Skip to content

Commit 6753b0e

Browse files
cmsbuildcmsbuild
authored
Merge pull request #45092 from cms-AlCaDB/alca-SD_triggerBits_14_1_X
Add possibility to read triggerbits for Secondary Datasets from the GT
2 parents 34d92a7 + 3d0b8e9 commit 6753b0e

File tree

4 files changed

+13
-57
lines changed

4 files changed

+13
-57
lines changed

‎Configuration/AlCa/python/autoCond.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
# GlobalTag for MC production (p-Pb collisions) with realistic alignment and calibrations for Run2
2525
'run2_mc_pa' : '131X_mcRun2_pA_v3',
2626
# GlobalTag for Run2 data reprocessing
27-
'run2_data' : '140X_dataRun2_v1',
27+
'run2_data' : '140X_dataRun2_v2',
2828
# GlobalTag for Run2 data 2018B relvals only: HEM-15-16 fail
2929
'run2_data_HEfail' : '140X_dataRun2_HEfail_v1',
3030
# GlobalTag for Run2 HI data
@@ -35,12 +35,12 @@
3535
'run3_hlt' : '140X_dataRun3_HLT_frozen_v3',
3636
# GlobalTag for Run3 data relvals (express GT) - 140X_dataRun3_Express_v1 but snapshot at 2024-01-20 12:00:00 (UTC)
3737
'run3_data_express' : '140X_dataRun3_Express_frozen_v1',
38-
# GlobalTag for Run3 data relvals (prompt GT) - 140X_dataRun3_Prompt_v1 but snapshot at 2024-01-20 12:00:00 (UTC)
39-
'run3_data_prompt' : '140X_dataRun3_Prompt_frozen_v1',
38+
# GlobalTag for Run3 data relvals (prompt GT) - 140X_dataRun3_Prompt_v3 but snapshot at 2024-05-31 09:09:12 (UTC)
39+
'run3_data_prompt' : '140X_dataRun3_Prompt_frozen_v3',
4040
# GlobalTag for Run3 offline data reprocessing - snapshot at 2024-02-07 16:38:59 (UTC)
41-
'run3_data' : '140X_dataRun3_v3',
41+
'run3_data' : '140X_dataRun3_v4',
4242
# GlobalTag for Run3 offline data reprocessing with Prompt GT, currenlty for 2022FG - snapshot at 2024-02-12 12:00:00 (UTC)
43-
'run3_data_PromptAnalysis' : '140X_dataRun3_PromptAnalysis_v1',
43+
'run3_data_PromptAnalysis' : '140X_dataRun3_PromptAnalysis_v2',
4444
# GlobalTag for MC production with perfectly aligned and calibrated detector for Phase1 2017 (and 0,0,~0-centred beamspot)
4545
'phase1_2017_design' : '131X_mc2017_design_v3',
4646
# GlobalTag for MC production with realistic conditions for Phase1 2017 detector

‎Configuration/Skimming/python/PDWG_ReserveDMu_SD_cff.py‎

Lines changed: 3 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -4,57 +4,9 @@
44
import HLTrigger.HLTfilters.hltHighLevel_cfi as hlt
55
ReserveDMu = hlt.hltHighLevel.clone()
66
ReserveDMu.TriggerResultsTag = cms.InputTag( "TriggerResults", "", "HLT" )
7-
ReserveDMu.HLTPaths = cms.vstring(
8-
'HLT_Dimuon0_Jpsi3p5_Muon2_v*',
9-
'HLT_Dimuon0_Jpsi_L1_4R_0er1p5R_v*',
10-
'HLT_Dimuon0_Jpsi_L1_NoOS_v*',
11-
'HLT_Dimuon0_Jpsi_NoVertexing_L1_4R_0er1p5R_v*',
12-
'HLT_Dimuon0_Jpsi_NoVertexing_NoOS_v*',
13-
'HLT_Dimuon0_Jpsi_NoVertexing_v*',
14-
'HLT_Dimuon0_Jpsi_v*',
15-
'HLT_Dimuon0_LowMass_L1_0er1p5R_v*',
16-
'HLT_Dimuon0_LowMass_L1_0er1p5_v*',
17-
'HLT_Dimuon0_LowMass_L1_4R_v*',
18-
'HLT_Dimuon0_LowMass_L1_4_v*',
19-
'HLT_Dimuon0_LowMass_L1_TM530_v*',
20-
'HLT_Dimuon0_LowMass_v*',
21-
'HLT_Dimuon0_Upsilon_L1_4p5_v*',
22-
'HLT_Dimuon0_Upsilon_L1_4p5er2p0M_v*',
23-
'HLT_Dimuon0_Upsilon_L1_4p5er2p0_v*',
24-
'HLT_Dimuon0_Upsilon_Muon_NoL1Mass_v*',
25-
'HLT_Dimuon0_Upsilon_NoVertexing_v*',
26-
'HLT_Dimuon12_Upsilon_y1p4_v*',
27-
'HLT_Dimuon14_Phi_Barrel_Seagulls_v*',
28-
'HLT_Dimuon18_PsiPrime_noCorrL1_v*',
29-
'HLT_Dimuon18_PsiPrime_v*',
30-
'HLT_Dimuon24_Phi_noCorrL1_v*',
31-
'HLT_Dimuon24_Upsilon_noCorrL1_v*',
32-
'HLT_Dimuon25_Jpsi_noCorrL1_v*',
33-
'HLT_Dimuon25_Jpsi_v*',
34-
'HLT_DoubleMu2_Jpsi_DoubleTrk1_Phi1p05_v*',
35-
'HLT_DoubleMu3_DoubleEle7p5_CaloIdL_TrackIdL_Upsilon_v*',
36-
'HLT_DoubleMu3_TkMu_DsTau3Mu_v*',
37-
'HLT_DoubleMu3_Trk_Tau3mu_NoL1Mass_v*',
38-
'HLT_DoubleMu3_Trk_Tau3mu_v*',
39-
'HLT_DoubleMu4_3_Bs_v*',
40-
'HLT_DoubleMu4_3_Jpsi_v*',
41-
'HLT_DoubleMu4_JpsiTrkTrk_Displaced_v*',
42-
'HLT_DoubleMu4_Jpsi_Displaced_v*',
43-
'HLT_DoubleMu4_Jpsi_NoVertexing_v*',
44-
'HLT_DoubleMu4_MuMuTrk_Displaced_v*',
45-
'HLT_DoubleMu5_Upsilon_DoubleEle3_CaloIdL_TrackIdL_v*',
46-
'HLT_Mu25_TkMu0_Phi_v*',
47-
'HLT_Mu30_TkMu0_Psi_v*',
48-
'HLT_Mu30_TkMu0_Upsilon_v*',
49-
'HLT_Mu4_L1DoubleMu_v*',
50-
'HLT_Mu7p5_L2Mu2_Jpsi_v*',
51-
'HLT_Mu7p5_L2Mu2_Upsilon_v*',
52-
'HLT_Tau3Mu_Mu7_Mu1_TkMu1_IsoTau15_Charge1_v*',
53-
'HLT_Tau3Mu_Mu7_Mu1_TkMu1_IsoTau15_v*',
54-
'HLT_Tau3Mu_Mu7_Mu1_TkMu1_Tau15_Charge1_v*',
55-
'HLT_Tau3Mu_Mu7_Mu1_TkMu1_Tau15_v*',
56-
'HLT_Trimuon5_3p5_2_Upsilon_Muon_v*',
57-
'HLT_TrimuonOpen_5_3p5_2_Upsilon_Muon_v*')
7+
# Read list of paths from the SecondaryDataset Triggerbit tag in the GT
8+
ReserveDMu.eventSetupPathsLabel = 'SecondaryDatasetTrigger' # TriggerBits tag label
9+
ReserveDMu.eventSetupPathsKey = 'ReserveDMu' # Dataset-specific key
5810
ReserveDMu.andOr = cms.bool( True )
5911
# we want to intentionally throw and exception
6012
# in case it does not match one of the HLT Paths

‎HLTrigger/HLTfilters/plugins/HLTHighLevel.cc‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ HLTHighLevel::HLTHighLevel(const edm::ParameterSet& iConfig)
4040
andOr_(iConfig.getParameter<bool>("andOr")),
4141
throw_(iConfig.getParameter<bool>("throw")),
4242
eventSetupPathsKey_(iConfig.getParameter<std::string>("eventSetupPathsKey")),
43+
eventSetupPathsLabel_(iConfig.getParameter<std::string>("eventSetupPathsLabel")),
4344
HLTPatterns_(iConfig.getParameter<std::vector<std::string> >("HLTPaths")),
4445
HLTPathsByName_(),
4546
HLTPathsByIndex_() {
@@ -55,7 +56,8 @@ HLTHighLevel::HLTHighLevel(const edm::ParameterSet& iConfig)
5556
<< HLTPatterns_.size() << " HLTPaths and\n"
5657
<< " eventSetupPathsKey " << eventSetupPathsKey_ << ", choose either of them.";
5758
}
58-
alcaRecotriggerBitsToken_ = esConsumes<AlCaRecoTriggerBits, AlCaRecoTriggerBitsRcd>();
59+
alcaRecotriggerBitsToken_ =
60+
esConsumes<AlCaRecoTriggerBits, AlCaRecoTriggerBitsRcd>(edm::ESInputTag("", eventSetupPathsLabel_));
5961
watchAlCaRecoTriggerBitsRcd_.emplace();
6062
}
6163
}
@@ -72,6 +74,7 @@ void HLTHighLevel::fillDescriptions(edm::ConfigurationDescriptions& descriptions
7274
desc.add<std::vector<std::string> >("HLTPaths", hltPaths);
7375
// # not empty => use read paths from AlCaRecoTriggerBitsRcd via this key
7476
desc.add<std::string>("eventSetupPathsKey", "");
77+
desc.add<std::string>("eventSetupPathsLabel", "");
7578
// # how to deal with multiple triggers: True (OR) accept if ANY is true, False (AND) accept if ALL are true
7679
desc.add<bool>("andOr", true);
7780
// # throw exception on unknown path names

‎HLTrigger/HLTfilters/plugins/HLTHighLevel.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ class HLTHighLevel : public edm::stream::EDFilter<> {
7777

7878
/// not empty => use read paths from AlCaRecoTriggerBitsRcd via this key
7979
const std::string eventSetupPathsKey_;
80+
const std::string eventSetupPathsLabel_;
8081
/// Watcher to be created and used if 'eventSetupPathsKey_' non empty:
8182
std::optional<edm::ESWatcher<AlCaRecoTriggerBitsRcd>> watchAlCaRecoTriggerBitsRcd_;
8283
/// ESGetToken to read AlCaRecoTriggerBits

0 commit comments

Comments
 (0)