Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

removal of last mentions of "HLTSchedule" #36395

Merged
merged 2 commits into from
Dec 9, 2021
Merged

removal of last mentions of "HLTSchedule" #36395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4df0e3b
remove obsolete renaming of "HLTSchedule" in customizeHLTforALL
missirol Dec 7, 2021
c90e606
remove last mentions of "HLTSchedule" outside HLTrigger/
missirol Dec 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 1 addition & 3 deletions Calibration/IsolatedParticles/test/python/HLT_IsoTrig_Data_New1.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,6 @@
process.HLTEndSequence
)

process.HLTSchedule = cms.Schedule( *(process.HLTriggerFirstPath,process.HLT_IsoTrackHE_v16,process.HLT_IsoTrackHB_v15,process.HLTriggerFinalPath))


## remove any instance of the FastTimerService
Expand Down Expand Up @@ -223,8 +222,7 @@
# Schedule definition
#process.schedule = cms.Schedule(process.raw2digi_step,process.L1Reco_step,process.reconstruction_step,process.eventinterpretaion_step,process.prevalidation_step,process.validation_step,process.dqmoffline_step,process.endjob_step,process.FEVTDEBUGHLToutput_step,process.DQMoutput_step)
#process.schedule = cms.Schedule(process.digitisation_step,process.L1simulation_step,process.digi2raw_step)
process.schedule = cms.Schedule(process.HLTSchedule)
#process.schedule.extend(process.HLTSchedule)
process.schedule = cms.Schedule( *(process.HLTriggerFirstPath,process.HLT_IsoTrackHE_v16,process.HLT_IsoTrackHB_v15,process.HLTriggerFinalPath))
process.schedule.extend([process.raw2digi_step,process.L1Reco_step,process.reconstruction_step,process.eventinterpretaion_step])
process.schedule.extend([process.analyze])
#process.schedule.extend([process.endjob_step,process.FEVTDEBUGHLToutput_step])
Expand Down
4 changes: 1 addition & 3 deletions Calibration/IsolatedParticles/test/python/HLT_IsoTrig_MC_New0.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,6 @@
process.HLTEndSequence
)

process.HLTSchedule = cms.Schedule( *(process.HLTriggerFirstPath,process.HLT_IsoTrackHE_v16,process.HLT_IsoTrackHB_v15,process.HLTriggerFinalPath))

# remove any instance of the FastTimerService
if 'FastTimerService' in process.__dict__:
del process.FastTimerService
Expand Down Expand Up @@ -181,7 +179,7 @@
process.endjob_step = cms.EndPath(process.endOfProcess)

process.schedule = cms.Schedule(process.digitisation_step,process.L1simulation_step,process.digi2raw_step)
process.schedule.extend(process.HLTSchedule)
process.schedule.extend([process.HLTriggerFirstPath,process.HLT_IsoTrackHE_v16,process.HLT_IsoTrackHB_v15,process.HLTriggerFinalPath])
process.schedule.extend([process.raw2digi_step,process.L1Reco_step,process.reconstruction_step,process.eventinterpretaion_step])
process.schedule.extend([process.analyze])
process.schedule.extend([process.FastTimerOutput])
Expand Down
4 changes: 1 addition & 3 deletions Calibration/IsolatedParticles/test/python/HLT_IsoTrig_MC_New1.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,6 @@
process.HLTEndSequence
)

process.HLTSchedule = cms.Schedule( *(process.HLTriggerFirstPath,process.HLT_IsoTrackHE_v16,process.HLT_IsoTrackHB_v15,process.HLTriggerFinalPath))

# remove any instance of the FastTimerService
if 'FastTimerService' in process.__dict__:
del process.FastTimerService
Expand Down Expand Up @@ -207,7 +205,7 @@
process.endjob_step = cms.EndPath(process.endOfProcess)

process.schedule = cms.Schedule(process.digitisation_step,process.L1simulation_step,process.digi2raw_step)
process.schedule.extend(process.HLTSchedule)
process.schedule.extend([process.HLTriggerFirstPath,process.HLT_IsoTrackHE_v16,process.HLT_IsoTrackHB_v15,process.HLTriggerFinalPath])
process.schedule.extend([process.raw2digi_step,process.L1Reco_step,process.reconstruction_step,process.eventinterpretaion_step])
process.schedule.extend([process.dqmoffline_step])
process.schedule.extend([process.e])
Expand Down
229 changes: 114 additions & 115 deletions Calibration/IsolatedParticles/test/python/HLT_IsoTrig_MC_New2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,120 +125,6 @@
process.HLTEndSequence
)

process.HLTSchedule = cms.Schedule( *(process.HLTriggerFirstPath,
process.HLT_AK8PFHT700_TrimR0p1PT0p03Mass50_v1,
process.HLT_DoubleMu33NoFiltersNoVtx_v1,
process.HLT_DoubleMu38NoFiltersNoVtx_v1,
process.HLT_DoubleMu23NoFiltersNoVtxDisplaced_v1,
process.HLT_DoubleMu28NoFiltersNoVtxDisplaced_v1,
process.HLT_Ele20WP60_Ele8_Mass55_v1,
process.HLT_Ele25WP60_SC4_Mass55_v1,
process.HLT_IsoMu17_eta2p1_v1,
process.HLT_DoubleIsoMu17_eta2p1_v1,
process.HLT_IsoMu24_eta2p1_LooseIsoPFTau20_v1,
process.HLT_IsoMu20_eta2p1_CentralPFJet30_BTagCSV_v1,
process.HLT_IsoMu20_eta2p1_TriCentralPFJet40_v1,
process.HLT_IsoMu20_eta2p1_TriCentralPFJet60_50_35_v1,
process.HLT_IsoMu20_eta2p1_v1,process.HLT_IsoMu24_v1,
process.HLT_IsoMu24_eta2p1_CentralPFJet30_BTagCSV_v1,
process.HLT_IsoMu24_eta2p1_TriCentralPFJet40_v1,
process.HLT_IsoMu24_eta2p1_TriCentralPFJet60_50_35_v1,
process.HLT_IsoMu24_eta2p1_v1,
process.HLT_IsoTkMu20_eta2p1_v1,
process.HLT_IsoTkMu24_v1,
process.HLT_IsoTkMu24_eta2p1_v1,
process.HLT_JetE30_NoBPTX3BX_NoHalo_v1,
process.HLT_JetE30_NoBPTX_v1,
process.HLT_JetE50_NoBPTX3BX_NoHalo_v1,
process.HLT_JetE70_NoBPTX3BX_NoHalo_v1,
process.HLT_L2DoubleMu23_NoVertex_v1,
process.HLT_L2DoubleMu28_NoVertex_2Cha_Angle2p5_Mass10_v1,
process.HLT_L2DoubleMu38_NoVertex_2Cha_Angle2p5_Mass10_v1,
process.HLT_L2Mu10_NoVertex_NoBPTX3BX_NoHalo_v1,
process.HLT_L2Mu10_NoVertex_NoBPTX_v1,
process.HLT_L2Mu20_NoVertex_3Sta_NoBPTX3BX_NoHalo_v1,
process.HLT_L2Mu30_NoVertex_3Sta_NoBPTX3BX_NoHalo_v1,
process.HLT_Mu17_Mu8_DZ_v1,
process.HLT_Mu17_TkMu8_DZ_v1,
process.HLT_Mu17_TrkIsoVVL_Mu8_TrkIsoVVL_v1,
process.HLT_Mu17_TrkIsoVVL_Mu8_TrkIsoVVL_DZ_v1,
process.HLT_Mu17_TrkIsoVVL_TkMu8_TrkIsoVVL_v1,
process.HLT_Mu17_TrkIsoVVL_TkMu8_TrkIsoVVL_DZ_v1,
process.HLT_Mu40_eta2p1_PFJet200_PFJet50_v1,
process.HLT_Mu24_eta2p1_v1,
process.HLT_TkMu24_eta2p1_v1,
process.HLT_PFHT350_PFMET120_NoiseCleaned_v1,
process.HLT_PFHT550_4Jet_v1,
process.HLT_PFHT650_4Jet_v1,
process.HLT_PFHT750_4Jet_v1,
process.HLT_PFHT350_v1,
process.HLT_PFHT600_v1,
process.HLT_PFHT650_v1,
process.HLT_PFHT900_v1,
process.HLT_PFJet40_v1,
process.HLT_PFJet60_v1,
process.HLT_PFJet80_v1,
process.HLT_PFJet140_v1,
process.HLT_PFJet200_v1,
process.HLT_DiPFJetAve30_HFJEC_v1,
process.HLT_DiPFJetAve60_HFJEC_v1,
process.HLT_DiPFJetAve80_HFJEC_v1,
process.HLT_DiPFJetAve100_HFJEC_v1,
process.HLT_DiPFJetAve160_HFJEC_v1,
process.HLT_DiPFJet40_DEta3p5_MJJ600_PFMETNoMu80_v1,
process.HLT_HT200_v1,
process.HLT_HT250_v1,
process.HLT_HT300_v1,
process.HLT_HT350_v1,
process.HLT_HT400_v1,
process.HLT_HT200_DiJet90_AlphaT0p57_v1,
process.HLT_HT250_DiJet90_AlphaT0p55_v1,
process.HLT_HT300_DiJet90_AlphaT0p53_v1,
process.HLT_HT350_DiJet90_AlphaT0p52_v1,
process.HLT_HT400_DiJet90_AlphaT0p51_v1,
process.HLT_Photon22_R9Id90_HE10_Iso40_EBOnly_PFMET40_v1,
process.HLT_Photon22_R9Id90_HE10_Iso40_EBOnly_VBF_v1,
process.HLT_Photon36_R9Id90_HE10_Iso40_EBOnly_PFMET40_v1,
process.HLT_Photon36_R9Id90_HE10_Iso40_EBOnly_VBF_v1,
process.HLT_Mu17_TrkIsoVVL_v1,
process.HLT_Mu24_TrkIsoVVL_v1,
process.HLT_Mu34_TrkIsoVVL_v1,
process.HLT_Ele23_CaloIdL_TrackIdL_IsoVL_PFJet30_v1,
process.HLT_Ele33_CaloIdL_TrackIdL_IsoVL_PFJet30_v1,
process.HLT_BTagMu_DiJet20_Mu5_v1,
process.HLT_BTagMu_DiJet40_Mu5_v1,
process.HLT_BTagMu_DiJet70_Mu5_v1,
process.HLT_BTagMu_DiJet110_Mu5_v1,
process.HLT_Ele23_CaloIdL_TrackIdL_IsoVL_v1,
process.HLT_PFHT650_WideJetMJJ900DEtaJJ1p5_v1,
process.HLT_PFHT650_WideJetMJJ950DEtaJJ1p5_v1,
process.HLT_Photon22_v1,
process.HLT_Photon36_v1,
process.HLT_Photon22_R9Id90_HE10_Iso40_v1,
process.HLT_Photon36_R9Id90_HE10_Iso40_v1,
process.HLT_Dimuon0_Jpsi_Muon_v1,
process.HLT_Dimuon0_Upsilon_Muon_v1,
process.HLT_Mu17_Mu8_SameSign_v1,
process.HLT_Mu17_Mu8_SameSign_DPhi_v1,
process.HLT_HT750_DisplacedDijet80_Inclusive_v1,
process.HLT_HT650_DisplacedDijet80_Inclusive_v1,
process.HLT_HT350_DisplacedDijet80_Tight_DisplacedTrack_v1,
process.HLT_HT350_DisplacedDijet80_DisplacedTrack_v1,
process.HLT_DoubleEle8_CaloIdL_TrkIdVL_Mass8_PFHT300_v1,
process.HLT_Mu10_CentralPFJet40_BTagCSV_v1,
process.HLT_Ele10_CaloId_TrackIdVL_CentralPFJet40_BTagCSV_v1,
process.HLT_Ele15_IsoVVVL_BTagtop8CSV07_PFHT400_v1,
process.HLT_Ele15_IsoVVVL_PFHT400_PFMET70_v1,
process.HLT_Ele15_IsoVVVL_PFHT600_v1,
process.HLT_Ele15_PFHT300_v1,
process.HLT_Physics_v1,
process.HLT_ReducedIterativeTracking_v1,
process.HLT_ZeroBias_v1,
process.HLT_IsoTrackHE_v16,
process.HLT_IsoTrackHB_v15,
process.HLTriggerFinalPath)
)

# remove any instance of the FastTimerService
if 'FastTimerService' in process.__dict__:
del process.FastTimerService
Expand Down Expand Up @@ -295,7 +181,120 @@
process.endjob_step = cms.EndPath(process.endOfProcess)

process.schedule = cms.Schedule(process.digitisation_step,process.L1simulation_step,process.digi2raw_step)
process.schedule.extend(process.HLTSchedule)
process.schedule.extend([
process.HLTriggerFirstPath,
process.HLT_AK8PFHT700_TrimR0p1PT0p03Mass50_v1,
process.HLT_DoubleMu33NoFiltersNoVtx_v1,
process.HLT_DoubleMu38NoFiltersNoVtx_v1,
process.HLT_DoubleMu23NoFiltersNoVtxDisplaced_v1,
process.HLT_DoubleMu28NoFiltersNoVtxDisplaced_v1,
process.HLT_Ele20WP60_Ele8_Mass55_v1,
process.HLT_Ele25WP60_SC4_Mass55_v1,
process.HLT_IsoMu17_eta2p1_v1,
process.HLT_DoubleIsoMu17_eta2p1_v1,
process.HLT_IsoMu24_eta2p1_LooseIsoPFTau20_v1,
process.HLT_IsoMu20_eta2p1_CentralPFJet30_BTagCSV_v1,
process.HLT_IsoMu20_eta2p1_TriCentralPFJet40_v1,
process.HLT_IsoMu20_eta2p1_TriCentralPFJet60_50_35_v1,
process.HLT_IsoMu20_eta2p1_v1,process.HLT_IsoMu24_v1,
process.HLT_IsoMu24_eta2p1_CentralPFJet30_BTagCSV_v1,
process.HLT_IsoMu24_eta2p1_TriCentralPFJet40_v1,
process.HLT_IsoMu24_eta2p1_TriCentralPFJet60_50_35_v1,
process.HLT_IsoMu24_eta2p1_v1,
process.HLT_IsoTkMu20_eta2p1_v1,
process.HLT_IsoTkMu24_v1,
process.HLT_IsoTkMu24_eta2p1_v1,
process.HLT_JetE30_NoBPTX3BX_NoHalo_v1,
process.HLT_JetE30_NoBPTX_v1,
process.HLT_JetE50_NoBPTX3BX_NoHalo_v1,
process.HLT_JetE70_NoBPTX3BX_NoHalo_v1,
process.HLT_L2DoubleMu23_NoVertex_v1,
process.HLT_L2DoubleMu28_NoVertex_2Cha_Angle2p5_Mass10_v1,
process.HLT_L2DoubleMu38_NoVertex_2Cha_Angle2p5_Mass10_v1,
process.HLT_L2Mu10_NoVertex_NoBPTX3BX_NoHalo_v1,
process.HLT_L2Mu10_NoVertex_NoBPTX_v1,
process.HLT_L2Mu20_NoVertex_3Sta_NoBPTX3BX_NoHalo_v1,
process.HLT_L2Mu30_NoVertex_3Sta_NoBPTX3BX_NoHalo_v1,
process.HLT_Mu17_Mu8_DZ_v1,
process.HLT_Mu17_TkMu8_DZ_v1,
process.HLT_Mu17_TrkIsoVVL_Mu8_TrkIsoVVL_v1,
process.HLT_Mu17_TrkIsoVVL_Mu8_TrkIsoVVL_DZ_v1,
process.HLT_Mu17_TrkIsoVVL_TkMu8_TrkIsoVVL_v1,
process.HLT_Mu17_TrkIsoVVL_TkMu8_TrkIsoVVL_DZ_v1,
process.HLT_Mu40_eta2p1_PFJet200_PFJet50_v1,
process.HLT_Mu24_eta2p1_v1,
process.HLT_TkMu24_eta2p1_v1,
process.HLT_PFHT350_PFMET120_NoiseCleaned_v1,
process.HLT_PFHT550_4Jet_v1,
process.HLT_PFHT650_4Jet_v1,
process.HLT_PFHT750_4Jet_v1,
process.HLT_PFHT350_v1,
process.HLT_PFHT600_v1,
process.HLT_PFHT650_v1,
process.HLT_PFHT900_v1,
process.HLT_PFJet40_v1,
process.HLT_PFJet60_v1,
process.HLT_PFJet80_v1,
process.HLT_PFJet140_v1,
process.HLT_PFJet200_v1,
process.HLT_DiPFJetAve30_HFJEC_v1,
process.HLT_DiPFJetAve60_HFJEC_v1,
process.HLT_DiPFJetAve80_HFJEC_v1,
process.HLT_DiPFJetAve100_HFJEC_v1,
process.HLT_DiPFJetAve160_HFJEC_v1,
process.HLT_DiPFJet40_DEta3p5_MJJ600_PFMETNoMu80_v1,
process.HLT_HT200_v1,
process.HLT_HT250_v1,
process.HLT_HT300_v1,
process.HLT_HT350_v1,
process.HLT_HT400_v1,
process.HLT_HT200_DiJet90_AlphaT0p57_v1,
process.HLT_HT250_DiJet90_AlphaT0p55_v1,
process.HLT_HT300_DiJet90_AlphaT0p53_v1,
process.HLT_HT350_DiJet90_AlphaT0p52_v1,
process.HLT_HT400_DiJet90_AlphaT0p51_v1,
process.HLT_Photon22_R9Id90_HE10_Iso40_EBOnly_PFMET40_v1,
process.HLT_Photon22_R9Id90_HE10_Iso40_EBOnly_VBF_v1,
process.HLT_Photon36_R9Id90_HE10_Iso40_EBOnly_PFMET40_v1,
process.HLT_Photon36_R9Id90_HE10_Iso40_EBOnly_VBF_v1,
process.HLT_Mu17_TrkIsoVVL_v1,
process.HLT_Mu24_TrkIsoVVL_v1,
process.HLT_Mu34_TrkIsoVVL_v1,
process.HLT_Ele23_CaloIdL_TrackIdL_IsoVL_PFJet30_v1,
process.HLT_Ele33_CaloIdL_TrackIdL_IsoVL_PFJet30_v1,
process.HLT_BTagMu_DiJet20_Mu5_v1,
process.HLT_BTagMu_DiJet40_Mu5_v1,
process.HLT_BTagMu_DiJet70_Mu5_v1,
process.HLT_BTagMu_DiJet110_Mu5_v1,
process.HLT_Ele23_CaloIdL_TrackIdL_IsoVL_v1,
process.HLT_PFHT650_WideJetMJJ900DEtaJJ1p5_v1,
process.HLT_PFHT650_WideJetMJJ950DEtaJJ1p5_v1,
process.HLT_Photon22_v1,
process.HLT_Photon36_v1,
process.HLT_Photon22_R9Id90_HE10_Iso40_v1,
process.HLT_Photon36_R9Id90_HE10_Iso40_v1,
process.HLT_Dimuon0_Jpsi_Muon_v1,
process.HLT_Dimuon0_Upsilon_Muon_v1,
process.HLT_Mu17_Mu8_SameSign_v1,
process.HLT_Mu17_Mu8_SameSign_DPhi_v1,
process.HLT_HT750_DisplacedDijet80_Inclusive_v1,
process.HLT_HT650_DisplacedDijet80_Inclusive_v1,
process.HLT_HT350_DisplacedDijet80_Tight_DisplacedTrack_v1,
process.HLT_HT350_DisplacedDijet80_DisplacedTrack_v1,
process.HLT_DoubleEle8_CaloIdL_TrkIdVL_Mass8_PFHT300_v1,
process.HLT_Mu10_CentralPFJet40_BTagCSV_v1,
process.HLT_Ele10_CaloId_TrackIdVL_CentralPFJet40_BTagCSV_v1,
process.HLT_Ele15_IsoVVVL_BTagtop8CSV07_PFHT400_v1,
process.HLT_Ele15_IsoVVVL_PFHT400_PFMET70_v1,
process.HLT_Ele15_IsoVVVL_PFHT600_v1,
process.HLT_Ele15_PFHT300_v1,
process.HLT_Physics_v1,
process.HLT_ReducedIterativeTracking_v1,
process.HLT_ZeroBias_v1,
process.HLT_IsoTrackHE_v16,
process.HLT_IsoTrackHB_v15,
process.HLTriggerFinalPath
])
process.schedule.extend([process.raw2digi_step,process.L1Reco_step,process.reconstruction_step,process.eventinterpretaion_step])
process.schedule.extend([process.analyze])
process.schedule.extend([process.FastTimerOutput])
Expand Down
9 changes: 0 additions & 9 deletions HLTrigger/Configuration/python/customizeHLTforALL.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,6 @@

def customizeHLTforAll(process, menuType = "GRun", _customInfo = None):

# rename "HLTSchedule" to "schedule":
# CMSSW policy is to have at most 1 schedule
# in the cms.Process, named "schedule"
if hasattr(process, 'HLTSchedule'):
if process.schedule_() != None:
raise Exception('process.schedule already exists')
process.setSchedule_(process.HLTSchedule)
del process.HLTSchedule

if (_customInfo is not None):

_maxEvents = _customInfo['maxEvents']
Expand Down
1 change: 0 additions & 1 deletion RecoLuminosity/LumiProducer/test/validation/fastsimSampleWithHLT_1E31_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@

# HLT schedule
process.schedule = cms.Schedule()
process.schedule.extend(process.HLTSchedule)

# To write out events
process.load("FastSimulation.Configuration.EventContent_cff")
Expand Down
2 changes: 0 additions & 2 deletions Validation/HGCalValidation/test/python/testHGCalSimWatcherV13_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
process.load('Configuration.StandardSequences.SimL1Emulator_cff')
process.load('Configuration.StandardSequences.L1TrackTrigger_cff')
process.load('Configuration.StandardSequences.DigiToRaw_cff')
process.load('HLTrigger.Configuration.HLT_Fake2_cff')
process.load('Configuration.StandardSequences.RawToDigi_cff')
process.load('Configuration.StandardSequences.L1Reco_cff')
process.load('Configuration.StandardSequences.Reconstruction_cff')
Expand Down Expand Up @@ -145,7 +144,6 @@
process.L1simulation_step,
process.L1TrackTrigger_step,
process.digi2raw_step,
# process.HLTSchedule,
process.raw2digi_step,
process.L1Reco_step,
process.reconstruction_step,
Expand Down