Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use latest dependencies in pipeline image #51

Merged
Merged
Changes from 1 commit
Commits
Show all changes
80 commits
Select commit Hold shift + click to select a range
674dfac
restG4/examples/01.NLDBD - increased number of events from 10 to 100 …
lobis Jun 6, 2022
89e47e3
restG4/examples/01.NLDBD/Validate.C - more semantic variable names
lobis Jun 6, 2022
df984bc
restG4.cxx - normalized variable name
lobis Jun 6, 2022
0e2dd76
Updated validation macro
lobis Jun 6, 2022
5707768
restG4.cxx - removed `REST_Display_CompatibilityMode` to fix pipeline
lobis Jun 6, 2022
096cfa2
.gitlab-ci.yml - using `test` pipeline temporarily
lobis Jun 6, 2022
31c6d13
examples/01 - using double for average number of _
lobis Jun 6, 2022
274505e
.gitlab-ci.yml - updated pipeline stage names
lobis Jun 6, 2022
16918d9
examples/01 - updated validation script to check average position
lobis Jun 6, 2022
2d249cd
examples/04 - collapsed physics lists tags
lobis Jun 6, 2022
980ecff
examples - using decimal numbers correctly in validation
lobis Jun 6, 2022
a49fa35
examples/04 - finished updating validaiton
lobis Jun 6, 2022
c3c165b
.gitlab-ci.yml - removed wrong check in example 11 (why wasn't it fai…
lobis Jun 6, 2022
837692f
examples/11 - collapsed tags
lobis Jun 6, 2022
19d9a2a
examples/08 - formatted rmls and collapsed some tags
lobis Jun 7, 2022
026933b
EventAction - added root timer, renamed some variables
lobis Jun 7, 2022
b3e006c
Event/RunAction - added better messages, reformatting
lobis Jun 7, 2022
9a64b2b
EventAction.cxx - speed up in case storage change is 100%
lobis Jun 7, 2022
a1ababb
examples/08 - using 10000 events as before
lobis Jun 7, 2022
bad46fa
examples/08 - Simplified and updated validation macro
lobis Jun 7, 2022
a24b13a
examples - updated decay example
lobis Jun 7, 2022
1de8527
updated examples with reference values for validation
lobis Jun 7, 2022
e0efdd2
examples/09 - updated shielding example
lobis Jun 7, 2022
e506403
Using TRestTools to check input rml exists and give proper error message
lobis Jun 7, 2022
7827b52
updated names on pipelines to follow repository naming convention
lobis Jun 7, 2022
505992f
examples/04 - validation
lobis Jun 7, 2022
40d0adc
examples/08 - updated validation ref value
lobis Jun 7, 2022
665fc8a
examples/04 - updated validation
lobis Jun 7, 2022
f1ac161
examples/04 - updated reference values
lobis Jun 7, 2022
9f024a4
updated pipeline image to `ghcr.io/lobis/root-geant4-garfield:rest-fo…
lobis Jun 7, 2022
1446230
using dev pipeline
lobis Jun 7, 2022
517d38f
Added back `REST_Display_CompatibilityMode`
lobis Jun 7, 2022
7acef6c
Validation - reduced tolerance to 0.5%
lobis Jun 8, 2022
21f2628
pipeline - updated tolerances to 0.1%
lobis Jun 8, 2022
931d4f8
Merge branch 'master' into 238-update-pipeline-image-to-use-latest-ve…
lobis Jun 9, 2022
c81ed79
github actions - updated to use dev image
lobis Jun 9, 2022
a5979ef
github actions - fixed not pulling corresponding branch of framework
lobis Jun 9, 2022
c4b8120
Update validation.yml
lobis Jun 9, 2022
398e4fb
github actions - using different cache key to fix
lobis Jun 10, 2022
cb6f83e
github actions - more debug
lobis Jun 10, 2022
b91267b
github actions - using rest-for-physics-reference-jun2022 for frozen …
lobis Jun 10, 2022
f2d5ea0
Using default in actions
lobis Jun 10, 2022
2771fa2
GitHub actions - removed invalid defaults
lobis Jun 10, 2022
94b5152
actions - removed env image variable
lobis Jun 10, 2022
9ab8909
actions - added more complete key to cache
lobis Jun 10, 2022
5be9442
actions removed cache of old
lobis Jun 10, 2022
3f9d744
actions - added back cache for old G4
lobis Jun 10, 2022
6be76c1
actions - using regular bash
lobis Jun 10, 2022
a7329ae
actions debug cache
lobis Jun 10, 2022
257e327
updated action
lobis Jun 10, 2022
f465f6d
debug action
lobis Jun 10, 2022
3cff58b
github actions - debug
lobis Jun 10, 2022
c669726
github actions - debug
lobis Jun 10, 2022
9664ee4
github actions - debug
lobis Jun 10, 2022
e5cf1d2
actions - sourcing root manually
lobis Jun 10, 2022
265de88
Added better sourcing of root
lobis Jun 11, 2022
3175777
actions - check
lobis Jun 11, 2022
a0f5c0f
actions - updated examples
lobis Jun 11, 2022
d8d4e87
actions - removed sourcing root manually
lobis Jun 11, 2022
39405cd
Fixed validation for example 11
lobis Jun 11, 2022
30ca8f3
attempt to fix pipeline
lobis Jun 11, 2022
7ecfbea
thisREST.sh - removed condition preventing from loading geant4.sh
lobis Jun 11, 2022
e6d9de5
Attempt to fix pipeline
lobis Jun 11, 2022
338fbcc
fixed example
lobis Jun 11, 2022
c3c08c0
removed patch from validation
lobis Jun 11, 2022
789c4ae
updated example 11 validation
lobis Jun 11, 2022
a13f8df
attempt to fix pipeline
lobis Jun 11, 2022
35c34c1
attempt to fix pipeline
lobis Jun 12, 2022
5c97c45
updated actions
lobis Jun 13, 2022
a8e81df
updated actions to include reference Geant4 version check
lobis Jun 13, 2022
da59128
updated actions
lobis Jun 13, 2022
955a36f
attempt to fix pipeline
lobis Jun 13, 2022
e60bf9d
actions - reduced cache key size
lobis Jun 13, 2022
df3a5e3
updated action
lobis Jun 13, 2022
5a01421
restG4 - fix bad Geant4 version print
lobis Jun 13, 2022
ac44c33
removed test path from cache
lobis Jun 13, 2022
56b137e
actions - added example 01 with ref
lobis Jun 13, 2022
ad10afd
fixed bug in validation
lobis Jun 13, 2022
94c018c
attempt to fix action
lobis Jun 13, 2022
ad80a60
actions - updated validation for example 01
lobis Jun 13, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
attempt to fix pipeline
  • Loading branch information
lobis committed Jun 12, 2022
commit 35c34c19570281f61ac0387aa9199a6de676f4be
2 changes: 1 addition & 1 deletion .github/workflows/validation.yml
Original file line number Diff line number Diff line change
@@ -364,4 +364,4 @@ jobs:
cd ${{ env.REST_PATH }}/examples/restG4/11.Xrays/
restG4 xrays.rml -o xrays_simulation.root
restManager --c analysis.rml --f xrays_simulation.root --o xrays_simulation_analysis.root
restRoot -b -q Validate.C'("xrays_simulation_analysis.root")'
restRoot -b -q GetQE.C'("xrays_simulation_analysis.root")'
6 changes: 3 additions & 3 deletions examples/11.Xrays/Validate.C → examples/11.Xrays/GetQE.C
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include "TRestRun.h"

Int_t Validate(const char* inputFile) {
Int_t GetQE(const char* inputFile) {
TRestRun run(inputFile);
TRestAnalysisTree* aTree = run.GetAnalysisTree();

@@ -10,7 +10,7 @@ Int_t Validate(const char* inputFile) {
for (int n = 0; n < run.GetEntries(); n++) {
run.GetEntry(n);

Double_t eDep = aTree->GetObservableValue<Double_t>("g4Ana_totalEDep");
Double_t eDep = aTree->GetObservableValue<Double_t>("g4Ana_totalEdep");
Double_t ePrimary = aTree->GetObservableValue<Double_t>("g4Ana_energyPrimary");

if (eDep > 0) eDepHist->Fill(eDep);
@@ -50,7 +50,7 @@ Int_t Validate(const char* inputFile) {
for (int n = 0; n < run.GetEntries(); n++) {
run.GetEntry(n);

Double_t eDep = aTree->GetObservableValue<Double_t>("g4Ana_totalEDep");
Double_t eDep = aTree->GetObservableValue<Double_t>("g4Ana_totalEdep");
Double_t ePrimary = aTree->GetObservableValue<Double_t>("g4Ana_energyPrimary");

if (eDep > 0) matrixHist->Fill(eDep, ePrimary);
2 changes: 1 addition & 1 deletion examples/11.Xrays/README.md
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@

**Author:** Javier Galan (javier.galan@unizar.es)

This example uses a x-ray gun with photons in the (0,15)keV range hitting a gas volume filled with Xenon in order to generate an efficiency response matrix.
This example uses an x-ray gun with photons in the (0,15)keV range hitting a gas volume filled with Xenon in order to generate an efficiency response matrix.

#### Detector geometry

6 changes: 3 additions & 3 deletions examples/11.Xrays/analysis.rml
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@ internal values are saved.
<parameter name="user" value="${USER}"/>
<parameter name="verboseLevel" value="1"/>
<parameter name="overwrite" value="off"/>
<parameter name="outputFileName" value="Run_[fRunType]_[fRunNumber]_[fRunTag].root"/>
<parameter name="outputFileName" value="Run_[fRunType]_[fRunNumber]_[fRunTag].root"/>
</TRestRun>

<TRestProcessRunner name="TemplateEventProcess" verboseLevel="info">
@@ -37,8 +37,8 @@ internal values are saved.

// observable = all will add all NON `custom` observables
<addProcess type="TRestGeant4AnalysisProcess" name="g4Ana" value="ON">
<observable name="energyPrimary" />
<observable name="totalEdep" />
<observable name="energyPrimary"/>
<observable name="totalEdep"/>
</addProcess>

</TRestProcessRunner>
1 change: 0 additions & 1 deletion examples/11.Xrays/xrays.rml
Original file line number Diff line number Diff line change
@@ -85,5 +85,4 @@ By default REST units are mm, keV and degrees
<physicsList name="G4EmExtraPhysics"/>

</TRestGeant4PhysicsLists>

</restG4>