Skip to content

Commit 9ced6a4

Browse files
missirolmissirol
committed
update of Run-3 data EDM input in HLT tests (HLT-Validation and HLT-addOn tests)
1 parent c2e865a commit 9ced6a4

File tree

5 files changed

+42
-15
lines changed

5 files changed

+42
-15
lines changed

‎Configuration/HLT/python/addOnTestsHLT.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,16 @@ def addOnTestsHLT():
3131
'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',
3232
'HLTrigger/Configuration/test/OnLine_HLT_Fake2.py',
3333
'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'],
34-
'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',
34+
'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',
3535
'HLTrigger/Configuration/test/OnLine_HLT_GRun.py',
3636
'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'],
3737
'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',
3838
'HLTrigger/Configuration/test/OnLine_HLT_HIon.py',
3939
'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'],
40-
'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',
40+
'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',
4141
'HLTrigger/Configuration/test/OnLine_HLT_PIon.py',
4242
'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'],
43-
'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',
43+
'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',
4444
'HLTrigger/Configuration/test/OnLine_HLT_PRef.py',
4545
'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'],
4646
}

‎HLTrigger/Configuration/test/cmsDriver.csh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ set InputGenSimPRef3 = $InputGenSimGRun3
4141
set InputLHCRawGRun0 = /store/data/Run2012A/MuEG/RAW/v1/000/191/718/14932935-E289-E111-830C-5404A6388697.root
4242
set InputLHCRawGRun1 = /store/data/Run2015D/MuonEG/RAW/v1/000/256/677/00000/80950A90-745D-E511-92FD-02163E011C5D.root
4343
set InputLHCRawGRun2 = /store/data/Run2016B/JetHT/RAW/v1/000/272/762/00000/C666CDE2-E013-E611-B15A-02163E011DBE.root
44-
set InputLHCRawGRun3 = /store/data/Run2022B/HLTPhysics/RAW/v1/000/355/456/00000/69b26b27-4bd1-4524-bc18-45f7b9b5e076.root
44+
set InputLHCRawGRun3 = /store/data/Run2023D/EphemeralHLTPhysics0/RAW/v1/000/370/293/00000/2ef73d2a-1fb7-4dac-9961-149525f9e887.root
4545
set InputLHCRawHIon1 = /store/hidata/HIRun2015/HIHardProbes/RAW/v1/000/263/718/00000/08057733-02A5-E511-9C7D-02163E014606.root
4646
set InputLHCRawHIon2 = /store/hidata/HIRun2018A/HIHardProbes/RAW/v1/000/326/479/00000/0E2CC5D5-9D87-7348-9219-B00CD718C847.root
4747
set InputLHCRawHIon3 = /store/hidata/HIRun2022A/HITestRaw0/RAW/v1/000/362/321/00000/f467ee64-fc64-47a6-9d8a-7ca73ebca2bd.root

‎HLTrigger/Configuration/test/readme.md‎

Lines changed: 29 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,36 @@ scram b runtests_testAccessToEDMInputsOfHLTTests
3232
```
3333
To run the unit test locally, execute
3434
```bash
35-
LOCALTOP="${CMSSW_BASE}" "${CMSSW_BASE}"/src/HLTrigger/Configuration/test/testAccessToEDMInputsOfHLTTests.sh
35+
cd "${CMSSW_BASE}"/src/HLTrigger/Configuration/test && \
36+
SCRAM_TEST_PATH=. ./testAccessToEDMInputsOfHLTTests.sh
3637
```
3738

3839
The unit test does not modify the content of the file `testAccessToEDMInputsOfHLTTests_filelist.txt`.
3940
The latter can be updated by manually executing the script `testAccessToEDMInputsOfHLTTests_update_filelist.sh`.
40-
The file `testAccessToEDMInputsOfHLTTests_filelist.txt` lists
41-
the Logical File Name (LFN) of the EDM files used in HLT tests
42-
for the main CMSSW development branches (name format: `CMSSW_[0-9]*_[0-9]*_X`).
43-
The list includes only EDM files which are either
44-
(1) cached in the IB-EOS area at the CERN T2, or
45-
(2) accessible remotely via the redirector `cms-xrd-global.cern.ch`.
41+
42+
- The file `testAccessToEDMInputsOfHLTTests_filelist.txt` lists
43+
the Logical File Name (LFN) of the EDM files used in HLT tests for
44+
(1) the main CMSSW development branches (name format: `CMSSW_[0-9]*_[0-9]*_X`), and
45+
(2) the HEAD of local CMSSW in use.
46+
47+
- The script `testAccessToEDMInputsOfHLTTests_update_filelist.sh` ignores other branches,
48+
as well as local modifications which have not been committed yet.
49+
50+
- The file `testAccessToEDMInputsOfHLTTests_filelist.txt` lists only EDM files which are either
51+
(1) cached in the IB-EOS area at the CERN T2, or
52+
(2) accessible remotely via the redirector `cms-xrd-global.cern.ch`.
53+
54+
Here are the steps one normally executes to update the
55+
EDM input files and the unit test `testAccessToEDMInputsOfHLTTests`.
56+
57+
- Update the input EDM files where needed,
58+
e.g. `addOnTestsHLT.py` and/or `cmsDriver.csh`.
59+
60+
- Test, and commit the changes.
61+
62+
- Run `testAccessToEDMInputsOfHLTTests_update_filelist.sh`
63+
(this will update `testAccessToEDMInputsOfHLTTests_filelist.txt`, if needed).
64+
65+
- Run the unit test (e.g. `scram b runtests_testAccessToEDMInputsOfHLTTests`).
66+
67+
- Commit the changes to `testAccessToEDMInputsOfHLTTests_filelist.txt`, if any.

‎HLTrigger/Configuration/test/testAccessToEDMInputsOfHLTTests.sh‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,14 @@ function die {
66
exit $2
77
}
88

9-
# run test job
10-
TESTDIR="${LOCALTOP}"/src/HLTrigger/Configuration/test
9+
if [ -z "${SCRAM_TEST_PATH}" ]; then
10+
printf "\n%s\n" "ERROR -- environment variable SCRAM_TEST_PATH not defined"
11+
printf "%s\n" " (hint: see readme file in the directory of this script)"
12+
exit 1
13+
fi
1114

12-
inputFileList="${TESTDIR}"/testAccessToEDMInputsOfHLTTests_filelist.txt
15+
# run test job
16+
inputFileList="${SCRAM_TEST_PATH}"/testAccessToEDMInputsOfHLTTests_filelist.txt
1317

1418
if [ ! -f "${inputFileList}" ]; then
1519
printf "\n%s\n" "ERROR -- invalid path to file listing EDM input files:"
@@ -18,7 +22,7 @@ if [ ! -f "${inputFileList}" ]; then
1822
fi
1923

2024
for inputFile in $(cat "${inputFileList}"); do
21-
cmsRun "${TESTDIR}"/testAccessToEDMInputsOfHLTTests_cfg.py inputFiles="${inputFile}" \
25+
cmsRun "${SCRAM_TEST_PATH}"/testAccessToEDMInputsOfHLTTests_cfg.py inputFiles="${inputFile}" \
2226
|| die "Failure running testAccessToEDMInputsOfHLTTests_cfg.py" $?
2327
done
2428
unset inputFile

‎HLTrigger/Configuration/test/testAccessToEDMInputsOfHLTTests_filelist.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
/store/data/Run2018D/EphemeralHLTPhysics1/RAW/v1/000/323/775/00000/2E066536-5CF2-B340-A73B-209640F29FF6.root
66
/store/data/Run2018D/HIMinimumBias0/RAW/v1/000/325/112/00000/660F62BB-9932-D645-A4A4-0BBBDA3963E8.root
77
/store/data/Run2022B/HLTPhysics/RAW/v1/000/355/456/00000/69b26b27-4bd1-4524-bc18-45f7b9b5e076.root
8+
/store/data/Run2023D/EphemeralHLTPhysics0/RAW/v1/000/370/293/00000/2ef73d2a-1fb7-4dac-9961-149525f9e887.root
89
/store/group/dpg_trigger/comm_trigger/TriggerStudiesGroup/STORM/GEN-SIM/CMSSW_5/143C21CD-E8A2-E311-87BE-0025904C66E8.root
910
/store/group/dpg_trigger/comm_trigger/TriggerStudiesGroup/STORM/GEN-SIM/CMSSW_7/72B2C6B5-9740-E411-8FF7-002618FDA26D.root
1011
/store/group/dpg_trigger/comm_trigger/TriggerStudiesGroup/STORM/GEN-SIM/CMSSW_7/8C172C6B-28FD-E311-8A62-0026189438F4.root

0 commit comments

Comments
 (0)