diff --git a/Calibration/IsolatedParticles/test/python/HLT_IsoTrig_Data_New1.py b/Calibration/IsolatedParticles/test/python/HLT_IsoTrig_Data_New1.py index c6a7484fbcb79..9c952f40dceeb 100644 --- a/Calibration/IsolatedParticles/test/python/HLT_IsoTrig_Data_New1.py +++ b/Calibration/IsolatedParticles/test/python/HLT_IsoTrig_Data_New1.py @@ -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 @@ -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]) diff --git a/Calibration/IsolatedParticles/test/python/HLT_IsoTrig_MC_New0.py b/Calibration/IsolatedParticles/test/python/HLT_IsoTrig_MC_New0.py index e89d8b97deac3..3df37c5e16036 100644 --- a/Calibration/IsolatedParticles/test/python/HLT_IsoTrig_MC_New0.py +++ b/Calibration/IsolatedParticles/test/python/HLT_IsoTrig_MC_New0.py @@ -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 @@ -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]) diff --git a/Calibration/IsolatedParticles/test/python/HLT_IsoTrig_MC_New1.py b/Calibration/IsolatedParticles/test/python/HLT_IsoTrig_MC_New1.py index 99a2ec9ed4d00..0375945bb8d50 100644 --- a/Calibration/IsolatedParticles/test/python/HLT_IsoTrig_MC_New1.py +++ b/Calibration/IsolatedParticles/test/python/HLT_IsoTrig_MC_New1.py @@ -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 @@ -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]) diff --git a/Calibration/IsolatedParticles/test/python/HLT_IsoTrig_MC_New2.py b/Calibration/IsolatedParticles/test/python/HLT_IsoTrig_MC_New2.py index 8aadfe992094c..3c0217043318c 100644 --- a/Calibration/IsolatedParticles/test/python/HLT_IsoTrig_MC_New2.py +++ b/Calibration/IsolatedParticles/test/python/HLT_IsoTrig_MC_New2.py @@ -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 @@ -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]) diff --git a/HLTrigger/Configuration/python/customizeHLTforALL.py b/HLTrigger/Configuration/python/customizeHLTforALL.py index 60885598ff1bb..d4ad3bbe875dd 100644 --- a/HLTrigger/Configuration/python/customizeHLTforALL.py +++ b/HLTrigger/Configuration/python/customizeHLTforALL.py @@ -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'] diff --git a/RecoLuminosity/LumiProducer/test/validation/fastsimSampleWithHLT_1E31_cfg.py b/RecoLuminosity/LumiProducer/test/validation/fastsimSampleWithHLT_1E31_cfg.py index a6384af53f3ac..4e4744638fc6d 100644 --- a/RecoLuminosity/LumiProducer/test/validation/fastsimSampleWithHLT_1E31_cfg.py +++ b/RecoLuminosity/LumiProducer/test/validation/fastsimSampleWithHLT_1E31_cfg.py @@ -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") diff --git a/Validation/HGCalValidation/test/python/testHGCalSimWatcherV13_cfg.py b/Validation/HGCalValidation/test/python/testHGCalSimWatcherV13_cfg.py index 28a92c16600a9..048d8eb066030 100644 --- a/Validation/HGCalValidation/test/python/testHGCalSimWatcherV13_cfg.py +++ b/Validation/HGCalValidation/test/python/testHGCalSimWatcherV13_cfg.py @@ -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') @@ -145,7 +144,6 @@ process.L1simulation_step, process.L1TrackTrigger_step, process.digi2raw_step, -# process.HLTSchedule, process.raw2digi_step, process.L1Reco_step, process.reconstruction_step,