Skip to content
Snippets Groups Projects
Commit e57448df authored by Christopher Dilks's avatar Christopher Dilks
Browse files

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

parents a0867171 29408132
No related branches found
No related tags found
1 merge request!70add IRT data model
Pipeline #35214 failed
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
...@@ -57,7 +57,7 @@ checks:juggler: ...@@ -57,7 +57,7 @@ checks:juggler:
rules: rules:
- if: '$CI_SERVER_HOST == "eicweb.phy.anl.gov"' - if: '$CI_SERVER_HOST == "eicweb.phy.anl.gov"'
variables: variables:
EICD_VERSION: "$EIC_DATA_MODEL_VERSION" JUGGLER_EICD_VERSION: "$EIC_DATA_MODEL_VERSION"
trigger: trigger:
project: EIC/juggler project: EIC/juggler
strategy: depend strategy: depend
......
...@@ -238,19 +238,6 @@ datatypes: ...@@ -238,19 +238,6 @@ datatypes:
## Particle info ## 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: eicd::ReconstructedParticle:
Description: "EIC Reconstructed Particle" Description: "EIC Reconstructed Particle"
Author: "W. Armstrong, S. Joosten, F. Gaede" Author: "W. Armstrong, S. Joosten, F. Gaede"
...@@ -556,7 +543,8 @@ datatypes: ...@@ -556,7 +543,8 @@ datatypes:
Description: "Used to keep track of the correspondence between MC and reconstructed particles" Description: "Used to keep track of the correspondence between MC and reconstructed particles"
Author: "S. Joosten" Author: "S. Joosten"
Members: Members:
- uint32_t simID // Index of corresponding MCParticle (position in MCParticles array) - 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 - float weight // weight of this association
OneToOneRelations : OneToOneRelations :
- eicd::ReconstructedParticle rec // reference to the reconstructed particle - eicd::ReconstructedParticle rec // reference to the reconstructed particle
...@@ -567,7 +555,8 @@ datatypes: ...@@ -567,7 +555,8 @@ datatypes:
Description: "Association between a Cluster and a MCParticle" Description: "Association between a Cluster and a MCParticle"
Author : "S. Joosten" Author : "S. Joosten"
Members: Members:
- uint32_t simID // Index of corresponding MCParticle (position in MCParticles array) - 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 - float weight // weight of this association
OneToOneRelations: OneToOneRelations:
- eicd::Cluster rec // reference to the cluster - eicd::Cluster rec // reference to the cluster
...@@ -577,7 +566,8 @@ datatypes: ...@@ -577,7 +566,8 @@ datatypes:
Description: "Association between a Track and a MCParticle" Description: "Association between a Track and a MCParticle"
Author : "S. Joosten" Author : "S. Joosten"
Members: Members:
- uint32_t simID // Index of corresponding MCParticle (position in MCParticles array) - 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 - float weight // weight of this association
OneToOneRelations: OneToOneRelations:
- eicd::Track rec // reference to the track - eicd::Track rec // reference to the track
...@@ -588,7 +578,8 @@ datatypes: ...@@ -588,7 +578,8 @@ datatypes:
Description: "Association between a Vertex and a MCParticle" Description: "Association between a Vertex and a MCParticle"
Author : "S. Joosten" Author : "S. Joosten"
Members: Members:
- uint32_t simID // Index of corresponding MCParticle (position in MCParticles array) - 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 - float weight // weight of this association
OneToOneRelations: OneToOneRelations:
- eicd::Vertex rec // reference to the vertex - eicd::Vertex rec // reference to the vertex
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment