New record types and new injector inheritance

.github/workflows/build_wheels.yml

@@ -3,21 +3,20 @@ name: Build
 on: [pull_request]
 
 jobs:
-  build_wheels:
+  build_wheels_linux:
     name: Build wheels on ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        #os: [ubuntu-20.04, windows-2019, macos-11]
-        os: [ubuntu-20.04, macos-11]
-        arch: [x86_64, auto32, auto64, aarch64, ppc64le, s390x, arm64]
+        os: [ubuntu-20.04]
+        arch: [x86_64, i686, aarch64, ppc64le, s390x]
 
     steps:
       - name: Checkout LeptonInjector
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.9'  # update once build dependencies are available
 
@@ -28,6 +27,36 @@ jobs:
         if: ${{ failure() }}
         uses: mxschmitt/action-tmate@v3
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
+          name: cibw-wheels-${{ matrix.os }}-${{ strategy.job-index }}
+          path: ./wheelhouse/*.whl
+  build_wheels_macos:
+    name: Build wheels on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [macos-11]
+        # arch: [x86_64, arm64]
+        arch: [x86_64]
+
+    steps:
+      - name: Checkout LeptonInjector
+        uses: actions/checkout@v4
+
+      - name: Setup Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.9'  # update once build dependencies are available
+
+      - name: Build wheels
+        uses: pypa/[email protected]
+
+      - name: Setup tmate session
+        if: ${{ failure() }}
+        uses: mxschmitt/action-tmate@v3
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: cibw-wheels-${{ matrix.os }}-${{ strategy.job-index }}
           path: ./wheelhouse/*.whl

.gitignore

@@ -48,21 +48,13 @@
 *.swp
 
 # rk
-*/*rk*
-*/*/*rk*
+vendor/rk/
 
 # ipynb_checkpoint
 *ipynb_checkpoint*
-*/*ipynb_checkpoint*
-*/*/*ipynb_checkpoint*
-*/*/*/*ipynb_checkpoint*
 
 # build
 *build
 
 # pycache
 *pycache*
-*/*pycache*
-*/*/*pycache*
-*/*/*/*pycache*
-*/*/*/*/*pycache*

projects/dataclasses/CMakeLists.txt

@@ -6,7 +6,8 @@ LIST (APPEND dataclasses_SOURCES
     ${PROJECT_SOURCE_DIR}/projects/dataclasses/private/InteractionRecord.cxx
     ${PROJECT_SOURCE_DIR}/projects/dataclasses/private/InteractionTree.cxx
     ${PROJECT_SOURCE_DIR}/projects/dataclasses/private/DecaySignature.cxx
-    ${PROJECT_SOURCE_DIR}/projects/dataclasses/private/DecayRecord.cxx
+    ${PROJECT_SOURCE_DIR}/projects/dataclasses/private/ParticleID.cxx
+    ${PROJECT_SOURCE_DIR}/projects/dataclasses/private/ParticleType.cxx
 )
 add_library(LI_dataclasses OBJECT ${dataclasses_SOURCES})
 set_property(TARGET LI_dataclasses PROPERTY POSITION_INDEPENDENT_CODE ON)
@@ -29,6 +30,10 @@ install(DIRECTORY "${PROJECT_SOURCE_DIR}/projects/dataclasses/public/"
     PATTERN "*.tcc"
 )
 
+package_add_test(UnitTest_InteractionSignature ${PROJECT_SOURCE_DIR}/projects/dataclasses/private/test/InteractionSignature_TEST.cxx)
+package_add_test(UnitTest_InteractionRecord ${PROJECT_SOURCE_DIR}/projects/dataclasses/private/test/InteractionRecord_TEST.cxx)
+package_add_test(UnitTest_InteractionTree ${PROJECT_SOURCE_DIR}/projects/dataclasses/private/test/InteractionTree_TEST.cxx)
+
 pybind11_add_module(dataclasses ${PROJECT_SOURCE_DIR}/projects/dataclasses/private/pybindings/dataclasses.cxx)
 target_link_libraries(dataclasses PRIVATE LeptonInjector)
 if(DEFINED SKBUILD)