Merge pull request #58 from lopezzot/lp-g411.2.1

Add geant-val fataset 1.3_1

README.md

@@ -75,6 +75,7 @@ Ask authors for access to datasets. Results are deployed on Geant Val.
 
 | ATLTileCalTB     | Reproduce data | Reproduce analysis | Comments     |
 | -------------    | ----------     | -----------        | -----------  |
+| v1.3 <br /> Geant4 11.2.p01 <br /> tag 1.3_1 <br /> FTFP_BERT(+tunes1,2,3), FTFP_BERT_ATL, QGSP_BERT, FTFP_INCLXX <br /> 300k events per run <br /> Added 19/4/2024 | Run with Geant Val, OR <br /> `./ATLTileCalTB -m TBrun_all.mac -p $PHYSLIST` | Run with Geant Val, OR <br /> `root ../analysis/TBrun_all.C` | First results produced on new el9 lxplus machine. |
 | v1.1 <br /> Geant4 11.1.p01 <br /> tag 1.1_2 <br /> FTFP_INCLXX Added 2/5/2023 | Run with Geant Val, OR <br /> `./ATLTileCalTB -m TBrun_all.mac -p $PHYSLIST` | Run with Geant Val, OR <br /> `root ../analysis/TBrun_all.C` | FTFP_INCLXX results only because results 1.1_1 do not contain FTFP_INCLXX |
 | v1.1 <br /> Geant4 11.1 <br /> tag 1.1_1 <br /> FTFP_BERT(+tunes1,2,3), FTFP_BERT_ATL, QGSP_BERT (tag v1.1_1) <br /> 300k events per run <br /> Added 13/2/2023 | Run with Geant Val, OR <br /> `./ATLTileCalTB -m TBrun_all.mac -p $PHYSLIST` | Run with Geant Val, OR <br /> `root ../analysis/TBrun_all.C` | FTFP_INCLXX results not included due to a crash, to be investigated (problem with merged root files by parser.py) |
 | v1.0 <br /> Geant4 10.4.p03, 10.5.p01, 10.6.p03, 10.7.p03, 11.0.p02 <br /> FTFP_BERT, FTFP_BERT_ATL, QGSP_BERT, FTFP_INCLXX <br /> 300k events per run <br /> Added 17/8/2022 | Run with Geant Val, OR <br /> `./ATLTileCalTB -m TBrun_all.mac -p $PHYSLIST` | Run with Geant Val, OR <br /> `root ../analysis/TBrun_all.C` | Adjusted events per run to 300k |

geantval_scripts/ATLTileCalTB/parser.py

@@ -41,12 +41,17 @@ def parse(self, jobs):
 
         # get data from analysis
         tf = ROOT.TFile(os.path.join(tempdir, 'analysis.root'), 'READ')
-        tge_eresp_pi = tf.Get('Energy Response Pions')
-        tge_eres_pi = tf.Get('Energy Resolution Pions')
-        tge_eresp_k = tf.Get('Energy Response Kaons')
-        tge_eres_k = tf.Get('Energy Resolution Kaons')
-        tge_eresp_p = tf.Get('Energy Response Protons')
-        tge_eres_p = tf.Get('Energy Resolution Protons')
+        tge_eresp_pi = tf.Get('Energy_Response_Pions')
+        tge_eres_pi = tf.Get('Energy_Resolution_Pions')
+        tge_eresp_k = tf.Get('Energy_Response_Kaons')
+        tge_eres_k = tf.Get('Energy_Resolution_Kaons')
+        tge_eresp_p = tf.Get('Energy_Response_Protons')
+        tge_eres_p = tf.Get('Energy_Resolution_Protons')
+        # graph names were changed in ATLTileCalTB_1.2
+        # spaces were changed with "_"
+        # e.g. "Energy Response" -> "Energy_Response"
+        # if you use ATLTileCalTB with geant-val and a
+        # release < 1.2 use previous names here
 
         # Return simulation results
         # Energy response pions

geantval_scripts/configs/11.1.p01.sh

@@ -13,7 +13,7 @@ source /cvmfs/sft.cern.ch/lcg/contrib/gcc/${GCC_VERSION}/${GCC_PLATFORM}/setup.s
 
 # Test path
 GVALPATH="/cvmfs/geant4.cern.ch/opt-geant-val/$GEANT4_VERSION/$GEANT4_PLATFORM/bin:/cvmfs/geant4.cern.ch/opt/$GEANT4_VERSION/$GEANT4_PLATFORM/bin"
-YOURPATH="/afs/cern.ch/work/l/lopezzot/Fellow/ATLTileCalTB/build1111"
+YOURPATH="@YOURPATH@"
 export PATH="$GVALPATH:$PATH:$YOURPATH"
 
 # Geant Val exports

geantval_scripts/configs/11.2.p01.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+export G4GCC_VERSION="12"
+export G4GCC_PLATFORM="x86_64-el9-gcc12-opt"
+export GEANT4_VERSION="11.2.p01"
+export GEANT4_PLATFORM="x86_64-el9-gcc12-optdeb-MT"
+export GCC_VERSION="12"
+export GCC_PLATFORM="x86_64-el9-gcc12-opt"
+
+source /cvmfs/sft.cern.ch/lcg/contrib/gcc/${G4GCC_VERSION}/${G4GCC_PLATFORM}/setup.sh
+source /cvmfs/geant4.cern.ch/geant4/${GEANT4_VERSION}/${GEANT4_PLATFORM}/bin/geant4.sh
+source /cvmfs/sft.cern.ch/lcg/contrib/gcc/${GCC_VERSION}/${GCC_PLATFORM}/setup.sh
+
+# Test path
+GVALPATH="/cvmfs/geant4.cern.ch/opt-geant-val/$GEANT4_VERSION/$GEANT4_PLATFORM/bin:/cvmfs/geant4.cern.ch/opt/$GEANT4_VERSION/$GEANT4_PLATFORM/bin"
+YOURPATH="@YOURPATH@"
+export PATH="$GVALPATH:$PATH:$YOURPATH"
+
+# Geant Val exports
+export VERSION=$GEANT4_VERSION
+export PLATFORM=$GEANT4_PLATFORM

scripts/ATLTileCalTB_lxplus_11.2.p01.sh

@@ -0,0 +1,18 @@
+#!/bin/sh
+
+export ROOT_VERSION="6.30.06"
+export ROOT_PLATFORM="x86_64-almalinux9.3-gcc114-opt"
+export G4GCC_VERSION="12"
+export G4GCC_PLATFORM="x86_64-el9-gcc12-opt"
+export GEANT4_VERSION="11.2.p01"
+export GEANT4_PLATFORM="x86_64-el9-gcc12-optdeb-MT"
+export GCC_VERSION="12"
+export GCC_PLATFORM="x86_64-el9-gcc12-opt"
+
+source ./ATLTileCalTB_cvmfs_setup.sh
+
+export CC=$(command -v gcc)
+export CXX=$(command -v g++)
+cmake3 ../ATLTileCalTB $@
+make -j$(nproc)
+