From 33b7ed8523746ab7fdcb1d564e24d235e8857735 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste De Vivie De Regie <devivie@lpsc.in2p3.fr> Date: Thu, 20 Mar 2025 15:37:41 +0000 Subject: [PATCH] Updates conditions tag Updates conditions tag --- Tools/Tier0ChainTests/test/test_bulkProcessing_calib.sh | 3 ++- Tools/Tier0ChainTests/test/test_bulkProcessing_cosmic.sh | 3 ++- Tools/Tier0ChainTests/test/test_bulkProcessing_data22.sh | 5 +++-- .../test/test_bulkProcessing_data22_900GeV.sh | 3 ++- Tools/Tier0ChainTests/test/test_bulkProcessing_data23.sh | 5 +++-- .../Tier0ChainTests/test/test_bulkProcessing_hi23_upc.sh | 3 ++- .../Tier0ChainTests/test/test_bulkProcessing_splashes.sh | 3 ++- Tools/Tier0ChainTests/test/test_drawProcessing_data23.sh | 9 +++++---- 8 files changed, 21 insertions(+), 13 deletions(-) diff --git a/Tools/Tier0ChainTests/test/test_bulkProcessing_calib.sh b/Tools/Tier0ChainTests/test/test_bulkProcessing_calib.sh index 0963d5e3e38..b7af0529bb4 100755 --- a/Tools/Tier0ChainTests/test/test_bulkProcessing_calib.sh +++ b/Tools/Tier0ChainTests/test/test_bulkProcessing_calib.sh @@ -10,6 +10,7 @@ # temporary preExec override due to ATLASRECTS-7502 # TODO update following ATLASRECTS-8054 +conditionsTag=$(python -c "from AthenaConfiguration.TestDefaults import defaultConditionsTags; print(defaultConditionsTags.RUN3_DATA22)") Reco_tf.py \ --AMI f1328 \ --preExec="flags.DQ.useTrigger=False; flags.DQ.triggerDataAvailable=False; flags.DQ.Steering.doHLTMon=False; flags.DQ.Steering.doTauMon=False;" \ @@ -17,7 +18,7 @@ Reco_tf.py \ --outputAODFile="AOD.pool.root" \ --outputESDFile="ESD.pool.root" \ --outputHISTFile="HIST.root" \ ---conditionsTag="CONDBR2-BLKPA-2022-15" \ +--conditionsTag=$conditionsTag \ --imf False rc1=$? diff --git a/Tools/Tier0ChainTests/test/test_bulkProcessing_cosmic.sh b/Tools/Tier0ChainTests/test/test_bulkProcessing_cosmic.sh index b02ca36ee66..6cfe7adf353 100755 --- a/Tools/Tier0ChainTests/test/test_bulkProcessing_cosmic.sh +++ b/Tools/Tier0ChainTests/test/test_bulkProcessing_cosmic.sh @@ -10,6 +10,7 @@ # temporary preExec override due to ATLASRECTS-7502 # TODO update following ATLASRECTS-8054 +conditionsTag=$(python -c "from AthenaConfiguration.TestDefaults import defaultConditionsTags; print(defaultConditionsTags.RUN3_DATA22)") Reco_tf.py \ --AMI f1328 \ --preExec="flags.DQ.Steering.doTauMon=False;" \ @@ -17,7 +18,7 @@ Reco_tf.py \ --outputAODFile="AOD.pool.root" \ --outputESDFile="ESD.pool.root" \ --outputHISTFile="HIST.root" \ ---conditionsTag="CONDBR2-BLKPA-2022-15" \ +--conditionsTag=$conditionsTag \ --imf False rc1=$? diff --git a/Tools/Tier0ChainTests/test/test_bulkProcessing_data22.sh b/Tools/Tier0ChainTests/test/test_bulkProcessing_data22.sh index 7344e2bbc1a..c1892240db3 100755 --- a/Tools/Tier0ChainTests/test/test_bulkProcessing_data22.sh +++ b/Tools/Tier0ChainTests/test/test_bulkProcessing_data22.sh @@ -9,7 +9,8 @@ # TODO update following ATLASRECTS-8054 -Reco_tf.py --CA \ +conditionsTag=$(python -c "from AthenaConfiguration.TestDefaults import defaultConditionsTags; print(defaultConditionsTags.RUN3_DATA22)") +Reco_tf.py \ --AMI f1328 \ --inputBSFile="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/TCT_Run3/data22_13p6TeV.00437548.physics_Main.daq.RAW._lb1044._SFO-15._0002.data" \ --maxEvents=700 \ @@ -24,7 +25,7 @@ Reco_tf.py --CA \ --outputDAOD_L1CALO1File="myDAOD_L1CALO1.pool.root" \ --outputDESDM_PHOJETFile="myDESDM_PHOJET.pool.root" \ --outputDRAW_TAULHFile="myDRAW_TAULH.data" \ ---conditionsTag="CONDBR2-BLKPA-2022-15" \ +--conditionsTag=$conditionsTag \ --imf False rc1=$? diff --git a/Tools/Tier0ChainTests/test/test_bulkProcessing_data22_900GeV.sh b/Tools/Tier0ChainTests/test/test_bulkProcessing_data22_900GeV.sh index 6526d542ac5..e87609f4c66 100755 --- a/Tools/Tier0ChainTests/test/test_bulkProcessing_data22_900GeV.sh +++ b/Tools/Tier0ChainTests/test/test_bulkProcessing_data22_900GeV.sh @@ -9,13 +9,14 @@ # TODO update following ATLASRECTS-8054 +conditionsTag=$(python -c "from AthenaConfiguration.TestDefaults import defaultConditionsTags; print(defaultConditionsTags.RUN3_DATA22)") Reco_tf.py \ --AMI f1328 \ --inputBSFile="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/TCT_Run3/data22_900GeV.00424070.express_express.merge.RAW._lb0100._SFO-ALL._0001.1" \ --outputAODFile="AOD.pool.root" \ --outputESDFile="ESD.pool.root" \ --outputHISTFile="HIST.root" \ ---conditionsTag="CONDBR2-BLKPA-2022-15" \ +--conditionsTag=$conditionsTag \ --imf False rc1=$? diff --git a/Tools/Tier0ChainTests/test/test_bulkProcessing_data23.sh b/Tools/Tier0ChainTests/test/test_bulkProcessing_data23.sh index 19fc231eb98..53babbadbd5 100755 --- a/Tools/Tier0ChainTests/test/test_bulkProcessing_data23.sh +++ b/Tools/Tier0ChainTests/test/test_bulkProcessing_data23.sh @@ -9,7 +9,8 @@ # TODO update following ATLASRECTS-8054 -Reco_tf.py --CA \ +conditionsTag=$(python -c "from AthenaConfiguration.TestDefaults import defaultConditionsTags; print(defaultConditionsTags.RUN3_DATA23)") +Reco_tf.py \ --AMI f1350 \ --inputBSFile="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/CampaignInputs/data23/RAW/data23_13p6TeV.00452463.physics_Main.daq.RAW/540events.data23_13p6TeV.00452463.physics_Main.daq.RAW._lb0514._SFO-16._0004.data" \ --outputAODFile="AOD.pool.root" \ @@ -23,7 +24,7 @@ Reco_tf.py --CA \ --outputDAOD_L1CALO1File="myDAOD_L1CALO1.pool.root" \ --outputDESDM_PHOJETFile="myDESDM_PHOJET.pool.root" \ --outputDRAW_TAULHFile="myDRAW_TAULH.data" \ ---conditionsTag="CONDBR2-BLKPA-2023-05" \ +--conditionsTag=$conditionsTag \ --imf False rc1=$? diff --git a/Tools/Tier0ChainTests/test/test_bulkProcessing_hi23_upc.sh b/Tools/Tier0ChainTests/test/test_bulkProcessing_hi23_upc.sh index a390698c6d1..d902794b920 100755 --- a/Tools/Tier0ChainTests/test/test_bulkProcessing_hi23_upc.sh +++ b/Tools/Tier0ChainTests/test/test_bulkProcessing_hi23_upc.sh @@ -9,6 +9,7 @@ # TODO update following ATLASRECTS-8054 +conditionsTag=$(python -c "from AthenaConfiguration.TestDefaults import defaultConditionsTags; print(defaultConditionsTags.RUN3_DATA23)") Reco_tf.py \ --AMI f1406 \ --inputBSFile="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/TCT_Run3/data23_hi.00462107.physics_UPC.daq.RAW._lb0500._SFO-14._0002.data" \ @@ -16,7 +17,7 @@ Reco_tf.py \ --outputESDFile="ESD.pool.root" \ --outputHISTFile="HIST.root" \ --maxEvents=1500 \ ---conditionsTag="CONDBR2-BLKPA-2022-15" \ +--conditionsTag=$conditionsTag \ --imf False rc1=$? diff --git a/Tools/Tier0ChainTests/test/test_bulkProcessing_splashes.sh b/Tools/Tier0ChainTests/test/test_bulkProcessing_splashes.sh index 6694b6af050..2dea150b263 100755 --- a/Tools/Tier0ChainTests/test/test_bulkProcessing_splashes.sh +++ b/Tools/Tier0ChainTests/test/test_bulkProcessing_splashes.sh @@ -9,13 +9,14 @@ # TODO update following ATLASRECTS-8054 +conditionsTag=$(python -c "from AthenaConfiguration.TestDefaults import defaultConditionsTags; print(defaultConditionsTags.RUN3_DATA22)") Reco_tf.py \ --AMI f1328 \ --inputBSFile="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/TCT_Run3/data22_comm.00420624.express_express.merge.RAW._lb1054._SFO-ALL._0001.1" \ --outputAODFile="AOD.pool.root" \ --outputESDFile="ESD.pool.root" \ --outputHISTFile="HIST.root" \ ---conditionsTag="CONDBR2-BLKPA-2022-15" \ +--conditionsTag=$conditionsTag \ --imf False rc1=$? diff --git a/Tools/Tier0ChainTests/test/test_drawProcessing_data23.sh b/Tools/Tier0ChainTests/test/test_drawProcessing_data23.sh index ebb76d7ecff..11bc023953d 100755 --- a/Tools/Tier0ChainTests/test/test_drawProcessing_data23.sh +++ b/Tools/Tier0ChainTests/test/test_drawProcessing_data23.sh @@ -9,24 +9,25 @@ # TODO update following ATLASRECTS-8054 -Reco_tf.py --CA \ +conditionsTag=$(python -c "from AthenaConfiguration.TestDefaults import defaultConditionsTags; print(defaultConditionsTags.RUN3_DATA23)") +Reco_tf.py \ --AMI f1350 \ --inputBSFile="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/CampaignInputs/data23/DRAW_EGZ/data23_13p6TeV.00456714.physics_Main.merge.DRAW_EGZ.f1370_m2193/312events.data23_13p6TeV.00456714.physics_Main.merge.DRAW_EGZ.f1370_m2193._0602.1" \ --outputDESDM_ALLCELLSFile="myDESDM_EGZ.pool.root" \ --outputDAOD_L1CALO1File="myDAOD_L1CALO1EGZ.pool.root" \ --maxEvents 75 \ ---conditionsTag="CONDBR2-BLKPA-2022-15" \ +--conditionsTag=$conditionsTag \ --imf False rc1=$? echo "art-result: $rc1 Reco DRAW_EGZ" -Reco_tf.py --CA \ +Reco_tf.py \ --AMI f1350 \ --inputBSFile="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/CampaignInputs/data23/DRAW_ZMUMU/data23_13p6TeV.00456386.physics_Main.merge.DRAW_ZMUMU.f1369_m2193/540events.data23_13p6TeV.00456386.physics_Main.merge.DRAW_ZMUMU.f1369_m2193._0042.1" \ --outputAODFile="myDAOD_ZMUMU.pool.root" \ --outputDAOD_L1CALO1File="myDAOD_L1CALO1ZMM.pool.root" \ --maxEvents 75 \ ---conditionsTag="CONDBR2-BLKPA-2022-15" \ +--conditionsTag=$conditionsTag \ --imf False rc2=$? echo "art-result: $rc2 Reco DRAW_ZMUMU" -- GitLab