Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
eicd
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
EIC
eicd
Commits
e57448df
Commit
e57448df
authored
2 years ago
by
Christopher Dilks
Browse files
Options
Downloads
Plain Diff
backmerge remote-tracking branch 'origin/master' into irt-data-model
parents
a0867171
29408132
No related branches found
No related tags found
1 merge request
!70
add IRT data model
Pipeline
#35214
failed
2 years ago
Stage: config
Stage: build
Stage: deploy
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.github/workflows/linux-eic-shell.yml
+22
-0
22 additions, 0 deletions
.github/workflows/linux-eic-shell.yml
.gitlab-ci.yml
+1
-1
1 addition, 1 deletion
.gitlab-ci.yml
eic_data.yaml
+8
-17
8 additions, 17 deletions
eic_data.yaml
with
31 additions
and
18 deletions
.github/workflows/linux-eic-shell.yml
0 → 100644
+
22
−
0
View file @
e57448df
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
This diff is collapsed.
Click to expand it.
.gitlab-ci.yml
+
1
−
1
View file @
e57448df
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
eic_data.yaml
+
8
−
17
View file @
e57448df
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment