Use latest dependencies in pipeline image

.gitlab-ci.yml

@@ -1,10 +1,10 @@
-image: ghcr.io/lobis/root-geant4-garfield:rest-for-physics
+image: ghcr.io/lobis/root-geant4-garfield:rest-for-physics-dev
 
 stages:
-  - build
-  - build-standalone
-  - loadRESTLibs
-  - examples
+  - Build
+  - Build Standalone
+  - Load REST Libraries
+  - Run Examples
 
 before_script:
   - export USER="rest"
@@ -18,7 +18,7 @@ before_script:
 
 # This is the one we use to run validations tests. We save the installation as an artifact.
 Build and Install:
-  stage: build
+  stage: Build
   script:
     - echo "**${CI_PROJECT_DIR}**"
     - git clone https://github.com/rest-for-physics/framework.git framework
@@ -50,7 +50,7 @@ Build and Install:
     expire_in: 1 day
 
 Build Standalone:
-  stage: build-standalone
+  stage: Build Standalone
   script:
     - echo "**${CI_PROJECT_DIR}**"
     - cd ${CI_PROJECT_DIR}/
@@ -64,22 +64,22 @@ Build Standalone:
     - rm -rf ${CI_PROJECT_DIR}/install-standalone
 
 Load REST Libraries:
-  stage: loadRESTLibs
+  stage: Load REST Libraries
   script:
     - . ${CI_PROJECT_DIR}/install/thisREST.sh
     - restRoot -b -q
 
-01_NLDBD:
-  stage: examples
+01.NLDBD:
+  stage: Run Examples
   script:
     - . ${CI_PROJECT_DIR}/install/thisREST.sh
     - cd ${CI_PROJECT_DIR}/install/examples/restG4/01.NLDBD/
     - restG4 NLDBD.rml
     - geant4-config --version
     - restRoot -b -q Validate.C'("Run00001_NLDBD_Test.root")'
 
-03_Fluorescence:
-  stage: examples
+03.Fluorescence:
+  stage: Run Examples
   script:
     - . ${CI_PROJECT_DIR}/install/thisREST.sh
     - cd ${CI_PROJECT_DIR}/install/examples/restG4/03.Fluorescence/
@@ -88,8 +88,8 @@ Load REST Libraries:
     - geant4-config --version
     - restRoot -b -q Validate.C'("Run00111_g4Analysis_Gamma_rest.root")'
 
-04_MuonScan:
-  stage: examples
+04.MuonScan:
+  stage: Run Examples
   script:
     - . ${CI_PROJECT_DIR}/install/thisREST.sh
     - cd ${CI_PROJECT_DIR}/install/examples/restG4/04.MuonScan/
@@ -101,37 +101,37 @@ Load REST Libraries:
     - restG4 CosmicMuonsFromCircle.rml
     - restRoot -b -q ValidateCircle.C'("Run00111_restG4_MuonsFromCircle_rest.root")'
 
-05_PandaXIII:
-  stage: examples
+05.PandaXIII:
+  stage: Run Examples
   script:
     - . ${CI_PROJECT_DIR}/install/thisREST.sh
     - cd ${CI_PROJECT_DIR}/install/examples/restG4/05.PandaXIII/
     - restG4 Xe136bb0n.rml
     - restRoot -b -q ValidateG4.C'("Xe136bb0n_n2E06.root")'
 
-06_IonRecoils:
-  stage: examples
+06.IonRecoils:
+  stage: Run Examples
   script:
     - . ${CI_PROJECT_DIR}/install/thisREST.sh
     - cd ${CI_PROJECT_DIR}/install/examples/restG4/06.IonRecoils/
     - restG4 recoils.rml
     - restRoot -b -q Validate.C'("Run00001_F20_Recoils.root")'
 
-07_FullChainDecay:
-  stage: examples
+07.FullChainDecay:
+  stage: Run Examples
   script:
     - . ${CI_PROJECT_DIR}/install/thisREST.sh
     - cd ${CI_PROJECT_DIR}/install/examples/restG4/07.FullChainDecay/
     - restG4 fullChain.rml
     - restG4 singleDecay.rml
-    - restRoot -b -q Validate.C'("Run00001_U238_FullChainDecay.root", 14)'
+    - restRoot -b -q Validate.C'("Run00001_U238_FullChainDecay.root", 16)'
     - restRoot -b -q Validate.C'("Run00002_U238_SingleChainDecay.root", 1)'
     - export REST_ISOTOPE="Be7"
     - restG4 singleDecay.rml
     - restRoot -b -q Validate.C'("Run00002_Be7_SingleChainDecay.root", 1)'
 
-08_Alphas:
-  stage: examples
+08.Alphas:
+  stage: Run Examples
   script:
     - . ${CI_PROJECT_DIR}/install/thisREST.sh
     - cd ${CI_PROJECT_DIR}/install/examples/restG4/08.Alphas/
@@ -151,28 +151,27 @@ Load REST Libraries:
     - restManager --c plots.rml --f "data/*g4Ana*root" --batch
     - restRoot -b -q Validate.C
 
-09_Pb210_Shielding:
-  stage: examples
+09.Pb210_Shielding:
+  stage: Run Examples
   script:
     - . ${CI_PROJECT_DIR}/install/thisREST.sh
     - cd ${CI_PROJECT_DIR}/install/examples/restG4/09.Pb210_Shield/
     - restG4 Pb210.rml
     - restRoot -b -q Validate.C'("Run00001_Pb210_Shielding.root")'
 
-10_Geometries:
-  stage: examples
+10.Geometries:
+  stage: Run Examples
   script:
     - . ${CI_PROJECT_DIR}/install/thisREST.sh
     - cd ${CI_PROJECT_DIR}/install/examples/restG4/10.Geometries/
     - restG4 Assembly.rml
     - restRoot -b -q Validate.C'("Run00001_Assembly_Assembly.root")'
 
-11_Xrays:
-  stage: examples
+11.Xrays:
+  stage: Run Examples
   script:
     - . ${CI_PROJECT_DIR}/install/thisREST.sh
     - cd ${CI_PROJECT_DIR}/install/examples/restG4/11.Xrays/
     - restG4 xrays.rml
-    - restRoot -b -q Validate.C'("Run00001_Assembly_Assembly.root")'
     - restManager --c analysis.rml --f RestG4_xrays_00001_ArgonISO.root
     - restRoot -b -q GetQE.C'("Run_g4Analysis_00001_xrays.root")'

examples/01.NLDBD/NLDBD.rml

@@ -44,7 +44,7 @@ By default REST units are mm, keV and degrees
         <parameter name="seed" value="17021981"/>
 
         <!-- The number of events to be simulated is now defined in TRestGeant4Metadata -->
-        <parameter name="nEvents" value="10"/>
+        <parameter name="nEvents" value="100"/>
 
         ///three types of source definition supported:
         <generator type="volume" from="gas">

examples/01.NLDBD/Validate.C

@@ -1,93 +1,126 @@
 
-Int_t Validate(string fname) {
-    TRestRun* run = new TRestRun(fname);
+#include <TRestGeant4Event.h>
 
-    if (run->GetParentRunNumber() != 0) {
-        cout << "Parent run number value : " << run->GetParentRunNumber() << endl;
+Int_t Validate(const char* filename) {
+    cout << "Starting validation for '" << filename << "'" << endl;
+
+    TRestRun run(filename);
+
+    if (run.GetParentRunNumber() != 0) {
+        cout << "Parent run number value : " << run.GetParentRunNumber() << endl;
         cout << "The parent run number from restG4 generated file should be 0" << endl;
         return 1;
     }
 
-    if (run->GetRunNumber() != 1) {
-        cout << "Run number value : " << run->GetRunNumber() << endl;
+    if (run.GetRunNumber() != 1) {
+        cout << "Run number value : " << run.GetRunNumber() << endl;
         cout << "The run number on the validation chain should be 1 by default!" << endl;
         return 2;
     }
 
-    if (run->GetRunType() != "restG4") {
-        cout << "Run type : " << run->GetRunType() << endl;
+    if (run.GetRunType() != "restG4") {
+        cout << "Run type : " << run.GetRunType() << endl;
         cout << "The run type of restG4 generated data should be 'restG4'!" << endl;
         return 3;
     }
 
-    if (run->GetRunTag() != "NLDBD") {
-        cout << "Run tag : " << run->GetRunTag() << endl;
+    if (run.GetRunTag() != "NLDBD") {
+        cout << "Run tag : " << run.GetRunTag() << endl;
         cout << "The run tag of the basic validation test should be 'NLDBD'!" << endl;
         return 4;
     }
 
-    if (run->GetEntries() != 10) {
-        cout << "Run entries : " << run->GetEntries() << endl;
-        cout << "The NLDBD simulation is launched from gas. It should always generate 10 events." << endl;
+    if (run.GetEntries() != 100) {
+        cout << "Run entries : " << run.GetEntries() << endl;
+        cout << "The number of stored events should match the reference value of 100" << endl;
         return 5;
     }
 
     cout << "Testing reading of Geant4 metadata class" << endl;
-    TRestGeant4Metadata* g4Md = (TRestGeant4Metadata*)run->GetMetadataClass("TRestGeant4Metadata");
-    if (!g4Md) {
+    TRestGeant4Metadata* geant4Metadata = (TRestGeant4Metadata*)run.GetMetadataClass("TRestGeant4Metadata");
+    if (!geant4Metadata) {
         cout << "Problem reading Geant4 metadata class!" << endl;
         return 6;
     }
-    g4Md->PrintMetadata();
+    geant4Metadata->PrintMetadata();
 
-    if (g4Md->GetNumberOfActiveVolumes() != 1) {
-        cout << "The number of registered volumes is not 1!" << endl;
+    const bool isReferenceGeant4Version = geant4Metadata->GetGeant4Version() == "10.4.3";
+
+    if (geant4Metadata->GetNumberOfActiveVolumes() != 1) {
+        cout << "The number of registered does not match the reference value of 1" << endl;
         return 7;
     }
 
-    TRestGeant4Event* ev = (TRestGeant4Event*)run->GetInputEvent();
-    run->GetEntry(9);
+    TRestGeant4Event* event = run.GetInputEvent<TRestGeant4Event>();
+
+    double nEvents = run.GetEntries();
+
+    double averageTotalEnergy = 0;
+    const double averageTotalEnergyRef = (!isReferenceGeant4Version) ? 2280.96 : 2221.55;
+
+    double averageSensitiveEnergy = 0;
+    const double averageSensitiveEnergyRef = (!isReferenceGeant4Version) ? 2280.96 : 2221.55;
+
+    double averageNumberOfHits = 0;
+    const double averageNumberOfHitsRef = (!isReferenceGeant4Version) ? 3071.17 : 342.37;
 
-    cout << "Total energy : " << ev->GetTotalDepositedEnergy() << endl;
-    Int_t en = (Int_t)(100 * ev->GetTotalDepositedEnergy());
-    cout << "Energy integer : " << en << endl;
-    cout << "Sensitive volume energy : " << ev->GetSensitiveVolumeEnergy() << endl;
-    cout << "Number of hits : " << ev->GetNumberOfHits() << endl;
-    cout << "Number of tracks : " << ev->GetNumberOfTracks() << endl;
+    double averageNumberOfTracks = 0;
+    const double averageNumberOfTracksRef = (!isReferenceGeant4Version) ? 2161.43 : 10.11;
 
-    Int_t X = (Int_t)(100 * ev->GetMeanPositionInVolume(0).X());
-    Int_t Y = (Int_t)(100 * ev->GetMeanPositionInVolume(0).Y());
-    Int_t Z = (Int_t)(100 * ev->GetMeanPositionInVolume(0).Z());
+    TVector3 averagePosition = {};
+    const TVector3 averagePositionRef = (!isReferenceGeant4Version) ? TVector3(-38.8987, 27.5536, 91.3969)
+                                                                    : TVector3(-17.8046, -32.5019, -31.8353);
 
-    cout << "x: " << X << " y: " << Y << " z: " << Z << endl;
+    const double tolerance = 0.001;
 
-    if (en != 245700) {
-        cout << "Error in total energy" << endl;
+    for (size_t i = 0; i < run.GetEntries(); i++) {
+        run.GetEntry(i);
+
+        averageTotalEnergy += event->GetTotalDepositedEnergy() / nEvents;
+        averageSensitiveEnergy += event->GetSensitiveVolumeEnergy() / nEvents;
+        averageNumberOfHits += event->GetNumberOfHits() / nEvents;
+        averageNumberOfTracks += event->GetNumberOfTracks() / nEvents;
+        averagePosition += event->GetMeanPositionInVolume(0) * (1.0 / nEvents);
+    }
+
+    cout << "Average total energy: " << averageTotalEnergy << " keV" << endl;
+    cout << "Average sensitive energy: " << averageSensitiveEnergy << " keV" << endl;
+    cout << "Average number of hits: " << averageNumberOfHits << endl;
+    cout << "Average number of tracks: " << averageNumberOfTracks << endl;
+    cout << "Average position: (" << averagePosition.x() << ", " << averagePosition.y() << ", "
+         << averagePosition.z() << ") mm" << endl;
+
+    if (TMath::Abs(averageNumberOfHits - averageNumberOfHitsRef) / averageNumberOfHitsRef > tolerance) {
+        cout << "The average number of hits does not match the reference value of " << averageNumberOfHitsRef
+             << endl;
         return 8;
     }
 
-    //en = (Int_t)(100 * ev->GetSensitiveVolumeEnergy());
-    //if (en != 245699) {
-    //    cout << "Error in total energy" << endl;
-    //    return 9;
-    //}
+    if (TMath::Abs(averageNumberOfTracks - averageNumberOfTracksRef) / averageNumberOfTracksRef > tolerance) {
+        cout << "The average number of tracks does not match the reference value of "
+             << averageNumberOfTracksRef << endl;
+        return 9;
+    }
 
-    if (ev->GetNumberOfHits() != 401) {
-        cout << "Error in the number of hits" << endl;
+    if (TMath::Abs(averageSensitiveEnergy - averageSensitiveEnergyRef) / averageSensitiveEnergyRef >
+        tolerance) {
+        cout << "The average sensitive volume energy does not match the reference value of "
+             << averageSensitiveEnergyRef << endl;
         return 10;
     }
 
-    if (ev->GetNumberOfTracks() != 11) {
-        cout << "Error in the number of tracks" << endl;
+    if (TMath::Abs(averageTotalEnergy - averageTotalEnergyRef) / averageTotalEnergyRef > tolerance) {
+        cout << "The average total energy does not match the reference value of " << averageTotalEnergyRef
+             << endl;
         return 11;
     }
-    if (X != -52709 || Y != 37592 || Z != 59585) {
-        cout << "Error in the event mean position" << endl;
+
+    if (TMath::Abs(averagePosition.Mag() - averagePositionRef.Mag()) / averagePositionRef.Mag() > tolerance) {
+        cout << "The average position does not match the reference value of "
+             << "(" << averagePositionRef.x() << ", " << averagePositionRef.y() << ", "
+             << averagePositionRef.z() << ") mm" << endl;
         return 12;
     }
 
-    cout << "All tests passed! [\033[32mOK\033[0m]\n";
-    // Other tests like opening other metadata classes. Detector TGeoManager, etc.
-
     return 0;
 }

examples/04.MuonScan/CosmicMuonsFromCircle.rml

@@ -65,7 +65,6 @@
         </physicsList>
 
         <!-- Hadron physics lists -->
-
         <physicsList name="G4HadronElasticPhysicsHP"/>
         <physicsList name="G4IonBinaryCascadePhysics"/>
         <physicsList name="G4HadronPhysicsQGSP_BIC_HP"/>

examples/04.MuonScan/CosmicMuonsFromWall.rml

@@ -52,24 +52,23 @@ First concept author G. Luzón (16-11-2020) -->
         <parameter name="maxEnergyRangeProductionCuts" value="1" units="GeV"/>
 
         <!-- EM Physics lists -->
-        <physicsList name="G4EmLivermorePhysics"></physicsList>
+        <physicsList name="G4EmLivermorePhysics"/>
         <!-- <physicsList name="G4EmPenelopePhysics"> </physicsList> -->
         <!-- <physicsList name="G4EmStandardPhysics_option3"> </physicsList> -->
 
         <!-- Decay physics lists -->
-        <physicsList name="G4DecayPhysics"></physicsList>
-        <physicsList name="G4RadioactiveDecayPhysics"></physicsList>
+        <physicsList name="G4DecayPhysics"/>
+        <physicsList name="G4RadioactiveDecayPhysics"/>
         <physicsList name="G4RadioactiveDecay">
             <option name="ICM" value="true"/>
             <option name="ARM" value="true"/>
         </physicsList>
 
         <!-- Hadron physics lists -->
-
-        <physicsList name="G4HadronElasticPhysicsHP"></physicsList>
-        <physicsList name="G4IonBinaryCascadePhysics"></physicsList>
-        <physicsList name="G4HadronPhysicsQGSP_BIC_HP"></physicsList>
-        <physicsList name="G4EmExtraPhysics"></physicsList>
+        <physicsList name="G4HadronElasticPhysicsHP"/>
+        <physicsList name="G4IonBinaryCascadePhysics"/>
+        <physicsList name="G4HadronPhysicsQGSP_BIC_HP"/>
+        <physicsList name="G4EmExtraPhysics"/>
 
     </TRestGeant4PhysicsLists>