diff --git a/Reconstruction/RecExample/RecExRecoTest/python/CaloReco_RAW_data22_13p6TeV.py b/Reconstruction/RecExample/RecExRecoTest/python/CaloReco_RAW_data22_13p6TeV.py index 5ff8d60bc5c7690aaff44f679b8b4df6c3fd0199..15dc4649aab898fabd21528dc513e4eeaab21cc0 100644 --- a/Reconstruction/RecExample/RecExRecoTest/python/CaloReco_RAW_data22_13p6TeV.py +++ b/Reconstruction/RecExample/RecExRecoTest/python/CaloReco_RAW_data22_13p6TeV.py @@ -3,6 +3,8 @@ if __name__=="__main__": from AthenaConfiguration.AllConfigFlags import initConfigFlags flags = initConfigFlags() + # Required for MT using --threads argument + flags.fillFromArgs(parser=flags.getArgumentParser()) from RecExRecoTest.RecExReco_setupData22 import RecExReco_setupData22 RecExReco_setupData22(flags) diff --git a/Reconstruction/RecExample/RecExRecoTest/python/CaloTopoClusterReco_ESDMC21.py b/Reconstruction/RecExample/RecExRecoTest/python/CaloTopoClusterReco_ESDMC21.py index 1208a5d5f3c178bed3317f936d021c0226a2aa19..11196fbf4d8dc5ce9ce1d43a8b4a61756fefe45b 100644 --- a/Reconstruction/RecExample/RecExRecoTest/python/CaloTopoClusterReco_ESDMC21.py +++ b/Reconstruction/RecExample/RecExRecoTest/python/CaloTopoClusterReco_ESDMC21.py @@ -3,6 +3,8 @@ if __name__=="__main__": from AthenaConfiguration.AllConfigFlags import initConfigFlags flags = initConfigFlags() + # Required for MT using --threads argument + flags.fillFromArgs(parser=flags.getArgumentParser()) flags.Input.Files = ["/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecExRecoTest/mc21_13p6TeV/ESDFiles/mc21_13p6TeV.421450.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep_fct.recon.ESD.e8445_e8447_s3822_r13565/ESD.28877240._000046.pool.root.1"] flags.lock() diff --git a/Reconstruction/RecExample/RecExRecoTest/python/EGammaReco_RAW_data22_13p6TeV.py b/Reconstruction/RecExample/RecExRecoTest/python/EGammaReco_RAW_data22_13p6TeV.py index 7c93c4553faaf901f373b4dadb94adba836a5c1c..17afdccfe1ca480d476669dd7b308969d9e50b4d 100644 --- a/Reconstruction/RecExample/RecExRecoTest/python/EGammaReco_RAW_data22_13p6TeV.py +++ b/Reconstruction/RecExample/RecExRecoTest/python/EGammaReco_RAW_data22_13p6TeV.py @@ -3,6 +3,8 @@ if __name__=="__main__": from AthenaConfiguration.AllConfigFlags import initConfigFlags flags = initConfigFlags() + # Required for MT using --threads argument + flags.fillFromArgs(parser=flags.getArgumentParser()) from RecExRecoTest.RecExReco_setupData22 import RecExReco_setupData22 RecExReco_setupData22(flags) diff --git a/Reconstruction/RecExample/RecExRecoTest/python/Jets_AODMC21.py b/Reconstruction/RecExample/RecExRecoTest/python/Jets_AODMC21.py index 375551481d13ffbe744830cbfbd8293214320ee5..3a129a82429deefe07051c0edd680657186ab54a 100644 --- a/Reconstruction/RecExample/RecExRecoTest/python/Jets_AODMC21.py +++ b/Reconstruction/RecExample/RecExRecoTest/python/Jets_AODMC21.py @@ -3,6 +3,8 @@ if __name__=="__main__": from AthenaConfiguration.AllConfigFlags import initConfigFlags flags = initConfigFlags() + # Required for MT using --threads argument + flags.fillFromArgs(parser=flags.getArgumentParser()) flags.Input.Files = ["/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecExRecoTest/mc21_13p6TeV/AODFiles/mc21_13p6TeV.421450.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep_fct.merge.AOD.e8445_e8447_s3822_r13565_r13491/AOD.28775909._000037.pool.root.1"] # We have to set the production step, which PFFlow muon linking uses for autoconfiguration. diff --git a/Reconstruction/RecExample/RecExRecoTest/python/METReco_ESDMC21.py b/Reconstruction/RecExample/RecExRecoTest/python/METReco_ESDMC21.py index d69f95010e05dddf23aee91df1d261b8d1128f70..ba6d83c0219526f50f459bc461d244882de33288 100644 --- a/Reconstruction/RecExample/RecExRecoTest/python/METReco_ESDMC21.py +++ b/Reconstruction/RecExample/RecExRecoTest/python/METReco_ESDMC21.py @@ -3,6 +3,8 @@ if __name__=="__main__": from AthenaConfiguration.AllConfigFlags import initConfigFlags flags = initConfigFlags() + # Required for MT using --threads argument + flags.fillFromArgs(parser=flags.getArgumentParser()) flags.Input.Files = ["/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecExRecoTest/mc21_13p6TeV/ESDFiles/mc21_13p6TeV.421450.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep_fct.recon.ESD.e8445_e8447_s3822_r13565/ESD.28877240._000046.pool.root.1"] # Use latest MC21 tag to pick up latest muon folders apparently needed diff --git a/Reconstruction/RecExample/RecExRecoTest/python/MuonReco_RAW_data22_13p6TeV.py b/Reconstruction/RecExample/RecExRecoTest/python/MuonReco_RAW_data22_13p6TeV.py index 92ac9f5fd99675db9b3f5456d3a8b699d67fd4a3..b62fa4860410a399a3c56735feb7c4e9e2e9534c 100644 --- a/Reconstruction/RecExample/RecExRecoTest/python/MuonReco_RAW_data22_13p6TeV.py +++ b/Reconstruction/RecExample/RecExRecoTest/python/MuonReco_RAW_data22_13p6TeV.py @@ -3,6 +3,8 @@ if __name__=="__main__": from AthenaConfiguration.AllConfigFlags import initConfigFlags flags = initConfigFlags() + # Required for MT using --threads argument + flags.fillFromArgs(parser=flags.getArgumentParser()) from RecExRecoTest.RecExReco_setupData22 import RecExReco_setupData22 RecExReco_setupData22(flags) diff --git a/Reconstruction/RecExample/RecExRecoTest/python/TauReco_RAW_data22_13p6TeV.py b/Reconstruction/RecExample/RecExRecoTest/python/TauReco_RAW_data22_13p6TeV.py index 03a2f1f200ec6a95e7c65722c63d2fd9122f66fa..fe80d1ce6401c7e1432324afd2252510ef30d951 100644 --- a/Reconstruction/RecExample/RecExRecoTest/python/TauReco_RAW_data22_13p6TeV.py +++ b/Reconstruction/RecExample/RecExRecoTest/python/TauReco_RAW_data22_13p6TeV.py @@ -3,6 +3,8 @@ if __name__=="__main__": from AthenaConfiguration.AllConfigFlags import initConfigFlags flags = initConfigFlags() + # Required for MT using --threads argument + flags.fillFromArgs(parser=flags.getArgumentParser()) from RecExRecoTest.RecExReco_setupData22 import RecExReco_setupData22 RecExReco_setupData22(flags) diff --git a/Reconstruction/RecExample/RecExRecoTest/python/TrackingReco_ESDMC21.py b/Reconstruction/RecExample/RecExRecoTest/python/TrackingReco_ESDMC21.py index 4e0947040426610d4aa064ea04f49b8cb3813ddf..22d6a0e49af525790f3c2cfe8f318df1a18b5152 100644 --- a/Reconstruction/RecExample/RecExRecoTest/python/TrackingReco_ESDMC21.py +++ b/Reconstruction/RecExample/RecExRecoTest/python/TrackingReco_ESDMC21.py @@ -3,6 +3,8 @@ if __name__=="__main__": from AthenaConfiguration.AllConfigFlags import initConfigFlags flags = initConfigFlags() + # Required for MT using --threads argument + flags.fillFromArgs(parser=flags.getArgumentParser()) flags.Input.Files = ["/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecExRecoTest/mc21_13p6TeV/ESDFiles/mc21_13p6TeV.421450.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep_fct.recon.ESD.e8445_e8447_s3822_r13565/ESD.28877240._000046.pool.root.1"] # Use latest MC21 tag to pick up latest muon folders apparently needed diff --git a/Reconstruction/RecExample/RecExRecoTest/python/TrackingReco_RAW_data22_13p6TeV.py b/Reconstruction/RecExample/RecExRecoTest/python/TrackingReco_RAW_data22_13p6TeV.py index 197561e12a68200bd77abdc3c96dfe33d6196db1..3a911d62108248e5c9c5ee21d170395fbc99839d 100644 --- a/Reconstruction/RecExample/RecExRecoTest/python/TrackingReco_RAW_data22_13p6TeV.py +++ b/Reconstruction/RecExample/RecExRecoTest/python/TrackingReco_RAW_data22_13p6TeV.py @@ -3,6 +3,8 @@ if __name__=="__main__": from AthenaConfiguration.AllConfigFlags import initConfigFlags flags = initConfigFlags() + # Required for MT using --threads argument + flags.fillFromArgs(parser=flags.getArgumentParser()) from RecExRecoTest.RecExReco_setupData22 import RecExReco_setupData22 RecExReco_setupData22(flags) diff --git a/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_BTagging_fromESDMC21.sh b/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_BTagging_fromESDMC21.sh index 52c8a115f04a45df0f6729145e7be881ba3bbfeb..b2d5881a967d12a10ac157de98ef96feee9b4c2b 100755 --- a/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_BTagging_fromESDMC21.sh +++ b/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_BTagging_fromESDMC21.sh @@ -1,12 +1,12 @@ #!/bin/sh # -# art-description: Athena (serial mode only) runs flavor taggingreconstruction, using the new Run 3 job configuration, from an ESD file +# art-description: Athena runs flavor tagging reconstruction from an ESD file # art-type: grid # art-athena-mt: 8 # art-include: main/Athena -# art-include: 23.0/Athena +# art-include: 24.0/Athena # art-output: *.log -python -m BTagging.BTagESD | tee temp.log + +python -m BTagging.BTagESD --nThreads=8 | tee temp.log echo "art-result: ${PIPESTATUS[0]}" test_postProcessing_Errors.sh temp.log - diff --git a/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_CaloTopoCluster_fromESDMC21.sh b/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_CaloTopoCluster_fromESDMC21.sh index 69372f97291e3a84824b0c3f13cdbb2ce4c7ddca..2b90dd6dae6b668ea86c2e1f7ae98a681c82da2b 100755 --- a/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_CaloTopoCluster_fromESDMC21.sh +++ b/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_CaloTopoCluster_fromESDMC21.sh @@ -1,13 +1,12 @@ #!/bin/sh # -# art-description: Athena runs calo reconstruction from a mc20e ESD file +# art-description: Athena runs calo reconstruction from a MC21 ESD file # art-type: grid # art-athena-mt: 8 # art-include: main/Athena -# art-include: 23.0/Athena +# art-include: 24.0/Athena # art-output: *.log -python -m RecExRecoTest.CaloTopoClusterReco_ESDMC21 | tee temp.log +python -m RecExRecoTest.CaloTopoClusterReco_ESDMC21 --threads=8 | tee temp.log echo "art-result: ${PIPESTATUS[0]}" test_postProcessing_Errors.sh temp.log - diff --git a/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_Calo_fromRawData22.sh b/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_Calo_fromRawData22.sh index a5521de63f32ccc821c472c77d324eb1d4ee8752..e9399d158d75f419c042602825f0c626cd40bc1e 100755 --- a/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_Calo_fromRawData22.sh +++ b/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_Calo_fromRawData22.sh @@ -4,10 +4,10 @@ # art-type: grid # art-athena-mt: 8 # art-include: main/Athena -# art-include: 23.0/Athena +# art-include: 24.0/Athena # art-output: *.log -python -m RecExRecoTest.CaloReco_RAW_data22_13p6TeV | tee temp.log +python -m RecExRecoTest.CaloReco_RAW_data22_13p6TeV --threads=8 | tee temp.log echo "art-result: ${PIPESTATUS[0]}" test_postProcessing_Errors.sh temp.log diff --git a/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_EGamma_fromRawData22.sh b/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_EGamma_fromRawData22.sh index 432d1a35fc51ee7d45c5159cd5f51e4f99b279c4..1291e7f30f622565a863098888644259d454b91b 100755 --- a/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_EGamma_fromRawData22.sh +++ b/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_EGamma_fromRawData22.sh @@ -1,13 +1,13 @@ #!/bin/sh # -# art-description: Athena runs egamma (+ calo + ID) reconstruction from a RAW data22 file +# art-description: Athena runs egamma (+ calo + ID) reconstruction from a RAW data22 file # art-type: grid # art-athena-mt: 8 # art-include: main/Athena -# art-include: 23.0/Athena +# art-include: 24.0/Athena # art-output: *.log -python -m RecExRecoTest.EGammaReco_RAW_data22_13p6TeV | tee temp.log +python -m RecExRecoTest.EGammaReco_RAW_data22_13p6TeV --threads=8 | tee temp.log echo "art-result: ${PIPESTATUS[0]}" test_postProcessing_Errors.sh temp.log diff --git a/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_Jets_fromAODMC21.sh b/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_Jets_fromAODMC21.sh index fb8471995b674901ba9de59d84130116cb070a13..6313228713c550b460c64e576203c31a7aaed853 100755 --- a/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_Jets_fromAODMC21.sh +++ b/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_Jets_fromAODMC21.sh @@ -1,13 +1,13 @@ #!/bin/sh # -# art-description: Athena runs jet reconstruction, using the new job configuration for Run 3, from an ESD file +# art-description: Athena runs jet reconstruction from an ESD file # art-type: grid # art-athena-mt: 8 # art-include: main/Athena -# art-include: 23.0/Athena +# art-include: 24.0/Athena # art-output: *.log -python -m RecExRecoTest.Jets_AODMC21 | tee temp.log +python -m RecExRecoTest.Jets_AODMC21 --threads=8 | tee temp.log echo "art-result: ${PIPESTATUS[0]}" test_postProcessing_Errors.sh temp.log diff --git a/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_MET_fromESDMC21.sh b/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_MET_fromESDMC21.sh index ac8861888c4a803a7742ebe583325bd4e1a63029..ad41af0c874cd8fcb174856aabf71f4a38fb6f40 100755 --- a/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_MET_fromESDMC21.sh +++ b/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_MET_fromESDMC21.sh @@ -1,12 +1,12 @@ #!/bin/sh # -# art-description: Athena runs MET reconstruction from an ESD file using CA +# art-description: Athena runs MET reconstruction from an ESD # art-type: grid -# art-include: main/Athena -# art-include: 23.0/Athena # art-athena-mt: 8 +# art-include: main/Athena +# art-include: 24.0/Athena # art-output: *.log -python -m RecExRecoTest.METReco_ESDMC21 | tee temp.log +python -m RecExRecoTest.METReco_ESDMC21 --threads=8 | tee temp.log echo "art-result: ${PIPESTATUS[0]}" test_postProcessing_Errors.sh temp.log diff --git a/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_Muon_fromRawData22.sh b/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_Muon_fromRawData22.sh index e7034e32ca32abc60b11973ff6bd92342acf16c6..b9ce70815d4380a8ecb206640c44f7d4fc34101f 100755 --- a/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_Muon_fromRawData22.sh +++ b/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_Muon_fromRawData22.sh @@ -1,13 +1,13 @@ #!/bin/sh # -# art-description: Athena runs muon reconstruction from a RAW data18 file +# art-description: Athena runs muon reconstruction from a RAW data22 file # art-type: grid # art-athena-mt: 8 # art-include: main/Athena -# art-include: 23.0/Athena +# art-include: 24.0/Athena # art-output: *.log -python -m RecExRecoTest.MuonReco_RAW_data22_13p6TeV | tee temp.log +python -m RecExRecoTest.MuonReco_RAW_data22_13p6TeV --threads=8 | tee temp.log echo "art-result: ${PIPESTATUS[0]}" test_postProcessing_Errors.sh temp.log diff --git a/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_PFlow_fromESDMC21.sh b/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_PFlow_fromESDMC21.sh index 32523817eeb58f0cc3c40ec5540dd2cbe2bc918f..3404b02397046746b74f55f2d29cb96101bb6b82 100755 --- a/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_PFlow_fromESDMC21.sh +++ b/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_PFlow_fromESDMC21.sh @@ -1,13 +1,13 @@ #!/bin/sh # -# art-description: Athena (serial mode only) runs particle flow reconstruction, using the new Run 3 job configuration, from an ESD file +# art-description: Athena runs particle flow reconstruction from an ESD file # art-type: grid # art-athena-mt: 8 # art-include: main/Athena -# art-include: 23.0/Athena +# art-include: 24.0/Athena # art-output: *.log -python -m eflowRec.PFRun3Config | tee temp.log +python -m eflowRec.PFRun3Config --threads=8 | tee temp.log echo "art-result: ${PIPESTATUS[0]}" test_postProcessing_Errors.sh temp.log diff --git a/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_Tau_fromRawData22.sh b/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_Tau_fromRawData22.sh index 891927165b2f625735073483808bed6de196b8c9..0b271fb9e1074642430c3cc1e3282fbf2b030af5 100755 --- a/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_Tau_fromRawData22.sh +++ b/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_Tau_fromRawData22.sh @@ -4,10 +4,10 @@ # art-type: grid # art-athena-mt: 8 # art-include: main/Athena -# art-include: 23.0/Athena +# art-include: 24.0/Athena # art-output: *.log -python -m RecExRecoTest.TauReco_RAW_data22_13p6TeV | tee temp.log +python -m RecExRecoTest.TauReco_RAW_data22_13p6TeV --threads=8 | tee temp.log echo "art-result: ${PIPESTATUS[0]}" test_postProcessing_Errors.sh temp.log diff --git a/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_Taus_fromESDMC21.sh b/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_Taus_fromESDMC21.sh index 6079d41fec9d18eb9a1dbb8c878d9436a3a7d2f8..502160939e2894553da9bcb6a6f2ebf907796233 100755 --- a/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_Taus_fromESDMC21.sh +++ b/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_Taus_fromESDMC21.sh @@ -1,13 +1,13 @@ #!/bin/sh # -# art-description: Athena runs tau reconstruction, using the new job configuration for Run 3, from an ESD file +# art-description: Athena runs tau reconstruction from an ESD file # art-type: grid # art-athena-mt: 8 # art-include: main/Athena -# art-include: 23.0/Athena +# art-include: 24.0/Athena # art-output: *.log -python -m tauRec.TauConfig | tee temp.log +python -m tauRec.TauConfig --threads=8 | tee temp.log echo "art-result: ${PIPESTATUS[0]}" test_postProcessing_Errors.sh temp.log diff --git a/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_Tracking_fromESDMC21.sh b/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_Tracking_fromESDMC21.sh index 8445e6b0efa669965c71e365a7a7118dd03e46bd..d8634cb14f889e93060ce22e56fb65bf5e93a85d 100755 --- a/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_Tracking_fromESDMC21.sh +++ b/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_Tracking_fromESDMC21.sh @@ -1,13 +1,13 @@ #!/bin/sh # -# art-description: Athena runs combined muon reconstruction, using the new job configuration for Run 3, from an ESD file +# art-description: Athena runs combined muon reconstruction from an ESD file # art-type: grid # art-athena-mt: 8 # art-include: main/Athena -# art-include: 23.0/Athena +# art-include: 24.0/Athena # art-output: *.log -python -m RecExRecoTest.TrackingReco_ESDMC21 | tee temp.log +python -m RecExRecoTest.TrackingReco_ESDMC21 --threads=8 | tee temp.log echo "art-result: ${PIPESTATUS[0]}" test_postProcessing_Errors.sh temp.log diff --git a/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_Tracking_fromRawData22.sh b/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_Tracking_fromRawData22.sh index a7bc3ee7b2d1e6e1b9a1931ef6199a5c9a4f3acf..90ebfb2fda8962f65b7a9d0f08fac6b78a992d06 100755 --- a/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_Tracking_fromRawData22.sh +++ b/Reconstruction/RecExample/RecExRecoTest/test/test_RecExReco_Art_Tracking_fromRawData22.sh @@ -4,10 +4,10 @@ # art-type: grid # art-athena-mt: 8 # art-include: main/Athena -# art-include: 23.0/Athena +# art-include: 24.0/Athena # art-output: *.log -python -m RecExRecoTest.TrackingReco_RAW_data22_13p6TeV | tee temp.log +python -m RecExRecoTest.TrackingReco_RAW_data22_13p6TeV --threads=8 | tee temp.log echo "art-result: ${PIPESTATUS[0]}" test_postProcessing_Errors.sh temp.log diff --git a/Reconstruction/RecExample/RecExRecoTest/test/test_postProcessing_Errors.sh b/Reconstruction/RecExample/RecExRecoTest/test/test_postProcessing_Errors.sh index 8fe5083345a815610a593a11ce0b6fde97e38250..146a04fc9ca181a2079d3e2b8e2ebdcf2a4cd99a 100755 --- a/Reconstruction/RecExample/RecExRecoTest/test/test_postProcessing_Errors.sh +++ b/Reconstruction/RecExample/RecExRecoTest/test/test_postProcessing_Errors.sh @@ -4,7 +4,7 @@ grep -v IsActiveStatus $1 | grep -v "WILL SOON NOT WORK ANYMORE" >& stdout_clean export GREP_ERROR=0 #grep returns 1 if nothing is found, whilst ART assumes a non-zero code indicates a problem. So need -#to revers the error code if 0 is returned by grep (by default assume error code zero in initialization above) +#to reverse the error code if 0 is returned by grep (by default assume error code zero in initialization above) grep ERROR stdout_cleaned.txt if [ $? == 0 ]; then export GREP_ERROR=1 diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_data11_7tev.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_data11_7tev.sh index f3d0e5903e78c857abdaef2562942ff760f37370..d1f99c3dbb1a1081ed0ba4fafd9fbf60be2cba47 100755 --- a/Reconstruction/RecExample/RecJobTransformTests/test/test_data11_7tev.sh +++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_data11_7tev.sh @@ -1,10 +1,10 @@ #!/bin/sh # -# art-description: Reco_tf runs on 7TeV collision data with all streams 2011 +# art-description: Reco_tf runs on 2011 7 TeV collision data with all streams # art-athena-mt: 8 # art-type: grid # art-include: main/Athena -# art-include: 23.0/Athena +# art-include: 24.0/Athena export ATHENA_CORE_NUMBER=8 Reco_tf.py --CA --multithreaded --inputBSFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/high_mu-data11_7TeV.00179725.physics_JetTauEtmiss.merge.RAW._lb0021.data --maxEvents 300 --conditionsTag="COMCOND-BLKPA-RUN1-07" --geometryVersion="ATLAS-R1-2011-02-00-00" --outputESDFile myESD.pool.root --outputAODFile myAOD.pool.root --outputHISTFile myHist.root diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_data11_heavy_ion.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_data11_heavy_ion.sh index dfed57a8dfa48f46427d3f2be363108fd483c6a4..d8b0a216b388cd2d957f40d5b335032af24d1afb 100755 --- a/Reconstruction/RecExample/RecJobTransformTests/test/test_data11_heavy_ion.sh +++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_data11_heavy_ion.sh @@ -1,10 +1,10 @@ #!/bin/sh # -# art-description: heavy ion reconstruction test from Andrzej Olszewski and Iwona Grabowska-Bold +# art-description: Reco_tf runs on 2011 Heavy Ion data with HardProbes stream (contact Andrzej Olszewski and Iwona Grabowska-Bold) # art-athena-mt: 4 # art-type: grid # art-include: main/Athena -# art-include: 23.0/Athena +# art-include: 24.0/Athena export ATHENA_CORE_NUMBER=4 Reco_tf.py \ diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_data12_8tev.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_data12_8tev.sh index 9aae9c1156fbfe18cc18630e48846510ac65d7dd..d8c97c2646fb8c5f2d1537c6f0ab04d05d79d959 100755 --- a/Reconstruction/RecExample/RecJobTransformTests/test/test_data12_8tev.sh +++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_data12_8tev.sh @@ -1,10 +1,10 @@ #!/bin/sh # -# art-description: Reco_tf runs on 8TeV collision data with all streams 2012 +# art-description: Reco_tf runs on 2012 8 TeV collision data with all streams # art-athena-mt: 8 # art-type: grid # art-include: main/Athena -# art-include: 23.0/Athena +# art-include: 24.0/Athena export ATHENA_CORE_NUMBER=8 Reco_tf.py --CA --multithreaded --inputBSFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/data12_8TeV.00209109.physics_JetTauEtmiss.merge.RAW._lb0186._SFO-1._0001.1 --maxEvents 300 --conditionsTag="COMCOND-BLKPA-RUN1-07" --geometryVersion="ATLAS-R1-2012-03-02-00" --outputESDFile myESD.pool.root --outputAODFile myAOD.pool.root --outputHISTFile myHist.root diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_data15_13tev.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_data15_13tev.sh index 581091328eb8b4552fef8ec576cad97e3f30a981..c569a9482ddd3c87f70d5ba5270c47af83eb62ad 100755 --- a/Reconstruction/RecExample/RecJobTransformTests/test/test_data15_13tev.sh +++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_data15_13tev.sh @@ -1,16 +1,16 @@ #!/bin/sh # -# art-description: Reco_tf runs on 13TeV collision data with all streams 2015 +# art-description: Reco_tf runs on 2015 13 TeV collision data with all streams # art-athena-mt: 8 # art-type: grid # art-include: main/Athena -# art-include: 23.0/Athena +# art-include: 24.0/Athena -export ATHENA_CORE_NUMBER=8 -#This configuration is documented here: https://twiki.cern.ch/twiki/bin/view/Atlas/2021FullRun2Reprocessing#Configuration -#The below is the CA equivalent +#This configuration is documented here: https://twiki.cern.ch/twiki/bin/view/Atlas/2021FullRun2Reprocessing#Configuration #Note that in the CA there is no useMuForTRTErrorScaling flag - this correctly auto configures #Also note that it is believed the bunch structure value no longer needs to be changed to avoid crashes and so is not included. + +export ATHENA_CORE_NUMBER=8 Reco_tf.py --CA --multithreaded --inputBSFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/data15_13TeV.00283429.physics_Main.daq.RAW._lb0154._SFO-1._0001.data --maxEvents 300 --autoConfiguration everything --conditionsTag="CONDBR2-BLKPA-RUN2-11" --geometryVersion="ATLAS-R2-2016-01-00-01" --outputESDFile myESD.pool.root --outputAODFile myAOD.pool.root --outputHISTFile myHist.root RES=$? diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_data15_heavy_ion.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_data15_heavy_ion.sh index 2c6fa0ccc14b120bd1d2725d2d9252095ac79ab2..0d11335897775d76335e00cf7c3b40cc8c9209f6 100755 --- a/Reconstruction/RecExample/RecJobTransformTests/test/test_data15_heavy_ion.sh +++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_data15_heavy_ion.sh @@ -1,10 +1,10 @@ #!/bin/sh # -# art-description: heavy ion reconstruction test from Andrzej Olszewski and Iwona Grabowska-Bold +# art-description: Reco_tf runs on 2015 Heavy Ion data with MinBiasOverlay stream (contact Andrzej Olszewski and Iwona Grabowska-Bold) # art-athena-mt: 4 # art-type: grid # art-include: main/Athena -# art-include: 23.0/Athena +# art-include: 24.0/Athena export ATHENA_CORE_NUMBER=8 Reco_tf.py \ diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_data16_13tev.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_data16_13tev.sh index d51302e7276c68e76305a38834281be77b6a68ec..0dafba7607564f9aceeda9d7468070bf13c145b5 100755 --- a/Reconstruction/RecExample/RecJobTransformTests/test/test_data16_13tev.sh +++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_data16_13tev.sh @@ -1,10 +1,10 @@ #!/bin/sh # -# art-description: Reco_tf runs on 13TeV collision data with all streams 2016 +# art-description: Reco_tf runs on 2016 13 TeV collision data with all streams # art-athena-mt: 8 # art-type: grid # art-include: main/Athena -# art-include: 23.0/Athena +# art-include: 24.0/Athena export ATHENA_CORE_NUMBER=8 #The setup for run2 data is described in test_data15_13TeV.sh diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_data17_13tev.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_data17_13tev.sh index 7a06ae619e14bcaf8a95440ab9e1befe72fcc92d..03dea3c96000273b9315742e757361624ae648bb 100755 --- a/Reconstruction/RecExample/RecJobTransformTests/test/test_data17_13tev.sh +++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_data17_13tev.sh @@ -1,18 +1,15 @@ #!/bin/sh # -# art-description: Reco_tf runs on 13TeV collision data 2017, early data, A3 +# art-description: Reco_tf runs on 2017 13 TeV collision data with all streams # art-athena-mt: 8 # art-type: grid # art-include: main/Athena -# art-include: 23.0/Athena +# art-include: 24.0/Athena export ATHENA_CORE_NUMBER=8 -#The setup for run2 data is described in test_data15_13TeV.sh Reco_tf.py --CA --multithreaded --inputBSFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/data17_13TeV/data17_13TeV.00336782.physics_Main.daq.RAW._lb0875._SFO-3._0001.data --maxEvents 300 --conditionsTag="CONDBR2-BLKPA-RUN2-11" --geometryVersion="ATLAS-R2-2016-01-00-01" --preExec="flags.DQ.Steering.doHLTMon=False" --ignoreErrors 'False' --ignorePatterns 'LArRawDataReadingAlg.+ERROR.+Found.+unsupported.+Rod.+block.+type.+0|LArRawDataReadingAlg.+\|.+ERROR.+\|.|ERROR.+message.+limit.+LArRawDataReadingAlg.' --outputESDFile myESD.pool.root --outputAODFile myAOD.pool.root --outputHISTFile myHist.root -#Remember retval of transform as art result -RES=$? +RES=$? xAODDigest.py myAOD.pool.root digest.txt - echo "art-result: $RES Reco" diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_data18_13TeV.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_data18_13TeV.sh index 4ef403ff1725141d380ebecf6281425f3d921c1e..69ec9a6388a91682877b7f901a63b08a988b2e6b 100755 --- a/Reconstruction/RecExample/RecJobTransformTests/test/test_data18_13TeV.sh +++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_data18_13TeV.sh @@ -1,16 +1,14 @@ #!/bin/sh # -# art-description: Reco_tf runs on 13TeV collision data 2018 +# art-description: Reco_tf runs on 2018 13 TeV collision data with all streams # art-athena-mt: 8 # art-type: grid # art-include: main/Athena -# art-include: 23.0/Athena +# art-include: 24.0/Athena export ATHENA_CORE_NUMBER=8 -#The setup for run2 data is described in test_data15_13TeV.sh Reco_tf.py --CA --multithreaded --inputBSFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/data18_13TeV/data18_13TeV.00348885.physics_Main.daq.RAW._lb0827._SFO-8._0002.data --maxEvents 300 --conditionsTag="CONDBR2-BLKPA-RUN2-11" --geometryVersion="ATLAS-R2-2016-01-00-01" --preExec="flags.DQ.Steering.doHLTMon=False" --ignoreErrors 'False' --ignorePatterns 'LArRawDataReadingAlg.+ERROR.+Found.+unsupported.+Rod.+block.+type.+0|LArRawDataReadingAlg.+\|.+ERROR.+\|.|ERROR.+message.+limit.+LArRawDataReadingAlg.' --outputESDFile myESD.pool.root --outputAODFile myAOD.pool.root --outputHISTFile myHist.root -#Remember retval of transform as art result RES=$? echo "art-result: $RES Reco" diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_data18_heavy_ion_notrigger.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_data18_heavy_ion_notrigger.sh index 0a3f55a5ac8d209aa68ca7a4972dc707664fac9c..8ca65acb9d216ea3b807c6d5286e31cdaa8c83f0 100755 --- a/Reconstruction/RecExample/RecJobTransformTests/test/test_data18_heavy_ion_notrigger.sh +++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_data18_heavy_ion_notrigger.sh @@ -1,10 +1,10 @@ #!/bin/sh # -# art-description: heavy ion reconstruction test from Sebastian Tapia +# art-description: Reco_tf runs on 2018 Heavy Ion data with HardProbes stream (contact Sebastian Tapia) # art-athena-mt: 8 # art-type: grid # art-include: main/Athena -# art-include: 23.0/Athena +# art-include: 24.0/Athena export ATHENA_CORE_NUMBER=8 export TRF_ECHO=True; diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_data22AFP_13p6tev.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_data22AFP_13p6tev.sh index 0b4850da63c1ec4af197cbe6043cc5aa5470b506..176fd7160e52f27e3a35d3d6c35b7768467814df 100755 --- a/Reconstruction/RecExample/RecJobTransformTests/test/test_data22AFP_13p6tev.sh +++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_data22AFP_13p6tev.sh @@ -1,18 +1,17 @@ #!/bin/sh # -# art-description: Reco_tf runs on 13p6TeV collision data 2022, run 435229 has AFP detector included. Details at https://twiki.cern.ch/twiki/bin/view/AtlasProtected/SpecialRunsIn2022#done_47_SM_HI_combined_LHCf_ZDC +# art-description: Reco_tf runs on 2022 13.6TeV collision data, where Run 435229 includes AFP detector. Details at https://twiki.cern.ch/twiki/bin/view/AtlasProtected/SpecialRunsIn2022#done_47_SM_HI_combined_LHCf_ZDC # art-athena-mt: 8 # art-type: grid # art-include: main/Athena -# art-include: 23.0/Athena +# art-include: 24.0/Athena export ATHENA_CORE_NUMBER=8 -#The setup for 2022 data is described in test_data22_13p6TeV.sh +#Settings same as test_data22_13p6TeV.sh Reco_tf.py --CA --multithreaded --inputBSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/data22_13p6TeV/data22_13p6TeV.00435229.physics_Main.daq.RAW/data22_13p6TeV.00435229.physics_Main.daq.RAW._lb1526._SFO-12._0001.data --conditionsTag="CONDBR2-BLKPA-2022-09" --geometryVersion="ATLAS-R3S-2021-03-01-00" --outputESDFile myESD.pool.root --outputAODFile myAOD.pool.root --outputHISTFile myHist.root --maxEvents=10 + #Remember retval of transform as art result RES=$? - xAODDigest.py myAOD.pool.root digest.txt - echo "art-result: $RES Reco" diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_data22_13p6TeV.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_data22_13p6TeV.sh index c445f9408c88244ca6bb7b2593f677a9a177d500..618437783586d8f6b93f653be1436254581d2898 100755 --- a/Reconstruction/RecExample/RecJobTransformTests/test/test_data22_13p6TeV.sh +++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_data22_13p6TeV.sh @@ -1,15 +1,16 @@ #!/bin/sh # -# art-description: Reco_tf runs on 13.6TeV collision data 2022 +# art-description: Reco_tf runs on 2022 13.6 TeV collision data for all streams # art-athena-mt: 8 # art-type: grid # art-include: main/Athena -# art-include: 23.0/Athena +# art-include: 24.0/Athena -export ATHENA_CORE_NUMBER=8 #Based on https://twiki.cern.ch/twiki/bin/view/Atlas/Quick2022Run3Reprocessing #In CA all the monitoring flags are true by default, so don't set them. #Don't touch ZDC flag, which is off by default. + +export ATHENA_CORE_NUMBER=8 Reco_tf.py --CA --multithreaded --inputBSFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/data22_13p6TeV/data22_13p6TeV.00430536.physics_Main.daq.RAW/data22_13p6TeV.00430536.physics_Main.daq.RAW._lb1015._SFO-20._0001.data --maxEvents 300 --conditionsTag="CONDBR2-BLKPA-2022-09" --geometryVersion="ATLAS-R3S-2021-03-01-00" --outputESDFile myESD.pool.root --outputAODFile myAOD.pool.root --outputHISTFile myHist.root #Remember retval of transform as art result diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_data22_13p6TeV_FPE.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_data22_13p6TeV_FPE.sh index dc13436a9568a086647d965c7c81befedca9f227..9430fda83bde4a3a045e206227cbb18aed2a0591 100755 --- a/Reconstruction/RecExample/RecJobTransformTests/test/test_data22_13p6TeV_FPE.sh +++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_data22_13p6TeV_FPE.sh @@ -1,18 +1,16 @@ #!/bin/sh # -# art-description: Reco_tf runs on 13.6TeV collision data 2022 with FPE crashes enabled. +# art-description: Reco_tf runs on 2022 13.6 TeV collision data with FPE crashes enabled. # art-athena-mt: 8 # art-type: grid # art-include: main/Athena -# art-include: 23.0/Athena +# art-include: 24.0/Athena export ATHENA_CORE_NUMBER=8 -#Based on https://twiki.cern.ch/twiki/bin/view/Atlas/Quick2022Run3Reprocessing -#In CA all the monitoring flags are true by default, so don't set them. -#Don't touch ZDC flag, which is off by default. + +#Settings same as test_data22_13p6TeV.sh Reco_tf.py --CA --multithreaded --inputBSFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/data22_13p6TeV/data22_13p6TeV.00430536.physics_Main.daq.RAW/data22_13p6TeV.00430536.physics_Main.daq.RAW._lb1015._SFO-20._0001.data --maxEvents 300 --conditionsTag="CONDBR2-BLKPA-2022-09" --geometryVersion="ATLAS-R3S-2021-03-01-00" --preExec="flags.Exec.FPE=-1" --outputESDFile myESD.pool.root --outputAODFile myAOD.pool.root --outputHISTFile myHist.root -#Remember retval of transform as art result RES=$? echo "art-result: $RES Reco" diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_data22_13p6TeV_serial.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_data22_13p6TeV_serial.sh index 85803c30946a345f83ced0205661d24adb7b46b4..bfeea3a83986d253535bb791a6a1d0d11ae5718f 100755 --- a/Reconstruction/RecExample/RecJobTransformTests/test/test_data22_13p6TeV_serial.sh +++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_data22_13p6TeV_serial.sh @@ -1,12 +1,12 @@ #!/bin/sh # -# art-description: Reco_tf runs on 13.6TeV collision data 2022 in serial mode +# art-description: Reco_tf runs on 2022 13.6 TeV collision data in serial mode # art-type: grid # art-include: main/Athena -# art-include: 23.0/Athena +# art-include: 24.0/Athena # art-memory: 6500 -#Settings discused in main data22 test script. +#Settings same as test_data22_13p6TeV.sh Reco_tf.py --CA --inputBSFile /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/data22_13p6TeV/data22_13p6TeV.00430536.physics_Main.daq.RAW/data22_13p6TeV.00430536.physics_Main.daq.RAW._lb1015._SFO-20._0001.data --maxEvents 300 --conditionsTag="CONDBR2-BLKPA-2022-09" --geometryVersion="ATLAS-R3S-2021-03-01-00" --outputESDFile myESD.pool.root --outputAODFile myAOD.pool.root --outputHISTFile myHist.root #Remember retval of transform as art result diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_data22_900GV_splash.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_data22_900GV_splash.sh index 351833b11c2bc4d0dad255cd061875adeeb447d4..004d6e74a0a006eb92c9fcd0ef1f497a7451bc3f 100755 --- a/Reconstruction/RecExample/RecJobTransformTests/test/test_data22_900GV_splash.sh +++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_data22_900GV_splash.sh @@ -1,10 +1,10 @@ #!/bin/sh # -# art-description: Reco_tf runs on splash events with all streams +# art-description: Reco_tf runs on 2022 900 GeV splash events with all streams # art-athena-mt: 8 # art-type: grid # art-include: main/Athena -# art-include: 23.0/Athena +# art-include: 24.0/Athena export ATHENA_CORE_NUMBER=8 #Monitoring is disabled because it tries to use the trigger information, which is disabled. diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_data22_CosmicCalo.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_data22_CosmicCalo.sh index 819e4b47495e2f1fa2647bbe5e3d38276affa629..bdee65e0b0f6672d9b6d9031a8f8bb47da86e540 100755 --- a/Reconstruction/RecExample/RecJobTransformTests/test/test_data22_CosmicCalo.sh +++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_data22_CosmicCalo.sh @@ -1,13 +1,13 @@ #!/bin/sh # -# art-description: Reco_tf runs on 2022 CosmicCalo stream +# art-description: Reco_tf runs on 2022 data with CosmicCalo stream # art-athena-mt: 8 # art-type: grid # art-include: main/Athena -# art-include: 23.0/Athena +# art-include: 24.0/Athena export ATHENA_CORE_NUMBER=8 -#See data22_13p6TeV test for details of choices. +#Settings same as test_data22_13p6TeV.sh Reco_tf.py --CA --multithreaded --inputBSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/data22_calib/data22_calib.00412340.physics_CosmicCalo.merge.RAW/data22_calib.00412340.physics_CosmicCalo.merge.RAW._lb0016._SFO-16._0001.1 --maxEvents=300 --conditionsTag="CONDBR2-BLKPA-2022-09" --geometryVersion="ATLAS-R3S-2021-03-01-00" --outputESDFile=myESD.pool.root --outputAODFile=myAOD.pool.root RES=$? diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_data22_IDCosmic.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_data22_IDCosmic.sh index 7ba0372e29a9e132f2fdb46a31a8a656ffc152e1..e6ebd8934f48d2d8bdde0b63f2760146a57b6ebd 100755 --- a/Reconstruction/RecExample/RecJobTransformTests/test/test_data22_IDCosmic.sh +++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_data22_IDCosmic.sh @@ -1,13 +1,15 @@ #!/bin/sh # -# art-description: Reco_tf runs on 2020 IDCosmic stream, without trigger. +# art-description: Reco_tf runs on 2020 data with IDCosmic stream, without trigger. # art-athena-mt: 8 # art-type: grid # art-include: main/Athena -# art-include: 23.0/Athena +# art-include: 24.0/Athena export ATHENA_CORE_NUMBER=8 -#See data22_13p6TeV test for details of choices. + +#Settings same as test_data22_13p6TeV.sh Reco_tf.py --CA --multithreaded --inputBSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/data22_cos/data22_cos.00412343.physics_IDCosmic.merge.RAW/data22_cos.00412343.physics_IDCosmic.merge.RAW._lb0763._SFO-ALL._0001.1 --maxEvents=300 --conditionsTag="CONDBR2-BLKPA-2022-09" --geometryVersion="ATLAS-R3S-2021-03-01-00" --outputESDFile=myESD.pool.root --outputAODFile=myAOD.pool.root + RES=$? echo "art-result: $RES Reco" diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_data22_hi.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_data22_hi.sh index ef6cb405db62a23023f334697c5f1d1f2e85dd8c..dd87bb7dd5e5372c6037ecadba147f86fe3899e2 100755 --- a/Reconstruction/RecExample/RecJobTransformTests/test/test_data22_hi.sh +++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_data22_hi.sh @@ -1,10 +1,10 @@ #!/bin/sh # -# art-description: heavy ion reconstruction on data22 +# art-description: Reco_tf runs on 2022 Heavy Ion data with Minbias stream (HI mode) # art-athena-mt: 8 # art-type: grid # art-include: main/Athena -# art-include: 23.0/Athena +# art-include: 24.0/Athena export ATHENA_CORE_NUMBER=8 Reco_tf.py \ diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_data22_hip.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_data22_hip.sh index c1ef257a5b69758486e30780066bd921f7f37655..324a4d33144079caebcaf860c14b812a5e65c910 100755 --- a/Reconstruction/RecExample/RecJobTransformTests/test/test_data22_hip.sh +++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_data22_hip.sh @@ -1,10 +1,10 @@ #!/bin/sh # -# art-description: heavy ion reconstruction on data22 +# art-description: Reco_tf runs on 2022 Heavy Ion data with Minbias stream (HIP mode) # art-athena-mt: 8 # art-type: grid # art-include: main/Athena -# art-include: 23.0/Athena +# art-include: 24.0/Athena export ATHENA_CORE_NUMBER=8 Reco_tf.py \ diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_data22_upc.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_data22_upc.sh index ca99aafd03f4444b8b0f73d189a25908fb51e271..12ad10db193bfea15fe4d96e138802072df35f2c 100755 --- a/Reconstruction/RecExample/RecJobTransformTests/test/test_data22_upc.sh +++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_data22_upc.sh @@ -1,10 +1,10 @@ #!/bin/sh # -# art-description: heavy ion reconstruction on data22 +# art-description: Reco_tf runs on 2022 Heavy Ion data with Minbias stream (UPC mode) # art-athena-mt: 8 # art-type: grid # art-include: main/Athena -# art-include: 23.0/Athena +# art-include: 24.0/Athena export ATHENA_CORE_NUMBER=8 Reco_tf.py \ diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_mc18_heavy_ion_notrigger.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_mc18_heavy_ion_notrigger.sh index a59dd89fe2785ba14b5120392d9a4f523a417800..7f581c937aa11cbc4ed27a8cb197aba22d642148 100755 --- a/Reconstruction/RecExample/RecJobTransformTests/test/test_mc18_heavy_ion_notrigger.sh +++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_mc18_heavy_ion_notrigger.sh @@ -1,10 +1,10 @@ #!/bin/sh # -# art-description: heavy ion reconstruction test from Sebastian Tapia +# art-description: Reco_tf runs on 2022 Heavy Ion data with HITS input (HI mode) (contact Sebastian Tapia) # art-athena-mt: 8 # art-type: grid # art-include: main/Athena -# art-include: 23.0/Athena +# art-include: 24.0/Athena export ATHENA_CORE_NUMBER=8 Reco_tf.py \ diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_mc20e_AFP_nopileup_13TeV.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_mc20e_AFP_nopileup_13TeV.sh index b30109152e06cf5c3fcfbbd353a9caa76164fb24..5a5c1be1fe6686e98ba5a2d926250ee52054bf6c 100755 --- a/Reconstruction/RecExample/RecJobTransformTests/test/test_mc20e_AFP_nopileup_13TeV.sh +++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_mc20e_AFP_nopileup_13TeV.sh @@ -5,7 +5,7 @@ # art-type: grid # art-athena-mt: 8 # art-include: main/Athena -# art-include: 23.0/Athena +# art-include: 24.0/Athena export ATHENA_CORE_NUMBER=8 Reco_tf.py --CA 'all:True' 'RDOtoRDOTrigger:False' --multithreaded --inputHITSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/user.ladamczy/user.ladamczy.mc15_13TeV.860102.SuperChicPy8_gg_jj_CEP_70_new.evgen.HITS.e8419.v1_EXT0/user.ladamczy.28711500.EXT0._000009.HITS.pool.root --maxEvents=500 --conditionsTag="OFLCOND-MC16-SDR-RUN2-09" --geometryVersion="ATLAS-R2-2016-01-00-01" --preInclude 'HITtoRDO:Campaigns.MC20e' 'RDOtoRDOTrigger:Campaigns/MC20e.py' 'RAWtoALL:Campaigns.MC20e' --maxEvents=300 --outputRDOFile=myRDO.pool.root --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root --steering 'doRDO_TRIG' --triggerConfig 'RDOtoRDOTrigger=MCRECO:DBF:TRIGGERDBMC:2233,87,314' --asetup "RDOtoRDOTrigger:Athena,21.0,latest" diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_mc21_13p6TeV.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_mc21_13p6TeV.sh index 8b8b58124a77d3b1c86813b2e8519278efc18e61..b79b8c3ee15052215ce5fe4bd97378a261977892 100755 --- a/Reconstruction/RecExample/RecJobTransformTests/test/test_mc21_13p6TeV.sh +++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_mc21_13p6TeV.sh @@ -1,11 +1,11 @@ #!/bin/sh # -# art-description: Run reco using mc21 (overlay+trigger+rco) +# art-description: Reco_tf runs on MC21a 13.6 TeV ttbar with HITS input (overlay+trigger+reco) # art-output: log.* # art-athena-mt: 8 # art-type: grid # art-include: main/Athena -# art-include: 23.0/Athena +# art-include: 24.0/Athena export ATHENA_CORE_NUMBER=8 Reco_tf.py --CA --multithreaded --outputRDOFile=myRDO.pool.root --outputAODFile=myAOD.pool.root --outputESDFile=myESD.pool.root --inputHITSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/RecJobTransformTests/mc21_13p6TeV/HITSFiles/mc21_13p6TeV.601229.PhPy8EG_A14_ttbar_hdamp258p75_SingleLep.simul.HITS.e8453_s3873/HITS.29625927._000632.pool.root.1 --inputRDO_BKGFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/OverlayTests/PresampledPileUp/22.0/Run3/v4/mc21a_presampling.VarBS.RDO.pool.root --maxEvents=300 --conditionsTag="OFLCOND-MC21-SDR-RUN3-07" --geometryVersion="ATLAS-R3S-2021-03-00-00" --preInclude 'Campaigns.MC21a' diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_mc21_13p6TeV_hi_withtrigger.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_mc21_13p6TeV_hi_withtrigger.sh index 906ffe176eab32f2f716dbc92af678352d78ebf4..bcc4090fdf8176cce4ff5d2bfcfdf96d4bb4e8ca 100755 --- a/Reconstruction/RecExample/RecJobTransformTests/test/test_mc21_13p6TeV_hi_withtrigger.sh +++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_mc21_13p6TeV_hi_withtrigger.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# art-description: heavy ion reconstruction on mc21 using ttbar +# art-description: Reco_tf runs on MC21 13.6 TeV Heavy Ion using ttbar with HITS input (HI mode) # art-athena-mt: 8 # art-type: grid # art-include: main/Athena diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_recexreco_art_data22_13p6TeV_compare1Vs8Threads.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_recexreco_art_data22_13p6TeV_compare1Vs8Threads.sh index 0dba7b9339bf5c96167d879ceeba34dc18459e0b..22f4b8732ea94bba776255e8f1916b6d5ee6e84f 100755 --- a/Reconstruction/RecExample/RecJobTransformTests/test/test_recexreco_art_data22_13p6TeV_compare1Vs8Threads.sh +++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_recexreco_art_data22_13p6TeV_compare1Vs8Threads.sh @@ -1,9 +1,9 @@ #!/bin/sh # -# art-description: Athena runs data22 with 1 and 8 threads twice, and then does diff-root. +# art-description: Reco_tf.py runs short test (25 events) on 2022 13.6 TeV data twice, with 1 and 8 threads, and then does diff-root. # art-type: grid # art-include: main/Athena -# art-include: 23.0/Athena +# art-include: 24.0/Athena # art-athena-mt: 8 # art-output: runOne # art-output: runTwo diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_recexreco_art_data22_13p6TeV_compare1Vs8Threads_Long.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_recexreco_art_data22_13p6TeV_compare1Vs8Threads_Long.sh index fe43be94f401de443e9e56de110df76dea390b69..0b3568f7d1f720772fd06b42d12926de88656227 100755 --- a/Reconstruction/RecExample/RecJobTransformTests/test/test_recexreco_art_data22_13p6TeV_compare1Vs8Threads_Long.sh +++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_recexreco_art_data22_13p6TeV_compare1Vs8Threads_Long.sh @@ -1,9 +1,9 @@ #!/bin/sh # -# art-description: Athena runs data22 with 1 and 8 threads twice, and then does diff-root. +# art-description: Reco_tf.py runs long test (1000 events) on 2022 13.6 TeV data twice, with 1 and 8 threads, and then does diff-root. # art-type: grid # art-include: main/Athena -# art-include: 23.0/Athena +# art-include: 24.0/Athena # art-athena-mt: 8 # art-output: runOne # art-output: runTwo diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_recexreco_art_data22_13p6TeV_compareMultipleThreads.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_recexreco_art_data22_13p6TeV_compareMultipleThreads.sh index aa42582314160ba22eeeca03b15256c398774b2b..4923c2775f96e510f9e37b251d1e062fb401612a 100755 --- a/Reconstruction/RecExample/RecJobTransformTests/test/test_recexreco_art_data22_13p6TeV_compareMultipleThreads.sh +++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_recexreco_art_data22_13p6TeV_compareMultipleThreads.sh @@ -1,9 +1,9 @@ #!/bin/sh # -# art-description: Athena runs data22 with 8 threads twice, and then does diff-root. +# art-description: Reco_tf.py runs short test (25 events) on 2022 13.6 TeV data twice, both times with 8 threads, and then does diff-root. # art-type: grid # art-include: main/Athena -# art-include: 23.0/Athena +# art-include: 24.0/Athena # art-athena-mt: 8 # art-output: runOne # art-output: runTwo diff --git a/Reconstruction/RecExample/RecJobTransformTests/test/test_recexreco_art_data22_13p6TeV_compareMultipleThreads_Long.sh b/Reconstruction/RecExample/RecJobTransformTests/test/test_recexreco_art_data22_13p6TeV_compareMultipleThreads_Long.sh index a1c8282f47c7d1094e78236ee00c7b185a0f1a43..75e21921bb3a1dc1339f266c7bb23916f5c6801c 100755 --- a/Reconstruction/RecExample/RecJobTransformTests/test/test_recexreco_art_data22_13p6TeV_compareMultipleThreads_Long.sh +++ b/Reconstruction/RecExample/RecJobTransformTests/test/test_recexreco_art_data22_13p6TeV_compareMultipleThreads_Long.sh @@ -1,9 +1,9 @@ #!/bin/sh # -# art-description: Athena runs data22 with 8 threads twice, and then does diff-root. +# art-description: Reco_tf.py runs long test (1000 events) on 2022 13.6 TeV data twice, both times with 8 threads, and then does diff-root. # art-type: grid # art-include: main/Athena -# art-include: 23.0/Athena +# art-include: 24.0/Athena # art-athena-mt: 8 # art-output: runOne # art-output: runTwo