From 0250b236c167bbe4353a0d3a5bd7994dafd9b415 Mon Sep 17 00:00:00 2001
From: Thomas Strebler <thomas.strebler@cern.ch>
Date: Thu, 7 Nov 2024 13:38:40 +0100
Subject: [PATCH] Added new ASG Run 3 test files + rename AFII -> FastSim
Added new ASG Run 3 test files + rename AFII -> FastSim
---
AsgExternal/Asg_Test/CMakeLists.txt | 25 ++++++---
.../cmake/Asg_TestEnvironmentConfig.cmake.in | 9 +++-
...teMCAFII.txt => TestFileLiteMCFastSim.txt} | 0
.../Asg_Test/cmt/TestFileLiteR3Data.txt | 1 +
.../Asg_Test/cmt/TestFileLiteR3MCFastSim.txt | 1 +
...stFileMCAFII.txt => TestFileMCFastSim.txt} | 0
AsgExternal/Asg_Test/cmt/TestFileR3Data.txt | 1 +
.../Asg_Test/cmt/TestFileR3MCFastSim.txt | 1 +
.../AnalysisAlgorithmsConfig/CMakeLists.txt | 54 ++++++++++---------
.../data/example_config.yaml | 2 +
.../python/FullCPAlgorithmsTest.py | 6 +--
.../scripts/FullCPAlgorithmsTest_CA.py | 25 ++++++---
.../scripts/FullCPAlgorithmsTest_eljob.py | 25 ++++++---
13 files changed, 102 insertions(+), 48 deletions(-)
rename AsgExternal/Asg_Test/cmt/{TestFileLiteMCAFII.txt => TestFileLiteMCFastSim.txt} (100%)
create mode 100644 AsgExternal/Asg_Test/cmt/TestFileLiteR3Data.txt
create mode 100644 AsgExternal/Asg_Test/cmt/TestFileLiteR3MCFastSim.txt
rename AsgExternal/Asg_Test/cmt/{TestFileMCAFII.txt => TestFileMCFastSim.txt} (100%)
create mode 100644 AsgExternal/Asg_Test/cmt/TestFileR3Data.txt
create mode 100644 AsgExternal/Asg_Test/cmt/TestFileR3MCFastSim.txt
diff --git a/AsgExternal/Asg_Test/CMakeLists.txt b/AsgExternal/Asg_Test/CMakeLists.txt
index 740cf8c4783..a1af71cd3c5 100644
--- a/AsgExternal/Asg_Test/CMakeLists.txt
+++ b/AsgExternal/Asg_Test/CMakeLists.txt
@@ -14,9 +14,9 @@ string( STRIP "${ASG_TEST_FILE_DATA}" ASG_TEST_FILE_DATA )
file( READ ${CMAKE_CURRENT_SOURCE_DIR}/cmt/TestFileMC.txt
ASG_TEST_FILE_MC )
string( STRIP "${ASG_TEST_FILE_MC}" ASG_TEST_FILE_MC )
-file( READ ${CMAKE_CURRENT_SOURCE_DIR}/cmt/TestFileMCAFII.txt
- ASG_TEST_FILE_MC_AFII )
-string( STRIP "${ASG_TEST_FILE_MC_AFII}" ASG_TEST_FILE_MC_AFII )
+file( READ ${CMAKE_CURRENT_SOURCE_DIR}/cmt/TestFileMCFastSim.txt
+ ASG_TEST_FILE_MC_FASTSIM )
+string( STRIP "${ASG_TEST_FILE_MC_FASTSIM}" ASG_TEST_FILE_MC_FASTSIM )
file( READ ${CMAKE_CURRENT_SOURCE_DIR}/cmt/TestFileLiteData.txt
ASG_TEST_FILE_LITE_DATA )
@@ -24,18 +24,29 @@ string( STRIP "${ASG_TEST_FILE_LITE_DATA}" ASG_TEST_FILE_LITE_DATA )
file( READ ${CMAKE_CURRENT_SOURCE_DIR}/cmt/TestFileLiteMC.txt
ASG_TEST_FILE_LITE_MC )
string( STRIP "${ASG_TEST_FILE_LITE_MC}" ASG_TEST_FILE_LITE_MC )
-file( READ ${CMAKE_CURRENT_SOURCE_DIR}/cmt/TestFileLiteMCAFII.txt
- ASG_TEST_FILE_LITE_MC_AFII )
-string( STRIP "${ASG_TEST_FILE_LITE_MC_AFII}" ASG_TEST_FILE_LITE_MC_AFII )
+file( READ ${CMAKE_CURRENT_SOURCE_DIR}/cmt/TestFileLiteMCFastSim.txt
+ ASG_TEST_FILE_LITE_MC_FASTSIM )
+string( STRIP "${ASG_TEST_FILE_LITE_MC_FASTSIM}" ASG_TEST_FILE_LITE_MC_FASTSIM )
-# currently we only have full sim
+file( READ ${CMAKE_CURRENT_SOURCE_DIR}/cmt/TestFileR3Data.txt
+ ASG_TEST_FILE_RUN3_DATA )
+string( STRIP "${ASG_TEST_FILE_RUN3_DATA}" ASG_TEST_FILE_RUN3_DATA )
file( READ ${CMAKE_CURRENT_SOURCE_DIR}/cmt/TestFileR3MC.txt
ASG_TEST_FILE_RUN3_MC )
string( STRIP "${ASG_TEST_FILE_RUN3_MC}" ASG_TEST_FILE_RUN3_MC )
+ file( READ ${CMAKE_CURRENT_SOURCE_DIR}/cmt/TestFileR3MCFastSim.txt
+ ASG_TEST_FILE_RUN3_MC_FASTSIM )
+string( STRIP "${ASG_TEST_FILE_RUN3_MC_FASTSIM}" ASG_TEST_FILE_RUN3_MC_FASTSIM )
+file( READ ${CMAKE_CURRENT_SOURCE_DIR}/cmt/TestFileLiteR3Data.txt
+ ASG_TEST_FILE_LITE_RUN3_DATA )
+string( STRIP "${ASG_TEST_FILE_LITE_RUN3_DATA}" ASG_TEST_FILE_LITE_RUN3_DATA )
file( READ ${CMAKE_CURRENT_SOURCE_DIR}/cmt/TestFileLiteR3MC.txt
ASG_TEST_FILE_LITE_RUN3_MC )
string( STRIP "${ASG_TEST_FILE_LITE_RUN3_MC}" ASG_TEST_FILE_LITE_RUN3_MC )
+file( READ ${CMAKE_CURRENT_SOURCE_DIR}/cmt/TestFileLiteR3MCFastSim.txt
+ ASG_TEST_FILE_LITE_RUN3_MC_FASTSIM )
+string( STRIP "${ASG_TEST_FILE_LITE_RUN3_MC_FASTSIM}" ASG_TEST_FILE_LITE_RUN3_MC_FASTSIM )
set( ROOTCORE_TEST_FILE ${ASG_TEST_FILE_MC} )
diff --git a/AsgExternal/Asg_Test/cmake/Asg_TestEnvironmentConfig.cmake.in b/AsgExternal/Asg_Test/cmake/Asg_TestEnvironmentConfig.cmake.in
index b69b2523b16..81c6aafa4ce 100644
--- a/AsgExternal/Asg_Test/cmake/Asg_TestEnvironmentConfig.cmake.in
+++ b/AsgExternal/Asg_Test/cmake/Asg_TestEnvironmentConfig.cmake.in
@@ -8,11 +8,16 @@ set( ASG_TESTENVIRONMENT_ENVIRONMENT
FORCESET ROOTCORE_RELEASE_SERIES @ROOTCORE_RELEASE_SERIES@
FORCESET ASG_TEST_FILE_DATA @ASG_TEST_FILE_DATA@
FORCESET ASG_TEST_FILE_MC @ASG_TEST_FILE_MC@
- FORCESET ASG_TEST_FILE_MC_AFII @ASG_TEST_FILE_MC_AFII@
+ FORCESET ASG_TEST_FILE_MC_FASTSIM @ASG_TEST_FILE_MC_FASTSIM@
FORCESET ASG_TEST_FILE_LITE_DATA @ASG_TEST_FILE_LITE_DATA@
FORCESET ASG_TEST_FILE_LITE_MC @ASG_TEST_FILE_LITE_MC@
- FORCESET ASG_TEST_FILE_LITE_MC_AFII @ASG_TEST_FILE_LITE_MC_AFII@
+ FORCESET ASG_TEST_FILE_LITE_MC_FASTSIM @ASG_TEST_FILE_LITE_MC_FASTSIM@
+ FORCESET ASG_TEST_FILE_RUN3_DATA @ASG_TEST_FILE_RUN3_DATA@
FORCESET ASG_TEST_FILE_RUN3_MC @ASG_TEST_FILE_RUN3_MC@
+ FORCESET ASG_TEST_FILE_RUN3_MC_FASTSIM @ASG_TEST_FILE_RUN3_MC_FASTSIM@
+ FORCESET ASG_TEST_FILE_LITE_RUN3_DATA @ASG_TEST_FILE_LITE_RUN3_DATA@
+ FORCESET ASG_TEST_FILE_LITE_RUN3_MC @ASG_TEST_FILE_LITE_RUN3_MC@
+ FORCESET ASG_TEST_FILE_LITE_RUN3_MC_FASTSIM @ASG_TEST_FILE_LITE_RUN3_MC_FASTSIM@
FORCESET ROOTCORE_TEST_FILE @ROOTCORE_TEST_FILE@
FORCESET ROOTCORE_TEST_DATA @ROOTCORE_TEST_DATA@ )
diff --git a/AsgExternal/Asg_Test/cmt/TestFileLiteMCAFII.txt b/AsgExternal/Asg_Test/cmt/TestFileLiteMCFastSim.txt
similarity index 100%
rename from AsgExternal/Asg_Test/cmt/TestFileLiteMCAFII.txt
rename to AsgExternal/Asg_Test/cmt/TestFileLiteMCFastSim.txt
diff --git a/AsgExternal/Asg_Test/cmt/TestFileLiteR3Data.txt b/AsgExternal/Asg_Test/cmt/TestFileLiteR3Data.txt
new file mode 100644
index 00000000000..4fa92d03754
--- /dev/null
+++ b/AsgExternal/Asg_Test/cmt/TestFileLiteR3Data.txt
@@ -0,0 +1 @@
+/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ASG/DAOD_PHYSLITE/p6482/data23_13p6TeV.00456749.physics_Main.deriv.DAOD_PHYSLITE.r15774_p6304_p6482/DAOD_PHYSLITE.41588921._000002.pool.root.1
diff --git a/AsgExternal/Asg_Test/cmt/TestFileLiteR3MCFastSim.txt b/AsgExternal/Asg_Test/cmt/TestFileLiteR3MCFastSim.txt
new file mode 100644
index 00000000000..3572a43c21c
--- /dev/null
+++ b/AsgExternal/Asg_Test/cmt/TestFileLiteR3MCFastSim.txt
@@ -0,0 +1 @@
+/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ASG/DAOD_PHYSLITE/p6491/mc23_13p6TeV.522036.aMCPy8EG_NNPDF30NLO_A14N23LO_ttZqq_run3.deriv.DAOD_PHYSLITE.e8558_e8528_a911_s4114_r15224_r15225_p6491/DAOD_PHYSLITE.41633196._000004.pool.root.1
diff --git a/AsgExternal/Asg_Test/cmt/TestFileMCAFII.txt b/AsgExternal/Asg_Test/cmt/TestFileMCFastSim.txt
similarity index 100%
rename from AsgExternal/Asg_Test/cmt/TestFileMCAFII.txt
rename to AsgExternal/Asg_Test/cmt/TestFileMCFastSim.txt
diff --git a/AsgExternal/Asg_Test/cmt/TestFileR3Data.txt b/AsgExternal/Asg_Test/cmt/TestFileR3Data.txt
new file mode 100644
index 00000000000..143732069f8
--- /dev/null
+++ b/AsgExternal/Asg_Test/cmt/TestFileR3Data.txt
@@ -0,0 +1 @@
+/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ASG/DAOD_PHYS/p6482/data23_13p6TeV.00456749.physics_Main.deriv.DAOD_PHYS.r15774_p6304_p6482/DAOD_PHYS.41588921._000003.pool.root.1
diff --git a/AsgExternal/Asg_Test/cmt/TestFileR3MCFastSim.txt b/AsgExternal/Asg_Test/cmt/TestFileR3MCFastSim.txt
new file mode 100644
index 00000000000..ce5b220183c
--- /dev/null
+++ b/AsgExternal/Asg_Test/cmt/TestFileR3MCFastSim.txt
@@ -0,0 +1 @@
+/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ASG/DAOD_PHYS/p6491/mc23_13p6TeV.522036.aMCPy8EG_NNPDF30NLO_A14N23LO_ttZqq_run3.deriv.DAOD_PHYS.e8558_e8528_a911_s4114_r15224_r15225_p6491/DAOD_PHYS.41633196._000006.pool.root.1
diff --git a/PhysicsAnalysis/Algorithms/AnalysisAlgorithmsConfig/CMakeLists.txt b/PhysicsAnalysis/Algorithms/AnalysisAlgorithmsConfig/CMakeLists.txt
index 87595071a2a..8d4f8e69575 100644
--- a/PhysicsAnalysis/Algorithms/AnalysisAlgorithmsConfig/CMakeLists.txt
+++ b/PhysicsAnalysis/Algorithms/AnalysisAlgorithmsConfig/CMakeLists.txt
@@ -66,40 +66,46 @@ atlas_add_test( ConfigTextCompareBlock
POST_EXEC_SCRIPT nopost.sh
PROPERTIES TIMEOUT 30 )
-add_test_job( TestJobDataConfig data --for-compare --no-systematics )
-add_test_job( TestJobDataTextConfig data --for-compare --text-config ${CONFIG_PATH} --no-systematics )
-add_test_job( TestJobDataFull data --no-systematics )
-add_test_job( TestJobDataNominalOR data --no-systematics --only-nominal-or )
+add_test_job( TestJobDataConfig data --for-compare --no-systematics --run 2 )
+add_test_job( TestJobDataTextConfig data --for-compare --text-config ${CONFIG_PATH} --no-systematics --run 2 )
+add_test_job( TestJobDataFull data --no-systematics --run 2 )
+add_test_job( TestJobDataFullR3 data --no-systematics --run 3 )
+add_test_job( TestJobDataNominalOR data --no-systematics --only-nominal-or --run 2 )
add_test_compare( TestJobDataCompareConfig data TestJobDataConfig TestJobDataTextConfig )
-add_test_job( TestJobFullSimConfig fullsim --for-compare )
-add_test_job( TestJobFullSimTextConfig fullsim --for-compare --text-config ${CONFIG_PATH} )
-add_test_job( TestJobFullSimFull fullsim )
-add_test_job( TestJobFullSimNominalOR fullsim --only-nominal-or )
+add_test_job( TestJobFullSimConfig fullsim --for-compare --run 2 )
+add_test_job( TestJobFullSimTextConfig fullsim --for-compare --text-config ${CONFIG_PATH} --run 2 )
+add_test_job( TestJobFullSimFull fullsim --run 2 )
+add_test_job( TestJobFullSimFullR3 fullsim --run 3 )
+add_test_job( TestJobFullSimNominalOR fullsim --only-nominal-or --run 2 )
add_test_compare( TestJobFullSimCompareConfig fullsim TestJobFullSimConfig TestJobFullSimTextConfig )
-add_test_job( TestJobFastSimConfig fastsim --for-compare )
-add_test_job( TestJobFastSimTextConfig fastsim --for-compare --text-config ${CONFIG_PATH} )
-add_test_job( TestJobFastSimFull fastsim )
-add_test_job( TestJobFastSimNominalOR fastsim --only-nominal-or )
+add_test_job( TestJobFastSimConfig fastsim --for-compare --run 2 )
+add_test_job( TestJobFastSimTextConfig fastsim --for-compare --text-config ${CONFIG_PATH} --run 2 )
+add_test_job( TestJobFastSimFull fastsim --run 2 )
+add_test_job( TestJobFastSimFullR3 fastsim --run 3 )
+add_test_job( TestJobFastSimNominalOR fastsim --only-nominal-or --run 2 )
add_test_compare( TestJobFastSimCompareConfig fastsim TestJobFastSimConfig TestJobFastSimTextConfig )
-add_test_job( TestJobDataConfigLite data --for-compare --physlite --no-systematics )
-add_test_job( TestJobDataTextConfigLite data --for-compare --text-config ${CONFIG_PATH} --physlite --no-systematics )
-add_test_job( TestJobDataFullLite data --physlite --no-systematics )
-add_test_job( TestJobDataNominalORLite data --only-nominal-or --physlite )
+add_test_job( TestJobDataConfigLite data --for-compare --physlite --no-systematics --run 2 )
+add_test_job( TestJobDataTextConfigLite data --for-compare --text-config ${CONFIG_PATH} --physlite --no-systematics --run 2 )
+add_test_job( TestJobDataFullLite data --physlite --no-systematics --run 2 )
+add_test_job( TestJobDataFullLiteR3 data --physlite --no-systematics --run 3 )
+add_test_job( TestJobDataNominalORLite data --only-nominal-or --physlite --run 2 )
add_test_compare( TestJobDataCompareConfigLite data TestJobDataConfigLite TestJobDataTextConfigLite )
-add_test_job( TestJobFullSimConfigLite fullsim --for-compare --physlite )
-add_test_job( TestJobFullSimTextConfigLite fullsim --for-compare --text-config ${CONFIG_PATH} --physlite )
-add_test_job( TestJobFullSimFullLite fullsim --physlite )
-add_test_job( TestJobFullSimNominalORLite fullsim --only-nominal-or --physlite )
+add_test_job( TestJobFullSimConfigLite fullsim --for-compare --physlite --run 2 )
+add_test_job( TestJobFullSimTextConfigLite fullsim --for-compare --text-config ${CONFIG_PATH} --physlite --run 2 )
+add_test_job( TestJobFullSimFullLite fullsim --physlite --run 2 )
+add_test_job( TestJobFullSimFullLiteR3 fullsim --physlite --run 3 )
+add_test_job( TestJobFullSimNominalORLite fullsim --only-nominal-or --physlite --run 2 )
add_test_compare( TestJobFullSimCompareConfigLite fullsim TestJobFullSimConfigLite TestJobFullSimTextConfigLite )
-add_test_job( TestJobFastSimConfigLite fastsim --for-compare --physlite )
-add_test_job( TestJobFastSimTextConfigLite fastsim --for-compare --text-config ${CONFIG_PATH} --physlite )
-add_test_job( TestJobFastSimFullLite fastsim --physlite )
-add_test_job( TestJobFastSimNominalORLite fastsim --only-nominal-or --physlite )
+add_test_job( TestJobFastSimConfigLite fastsim --for-compare --physlite --run 2 )
+add_test_job( TestJobFastSimTextConfigLite fastsim --for-compare --text-config ${CONFIG_PATH} --physlite --run 2 )
+add_test_job( TestJobFastSimFullLite fastsim --physlite --run 2 )
+add_test_job( TestJobFastSimFullLiteR3 fastsim --physlite --run 3 )
+add_test_job( TestJobFastSimNominalORLite fastsim --only-nominal-or --physlite --run 2 )
add_test_compare( TestJobFastSimCompareConfigLite fastsim TestJobFastSimConfigLite TestJobFastSimTextConfigLite )
diff --git a/PhysicsAnalysis/Algorithms/AnalysisAlgorithmsConfig/data/example_config.yaml b/PhysicsAnalysis/Algorithms/AnalysisAlgorithmsConfig/data/example_config.yaml
index 16073394d4b..ec33a0870be 100644
--- a/PhysicsAnalysis/Algorithms/AnalysisAlgorithmsConfig/data/example_config.yaml
+++ b/PhysicsAnalysis/Algorithms/AnalysisAlgorithmsConfig/data/example_config.yaml
@@ -143,6 +143,8 @@ Trigger:
- 'HLT_2mu14'
'2022':
- 'HLT_e26_lhtight_ivarloose_L1EM22VHI || HLT_e60_lhmedium_L1EM22VHI || HLT_e140_lhloose_L1EM22VHI'
+ '2023':
+ - 'HLT_e26_lhtight_ivarloose_L1EM22VHI || HLT_e60_lhmedium_L1EM22VHI || HLT_e140_lhloose_L1EM22VHI'
noFilter: True
electronID: 'Tight'
electronIsol: 'Tight_VarRad'
diff --git a/PhysicsAnalysis/Algorithms/AnalysisAlgorithmsConfig/python/FullCPAlgorithmsTest.py b/PhysicsAnalysis/Algorithms/AnalysisAlgorithmsConfig/python/FullCPAlgorithmsTest.py
index 26a7053c639..c45f7d1524d 100644
--- a/PhysicsAnalysis/Algorithms/AnalysisAlgorithmsConfig/python/FullCPAlgorithmsTest.py
+++ b/PhysicsAnalysis/Algorithms/AnalysisAlgorithmsConfig/python/FullCPAlgorithmsTest.py
@@ -15,6 +15,7 @@ triggerChainsPerYear = {
'2017': ['HLT_e26_lhtight_nod0_ivarloose || HLT_e60_lhmedium_nod0 || HLT_e140_lhloose_nod0', 'HLT_2g22_tight_L12EM15VHI', 'HLT_mu50'],
'2018': ['HLT_e26_lhtight_nod0_ivarloose || HLT_e60_lhmedium_nod0 || HLT_e140_lhloose_nod0', 'HLT_g35_medium_g25_medium_L12EM20VH', 'HLT_mu26_ivarmedium', 'HLT_2mu14'],
'2022': ['HLT_e26_lhtight_ivarloose_L1EM22VHI || HLT_e60_lhmedium_L1EM22VHI || HLT_e140_lhloose_L1EM22VHI'],
+ '2023': ['HLT_e26_lhtight_ivarloose_L1EM22VHI || HLT_e60_lhmedium_L1EM22VHI || HLT_e140_lhloose_L1EM22VHI'],
}
triggerChains = [
'HLT_2mu14',
@@ -395,9 +396,8 @@ def makeTestSequenceBlocks (dataType, algSeq, forCompare, isPhyslite,
configSeq.setOptionValue ('.outputName', 'OutTrackJets')
# disabling comparisons for triggers, because the config blocks do a
- # lot more than the sequences. also disabling for Run 4, not sure
- # what the issue with that is.
- if not forCompare and geometry is not LHCPeriod.Run4:
+ # lot more than the sequences. Also disabling for Run 3+4, as there is no SF yet
+ if not forCompare and geometry is LHCPeriod.Run2:
# Include, and then set up the trigger analysis sequence:
configSeq += config.makeConfig( 'Trigger' )
configSeq.setOptionValue ('.triggerChainsPerYear', triggerChainsPerYear )
diff --git a/PhysicsAnalysis/Algorithms/AnalysisAlgorithmsConfig/scripts/FullCPAlgorithmsTest_CA.py b/PhysicsAnalysis/Algorithms/AnalysisAlgorithmsConfig/scripts/FullCPAlgorithmsTest_CA.py
index ec038378380..e83e818576c 100755
--- a/PhysicsAnalysis/Algorithms/AnalysisAlgorithmsConfig/scripts/FullCPAlgorithmsTest_CA.py
+++ b/PhysicsAnalysis/Algorithms/AnalysisAlgorithmsConfig/scripts/FullCPAlgorithmsTest_CA.py
@@ -40,6 +40,9 @@ athArgsParser.add_argument('--no-systematics', dest='no_systematics',
athArgsParser.add_argument('--physlite', dest='physlite',
action='store_true', default=False,
help='Run the job on physlite')
+athArgsParser.add_argument('--run', action='store', dest='run',
+ default=2, type=int,
+ help='Run number for the inputs')
athArgsParser.add_argument('--only-nominal-or', dest='onlyNominalOR',
action='store_true', default=False,
help='Only run overlap removal for nominal (skip systematics)')
@@ -52,13 +55,23 @@ forCompare = athArgs.for_compare
print(f"Running on data type: {dataType.value}")
if athArgs.physlite:
- inputfile = {DataType.Data: 'ASG_TEST_FILE_LITE_DATA',
- DataType.FullSim: 'ASG_TEST_FILE_LITE_MC',
- DataType.FastSim: 'ASG_TEST_FILE_LITE_MC_AFII'}
+ if athArgs.run==3:
+ inputfile = {DataType.Data: 'ASG_TEST_FILE_LITE_RUN3_DATA',
+ DataType.FullSim: 'ASG_TEST_FILE_LITE_RUN3_MC',
+ DataType.FastSim: 'ASG_TEST_FILE_LITE_RUN3_MC_FASTSIM'}
+ elif athArgs.run==2:
+ inputfile = {DataType.Data: 'ASG_TEST_FILE_LITE_DATA',
+ DataType.FullSim: 'ASG_TEST_FILE_LITE_MC',
+ DataType.FastSim: 'ASG_TEST_FILE_LITE_MC_FASTSIM'}
else:
- inputfile = {DataType.Data: 'ASG_TEST_FILE_DATA',
- DataType.FullSim: 'ASG_TEST_FILE_MC',
- DataType.FastSim: 'ASG_TEST_FILE_MC_AFII'}
+ if athArgs.run==3:
+ inputfile = {DataType.Data: 'ASG_TEST_FILE_RUN3_DATA',
+ DataType.FullSim: 'ASG_TEST_FILE_RUN3_MC',
+ DataType.FastSim: 'ASG_TEST_FILE_RUN3_MC_FASTSIM'}
+ elif athArgs.run==2:
+ inputfile = {DataType.Data: 'ASG_TEST_FILE_DATA',
+ DataType.FullSim: 'ASG_TEST_FILE_MC',
+ DataType.FastSim: 'ASG_TEST_FILE_MC_FASTSIM'}
# Set up the reading of the input file:
if athArgs.input_file:
diff --git a/PhysicsAnalysis/Algorithms/AnalysisAlgorithmsConfig/scripts/FullCPAlgorithmsTest_eljob.py b/PhysicsAnalysis/Algorithms/AnalysisAlgorithmsConfig/scripts/FullCPAlgorithmsTest_eljob.py
index df04245375b..19eb489fe69 100755
--- a/PhysicsAnalysis/Algorithms/AnalysisAlgorithmsConfig/scripts/FullCPAlgorithmsTest_eljob.py
+++ b/PhysicsAnalysis/Algorithms/AnalysisAlgorithmsConfig/scripts/FullCPAlgorithmsTest_eljob.py
@@ -58,6 +58,9 @@ parser.add_option( '--for-compare', dest='for_compare',
parser.add_option( '--physlite', dest='physlite',
action = 'store_true', default = False,
help = 'Configure the job for physlite' )
+parser.add_option('--run', action='store', dest='run',
+ default=2, type=int,
+ help='Run number for the inputs')
parser.add_option( '--force-mc', dest='forceMC',
action = 'store_true', default = False,
help = 'Force the job to treat input as MC' )
@@ -84,13 +87,23 @@ forCompare = options.for_compare
print(f"Running on data type: {dataType.value}")
if options.physlite:
- inputfile = {DataType.Data: 'ASG_TEST_FILE_LITE_DATA',
- DataType.FullSim: 'ASG_TEST_FILE_LITE_MC',
- DataType.FastSim: 'ASG_TEST_FILE_LITE_MC_AFII'}
+ if options.run==3:
+ inputfile = {DataType.Data: 'ASG_TEST_FILE_LITE_RUN3_DATA',
+ DataType.FullSim: 'ASG_TEST_FILE_LITE_RUN3_MC',
+ DataType.FastSim: 'ASG_TEST_FILE_LITE_RUN3_MC_FASTSIM'}
+ elif options.run==2:
+ inputfile = {DataType.Data: 'ASG_TEST_FILE_LITE_DATA',
+ DataType.FullSim: 'ASG_TEST_FILE_LITE_MC',
+ DataType.FastSim: 'ASG_TEST_FILE_LITE_MC_FASTSIM'}
else:
- inputfile = {DataType.Data: 'ASG_TEST_FILE_DATA',
- DataType.FullSim: 'ASG_TEST_FILE_MC',
- DataType.FastSim: 'ASG_TEST_FILE_MC_AFII'}
+ if options.run==3:
+ inputfile = {DataType.Data: 'ASG_TEST_FILE_RUN3_DATA',
+ DataType.FullSim: 'ASG_TEST_FILE_RUN3_MC',
+ DataType.FastSim: 'ASG_TEST_FILE_RUN3_MC_FASTSIM'}
+ elif options.run==2:
+ inputfile = {DataType.Data: 'ASG_TEST_FILE_DATA',
+ DataType.FullSim: 'ASG_TEST_FILE_MC',
+ DataType.FastSim: 'ASG_TEST_FILE_MC_FASTSIM'}
# No R24 FastSim recommendations for EGamma yet
forceEGammaFullSimConfig = True
--
GitLab