diff --git a/Configuration/HLT/python/addOnTestsHLT.py b/Configuration/HLT/python/addOnTestsHLT.py index 3e9f2ac80eff6..9aba671803f38 100644 --- a/Configuration/HLT/python/addOnTestsHLT.py +++ b/Configuration/HLT/python/addOnTestsHLT.py @@ -31,16 +31,16 @@ def addOnTestsHLT(): 'hlt_data_Fake2': ['cmsDriver.py RelVal -s L1REPACK:Full --data --scenario=pp -n 10 --conditions auto:run2_hlt_Fake2 --relval 9000,50 --datatier "RAW" --eventcontent RAW --customise=HLTrigger/Configuration/CustomConfigs.L1T --era Run2_2016 --fileout file:RelVal_Raw_Fake2_DATA.root --filein /store/data/Run2016B/JetHT/RAW/v1/000/272/762/00000/C666CDE2-E013-E611-B15A-02163E011DBE.root', 'HLTrigger/Configuration/test/OnLine_HLT_Fake2.py', 'cmsDriver.py RelVal -s HLT:Fake2,RAW2DIGI,L1Reco,RECO --data --scenario=pp -n 10 --conditions auto:run2_data_Fake2 --relval 9000,50 --datatier "RAW-HLT-RECO" --eventcontent FEVTDEBUGHLT --customise=HLTrigger/Configuration/CustomConfigs.L1THLT --customise=HLTrigger/Configuration/CustomConfigs.HLTRECO --era Run2_2016 --processName=HLTRECO --filein file:RelVal_Raw_Fake2_DATA.root --fileout file:RelVal_Raw_Fake2_DATA_HLT_RECO.root'], - 'hlt_data_GRun' : ['cmsDriver.py RelVal -s L1REPACK:Full --data --scenario=pp -n 10 --conditions auto:run3_hlt_GRun --relval 9000,50 --datatier "RAW" --eventcontent RAW --customise=HLTrigger/Configuration/CustomConfigs.L1T --era Run3_2023 --fileout file:RelVal_Raw_GRun_DATA.root --filein /store/data/Run2022B/HLTPhysics/RAW/v1/000/355/456/00000/69b26b27-4bd1-4524-bc18-45f7b9b5e076.root', + 'hlt_data_GRun' : ['cmsDriver.py RelVal -s L1REPACK:Full --data --scenario=pp -n 10 --conditions auto:run3_hlt_GRun --relval 9000,50 --datatier "RAW" --eventcontent RAW --customise=HLTrigger/Configuration/CustomConfigs.L1T --era Run3_2023 --fileout file:RelVal_Raw_GRun_DATA.root --filein /store/data/Run2023D/EphemeralHLTPhysics0/RAW/v1/000/370/293/00000/2ef73d2a-1fb7-4dac-9961-149525f9e887.root', 'HLTrigger/Configuration/test/OnLine_HLT_GRun.py', 'cmsDriver.py RelVal -s HLT:GRun,RAW2DIGI,L1Reco,RECO --data --scenario=pp -n 10 --conditions auto:run3_data_GRun --relval 9000,50 --datatier "RAW-HLT-RECO" --eventcontent FEVTDEBUGHLT --customise=HLTrigger/Configuration/CustomConfigs.L1THLT --customise=HLTrigger/Configuration/CustomConfigs.HLTRECO --customise=HLTrigger/Configuration/CustomConfigs.customiseGlobalTagForOnlineBeamSpot --era Run3_2023 --processName=HLTRECO --filein file:RelVal_Raw_GRun_DATA.root --fileout file:RelVal_Raw_GRun_DATA_HLT_RECO.root'], 'hlt_data_HIon' : ['cmsDriver.py RelVal -s L1REPACK:Full --data --scenario=pp -n 10 --conditions auto:run3_hlt_HIon --relval 9000,50 --datatier "RAW" --eventcontent RAW --customise=HLTrigger/Configuration/CustomConfigs.L1T --era Run3_pp_on_PbPb --fileout file:RelVal_Raw_HIon_DATA.root --filein /store/hidata/HIRun2022A/HITestRaw0/RAW/v1/000/362/321/00000/f467ee64-fc64-47a6-9d8a-7ca73ebca2bd.root --customise=HLTrigger/Configuration/CustomConfigs.customiseL1TforHIonRepackedRAW', 'HLTrigger/Configuration/test/OnLine_HLT_HIon.py', 'cmsDriver.py RelVal -s HLT:HIon,RAW2DIGI,L1Reco,RECO --data --scenario=pp -n 10 --conditions auto:run3_data_HIon --relval 9000,50 --datatier "RAW-HLT-RECO" --eventcontent FEVTDEBUGHLT --customise=HLTrigger/Configuration/CustomConfigs.L1THLT --customise=HLTrigger/Configuration/CustomConfigs.HLTRECO --customise=HLTrigger/Configuration/CustomConfigs.customiseGlobalTagForOnlineBeamSpot --era Run3_pp_on_PbPb --processName=HLTRECO --filein file:RelVal_Raw_HIon_DATA.root --fileout file:RelVal_Raw_HIon_DATA_HLT_RECO.root'], - 'hlt_data_PIon' : ['cmsDriver.py RelVal -s L1REPACK:Full --data --scenario=pp -n 10 --conditions auto:run3_hlt_PIon --relval 9000,50 --datatier "RAW" --customise=HLTrigger/Configuration/CustomConfigs.L1T --era Run3_2023 --eventcontent RAW --fileout file:RelVal_Raw_PIon_DATA.root --filein /store/data/Run2022B/HLTPhysics/RAW/v1/000/355/456/00000/69b26b27-4bd1-4524-bc18-45f7b9b5e076.root', + 'hlt_data_PIon' : ['cmsDriver.py RelVal -s L1REPACK:Full --data --scenario=pp -n 10 --conditions auto:run3_hlt_PIon --relval 9000,50 --datatier "RAW" --customise=HLTrigger/Configuration/CustomConfigs.L1T --era Run3_2023 --eventcontent RAW --fileout file:RelVal_Raw_PIon_DATA.root --filein /store/data/Run2023D/EphemeralHLTPhysics0/RAW/v1/000/370/293/00000/2ef73d2a-1fb7-4dac-9961-149525f9e887.root', 'HLTrigger/Configuration/test/OnLine_HLT_PIon.py', 'cmsDriver.py RelVal -s HLT:PIon,RAW2DIGI,L1Reco,RECO --data --scenario=pp -n 10 --conditions auto:run3_data_PIon --relval 9000,50 --datatier "RAW-HLT-RECO" --eventcontent FEVTDEBUGHLT --customise=HLTrigger/Configuration/CustomConfigs.L1THLT --customise=HLTrigger/Configuration/CustomConfigs.HLTRECO --customise=HLTrigger/Configuration/CustomConfigs.customiseGlobalTagForOnlineBeamSpot --era Run3_2023 --processName=HLTRECO --filein file:RelVal_Raw_PIon_DATA.root --fileout file:RelVal_Raw_PIon_DATA_HLT_RECO.root'], - 'hlt_data_PRef' : ['cmsDriver.py RelVal -s L1REPACK:Full --data --scenario=pp -n 10 --conditions auto:run3_hlt_PRef --relval 9000,50 --datatier "RAW" --customise=HLTrigger/Configuration/CustomConfigs.L1T --era Run3_2023 --eventcontent RAW --fileout file:RelVal_Raw_PRef_DATA.root --filein /store/data/Run2022B/HLTPhysics/RAW/v1/000/355/456/00000/69b26b27-4bd1-4524-bc18-45f7b9b5e076.root', + 'hlt_data_PRef' : ['cmsDriver.py RelVal -s L1REPACK:Full --data --scenario=pp -n 10 --conditions auto:run3_hlt_PRef --relval 9000,50 --datatier "RAW" --customise=HLTrigger/Configuration/CustomConfigs.L1T --era Run3_2023 --eventcontent RAW --fileout file:RelVal_Raw_PRef_DATA.root --filein /store/data/Run2023D/EphemeralHLTPhysics0/RAW/v1/000/370/293/00000/2ef73d2a-1fb7-4dac-9961-149525f9e887.root', 'HLTrigger/Configuration/test/OnLine_HLT_PRef.py', 'cmsDriver.py RelVal -s HLT:PRef,RAW2DIGI,L1Reco,RECO --data --scenario=pp -n 10 --conditions auto:run3_data_PRef --relval 9000,50 --datatier "RAW-HLT-RECO" --eventcontent FEVTDEBUGHLT --customise=HLTrigger/Configuration/CustomConfigs.L1THLT --customise=HLTrigger/Configuration/CustomConfigs.HLTRECO --customise=HLTrigger/Configuration/CustomConfigs.customiseGlobalTagForOnlineBeamSpot --era Run3_2023 --processName=HLTRECO --filein file:RelVal_Raw_PRef_DATA.root --fileout file:RelVal_Raw_PRef_DATA_HLT_RECO.root'], } diff --git a/HLTrigger/Configuration/test/cmsDriver.csh b/HLTrigger/Configuration/test/cmsDriver.csh index cbfaf52aaf904..4c6e37a3f961e 100755 --- a/HLTrigger/Configuration/test/cmsDriver.csh +++ b/HLTrigger/Configuration/test/cmsDriver.csh @@ -41,7 +41,7 @@ set InputGenSimPRef3 = $InputGenSimGRun3 set InputLHCRawGRun0 = /store/data/Run2012A/MuEG/RAW/v1/000/191/718/14932935-E289-E111-830C-5404A6388697.root set InputLHCRawGRun1 = /store/data/Run2015D/MuonEG/RAW/v1/000/256/677/00000/80950A90-745D-E511-92FD-02163E011C5D.root set InputLHCRawGRun2 = /store/data/Run2016B/JetHT/RAW/v1/000/272/762/00000/C666CDE2-E013-E611-B15A-02163E011DBE.root -set InputLHCRawGRun3 = /store/data/Run2022B/HLTPhysics/RAW/v1/000/355/456/00000/69b26b27-4bd1-4524-bc18-45f7b9b5e076.root +set InputLHCRawGRun3 = /store/data/Run2023D/EphemeralHLTPhysics0/RAW/v1/000/370/293/00000/2ef73d2a-1fb7-4dac-9961-149525f9e887.root set InputLHCRawHIon1 = /store/hidata/HIRun2015/HIHardProbes/RAW/v1/000/263/718/00000/08057733-02A5-E511-9C7D-02163E014606.root set InputLHCRawHIon2 = /store/hidata/HIRun2018A/HIHardProbes/RAW/v1/000/326/479/00000/0E2CC5D5-9D87-7348-9219-B00CD718C847.root set InputLHCRawHIon3 = /store/hidata/HIRun2022A/HITestRaw0/RAW/v1/000/362/321/00000/f467ee64-fc64-47a6-9d8a-7ca73ebca2bd.root diff --git a/HLTrigger/Configuration/test/readme.md b/HLTrigger/Configuration/test/readme.md index 9a9b43c09d8bf..e030cc8ae4e2e 100644 --- a/HLTrigger/Configuration/test/readme.md +++ b/HLTrigger/Configuration/test/readme.md @@ -32,14 +32,36 @@ scram b runtests_testAccessToEDMInputsOfHLTTests ``` To run the unit test locally, execute ```bash -LOCALTOP="${CMSSW_BASE}" "${CMSSW_BASE}"/src/HLTrigger/Configuration/test/testAccessToEDMInputsOfHLTTests.sh +cd "${CMSSW_BASE}"/src/HLTrigger/Configuration/test && \ + SCRAM_TEST_PATH=. ./testAccessToEDMInputsOfHLTTests.sh ``` The unit test does not modify the content of the file `testAccessToEDMInputsOfHLTTests_filelist.txt`. The latter can be updated by manually executing the script `testAccessToEDMInputsOfHLTTests_update_filelist.sh`. -The file `testAccessToEDMInputsOfHLTTests_filelist.txt` lists -the Logical File Name (LFN) of the EDM files used in HLT tests -for the main CMSSW development branches (name format: `CMSSW_[0-9]*_[0-9]*_X`). -The list includes only EDM files which are either -(1) cached in the IB-EOS area at the CERN T2, or -(2) accessible remotely via the redirector `cms-xrd-global.cern.ch`. + + - The file `testAccessToEDMInputsOfHLTTests_filelist.txt` lists + the Logical File Name (LFN) of the EDM files used in HLT tests for + (1) the main CMSSW development branches (name format: `CMSSW_[0-9]*_[0-9]*_X`), and + (2) the HEAD of local CMSSW in use. + + - The script `testAccessToEDMInputsOfHLTTests_update_filelist.sh` ignores other branches, + as well as local modifications which have not been committed yet. + + - The file `testAccessToEDMInputsOfHLTTests_filelist.txt` lists only EDM files which are either + (1) cached in the IB-EOS area at the CERN T2, or + (2) accessible remotely via the redirector `cms-xrd-global.cern.ch`. + +Here are the steps one normally executes to update the +EDM input files and the unit test `testAccessToEDMInputsOfHLTTests`. + + - Update the input EDM files where needed, + e.g. `addOnTestsHLT.py` and/or `cmsDriver.csh`. + + - Test, and commit the changes. + + - Run `testAccessToEDMInputsOfHLTTests_update_filelist.sh` + (this will update `testAccessToEDMInputsOfHLTTests_filelist.txt`, if needed). + + - Run the unit test (e.g. `scram b runtests_testAccessToEDMInputsOfHLTTests`). + + - Commit the changes to `testAccessToEDMInputsOfHLTTests_filelist.txt`, if any. diff --git a/HLTrigger/Configuration/test/testAccessToEDMInputsOfHLTTests.sh b/HLTrigger/Configuration/test/testAccessToEDMInputsOfHLTTests.sh index da9f7ac9fa9e0..57e6846bfaee6 100755 --- a/HLTrigger/Configuration/test/testAccessToEDMInputsOfHLTTests.sh +++ b/HLTrigger/Configuration/test/testAccessToEDMInputsOfHLTTests.sh @@ -6,10 +6,14 @@ function die { exit $2 } -# run test job -TESTDIR="${LOCALTOP}"/src/HLTrigger/Configuration/test +if [ -z "${SCRAM_TEST_PATH}" ]; then + printf "\n%s\n" "ERROR -- environment variable SCRAM_TEST_PATH not defined" + printf "%s\n" " (hint: see readme file in the directory of this script)" + exit 1 +fi -inputFileList="${TESTDIR}"/testAccessToEDMInputsOfHLTTests_filelist.txt +# run test job +inputFileList="${SCRAM_TEST_PATH}"/testAccessToEDMInputsOfHLTTests_filelist.txt if [ ! -f "${inputFileList}" ]; then printf "\n%s\n" "ERROR -- invalid path to file listing EDM input files:" @@ -18,7 +22,7 @@ if [ ! -f "${inputFileList}" ]; then fi for inputFile in $(cat "${inputFileList}"); do - cmsRun "${TESTDIR}"/testAccessToEDMInputsOfHLTTests_cfg.py inputFiles="${inputFile}" \ + cmsRun "${SCRAM_TEST_PATH}"/testAccessToEDMInputsOfHLTTests_cfg.py inputFiles="${inputFile}" \ || die "Failure running testAccessToEDMInputsOfHLTTests_cfg.py" $? done unset inputFile diff --git a/HLTrigger/Configuration/test/testAccessToEDMInputsOfHLTTests_filelist.txt b/HLTrigger/Configuration/test/testAccessToEDMInputsOfHLTTests_filelist.txt index 6e67ead767150..d365b38612d3e 100644 --- a/HLTrigger/Configuration/test/testAccessToEDMInputsOfHLTTests_filelist.txt +++ b/HLTrigger/Configuration/test/testAccessToEDMInputsOfHLTTests_filelist.txt @@ -5,6 +5,7 @@ /store/data/Run2018D/EphemeralHLTPhysics1/RAW/v1/000/323/775/00000/2E066536-5CF2-B340-A73B-209640F29FF6.root /store/data/Run2018D/HIMinimumBias0/RAW/v1/000/325/112/00000/660F62BB-9932-D645-A4A4-0BBBDA3963E8.root /store/data/Run2022B/HLTPhysics/RAW/v1/000/355/456/00000/69b26b27-4bd1-4524-bc18-45f7b9b5e076.root +/store/data/Run2023D/EphemeralHLTPhysics0/RAW/v1/000/370/293/00000/2ef73d2a-1fb7-4dac-9961-149525f9e887.root /store/group/dpg_trigger/comm_trigger/TriggerStudiesGroup/STORM/GEN-SIM/CMSSW_5/143C21CD-E8A2-E311-87BE-0025904C66E8.root /store/group/dpg_trigger/comm_trigger/TriggerStudiesGroup/STORM/GEN-SIM/CMSSW_7/72B2C6B5-9740-E411-8FF7-002618FDA26D.root /store/group/dpg_trigger/comm_trigger/TriggerStudiesGroup/STORM/GEN-SIM/CMSSW_7/8C172C6B-28FD-E311-8A62-0026189438F4.root