From 0a5e70fba8c22b9ba3d773578b4b6872d47b720d Mon Sep 17 00:00:00 2001 From: Lorenzo Pezzotti Date: Mon, 15 Apr 2024 21:00:42 +0200 Subject: [PATCH 1/6] Add script for lxplus usage with G4-11.2.p01 Add script for lxplus usage with G4-11.2.p01 and el9 machines. --- scripts/ATLTileCalTB_lxplus_11.2.p01.sh | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 scripts/ATLTileCalTB_lxplus_11.2.p01.sh diff --git a/scripts/ATLTileCalTB_lxplus_11.2.p01.sh b/scripts/ATLTileCalTB_lxplus_11.2.p01.sh new file mode 100644 index 0000000..a26ef69 --- /dev/null +++ b/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) + From c2ac79cdb257502859adf10b97edbdf32f2ad6c3 Mon Sep 17 00:00:00 2001 From: Lorenzo Pezzotti Date: Mon, 15 Apr 2024 21:26:51 +0200 Subject: [PATCH 2/6] Fix bug in 11.2.p01 lxplus usage script Fix capital letters for GEANT4_PLATFORM. --- scripts/ATLTileCalTB_lxplus_11.2.p01.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ATLTileCalTB_lxplus_11.2.p01.sh b/scripts/ATLTileCalTB_lxplus_11.2.p01.sh index a26ef69..58c4c82 100644 --- a/scripts/ATLTileCalTB_lxplus_11.2.p01.sh +++ b/scripts/ATLTileCalTB_lxplus_11.2.p01.sh @@ -5,7 +5,7 @@ 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 GEANT4_PLATFORM="x86_64-el9-gcc12-optdeb-MT" export GCC_VERSION="12" export GCC_PLATFORM="x86_64-el9-gcc12-opt" From 4c6b3a9bb57001ecb9fa507238a83d5da0bcf626 Mon Sep 17 00:00:00 2001 From: Lorenzo Pezzotti Date: Mon, 15 Apr 2024 21:28:42 +0200 Subject: [PATCH 3/6] Fix YOURPATH env in 11.1.p01 gval script Do not use hardcoded YOUTPATH env in gval script (as done in the other config files). --- geantval_scripts/configs/11.1.p01.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/geantval_scripts/configs/11.1.p01.sh b/geantval_scripts/configs/11.1.p01.sh index 92b21cf..0b80dd6 100644 --- a/geantval_scripts/configs/11.1.p01.sh +++ b/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 From 54a40fcb53d5cba30fee93b5b604f9cc65b571e0 Mon Sep 17 00:00:00 2001 From: Lorenzo Pezzotti Date: Mon, 15 Apr 2024 21:30:10 +0200 Subject: [PATCH 4/6] Add gval G4-11.2.p01 config file Add config file for usage in geant-val with G4-11.2.p01 on el9 machines. --- geantval_scripts/configs/11.2.p01.sh | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 geantval_scripts/configs/11.2.p01.sh diff --git a/geantval_scripts/configs/11.2.p01.sh b/geantval_scripts/configs/11.2.p01.sh new file mode 100644 index 0000000..ee009b3 --- /dev/null +++ b/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 From 2926aae5754eed2fd2ee19211f012ac0c99ebfce Mon Sep 17 00:00:00 2001 From: Lorenzo Pezzotti Date: Fri, 19 Apr 2024 15:00:50 +0200 Subject: [PATCH 5/6] Rm spaces in graph names in parser.py Spaces in analysis graph names were removed in v1.2. Should be removed in parser.py too. --- geantval_scripts/ATLTileCalTB/parser.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/geantval_scripts/ATLTileCalTB/parser.py b/geantval_scripts/ATLTileCalTB/parser.py index 2de56d9..6a23a67 100644 --- a/geantval_scripts/ATLTileCalTB/parser.py +++ b/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 From 513b89e41245d4ca66833bd3cf53046682fa8268 Mon Sep 17 00:00:00 2001 From: Lorenzo Pezzotti Date: Fri, 19 Apr 2024 15:30:33 +0200 Subject: [PATCH 6/6] Add 1.3_1 geant-val dataset Add 1.3_1 geant-val dataset in the geant-val results table. --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 9fd8d0f..7e687f3 100644 --- a/README.md +++ b/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
Geant4 11.2.p01
tag 1.3_1
FTFP_BERT(+tunes1,2,3), FTFP_BERT_ATL, QGSP_BERT, FTFP_INCLXX
300k events per run
Added 19/4/2024 | Run with Geant Val, OR
`./ATLTileCalTB -m TBrun_all.mac -p $PHYSLIST` | Run with Geant Val, OR
`root ../analysis/TBrun_all.C` | First results produced on new el9 lxplus machine. | | v1.1
Geant4 11.1.p01
tag 1.1_2
FTFP_INCLXX Added 2/5/2023 | Run with Geant Val, OR
`./ATLTileCalTB -m TBrun_all.mac -p $PHYSLIST` | Run with Geant Val, OR
`root ../analysis/TBrun_all.C` | FTFP_INCLXX results only because results 1.1_1 do not contain FTFP_INCLXX | | v1.1
Geant4 11.1
tag 1.1_1
FTFP_BERT(+tunes1,2,3), FTFP_BERT_ATL, QGSP_BERT (tag v1.1_1)
300k events per run
Added 13/2/2023 | Run with Geant Val, OR
`./ATLTileCalTB -m TBrun_all.mac -p $PHYSLIST` | Run with Geant Val, OR
`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
Geant4 10.4.p03, 10.5.p01, 10.6.p03, 10.7.p03, 11.0.p02
FTFP_BERT, FTFP_BERT_ATL, QGSP_BERT, FTFP_INCLXX
300k events per run
Added 17/8/2022 | Run with Geant Val, OR
`./ATLTileCalTB -m TBrun_all.mac -p $PHYSLIST` | Run with Geant Val, OR
`root ../analysis/TBrun_all.C` | Adjusted events per run to 300k |