backmerge remote-tracking branch 'origin/master' into irt-data-model

.github/workflows/linux-eic-shell.yml

+name: linux-eic-shell
+
+on: [push, pull_request]
+
+jobs:
+  build-test:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: cvmfs-contrib/github-action-cvmfs@v2
+    - uses: eic/run-cvmfs-osg-eic-shell@main
+      with:
+        platform-release: "jug_xl:nightly"
+        run: |
+          PREFIX=${PWD}/install
+          cmake -B build -S . -DCMAKE_INSTALL_PREFIX=${PREFIX}
+          cmake --build build -- install
+    - uses: actions/upload-artifact@v3
+      with:
+        name: build-eic-shell
+        path: install/
+        if-no-files-found: error

.gitlab-ci.yml

@@ -57,7 +57,7 @@ checks:juggler:
   rules:
     - if: '$CI_SERVER_HOST == "eicweb.phy.anl.gov"' 
   variables:
-    EICD_VERSION: "$EIC_DATA_MODEL_VERSION"
+    JUGGLER_EICD_VERSION: "$EIC_DATA_MODEL_VERSION"
   trigger:
     project: EIC/juggler
     strategy: depend

eic_data.yaml

@@ -238,19 +238,6 @@ datatypes:
   ## Particle info
   ## ==========================================================================
 
-  eicd::BasicParticle:
-    #DEPRECATED
-    Description: "Basic particle used internally to communicate basic particle properties."
-    Author: "W. Armstrong, S. Joosten"
-    Members:
-      - eicd::Vector3f    p                 // Momentum [GeV]
-      - eicd::Vector3d    v                 // Vertex [mm]
-      - float             time              // Time in [ns]
-      - int32_t           pid               // Particle PDG code
-      - int16_t           status            // Status code
-      - int16_t           charge            // Particle charge (or sign)
-      - float             weight            // Particle weight, e.g. from PID algorithm [0-1]
-
   eicd::ReconstructedParticle:
     Description: "EIC Reconstructed Particle"
     Author: "W. Armstrong, S. Joosten, F. Gaede"
@@ -557,6 +544,7 @@ datatypes:
     Author: "S. Joosten"
     Members:
       - uint32_t          simID             // Index of corresponding MCParticle (position in MCParticles array)
+      - uint32_t          recID             // Index of corresponding ReconstructedParticle (position in ReconstructedParticles array)
       - float             weight            // weight of this association
     OneToOneRelations :
       - eicd::ReconstructedParticle  rec    // reference to the reconstructed particle
@@ -568,6 +556,7 @@ datatypes:
     Author : "S. Joosten"
     Members:
       - uint32_t          simID             // Index of corresponding MCParticle (position in MCParticles array)
+      - uint32_t          recID             // Index of corresponding Cluster (position in Clusters array)
       - float             weight            // weight of this association
     OneToOneRelations:
       - eicd::Cluster     rec               // reference to the cluster
@@ -578,6 +567,7 @@ datatypes:
     Author : "S. Joosten"
     Members:
       - uint32_t          simID             // Index of corresponding MCParticle (position in MCParticles array)
+      - uint32_t          recID             // Index of corresponding Track (position in Tracks array)
       - float             weight            // weight of this association
     OneToOneRelations:
       - eicd::Track       rec               // reference to the track
@@ -589,6 +579,7 @@ datatypes:
     Author : "S. Joosten"
     Members:
       - uint32_t          simID             // Index of corresponding MCParticle (position in MCParticles array)
+      - uint32_t          recID             // Index of corresponding Vertex (position in Vertices array)
       - float             weight            // weight of this association
     OneToOneRelations:
       - eicd::Vertex       rec               // reference to the vertex