From 183087b321c9fb562b738b77aa7de9084647c64e Mon Sep 17 00:00:00 2001 From: Kevin Pedro Date: Fri, 23 Sep 2016 17:11:40 -0500 Subject: [PATCH 1/2] remove (most) direct importing of Configuration.StandardSequences.Eras --- .../Hcal_Conditions_forGlobalTag_cff.py | 4 +- .../python/CSCChannelMapper_cfi.py | 4 +- .../CSCCalibration/python/CSCIndexer_cfi.py | 4 +- .../HBHENoiseFilterResultProducer_cfi.py | 4 +- .../EventContent/python/EventContent_cff.py | 17 +++-- .../python/DataMixerPreMix_cff.py | 4 +- .../python/DigiToRawDM_cff.py | 6 +- .../StandardSequences/python/DigiToRaw_cff.py | 10 ++- .../python/Digi_PreMix_cff.py | 4 +- .../StandardSequences/python/Digi_cff.py | 8 +- .../StandardSequences/python/RawToDigi_cff.py | 12 +-- .../python/Reconstruction_cff.py | 22 +++--- .../python/SimL1EmulatorDM_cff.py | 4 +- .../SimL1EmulatorRepack_Full2015Data_cff.py | 4 +- .../python/SimL1EmulatorRepack_FullMC_cff.py | 4 +- .../SimL1EmulatorRepack_FullSimTP_cff.py | 4 +- .../python/SimL1EmulatorRepack_Full_cff.py | 4 +- .../python/SimL1EmulatorRepack_uGT_cff.py | 4 +- .../python/SimL1Emulator_cff.py | 4 +- DQM/BeamMonitor/python/AlcaBeamMonitor_cfi.py | 4 +- .../python/OfflineSourceSequence_cosmic.py | 4 +- .../python/OfflineSourceSequence_hi.py | 4 +- .../python/OfflineSourceSequence_pp.py | 4 +- DQM/L1TMonitor/python/L1ExtraDQM_cff.py | 26 +++---- DQM/L1TMonitor/python/L1TCSCTF_cfi.py | 4 +- DQM/Physics/python/DQMPhysics_cff.py | 4 +- .../python/SiPixelOfflineDQM_client_cff.py | 8 +- .../python/SiPixelOfflineDQM_source_cff.py | 4 +- .../python/SiPixelMonitorCluster_cfi.py | 4 +- .../python/SiPixelMonitorDigi_cfi.py | 4 +- .../python/SiPixelMonitorRawData_cfi.py | 4 +- .../python/SiPixelMonitorRecHit_cfi.py | 4 +- .../python/SiPixelMonitorEfficiency_cfi.py | 4 +- .../python/SiPixelMonitorTrack_cfi.py | 4 +- .../python/SiStripSourceConfigTier0_cff.py | 10 +-- .../python/DQMOffline_CRT_cff.py | 4 +- .../python/DQMOffline_SecondStep_cff.py | 6 +- .../Configuration/python/DQMOffline_cff.py | 14 ++-- .../python/jetMETDQMOfflineSource_cff.py | 4 +- .../python/L1TriggerDqmOffline_cff.py | 74 +++++++++---------- DQMOffline/Muon/python/muonAnalyzer_cff.py | 7 +- .../CSCRawToDigi/python/cscPacker_cfi.py | 8 +- .../HcalRawToDigi/python/HcalDigiToRaw_cfi.py | 6 +- .../python/rawDataCollectorByLabel_cfi.py | 4 +- .../python/rawDataCollector_cfi.py | 7 +- .../python/SiPixelDigiToRaw_cfi.py | 4 +- .../python/SiPixelRawToDigi_cfi.py | 4 +- .../Calorimetry/python/Calorimetry_cff.py | 4 +- .../python/TrackerSimHits_cfi.py | 4 +- .../python/cscGeometryDB_cfi.py | 4 +- .../python/cscGeometry_cfi.py | 4 +- .../Btag/python/HltBtagValidation_cff.py | 4 +- .../Common/python/HLTValidationHarvest_cff.py | 8 +- .../Common/python/HLTValidation_cff.py | 9 ++- .../SUSYBSM_Ele_HT_BTag_SingleLepton_cff.py | 4 +- ...SUSYBSM_Ele_HT_Control_SingleLepton_cff.py | 4 +- .../SUSYBSM_Ele_HT_MET_SingleLepton_cff.py | 6 +- .../python/SUSYBSM_Ele_HT_SingleLepton_cff.py | 8 +- IOMC/RandomEngine/python/IOMC_cff.py | 10 ++- .../python/csctfTrackDigis_cfi.py | 4 +- .../python/cscTriggerPrimitiveDigis_cfi.py | 10 ++- .../ConditionalStage1Configuration_cff.py | 4 +- .../Configuration/python/L1TDigiToRaw_cff.py | 17 +++-- .../Configuration/python/L1TRawToDigi_cff.py | 9 ++- L1Trigger/Configuration/python/L1TReco_cff.py | 12 +-- .../python/L1Trigger_EventContent_cff.py | 10 +-- .../python/SimL1TechnicalTriggers_cff.py | 4 +- .../Configuration/python/customiseReEmul.py | 18 ++--- .../Configuration/python/customiseSettings.py | 1 - .../python/customise_ReEmulateL1_cff.py | 16 ++-- .../python/l1extraParticles_cfi.py | 26 +++---- .../python/hackConditions_cff.py | 12 +-- .../L1TCalorimeter/python/simDigis_cff.py | 9 ++- .../L1TGlobal/python/hackConditions_cff.py | 9 ++- L1Trigger/L1TGlobal/python/simDigis_cff.py | 6 +- .../L1TMuon/python/hackConditions_cff.py | 9 ++- L1Trigger/L1TMuon/python/simDigis_cff.py | 6 +- .../python/slimming/metFilterPaths_cff.py | 8 +- .../python/RecoEcal_EventContent_cff.py | 8 +- ...particleFlowSuperClusteringSequence_cff.py | 6 +- .../python/reducedRecHitsSequence_cff.py | 4 +- .../python/RecoEgamma_EventContent_cff.py | 8 +- .../python/ecalDrivenElectronSeeds_cfi.py | 4 +- .../python/reducedEgamma_cfi.py | 4 +- .../python/PhotonIDValueMapProducer_cfi.py | 4 +- .../Configuration/python/CaloTowersES_cfi.py | 4 +- .../JetProducers/python/caloJetsForTrk_cff.py | 14 ++-- .../python/RecoLocalCalo_EventContent_cff.py | 8 +- .../Configuration/python/RecoLocalCalo_cff.py | 4 +- .../python/ecalLocalRecoSequence_cff.py | 4 +- .../python/ecalLocalReco_EventContent_cff.py | 6 +- .../python/hcalGlobalReco_cff.py | 6 +- .../Configuration/python/hcalLocalReco_cff.py | 20 ++--- .../CSCRecHitD/python/cscRecHitD_cfi.py | 6 +- .../python/RecoLocalMuon_EventContent_cff.py | 7 +- .../Configuration/python/RecoLocalMuon_cff.py | 7 +- .../RPCRecHit/python/rpcRecHits_cfi.py | 4 +- .../RecoLocalTracker_EventContent_cff.py | 6 +- .../python/RecoLocalTracker_cff.py | 4 +- .../python/Phase2ITPixelClusterizer_cfi.py | 4 +- .../python/SiPixelClusterizer_cfi.py | 4 +- .../python/PixelCPEGeneric_cfi.py | 4 +- .../python/PixelCPETemplateReco_cfi.py | 4 +- .../python/SiStripClusterChargeCut_cfi.py | 6 +- .../python/SiStripClusterizer_RealData_cfi.py | 4 +- .../python/SiStripZeroSuppression_cfi.py | 4 +- .../python/bunchSpacingProducer_cfi.py | 6 +- RecoMET/Configuration/python/RecoMET_cff.py | 4 +- .../EcalDeadCellTriggerPrimitiveFilter_cfi.py | 4 +- RecoMET/METFilters/python/metFilters_cff.py | 4 +- .../MergeDisplacedTrackCollections_cff.py | 4 +- .../python/RecoMuonPPonly_cff.py | 13 ++-- .../python/RecoMuon_EventContent_cff.py | 8 +- .../preDuplicateMergingDisplacedTracks_cfi.py | 7 +- .../python/GlobalMuonRefitter_cff.py | 4 +- .../GlobalTrajectoryBuilderCommon_cff.py | 4 +- .../python/TrackerKinkFinder_cfi.py | 4 +- .../python/muons1stStep_cfi.py | 7 +- .../python/MuonTrackLoader_cff.py | 4 +- .../RecoParticleFlow_EventContent_cff.py | 15 ++-- .../python/RecoParticleFlow_cff.py | 10 +-- .../python/particleFlowClusterHO_cfi.py | 4 +- .../python/particleFlowCluster_cff.py | 9 ++- .../python/particleFlowRecHitHO_cfi.py | 4 +- .../python/particleFlowBlock_cff.py | 4 +- .../python/trackerDrivenElectronSeeds_cfi.py | 4 +- .../python/RecoPixelVertexing_cff.py | 10 ++- .../ClusterShapeHitFilterESProducer_cfi.py | 8 +- .../python/PixelTrackReconstruction_cfi.py | 10 ++- .../PixelTripletLargeTipGenerator_cfi.py | 4 +- .../python/quadrupletseedmerging_cff.py | 10 ++- .../python/ConversionStep_cff.py | 24 +++--- ...TrajectorySeedProducerFromSingleLeg_cfi.py | 10 ++- .../python/MergeTrackCollections_cff.py | 4 +- .../python/TrackCutClassifier_cff.py | 10 ++- .../python/earlyGeneralTracks_cfi.py | 13 ++-- .../python/multiTrackSelector_cfi.py | 10 ++- .../preDuplicateMergingGeneralTracks_cfi.py | 7 +- .../python/DetachedQuadStep_cff.py | 46 ++++++------ .../python/DetachedTripletStep_cff.py | 16 ++-- .../python/ElectronSeeds_cff.py | 42 ++++++----- .../python/HighPtTripletStep_cff.py | 29 ++++---- .../python/InitialStepPreSplitting_cff.py | 22 +++--- .../python/InitialStep_cff.py | 42 ++++++----- .../python/JetCoreRegionalStep_cff.py | 4 +- .../python/LowPtQuadStep_cff.py | 36 ++++----- .../python/LowPtTripletStep_cff.py | 54 +++++++------- .../python/MixedTripletStep_cff.py | 48 ++++++------ .../python/MuonSeededStep_cff.py | 19 ++--- .../python/PixelLessStep_cff.py | 14 ++-- .../python/PixelPairStep_cff.py | 43 ++++++----- .../python/TobTecStep_cff.py | 41 +++++----- .../MeasurementTrackerESProducer_cfi.py | 4 +- .../MeasurementTrackerEventProducer_cfi.py | 4 +- .../python/inOutSeedsFromTrackerMuons_cfi.py | 4 +- .../python/GlobalMixedSeeds_cff.py | 4 +- .../GlobalSeedsFromPairsWithVertices_cff.py | 4 +- .../python/GlobalSeedsFromTriplets_cff.py | 4 +- .../SeedFromConsecutiveHitsCreator_cfi.py | 4 +- ...edGeneratorFromRegionHitsEDProducer_cfi.py | 4 +- .../python/PixelLayerTriplets_cfi.py | 10 ++- .../GlobalTrackingRegionWithVertices_cfi.py | 4 +- .../TrackProducer/python/TrackProducer_cfi.py | 4 +- .../python/TTRHBuilderWithTemplate_cfi.py | 4 +- ...ntTrackingRecHitBuilderWithoutRefit_cfi.py | 4 +- .../TransientTrackingRecHitBuilder_cfi.py | 4 +- .../python/RecoVertex_EventContent_cff.py | 4 +- .../Configuration/python/RecoVertex_cff.py | 8 +- .../python/OfflinePrimaryVertices_cfi.py | 4 +- .../Configuration/python/phase2TkFlat.py | 1 - .../Configuration/python/phase2TkTilted.py | 1 - .../python/phase2TkTilted4021.py | 1 - .../python/SimCalorimetry_EventContent_cff.py | 15 ++-- .../python/SimCalorimetry_cff.py | 4 +- .../python/hcalDigiSequence_cff.py | 4 +- .../python/ecalTriggerPrimitiveDigis_cff.py | 4 +- .../ecalTriggerPrimitiveDigis_mc_cff.py | 4 +- ...iggerPrimitiveDigis_with_suppressed_cff.py | 4 +- .../python/hcalSimParameters_cfi.py | 10 ++- .../python/hcalUnsuppressedDigis_cfi.py | 7 +- .../python/hcalDigisRealistic_cfi.py | 4 +- SimG4Core/Application/python/g4SimHits_cfi.py | 4 +- .../Configuration/python/SimG4Core_cff.py | 7 +- .../python/SimGeneral_EventContent_cff.py | 15 ++-- .../python/mixOne_simraw_on_sim_cfi.py | 4 +- .../python/SiPixelSimParameters_cfi.py | 4 +- .../MixingModule/python/aliases_PreMix_cfi.py | 11 +-- SimGeneral/MixingModule/python/aliases_cfi.py | 11 +-- .../python/caloTruthProducer_cfi.py | 4 +- .../MixingModule/python/digi_MixPreMix_cfi.py | 7 +- .../MixingModule/python/digitizers_cfi.py | 17 +++-- .../MixingModule/python/ecalDigitizer_cfi.py | 11 +-- .../MixingModule/python/mixObjects_cfi.py | 20 ++--- .../python/trackingTruthProducer_cfi.py | 11 +-- .../python/TrackingParticleSelection_cfi.py | 7 +- .../python/simHitTPAssociation_cfi.py | 4 +- ...ckingParticleNumberOfLayersProducer_cff.py | 4 +- .../CSCDigitizer/python/muonCSCDigis_cfi.py | 10 +-- .../python/SimMuon_EventContent_cff.py | 17 +++-- SimMuon/Configuration/python/SimMuon_cff.py | 9 ++- SimMuon/DTDigitizer/python/muonDTDigis_cfi.py | 4 +- .../python/MuonAssociatorByHits_cfi.py | 13 ++-- ...muonAssociatorByHitsNoSimHitsHelper_cfi.py | 6 +- .../RPCDigitizer/python/muonRPCDigis_cfi.py | 7 +- .../python/quickTrackAssociatorByHits_cfi.py | 4 +- .../python/DetIdAssociatorESProducer_cff.py | 10 ++- .../python/globalValidation_cff.py | 11 +-- .../python/postValidation_cff.py | 11 +-- .../python/DTRecHitQualityAll_cfi.py | 4 +- .../DTRecHits/python/DTRecHitQuality_cfi.py | 4 +- .../python/ecalDigisValidation_cfi.py | 4 +- .../ecalSelectiveReadoutValidation_cfi.py | 4 +- .../python/ecalSimHitsValidation_cfi.py | 4 +- .../python/ecalRecHitsValidation_cfi.py | 4 +- .../HcalDigis/python/HcalDigisParam_cfi.py | 4 +- .../HcalHits/python/HcalSimHitStudy_cfi.py | 4 +- .../python/SimHitsValidationHcal_cfi.py | 4 +- .../hcalRecHitsValidationSequence_cff.py | 4 +- .../python/cscDigiValidation_cfi.py | 4 +- .../python/dtDigiValidation_cfi.py | 4 +- .../MuonHits/python/muonHitsValidation_cfi.py | 4 +- .../python/muonIdVal_cfi.py | 4 +- .../python/validationMuonRPCDigis_cfi.py | 4 +- .../python/rpcRecHitValidation_cfi.py | 4 +- .../python/photonPostProcessor_cff.py | 4 +- .../RecoEgamma/python/photonValidator_cfi.py | 4 +- .../RecoEgamma/python/tkConvValidator_cfi.py | 4 +- .../RecoMuon/python/MuonTrackValidator_cfi.py | 4 +- Validation/RecoMuon/python/associators_cff.py | 4 +- .../RecoMuon/python/muonValidation_cff.py | 4 +- .../RecoTau/python/DQMMCValidation_cfi.py | 4 +- ...MTVHistoProducerAlgoForTrackerBlock_cfi.py | 7 +- .../python/MultiTrackValidator_cfi.py | 4 +- .../python/SiTrackingRecHitsValid_cff.py | 4 +- .../RecoTrack/python/TrackValidation_cff.py | 14 ++-- ...ckingParticleSelectionForEfficiency_cfi.py | 10 ++- ...kingParticleSelectionsForEfficiency_cff.py | 14 ++-- .../RecoTrack/python/trackingNtuple_cff.py | 7 +- .../PrimaryVertexAnalyzer4PUSlimmed_cfi.py | 16 ++-- 239 files changed, 1078 insertions(+), 961 deletions(-) mode change 100755 => 100644 RecoTracker/FinalTrackSelectors/python/multiTrackSelector_cfi.py diff --git a/CalibCalorimetry/HcalPlugins/python/Hcal_Conditions_forGlobalTag_cff.py b/CalibCalorimetry/HcalPlugins/python/Hcal_Conditions_forGlobalTag_cff.py index cb641cbef70f2..50530030a8708 100644 --- a/CalibCalorimetry/HcalPlugins/python/Hcal_Conditions_forGlobalTag_cff.py +++ b/CalibCalorimetry/HcalPlugins/python/Hcal_Conditions_forGlobalTag_cff.py @@ -103,8 +103,8 @@ es_prefer_hcalHardcode = cms.ESPrefer("HcalHardcodeCalibrations", "es_hardcode") -from Configuration.StandardSequences.Eras import eras -eras.phase2_hcal.toModify( es_hardcode, +from Configuration.Eras.Modifier_phase2_hcal_cff import phase2_hcal +phase2_hcal.toModify( es_hardcode, toGet = cms.untracked.vstring( 'GainWidths', 'MCParams', diff --git a/CalibMuon/CSCCalibration/python/CSCChannelMapper_cfi.py b/CalibMuon/CSCCalibration/python/CSCChannelMapper_cfi.py index e4bad988671c9..4360f42c847bb 100644 --- a/CalibMuon/CSCCalibration/python/CSCChannelMapper_cfi.py +++ b/CalibMuon/CSCCalibration/python/CSCChannelMapper_cfi.py @@ -12,5 +12,5 @@ # # Modify for running in run 2 # -from Configuration.StandardSequences.Eras import eras -eras.run2_common.toModify( CSCChannelMapperESProducer, AlgoName=cms.string("CSCChannelMapperPostls1") ) +from Configuration.Eras.Modifier_run2_common_cff import run2_common +run2_common.toModify( CSCChannelMapperESProducer, AlgoName=cms.string("CSCChannelMapperPostls1") ) diff --git a/CalibMuon/CSCCalibration/python/CSCIndexer_cfi.py b/CalibMuon/CSCCalibration/python/CSCIndexer_cfi.py index 3cfc01f45751a..01c748ef4e0d0 100644 --- a/CalibMuon/CSCCalibration/python/CSCIndexer_cfi.py +++ b/CalibMuon/CSCCalibration/python/CSCIndexer_cfi.py @@ -12,5 +12,5 @@ # # Modify for running in run 2 # -from Configuration.StandardSequences.Eras import eras -eras.run2_common.toModify( CSCIndexerESProducer, AlgoName=cms.string("CSCIndexerPostls1") ) +from Configuration.Eras.Modifier_run2_common_cff import run2_common +run2_common.toModify( CSCIndexerESProducer, AlgoName=cms.string("CSCIndexerPostls1") ) diff --git a/CommonTools/RecoAlgos/python/HBHENoiseFilterResultProducer_cfi.py b/CommonTools/RecoAlgos/python/HBHENoiseFilterResultProducer_cfi.py index 1c37586b8b81c..ffda2e58cf662 100644 --- a/CommonTools/RecoAlgos/python/HBHENoiseFilterResultProducer_cfi.py +++ b/CommonTools/RecoAlgos/python/HBHENoiseFilterResultProducer_cfi.py @@ -14,5 +14,5 @@ useBunchSpacingProducer = cms.bool(True) ) -from Configuration.StandardSequences.Eras import eras -eras.run2_common.toModify(HBHENoiseFilterResultProducer, IgnoreTS4TS5ifJetInLowBVRegion=False) +from Configuration.Eras.Modifier_run2_common_cff import run2_common +run2_common.toModify(HBHENoiseFilterResultProducer, IgnoreTS4TS5ifJetInLowBVRegion=False) diff --git a/Configuration/EventContent/python/EventContent_cff.py b/Configuration/EventContent/python/EventContent_cff.py index 26b04f2adde48..0456e883d0e94 100644 --- a/Configuration/EventContent/python/EventContent_cff.py +++ b/Configuration/EventContent/python/EventContent_cff.py @@ -98,8 +98,8 @@ # from FastSimulation.Configuration.EventContent_cff import FASTPUEventContent import FastSimulation.Configuration.EventContent_cff as fastSimEC -from Configuration.StandardSequences.Eras import eras -if eras.fastSim.isChosen(): +from Configuration.Eras.Modifier_fastSim_cff import fastSim +if fastSim.isChosen(): RecoLocalTrackerRECO.outputCommands = fastSimEC.RecoLocalTracker.outputCommands RecoLocalTrackerFEVT.outputCommands = fastSimEC.RecoLocalTracker.outputCommands SimG4CoreRAW = fastSimEC.SimRAW @@ -448,7 +448,8 @@ RECOEventContent.outputCommands.extend(TcdsEventContent.outputCommands) RECOEventContent.outputCommands.extend(CommonEventContent.outputCommands) RECOEventContent.outputCommands.extend(EITopPAGEventContent.outputCommands) -eras.ctpps_2016.toModify(RECOEventContent, outputCommands = RECOEventContent.outputCommands + RecoCTPPSRECO.outputCommands) +from Configuration.Eras.Modifier_ctpps_2016_cff import ctpps_2016 +ctpps_2016.toModify(RECOEventContent, outputCommands = RECOEventContent.outputCommands + RecoCTPPSRECO.outputCommands) RAWRECOEventContent.outputCommands.extend(RECOEventContent.outputCommands) RAWRECOEventContent.outputCommands.extend(cms.untracked.vstring( @@ -479,7 +480,7 @@ AODEventContent.outputCommands.extend(TcdsEventContent.outputCommands) AODEventContent.outputCommands.extend(CommonEventContent.outputCommands) AODEventContent.outputCommands.extend(EITopPAGEventContent.outputCommands) -eras.ctpps_2016.toModify(AODEventContent, outputCommands = AODEventContent.outputCommands + RecoCTPPSAOD.outputCommands) +ctpps_2016.toModify(AODEventContent, outputCommands = AODEventContent.outputCommands + RecoCTPPSAOD.outputCommands) RAWSIMEventContent.outputCommands.extend(RAWEventContent.outputCommands) RAWSIMEventContent.outputCommands.extend(SimG4CoreRAW.outputCommands) @@ -530,7 +531,7 @@ PREMIXEventContent.outputCommands.append('keep StripDigiSimLinkedmDetSetVector_simMuonCSCDigis_*_*') PREMIXEventContent.outputCommands.append('keep RPCDigiSimLinkedmDetSetVector_*_*_*') PREMIXEventContent.outputCommands.append('keep DTLayerIdDTDigiSimLinkMuonDigiCollection_*_*_*') -if eras.fastSim.isChosen(): +if fastSim.isChosen(): PREMIXEventContent.outputCommands.extend(fastSimEC.extraPremixContent) PREMIXRAWEventContent.outputCommands.extend(RAWSIMEventContent.outputCommands) @@ -543,7 +544,7 @@ PREMIXRAWEventContent.outputCommands.append('keep *_*_MuonCSCWireDigiSimLinks_*') PREMIXRAWEventContent.outputCommands.append('keep *_*_RPCDigiSimLink_*') PREMIXRAWEventContent.outputCommands.append('keep DTLayerIdDTDigiSimLinkMuonDigiCollection_*_*_*') -if eras.fastSim.isChosen(): +if fastSim.isChosen(): PREMIXEventContent.outputCommands.extend(fastSimEC.extraPremixContent) REPACKRAWSIMEventContent.outputCommands.extend(REPACKRAWEventContent.outputCommands) @@ -623,7 +624,7 @@ FEVTEventContent.outputCommands.extend(TcdsEventContent.outputCommands) FEVTEventContent.outputCommands.extend(CommonEventContent.outputCommands) FEVTEventContent.outputCommands.extend(EITopPAGEventContent.outputCommands) -eras.ctpps_2016.toModify(FEVTEventContent, outputCommands = FEVTEventContent.outputCommands + RecoCTPPSFEVT.outputCommands) +ctpps_2016.toModify(FEVTEventContent, outputCommands = FEVTEventContent.outputCommands + RecoCTPPSFEVT.outputCommands) FEVTHLTALLEventContent.outputCommands.extend(FEVTEventContent.outputCommands) FEVTHLTALLEventContent.outputCommands.append('keep *_*_*_HLT') @@ -815,7 +816,7 @@ def SwapKeepAndDrop(l): # in fastsim, normal digis are edaliases of simdigis # drop the simdigis to avoid complaints from the outputmodule related to duplicated branches -if eras.fastSim.isChosen(): +if fastSim.isChosen(): for _entry in [FEVTDEBUGHLTEventContent,FEVTDEBUGEventContent,RECOSIMEventContent,AODSIMEventContent,RAWAODSIMEventContent]: fastSimEC.dropSimDigis(_entry.outputCommands) diff --git a/Configuration/StandardSequences/python/DataMixerPreMix_cff.py b/Configuration/StandardSequences/python/DataMixerPreMix_cff.py index c27d88e54bb53..7dc7d7f94674c 100644 --- a/Configuration/StandardSequences/python/DataMixerPreMix_cff.py +++ b/Configuration/StandardSequences/python/DataMixerPreMix_cff.py @@ -62,8 +62,8 @@ pdatamix = cms.Sequence(mixData+postDMDigi+addPileupInfo) -from Configuration.StandardSequences.Eras import eras -if eras.fastSim.isChosen(): +from Configuration.Eras.Modifier_fastSim_cff import fastSim +if fastSim.isChosen(): # pretend these digis have been through digi2raw and raw2digi, by using the approprate aliases # use an alias to make the mixed track collection available under the usual label from FastSimulation.Configuration.DigiAliases_cff import loadDigiAliases diff --git a/Configuration/StandardSequences/python/DigiToRawDM_cff.py b/Configuration/StandardSequences/python/DigiToRawDM_cff.py index e319dc1df4343..c1afef6b54691 100644 --- a/Configuration/StandardSequences/python/DigiToRawDM_cff.py +++ b/Configuration/StandardSequences/python/DigiToRawDM_cff.py @@ -33,12 +33,12 @@ #castorRawData.CASTOR = cms.untracked.InputTag("castorDigis") # -from Configuration.StandardSequences.Eras import eras -eras.run2_HCAL_2017.toModify( hcalRawDataVME, +from Configuration.Eras.Modifier_run2_HCAL_2017_cff import run2_HCAL_2017 +run2_HCAL_2017.toModify( hcalRawDataVME, HBHE = cms.untracked.InputTag(""), HF = cms.untracked.InputTag(""), ) -eras.run2_HCAL_2017.toModify( hcalRawDatauHTR, +run2_HCAL_2017.toModify( hcalRawDatauHTR, HBHE = cms.untracked.InputTag("DMHcalDigis"), HF = cms.untracked.InputTag("DMHcalDigis") ) diff --git a/Configuration/StandardSequences/python/DigiToRaw_cff.py b/Configuration/StandardSequences/python/DigiToRaw_cff.py index 7fb93032a198a..e27dc7284c3ea 100644 --- a/Configuration/StandardSequences/python/DigiToRaw_cff.py +++ b/Configuration/StandardSequences/python/DigiToRaw_cff.py @@ -2,7 +2,6 @@ # This object is used to make changes for different running scenarios. In # this case for Run 2 -from Configuration.StandardSequences.Eras import eras from EventFilter.SiPixelRawToDigi.SiPixelDigiToRaw_cfi import * from EventFilter.SiStripRawToDigi.SiStripDigiToRaw_cfi import * @@ -25,11 +24,14 @@ ecalPacker.labelEBSRFlags = "simEcalDigis:ebSrFlags" ecalPacker.labelEESRFlags = "simEcalDigis:eeSrFlags" -eras.phase2_common.toReplaceWith(DigiToRaw, DigiToRaw.copyAndExclude([castorRawData])) +from Configuration.Eras.Modifier_phase2_common_cff import phase2_common +phase2_common.toReplaceWith(DigiToRaw, DigiToRaw.copyAndExclude([castorRawData])) #until we have hcal raw data for phase 2.... -eras.phase2_hcal.toReplaceWith(DigiToRaw, DigiToRaw.copyAndExclude([hcalRawData])) +from Configuration.Eras.Modifier_phase2_hcal_cff import phase2_hcal +phase2_hcal.toReplaceWith(DigiToRaw, DigiToRaw.copyAndExclude([hcalRawData])) -if eras.fastSim.isChosen() : +from Configuration.Eras.Modifier_fastSim_cff import fastSim +if fastSim.isChosen() : for _entry in [siPixelRawData,SiStripDigiToRaw,castorRawData]: DigiToRaw.remove(_entry) diff --git a/Configuration/StandardSequences/python/Digi_PreMix_cff.py b/Configuration/StandardSequences/python/Digi_PreMix_cff.py index 3a99e37af9cf7..b478d94cacf26 100644 --- a/Configuration/StandardSequences/python/Digi_PreMix_cff.py +++ b/Configuration/StandardSequences/python/Digi_PreMix_cff.py @@ -21,8 +21,8 @@ # This is extra, since the configuration skips it anyway. Belts and suspenders. pdigi.remove(simEcalPreshowerDigis) -from Configuration.StandardSequences.Eras import eras -if eras.fastSim.isChosen(): +from Configuration.Eras.Modifier_fastSim_cff import fastSim +if fastSim.isChosen(): # no need for the aliases for usual mixing del generalTracks,ecalPreshowerDigis,ecalDigis,hcalDigis,muonDTDigis,muonCSCDigis,muonRPCDigis else: diff --git a/Configuration/StandardSequences/python/Digi_cff.py b/Configuration/StandardSequences/python/Digi_cff.py index 56441b3093804..6243930099c16 100644 --- a/Configuration/StandardSequences/python/Digi_cff.py +++ b/Configuration/StandardSequences/python/Digi_cff.py @@ -35,8 +35,8 @@ pdigi_nogen=cms.Sequence(generatorSmeared*cms.SequencePlaceholder("randomEngineStateProducer")*cms.SequencePlaceholder("mix")*doAllDigi*addPileupInfo) pdigi_valid_nogen=cms.Sequence(pdigi_nogen) -from Configuration.StandardSequences.Eras import eras -if eras.fastSim.isChosen(): +from Configuration.Eras.Modifier_fastSim_cff import fastSim +if fastSim.isChosen(): # pretend these digis have been through digi2raw and raw2digi, by using the approprate aliases # use an alias to make the mixed track collection available under the usual label from FastSimulation.Configuration.DigiAliases_cff import loadDigiAliases @@ -50,7 +50,7 @@ def _modifyDigitizerPhase2Hcal( theProcess ): theProcess.es_hardcode = _es_hardcode theProcess.es_prefer_hcalHardcode = _es_prefer_hcalHardcode -from Configuration.StandardSequences.Eras import eras -modifyDigitizerPhase2Hcal_ = eras.phase2_hcal.makeProcessModifier( _modifyDigitizerPhase2Hcal ) +from Configuration.Eras.Modifier_phase2_hcal_cff import phase2_hcal +modifyDigitizerPhase2Hcal_ = phase2_hcal.makeProcessModifier( _modifyDigitizerPhase2Hcal ) diff --git a/Configuration/StandardSequences/python/RawToDigi_cff.py b/Configuration/StandardSequences/python/RawToDigi_cff.py index 3b90676a9d857..a872f6d77ee07 100644 --- a/Configuration/StandardSequences/python/RawToDigi_cff.py +++ b/Configuration/StandardSequences/python/RawToDigi_cff.py @@ -2,7 +2,6 @@ # This object is used to selectively make changes for different running # scenarios. In this case it makes changes for Run 2. -from Configuration.StandardSequences.Eras import eras from EventFilter.SiPixelRawToDigi.SiPixelRawToDigi_cfi import * @@ -79,17 +78,20 @@ totemTriggerRawToDigi.rawDataTag = cms.InputTag("rawDataCollector") totemRPRawToDigi.rawDataTag = cms.InputTag("rawDataCollector") -eras.phase2_common.toReplaceWith(RawToDigi, RawToDigi.copyAndExclude([castorDigis])) +from Configuration.Eras.Modifier_phase2_common_cff import phase2_common +phase2_common.toReplaceWith(RawToDigi, RawToDigi.copyAndExclude([castorDigis])) # until we have hcal raw data for phase 2... -eras.phase2_hcal.toReplaceWith(RawToDigi, RawToDigi.copyAndExclude([hcalDigis])) +from Configuration.Eras.Modifier_phase2_hcal_cff import phase2_hcal +phase2_hcal.toReplaceWith(RawToDigi, RawToDigi.copyAndExclude([hcalDigis])) # add CTPPS 2016 raw-to-digi modules _ctpps_2016_RawToDigi = RawToDigi.copy() _ctpps_2016_RawToDigi += totemTriggerRawToDigi + totemRPRawToDigi -eras.ctpps_2016.toReplaceWith(RawToDigi, _ctpps_2016_RawToDigi) +from Configuration.Eras.Modifier_ctpps_2016_cff import ctpps_2016 +ctpps_2016.toReplaceWith(RawToDigi, _ctpps_2016_RawToDigi) _ctpps_2016_RawToDigi_noTk = RawToDigi_noTk.copy() _ctpps_2016_RawToDigi_noTk += totemTriggerRawToDigi + totemRPRawToDigi -eras.ctpps_2016.toReplaceWith(RawToDigi_noTk, _ctpps_2016_RawToDigi_noTk) +ctpps_2016.toReplaceWith(RawToDigi_noTk, _ctpps_2016_RawToDigi_noTk) diff --git a/Configuration/StandardSequences/python/Reconstruction_cff.py b/Configuration/StandardSequences/python/Reconstruction_cff.py index 27babb198fabd..4eac284dadb10 100644 --- a/Configuration/StandardSequences/python/Reconstruction_cff.py +++ b/Configuration/StandardSequences/python/Reconstruction_cff.py @@ -1,5 +1,4 @@ import FWCore.ParameterSet.Config as cms -from Configuration.StandardSequences.Eras import eras from RecoLuminosity.LumiProducer.lumiProducer_cff import * from RecoLuminosity.LumiProducer.bunchSpacingProducer_cfi import * @@ -52,16 +51,18 @@ _phase2_localreco = localreco.copyAndExclude([castorreco]) _phase2_localreco_HcalNZS = localreco_HcalNZS.copyAndExclude([castorreco]) -eras.phase2_common.toReplaceWith(localreco, _phase2_localreco) -eras.phase2_common.toReplaceWith(localreco_HcalNZS, _phase2_localreco_HcalNZS) +from Configuration.Eras.Modifier_phase2_common_cff import phase2_common +phase2_common.toReplaceWith(localreco, _phase2_localreco) +phase2_common.toReplaceWith(localreco_HcalNZS, _phase2_localreco_HcalNZS) _ctpps_2016_localreco = localreco.copy() _ctpps_2016_localreco += totemRPLocalReconstruction -eras.ctpps_2016.toReplaceWith(localreco, _ctpps_2016_localreco) +from Configuration.Eras.Modifier_ctpps_2016_cff import ctpps_2016 +ctpps_2016.toReplaceWith(localreco, _ctpps_2016_localreco) _ctpps_2016_localreco_HcalNZS = localreco_HcalNZS.copy() _ctpps_2016_localreco_HcalNZS += totemRPLocalReconstruction -eras.ctpps_2016.toReplaceWith(localreco_HcalNZS, _ctpps_2016_localreco_HcalNZS) +ctpps_2016.toReplaceWith(localreco_HcalNZS, _ctpps_2016_localreco_HcalNZS) # # temporarily switching off recoGenJets; since this are MC and wil be moved to a proper sequence @@ -78,9 +79,12 @@ vertexreco) _globalreco_tracking_LowPU_Phase1PU70 = globalreco_tracking.copy() _globalreco_tracking_LowPU_Phase1PU70.replace(trackingGlobalReco, recopixelvertexing+trackingGlobalReco) -eras.trackingLowPU.toReplaceWith(globalreco_tracking, _globalreco_tracking_LowPU_Phase1PU70) -eras.trackingPhase1PU70.toReplaceWith(globalreco_tracking, _globalreco_tracking_LowPU_Phase1PU70) -eras.trackingPhase2PU140.toReplaceWith(globalreco_tracking, _globalreco_tracking_LowPU_Phase1PU70) +from Configuration.Eras.Modifier_trackingLowPU_cff import trackingLowPU +trackingLowPU.toReplaceWith(globalreco_tracking, _globalreco_tracking_LowPU_Phase1PU70) +from Configuration.Eras.Modifier_trackingPhase1PU70_cff import trackingPhase1PU70 +trackingPhase1PU70.toReplaceWith(globalreco_tracking, _globalreco_tracking_LowPU_Phase1PU70) +from Configuration.Eras.Modifier_trackingPhase2PU140_cff import trackingPhase2PU140 +trackingPhase2PU140.toReplaceWith(globalreco_tracking, _globalreco_tracking_LowPU_Phase1PU70) globalreco = cms.Sequence(globalreco_tracking* hcalGlobalRecoSequence* @@ -95,7 +99,7 @@ CastorFullReco) _phase2_globalreco = globalreco.copyAndExclude([CastorFullReco]) -eras.phase2_common.toReplaceWith(globalreco, _phase2_globalreco) +phase2_common.toReplaceWith(globalreco, _phase2_globalreco) globalreco_plusPL= cms.Sequence(globalreco*ctfTracksPixelLess) diff --git a/Configuration/StandardSequences/python/SimL1EmulatorDM_cff.py b/Configuration/StandardSequences/python/SimL1EmulatorDM_cff.py index c30c820d65102..5faf2bcc9cf43 100644 --- a/Configuration/StandardSequences/python/SimL1EmulatorDM_cff.py +++ b/Configuration/StandardSequences/python/SimL1EmulatorDM_cff.py @@ -1,7 +1,6 @@ import FWCore.ParameterSet.Config as cms from Configuration.StandardSequences.SimL1Emulator_cff import * -from Configuration.StandardSequences.Eras import eras # Modifications for DataMixer input: simDtTriggerPrimitiveDigis.digiTag = 'mixData' @@ -14,7 +13,8 @@ simHcalTechTrigDigis.ttpDigiCollection = "DMHcalTTPDigis" # -if not eras.stage2L1Trigger.isChosen(): +from Configuration.Eras.Modifier_stage2L1Trigger_cff import stage2L1Trigger +if not stage2L1Trigger.isChosen(): simRpcTriggerDigis.label = 'mixData' simRctDigis.hcalDigis=cms.VInputTag(cms.InputTag("DMHcalTriggerPrimitiveDigis")) simRctDigis.ecalDigis=cms.VInputTag(cms.InputTag("DMEcalTriggerPrimitiveDigis")) diff --git a/Configuration/StandardSequences/python/SimL1EmulatorRepack_Full2015Data_cff.py b/Configuration/StandardSequences/python/SimL1EmulatorRepack_Full2015Data_cff.py index 5230835e9fbcb..dd3b2a4bb631c 100644 --- a/Configuration/StandardSequences/python/SimL1EmulatorRepack_Full2015Data_cff.py +++ b/Configuration/StandardSequences/python/SimL1EmulatorRepack_Full2015Data_cff.py @@ -1,10 +1,10 @@ import FWCore.ParameterSet.Config as cms -from Configuration.StandardSequences.Eras import eras ## L1REPACK FULL: Re-Emulate all of L1 and repack into RAW -if not (eras.stage2L1Trigger.isChosen()): +from Configuration.Eras.Modifier_stage2L1Trigger_cff import stage2L1Trigger +if not (stage2L1Trigger.isChosen()): print "L1T WARN: L1REPACK:Full2015Data only supports Stage 2 eras for now." print "L1T WARN: Use a legacy version of L1REPACK for now." else: diff --git a/Configuration/StandardSequences/python/SimL1EmulatorRepack_FullMC_cff.py b/Configuration/StandardSequences/python/SimL1EmulatorRepack_FullMC_cff.py index b3ec08598d284..9df9dfff38293 100644 --- a/Configuration/StandardSequences/python/SimL1EmulatorRepack_FullMC_cff.py +++ b/Configuration/StandardSequences/python/SimL1EmulatorRepack_FullMC_cff.py @@ -1,10 +1,10 @@ import FWCore.ParameterSet.Config as cms -from Configuration.StandardSequences.Eras import eras ## L1REPACK FULL: Re-Emulate all of L1 and repack into RAW -if not (eras.stage2L1Trigger.isChosen()): +from Configuration.Eras.Modifier_stage2L1Trigger_cff import stage2L1Trigger +if not (stage2L1Trigger.isChosen()): print "L1T WARN: L1REPACK:FullMC (intended for MC events with RAW eventcontent) only supports Stage 2 eras for now." print "L1T WARN: Use a legacy version of L1REPACK for now." else: diff --git a/Configuration/StandardSequences/python/SimL1EmulatorRepack_FullSimTP_cff.py b/Configuration/StandardSequences/python/SimL1EmulatorRepack_FullSimTP_cff.py index 44b4e696951ca..cb38f892cbab9 100644 --- a/Configuration/StandardSequences/python/SimL1EmulatorRepack_FullSimTP_cff.py +++ b/Configuration/StandardSequences/python/SimL1EmulatorRepack_FullSimTP_cff.py @@ -1,10 +1,10 @@ import FWCore.ParameterSet.Config as cms -from Configuration.StandardSequences.Eras import eras ## L1REPACK FULL: Re-Emulate all of L1 and repack into RAW -if not (eras.stage2L1Trigger.isChosen()): +from Configuration.Eras.Modifier_stage2L1Trigger_cff import stage2L1Trigger +if not (stage2L1Trigger.isChosen()): print "L1T WARN: L1REPACK:FullSimTP (intended for 2016 data) only supports Stage 2 eras for now." print "L1T WARN: Use a legacy version of L1REPACK for now." else: diff --git a/Configuration/StandardSequences/python/SimL1EmulatorRepack_Full_cff.py b/Configuration/StandardSequences/python/SimL1EmulatorRepack_Full_cff.py index b62cfde626b5d..3b34ffed8360f 100644 --- a/Configuration/StandardSequences/python/SimL1EmulatorRepack_Full_cff.py +++ b/Configuration/StandardSequences/python/SimL1EmulatorRepack_Full_cff.py @@ -1,10 +1,10 @@ import FWCore.ParameterSet.Config as cms -from Configuration.StandardSequences.Eras import eras ## L1REPACK FULL: Re-Emulate all of L1 and repack into RAW -if not (eras.stage2L1Trigger.isChosen()): +from Configuration.Eras.Modifier_stage2L1Trigger_cff import stage2L1Trigger +if not (stage2L1Trigger.isChosen()): print "L1T WARN: L1REPACK:Full (intended for 2016 data) only supports Stage 2 eras for now." print "L1T WARN: Use a legacy version of L1REPACK for now." else: diff --git a/Configuration/StandardSequences/python/SimL1EmulatorRepack_uGT_cff.py b/Configuration/StandardSequences/python/SimL1EmulatorRepack_uGT_cff.py index f22466da8a1d1..65935a9c485ea 100644 --- a/Configuration/StandardSequences/python/SimL1EmulatorRepack_uGT_cff.py +++ b/Configuration/StandardSequences/python/SimL1EmulatorRepack_uGT_cff.py @@ -1,10 +1,10 @@ import FWCore.ParameterSet.Config as cms -from Configuration.StandardSequences.Eras import eras ## L1REPACK FULL: Re-Emulate all of L1 and repack into RAW -if not (eras.stage2L1Trigger.isChosen()): +from Configuration.Eras.Modifier_stage2L1Trigger_cff import stage2L1Trigger +if not (stage2L1Trigger.isChosen()): print "L1T WARN: L1REPACK:Full (intended for 2016 data) only supports Stage 2 eras for now." print "L1T WARN: Use a legacy version of L1REPACK for now." else: diff --git a/Configuration/StandardSequences/python/SimL1Emulator_cff.py b/Configuration/StandardSequences/python/SimL1Emulator_cff.py index ddeed0b5d31c8..df78c1d64c826 100644 --- a/Configuration/StandardSequences/python/SimL1Emulator_cff.py +++ b/Configuration/StandardSequences/python/SimL1Emulator_cff.py @@ -3,8 +3,8 @@ from L1Trigger.Configuration.SimL1Emulator_cff import * # make trigger digis available under with the raw2digi names -from Configuration.StandardSequences.Eras import eras -if eras.fastSim.isChosen(): +from Configuration.Eras.Modifier_fastSim_cff import fastSim +if fastSim.isChosen(): # pretend these digis have been through digi2raw and to the HLT internal raw2digi, by using the approprate aliases # consider moving these mods to the HLT configuration from FastSimulation.Configuration.DigiAliases_cff import loadTriggerDigiAliases diff --git a/DQM/BeamMonitor/python/AlcaBeamMonitor_cfi.py b/DQM/BeamMonitor/python/AlcaBeamMonitor_cfi.py index 975640746a479..bd1cabdf21944 100644 --- a/DQM/BeamMonitor/python/AlcaBeamMonitor_cfi.py +++ b/DQM/BeamMonitor/python/AlcaBeamMonitor_cfi.py @@ -60,7 +60,7 @@ # is not included in data-taking, like it was the case for "Quiet # Beam" collisions on 2016 with run 269207. -from Configuration.StandardSequences.Eras import eras -eras.trackingLowPU.toModify(AlcaBeamMonitor, +from Configuration.Eras.Modifier_trackingLowPU_cff import trackingLowPU +trackingLowPU.toModify(AlcaBeamMonitor, BeamFitter = dict(MaximumImpactParameter = 5.0, MinimumInputTracks = 50)) diff --git a/DQM/HcalTasks/python/OfflineSourceSequence_cosmic.py b/DQM/HcalTasks/python/OfflineSourceSequence_cosmic.py index 335ea09716bc6..bf5fe6d0fdb43 100644 --- a/DQM/HcalTasks/python/OfflineSourceSequence_cosmic.py +++ b/DQM/HcalTasks/python/OfflineSourceSequence_cosmic.py @@ -41,6 +41,6 @@ _phase1_hcalOfflineSourceSequence = hcalOfflineSourceSequence.copy() _phase1_hcalOfflineSourceSequence.insert(0,digiPhase1Task) -from Configuration.StandardSequences.Eras import eras -eras.run2_HCAL_2017.toReplaceWith( hcalOfflineSourceSequence, _phase1_hcalOfflineSourceSequence ) +from Configuration.Eras.Modifier_run2_HCAL_2017_cff import run2_HCAL_2017 +run2_HCAL_2017.toReplaceWith( hcalOfflineSourceSequence, _phase1_hcalOfflineSourceSequence ) diff --git a/DQM/HcalTasks/python/OfflineSourceSequence_hi.py b/DQM/HcalTasks/python/OfflineSourceSequence_hi.py index 6f8cf378747ae..a62142f07f5d7 100644 --- a/DQM/HcalTasks/python/OfflineSourceSequence_hi.py +++ b/DQM/HcalTasks/python/OfflineSourceSequence_hi.py @@ -42,6 +42,6 @@ _phase1_hcalOfflineSourceSequence = hcalOfflineSourceSequence.copy() _phase1_hcalOfflineSourceSequence.insert(0,digiPhase1Task) -from Configuration.StandardSequences.Eras import eras -eras.run2_HCAL_2017.toReplaceWith( hcalOfflineSourceSequence, _phase1_hcalOfflineSourceSequence ) +from Configuration.Eras.Modifier_run2_HCAL_2017_cff import run2_HCAL_2017 +run2_HCAL_2017.toReplaceWith( hcalOfflineSourceSequence, _phase1_hcalOfflineSourceSequence ) diff --git a/DQM/HcalTasks/python/OfflineSourceSequence_pp.py b/DQM/HcalTasks/python/OfflineSourceSequence_pp.py index 22d5c042c2e65..ef56832ed7c2b 100644 --- a/DQM/HcalTasks/python/OfflineSourceSequence_pp.py +++ b/DQM/HcalTasks/python/OfflineSourceSequence_pp.py @@ -31,5 +31,5 @@ _phase1_hcalOfflineSourceSequence = hcalOfflineSourceSequence.copy() _phase1_hcalOfflineSourceSequence.insert(0,digiPhase1Task) -from Configuration.StandardSequences.Eras import eras -eras.run2_HCAL_2017.toReplaceWith( hcalOfflineSourceSequence, _phase1_hcalOfflineSourceSequence ) +from Configuration.Eras.Modifier_run2_HCAL_2017_cff import run2_HCAL_2017 +run2_HCAL_2017.toReplaceWith( hcalOfflineSourceSequence, _phase1_hcalOfflineSourceSequence ) diff --git a/DQM/L1TMonitor/python/L1ExtraDQM_cff.py b/DQM/L1TMonitor/python/L1ExtraDQM_cff.py index a3a1b87f8f542..dded3f5fa51f7 100644 --- a/DQM/L1TMonitor/python/L1ExtraDQM_cff.py +++ b/DQM/L1TMonitor/python/L1ExtraDQM_cff.py @@ -67,16 +67,16 @@ # applied to l1extraParticles before it is cloned, but the changes are overwritten # in the commands above. So we need to write back the correct Run 2 values. # -from Configuration.StandardSequences.Eras import eras -eras.stage1L1Trigger.toModify( dqmL1ExtraParticles, etTotalSource = cms.InputTag("caloStage1LegacyFormatDigis") ) -eras.stage1L1Trigger.toModify( dqmL1ExtraParticles, nonIsolatedEmSource = cms.InputTag("caloStage1LegacyFormatDigis","nonIsoEm") ) -eras.stage1L1Trigger.toModify( dqmL1ExtraParticles, etMissSource = cms.InputTag("caloStage1LegacyFormatDigis") ) -eras.stage1L1Trigger.toModify( dqmL1ExtraParticles, htMissSource = cms.InputTag("caloStage1LegacyFormatDigis") ) -eras.stage1L1Trigger.toModify( dqmL1ExtraParticles, forwardJetSource = cms.InputTag("caloStage1LegacyFormatDigis","forJets") ) -eras.stage1L1Trigger.toModify( dqmL1ExtraParticles, centralJetSource = cms.InputTag("caloStage1LegacyFormatDigis","cenJets") ) -eras.stage1L1Trigger.toModify( dqmL1ExtraParticles, tauJetSource = cms.InputTag("caloStage1LegacyFormatDigis","tauJets") ) -eras.stage1L1Trigger.toModify( dqmL1ExtraParticles, isoTauJetSource = cms.InputTag("caloStage1LegacyFormatDigis","isoTauJets") ) -eras.stage1L1Trigger.toModify( dqmL1ExtraParticles, isolatedEmSource = cms.InputTag("caloStage1LegacyFormatDigis","isoEm") ) -eras.stage1L1Trigger.toModify( dqmL1ExtraParticles, etHadSource = cms.InputTag("caloStage1LegacyFormatDigis") ) -eras.stage1L1Trigger.toModify( dqmL1ExtraParticles, hfRingEtSumsSource = cms.InputTag("caloStage1LegacyFormatDigis") ) -eras.stage1L1Trigger.toModify( dqmL1ExtraParticles, hfRingBitCountsSource = cms.InputTag("caloStage1LegacyFormatDigis") ) +from Configuration.Eras.Modifier_stage1L1Trigger_cff import stage1L1Trigger +stage1L1Trigger.toModify( dqmL1ExtraParticles, etTotalSource = cms.InputTag("caloStage1LegacyFormatDigis") ) +stage1L1Trigger.toModify( dqmL1ExtraParticles, nonIsolatedEmSource = cms.InputTag("caloStage1LegacyFormatDigis","nonIsoEm") ) +stage1L1Trigger.toModify( dqmL1ExtraParticles, etMissSource = cms.InputTag("caloStage1LegacyFormatDigis") ) +stage1L1Trigger.toModify( dqmL1ExtraParticles, htMissSource = cms.InputTag("caloStage1LegacyFormatDigis") ) +stage1L1Trigger.toModify( dqmL1ExtraParticles, forwardJetSource = cms.InputTag("caloStage1LegacyFormatDigis","forJets") ) +stage1L1Trigger.toModify( dqmL1ExtraParticles, centralJetSource = cms.InputTag("caloStage1LegacyFormatDigis","cenJets") ) +stage1L1Trigger.toModify( dqmL1ExtraParticles, tauJetSource = cms.InputTag("caloStage1LegacyFormatDigis","tauJets") ) +stage1L1Trigger.toModify( dqmL1ExtraParticles, isoTauJetSource = cms.InputTag("caloStage1LegacyFormatDigis","isoTauJets") ) +stage1L1Trigger.toModify( dqmL1ExtraParticles, isolatedEmSource = cms.InputTag("caloStage1LegacyFormatDigis","isoEm") ) +stage1L1Trigger.toModify( dqmL1ExtraParticles, etHadSource = cms.InputTag("caloStage1LegacyFormatDigis") ) +stage1L1Trigger.toModify( dqmL1ExtraParticles, hfRingEtSumsSource = cms.InputTag("caloStage1LegacyFormatDigis") ) +stage1L1Trigger.toModify( dqmL1ExtraParticles, hfRingBitCountsSource = cms.InputTag("caloStage1LegacyFormatDigis") ) diff --git a/DQM/L1TMonitor/python/L1TCSCTF_cfi.py b/DQM/L1TMonitor/python/L1TCSCTF_cfi.py index fbe70232928d1..757d132b60f2b 100644 --- a/DQM/L1TMonitor/python/L1TCSCTF_cfi.py +++ b/DQM/L1TMonitor/python/L1TCSCTF_cfi.py @@ -17,5 +17,5 @@ # # Make changes for running in Run 2 # -from Configuration.StandardSequences.Eras import eras -eras.run2_common.toModify( l1tCsctf, gangedME11a = False ) +from Configuration.Eras.Modifier_run2_common_cff import run2_common +run2_common.toModify( l1tCsctf, gangedME11a = False ) diff --git a/DQM/Physics/python/DQMPhysics_cff.py b/DQM/Physics/python/DQMPhysics_cff.py index 3c907388bb6fa..74699a301fdc3 100644 --- a/DQM/Physics/python/DQMPhysics_cff.py +++ b/DQM/Physics/python/DQMPhysics_cff.py @@ -1,5 +1,4 @@ import FWCore.ParameterSet.Config as cms -from Configuration.StandardSequences.Eras import eras from DQM.Physics.bphysicsOniaDQM_cfi import * from DQM.Physics.ewkMuDQM_cfi import * @@ -35,7 +34,8 @@ *ExoticaDQM *B2GDQM ) -eras.phase1Pixel.toReplaceWith(dqmPhysics, dqmPhysics.copyAndExclude([ # FIXME +from Configuration.Eras.Modifier_phase1Pixel_cff import phase1Pixel +phase1Pixel.toReplaceWith(dqmPhysics, dqmPhysics.copyAndExclude([ # FIXME ewkMuDQM, # Excessive printouts because 2017 doesn't have HLT yet ewkElecDQM, # Excessive printouts because 2017 doesn't have HLT yet ewkMuLumiMonitorDQM, # Excessive printouts because 2017 doesn't have HLT yet diff --git a/DQM/SiPixelCommon/python/SiPixelOfflineDQM_client_cff.py b/DQM/SiPixelCommon/python/SiPixelOfflineDQM_client_cff.py index 5c4734cd45b00..5f370a27305e4 100644 --- a/DQM/SiPixelCommon/python/SiPixelOfflineDQM_client_cff.py +++ b/DQM/SiPixelCommon/python/SiPixelOfflineDQM_client_cff.py @@ -3,7 +3,6 @@ # # This object is used to make changes for different running scenarios # -from Configuration.StandardSequences.Eras import eras #Client: sipixelEDAClient = cms.EDAnalyzer("SiPixelEDAClient", @@ -53,7 +52,8 @@ # Modify for running with the Phase 1 pixel detector. from DQM.SiPixelPhase1Config.SiPixelPhase1OfflineDQM_harvesting_cff import * -eras.phase1Pixel.toReplaceWith(PixelOfflineDQMClient, siPixelPhase1OfflineDQM_harvesting) +from Configuration.Eras.Modifier_phase1Pixel_cff import phase1Pixel +phase1Pixel.toReplaceWith(PixelOfflineDQMClient, siPixelPhase1OfflineDQM_harvesting) #TODO: properly upgrade these and the others -eras.phase1Pixel.toReplaceWith(PixelOfflineDQMClientNoDataCertification, siPixelPhase1OfflineDQM_harvesting) -eras.phase1Pixel.toReplaceWith(PixelOfflineDQMClientWithDataCertification, siPixelPhase1OfflineDQM_harvesting) +phase1Pixel.toReplaceWith(PixelOfflineDQMClientNoDataCertification, siPixelPhase1OfflineDQM_harvesting) +phase1Pixel.toReplaceWith(PixelOfflineDQMClientWithDataCertification, siPixelPhase1OfflineDQM_harvesting) diff --git a/DQM/SiPixelCommon/python/SiPixelOfflineDQM_source_cff.py b/DQM/SiPixelCommon/python/SiPixelOfflineDQM_source_cff.py index 589199831488f..350fbc2acf4eb 100644 --- a/DQM/SiPixelCommon/python/SiPixelOfflineDQM_source_cff.py +++ b/DQM/SiPixelCommon/python/SiPixelOfflineDQM_source_cff.py @@ -130,10 +130,10 @@ siPixelOfflineDQM_source_woTrack = cms.Sequence(SiPixelHLTSource + SiPixelRawDataErrorSource + SiPixelDigiSource + SiPixelRecHitSource + SiPixelClusterSource + dqmInfo) # Phase1 config -from Configuration.StandardSequences.Eras import eras # _all_ of the stuff above becomes obsolete. We just hijack the names and # replace them with the phase1 config of the new DQM. from DQM.SiPixelPhase1Config.SiPixelPhase1OfflineDQM_source_cff import * -eras.phase1Pixel.toReplaceWith(siPixelOfflineDQM_source, siPixelPhase1OfflineDQM_source) +from Configuration.Eras.Modifier_phase1Pixel_cff import phase1Pixel +phase1Pixel.toReplaceWith(siPixelOfflineDQM_source, siPixelPhase1OfflineDQM_source) # don't forget the Harvesters, they are plugged in at PixelOfflineDQMClient # TODO: the same game for the other three. diff --git a/DQM/SiPixelMonitorCluster/python/SiPixelMonitorCluster_cfi.py b/DQM/SiPixelMonitorCluster/python/SiPixelMonitorCluster_cfi.py index 0c5a83448d405..aa5ab1e7da1cb 100644 --- a/DQM/SiPixelMonitorCluster/python/SiPixelMonitorCluster_cfi.py +++ b/DQM/SiPixelMonitorCluster/python/SiPixelMonitorCluster_cfi.py @@ -3,7 +3,6 @@ # # This object is used to make changes for different running scenarios # -from Configuration.StandardSequences.Eras import eras SiPixelClusterSource = cms.EDAnalyzer("SiPixelClusterSource", TopFolderName = cms.string('Pixel'), @@ -26,4 +25,5 @@ ) # Modify for if the phase 1 pixel detector is active -eras.phase1Pixel.toModify( SiPixelClusterSource, isUpgrade=cms.untracked.bool(True) ) +from Configuration.Eras.Modifier_phase1Pixel_cff import phase1Pixel +phase1Pixel.toModify( SiPixelClusterSource, isUpgrade=cms.untracked.bool(True) ) diff --git a/DQM/SiPixelMonitorDigi/python/SiPixelMonitorDigi_cfi.py b/DQM/SiPixelMonitorDigi/python/SiPixelMonitorDigi_cfi.py index 961e77cfe6323..03c527d6d1185 100644 --- a/DQM/SiPixelMonitorDigi/python/SiPixelMonitorDigi_cfi.py +++ b/DQM/SiPixelMonitorDigi/python/SiPixelMonitorDigi_cfi.py @@ -3,7 +3,6 @@ # # This object is used to make changes for different running scenarios # -from Configuration.StandardSequences.Eras import eras SiPixelDigiSource = cms.EDAnalyzer("SiPixelDigiSource", TopFolderName = cms.string('Pixel'), @@ -32,5 +31,6 @@ ) # Modify for if the phase 1 pixel detector is active -eras.phase1Pixel.toModify( SiPixelDigiSource, isUpgrade=cms.untracked.bool(True) ) +from Configuration.Eras.Modifier_phase1Pixel_cff import phase1Pixel +phase1Pixel.toModify( SiPixelDigiSource, isUpgrade=cms.untracked.bool(True) ) diff --git a/DQM/SiPixelMonitorRawData/python/SiPixelMonitorRawData_cfi.py b/DQM/SiPixelMonitorRawData/python/SiPixelMonitorRawData_cfi.py index 850e4d8122b72..81cb43d849dc5 100644 --- a/DQM/SiPixelMonitorRawData/python/SiPixelMonitorRawData_cfi.py +++ b/DQM/SiPixelMonitorRawData/python/SiPixelMonitorRawData_cfi.py @@ -3,7 +3,6 @@ # # This object is used to make changes for different running scenarios # -from Configuration.StandardSequences.Eras import eras SiPixelRawDataErrorSource = cms.EDAnalyzer("SiPixelRawDataErrorSource", TopFolderName = cms.string('Pixel'), @@ -19,4 +18,5 @@ ) # Modify for if the phase 1 pixel detector is active -eras.phase1Pixel.toModify( SiPixelRawDataErrorSource, isUpgrade=cms.untracked.bool(True) ) +from Configuration.Eras.Modifier_phase1Pixel_cff import phase1Pixel +phase1Pixel.toModify( SiPixelRawDataErrorSource, isUpgrade=cms.untracked.bool(True) ) diff --git a/DQM/SiPixelMonitorRecHit/python/SiPixelMonitorRecHit_cfi.py b/DQM/SiPixelMonitorRecHit/python/SiPixelMonitorRecHit_cfi.py index 51012ea91c711..49a0625f07d42 100644 --- a/DQM/SiPixelMonitorRecHit/python/SiPixelMonitorRecHit_cfi.py +++ b/DQM/SiPixelMonitorRecHit/python/SiPixelMonitorRecHit_cfi.py @@ -3,7 +3,6 @@ # # This object is used to make changes for different running scenarios # -from Configuration.StandardSequences.Eras import eras SiPixelRecHitSource = cms.EDAnalyzer("SiPixelRecHitSource", TopFolderName = cms.string('Pixel'), @@ -24,4 +23,5 @@ ) # Modify for if the phase 1 pixel detector is active -eras.phase1Pixel.toModify( SiPixelRecHitSource, isUpgrade=cms.untracked.bool(True) ) +from Configuration.Eras.Modifier_phase1Pixel_cff import phase1Pixel +phase1Pixel.toModify( SiPixelRecHitSource, isUpgrade=cms.untracked.bool(True) ) diff --git a/DQM/SiPixelMonitorTrack/python/SiPixelMonitorEfficiency_cfi.py b/DQM/SiPixelMonitorTrack/python/SiPixelMonitorEfficiency_cfi.py index 8d2a871eaf62e..fe7f5e5c1e070 100644 --- a/DQM/SiPixelMonitorTrack/python/SiPixelMonitorEfficiency_cfi.py +++ b/DQM/SiPixelMonitorTrack/python/SiPixelMonitorEfficiency_cfi.py @@ -3,7 +3,6 @@ # # This object is used to make changes for different running scenarios # -from Configuration.StandardSequences.Eras import eras SiPixelHitEfficiencySource = cms.EDAnalyzer("SiPixelHitEfficiencySource", src = cms.InputTag("siPixelHitEfficiency"), @@ -26,4 +25,5 @@ ) # Modify for if the phase 1 pixel detector is active -eras.phase1Pixel.toModify( SiPixelHitEfficiencySource, isUpgrade=cms.untracked.bool(True) ) +from Configuration.Eras.Modifier_phase1Pixel_cff import phase1Pixel +phase1Pixel.toModify( SiPixelHitEfficiencySource, isUpgrade=cms.untracked.bool(True) ) diff --git a/DQM/SiPixelMonitorTrack/python/SiPixelMonitorTrack_cfi.py b/DQM/SiPixelMonitorTrack/python/SiPixelMonitorTrack_cfi.py index 1971aae9d7d8a..c299a05c8ae8f 100644 --- a/DQM/SiPixelMonitorTrack/python/SiPixelMonitorTrack_cfi.py +++ b/DQM/SiPixelMonitorTrack/python/SiPixelMonitorTrack_cfi.py @@ -3,7 +3,6 @@ # # This object is used to make changes for different running scenarios # -from Configuration.StandardSequences.Eras import eras SiPixelTrackResidualSource = cms.EDAnalyzer("SiPixelTrackResidualSource", TopFolderName = cms.string('Pixel'), @@ -33,4 +32,5 @@ ) # Modify for if the phase 1 pixel detector is active -eras.phase1Pixel.toModify( SiPixelTrackResidualSource, isUpgrade=cms.untracked.bool(True) ) +from Configuration.Eras.Modifier_phase1Pixel_cff import phase1Pixel +phase1Pixel.toModify( SiPixelTrackResidualSource, isUpgrade=cms.untracked.bool(True) ) diff --git a/DQM/SiStripMonitorClient/python/SiStripSourceConfigTier0_cff.py b/DQM/SiStripMonitorClient/python/SiStripSourceConfigTier0_cff.py index edc6ec99d2267..b0875e3467239 100644 --- a/DQM/SiStripMonitorClient/python/SiStripSourceConfigTier0_cff.py +++ b/DQM/SiStripMonitorClient/python/SiStripSourceConfigTier0_cff.py @@ -1,5 +1,4 @@ import FWCore.ParameterSet.Config as cms -from Configuration.StandardSequences.Eras import eras # FED integrity Check from DQM.SiStripMonitorHardware.siStripFEDCheck_cfi import * @@ -66,8 +65,8 @@ errorReplyDcs = cms.bool( True ), ) -from Configuration.StandardSequences.Eras import eras -eras.stage2L1Trigger.toModify(SiStripMonitorClusterBPTX, +from Configuration.Eras.Modifier_stage2L1Trigger_cff import stage2L1Trigger +stage2L1Trigger.toModify(SiStripMonitorClusterBPTX, BPTXfilter = dict( stage2 = cms.bool(True), l1tAlgBlkInputTag = cms.InputTag("gtStage2Digis"), @@ -154,7 +153,8 @@ APVPhases*consecutiveHEs*siStripFEDCheck*siStripFEDMonitor*SiStripMonitorDigi*SiStripMonitorClusterBPTX *SiStripMonitorTrackCommon*SiStripMonitorTrackIB*MonitorTrackResiduals *dqmInfoSiStrip) -eras.phase1Pixel.toReplaceWith(SiStripDQMTier0, SiStripDQMTier0.copyAndExclude([ # FIXME +from Configuration.Eras.Modifier_phase1Pixel_cff import phase1Pixel +phase1Pixel.toReplaceWith(SiStripDQMTier0, SiStripDQMTier0.copyAndExclude([ # FIXME MonitorTrackResiduals # Excessive printouts because 2017 doesn't have HLT yet ])) @@ -167,7 +167,7 @@ APVPhases*consecutiveHEs*siStripFEDCheck*siStripFEDMonitor*SiStripMonitorDigi*SiStripMonitorClusterBPTX *SiStripMonitorTrackMB*SiStripMonitorTrackIB*MonitorTrackResiduals *dqmInfoSiStrip) -eras.phase1Pixel.toReplaceWith(SiStripDQMTier0MinBias, SiStripDQMTier0MinBias.copyAndExclude([ # FIXME +phase1Pixel.toReplaceWith(SiStripDQMTier0MinBias, SiStripDQMTier0MinBias.copyAndExclude([ # FIXME MonitorTrackResiduals # Excessive printouts because 2017 doesn't have HLT yet ])) diff --git a/DQMOffline/Configuration/python/DQMOffline_CRT_cff.py b/DQMOffline/Configuration/python/DQMOffline_CRT_cff.py index 36e967c8fca39..b7b50248dc761 100644 --- a/DQMOffline/Configuration/python/DQMOffline_CRT_cff.py +++ b/DQMOffline/Configuration/python/DQMOffline_CRT_cff.py @@ -1,5 +1,4 @@ import FWCore.ParameterSet.Config as cms -from Configuration.StandardSequences.Eras import eras siStripCertificationInfo = cms.EDAnalyzer("SiStripCertificationInfo") from DQM.SiPixelCommon.SiPixelOfflineDQM_client_cff import * @@ -25,7 +24,8 @@ dataCertificationJetMETSequence * egammaDataCertificationTask * dqmOfflineTriggerCert ) -eras.phase1Pixel.toReplaceWith(crt_dqmoffline, crt_dqmoffline.copyAndExclude([ # FIXME +from Configuration.Eras.Modifier_phase1Pixel_cff import phase1Pixel +phase1Pixel.toReplaceWith(crt_dqmoffline, crt_dqmoffline.copyAndExclude([ # FIXME dqmOfflineTriggerCert, # No HLT yet for 2017, so no need to run the DQM (avoiding excessive printouts) sipixelCertification # segfaults with pixel harvesting plots missing ])) diff --git a/DQMOffline/Configuration/python/DQMOffline_SecondStep_cff.py b/DQMOffline/Configuration/python/DQMOffline_SecondStep_cff.py index 3b500360e4ac8..7c54accd27994 100644 --- a/DQMOffline/Configuration/python/DQMOffline_SecondStep_cff.py +++ b/DQMOffline/Configuration/python/DQMOffline_SecondStep_cff.py @@ -1,5 +1,4 @@ import FWCore.ParameterSet.Config as cms -from Configuration.StandardSequences.Eras import eras from CondTools.DQM.DQMReferenceHistogramRootFileEventSetupAnalyzer_cfi import * from DQMServices.Components.DQMMessageLoggerClient_cff import * @@ -54,7 +53,8 @@ alcaBeamMonitorClient * SusyPostProcessorSequence * runTauEff) -eras.phase1Pixel.toReplaceWith(DQMOffline_SecondStep_PrePOG, DQMOffline_SecondStep_PrePOG.copyAndExclude([ +from Configuration.Eras.Modifier_phase1Pixel_cff import phase1Pixel +phase1Pixel.toReplaceWith(DQMOffline_SecondStep_PrePOG, DQMOffline_SecondStep_PrePOG.copyAndExclude([ hltOfflineDQMClient, # No HLT yet for 2017, so no need to run the DQM (avoiding excessive printouts) runTauEff, # Excessive printouts because 2017 doesn't have HLT yet ])) @@ -71,7 +71,7 @@ HLTMonitoringClient * DQMMessageLoggerClientSeq * dqmFastTimerServiceClient) -eras.phase1Pixel.toReplaceWith(DQMOffline_SecondStep, DQMOffline_SecondStep.copyAndExclude([ +phase1Pixel.toReplaceWith(DQMOffline_SecondStep, DQMOffline_SecondStep.copyAndExclude([ HLTMonitoringClient, # No HLT yet for 2017, so no need to run the DQM (avoiding excessive printouts) ])) diff --git a/DQMOffline/Configuration/python/DQMOffline_cff.py b/DQMOffline/Configuration/python/DQMOffline_cff.py index 406f88033cd7a..ee00cdce74b5a 100644 --- a/DQMOffline/Configuration/python/DQMOffline_cff.py +++ b/DQMOffline/Configuration/python/DQMOffline_cff.py @@ -1,5 +1,4 @@ import FWCore.ParameterSet.Config as cms -from Configuration.StandardSequences.Eras import eras from DQMServices.Components.DQMMessageLogger_cfi import * from DQMServices.Components.DQMDcsInfo_cfi import * @@ -62,7 +61,8 @@ dqmPhysics * produceDenoms * pfTauRunDQMValidation) -eras.phase1Pixel.toReplaceWith(DQMOfflinePrePOG, DQMOfflinePrePOG.copyAndExclude([ # FIXME +from Configuration.Eras.Modifier_phase1Pixel_cff import phase1Pixel +phase1Pixel.toReplaceWith(DQMOfflinePrePOG, DQMOfflinePrePOG.copyAndExclude([ # FIXME triggerOfflineDQMSource, # No HLT yet for 2017, so no need to run the DQM (avoiding excessive printouts) pfTauRunDQMValidation, # Excessive printouts because 2017 doesn't have HLT yet ])) @@ -77,17 +77,18 @@ HLTMonitoring * dqmFastTimerServiceLuminosity * DQMMessageLogger ) -eras.phase1Pixel.toReplaceWith(DQMOffline, DQMOffline.copyAndExclude([ +phase1Pixel.toReplaceWith(DQMOffline, DQMOffline.copyAndExclude([ HLTMonitoring # No HLT yet for 2017, so no need to run the DQM (avoiding excessive printouts) ])) _ctpps_2016_DQMOffline = DQMOffline.copy() _ctpps_2016_DQMOffline *= totemDQM -eras.ctpps_2016.toReplaceWith(DQMOffline, _ctpps_2016_DQMOffline) +from Configuration.Eras.Modifier_ctpps_2016_cff import ctpps_2016 +ctpps_2016.toReplaceWith(DQMOffline, _ctpps_2016_DQMOffline) _ctpps_2016_DQMOffline = DQMOffline.copy() #_ctpps_2016_DQMOffline *= totemDQM -eras.ctpps_2016.toReplaceWith(DQMOffline, _ctpps_2016_DQMOffline) +ctpps_2016.toReplaceWith(DQMOffline, _ctpps_2016_DQMOffline) DQMOfflineFakeHLT = cms.Sequence( DQMOffline ) DQMOfflineFakeHLT.remove( HLTMonitoring ) @@ -156,7 +157,8 @@ PostDQMOfflineMiniAOD = cms.Sequence(miniAODDQMSequence*jetMETDQMOfflineSourceMiniAOD*tracksDQMMiniAOD*topPhysicsminiAOD) PostDQMOffline = cms.Sequence() -eras.phase2_hcal.toReplaceWith( PostDQMOfflineMiniAOD, PostDQMOfflineMiniAOD.copyAndExclude([ +from Configuration.Eras.Modifier_phase2_hcal_cff import phase2_hcal +phase2_hcal.toReplaceWith( PostDQMOfflineMiniAOD, PostDQMOfflineMiniAOD.copyAndExclude([ pfMetDQMAnalyzerMiniAOD, pfPuppiMetDQMAnalyzerMiniAOD # No hcalnoise yet ])) diff --git a/DQMOffline/JetMET/python/jetMETDQMOfflineSource_cff.py b/DQMOffline/JetMET/python/jetMETDQMOfflineSource_cff.py index 07ed17a80e163..b60c830597064 100644 --- a/DQMOffline/JetMET/python/jetMETDQMOfflineSource_cff.py +++ b/DQMOffline/JetMET/python/jetMETDQMOfflineSource_cff.py @@ -1,5 +1,4 @@ import FWCore.ParameterSet.Config as cms -from Configuration.StandardSequences.Eras import eras from DQMOffline.JetMET.metDQMConfig_cff import * from DQMOffline.JetMET.jetAnalyzer_cff import * @@ -109,7 +108,8 @@ dqmCorrPfMetType1*pfMETT1*jetDQMAnalyzerSequence*HBHENoiseFilterResultProducer* CSCTightHaloFilterDQM*CSCTightHalo2015FilterDQM*eeBadScFilterDQM*EcalDeadCellTriggerPrimitiveFilterDQM*EcalDeadCellBoundaryEnergyFilterDQM*HcalStripHaloFilterDQM *METDQMAnalyzerSequence) -eras.phase1Pixel.toReplaceWith(jetMETDQMOfflineSource, jetMETDQMOfflineSource.copyAndExclude([ # FIXME +from Configuration.Eras.Modifier_phase1Pixel_cff import phase1Pixel +phase1Pixel.toReplaceWith(jetMETDQMOfflineSource, jetMETDQMOfflineSource.copyAndExclude([ # FIXME jetDQMAnalyzerSequence, # Excessive printouts because 2017 doesn't have HLT yet METDQMAnalyzerSequence, # Excessive printouts because 2017 doesn't have HLT yet ])) diff --git a/DQMOffline/L1Trigger/python/L1TriggerDqmOffline_cff.py b/DQMOffline/L1Trigger/python/L1TriggerDqmOffline_cff.py index 0ebbb547b2bba..37e7de709854b 100644 --- a/DQMOffline/L1Trigger/python/L1TriggerDqmOffline_cff.py +++ b/DQMOffline/L1Trigger/python/L1TriggerDqmOffline_cff.py @@ -88,43 +88,43 @@ valStage1GtDigis.GctInputTag = 'gctDigis' -from Configuration.StandardSequences.Eras import eras - -eras.stage1L1Trigger.toModify(l1TdeRCT, rctSourceData = 'caloStage1Digis') -eras.stage1L1Trigger.toModify(l1TdeRCTfromRCT, rctSourceData = 'rctDigis') -eras.stage1L1Trigger.toModify(l1tRct, rctSource = 'caloStage1Digis') -eras.stage1L1Trigger.toModify(l1tRctfromRCT, rctSource = 'rctDigis') -eras.stage1L1Trigger.toModify(l1tPUM, regionSource = cms.InputTag("rctDigis")) - -eras.stage1L1Trigger.toModify(l1tStage1Layer2, stage1_layer2_ = cms.bool(True)) -eras.stage1L1Trigger.toModify(l1tStage1Layer2, gctCentralJetsSource = cms.InputTag("caloStage1LegacyFormatDigis","cenJets")) -eras.stage1L1Trigger.toModify(l1tStage1Layer2, gctForwardJetsSource = cms.InputTag("caloStage1LegacyFormatDigis","forJets")) -eras.stage1L1Trigger.toModify(l1tStage1Layer2, gctTauJetsSource = cms.InputTag("caloStage1LegacyFormatDigis","tauJets")) -eras.stage1L1Trigger.toModify(l1tStage1Layer2, gctIsoTauJetsSource = cms.InputTag("caloStage1LegacyFormatDigis","isoTauJets")) -eras.stage1L1Trigger.toModify(l1tStage1Layer2, gctEnergySumsSource = cms.InputTag("caloStage1LegacyFormatDigis")) -eras.stage1L1Trigger.toModify(l1tStage1Layer2, gctIsoEmSource = cms.InputTag("caloStage1LegacyFormatDigis","isoEm")) -eras.stage1L1Trigger.toModify(l1tStage1Layer2, gctNonIsoEmSource = cms.InputTag("caloStage1LegacyFormatDigis","nonIsoEm")) - -eras.stage1L1Trigger.toModify( dqmL1ExtraParticlesStage1, etTotalSource = cms.InputTag("caloStage1LegacyFormatDigis") ) -eras.stage1L1Trigger.toModify( dqmL1ExtraParticlesStage1, nonIsolatedEmSource = cms.InputTag("caloStage1LegacyFormatDigis","nonIsoEm") ) -eras.stage1L1Trigger.toModify( dqmL1ExtraParticlesStage1, etMissSource = cms.InputTag("caloStage1LegacyFormatDigis") ) -eras.stage1L1Trigger.toModify( dqmL1ExtraParticlesStage1, htMissSource = cms.InputTag("caloStage1LegacyFormatDigis") ) -eras.stage1L1Trigger.toModify( dqmL1ExtraParticlesStage1, forwardJetSource = cms.InputTag("caloStage1LegacyFormatDigis","forJets") ) -eras.stage1L1Trigger.toModify( dqmL1ExtraParticlesStage1, centralJetSource = cms.InputTag("caloStage1LegacyFormatDigis","cenJets") ) -eras.stage1L1Trigger.toModify( dqmL1ExtraParticlesStage1, tauJetSource = cms.InputTag("caloStage1LegacyFormatDigis","tauJets") ) -eras.stage1L1Trigger.toModify( dqmL1ExtraParticlesStage1, isoTauJetSource = cms.InputTag("caloStage1LegacyFormatDigis","isoTauJets") ) -eras.stage1L1Trigger.toModify( dqmL1ExtraParticlesStage1, isolatedEmSource = cms.InputTag("caloStage1LegacyFormatDigis","isoEm") ) -eras.stage1L1Trigger.toModify( dqmL1ExtraParticlesStage1, etHadSource = cms.InputTag("caloStage1LegacyFormatDigis") ) -eras.stage1L1Trigger.toModify( dqmL1ExtraParticlesStage1, hfRingEtSumsSource = cms.InputTag("caloStage1LegacyFormatDigis") ) -eras.stage1L1Trigger.toModify( dqmL1ExtraParticlesStage1, hfRingBitCountsSource = cms.InputTag("caloStage1LegacyFormatDigis") ) -eras.stage1L1Trigger.toModify( l1ExtraDQMStage1, stage1_layer2_ = cms.bool(True)) -eras.stage1L1Trigger.toModify( l1ExtraDQMStage1, L1ExtraIsoTauJetSource_ = cms.InputTag("dqmL1ExtraParticlesStage1", "IsoTau")) - -eras.stage1L1Trigger.toModify(l1compareforstage1, GCTsourceData = cms.InputTag("caloStage1LegacyFormatDigis")) -eras.stage1L1Trigger.toModify(l1compareforstage1, GCTsourceEmul = cms.InputTag("valCaloStage1LegacyFormatDigis")) -eras.stage1L1Trigger.toModify(l1compareforstage1, stage1_layer2_ = cms.bool(True)) - -eras.stage1L1Trigger.toModify(valStage1GtDigis, GctInputTag = 'caloStage1LegacyFormatDigis') + +from Configuration.Eras.Modifier_stage1L1Trigger_cff import stage1L1Trigger +stage1L1Trigger.toModify(l1TdeRCT, rctSourceData = 'caloStage1Digis') +stage1L1Trigger.toModify(l1TdeRCTfromRCT, rctSourceData = 'rctDigis') +stage1L1Trigger.toModify(l1tRct, rctSource = 'caloStage1Digis') +stage1L1Trigger.toModify(l1tRctfromRCT, rctSource = 'rctDigis') +stage1L1Trigger.toModify(l1tPUM, regionSource = cms.InputTag("rctDigis")) + +stage1L1Trigger.toModify(l1tStage1Layer2, stage1_layer2_ = cms.bool(True)) +stage1L1Trigger.toModify(l1tStage1Layer2, gctCentralJetsSource = cms.InputTag("caloStage1LegacyFormatDigis","cenJets")) +stage1L1Trigger.toModify(l1tStage1Layer2, gctForwardJetsSource = cms.InputTag("caloStage1LegacyFormatDigis","forJets")) +stage1L1Trigger.toModify(l1tStage1Layer2, gctTauJetsSource = cms.InputTag("caloStage1LegacyFormatDigis","tauJets")) +stage1L1Trigger.toModify(l1tStage1Layer2, gctIsoTauJetsSource = cms.InputTag("caloStage1LegacyFormatDigis","isoTauJets")) +stage1L1Trigger.toModify(l1tStage1Layer2, gctEnergySumsSource = cms.InputTag("caloStage1LegacyFormatDigis")) +stage1L1Trigger.toModify(l1tStage1Layer2, gctIsoEmSource = cms.InputTag("caloStage1LegacyFormatDigis","isoEm")) +stage1L1Trigger.toModify(l1tStage1Layer2, gctNonIsoEmSource = cms.InputTag("caloStage1LegacyFormatDigis","nonIsoEm")) + +stage1L1Trigger.toModify( dqmL1ExtraParticlesStage1, etTotalSource = cms.InputTag("caloStage1LegacyFormatDigis") ) +stage1L1Trigger.toModify( dqmL1ExtraParticlesStage1, nonIsolatedEmSource = cms.InputTag("caloStage1LegacyFormatDigis","nonIsoEm") ) +stage1L1Trigger.toModify( dqmL1ExtraParticlesStage1, etMissSource = cms.InputTag("caloStage1LegacyFormatDigis") ) +stage1L1Trigger.toModify( dqmL1ExtraParticlesStage1, htMissSource = cms.InputTag("caloStage1LegacyFormatDigis") ) +stage1L1Trigger.toModify( dqmL1ExtraParticlesStage1, forwardJetSource = cms.InputTag("caloStage1LegacyFormatDigis","forJets") ) +stage1L1Trigger.toModify( dqmL1ExtraParticlesStage1, centralJetSource = cms.InputTag("caloStage1LegacyFormatDigis","cenJets") ) +stage1L1Trigger.toModify( dqmL1ExtraParticlesStage1, tauJetSource = cms.InputTag("caloStage1LegacyFormatDigis","tauJets") ) +stage1L1Trigger.toModify( dqmL1ExtraParticlesStage1, isoTauJetSource = cms.InputTag("caloStage1LegacyFormatDigis","isoTauJets") ) +stage1L1Trigger.toModify( dqmL1ExtraParticlesStage1, isolatedEmSource = cms.InputTag("caloStage1LegacyFormatDigis","isoEm") ) +stage1L1Trigger.toModify( dqmL1ExtraParticlesStage1, etHadSource = cms.InputTag("caloStage1LegacyFormatDigis") ) +stage1L1Trigger.toModify( dqmL1ExtraParticlesStage1, hfRingEtSumsSource = cms.InputTag("caloStage1LegacyFormatDigis") ) +stage1L1Trigger.toModify( dqmL1ExtraParticlesStage1, hfRingBitCountsSource = cms.InputTag("caloStage1LegacyFormatDigis") ) +stage1L1Trigger.toModify( l1ExtraDQMStage1, stage1_layer2_ = cms.bool(True)) +stage1L1Trigger.toModify( l1ExtraDQMStage1, L1ExtraIsoTauJetSource_ = cms.InputTag("dqmL1ExtraParticlesStage1", "IsoTau")) + +stage1L1Trigger.toModify(l1compareforstage1, GCTsourceData = cms.InputTag("caloStage1LegacyFormatDigis")) +stage1L1Trigger.toModify(l1compareforstage1, GCTsourceEmul = cms.InputTag("valCaloStage1LegacyFormatDigis")) +stage1L1Trigger.toModify(l1compareforstage1, stage1_layer2_ = cms.bool(True)) + +stage1L1Trigger.toModify(valStage1GtDigis, GctInputTag = 'caloStage1LegacyFormatDigis') # # define sequences diff --git a/DQMOffline/Muon/python/muonAnalyzer_cff.py b/DQMOffline/Muon/python/muonAnalyzer_cff.py index c9359fc778044..54a715a4c4976 100644 --- a/DQMOffline/Muon/python/muonAnalyzer_cff.py +++ b/DQMOffline/Muon/python/muonAnalyzer_cff.py @@ -1,5 +1,4 @@ import FWCore.ParameterSet.Config as cms -from Configuration.StandardSequences.Eras import eras from DQMOffline.Muon.muonRecoOneHLT_cfi import * from DQMOffline.Muon.muonEfficiencyAnalyzer_cfi import * @@ -23,10 +22,12 @@ TightMuonEfficiencyAnalyzer* muonPFsequence* muonRecoOneHLT) -eras.phase1Pixel.toReplaceWith(muonAnalyzer, muonAnalyzer.copyAndExclude([ # FIXME +from Configuration.Eras.Modifier_phase1Pixel_cff import phase1Pixel +phase1Pixel.toReplaceWith(muonAnalyzer, muonAnalyzer.copyAndExclude([ # FIXME muonRecoOneHLT # Doesn't work because TriggerResults::HLT is missing (because HLT not yet being part of 2017 workflow) ])) -eras.phase2_muon.toReplaceWith(muonAnalyzer, muonAnalyzer.copyAndExclude([ # FIXME +from Configuration.Eras.Modifier_phase2_muon_cff import phase2_muon +phase2_muon.toReplaceWith(muonAnalyzer, muonAnalyzer.copyAndExclude([ # FIXME muonEnergyDepositAnalyzer ])) diff --git a/EventFilter/CSCRawToDigi/python/cscPacker_cfi.py b/EventFilter/CSCRawToDigi/python/cscPacker_cfi.py index 0f3c642b32712..edf57facd4476 100644 --- a/EventFilter/CSCRawToDigi/python/cscPacker_cfi.py +++ b/EventFilter/CSCRawToDigi/python/cscPacker_cfi.py @@ -21,8 +21,8 @@ ## ## Make changes for running in Run 2 ## -from Configuration.StandardSequences.Eras import eras # packer - simply get rid of it -eras.run2_common.toModify( cscpacker, useFormatVersion = cms.uint32(2013) ) -eras.run2_common.toModify( cscpacker, usePreTriggers = cms.bool(False) ) -eras.run2_common.toModify( cscpacker, packEverything = cms.bool(True) ) +from Configuration.Eras.Modifier_run2_common_cff import run2_common +run2_common.toModify( cscpacker, useFormatVersion = cms.uint32(2013) ) +run2_common.toModify( cscpacker, usePreTriggers = cms.bool(False) ) +run2_common.toModify( cscpacker, packEverything = cms.bool(True) ) diff --git a/EventFilter/HcalRawToDigi/python/HcalDigiToRaw_cfi.py b/EventFilter/HcalRawToDigi/python/HcalDigiToRaw_cfi.py index 8ecaf01aa469f..2cd476f876035 100644 --- a/EventFilter/HcalRawToDigi/python/HcalDigiToRaw_cfi.py +++ b/EventFilter/HcalRawToDigi/python/HcalDigiToRaw_cfi.py @@ -16,10 +16,10 @@ _phase1_hcalRawData = hcalRawData.copy() _phase1_hcalRawData += hcalRawDatauHTR -from Configuration.StandardSequences.Eras import eras -eras.run2_HCAL_2017.toModify( hcalRawDataVME, +from Configuration.Eras.Modifier_run2_HCAL_2017_cff import run2_HCAL_2017 +run2_HCAL_2017.toModify( hcalRawDataVME, HBHE = cms.untracked.InputTag(""), HF = cms.untracked.InputTag(""), TRIG = cms.untracked.InputTag("") ) -eras.run2_HCAL_2017.toReplaceWith(hcalRawData,_phase1_hcalRawData) +run2_HCAL_2017.toReplaceWith(hcalRawData,_phase1_hcalRawData) diff --git a/EventFilter/RawDataCollector/python/rawDataCollectorByLabel_cfi.py b/EventFilter/RawDataCollector/python/rawDataCollectorByLabel_cfi.py index 2dbe754fbd1dd..324fdc42a802c 100644 --- a/EventFilter/RawDataCollector/python/rawDataCollectorByLabel_cfi.py +++ b/EventFilter/RawDataCollector/python/rawDataCollectorByLabel_cfi.py @@ -9,5 +9,5 @@ # # Make changes if using the Stage 1 trigger # -from Configuration.StandardSequences.Eras import eras -eras.stage1L1Trigger.toModify( rawDataCollector.RawCollectionList, func = lambda list: list.append(cms.InputTag("l1tDigiToRaw")) ) +from Configuration.Eras.Modifier_stage1L1Trigger_cff import stage1L1Trigger +stage1L1Trigger.toModify( rawDataCollector.RawCollectionList, func = lambda list: list.append(cms.InputTag("l1tDigiToRaw")) ) diff --git a/EventFilter/RawDataCollector/python/rawDataCollector_cfi.py b/EventFilter/RawDataCollector/python/rawDataCollector_cfi.py index 0441674077834..17c2db24cbaca 100644 --- a/EventFilter/RawDataCollector/python/rawDataCollector_cfi.py +++ b/EventFilter/RawDataCollector/python/rawDataCollector_cfi.py @@ -22,6 +22,7 @@ # # Make changes if using the Stage 1 trigger # -from Configuration.StandardSequences.Eras import eras -eras.stage1L1Trigger.toModify( rawDataCollector.RawCollectionList, func = lambda list: list.append(cms.InputTag("l1tDigiToRaw")) ) -eras.run2_HCAL_2017.toModify( rawDataCollector.RawCollectionList, func = lambda list: list.append(cms.InputTag("hcalRawDatauHTR")) ) +from Configuration.Eras.Modifier_stage1L1Trigger_cff import stage1L1Trigger +stage1L1Trigger.toModify( rawDataCollector.RawCollectionList, func = lambda list: list.append(cms.InputTag("l1tDigiToRaw")) ) +from Configuration.Eras.Modifier_run2_HCAL_2017_cff import run2_HCAL_2017 +run2_HCAL_2017.toModify( rawDataCollector.RawCollectionList, func = lambda list: list.append(cms.InputTag("hcalRawDatauHTR")) ) diff --git a/EventFilter/SiPixelRawToDigi/python/SiPixelDigiToRaw_cfi.py b/EventFilter/SiPixelRawToDigi/python/SiPixelDigiToRaw_cfi.py index e50a2cd527fc2..bb78b3ee8c6ea 100644 --- a/EventFilter/SiPixelRawToDigi/python/SiPixelDigiToRaw_cfi.py +++ b/EventFilter/SiPixelRawToDigi/python/SiPixelDigiToRaw_cfi.py @@ -1,5 +1,4 @@ import FWCore.ParameterSet.Config as cms -from Configuration.StandardSequences.Eras import eras siPixelRawData = cms.EDProducer("SiPixelDigiToRaw", Timing = cms.untracked.bool(False), @@ -7,6 +6,7 @@ ## Use phase1 UsePhase1 = cms.bool(False), ) -eras.phase1Pixel.toModify(siPixelRawData, UsePhase1=True) +from Configuration.Eras.Modifier_phase1Pixel_cff import phase1Pixel +phase1Pixel.toModify(siPixelRawData, UsePhase1=True) diff --git a/EventFilter/SiPixelRawToDigi/python/SiPixelRawToDigi_cfi.py b/EventFilter/SiPixelRawToDigi/python/SiPixelRawToDigi_cfi.py index 13aaf80701b5d..fda0b69fa46a1 100644 --- a/EventFilter/SiPixelRawToDigi/python/SiPixelRawToDigi_cfi.py +++ b/EventFilter/SiPixelRawToDigi/python/SiPixelRawToDigi_cfi.py @@ -1,5 +1,4 @@ import FWCore.ParameterSet.Config as cms -from Configuration.StandardSequences.Eras import eras import EventFilter.SiPixelRawToDigi.siPixelRawToDigi_cfi siPixelDigis = EventFilter.SiPixelRawToDigi.siPixelRawToDigi_cfi.siPixelRawToDigi.clone() @@ -19,4 +18,5 @@ siPixelDigis.Regions = cms.PSet( ) siPixelDigis.CablingMapLabel = cms.string("") -eras.phase1Pixel.toModify(siPixelDigis, UsePhase1=True) +from Configuration.Eras.Modifier_phase1Pixel_cff import phase1Pixel +phase1Pixel.toModify(siPixelDigis, UsePhase1=True) diff --git a/FastSimulation/Calorimetry/python/Calorimetry_cff.py b/FastSimulation/Calorimetry/python/Calorimetry_cff.py index aa2fe02ccc187..56a8a846c13b3 100644 --- a/FastSimulation/Calorimetry/python/Calorimetry_cff.py +++ b/FastSimulation/Calorimetry/python/Calorimetry_cff.py @@ -1,7 +1,6 @@ import FWCore.ParameterSet.Config as cms # This is used to modify parameters for Run 2 (see bottom of file) -from Configuration.StandardSequences.Eras import eras #Global fast calorimetry parameters from FastSimulation.Calorimetry.HcalResponse_cfi import * @@ -299,4 +298,5 @@ FamosCalorimetryBlock.Calorimetry.ECAL.Digitizer = True FamosCalorimetryBlock.Calorimetry.HCAL.Digitizer = True -eras.run2_common.toModify(FamosCalorimetryBlock.Calorimetry.HFShowerLibrary, FileName = 'SimG4CMS/Calo/data/HFShowerLibrary_npmt_noatt_eta4_16en_v3.root' ) +from Configuration.Eras.Modifier_run2_common_cff import run2_common +run2_common.toModify(FamosCalorimetryBlock.Calorimetry.HFShowerLibrary, FileName = 'SimG4CMS/Calo/data/HFShowerLibrary_npmt_noatt_eta4_16en_v3.root' ) diff --git a/FastSimulation/TrajectoryManager/python/TrackerSimHits_cfi.py b/FastSimulation/TrajectoryManager/python/TrackerSimHits_cfi.py index c061b55bc0c11..dcd28a1e09ac4 100644 --- a/FastSimulation/TrajectoryManager/python/TrackerSimHits_cfi.py +++ b/FastSimulation/TrajectoryManager/python/TrackerSimHits_cfi.py @@ -12,5 +12,5 @@ # # Modify for running in Run 2 # -from Configuration.StandardSequences.Eras import eras -eras.run2_common.toModify( TrackerSimHitsBlock.TrackerSimHits, pTmin = 0.1 ) +from Configuration.Eras.Modifier_run2_common_cff import run2_common +run2_common.toModify( TrackerSimHitsBlock.TrackerSimHits, pTmin = 0.1 ) diff --git a/Geometry/CSCGeometryBuilder/python/cscGeometryDB_cfi.py b/Geometry/CSCGeometryBuilder/python/cscGeometryDB_cfi.py index 01cf55b89a449..26c5167abe161 100644 --- a/Geometry/CSCGeometryBuilder/python/cscGeometryDB_cfi.py +++ b/Geometry/CSCGeometryBuilder/python/cscGeometryDB_cfi.py @@ -21,5 +21,5 @@ # # Modify for running in run 2 # -from Configuration.StandardSequences.Eras import eras -eras.run2_common.toModify( CSCGeometryESModule, useGangedStripsInME1a=False ) +from Configuration.Eras.Modifier_run2_common_cff import run2_common +run2_common.toModify( CSCGeometryESModule, useGangedStripsInME1a=False ) diff --git a/Geometry/CSCGeometryBuilder/python/cscGeometry_cfi.py b/Geometry/CSCGeometryBuilder/python/cscGeometry_cfi.py index 3592ff56332f8..3c33e4601363b 100644 --- a/Geometry/CSCGeometryBuilder/python/cscGeometry_cfi.py +++ b/Geometry/CSCGeometryBuilder/python/cscGeometry_cfi.py @@ -21,5 +21,5 @@ # # Modify for running in run 2 # -from Configuration.StandardSequences.Eras import eras -eras.run2_common.toModify( CSCGeometryESModule, useGangedStripsInME1a=False ) +from Configuration.Eras.Modifier_run2_common_cff import run2_common +run2_common.toModify( CSCGeometryESModule, useGangedStripsInME1a=False ) diff --git a/HLTriggerOffline/Btag/python/HltBtagValidation_cff.py b/HLTriggerOffline/Btag/python/HltBtagValidation_cff.py index e48da703ca0e7..24e9fe6f5fb2d 100644 --- a/HLTriggerOffline/Btag/python/HltBtagValidation_cff.py +++ b/HLTriggerOffline/Btag/python/HltBtagValidation_cff.py @@ -76,8 +76,8 @@ ) # fastsim customs -from Configuration.StandardSequences.Eras import eras -if eras.fastSim.isChosen(): +from Configuration.Eras.Modifier_fastSim_cff import fastSim +if fastSim.isChosen(): HltVertexValidationVertices.SimVertexCollection = cms.InputTag("famosSimHits") # are these customs actually needed? #HltVertexValidationVertices.HLTPathNames =cms.vstring( diff --git a/HLTriggerOffline/Common/python/HLTValidationHarvest_cff.py b/HLTriggerOffline/Common/python/HLTValidationHarvest_cff.py index 76f9b2ae84927..800e5d74fa7a9 100644 --- a/HLTriggerOffline/Common/python/HLTValidationHarvest_cff.py +++ b/HLTriggerOffline/Common/python/HLTValidationHarvest_cff.py @@ -1,4 +1,3 @@ -from Configuration.StandardSequences.Eras import eras from HLTriggerOffline.Tau.Validation.HLTTauPostValidation_cfi import * from HLTriggerOffline.Muon.HLTMuonPostVal_cff import * @@ -37,11 +36,12 @@ +HLTSMPPostVal +HltBTagPostVal ) -eras.phase1Pixel.toReplaceWith(hltpostvalidation, cms.Sequence()) # FIXME: No HLT yet for 2017, so no need to run the DQM (avoiding excessive printouts) +from Configuration.Eras.Modifier_phase1Pixel_cff import phase1Pixel +phase1Pixel.toReplaceWith(hltpostvalidation, cms.Sequence()) # FIXME: No HLT yet for 2017, so no need to run the DQM (avoiding excessive printouts) # fastsim customs -from Configuration.StandardSequences.Eras import eras -if eras.fastSim.isChosen(): +from Configuration.Eras.Modifier_fastSim_cff import fastSim +if fastSim.isChosen(): hltpostvalidation.remove(postProcessorHLTtrackingSequence) hltpostvalidation.remove(postProcessorHLTvertexing) # remove this: +hltvalidationqt ? diff --git a/HLTriggerOffline/Common/python/HLTValidation_cff.py b/HLTriggerOffline/Common/python/HLTValidation_cff.py index 6aec4470f6558..31e8aa0b5d8de 100644 --- a/HLTriggerOffline/Common/python/HLTValidation_cff.py +++ b/HLTriggerOffline/Common/python/HLTValidation_cff.py @@ -1,4 +1,3 @@ -from Configuration.StandardSequences.Eras import eras from Validation.RecoTrack.HLTmultiTrackValidator_cff import * from Validation.RecoVertex.HLTmultiPVvalidator_cff import * @@ -33,7 +32,8 @@ +egammaSelectors +ExoticaValidationProdSeq ) -eras.phase1Pixel.toReplaceWith(hltassociation, cms.Sequence()) # FIXME: No HLT yet for 2017, so no need to run the validation +from Configuration.Eras.Modifier_phase1Pixel_cff import phase1Pixel +phase1Pixel.toReplaceWith(hltassociation, cms.Sequence()) # FIXME: No HLT yet for 2017, so no need to run the validation hltvalidation = cms.Sequence( HLTMuonVal @@ -50,12 +50,13 @@ +SMPValidationSequence +hltbtagValidationSequence ) -eras.phase1Pixel.toReplaceWith(hltvalidation, cms.Sequence()) # FIXME: No HLT yet for 2017, so no need to run the validation +phase1Pixel.toReplaceWith(hltvalidation, cms.Sequence()) # FIXME: No HLT yet for 2017, so no need to run the validation # some hlt collections have no direct fastsim equivalent # remove the dependent modules for now # probably it would be rather easy to add or fake these collections -if eras.fastSim.isChosen(): +from Configuration.Eras.Modifier_fastSim_cff import fastSim +if fastSim.isChosen(): hltassociation.remove(hltMultiTrackValidation) hltassociation.remove(hltMultiPVValidation) diff --git a/HLTriggerOffline/SUSYBSM/python/SUSYBSM_Ele_HT_BTag_SingleLepton_cff.py b/HLTriggerOffline/SUSYBSM/python/SUSYBSM_Ele_HT_BTag_SingleLepton_cff.py index 943443f959068..cfc7ae2222c37 100644 --- a/HLTriggerOffline/SUSYBSM/python/SUSYBSM_Ele_HT_BTag_SingleLepton_cff.py +++ b/HLTriggerOffline/SUSYBSM/python/SUSYBSM_Ele_HT_BTag_SingleLepton_cff.py @@ -54,5 +54,5 @@ ) # fastsim has no conversion collection (yet) -from Configuration.StandardSequences.Eras import eras -eras.fastSim.toModify(SUSY_HLT_Ele_HT_BTag_SingleLepton,conversionCollection=cms.InputTag('')) +from Configuration.Eras.Modifier_fastSim_cff import fastSim +fastSim.toModify(SUSY_HLT_Ele_HT_BTag_SingleLepton,conversionCollection=cms.InputTag('')) diff --git a/HLTriggerOffline/SUSYBSM/python/SUSYBSM_Ele_HT_Control_SingleLepton_cff.py b/HLTriggerOffline/SUSYBSM/python/SUSYBSM_Ele_HT_Control_SingleLepton_cff.py index 36d6feda69148..f9311527784f4 100644 --- a/HLTriggerOffline/SUSYBSM/python/SUSYBSM_Ele_HT_Control_SingleLepton_cff.py +++ b/HLTriggerOffline/SUSYBSM/python/SUSYBSM_Ele_HT_Control_SingleLepton_cff.py @@ -53,5 +53,5 @@ # fastsim has no conversion collection (yet) -from Configuration.StandardSequences.Eras import eras -eras.fastSim.toModify(SUSY_HLT_Ele_HT_Control_SingleLepton,conversionCollection=cms.InputTag('')) +from Configuration.Eras.Modifier_fastSim_cff import fastSim +fastSim.toModify(SUSY_HLT_Ele_HT_Control_SingleLepton,conversionCollection=cms.InputTag('')) diff --git a/HLTriggerOffline/SUSYBSM/python/SUSYBSM_Ele_HT_MET_SingleLepton_cff.py b/HLTriggerOffline/SUSYBSM/python/SUSYBSM_Ele_HT_MET_SingleLepton_cff.py index 5f029e8c7b6af..92299860002de 100644 --- a/HLTriggerOffline/SUSYBSM/python/SUSYBSM_Ele_HT_MET_SingleLepton_cff.py +++ b/HLTriggerOffline/SUSYBSM/python/SUSYBSM_Ele_HT_MET_SingleLepton_cff.py @@ -105,9 +105,9 @@ # fastsim has no conversion collection (yet) -from Configuration.StandardSequences.Eras import eras -eras.fastSim.toModify(SUSY_HLT_Ele15_HT350_MET50_SingleLepton,conversionCollection=cms.InputTag('')) -eras.fastSim.toModify(SUSY_HLT_Ele15_HT400_MET50_SingleLepton,conversionCollection=cms.InputTag('')) +from Configuration.Eras.Modifier_fastSim_cff import fastSim +fastSim.toModify(SUSY_HLT_Ele15_HT350_MET50_SingleLepton,conversionCollection=cms.InputTag('')) +fastSim.toModify(SUSY_HLT_Ele15_HT400_MET50_SingleLepton,conversionCollection=cms.InputTag('')) SUSY_HLT_Ele_HT_MET_SingleLepton = cms.Sequence( SUSY_HLT_Ele15_HT350_MET50_SingleLepton + SUSY_HLT_Ele15_HT400_MET50_SingleLepton diff --git a/HLTriggerOffline/SUSYBSM/python/SUSYBSM_Ele_HT_SingleLepton_cff.py b/HLTriggerOffline/SUSYBSM/python/SUSYBSM_Ele_HT_SingleLepton_cff.py index a62ab85fea291..b1ea01bd22f81 100644 --- a/HLTriggerOffline/SUSYBSM/python/SUSYBSM_Ele_HT_SingleLepton_cff.py +++ b/HLTriggerOffline/SUSYBSM/python/SUSYBSM_Ele_HT_SingleLepton_cff.py @@ -152,10 +152,10 @@ ) # fastsim has no conversion collection (yet) -from Configuration.StandardSequences.Eras import eras -eras.fastSim.toModify(SUSY_HLT_Ele15_HT600_SingleLepton,conversionCollection=cms.InputTag('')) -eras.fastSim.toModify(SUSY_HLT_Ele15_HT400_SingleLepton,conversionCollection=cms.InputTag('')) -eras.fastSim.toModify(SUSY_HLT_Ele50_HT400_SingleLepton,conversionCollection=cms.InputTag('')) +from Configuration.Eras.Modifier_fastSim_cff import fastSim +fastSim.toModify(SUSY_HLT_Ele15_HT600_SingleLepton,conversionCollection=cms.InputTag('')) +fastSim.toModify(SUSY_HLT_Ele15_HT400_SingleLepton,conversionCollection=cms.InputTag('')) +fastSim.toModify(SUSY_HLT_Ele50_HT400_SingleLepton,conversionCollection=cms.InputTag('')) SUSY_HLT_Ele_HT_SingleLepton = cms.Sequence( SUSY_HLT_Ele15_HT600_SingleLepton + SUSY_HLT_Ele15_HT400_SingleLepton diff --git a/IOMC/RandomEngine/python/IOMC_cff.py b/IOMC/RandomEngine/python/IOMC_cff.py index 365c9712037f5..cb3c477c7e897 100644 --- a/IOMC/RandomEngine/python/IOMC_cff.py +++ b/IOMC/RandomEngine/python/IOMC_cff.py @@ -169,16 +169,18 @@ randomEngineStateProducer = cms.EDProducer("RandomEngineStateProducer") -from Configuration.StandardSequences.Eras import eras -eras.run3_GEM.toModify(RandomNumberGeneratorService, simMuonGEMDigis = cms.PSet( +from Configuration.Eras.Modifier_run3_GEM_cff import run3_GEM +run3_GEM.toModify(RandomNumberGeneratorService, simMuonGEMDigis = cms.PSet( initialSeed = cms.untracked.uint32(1234567), engineName = cms.untracked.string('HepJamesRandom')) ) -eras.phase2_muon.toModify(RandomNumberGeneratorService, simMuonME0Digis = cms.PSet( +from Configuration.Eras.Modifier_phase2_muon_cff import phase2_muon +phase2_muon.toModify(RandomNumberGeneratorService, simMuonME0Digis = cms.PSet( initialSeed = cms.untracked.uint32(1234567), engineName = cms.untracked.string('HepJamesRandom')) ) -eras.phase2_timing.toModify( +from Configuration.Eras.Modifier_phase2_timing_cff import phase2_timing +phase2_timing.toModify( RandomNumberGeneratorService, trackTimeValueMapProducer = cms.PSet( initialSeed = cms.untracked.uint32(1234567), diff --git a/L1Trigger/CSCTrackFinder/python/csctfTrackDigis_cfi.py b/L1Trigger/CSCTrackFinder/python/csctfTrackDigis_cfi.py index 04552cb9cd313..b35beffa84f03 100644 --- a/L1Trigger/CSCTrackFinder/python/csctfTrackDigis_cfi.py +++ b/L1Trigger/CSCTrackFinder/python/csctfTrackDigis_cfi.py @@ -126,6 +126,6 @@ def _modifyCsctfTrackDigisForRun2( object ) : # # If the run2 era is active, make the required changes # -from Configuration.StandardSequences.Eras import eras -eras.run2_common.toModify( csctfTrackDigis, _modifyCsctfTrackDigisForRun2 ) +from Configuration.Eras.Modifier_run2_common_cff import run2_common +run2_common.toModify( csctfTrackDigis, _modifyCsctfTrackDigisForRun2 ) diff --git a/L1Trigger/CSCTriggerPrimitives/python/cscTriggerPrimitiveDigis_cfi.py b/L1Trigger/CSCTriggerPrimitives/python/cscTriggerPrimitiveDigis_cfi.py index a7631b85dab1b..5f35a7b938950 100644 --- a/L1Trigger/CSCTriggerPrimitives/python/cscTriggerPrimitiveDigis_cfi.py +++ b/L1Trigger/CSCTriggerPrimitives/python/cscTriggerPrimitiveDigis_cfi.py @@ -501,16 +501,17 @@ promoteALCTRPCquality = cms.bool(True), ) -from Configuration.StandardSequences.Eras import eras ## unganging in ME1/a -eras.run2_common.toModify( cscTriggerPrimitiveDigis, +from Configuration.Eras.Modifier_run2_common_cff import run2_common +run2_common.toModify( cscTriggerPrimitiveDigis, debugParameters = True, checkBadChambers = False, commonParam = dict(gangedME1a = False) ) ## GEM-CSC ILT in ME1/1 -eras.run3_GEM.toModify( cscTriggerPrimitiveDigis, +from Configuration.Eras.Modifier_run3_GEM_cff import run3_GEM +run3_GEM.toModify( cscTriggerPrimitiveDigis, GEMPadDigiProducer = cms.InputTag("simMuonGEMPadDigis"), commonParam = dict( isSLHC = cms.bool(True), @@ -521,7 +522,8 @@ ) ## GEM-CSC ILT in ME2/1, CSC-RPC ILT in ME3/1 and ME4/1 -eras.phase2_muon.toModify( cscTriggerPrimitiveDigis, +from Configuration.Eras.Modifier_phase2_muon_cff import phase2_muon +phase2_muon.toModify( cscTriggerPrimitiveDigis, RPCDigiProducer = cms.InputTag("simMuonRPCDigis"), commonParam = dict(runME21ILT = cms.bool(True), runME3141ILT = cms.bool(False)), diff --git a/L1Trigger/Configuration/python/ConditionalStage1Configuration_cff.py b/L1Trigger/Configuration/python/ConditionalStage1Configuration_cff.py index 27dfbd6d7d7b1..9a7ffc5bdacef 100644 --- a/L1Trigger/Configuration/python/ConditionalStage1Configuration_cff.py +++ b/L1Trigger/Configuration/python/ConditionalStage1Configuration_cff.py @@ -19,7 +19,6 @@ # run, so the era customisations will not be applied. # -from Configuration.StandardSequences.Eras import eras def _loadStage1Fragments( processObject ) : # processObject.load('L1Trigger.L1TCalorimeter.caloStage1Params_cfi') @@ -27,4 +26,5 @@ def _loadStage1Fragments( processObject ) : processObject.load('L1Trigger.L1TCalorimeter.caloConfigStage1PP_cfi') # A unique name is required so I'll use make sure the name includes the filename -modifyL1TriggerConfigurationConditionalStage1Configuration_cff_ = eras.stage1L1Trigger.makeProcessModifier( _loadStage1Fragments ) +from Configuration.Eras.Modifier_stage1L1Trigger_cff import stage1L1Trigger +modifyL1TriggerConfigurationConditionalStage1Configuration_cff_ = stage1L1Trigger.makeProcessModifier( _loadStage1Fragments ) diff --git a/L1Trigger/Configuration/python/L1TDigiToRaw_cff.py b/L1Trigger/Configuration/python/L1TDigiToRaw_cff.py index 9fe4c964513b1..b2f653c154a88 100644 --- a/L1Trigger/Configuration/python/L1TDigiToRaw_cff.py +++ b/L1Trigger/Configuration/python/L1TDigiToRaw_cff.py @@ -6,19 +6,20 @@ # which contains all L1 trigger packers needed for the current era. # import FWCore.ParameterSet.Config as cms -from Configuration.StandardSequences.Eras import eras # Modify the Raw Data Collection Raw collection List to include upgrade collections where appropriate: from EventFilter.RawDataCollector.rawDataCollector_cfi import * -eras.stage1L1Trigger.toModify( rawDataCollector.RawCollectionList, func = lambda list: list.append(cms.InputTag("caloStage1Raw")) ) -eras.stage2L1Trigger.toModify( rawDataCollector.RawCollectionList, func = lambda list: list.append(cms.InputTag("caloStage2Raw")) ) -eras.stage2L1Trigger.toModify( rawDataCollector.RawCollectionList, func = lambda list: list.append(cms.InputTag("gmtStage2Raw")) ) -eras.stage2L1Trigger.toModify( rawDataCollector.RawCollectionList, func = lambda list: list.append(cms.InputTag("gtStage2Raw")) ) +from Configuration.Eras.Modifier_stage1L1Trigger_cff import stage1L1Trigger +stage1L1Trigger.toModify( rawDataCollector.RawCollectionList, func = lambda list: list.append(cms.InputTag("caloStage1Raw")) ) +from Configuration.Eras.Modifier_stage2L1Trigger_cff import stage2L1Trigger +stage2L1Trigger.toModify( rawDataCollector.RawCollectionList, func = lambda list: list.append(cms.InputTag("caloStage2Raw")) ) +stage2L1Trigger.toModify( rawDataCollector.RawCollectionList, func = lambda list: list.append(cms.InputTag("gmtStage2Raw")) ) +stage2L1Trigger.toModify( rawDataCollector.RawCollectionList, func = lambda list: list.append(cms.InputTag("gtStage2Raw")) ) # # Legacy Trigger: # -if not (eras.stage1L1Trigger.isChosen() or eras.stage2L1Trigger.isChosen()): +if not (stage1L1Trigger.isChosen() or stage2L1Trigger.isChosen()): print "L1TDigiToRaw Sequence configured for Run1 (Legacy) trigger. " # legacy L1 packages: from EventFilter.CSCTFRawToDigi.csctfpacker_cfi import * @@ -39,7 +40,7 @@ # # Stage-1 Trigger # -if eras.stage1L1Trigger.isChosen() and not eras.stage2L1Trigger.isChosen(): +if stage1L1Trigger.isChosen() and not stage2L1Trigger.isChosen(): print "L1TDigiToRaw Sequence configured for Stage-1 (2015) trigger. " # legacy L1 packers, still in use for 2015: from EventFilter.CSCTFRawToDigi.csctfpacker_cfi import * @@ -64,7 +65,7 @@ # # Stage-2 Trigger # -if eras.stage2L1Trigger.isChosen(): +if stage2L1Trigger.isChosen(): print "L1TDigiToRaw Sequence configured for Stage-2 (2016) trigger. " from EventFilter.L1TRawToDigi.caloStage2Raw_cfi import * from EventFilter.L1TRawToDigi.gmtStage2Raw_cfi import * diff --git a/L1Trigger/Configuration/python/L1TRawToDigi_cff.py b/L1Trigger/Configuration/python/L1TRawToDigi_cff.py index c12cebf110ce8..1a1a045d96f6a 100644 --- a/L1Trigger/Configuration/python/L1TRawToDigi_cff.py +++ b/L1Trigger/Configuration/python/L1TRawToDigi_cff.py @@ -7,7 +7,6 @@ # import FWCore.ParameterSet.Config as cms -from Configuration.StandardSequences.Eras import eras def unpack_legacy(): @@ -67,7 +66,9 @@ def unpack_stage2(): # # Legacy Trigger: # -if not (eras.stage1L1Trigger.isChosen() or eras.stage2L1Trigger.isChosen()): +from Configuration.Eras.Modifier_stage1L1Trigger_cff import stage1L1Trigger +from Configuration.Eras.Modifier_stage2L1Trigger_cff import stage2L1Trigger +if not (stage1L1Trigger.isChosen() or stage2L1Trigger.isChosen()): print "L1TRawToDigi Sequence configured for Run1 (Legacy) trigger. " unpack_legacy() L1TRawToDigi = cms.Sequence(L1TRawToDigi_Legacy); @@ -75,7 +76,7 @@ def unpack_stage2(): # # Stage-1 Trigger # -if eras.stage1L1Trigger.isChosen() and not eras.stage2L1Trigger.isChosen(): +if stage1L1Trigger.isChosen() and not stage2L1Trigger.isChosen(): print "L1TRawToDigi Sequence configured for Stage-1 (2015) trigger. " unpack_stage1() L1TRawToDigi = cms.Sequence(L1TRawToDigi_Stage1) @@ -83,7 +84,7 @@ def unpack_stage2(): # # Stage-2 Trigger: fow now, unpack Stage 1 and Stage 2 (in case both available) # -if eras.stage2L1Trigger.isChosen(): +if stage2L1Trigger.isChosen(): print "L1TRawToDigi Sequence configured for Stage-2 (2016) trigger. " unpack_stage1() unpack_stage2() diff --git a/L1Trigger/Configuration/python/L1TReco_cff.py b/L1Trigger/Configuration/python/L1TReco_cff.py index b3db02806b6db..8ebde812d0d9d 100644 --- a/L1Trigger/Configuration/python/L1TReco_cff.py +++ b/L1Trigger/Configuration/python/L1TReco_cff.py @@ -7,7 +7,6 @@ # import FWCore.ParameterSet.Config as cms -from Configuration.StandardSequences.Eras import eras # # These might be more widely useful... L1T_customs? @@ -48,7 +47,9 @@ def config_L1ExtraForStage2Sim(coll): # # Legacy Trigger: # -if not (eras.stage1L1Trigger.isChosen() or eras.stage2L1Trigger.isChosen()): +from Configuration.Eras.Modifier_stage1L1Trigger_cff import stage1L1Trigger +from Configuration.Eras.Modifier_stage2L1Trigger_cff import stage2L1Trigger +if not (stage1L1Trigger.isChosen() or stage2L1Trigger.isChosen()): print "L1TReco Sequence configured for Run1 (Legacy) trigger. " from L1Trigger.L1ExtraFromDigis.l1extraParticles_cfi import * l1extraParticles.centralBxOnly = False @@ -66,7 +67,7 @@ def config_L1ExtraForStage2Sim(coll): # # Stage-1 Trigger # -if eras.stage1L1Trigger.isChosen() and not eras.stage2L1Trigger.isChosen(): +if stage1L1Trigger.isChosen() and not stage2L1Trigger.isChosen(): print "L1TReco Sequence configured for Stage-1 (2015) trigger. " from L1Trigger.L1ExtraFromDigis.l1extraParticles_cfi import * config_L1ExtraForStage1Raw(l1extraParticles) @@ -75,13 +76,14 @@ def config_L1ExtraForStage2Sim(coll): # # Stage-2 Trigger: fow now, reco Stage-1 as before: # -if eras.stage2L1Trigger.isChosen(): +if stage2L1Trigger.isChosen(): print "L1TReco Sequence configured for Stage-2 (2016) trigger. " from L1Trigger.L1ExtraFromDigis.l1extraParticles_cfi import * config_L1ExtraForStage1Raw(l1extraParticles) L1Reco = cms.Sequence(l1extraParticles) -if eras.fastSim.isChosen(): +from Configuration.Eras.Modifier_fastSim_cff import fastSim +if fastSim.isChosen(): # fastsim runs L1Reco and HLT in one step # this requires to set : from L1Trigger.L1ExtraFromDigis.l1extraParticles_cfi import * diff --git a/L1Trigger/Configuration/python/L1Trigger_EventContent_cff.py b/L1Trigger/Configuration/python/L1Trigger_EventContent_cff.py index e84d209ec7e9b..16e3e22146a2f 100644 --- a/L1Trigger/Configuration/python/L1Trigger_EventContent_cff.py +++ b/L1Trigger/Configuration/python/L1Trigger_EventContent_cff.py @@ -1,5 +1,4 @@ import FWCore.ParameterSet.Config as cms -from Configuration.StandardSequences.Eras import eras # RAW content L1TriggerRAW = cms.PSet( @@ -107,7 +106,8 @@ def _appendStage2Digis(obj): obj.outputCommands += l1Stage2Digis # adding them to all places where we had l1extraParticles -eras.stage2L1Trigger.toModify(L1TriggerRAWDEBUG, func=_appendStage2Digis) -eras.stage2L1Trigger.toModify(L1TriggerRECO, func=_appendStage2Digis) -eras.stage2L1Trigger.toModify(L1TriggerAOD, func=_appendStage2Digis) -eras.stage2L1Trigger.toModify(L1TriggerFEVTDEBUG, func=_appendStage2Digis) +from Configuration.Eras.Modifier_stage2L1Trigger_cff import stage2L1Trigger +stage2L1Trigger.toModify(L1TriggerRAWDEBUG, func=_appendStage2Digis) +stage2L1Trigger.toModify(L1TriggerRECO, func=_appendStage2Digis) +stage2L1Trigger.toModify(L1TriggerAOD, func=_appendStage2Digis) +stage2L1Trigger.toModify(L1TriggerFEVTDEBUG, func=_appendStage2Digis) diff --git a/L1Trigger/Configuration/python/SimL1TechnicalTriggers_cff.py b/L1Trigger/Configuration/python/SimL1TechnicalTriggers_cff.py index 2a27a95e10338..1abf6156fa343 100644 --- a/L1Trigger/Configuration/python/SimL1TechnicalTriggers_cff.py +++ b/L1Trigger/Configuration/python/SimL1TechnicalTriggers_cff.py @@ -1,5 +1,4 @@ import FWCore.ParameterSet.Config as cms -from Configuration.StandardSequences.Eras import eras # Stage2 fake Technical Triggers import L1Trigger.L1TGlobal.simGtExtFakeProd_cfi @@ -26,7 +25,8 @@ import SimCalorimetry.CastorTechTrigProducer.castorTTRecord_cfi simCastorTechTrigDigis = SimCalorimetry.CastorTechTrigProducer.castorTTRecord_cfi.simCastorTTRecord.clone() -if not (eras.stage2L1Trigger.isChosen()): +from Configuration.Eras.Modifier_stage2L1Trigger_cff import stage2L1Trigger +if not (stage2L1Trigger.isChosen()): SimL1TechnicalTriggers = cms.Sequence( simBscDigis + simRpcTechTrigDigis + diff --git a/L1Trigger/Configuration/python/customiseReEmul.py b/L1Trigger/Configuration/python/customiseReEmul.py index 498f5c50539ef..bbf82de67eb0d 100644 --- a/L1Trigger/Configuration/python/customiseReEmul.py +++ b/L1Trigger/Configuration/python/customiseReEmul.py @@ -1,5 +1,5 @@ import FWCore.ParameterSet.Config as cms -from Configuration.StandardSequences.Eras import eras +from Configuration.Eras.Modifier_stage2L1Trigger_cff import stage2L1Trigger def L1TCaloStage2ParamsForHW(process): process.load("L1Trigger.L1TCalorimeter.caloStage2Params_HWConfig_cfi") @@ -61,7 +61,7 @@ def L1TReEmulFromRAW2015(process): process.simCscTriggerPrimitiveDigis.CSCComparatorDigiProducer = cms.InputTag( 'muonCSCDigis', 'MuonCSCComparatorDigi') process.simCscTriggerPrimitiveDigis.CSCWireDigiProducer = cms.InputTag( 'muonCSCDigis', 'MuonCSCWireDigi' ) - if eras.stage2L1Trigger.isChosen(): + if stage2L1Trigger.isChosen(): process.simTwinMuxDigis.RPC_Source = cms.InputTag('muonRPCDigis') # When available, this will switch to TwinMux input Digis: process.simTwinMuxDigis.DTDigi_Source = cms.InputTag("dttfDigis") @@ -100,14 +100,14 @@ def L1TReEmulFromRAW2015(process): def L1TReEmulMCFromRAW2015(process): L1TReEmulFromRAW2015(process) - if eras.stage2L1Trigger.isChosen(): + if stage2L1Trigger.isChosen(): process.simEmtfDigis.CSCInput = cms.InputTag('simCscTriggerPrimitiveDigis','MPCSORTED') process.simOmtfDigis.srcCSC = cms.InputTag('simCscTriggerPrimitiveDigis','MPCSORTED') return process def L1TReEmulFromRAW2015simCaloTP(process): L1TReEmulFromRAW2015(process) - if eras.stage2L1Trigger.isChosen(): + if stage2L1Trigger.isChosen(): process.simCaloStage2Layer1Digis.ecalToken = cms.InputTag("simEcalTriggerPrimitiveDigis") return process @@ -122,7 +122,7 @@ def L1TReEmulFromRAW(process): process.simCscTriggerPrimitiveDigis.CSCComparatorDigiProducer = cms.InputTag( 'muonCSCDigis', 'MuonCSCComparatorDigi') process.simCscTriggerPrimitiveDigis.CSCWireDigiProducer = cms.InputTag( 'muonCSCDigis', 'MuonCSCWireDigi' ) process.L1TReEmul = cms.Sequence(process.simEcalTriggerPrimitiveDigis * process.simHcalTriggerPrimitiveDigis * process.SimL1Emulator) - if eras.stage2L1Trigger.isChosen(): + if stage2L1Trigger.isChosen(): #cutlist=['simDtTriggerPrimitiveDigis','simCscTriggerPrimitiveDigis'] #for b in cutlist: # process.SimL1Emulator.remove(getattr(process,b)) @@ -163,26 +163,26 @@ def L1TReEmulFromRAW(process): def L1TReEmulMCFromRAW(process): L1TReEmulFromRAW(process) - if eras.stage2L1Trigger.isChosen(): + if stage2L1Trigger.isChosen(): process.simEmtfDigis.CSCInput = cms.InputTag('simCscTriggerPrimitiveDigis','MPCSORTED') process.simOmtfDigis.srcCSC = cms.InputTag('simCscTriggerPrimitiveDigis','MPCSORTED') return process def L1TReEmulFromRAWsimEcalTP(process): L1TReEmulFromRAW(process) - if eras.stage2L1Trigger.isChosen(): + if stage2L1Trigger.isChosen(): process.simCaloStage2Layer1Digis.ecalToken = cms.InputTag("simEcalTriggerPrimitiveDigis") return process def L1TReEmulFromRAWsimHcalTP(process): L1TReEmulFromRAW(process) - if eras.stage2L1Trigger.isChosen(): + if stage2L1Trigger.isChosen(): process.simCaloStage2Layer1Digis.hcalToken = cms.InputTag('simHcalTriggerPrimitiveDigis') return process def L1TReEmulFromRAWsimTP(process): L1TReEmulFromRAW(process) - if eras.stage2L1Trigger.isChosen(): + if stage2L1Trigger.isChosen(): # TwinMux process.simTwinMuxDigis.RPC_Source = cms.InputTag('muonRPCDigis') process.simTwinMuxDigis.DTDigi_Source = cms.InputTag('simDtTriggerPrimitiveDigis') diff --git a/L1Trigger/Configuration/python/customiseSettings.py b/L1Trigger/Configuration/python/customiseSettings.py index a550486c7c138..9bb9f4d25c646 100644 --- a/L1Trigger/Configuration/python/customiseSettings.py +++ b/L1Trigger/Configuration/python/customiseSettings.py @@ -1,6 +1,5 @@ import os.path import FWCore.ParameterSet.Config as cms -from Configuration.StandardSequences.Eras import eras def L1TSettingsToCaloStage2Params_v3_2(process): process.load("L1Trigger.L1TCalorimeter.caloStage2Params_2016_v3_2_cfi") diff --git a/L1Trigger/Configuration/python/customise_ReEmulateL1_cff.py b/L1Trigger/Configuration/python/customise_ReEmulateL1_cff.py index 076b458cb7135..322c4ae30cc51 100644 --- a/L1Trigger/Configuration/python/customise_ReEmulateL1_cff.py +++ b/L1Trigger/Configuration/python/customise_ReEmulateL1_cff.py @@ -1,12 +1,12 @@ import FWCore.ParameterSet.Config as cms - -from Configuration.StandardSequences.Eras import eras +from Configuration.Eras.Modifier_stage2L1Trigger_cff import stage2L1Trigger +from Configuration.Eras.Modifier_stage1L1Trigger_cff import stage1L1Trigger # this function expects an incomplete list of subsystems to emulate # and returns a complete list, to ensure all required subsystems are emulated def getSubsystemsToEmulate(subsys): - if not eras.stage2L1Trigger.isChosen(): + if not stage2L1Trigger.isChosen(): if 'ECAL' in subsys: subsys.append('RCT') if 'HCAL' in subsys: @@ -33,7 +33,7 @@ def getSubsystemsToEmulate(subsys): if 'GMT' in subsys: subsys.append('GT') - if eras.stage1L1Trigger.isChosen(): + if stage1L1Trigger.isChosen(): if 'ECAL' in subsys: subsys.append('RCT') if 'HCAL' in subsys: @@ -60,7 +60,7 @@ def getSubsystemsToEmulate(subsys): if 'GMT' in subsys: subsys.append('GT') - if eras.stage2L1Trigger.isChosen(): + if stage2L1Trigger.isChosen(): if 'ECAL' in subsys: subsys.append('CALOL1') if 'HCAL' in subsys: @@ -169,7 +169,7 @@ def setInputTags(process, subsys): def modifySimL1EmulatorForReEmulation(SimL1Emulator_object, subsys=[]): - if not eras.stage2L1Trigger.isChosen(): + if not stage2L1Trigger.isChosen(): # if 'ECAL' not in subsys: # digiSeq_object.remove(simEcalTriggerPrimitiveDigis) # if 'HCAL' not in subsys: @@ -195,14 +195,14 @@ def modifySimL1EmulatorForReEmulation(SimL1Emulator_object, subsys=[]): if 'GT' not in subsys: SimL1Emulator_object.remove(simGtDigis) - if eras.stage1L1Trigger.isChosen(): + if stage1L1Trigger.isChosen(): if 'S1CALOL2' not in subsys: SimL1Emulator_object.remove(simRctUpgradeFormatDigis) SimL1Emulator_object.remove(simCaloStage1Digis) SimL1Emulator_object.remove(simCaloStage1FinalDigis) SimL1Emulator_object.remove(simCaloStage1LegacyFormatDigis) - if eras.stage1L1Trigger.isChosen(): + if stage1L1Trigger.isChosen(): if 'CALOL1' not in subsys: SimL1Emulator_object.remove(simCaloStage2Layer1Digis) if 'CALOL2' not in subsys: diff --git a/L1Trigger/L1ExtraFromDigis/python/l1extraParticles_cfi.py b/L1Trigger/L1ExtraFromDigis/python/l1extraParticles_cfi.py index edad4f4652780..fb8fc39ae2b1a 100644 --- a/L1Trigger/L1ExtraFromDigis/python/l1extraParticles_cfi.py +++ b/L1Trigger/L1ExtraFromDigis/python/l1extraParticles_cfi.py @@ -23,16 +23,16 @@ # # Modify for running with the Stage 1 trigger # -from Configuration.StandardSequences.Eras import eras -eras.stage1L1Trigger.toModify( l1extraParticles, etTotalSource = cms.InputTag("caloStage1LegacyFormatDigis") ) -eras.stage1L1Trigger.toModify( l1extraParticles, nonIsolatedEmSource = cms.InputTag("caloStage1LegacyFormatDigis","nonIsoEm") ) -eras.stage1L1Trigger.toModify( l1extraParticles, etMissSource = cms.InputTag("caloStage1LegacyFormatDigis") ) -eras.stage1L1Trigger.toModify( l1extraParticles, htMissSource = cms.InputTag("caloStage1LegacyFormatDigis") ) -eras.stage1L1Trigger.toModify( l1extraParticles, forwardJetSource = cms.InputTag("caloStage1LegacyFormatDigis","forJets") ) -eras.stage1L1Trigger.toModify( l1extraParticles, centralJetSource = cms.InputTag("caloStage1LegacyFormatDigis","cenJets") ) -eras.stage1L1Trigger.toModify( l1extraParticles, tauJetSource = cms.InputTag("caloStage1LegacyFormatDigis","tauJets") ) -eras.stage1L1Trigger.toModify( l1extraParticles, isoTauJetSource = cms.InputTag("caloStage1LegacyFormatDigis","isoTauJets") ) -eras.stage1L1Trigger.toModify( l1extraParticles, isolatedEmSource = cms.InputTag("caloStage1LegacyFormatDigis","isoEm") ) -eras.stage1L1Trigger.toModify( l1extraParticles, etHadSource = cms.InputTag("caloStage1LegacyFormatDigis") ) -eras.stage1L1Trigger.toModify( l1extraParticles, hfRingEtSumsSource = cms.InputTag("caloStage1LegacyFormatDigis") ) -eras.stage1L1Trigger.toModify( l1extraParticles, hfRingBitCountsSource = cms.InputTag("caloStage1LegacyFormatDigis") ) +from Configuration.Eras.Modifier_stage1L1Trigger_cff import stage1L1Trigger +stage1L1Trigger.toModify( l1extraParticles, etTotalSource = cms.InputTag("caloStage1LegacyFormatDigis") ) +stage1L1Trigger.toModify( l1extraParticles, nonIsolatedEmSource = cms.InputTag("caloStage1LegacyFormatDigis","nonIsoEm") ) +stage1L1Trigger.toModify( l1extraParticles, etMissSource = cms.InputTag("caloStage1LegacyFormatDigis") ) +stage1L1Trigger.toModify( l1extraParticles, htMissSource = cms.InputTag("caloStage1LegacyFormatDigis") ) +stage1L1Trigger.toModify( l1extraParticles, forwardJetSource = cms.InputTag("caloStage1LegacyFormatDigis","forJets") ) +stage1L1Trigger.toModify( l1extraParticles, centralJetSource = cms.InputTag("caloStage1LegacyFormatDigis","cenJets") ) +stage1L1Trigger.toModify( l1extraParticles, tauJetSource = cms.InputTag("caloStage1LegacyFormatDigis","tauJets") ) +stage1L1Trigger.toModify( l1extraParticles, isoTauJetSource = cms.InputTag("caloStage1LegacyFormatDigis","isoTauJets") ) +stage1L1Trigger.toModify( l1extraParticles, isolatedEmSource = cms.InputTag("caloStage1LegacyFormatDigis","isoEm") ) +stage1L1Trigger.toModify( l1extraParticles, etHadSource = cms.InputTag("caloStage1LegacyFormatDigis") ) +stage1L1Trigger.toModify( l1extraParticles, hfRingEtSumsSource = cms.InputTag("caloStage1LegacyFormatDigis") ) +stage1L1Trigger.toModify( l1extraParticles, hfRingBitCountsSource = cms.InputTag("caloStage1LegacyFormatDigis") ) diff --git a/L1Trigger/L1TCalorimeter/python/hackConditions_cff.py b/L1Trigger/L1TCalorimeter/python/hackConditions_cff.py index fb4edef5e3681..56a3b285c5418 100644 --- a/L1Trigger/L1TCalorimeter/python/hackConditions_cff.py +++ b/L1Trigger/L1TCalorimeter/python/hackConditions_cff.py @@ -5,22 +5,24 @@ # import FWCore.ParameterSet.Config as cms -from Configuration.StandardSequences.Eras import eras +from Configuration.Eras.Modifier_run2_HI_specific_cff import run2_HI_specific # # Legacy Trigger: No Hacks Needed # -#if not (eras.stage1L1Trigger.isChosen() or eras.stage2L1Trigger.isChosen()): +from Configuration.Eras.Modifier_stage1L1Trigger_cff import stage1L1Trigger +from Configuration.Eras.Modifier_stage2L1Trigger_cff import stage2L1Trigger +#if not (stage1L1Trigger.isChosen() or stage2L1Trigger.isChosen()): # print "L1TCalorimeter conditions configured for Run1 (Legacy) trigger. " # # # Stage-1 Trigger # -if eras.stage1L1Trigger.isChosen() and not eras.stage2L1Trigger.isChosen(): +if stage1L1Trigger.isChosen() and not stage2L1Trigger.isChosen(): print "L1TCalorimeter Conditions configured for Stage-1 (2015) trigger. " # Switch between HI and PP calo configuration: - if (eras.run2_HI_specific.isChosen()): + if (run2_HI_specific.isChosen()): from L1Trigger.L1TCalorimeter.caloConfigStage1HI_cfi import * else: from L1Trigger.L1TCalorimeter.caloConfigStage1PP_cfi import * @@ -31,7 +33,7 @@ # # Stage-2 Trigger # -if eras.stage2L1Trigger.isChosen(): +if stage2L1Trigger.isChosen(): print "L1TCalorimeter Conditions configured for Stage-2 (2016) trigger. " # from L1Trigger.L1TCalorimeter.simCaloStage2Layer1Digis_cfi import simCaloStage2Layer1Digis diff --git a/L1Trigger/L1TCalorimeter/python/simDigis_cff.py b/L1Trigger/L1TCalorimeter/python/simDigis_cff.py index 4608b700876ba..812e7c64c68a9 100644 --- a/L1Trigger/L1TCalorimeter/python/simDigis_cff.py +++ b/L1Trigger/L1TCalorimeter/python/simDigis_cff.py @@ -1,10 +1,11 @@ import FWCore.ParameterSet.Config as cms -from Configuration.StandardSequences.Eras import eras # # Legacy Trigger: # -if not (eras.stage1L1Trigger.isChosen() or eras.stage2L1Trigger.isChosen()): +from Configuration.Eras.Modifier_stage1L1Trigger_cff import stage1L1Trigger +from Configuration.Eras.Modifier_stage2L1Trigger_cff import stage2L1Trigger +if not (stage1L1Trigger.isChosen() or stage2L1Trigger.isChosen()): print "L1TCalorimeter Sequence configured for Run1 (Legacy) trigger. " # - RCT (Regional Calorimeter Trigger) emulator import L1Trigger.RegionalCaloTrigger.rctDigis_cfi @@ -20,7 +21,7 @@ # # Stage-1 Trigger # -if eras.stage1L1Trigger.isChosen() and not eras.stage2L1Trigger.isChosen(): +if stage1L1Trigger.isChosen() and not stage2L1Trigger.isChosen(): print "L1TCalorimeter Sequence configured for Stage-1 (2015) trigger. " # # - RCT (Regional Calorimeter Trigger) emulator @@ -40,7 +41,7 @@ # # Stage-2 Trigger # -if eras.stage2L1Trigger.isChosen(): +if stage2L1Trigger.isChosen(): print "L1TCalorimeter Sequence configured for Stage-2 (2016) trigger. " # select one of the following two options: # - layer1 from L1Trigger/L1TCalorimeter package diff --git a/L1Trigger/L1TGlobal/python/hackConditions_cff.py b/L1Trigger/L1TGlobal/python/hackConditions_cff.py index 94be2362fb9a1..7c90d7e60d2ee 100644 --- a/L1Trigger/L1TGlobal/python/hackConditions_cff.py +++ b/L1Trigger/L1TGlobal/python/hackConditions_cff.py @@ -9,25 +9,26 @@ # import FWCore.ParameterSet.Config as cms -from Configuration.StandardSequences.Eras import eras # # Legacy Trigger: No Hacks Needed # -#if not (eras.stage1L1Trigger.isChosen() or eras.stage2L1Trigger.isChosen()): +from Configuration.Eras.Modifier_stage1L1Trigger_cff import stage1L1Trigger +from Configuration.Eras.Modifier_stage2L1Trigger_cff import stage2L1Trigger +#if not (stage1L1Trigger.isChosen() or stage2L1Trigger.isChosen()): # print "L1TGlobal conditions configured for Run1 (Legacy) trigger. " # # # Stage-1 Trigger: No Hacks Needed # -#if eras.stage1L1Trigger.isChosen() and not eras.stage2L1Trigger.isChosen(): +#if stage1L1Trigger.isChosen() and not stage2L1Trigger.isChosen(): # print "L1TGlobal Conditions configured for Stage-1 (2015) trigger. " # # Stage-2 Trigger # -if eras.stage2L1Trigger.isChosen(): +if stage2L1Trigger.isChosen(): print "L1TGlobal Conditions configured for Stage-2 (2016) trigger. " from L1Trigger.L1TGlobal.StableParameters_cff import * # from L1Trigger.L1TGlobal.GlobalParameters_cff import * diff --git a/L1Trigger/L1TGlobal/python/simDigis_cff.py b/L1Trigger/L1TGlobal/python/simDigis_cff.py index ef8158959281d..6e5621c88826d 100644 --- a/L1Trigger/L1TGlobal/python/simDigis_cff.py +++ b/L1Trigger/L1TGlobal/python/simDigis_cff.py @@ -4,11 +4,11 @@ # All changes must be explicitly discussed with the L1T offline coordinator. # import FWCore.ParameterSet.Config as cms -from Configuration.StandardSequences.Eras import eras # # Legacy Trigger: # -if not (eras.stage2L1Trigger.isChosen()): +from Configuration.Eras.Modifier_stage2L1Trigger_cff import stage2L1Trigger +if not (stage2L1Trigger.isChosen()): print "L1TGlobal Sequence configured for Legacy trigger (Run1 and Run 2015). " # # - Global Trigger emulator @@ -28,7 +28,7 @@ # # Stage-2 Trigger # -if eras.stage2L1Trigger.isChosen(): +if stage2L1Trigger.isChosen(): # # - Global Trigger emulator # diff --git a/L1Trigger/L1TMuon/python/hackConditions_cff.py b/L1Trigger/L1TMuon/python/hackConditions_cff.py index 514a9a30bd00f..da5cedc1012c6 100644 --- a/L1Trigger/L1TMuon/python/hackConditions_cff.py +++ b/L1Trigger/L1TMuon/python/hackConditions_cff.py @@ -5,25 +5,26 @@ # import FWCore.ParameterSet.Config as cms -from Configuration.StandardSequences.Eras import eras # # Legacy Trigger: No Hacks Needed # -#if not (eras.stage1L1Trigger.isChosen() or eras.stage2L1Trigger.isChosen()): +from Configuration.Eras.Modifier_stage1L1Trigger_cff import stage1L1Trigger +from Configuration.Eras.Modifier_stage2L1Trigger_cff import stage2L1Trigger +#if not (stage1L1Trigger.isChosen() or stage2L1Trigger.isChosen()): # print "L1TMuon conditions configured for Run1 (Legacy) trigger. " # # # Stage-1 Trigger: No Hacks Needed # -#if eras.stage1L1Trigger.isChosen() and not eras.stage2L1Trigger.isChosen(): +#if stage1L1Trigger.isChosen() and not stage2L1Trigger.isChosen(): # print "L1TMuon Conditions configured for Stage-1 (2015) trigger. " # # Stage-2 Trigger # -if eras.stage2L1Trigger.isChosen(): +if stage2L1Trigger.isChosen(): print "L1TMuon Conditions configured for Stage-2 (2016) trigger. " from L1Trigger.L1TMuonBarrel.fakeBmtfParams_cff import * from L1Trigger.L1TMuonOverlap.fakeOmtfParams_cff import * diff --git a/L1Trigger/L1TMuon/python/simDigis_cff.py b/L1Trigger/L1TMuon/python/simDigis_cff.py index 011d683297a2c..219a35515f918 100644 --- a/L1Trigger/L1TMuon/python/simDigis_cff.py +++ b/L1Trigger/L1TMuon/python/simDigis_cff.py @@ -1,5 +1,4 @@ import FWCore.ParameterSet.Config as cms -from Configuration.StandardSequences.Eras import eras # # Legacy L1 Muon modules still running in 2016 trigger: @@ -25,7 +24,8 @@ # # Legacy Trigger: # -if not (eras.stage2L1Trigger.isChosen()): +from Configuration.Eras.Modifier_stage2L1Trigger_cff import stage2L1Trigger +if not (stage2L1Trigger.isChosen()): print "L1TMuon Sequence configured for Legacy trigger (Run1 and Run 2015). " # # - CSC Track Finder emulator @@ -68,7 +68,7 @@ # # Stage-2 Trigger # -if eras.stage2L1Trigger.isChosen(): +if stage2L1Trigger.isChosen(): print "L1TMuon Sequence configured for Stage-2 (2016) trigger. " from L1Trigger.L1TMuonBarrel.simTwinMuxDigis_cfi import * from L1Trigger.L1TMuonBarrel.simBmtfDigis_cfi import * diff --git a/PhysicsTools/PatAlgos/python/slimming/metFilterPaths_cff.py b/PhysicsTools/PatAlgos/python/slimming/metFilterPaths_cff.py index 67458152be612..cc1f02594c414 100644 --- a/PhysicsTools/PatAlgos/python/slimming/metFilterPaths_cff.py +++ b/PhysicsTools/PatAlgos/python/slimming/metFilterPaths_cff.py @@ -50,8 +50,8 @@ def miniAOD_customizeMETFiltersFastSim(process): process.globalReplace(X, cms.EDFilter("HLTBool", result=cms.bool(False))) return process -from Configuration.StandardSequences.Eras import eras -eras.phase2_hgcal.toReplaceWith( Flag_HBHENoiseFilter, cms.Path() ) -eras.phase2_hgcal.toReplaceWith( Flag_HBHENoiseIsoFilter, cms.Path() ) -eras.phase2_hgcal.toReplaceWith( Flag_eeBadScFilter, cms.Path() ) +from Configuration.Eras.Modifier_phase2_hgcal_cff import phase2_hgcal +phase2_hgcal.toReplaceWith( Flag_HBHENoiseFilter, cms.Path() ) +phase2_hgcal.toReplaceWith( Flag_HBHENoiseIsoFilter, cms.Path() ) +phase2_hgcal.toReplaceWith( Flag_eeBadScFilter, cms.Path() ) diff --git a/RecoEcal/Configuration/python/RecoEcal_EventContent_cff.py b/RecoEcal/Configuration/python/RecoEcal_EventContent_cff.py index 1fd0f30ffb419..017fc3b488795 100644 --- a/RecoEcal/Configuration/python/RecoEcal_EventContent_cff.py +++ b/RecoEcal/Configuration/python/RecoEcal_EventContent_cff.py @@ -80,7 +80,6 @@ ) ) -from Configuration.StandardSequences.Eras import eras _phase2_hgcal_scCommands = ['keep *_particleFlowSuperClusterHGCal_*_*'] _phase2_hgcal_scCommandsAOD = ['keep recoSuperClusters_particleFlowSuperClusterHGCal__*', 'keep recoCaloClusters_particleFlowSuperClusterHGCal__*'] @@ -90,6 +89,7 @@ _phase2_hgcal_RecoEcalRECO.outputCommands += _phase2_hgcal_scCommands _phase2_hgcal_RecoEcalAOD = RecoEcalAOD.clone() _phase2_hgcal_RecoEcalAOD.outputCommands += _phase2_hgcal_scCommandsAOD -eras.phase2_hgcal.toReplaceWith( RecoEcalFEVT, _phase2_hgcal_RecoEcalFEVT ) -eras.phase2_hgcal.toReplaceWith( RecoEcalRECO, _phase2_hgcal_RecoEcalRECO ) -eras.phase2_hgcal.toReplaceWith( RecoEcalAOD , _phase2_hgcal_RecoEcalAOD ) +from Configuration.Eras.Modifier_phase2_hgcal_cff import phase2_hgcal +phase2_hgcal.toReplaceWith( RecoEcalFEVT, _phase2_hgcal_RecoEcalFEVT ) +phase2_hgcal.toReplaceWith( RecoEcalRECO, _phase2_hgcal_RecoEcalRECO ) +phase2_hgcal.toReplaceWith( RecoEcalAOD , _phase2_hgcal_RecoEcalAOD ) diff --git a/RecoEcal/EgammaClusterProducers/python/particleFlowSuperClusteringSequence_cff.py b/RecoEcal/EgammaClusterProducers/python/particleFlowSuperClusteringSequence_cff.py index e1907f692142b..5f9f685aa18b7 100644 --- a/RecoEcal/EgammaClusterProducers/python/particleFlowSuperClusteringSequence_cff.py +++ b/RecoEcal/EgammaClusterProducers/python/particleFlowSuperClusteringSequence_cff.py @@ -10,11 +10,11 @@ # PFECAL super clusters, either hybrid-clustering clone (Box) or mustache. particleFlowSuperClusteringSequence = cms.Sequence(particleFlowSuperClusterECAL) -from Configuration.StandardSequences.Eras import eras particleFlowSuperClusterHGCal = particleFlowSuperClusterECAL.clone() _phase2_hgcal_particleFlowSuperClusteringSequence = particleFlowSuperClusteringSequence.copy() _phase2_hgcal_particleFlowSuperClusteringSequence += particleFlowSuperClusterHGCal -eras.phase2_hgcal.toModify( +from Configuration.Eras.Modifier_phase2_hgcal_cff import phase2_hgcal +phase2_hgcal.toModify( particleFlowSuperClusterHGCal, PFClusters = cms.InputTag('particleFlowClusterHGCal'), useRegression = cms.bool(False), #no HGCal regression yet @@ -24,5 +24,5 @@ PFSuperClusterCollectionEndcapWithPreshower = cms.string(""), thresh_PFClusterEndcap = cms.double(1.5e-1) # 150 MeV threshold ) -eras.phase2_hgcal.toReplaceWith( particleFlowSuperClusteringSequence, _phase2_hgcal_particleFlowSuperClusteringSequence ) +phase2_hgcal.toReplaceWith( particleFlowSuperClusteringSequence, _phase2_hgcal_particleFlowSuperClusteringSequence ) diff --git a/RecoEcal/EgammaClusterProducers/python/reducedRecHitsSequence_cff.py b/RecoEcal/EgammaClusterProducers/python/reducedRecHitsSequence_cff.py index cf306f39bba83..85e1caa49f0c1 100644 --- a/RecoEcal/EgammaClusterProducers/python/reducedRecHitsSequence_cff.py +++ b/RecoEcal/EgammaClusterProducers/python/reducedRecHitsSequence_cff.py @@ -145,5 +145,5 @@ _phase2_reducedEcalRecHitsSequence = reducedEcalRecHitsSequence.copy() _phase2_reducedEcalRecHitsSequence.remove(reducedEcalRecHitsES) -from Configuration.StandardSequences.Eras import eras -eras.phase2_common.toReplaceWith( reducedEcalRecHitsSequence , _phase2_reducedEcalRecHitsSequence ) +from Configuration.Eras.Modifier_phase2_common_cff import phase2_common +phase2_common.toReplaceWith( reducedEcalRecHitsSequence , _phase2_reducedEcalRecHitsSequence ) diff --git a/RecoEgamma/Configuration/python/RecoEgamma_EventContent_cff.py b/RecoEgamma/Configuration/python/RecoEgamma_EventContent_cff.py index 687de3a882ad3..b4c8397131e6a 100644 --- a/RecoEgamma/Configuration/python/RecoEgamma_EventContent_cff.py +++ b/RecoEgamma/Configuration/python/RecoEgamma_EventContent_cff.py @@ -152,10 +152,10 @@ ) # mods for HGCAL -from Configuration.StandardSequences.Eras import eras _phase2_hgcal_RecoEgamma_tokeep = [ 'keep *_ecalDrivenGsfElectronCores_*_*', 'keep *_ecalDrivenGsfElectrons_*_*' ] -eras.phase2_hgcal.toModify( RecoEgammaFEVT, outputCommands = RecoEgammaFEVT.outputCommands + _phase2_hgcal_RecoEgamma_tokeep +from Configuration.Eras.Modifier_phase2_hgcal_cff import phase2_hgcal +phase2_hgcal.toModify( RecoEgammaFEVT, outputCommands = RecoEgammaFEVT.outputCommands + _phase2_hgcal_RecoEgamma_tokeep ) -eras.phase2_hgcal.toModify( RecoEgammaRECO, outputCommands = RecoEgammaRECO.outputCommands + _phase2_hgcal_RecoEgamma_tokeep ) -eras.phase2_hgcal.toModify( RecoEgammaAOD, outputCommands = RecoEgammaAOD.outputCommands + _phase2_hgcal_RecoEgamma_tokeep ) +phase2_hgcal.toModify( RecoEgammaRECO, outputCommands = RecoEgammaRECO.outputCommands + _phase2_hgcal_RecoEgamma_tokeep ) +phase2_hgcal.toModify( RecoEgammaAOD, outputCommands = RecoEgammaAOD.outputCommands + _phase2_hgcal_RecoEgamma_tokeep ) diff --git a/RecoEgamma/EgammaElectronProducers/python/ecalDrivenElectronSeeds_cfi.py b/RecoEgamma/EgammaElectronProducers/python/ecalDrivenElectronSeeds_cfi.py index f842cc4cb42eb..103b68a96c026 100644 --- a/RecoEgamma/EgammaElectronProducers/python/ecalDrivenElectronSeeds_cfi.py +++ b/RecoEgamma/EgammaElectronProducers/python/ecalDrivenElectronSeeds_cfi.py @@ -31,8 +31,8 @@ ) ) -from Configuration.StandardSequences.Eras import eras -eras.phase2_hgcal.toModify( +from Configuration.Eras.Modifier_phase2_hgcal_cff import phase2_hgcal +phase2_hgcal.toModify( ecalDrivenElectronSeeds, endcapSuperClusters = cms.InputTag('particleFlowSuperClusterHGCal') ) diff --git a/RecoEgamma/EgammaPhotonProducers/python/reducedEgamma_cfi.py b/RecoEgamma/EgammaPhotonProducers/python/reducedEgamma_cfi.py index 4548ec7e3ec3d..f020f1bf58bd8 100644 --- a/RecoEgamma/EgammaPhotonProducers/python/reducedEgamma_cfi.py +++ b/RecoEgamma/EgammaPhotonProducers/python/reducedEgamma_cfi.py @@ -1,5 +1,4 @@ import FWCore.ParameterSet.Config as cms -from Configuration.StandardSequences.Eras import eras reducedEgamma = cms.EDProducer("ReducedEGProducer", keepPhotons = cms.string("hadTowOverEm()<0.15 && pt>10 && (pt>14 || chargedHadronIso()<10)"), #keep in output @@ -59,6 +58,7 @@ ), ) -eras.phase2_common.toModify(reducedEgamma, +from Configuration.Eras.Modifier_phase2_common_cff import phase2_common +phase2_common.toModify(reducedEgamma, preshowerEcalHits = cms.InputTag(""), ) diff --git a/RecoEgamma/PhotonIdentification/python/PhotonIDValueMapProducer_cfi.py b/RecoEgamma/PhotonIdentification/python/PhotonIDValueMapProducer_cfi.py index 86fc513b254f8..aa3d6ac3be251 100644 --- a/RecoEgamma/PhotonIdentification/python/PhotonIDValueMapProducer_cfi.py +++ b/RecoEgamma/PhotonIdentification/python/PhotonIDValueMapProducer_cfi.py @@ -24,8 +24,8 @@ srcMiniAOD = cms.InputTag('slimmedPhotons',processName=cms.InputTag.skipCurrentProcess()), ) -from Configuration.StandardSequences.Eras import eras -eras.phase2_common.toModify(photonIDValueMapProducer, +from Configuration.Eras.Modifier_phase2_common_cff import phase2_common +phase2_common.toModify(photonIDValueMapProducer, esReducedRecHitCollection = cms.InputTag(""), esReducedRecHitCollectionMiniAOD = cms.InputTag(""), ) diff --git a/RecoJets/Configuration/python/CaloTowersES_cfi.py b/RecoJets/Configuration/python/CaloTowersES_cfi.py index e70558aa8fcae..a8e8571f5d9bf 100644 --- a/RecoJets/Configuration/python/CaloTowersES_cfi.py +++ b/RecoJets/Configuration/python/CaloTowersES_cfi.py @@ -5,5 +5,5 @@ CaloTowerConstituentsMapBuilder = Geometry.CaloEventSetup.caloTowerConstituents_cfi.caloTowerConstituents.clone() CaloTowerConstituentsMapBuilder.MapFile = "Geometry/CaloTopology/data/CaloTowerEEGeometric.map.gz" -from Configuration.StandardSequences.Eras import eras -eras.phase2_hgcal.toModify( CaloTowerConstituentsMapBuilder, MapFile = "", SkipHE = True ) +from Configuration.Eras.Modifier_phase2_hgcal_cff import phase2_hgcal +phase2_hgcal.toModify( CaloTowerConstituentsMapBuilder, MapFile = "", SkipHE = True ) diff --git a/RecoJets/JetProducers/python/caloJetsForTrk_cff.py b/RecoJets/JetProducers/python/caloJetsForTrk_cff.py index a2efbc71ccd57..6680cb0f28cfb 100644 --- a/RecoJets/JetProducers/python/caloJetsForTrk_cff.py +++ b/RecoJets/JetProducers/python/caloJetsForTrk_cff.py @@ -1,22 +1,24 @@ import FWCore.ParameterSet.Config as cms -from Configuration.StandardSequences.Eras import eras from RecoJets.JetProducers.ak4CaloJets_cfi import ak4CaloJets from RecoLocalCalo.CaloTowersCreator.calotowermaker_cfi import calotowermaker caloTowerForTrk = calotowermaker.clone(hbheInput=cms.InputTag('hbheprereco')) ak4CaloJetsForTrk = ak4CaloJets.clone(srcPVs = cms.InputTag('firstStepPrimaryVertices'), src= cms.InputTag('caloTowerForTrk')) -eras.trackingLowPU.toModify(ak4CaloJetsForTrk, +from Configuration.Eras.Modifier_trackingLowPU_cff import trackingLowPU +trackingLowPU.toModify(ak4CaloJetsForTrk, srcPVs = "pixelVertices" ) -eras.trackingPhase1PU70.toModify(ak4CaloJetsForTrk, +from Configuration.Eras.Modifier_trackingPhase1PU70_cff import trackingPhase1PU70 +trackingPhase1PU70.toModify(ak4CaloJetsForTrk, srcPVs = "pixelVertices" ) -eras.trackingPhase2PU140.toModify(ak4CaloJetsForTrk, +from Configuration.Eras.Modifier_trackingPhase2PU140_cff import trackingPhase2PU140 +trackingPhase2PU140.toModify(ak4CaloJetsForTrk, srcPVs = "pixelVertices" ) caloJetsForTrk = cms.Sequence(caloTowerForTrk*ak4CaloJetsForTrk) -from Configuration.StandardSequences.Eras import eras -eras.phase2_hcal.toModify( caloTowerForTrk, hbheInput = cms.InputTag("hbhereco") ) +from Configuration.Eras.Modifier_phase2_hcal_cff import phase2_hcal +phase2_hcal.toModify( caloTowerForTrk, hbheInput = cms.InputTag("hbhereco") ) diff --git a/RecoLocalCalo/Configuration/python/RecoLocalCalo_EventContent_cff.py b/RecoLocalCalo/Configuration/python/RecoLocalCalo_EventContent_cff.py index 22e8a8c4d0bfa..479ce122e7621 100644 --- a/RecoLocalCalo/Configuration/python/RecoLocalCalo_EventContent_cff.py +++ b/RecoLocalCalo/Configuration/python/RecoLocalCalo_EventContent_cff.py @@ -63,14 +63,14 @@ def _updateOutput( era, outputPSets, commands): for o in outputPSets: era.toModify( o, outputCommands = o.outputCommands + commands ) -from Configuration.StandardSequences.Eras import eras # mods for HGCAL -eras.phase2_hgcal.toModify( RecoLocalCaloFEVT, outputCommands = RecoLocalCaloFEVT.outputCommands + [ +from Configuration.Eras.Modifier_phase2_hgcal_cff import phase2_hgcal +phase2_hgcal.toModify( RecoLocalCaloFEVT, outputCommands = RecoLocalCaloFEVT.outputCommands + [ 'keep *_HGCalRecHit_*_*', 'keep *_HGCalUncalibRecHit_*_*' ] ) -eras.phase2_hgcal.toModify( RecoLocalCaloRECO, outputCommands = RecoLocalCaloRECO.outputCommands + ['keep *_HGCalRecHit_*_*'] ) +phase2_hgcal.toModify( RecoLocalCaloRECO, outputCommands = RecoLocalCaloRECO.outputCommands + ['keep *_HGCalRecHit_*_*'] ) # don't modify AOD for HGCal yet, need "reduced" rechits collection first (i.e. requires reconstruction) -#eras.phase2_hgcal.toModify( RecoLocalCaloAOD, outputCommands = RecoLocalCaloAOD.outputCommands + ['keep *_HGCalRecHit_*_*'] ) +#phase2_hgcal.toModify( RecoLocalCaloAOD, outputCommands = RecoLocalCaloAOD.outputCommands + ['keep *_HGCalRecHit_*_*'] ) diff --git a/RecoLocalCalo/Configuration/python/RecoLocalCalo_cff.py b/RecoLocalCalo/Configuration/python/RecoLocalCalo_cff.py index 62bbb3b7c661d..9eb2ab324d49b 100644 --- a/RecoLocalCalo/Configuration/python/RecoLocalCalo_cff.py +++ b/RecoLocalCalo/Configuration/python/RecoLocalCalo_cff.py @@ -36,5 +36,5 @@ _phase2_calolocalreco = calolocalreco.copy() _phase2_calolocalreco += hgcalLocalRecoSequence -from Configuration.StandardSequences.Eras import eras -eras.phase2_hgcal.toReplaceWith( calolocalreco , _phase2_calolocalreco ) +from Configuration.Eras.Modifier_phase2_hgcal_cff import phase2_hgcal +phase2_hgcal.toReplaceWith( calolocalreco , _phase2_calolocalreco ) diff --git a/RecoLocalCalo/Configuration/python/ecalLocalRecoSequence_cff.py b/RecoLocalCalo/Configuration/python/ecalLocalRecoSequence_cff.py index 0a8d6440ab982..f9f3d08126c74 100644 --- a/RecoLocalCalo/Configuration/python/ecalLocalRecoSequence_cff.py +++ b/RecoLocalCalo/Configuration/python/ecalLocalRecoSequence_cff.py @@ -34,7 +34,7 @@ ecalLocalRecoSequence = cms.Sequence(ecalUncalibRecHitSequence* ecalRecHitSequence) -from Configuration.StandardSequences.Eras import eras from RecoLocalCalo.EcalRecProducers.ecalDetailedTimeRecHit_cfi import * _phase2_timing_ecalRecHitSequence = cms.Sequence( ecalRecHitSequence.copy() + ecalDetailedTimeRecHit ) -eras.phase2_timing.toReplaceWith( ecalRecHitSequence, _phase2_timing_ecalRecHitSequence ) +from Configuration.Eras.Modifier_phase2_timing_cff import phase2_timing +phase2_timing.toReplaceWith( ecalRecHitSequence, _phase2_timing_ecalRecHitSequence ) diff --git a/RecoLocalCalo/Configuration/python/ecalLocalReco_EventContent_cff.py b/RecoLocalCalo/Configuration/python/ecalLocalReco_EventContent_cff.py index 9c335c7f14749..3184764d56dfe 100644 --- a/RecoLocalCalo/Configuration/python/ecalLocalReco_EventContent_cff.py +++ b/RecoLocalCalo/Configuration/python/ecalLocalReco_EventContent_cff.py @@ -30,12 +30,12 @@ ) ) -from Configuration.StandardSequences.Eras import eras #mods for timing _phase2_timing_EcalOutputCommands = ['keep *_mix_EBTimeDigi_*', 'keep *_mix_EETimeDigi_*', 'keep *_ecalDetailedTimeRecHit_*_*'] -eras.phase2_timing.toModify( ecalLocalRecoFEVT, outputCommands = ecalLocalRecoFEVT.outputCommands + _phase2_timing_EcalOutputCommands ) -eras.phase2_timing.toModify( ecalLocalRecoRECO, outputCommands = ecalLocalRecoRECO.outputCommands + _phase2_timing_EcalOutputCommands ) +from Configuration.Eras.Modifier_phase2_timing_cff import phase2_timing +phase2_timing.toModify( ecalLocalRecoFEVT, outputCommands = ecalLocalRecoFEVT.outputCommands + _phase2_timing_EcalOutputCommands ) +phase2_timing.toModify( ecalLocalRecoRECO, outputCommands = ecalLocalRecoRECO.outputCommands + _phase2_timing_EcalOutputCommands ) diff --git a/RecoLocalCalo/Configuration/python/hcalGlobalReco_cff.py b/RecoLocalCalo/Configuration/python/hcalGlobalReco_cff.py index 38e1405eb90d1..bad6674d71989 100644 --- a/RecoLocalCalo/Configuration/python/hcalGlobalReco_cff.py +++ b/RecoLocalCalo/Configuration/python/hcalGlobalReco_cff.py @@ -5,6 +5,6 @@ from RecoLocalCalo.HcalRecProducers.HBHEUpgradeReconstructor_cfi import hbheUpgradeReco as _hbheUpgradeReco -from Configuration.StandardSequences.Eras import eras -eras.phase2_hcal.toReplaceWith( hbhereco, _hbheUpgradeReco ) -eras.phase2_hcal.toModify( hbhereco, digiLabel = cms.InputTag('simHcalDigis','HBHEUpgradeDigiCollection') ) +from Configuration.Eras.Modifier_phase2_hcal_cff import phase2_hcal +phase2_hcal.toReplaceWith( hbhereco, _hbheUpgradeReco ) +phase2_hcal.toModify( hbhereco, digiLabel = cms.InputTag('simHcalDigis','HBHEUpgradeDigiCollection') ) diff --git a/RecoLocalCalo/Configuration/python/hcalLocalReco_cff.py b/RecoLocalCalo/Configuration/python/hcalLocalReco_cff.py index 18eae50ee349a..03bd815e54b4b 100644 --- a/RecoLocalCalo/Configuration/python/hcalLocalReco_cff.py +++ b/RecoLocalCalo/Configuration/python/hcalLocalReco_cff.py @@ -14,12 +14,12 @@ _phase2_hcalLocalRecoSequence = hcalLocalRecoSequence.copy() _phase2_hcalLocalRecoSequence.remove(hbheprereco) -from Configuration.StandardSequences.Eras import eras -eras.phase2_hcal.toModify( horeco, digiLabel = cms.InputTag('simHcalDigis') ) -eras.phase2_hcal.toReplaceWith( hfreco, _hfUpgradeReco ) -eras.phase2_hcal.toModify( hfreco, digiLabel = cms.InputTag('simHcalDigis','HFUpgradeDigiCollection') ) -eras.phase2_hcal.toModify( zdcreco, digiLabel = cms.InputTag('simHcalUnsuppressedDigis'), digiLabelhcal = cms.InputTag('simHcalUnsuppressedDigis') ) -eras.phase2_hcal.toReplaceWith( hcalLocalRecoSequence, _phase2_hcalLocalRecoSequence ) +from Configuration.Eras.Modifier_phase2_hcal_cff import phase2_hcal +phase2_hcal.toModify( horeco, digiLabel = cms.InputTag('simHcalDigis') ) +phase2_hcal.toReplaceWith( hfreco, _hfUpgradeReco ) +phase2_hcal.toModify( hfreco, digiLabel = cms.InputTag('simHcalDigis','HFUpgradeDigiCollection') ) +phase2_hcal.toModify( zdcreco, digiLabel = cms.InputTag('simHcalUnsuppressedDigis'), digiLabelhcal = cms.InputTag('simHcalUnsuppressedDigis') ) +phase2_hcal.toReplaceWith( hcalLocalRecoSequence, _phase2_hcalLocalRecoSequence ) from RecoLocalCalo.HcalRecProducers.hfprereco_cfi import hfprereco from RecoLocalCalo.HcalRecProducers.HFPhase1Reconstructor_cfi import hfreco as _phase1_hfreco @@ -28,6 +28,8 @@ _phase1_hcalLocalRecoSequence = hcalLocalRecoSequence.copy() _phase1_hcalLocalRecoSequence.insert(0,hfprereco) -eras.run2_HF_2017.toReplaceWith( hcalLocalRecoSequence, _phase1_hcalLocalRecoSequence ) -eras.run2_HF_2017.toReplaceWith( hfreco, _phase1_hfreco ) -eras.run2_HE_2017.toReplaceWith( hbheprereco, _phase1_hbheprereco ) +from Configuration.Eras.Modifier_run2_HF_2017_cff import run2_HF_2017 +run2_HF_2017.toReplaceWith( hcalLocalRecoSequence, _phase1_hcalLocalRecoSequence ) +run2_HF_2017.toReplaceWith( hfreco, _phase1_hfreco ) +from Configuration.Eras.Modifier_run2_HE_2017_cff import run2_HE_2017 +run2_HE_2017.toReplaceWith( hbheprereco, _phase1_hbheprereco ) diff --git a/RecoLocalMuon/CSCRecHitD/python/cscRecHitD_cfi.py b/RecoLocalMuon/CSCRecHitD/python/cscRecHitD_cfi.py index 4153250b18cda..29f5e90bf9e25 100644 --- a/RecoLocalMuon/CSCRecHitD/python/cscRecHitD_cfi.py +++ b/RecoLocalMuon/CSCRecHitD/python/cscRecHitD_cfi.py @@ -1,7 +1,6 @@ import FWCore.ParameterSet.Config as cms # This object modifies the csc2DRecHits for running in Run 2 -from Configuration.StandardSequences.Eras import eras # parameters for CSC rechit building from RecoLocalMuon.CSCRecHitD.cscRecHitD_cff import * @@ -71,6 +70,7 @@ ## ## Modify for running in Run 2 ## -eras.run2_common.toModify( csc2DRecHits, readBadChannels = False ) -eras.run2_common.toModify( csc2DRecHits, CSCUseGasGainCorrections = False ) +from Configuration.Eras.Modifier_run2_common_cff import run2_common +run2_common.toModify( csc2DRecHits, readBadChannels = False ) +run2_common.toModify( csc2DRecHits, CSCUseGasGainCorrections = False ) diff --git a/RecoLocalMuon/Configuration/python/RecoLocalMuon_EventContent_cff.py b/RecoLocalMuon/Configuration/python/RecoLocalMuon_EventContent_cff.py index 5e535de57b744..05d0b81a06c95 100644 --- a/RecoLocalMuon/Configuration/python/RecoLocalMuon_EventContent_cff.py +++ b/RecoLocalMuon/Configuration/python/RecoLocalMuon_EventContent_cff.py @@ -28,11 +28,12 @@ 'keep *_cscSegments_*_*', 'keep *_rpcRecHits_*_*') ) -from Configuration.StandardSequences.Eras import eras def _updateOutput( era, outputPSets, commands): for o in outputPSets: era.toModify( o, outputCommands = o.outputCommands + commands ) +from Configuration.Eras.Modifier_run3_GEM_cff import run3_GEM +from Configuration.Eras.Modifier_phase2_muon_cff import phase2_muon _outputs = [RecoLocalMuonFEVT, RecoLocalMuonRECO, RecoLocalMuonAOD] -_updateOutput( eras.run3_GEM, _outputs, ['keep *_gemRecHits_*_*', 'keep *_gemSegments_*_*'] ) -_updateOutput(eras.phase2_muon, _outputs, ['keep *_me0RecHits_*_*', 'keep *_me0Segments_*_*']) +_updateOutput( run3_GEM, _outputs, ['keep *_gemRecHits_*_*', 'keep *_gemSegments_*_*'] ) +_updateOutput(phase2_muon, _outputs, ['keep *_me0RecHits_*_*', 'keep *_me0Segments_*_*']) diff --git a/RecoLocalMuon/Configuration/python/RecoLocalMuon_cff.py b/RecoLocalMuon/Configuration/python/RecoLocalMuon_cff.py index 15796dc17e7a8..291d4a4b4c1a7 100644 --- a/RecoLocalMuon/Configuration/python/RecoLocalMuon_cff.py +++ b/RecoLocalMuon/Configuration/python/RecoLocalMuon_cff.py @@ -46,6 +46,7 @@ _phase2_muonlocalreco = _run3_muonlocalreco.copy() _phase2_muonlocalreco += me0LocalReco -from Configuration.StandardSequences.Eras import eras -eras.run3_GEM.toReplaceWith( muonlocalreco , _run3_muonlocalreco ) -eras.phase2_muon.toReplaceWith( muonlocalreco , _phase2_muonlocalreco ) +from Configuration.Eras.Modifier_run3_GEM_cff import run3_GEM +run3_GEM.toReplaceWith( muonlocalreco , _run3_muonlocalreco ) +from Configuration.Eras.Modifier_phase2_muon_cff import phase2_muon +phase2_muon.toReplaceWith( muonlocalreco , _phase2_muonlocalreco ) diff --git a/RecoLocalMuon/RPCRecHit/python/rpcRecHits_cfi.py b/RecoLocalMuon/RPCRecHit/python/rpcRecHits_cfi.py index e740d603e41d0..2c5d21e3e980c 100644 --- a/RecoLocalMuon/RPCRecHit/python/rpcRecHits_cfi.py +++ b/RecoLocalMuon/RPCRecHit/python/rpcRecHits_cfi.py @@ -13,5 +13,5 @@ ) #disabling DIGI2RAW,RAW2DIGI chain for Phase2 -from Configuration.StandardSequences.Eras import eras -eras.phase2_muon.toModify(rpcRecHits, rpcDigiLabel = cms.InputTag('simMuonRPCDigis')) +from Configuration.Eras.Modifier_phase2_muon_cff import phase2_muon +phase2_muon.toModify(rpcRecHits, rpcDigiLabel = cms.InputTag('simMuonRPCDigis')) diff --git a/RecoLocalTracker/Configuration/python/RecoLocalTracker_EventContent_cff.py b/RecoLocalTracker/Configuration/python/RecoLocalTracker_EventContent_cff.py index b2999497ecb35..6688a6a5ae664 100644 --- a/RecoLocalTracker/Configuration/python/RecoLocalTracker_EventContent_cff.py +++ b/RecoLocalTracker/Configuration/python/RecoLocalTracker_EventContent_cff.py @@ -23,9 +23,9 @@ outputCommands = cms.untracked.vstring('keep ClusterSummary_clusterSummaryProducer_*_*') ) -from Configuration.StandardSequences.Eras import eras -eras.phase2_tracker.toModify(RecoLocalTrackerFEVT, outputCommands = RecoLocalTrackerFEVT.outputCommands + ['keep *_siPhase2Clusters_*_*', +from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker +phase2_tracker.toModify(RecoLocalTrackerFEVT, outputCommands = RecoLocalTrackerFEVT.outputCommands + ['keep *_siPhase2Clusters_*_*', 'keep *_phase2ITPixelClusters_*_*'] ) -eras.phase2_tracker.toModify(RecoLocalTrackerRECO, outputCommands = RecoLocalTrackerRECO.outputCommands + ['keep *_siPhase2Clusters_*_*', +phase2_tracker.toModify(RecoLocalTrackerRECO, outputCommands = RecoLocalTrackerRECO.outputCommands + ['keep *_siPhase2Clusters_*_*', 'keep *_phase2ITPixelClusters_*_*'] ) diff --git a/RecoLocalTracker/Configuration/python/RecoLocalTracker_cff.py b/RecoLocalTracker/Configuration/python/RecoLocalTracker_cff.py index 636f9c461c564..c678727739609 100644 --- a/RecoLocalTracker/Configuration/python/RecoLocalTracker_cff.py +++ b/RecoLocalTracker/Configuration/python/RecoLocalTracker_cff.py @@ -21,8 +21,8 @@ from RecoLocalTracker.Phase2ITPixelClusterizer.Phase2ITPixelClusterizer_cfi import * from RecoLocalTracker.Phase2TrackerRecHits.Phase2StripCPEGeometricESProducer_cfi import * -from Configuration.StandardSequences.Eras import eras -eras.phase2_tracker.toReplaceWith(pixeltrackerlocalreco, +from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker +phase2_tracker.toReplaceWith(pixeltrackerlocalreco, cms.Sequence( siPhase2Clusters + phase2ITPixelClusters + diff --git a/RecoLocalTracker/Phase2ITPixelClusterizer/python/Phase2ITPixelClusterizer_cfi.py b/RecoLocalTracker/Phase2ITPixelClusterizer/python/Phase2ITPixelClusterizer_cfi.py index 27ed8c9abf1d1..b0db0e1c0d69f 100644 --- a/RecoLocalTracker/Phase2ITPixelClusterizer/python/Phase2ITPixelClusterizer_cfi.py +++ b/RecoLocalTracker/Phase2ITPixelClusterizer/python/Phase2ITPixelClusterizer_cfi.py @@ -24,8 +24,8 @@ ) # This customization will be removed once we have phase2 pixel digis -from Configuration.StandardSequences.Eras import eras -eras.phase2_tracker.toModify(phase2ITPixelClusters, #FIXME +from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker +phase2_tracker.toModify(phase2ITPixelClusters, #FIXME src = cms.InputTag('simSiPixelDigis', "Pixel"), MissCalibrate = False ) diff --git a/RecoLocalTracker/SiPixelClusterizer/python/SiPixelClusterizer_cfi.py b/RecoLocalTracker/SiPixelClusterizer/python/SiPixelClusterizer_cfi.py index 2c7fb0c9b2fa3..0b70acc5a84f8 100644 --- a/RecoLocalTracker/SiPixelClusterizer/python/SiPixelClusterizer_cfi.py +++ b/RecoLocalTracker/SiPixelClusterizer/python/SiPixelClusterizer_cfi.py @@ -25,8 +25,8 @@ # Need these until phase2 pixel templates are used -from Configuration.StandardSequences.Eras import eras -eras.phase2_tracker.toModify(siPixelClusters, # FIXME +from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker +phase2_tracker.toModify(siPixelClusters, # FIXME src = cms.InputTag('simSiPixelDigis', "Pixel"), MissCalibrate = False ) diff --git a/RecoLocalTracker/SiPixelRecHits/python/PixelCPEGeneric_cfi.py b/RecoLocalTracker/SiPixelRecHits/python/PixelCPEGeneric_cfi.py index d04f9b1b608dd..5ee7ceff025d2 100644 --- a/RecoLocalTracker/SiPixelRecHits/python/PixelCPEGeneric_cfi.py +++ b/RecoLocalTracker/SiPixelRecHits/python/PixelCPEGeneric_cfi.py @@ -61,8 +61,8 @@ # This customization will be removed once we get the templates for phase2 pixel # FIXME::Is the Upgrade variable actually used? -from Configuration.StandardSequences.Eras import eras -eras.phase2_tracker.toModify(PixelCPEGenericESProducer, +from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker +phase2_tracker.toModify(PixelCPEGenericESProducer, useLAWidthFromDB = False, UseErrorsFromTemplates = False, LoadTemplatesFromDB = False, diff --git a/RecoLocalTracker/SiPixelRecHits/python/PixelCPETemplateReco_cfi.py b/RecoLocalTracker/SiPixelRecHits/python/PixelCPETemplateReco_cfi.py index 26fbd47c9ad5e..acebe3320de40 100644 --- a/RecoLocalTracker/SiPixelRecHits/python/PixelCPETemplateReco_cfi.py +++ b/RecoLocalTracker/SiPixelRecHits/python/PixelCPETemplateReco_cfi.py @@ -20,8 +20,8 @@ ) # This customization will be removed once we get the templates for phase2 pixel -from Configuration.StandardSequences.Eras import eras -eras.phase2_tracker.toModify(templates, +from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker +phase2_tracker.toModify(templates, LoadTemplatesFromDB = False, DoLorentz = False, ) diff --git a/RecoLocalTracker/SiStripClusterizer/python/SiStripClusterChargeCut_cfi.py b/RecoLocalTracker/SiStripClusterizer/python/SiStripClusterChargeCut_cfi.py index ada9b5919490f..0ef899c2e246a 100644 --- a/RecoLocalTracker/SiStripClusterizer/python/SiStripClusterChargeCut_cfi.py +++ b/RecoLocalTracker/SiStripClusterizer/python/SiStripClusterChargeCut_cfi.py @@ -1,5 +1,4 @@ import FWCore.ParameterSet.Config as cms -from Configuration.StandardSequences.Eras import eras SiStripClusterChargeCutNone = cms.PSet( value = cms.double(-1.0) @@ -17,5 +16,6 @@ value = cms.double(1945.0) ) -eras.trackingLowPU.toReplaceWith(SiStripClusterChargeCutLoose, SiStripClusterChargeCutTiny) -eras.trackingLowPU.toReplaceWith(SiStripClusterChargeCutTight, SiStripClusterChargeCutTiny) +from Configuration.Eras.Modifier_trackingLowPU_cff import trackingLowPU +trackingLowPU.toReplaceWith(SiStripClusterChargeCutLoose, SiStripClusterChargeCutTiny) +trackingLowPU.toReplaceWith(SiStripClusterChargeCutTight, SiStripClusterChargeCutTiny) diff --git a/RecoLocalTracker/SiStripClusterizer/python/SiStripClusterizer_RealData_cfi.py b/RecoLocalTracker/SiStripClusterizer/python/SiStripClusterizer_RealData_cfi.py index 1ffb1912156f6..cbe219a4526ba 100644 --- a/RecoLocalTracker/SiStripClusterizer/python/SiStripClusterizer_RealData_cfi.py +++ b/RecoLocalTracker/SiStripClusterizer/python/SiStripClusterizer_RealData_cfi.py @@ -11,10 +11,10 @@ cms.InputTag('siStripZeroSuppression','ScopeMode')), ) -from Configuration.StandardSequences.Eras import eras # The SiStripClusters are not used anymore in phase2 tracking # This part has to be clean up when they will be officially removed from the entire flow -eras.phase2_tracker.toModify(siStripClusters, # FIXME +from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker +phase2_tracker.toModify(siStripClusters, # FIXME DigiProducersList = cms.VInputTag( cms.InputTag('simSiStripDigis','ZeroSuppressed'), cms.InputTag('siStripZeroSuppression','VirginRaw'), cms.InputTag('siStripZeroSuppression','ProcessedRaw'), diff --git a/RecoLocalTracker/SiStripZeroSuppression/python/SiStripZeroSuppression_cfi.py b/RecoLocalTracker/SiStripZeroSuppression/python/SiStripZeroSuppression_cfi.py index 5a69cd610537f..4dda0820cccd8 100644 --- a/RecoLocalTracker/SiStripZeroSuppression/python/SiStripZeroSuppression_cfi.py +++ b/RecoLocalTracker/SiStripZeroSuppression/python/SiStripZeroSuppression_cfi.py @@ -25,10 +25,10 @@ ) -from Configuration.StandardSequences.Eras import eras # The SiStripClusters are not used anymore in phase2 tracking # This part has to be clean up when they will be officially removed from the entire flow -eras.phase2_tracker.toModify(siStripZeroSuppression, # FIXME +from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker +phase2_tracker.toModify(siStripZeroSuppression, # FIXME RawDigiProducersList = cms.VInputTag( cms.InputTag('simSiStripDigis','VirginRaw'), cms.InputTag('simSiStripDigis','ProcessedRaw'), cms.InputTag('simSiStripDigis','ScopeMode')) diff --git a/RecoLuminosity/LumiProducer/python/bunchSpacingProducer_cfi.py b/RecoLuminosity/LumiProducer/python/bunchSpacingProducer_cfi.py index 95810b045de94..d4076d1ba90f4 100644 --- a/RecoLuminosity/LumiProducer/python/bunchSpacingProducer_cfi.py +++ b/RecoLuminosity/LumiProducer/python/bunchSpacingProducer_cfi.py @@ -1,6 +1,6 @@ import FWCore.ParameterSet.Config as cms bunchSpacingProducer = cms.EDProducer("BunchSpacingProducer") -from Configuration.StandardSequences.Eras import eras -eras.run2_50ns_specific.toModify( bunchSpacingProducer, bunchSpacingOverride = cms.uint32(50)) -eras.run2_50ns_specific.toModify( bunchSpacingProducer, overrideBunchSpacing = cms.bool(True)) +from Configuration.Eras.Modifier_run2_50ns_specific_cff import run2_50ns_specific +run2_50ns_specific.toModify( bunchSpacingProducer, bunchSpacingOverride = cms.uint32(50)) +run2_50ns_specific.toModify( bunchSpacingProducer, overrideBunchSpacing = cms.bool(True)) diff --git a/RecoMET/Configuration/python/RecoMET_cff.py b/RecoMET/Configuration/python/RecoMET_cff.py index 9fa2065ae06c2..12407564561b1 100644 --- a/RecoMET/Configuration/python/RecoMET_cff.py +++ b/RecoMET/Configuration/python/RecoMET_cff.py @@ -21,7 +21,7 @@ ##____________________________________________________________________________|| metrecoPlusHCALNoise = cms.Sequence( metreco + hcalnoise ) -from Configuration.StandardSequences.Eras import eras -eras.phase2_hcal.toReplaceWith( metrecoPlusHCALNoise, metreco ) +from Configuration.Eras.Modifier_phase2_hcal_cff import phase2_hcal +phase2_hcal.toReplaceWith( metrecoPlusHCALNoise, metreco ) ##____________________________________________________________________________|| diff --git a/RecoMET/METFilters/python/EcalDeadCellTriggerPrimitiveFilter_cfi.py b/RecoMET/METFilters/python/EcalDeadCellTriggerPrimitiveFilter_cfi.py index 46cf0345abed8..b99cd8b9c0e96 100644 --- a/RecoMET/METFilters/python/EcalDeadCellTriggerPrimitiveFilter_cfi.py +++ b/RecoMET/METFilters/python/EcalDeadCellTriggerPrimitiveFilter_cfi.py @@ -28,7 +28,7 @@ usekTPSaturated = cms.bool ( False) ) -from Configuration.StandardSequences.Eras import eras -eras.phase2_hgcal.toModify( EcalDeadCellTriggerPrimitiveFilter, +from Configuration.Eras.Modifier_phase2_hgcal_cff import phase2_hgcal +phase2_hgcal.toModify( EcalDeadCellTriggerPrimitiveFilter, doEEfilter = cms.untracked.bool(False) ) diff --git a/RecoMET/METFilters/python/metFilters_cff.py b/RecoMET/METFilters/python/metFilters_cff.py index 4cd86240fc42f..9c809a9f8b1f8 100644 --- a/RecoMET/METFilters/python/metFilters_cff.py +++ b/RecoMET/METFilters/python/metFilters_cff.py @@ -97,8 +97,8 @@ muonBadTrackFilter ) -from Configuration.StandardSequences.Eras import eras -eras.phase2_hgcal.toReplaceWith(metFilters, metFilters.copyAndExclude([ +from Configuration.Eras.Modifier_phase2_hgcal_cff import phase2_hgcal +phase2_hgcal.toReplaceWith(metFilters, metFilters.copyAndExclude([ HBHENoiseFilterResultProducer, HBHENoiseFilter, # No hcalnoise for hgcal eeBadScFilter # No EE ])) diff --git a/RecoMuon/Configuration/python/MergeDisplacedTrackCollections_cff.py b/RecoMuon/Configuration/python/MergeDisplacedTrackCollections_cff.py index 40bfcd1c66862..44db9c8f03449 100644 --- a/RecoMuon/Configuration/python/MergeDisplacedTrackCollections_cff.py +++ b/RecoMuon/Configuration/python/MergeDisplacedTrackCollections_cff.py @@ -49,5 +49,5 @@ # This customization will be removed once we get the templates for # phase2 pixel -from Configuration.StandardSequences.Eras import eras -eras.phase2_tracker.toModify(duplicateDisplacedTrackCandidates, ttrhBuilderName = "WithTrackAngle") # FIXME +from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker +phase2_tracker.toModify(duplicateDisplacedTrackCandidates, ttrhBuilderName = "WithTrackAngle") # FIXME diff --git a/RecoMuon/Configuration/python/RecoMuonPPonly_cff.py b/RecoMuon/Configuration/python/RecoMuonPPonly_cff.py index 067d5ca620b6b..bcfe31cf50c75 100644 --- a/RecoMuon/Configuration/python/RecoMuonPPonly_cff.py +++ b/RecoMuon/Configuration/python/RecoMuonPPonly_cff.py @@ -83,24 +83,25 @@ ######################################################## -from Configuration.StandardSequences.Eras import eras _enableGEMMeasurement = dict( EnableGEMMeasurement = cms.bool(True) ) -eras.run3_GEM.toModify( standAloneMuons, STATrajBuilderParameters = dict( +from Configuration.Eras.Modifier_run3_GEM_cff import run3_GEM +run3_GEM.toModify( standAloneMuons, STATrajBuilderParameters = dict( FilterParameters = _enableGEMMeasurement, BWFilterParameters = _enableGEMMeasurement ) ) -eras.run3_GEM.toModify( refittedStandAloneMuons, STATrajBuilderParameters = dict( +run3_GEM.toModify( refittedStandAloneMuons, STATrajBuilderParameters = dict( FilterParameters = _enableGEMMeasurement, BWFilterParameters = _enableGEMMeasurement ) ) _enableME0Measurement = dict( EnableME0Measurement = cms.bool(True) ) -eras.phase2_muon.toModify( standAloneMuons, STATrajBuilderParameters = dict( +from Configuration.Eras.Modifier_phase2_muon_cff import phase2_muon +phase2_muon.toModify( standAloneMuons, STATrajBuilderParameters = dict( FilterParameters = _enableME0Measurement, BWFilterParameters = _enableME0Measurement ) ) -eras.phase2_muon.toModify( refittedStandAloneMuons, STATrajBuilderParameters = dict( +phase2_muon.toModify( refittedStandAloneMuons, STATrajBuilderParameters = dict( FilterParameters = _enableME0Measurement, BWFilterParameters = _enableME0Measurement ) ) from RecoMuon.MuonIdentification.me0MuonReco_cff import * _phase2_muonGlobalReco = muonGlobalReco.copy() _phase2_muonGlobalReco += me0MuonReco -eras.phase2_muon.toReplaceWith( muonGlobalReco, _phase2_muonGlobalReco ) +phase2_muon.toReplaceWith( muonGlobalReco, _phase2_muonGlobalReco ) diff --git a/RecoMuon/Configuration/python/RecoMuon_EventContent_cff.py b/RecoMuon/Configuration/python/RecoMuon_EventContent_cff.py index 1986c8f5ea041..6d9107a19d157 100644 --- a/RecoMuon/Configuration/python/RecoMuon_EventContent_cff.py +++ b/RecoMuon/Configuration/python/RecoMuon_EventContent_cff.py @@ -87,7 +87,7 @@ def _modifyRecoMuonEventContentForPhase2( object ): object.outputCommands.append('keep *_me0SegmentMatching_*_*') object.outputCommands.append('keep *_me0MuonConverting_*_*') -from Configuration.StandardSequences.Eras import eras -eras.phase2_muon.toModify( RecoMuonFEVT, func=_modifyRecoMuonEventContentForPhase2 ) -eras.phase2_muon.toModify( RecoMuonRECO, func=_modifyRecoMuonEventContentForPhase2 ) -eras.phase2_muon.toModify( RecoMuonAOD, func=_modifyRecoMuonEventContentForPhase2 ) +from Configuration.Eras.Modifier_phase2_muon_cff import phase2_muon +phase2_muon.toModify( RecoMuonFEVT, func=_modifyRecoMuonEventContentForPhase2 ) +phase2_muon.toModify( RecoMuonRECO, func=_modifyRecoMuonEventContentForPhase2 ) +phase2_muon.toModify( RecoMuonAOD, func=_modifyRecoMuonEventContentForPhase2 ) diff --git a/RecoMuon/Configuration/python/preDuplicateMergingDisplacedTracks_cfi.py b/RecoMuon/Configuration/python/preDuplicateMergingDisplacedTracks_cfi.py index 6ef3ff8622245..7809a3ef4705a 100644 --- a/RecoMuon/Configuration/python/preDuplicateMergingDisplacedTracks_cfi.py +++ b/RecoMuon/Configuration/python/preDuplicateMergingDisplacedTracks_cfi.py @@ -1,5 +1,4 @@ import FWCore.ParameterSet.Config as cms -from Configuration.StandardSequences.Eras import eras from RecoTracker.FinalTrackSelectors.TrackCollectionMerger_cfi import * preDuplicateMergingDisplacedTracks = TrackCollectionMerger.clone() @@ -20,13 +19,15 @@ # that configuration is indended only for tracking comparisons (not # for production), it is not worth of the effort to try to fix the # situation. -eras.trackingPhase1PU70.toModify(preDuplicateMergingDisplacedTracks, +from Configuration.Eras.Modifier_trackingPhase1PU70_cff import trackingPhase1PU70 +trackingPhase1PU70.toModify(preDuplicateMergingDisplacedTracks, trackProducers = [x for x in preDuplicateMergingDisplacedTracks.trackProducers if x != "muonSeededTracksInOut"], inputClassifiers = [x for x in preDuplicateMergingDisplacedTracks.inputClassifiers if x != "muonSeededTracksInOutClassifier"], ) # Same for Phase2PU140 -eras.trackingPhase2PU140.toModify(preDuplicateMergingDisplacedTracks, +from Configuration.Eras.Modifier_trackingPhase2PU140_cff import trackingPhase2PU140 +trackingPhase2PU140.toModify(preDuplicateMergingDisplacedTracks, trackProducers = [x for x in preDuplicateMergingDisplacedTracks.trackProducers if x != "muonSeededTracksInOut"], inputClassifiers = [x for x in preDuplicateMergingDisplacedTracks.inputClassifiers if x != "muonSeededTracksInOutClassifier"], ) diff --git a/RecoMuon/GlobalTrackingTools/python/GlobalMuonRefitter_cff.py b/RecoMuon/GlobalTrackingTools/python/GlobalMuonRefitter_cff.py index ffe26bc276c66..b71d73476df9f 100644 --- a/RecoMuon/GlobalTrackingTools/python/GlobalMuonRefitter_cff.py +++ b/RecoMuon/GlobalTrackingTools/python/GlobalMuonRefitter_cff.py @@ -47,6 +47,6 @@ # This customization will be removed once we get the templates for # phase2 pixel -from Configuration.StandardSequences.Eras import eras -eras.phase2_tracker.toModify(GlobalMuonRefitter, TrackerRecHitBuilder = 'WithTrackAngle') # FIXME +from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker +phase2_tracker.toModify(GlobalMuonRefitter, TrackerRecHitBuilder = 'WithTrackAngle') # FIXME diff --git a/RecoMuon/GlobalTrackingTools/python/GlobalTrajectoryBuilderCommon_cff.py b/RecoMuon/GlobalTrackingTools/python/GlobalTrajectoryBuilderCommon_cff.py index e65faf8af4933..be49cef0b514b 100644 --- a/RecoMuon/GlobalTrackingTools/python/GlobalTrajectoryBuilderCommon_cff.py +++ b/RecoMuon/GlobalTrackingTools/python/GlobalTrajectoryBuilderCommon_cff.py @@ -71,8 +71,8 @@ # This customization will be removed once we get the templates for # phase2 pixel -from Configuration.StandardSequences.Eras import eras -eras.phase2_tracker.toModify(GlobalTrajectoryBuilderCommon, # FIXME +from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker +phase2_tracker.toModify(GlobalTrajectoryBuilderCommon, # FIXME TrackerRecHitBuilder = 'WithTrackAngle', TrackTransformer = dict(TrackerRecHitBuilder = 'WithTrackAngle'), GlbRefitterParameters = dict(TrackerRecHitBuilder = 'WithTrackAngle'), diff --git a/RecoMuon/MuonIdentification/python/TrackerKinkFinder_cfi.py b/RecoMuon/MuonIdentification/python/TrackerKinkFinder_cfi.py index 7096f27d144b2..233ca21d4bd2a 100644 --- a/RecoMuon/MuonIdentification/python/TrackerKinkFinder_cfi.py +++ b/RecoMuon/MuonIdentification/python/TrackerKinkFinder_cfi.py @@ -20,6 +20,6 @@ # This customization will be removed once we get the templates for # phase2 pixel -from Configuration.StandardSequences.Eras import eras -eras.phase2_tracker.toModify(TrackerKinkFinderParametersBlock, TrackerKinkFinderParameters = dict(TrackerRecHitBuilder = 'WithTrackAngle')) # FIXME +from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker +phase2_tracker.toModify(TrackerKinkFinderParametersBlock, TrackerKinkFinderParameters = dict(TrackerRecHitBuilder = 'WithTrackAngle')) # FIXME diff --git a/RecoMuon/MuonIdentification/python/muons1stStep_cfi.py b/RecoMuon/MuonIdentification/python/muons1stStep_cfi.py index 60d48208be00b..d0ff2d79ab6f3 100644 --- a/RecoMuon/MuonIdentification/python/muons1stStep_cfi.py +++ b/RecoMuon/MuonIdentification/python/muons1stStep_cfi.py @@ -6,7 +6,6 @@ from RecoMuon.MuonIdentification.MuonTimingFiller_cfi import * from RecoMuon.MuonIdentification.TrackerKinkFinder_cfi import * from TrackingTools.TrackAssociator.default_cfi import * -from Configuration.StandardSequences.Eras import eras muons1stStep = cms.EDProducer("MuonIdProducer", # MuonCaloCompatibility MuonCaloCompatibilityBlock, @@ -81,8 +80,10 @@ ) ) -eras.run3_GEM.toModify( muons1stStep, TrackAssociatorParameters = dict(useGEM = cms.bool(True) ) ) -eras.phase2_muon.toModify( muons1stStep, TrackAssociatorParameters = dict(useME0 = cms.bool(True) ) ) +from Configuration.Eras.Modifier_run3_GEM_cff import run3_GEM +run3_GEM.toModify( muons1stStep, TrackAssociatorParameters = dict(useGEM = cms.bool(True) ) ) +from Configuration.Eras.Modifier_phase2_muon_cff import phase2_muon +phase2_muon.toModify( muons1stStep, TrackAssociatorParameters = dict(useME0 = cms.bool(True) ) ) muonEcalDetIds = cms.EDProducer("InterestingEcalDetIdProducer", inputCollection = cms.InputTag("muons1stStep") diff --git a/RecoMuon/TrackingTools/python/MuonTrackLoader_cff.py b/RecoMuon/TrackingTools/python/MuonTrackLoader_cff.py index 0372fed58e7df..3820e20deeadc 100644 --- a/RecoMuon/TrackingTools/python/MuonTrackLoader_cff.py +++ b/RecoMuon/TrackingTools/python/MuonTrackLoader_cff.py @@ -86,6 +86,6 @@ # This customization will be removed once we get the templates for # phase2 pixel -from Configuration.StandardSequences.Eras import eras -eras.phase2_tracker.toModify(MuonTrackLoaderForGLB, TrackLoaderParameters = dict(TTRHBuilder = 'WithTrackAngle')) # FIXME +from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker +phase2_tracker.toModify(MuonTrackLoaderForGLB, TrackLoaderParameters = dict(TTRHBuilder = 'WithTrackAngle')) # FIXME diff --git a/RecoParticleFlow/Configuration/python/RecoParticleFlow_EventContent_cff.py b/RecoParticleFlow/Configuration/python/RecoParticleFlow_EventContent_cff.py index 30408ce5eec27..a26fdae46c445 100644 --- a/RecoParticleFlow/Configuration/python/RecoParticleFlow_EventContent_cff.py +++ b/RecoParticleFlow/Configuration/python/RecoParticleFlow_EventContent_cff.py @@ -143,8 +143,8 @@ def _modifyPFEventContentForHGCalFEVT( obj ): # mods for HGCAL -from Configuration.StandardSequences.Eras import eras -eras.phase2_hgcal.toModify( RecoParticleFlowFEVT, outputCommands = RecoParticleFlowFEVT.outputCommands + [ +from Configuration.Eras.Modifier_phase2_hgcal_cff import phase2_hgcal +phase2_hgcal.toModify( RecoParticleFlowFEVT, outputCommands = RecoParticleFlowFEVT.outputCommands + [ 'keep recoPFRecHits_particleFlowClusterECAL__*', 'keep recoPFRecHits_particleFlowClusterECAL_Cleaned_*', 'keep recoPFRecHits_particleFlowRecHitHGC__*', @@ -154,21 +154,22 @@ def _modifyPFEventContentForHGCalFEVT( obj ): 'keep *_particleFlowTmpBarrel_*_*', ] ) -eras.phase2_hgcal.toModify( RecoParticleFlowRECO, outputCommands = RecoParticleFlowRECO.outputCommands + [ 'keep recoPFRecHits_particleFlowClusterECAL_Cleaned_*', 'keep recoPFRecHits_particleFlowRecHitHGC_Cleaned_*', 'keep recoPFClusters_particleFlowClusterHGCal__*', 'keep recoPFBlocks_simPFProducer_*_*', 'keep recoSuperClusters_simPFProducer_*_*','keep *_particleFlowTmpBarrel_*_*' ] ) -eras.phase2_hgcal.toModify( RecoParticleFlowAOD, outputCommands = RecoParticleFlowAOD.outputCommands + [ 'keep recoPFRecHits_particleFlowClusterECAL_Cleaned_*', 'keep recoPFRecHits_particleFlowRecHitHGC_Cleaned_*', 'keep recoPFClusters_particleFlowClusterHGCal__*', 'keep recoSuperClusters_simPFProducer_*_*' ] ) +phase2_hgcal.toModify( RecoParticleFlowRECO, outputCommands = RecoParticleFlowRECO.outputCommands + [ 'keep recoPFRecHits_particleFlowClusterECAL_Cleaned_*', 'keep recoPFRecHits_particleFlowRecHitHGC_Cleaned_*', 'keep recoPFClusters_particleFlowClusterHGCal__*', 'keep recoPFBlocks_simPFProducer_*_*', 'keep recoSuperClusters_simPFProducer_*_*','keep *_particleFlowTmpBarrel_*_*' ] ) +phase2_hgcal.toModify( RecoParticleFlowAOD, outputCommands = RecoParticleFlowAOD.outputCommands + [ 'keep recoPFRecHits_particleFlowClusterECAL_Cleaned_*', 'keep recoPFRecHits_particleFlowRecHitHGC_Cleaned_*', 'keep recoPFClusters_particleFlowClusterHGCal__*', 'keep recoSuperClusters_simPFProducer_*_*' ] ) #timing -eras.phase2_timing.toModify( +from Configuration.Eras.Modifier_phase2_timing_cff import phase2_timing +phase2_timing.toModify( RecoParticleFlowFEVT, outputCommands = RecoParticleFlowFEVT.outputCommands + [ 'keep *_ecalBarrelClusterFastTimer_*_*' ]) -eras.phase2_timing.toModify( +phase2_timing.toModify( RecoParticleFlowRECO, outputCommands = RecoParticleFlowRECO.outputCommands + [ 'keep *_ecalBarrelClusterFastTimer_*_*' ]) -eras.phase2_timing.toModify( +phase2_timing.toModify( RecoParticleFlowAOD, outputCommands = RecoParticleFlowAOD.outputCommands + [ 'keep *_ecalBarrelClusterFastTimer_*_*' diff --git a/RecoParticleFlow/Configuration/python/RecoParticleFlow_cff.py b/RecoParticleFlow/Configuration/python/RecoParticleFlow_cff.py index 6ca021e7de591..d243f41d12f99 100644 --- a/RecoParticleFlow/Configuration/python/RecoParticleFlow_cff.py +++ b/RecoParticleFlow/Configuration/python/RecoParticleFlow_cff.py @@ -42,7 +42,6 @@ from RecoParticleFlow.PFProducer.simPFProducer_cfi import * from SimTracker.TrackerHitAssociation.tpClusterProducer_cfi import * from SimTracker.TrackAssociatorProducers.quickTrackAssociatorByHits_cfi import * -from Configuration.StandardSequences.Eras import eras particleFlowTmpBarrel = particleFlowTmp.clone() _phase2_hgcal_particleFlowTmp = cms.EDProducer( "PFCandidateListMerger", @@ -59,15 +58,16 @@ _phase2_hgcal_particleFlowReco = cms.Sequence( _phase2_hgcal_simPFSequence * particleFlowReco.copy() ) _phase2_hgcal_particleFlowReco.replace( particleFlowTmpSeq, cms.Sequence( particleFlowTmpBarrel * particleFlowTmp ) ) -eras.phase2_hgcal.toModify( quickTrackAssociatorByHits, +from Configuration.Eras.Modifier_phase2_hgcal_cff import phase2_hgcal +phase2_hgcal.toModify( quickTrackAssociatorByHits, pixelSimLinkSrc = cms.InputTag("simSiPixelDigis","Pixel"), stripSimLinkSrc = cms.InputTag("simSiPixelDigis","Tracker") ) -eras.phase2_hgcal.toModify( tpClusterProducer, +phase2_hgcal.toModify( tpClusterProducer, pixelSimLinkSrc = cms.InputTag("simSiPixelDigis", "Pixel"), phase2OTSimLinkSrc = cms.InputTag("simSiPixelDigis","Tracker") ) -eras.phase2_hgcal.toReplaceWith( particleFlowTmp, _phase2_hgcal_particleFlowTmp ) -eras.phase2_hgcal.toReplaceWith( particleFlowReco, _phase2_hgcal_particleFlowReco ) +phase2_hgcal.toReplaceWith( particleFlowTmp, _phase2_hgcal_particleFlowTmp ) +phase2_hgcal.toReplaceWith( particleFlowReco, _phase2_hgcal_particleFlowReco ) diff --git a/RecoParticleFlow/PFClusterProducer/python/particleFlowClusterHO_cfi.py b/RecoParticleFlow/PFClusterProducer/python/particleFlowClusterHO_cfi.py index dea927e93d869..b54752bc07f31 100644 --- a/RecoParticleFlow/PFClusterProducer/python/particleFlowClusterHO_cfi.py +++ b/RecoParticleFlow/PFClusterProducer/python/particleFlowClusterHO_cfi.py @@ -1,7 +1,6 @@ import FWCore.ParameterSet.Config as cms # Use this object to modify parameters specifically for Run 2 -from Configuration.StandardSequences.Eras import eras #### PF CLUSTER HO #### @@ -106,4 +105,5 @@ def _modifyParticleFlowClusterHOForRun2( object ) : object.pfClusterBuilder.allCellsPositionCalc.logWeightDenominator = cms.double(0.05) # Call the function above to modify particleFlowClusterHO only if the run2 era is active -eras.run2_common.toModify( particleFlowClusterHO, func=_modifyParticleFlowClusterHOForRun2 ) +from Configuration.Eras.Modifier_run2_common_cff import run2_common +run2_common.toModify( particleFlowClusterHO, func=_modifyParticleFlowClusterHOForRun2 ) diff --git a/RecoParticleFlow/PFClusterProducer/python/particleFlowCluster_cff.py b/RecoParticleFlow/PFClusterProducer/python/particleFlowCluster_cff.py index 89a3be67ce66c..c241333fc685b 100644 --- a/RecoParticleFlow/PFClusterProducer/python/particleFlowCluster_cff.py +++ b/RecoParticleFlow/PFClusterProducer/python/particleFlowCluster_cff.py @@ -55,8 +55,8 @@ _phase2_hgcal_particleFlowCluster = particleFlowCluster.copy() _phase2_hgcal_particleFlowCluster += pfClusteringHGCal -from Configuration.StandardSequences.Eras import eras -eras.phase2_hgcal.toReplaceWith( particleFlowCluster, _phase2_hgcal_particleFlowCluster ) +from Configuration.Eras.Modifier_phase2_hgcal_cff import phase2_hgcal +phase2_hgcal.toReplaceWith( particleFlowCluster, _phase2_hgcal_particleFlowCluster ) #timing @@ -65,7 +65,8 @@ _phase2_timing_particleFlowClusterECALSequence = cms.Sequence(ecalBarrelClusterFastTimer* particleFlowTimeAssignerECAL* particleFlowClusterECALSequence.copy()) -eras.phase2_timing.toReplaceWith(particleFlowClusterECALSequence, +from Configuration.Eras.Modifier_phase2_timing_cff import phase2_timing +phase2_timing.toReplaceWith(particleFlowClusterECALSequence, _phase2_timing_particleFlowClusterECALSequence) -eras.phase2_timing.toModify(particleFlowClusterECAL, +phase2_timing.toModify(particleFlowClusterECAL, inputECAL = cms.InputTag('particleFlowTimeAssignerECAL')) diff --git a/RecoParticleFlow/PFClusterProducer/python/particleFlowRecHitHO_cfi.py b/RecoParticleFlow/PFClusterProducer/python/particleFlowRecHitHO_cfi.py index e3ce24e34ff54..b7296d1539900 100644 --- a/RecoParticleFlow/PFClusterProducer/python/particleFlowRecHitHO_cfi.py +++ b/RecoParticleFlow/PFClusterProducer/python/particleFlowRecHitHO_cfi.py @@ -32,7 +32,6 @@ # # Need to change the quality tests for Run 2 # -from Configuration.StandardSequences.Eras import eras def _modifyParticleFlowRecHitHOForRun2( object ) : """ @@ -53,4 +52,5 @@ def _modifyParticleFlowRecHitHOForRun2( object ) : ) ) -eras.run2_common.toModify( particleFlowRecHitHO, func=_modifyParticleFlowRecHitHOForRun2 ) +from Configuration.Eras.Modifier_run2_common_cff import run2_common +run2_common.toModify( particleFlowRecHitHO, func=_modifyParticleFlowRecHitHOForRun2 ) diff --git a/RecoParticleFlow/PFProducer/python/particleFlowBlock_cff.py b/RecoParticleFlow/PFProducer/python/particleFlowBlock_cff.py index a198582479f43..c83ddc8806dc7 100644 --- a/RecoParticleFlow/PFProducer/python/particleFlowBlock_cff.py +++ b/RecoParticleFlow/PFProducer/python/particleFlowBlock_cff.py @@ -9,7 +9,6 @@ # include "RecoTracker/TrackProducer/data/CTFFinalFitWithMaterial.cff" from RecoParticleFlow.PFProducer.particleFlowBlock_cfi import * -from Configuration.StandardSequences.Eras import eras _phase2_hgcal_Importers = deepcopy(particleFlowBlock.elementImporters) # kill tracks in the HGCal _phase2_hgcal_Importers[5].importerName = cms.string('GeneralTracksImporterWithVeto') @@ -39,7 +38,8 @@ # useKDTree = cms.bool(False) ) #) -eras.phase2_hgcal.toModify( +from Configuration.Eras.Modifier_phase2_hgcal_cff import phase2_hgcal +phase2_hgcal.toModify( particleFlowBlock, linkDefinitions = _phase2_hgcal_Linkers, elementImporters = _phase2_hgcal_Importers diff --git a/RecoParticleFlow/PFTracking/python/trackerDrivenElectronSeeds_cfi.py b/RecoParticleFlow/PFTracking/python/trackerDrivenElectronSeeds_cfi.py index d1f89fd29ca55..5b9a16eb63e66 100644 --- a/RecoParticleFlow/PFTracking/python/trackerDrivenElectronSeeds_cfi.py +++ b/RecoParticleFlow/PFTracking/python/trackerDrivenElectronSeeds_cfi.py @@ -51,5 +51,5 @@ # This customization will be removed once we get the templates for # phase2 pixel -from Configuration.StandardSequences.Eras import eras -eras.phase2_tracker.toModify(trackerDrivenElectronSeeds, TTRHBuilder = 'WithTrackAngle') # FIXME +from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker +phase2_tracker.toModify(trackerDrivenElectronSeeds, TTRHBuilder = 'WithTrackAngle') # FIXME diff --git a/RecoPixelVertexing/Configuration/python/RecoPixelVertexing_cff.py b/RecoPixelVertexing/Configuration/python/RecoPixelVertexing_cff.py index b265b4ff71b08..f627f403004e9 100644 --- a/RecoPixelVertexing/Configuration/python/RecoPixelVertexing_cff.py +++ b/RecoPixelVertexing/Configuration/python/RecoPixelVertexing_cff.py @@ -1,5 +1,4 @@ import FWCore.ParameterSet.Config as cms -from Configuration.StandardSequences.Eras import eras from RecoPixelVertexing.PixelTrackFitting.PixelTracks_cff import * # @@ -16,6 +15,9 @@ ) _recopixelvertexing_LowPU_Phase1PU70 = recopixelvertexing.copy() _recopixelvertexing_LowPU_Phase1PU70.replace(PixelLayerTriplets, PixelLayerTripletsPreSplitting) -eras.trackingLowPU.toReplaceWith(recopixelvertexing, _recopixelvertexing_LowPU_Phase1PU70) -eras.trackingPhase1PU70.toReplaceWith(recopixelvertexing, _recopixelvertexing_LowPU_Phase1PU70) -eras.trackingPhase2PU140.toReplaceWith(recopixelvertexing, _recopixelvertexing_LowPU_Phase1PU70) +from Configuration.Eras.Modifier_trackingLowPU_cff import trackingLowPU +trackingLowPU.toReplaceWith(recopixelvertexing, _recopixelvertexing_LowPU_Phase1PU70) +from Configuration.Eras.Modifier_trackingPhase1PU70_cff import trackingPhase1PU70 +trackingPhase1PU70.toReplaceWith(recopixelvertexing, _recopixelvertexing_LowPU_Phase1PU70) +from Configuration.Eras.Modifier_trackingPhase2PU140_cff import trackingPhase2PU140 +trackingPhase2PU140.toReplaceWith(recopixelvertexing, _recopixelvertexing_LowPU_Phase1PU70) diff --git a/RecoPixelVertexing/PixelLowPtUtilities/python/ClusterShapeHitFilterESProducer_cfi.py b/RecoPixelVertexing/PixelLowPtUtilities/python/ClusterShapeHitFilterESProducer_cfi.py index 72f2a906c6a77..129e320aac69a 100644 --- a/RecoPixelVertexing/PixelLowPtUtilities/python/ClusterShapeHitFilterESProducer_cfi.py +++ b/RecoPixelVertexing/PixelLowPtUtilities/python/ClusterShapeHitFilterESProducer_cfi.py @@ -1,5 +1,4 @@ import FWCore.ParameterSet.Config as cms -from Configuration.StandardSequences.Eras import eras from Configuration.Eras.Modifier_phase1PixelNewFPix_cff import phase1PixelNewFPix as _phase1PixelNewFPix ClusterShapeHitFilterESProducer = cms.ESProducer("ClusterShapeHitFilterESProducer", @@ -7,12 +6,15 @@ PixelShapeFile= cms.string('RecoPixelVertexing/PixelLowPtUtilities/data/pixelShape.par'), clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutNone')) ) -eras.phase1Pixel.toModify(ClusterShapeHitFilterESProducer, +from Configuration.Eras.Modifier_phase1Pixel_cff import phase1Pixel +phase1Pixel.toModify(ClusterShapeHitFilterESProducer, PixelShapeFile = 'RecoPixelVertexing/PixelLowPtUtilities/data/pixelShape_Phase1Tk.par' ) -eras.phase2_tracker.toModify(ClusterShapeHitFilterESProducer, +from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker +phase2_tracker.toModify(ClusterShapeHitFilterESProducer, PixelShapeFile = 'RecoPixelVertexing/PixelLowPtUtilities/data/pixelShape_Phase1Tk.par' ) +from Configuration.Eras.Modifier_phase1PixelNewFPix_cff import phase1PixelNewFPix _phase1PixelNewFPix.toModify(ClusterShapeHitFilterESProducer, PixelShapeFile = 'RecoPixelVertexing/PixelLowPtUtilities/data/pixelShape_Phase1TkNewFPix.par' ) diff --git a/RecoPixelVertexing/PixelTrackFitting/python/PixelTrackReconstruction_cfi.py b/RecoPixelVertexing/PixelTrackFitting/python/PixelTrackReconstruction_cfi.py index b0a52cb676c34..fffce29cacb86 100644 --- a/RecoPixelVertexing/PixelTrackFitting/python/PixelTrackReconstruction_cfi.py +++ b/RecoPixelVertexing/PixelTrackFitting/python/PixelTrackReconstruction_cfi.py @@ -1,5 +1,4 @@ import FWCore.ParameterSet.Config as cms -from Configuration.StandardSequences.Eras import eras from RecoPixelVertexing.PixelTrackFitting.PixelFitterByHelixProjections_cfi import * from RecoTracker.TkTrackingRegions.GlobalTrackingRegionFromBeamSpot_cfi import * @@ -40,8 +39,10 @@ SeedingLayers = "PixelLayerTripletsPreSplitting", GeneratorPSet = dict(SeedComparitorPSet = dict(clusterShapeCacheSrc = "siPixelClusterShapeCachePreSplitting")) ) -eras.trackingLowPU.toModify(PixelTrackReconstructionBlock, OrderedHitsFactoryPSet = _OrderedHitsFactoryPSet_LowPU_Phase1PU70) -eras.trackingPhase1PU70.toModify(PixelTrackReconstructionBlock, +from Configuration.Eras.Modifier_trackingLowPU_cff import trackingLowPU +trackingLowPU.toModify(PixelTrackReconstructionBlock, OrderedHitsFactoryPSet = _OrderedHitsFactoryPSet_LowPU_Phase1PU70) +from Configuration.Eras.Modifier_trackingPhase1PU70_cff import trackingPhase1PU70 +trackingPhase1PU70.toModify(PixelTrackReconstructionBlock, SeedMergerPSet = cms.PSet( layerList = cms.PSet(refToPSet_ = cms.string('PixelSeedMergerQuadruplets')), addRemainingTriplets = cms.bool(False), @@ -55,7 +56,8 @@ RegionFactoryPSet = dict(RegionPSet = dict(originRadius = 0.02)), OrderedHitsFactoryPSet = _OrderedHitsFactoryPSet_LowPU_Phase1PU70, ) -eras.trackingPhase2PU140.toModify(PixelTrackReconstructionBlock, +from Configuration.Eras.Modifier_trackingPhase2PU140_cff import trackingPhase2PU140 +trackingPhase2PU140.toModify(PixelTrackReconstructionBlock, SeedMergerPSet = cms.PSet( layerList = cms.PSet(refToPSet_ = cms.string('PixelSeedMergerQuadruplets')), addRemainingTriplets = cms.bool(False), diff --git a/RecoPixelVertexing/PixelTriplets/python/PixelTripletLargeTipGenerator_cfi.py b/RecoPixelVertexing/PixelTriplets/python/PixelTripletLargeTipGenerator_cfi.py index be55207a13e45..5752db8b49dfb 100644 --- a/RecoPixelVertexing/PixelTriplets/python/PixelTripletLargeTipGenerator_cfi.py +++ b/RecoPixelVertexing/PixelTriplets/python/PixelTripletLargeTipGenerator_cfi.py @@ -1,5 +1,4 @@ import FWCore.ParameterSet.Config as cms -from Configuration.StandardSequences.Eras import eras # moving to the block. Will delete the PSet once transition is done PixelTripletLargeTipGenerator = cms.PSet( @@ -12,5 +11,6 @@ extraHitRPhitolerance = cms.double(0.032), extraHitRZtolerance = cms.double(0.037) ) -eras.trackingPhase1PU70.toModify(PixelTripletLargeTipGenerator, maxElement = 0) +from Configuration.Eras.Modifier_trackingPhase1PU70_cff import trackingPhase1PU70 +trackingPhase1PU70.toModify(PixelTripletLargeTipGenerator, maxElement = 0) diff --git a/RecoPixelVertexing/PixelTriplets/python/quadrupletseedmerging_cff.py b/RecoPixelVertexing/PixelTriplets/python/quadrupletseedmerging_cff.py index 1746dd7b04ef7..0116305c5c8a2 100644 --- a/RecoPixelVertexing/PixelTriplets/python/quadrupletseedmerging_cff.py +++ b/RecoPixelVertexing/PixelTriplets/python/quadrupletseedmerging_cff.py @@ -1,6 +1,5 @@ import FWCore.ParameterSet.Config as cms -from Configuration.StandardSequences.Eras import eras # creating quadruplet SeedingLayerSets for the merger; PixelSeedMergerQuadruplets = cms.PSet( @@ -58,6 +57,9 @@ BPix = dict(HitProducer = "siPixelRecHitsPreSplitting"), FPix = dict(HitProducer = "siPixelRecHitsPreSplitting"), ) -eras.trackingPhase1.toModify(PixelSeedMergerQuadruplets, **_forPhase1) -eras.trackingPhase1PU70.toModify(PixelSeedMergerQuadruplets, **_forPhase1) -eras.trackingPhase2PU140.toModify(PixelSeedMergerQuadruplets, layerList = _layerListForPhase2) +from Configuration.Eras.Modifier_trackingPhase1_cff import trackingPhase1 +trackingPhase1.toModify(PixelSeedMergerQuadruplets, **_forPhase1) +from Configuration.Eras.Modifier_trackingPhase1PU70_cff import trackingPhase1PU70 +trackingPhase1PU70.toModify(PixelSeedMergerQuadruplets, **_forPhase1) +from Configuration.Eras.Modifier_trackingPhase2PU140_cff import trackingPhase2PU140 +trackingPhase2PU140.toModify(PixelSeedMergerQuadruplets, layerList = _layerListForPhase2) diff --git a/RecoTracker/ConversionSeedGenerators/python/ConversionStep_cff.py b/RecoTracker/ConversionSeedGenerators/python/ConversionStep_cff.py index 66f68d8cbfacf..bd57f69c4d75d 100644 --- a/RecoTracker/ConversionSeedGenerators/python/ConversionStep_cff.py +++ b/RecoTracker/ConversionSeedGenerators/python/ConversionStep_cff.py @@ -1,5 +1,4 @@ import FWCore.ParameterSet.Config as cms -from Configuration.StandardSequences.Eras import eras from RecoTracker.TkSeedingLayers.seedingLayersEDProducer_cfi import * @@ -18,13 +17,15 @@ convClusters = _convClustersBase.clone( trackClassifier = cms.InputTag('tobTecStep',"QualityMasks"), ) -eras.trackingPhase1PU70.toReplaceWith(convClusters, _convClustersBase.clone( +from Configuration.Eras.Modifier_trackingPhase1PU70_cff import trackingPhase1PU70 +trackingPhase1PU70.toReplaceWith(convClusters, _convClustersBase.clone( overrideTrkQuals = "tobTecStepSelector:tobTecStep", )) #Phase2 : configuring the phase2 track Cluster Remover from RecoLocalTracker.SubCollectionProducers.phase2trackClusterRemover_cfi import phase2trackClusterRemover as _phase2trackClusterRemover -eras.trackingPhase2PU140.toReplaceWith(convClusters, _phase2trackClusterRemover.clone( +from Configuration.Eras.Modifier_trackingPhase2PU140_cff import trackingPhase2PU140 +trackingPhase2PU140.toReplaceWith(convClusters, _phase2trackClusterRemover.clone( maxChi2 = 30.0, phase2pixelClusters = "siPixelClusters", phase2OTClusters = "siPhase2Clusters", @@ -221,7 +222,7 @@ skipClusters = cms.InputTag('convClusters'), ) ) -eras.trackingPhase1PU70.toModify(convLayerPairs, +trackingPhase1PU70.toModify(convLayerPairs, layerList = [ 'BPix1+BPix2', @@ -324,7 +325,7 @@ TOB5 = dict(clusterChargeCut = dict(refToPSet_ = "SiStripClusterChargeCutNone")), TOB6 = dict(clusterChargeCut = dict(refToPSet_ = "SiStripClusterChargeCutNone")), ) -eras.trackingPhase2PU140.toReplaceWith(convLayerPairs, cms.EDProducer("SeedingLayersEDProducer", +trackingPhase2PU140.toReplaceWith(convLayerPairs, cms.EDProducer("SeedingLayersEDProducer", layerList = cms.vstring('BPix1+BPix2', 'BPix2+BPix3', 'BPix3+BPix4', @@ -365,9 +366,10 @@ photonConvTrajSeedFromSingleLeg.primaryVerticesTag = cms.InputTag('firstStepPrimaryVertices') #photonConvTrajSeedFromQuadruplets.TrackRefitter = cms.InputTag('generalTracks') #photonConvTrajSeedFromQuadruplets.primaryVerticesTag = cms.InputTag('pixelVertices') -eras.trackingLowPU.toModify(photonConvTrajSeedFromSingleLeg, primaryVerticesTag = "pixelVertices") -eras.trackingPhase1PU70.toModify(photonConvTrajSeedFromSingleLeg, primaryVerticesTag = "pixelVertices") -eras.trackingPhase2PU140.toModify(photonConvTrajSeedFromSingleLeg, primaryVerticesTag = "pixelVertices") +from Configuration.Eras.Modifier_trackingLowPU_cff import trackingLowPU +trackingLowPU.toModify(photonConvTrajSeedFromSingleLeg, primaryVerticesTag = "pixelVertices") +trackingPhase1PU70.toModify(photonConvTrajSeedFromSingleLeg, primaryVerticesTag = "pixelVertices") +trackingPhase2PU140.toModify(photonConvTrajSeedFromSingleLeg, primaryVerticesTag = "pixelVertices") # TRACKER DATA CONTROL @@ -401,10 +403,10 @@ convCkfTrajectoryBuilder = _convCkfTrajectoryBuilderBase.clone( estimator = cms.string('convStepChi2Est') ) -eras.trackingPhase1PU70.toReplaceWith(convCkfTrajectoryBuilder, _convCkfTrajectoryBuilderBase.clone( +trackingPhase1PU70.toReplaceWith(convCkfTrajectoryBuilder, _convCkfTrajectoryBuilderBase.clone( maxCand = 2, )) -eras.trackingPhase2PU140.toReplaceWith(convCkfTrajectoryBuilder, _convCkfTrajectoryBuilderBase.clone( +trackingPhase2PU140.toReplaceWith(convCkfTrajectoryBuilder, _convCkfTrajectoryBuilderBase.clone( maxCand = 2, )) @@ -415,7 +417,7 @@ clustersToSkip = cms.InputTag('convClusters'), TrajectoryBuilderPSet = cms.PSet(refToPSet_ = cms.string('convCkfTrajectoryBuilder')) ) -eras.trackingPhase2PU140.toModify(convTrackCandidates, +trackingPhase2PU140.toModify(convTrackCandidates, clustersToSkip = None, phase2clustersToSkip = cms.InputTag("convClusters") ) diff --git a/RecoTracker/ConversionSeedGenerators/python/PhotonConversionTrajectorySeedProducerFromSingleLeg_cfi.py b/RecoTracker/ConversionSeedGenerators/python/PhotonConversionTrajectorySeedProducerFromSingleLeg_cfi.py index 6935a807688f0..93ef9693313bf 100644 --- a/RecoTracker/ConversionSeedGenerators/python/PhotonConversionTrajectorySeedProducerFromSingleLeg_cfi.py +++ b/RecoTracker/ConversionSeedGenerators/python/PhotonConversionTrajectorySeedProducerFromSingleLeg_cfi.py @@ -1,5 +1,4 @@ import FWCore.ParameterSet.Config as cms -from Configuration.StandardSequences.Eras import eras photonConvTrajSeedFromSingleLeg = cms.EDProducer("PhotonConversionTrajectorySeedProducerFromSingleLeg", TrackRefitter = cms.InputTag('TrackRefitter',''), @@ -45,7 +44,8 @@ TTRHBuilder = cms.string('WithTrackAngle') ) ) -eras.trackingLowPU.toModify(photonConvTrajSeedFromSingleLeg, +from Configuration.Eras.Modifier_trackingLowPU_cff import trackingLowPU +trackingLowPU.toModify(photonConvTrajSeedFromSingleLeg, OrderedHitsFactoryPSet = dict(maxElement = 10000), ClusterCheckPSet = dict( MaxNumberOfCosmicClusters = 150000, @@ -53,7 +53,8 @@ cut = "strip < 150000 && pixel < 20000 && (strip < 20000 + 7* pixel)" ) ) -eras.trackingPhase1PU70.toModify(photonConvTrajSeedFromSingleLeg, +from Configuration.Eras.Modifier_trackingPhase1PU70_cff import trackingPhase1PU70 +trackingPhase1PU70.toModify(photonConvTrajSeedFromSingleLeg, ClusterCheckPSet = dict( MaxNumberOfCosmicClusters = 1000000, MaxNumberOfPixelClusters = 100000, @@ -62,7 +63,8 @@ OrderedHitsFactoryPSet = dict(maxElement = 100000), RegionFactoryPSet = dict(RegionPSet = dict(ptMin = 0.3)), ) -eras.trackingPhase2PU140.toModify(photonConvTrajSeedFromSingleLeg, +from Configuration.Eras.Modifier_trackingPhase2PU140_cff import trackingPhase2PU140 +trackingPhase2PU140.toModify(photonConvTrajSeedFromSingleLeg, ClusterCheckPSet = dict( MaxNumberOfCosmicClusters = 1000000, MaxNumberOfPixelClusters = 100000, diff --git a/RecoTracker/FinalTrackSelectors/python/MergeTrackCollections_cff.py b/RecoTracker/FinalTrackSelectors/python/MergeTrackCollections_cff.py index 0ff5daedf4e3f..6f39d4172f062 100644 --- a/RecoTracker/FinalTrackSelectors/python/MergeTrackCollections_cff.py +++ b/RecoTracker/FinalTrackSelectors/python/MergeTrackCollections_cff.py @@ -24,8 +24,8 @@ duplicateTrackClassifier.mva.maxLostLayers = [99,99,99] # This customization will be removed once we get the templates for # phase2 pixel -from Configuration.StandardSequences.Eras import eras -eras.phase2_tracker.toModify(duplicateTrackCandidates, ttrhBuilderName = "WithTrackAngle") # FIXME +from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker +phase2_tracker.toModify(duplicateTrackCandidates, ttrhBuilderName = "WithTrackAngle") # FIXME generalTracks = DuplicateListMerger.clone() generalTracks.originalSource = cms.InputTag("preDuplicateMergingGeneralTracks") diff --git a/RecoTracker/FinalTrackSelectors/python/TrackCutClassifier_cff.py b/RecoTracker/FinalTrackSelectors/python/TrackCutClassifier_cff.py index 9b4c73e77027f..f28d238e6c36d 100644 --- a/RecoTracker/FinalTrackSelectors/python/TrackCutClassifier_cff.py +++ b/RecoTracker/FinalTrackSelectors/python/TrackCutClassifier_cff.py @@ -1,11 +1,13 @@ -from Configuration.StandardSequences.Eras import eras from RecoTracker.FinalTrackSelectors.TrackCutClassifier_cfi import * -eras.trackingLowPU.toModify(TrackCutClassifier, +from Configuration.Eras.Modifier_trackingLowPU_cff import trackingLowPU +trackingLowPU.toModify(TrackCutClassifier, vertices = "pixelVertices" ) -eras.trackingPhase1PU70.toModify(TrackCutClassifier, +from Configuration.Eras.Modifier_trackingPhase1PU70_cff import trackingPhase1PU70 +trackingPhase1PU70.toModify(TrackCutClassifier, vertices = "pixelVertices" ) -eras.trackingPhase2PU140.toModify(TrackCutClassifier, +from Configuration.Eras.Modifier_trackingPhase2PU140_cff import trackingPhase2PU140 +trackingPhase2PU140.toModify(TrackCutClassifier, vertices = "pixelVertices" ) diff --git a/RecoTracker/FinalTrackSelectors/python/earlyGeneralTracks_cfi.py b/RecoTracker/FinalTrackSelectors/python/earlyGeneralTracks_cfi.py index 26f52839b0f78..8afe48789a570 100644 --- a/RecoTracker/FinalTrackSelectors/python/earlyGeneralTracks_cfi.py +++ b/RecoTracker/FinalTrackSelectors/python/earlyGeneralTracks_cfi.py @@ -1,5 +1,4 @@ import FWCore.ParameterSet.Config as cms -from Configuration.StandardSequences.Eras import eras from RecoTracker.FinalTrackSelectors.TrackCollectionMerger_cfi import * import RecoTracker.FinalTrackSelectors.trackListMerger_cfi @@ -22,7 +21,8 @@ "pixelLessStep", "tobTecStep" ] -eras.trackingLowPU.toModify(earlyGeneralTracks, +from Configuration.Eras.Modifier_trackingLowPU_cff import trackingLowPU +trackingLowPU.toModify(earlyGeneralTracks, trackProducers = [ 'initialStepTracks', 'lowPtTripletStepTracks', @@ -42,7 +42,8 @@ "tobTecStep" ] ) -eras.trackingPhase1.toModify( +from Configuration.Eras.Modifier_trackingPhase1_cff import trackingPhase1 +trackingPhase1.toModify( earlyGeneralTracks, trackProducers = [ 'initialStepTracks', @@ -72,7 +73,8 @@ # For Phase1PU70 from RecoTracker.FinalTrackSelectors.trackListMerger_cfi import trackListMerger as _trackListMerger -eras.trackingPhase1PU70.toReplaceWith(earlyGeneralTracks, _trackListMerger.clone( +from Configuration.Eras.Modifier_trackingPhase1PU70_cff import trackingPhase1PU70 +trackingPhase1PU70.toReplaceWith(earlyGeneralTracks, _trackListMerger.clone( TrackProducers = ['initialStepTracks', 'highPtTripletStepTracks', 'lowPtQuadStepTracks', @@ -96,7 +98,8 @@ makeReKeyedSeeds = cms.untracked.bool(False) )) # For Phase2PU140 -eras.trackingPhase2PU140.toReplaceWith(earlyGeneralTracks, _trackListMerger.clone( +from Configuration.Eras.Modifier_trackingPhase2PU140_cff import trackingPhase2PU140 +trackingPhase2PU140.toReplaceWith(earlyGeneralTracks, _trackListMerger.clone( TrackProducers =['initialStepTracks', 'highPtTripletStepTracks', 'lowPtQuadStepTracks', diff --git a/RecoTracker/FinalTrackSelectors/python/multiTrackSelector_cfi.py b/RecoTracker/FinalTrackSelectors/python/multiTrackSelector_cfi.py old mode 100755 new mode 100644 index 3668b24810a7b..3251602bf25f1 --- a/RecoTracker/FinalTrackSelectors/python/multiTrackSelector_cfi.py +++ b/RecoTracker/FinalTrackSelectors/python/multiTrackSelector_cfi.py @@ -1,5 +1,4 @@ import FWCore.ParameterSet.Config as cms -from Configuration.StandardSequences.Eras import eras looseMTS = cms.PSet( preFilterName=cms.string(''), @@ -90,12 +89,15 @@ tightMTS, highpurityMTS) ) -eras.trackingLowPU.toModify(multiTrackSelector, +from Configuration.Eras.Modifier_trackingLowPU_cff import trackingLowPU +trackingLowPU.toModify(multiTrackSelector, vertices = "pixelVertices" ) -eras.trackingPhase1PU70.toModify(multiTrackSelector, +from Configuration.Eras.Modifier_trackingPhase1PU70_cff import trackingPhase1PU70 +trackingPhase1PU70.toModify(multiTrackSelector, vertices = "pixelVertices" ) -eras.trackingPhase2PU140.toModify(multiTrackSelector, +from Configuration.Eras.Modifier_trackingPhase2PU140_cff import trackingPhase2PU140 +trackingPhase2PU140.toModify(multiTrackSelector, vertices = "pixelVertices" ) diff --git a/RecoTracker/FinalTrackSelectors/python/preDuplicateMergingGeneralTracks_cfi.py b/RecoTracker/FinalTrackSelectors/python/preDuplicateMergingGeneralTracks_cfi.py index c3be5abc23b94..5d9507edae608 100644 --- a/RecoTracker/FinalTrackSelectors/python/preDuplicateMergingGeneralTracks_cfi.py +++ b/RecoTracker/FinalTrackSelectors/python/preDuplicateMergingGeneralTracks_cfi.py @@ -1,5 +1,4 @@ import FWCore.ParameterSet.Config as cms -from Configuration.StandardSequences.Eras import eras from RecoTracker.FinalTrackSelectors.TrackCollectionMerger_cfi import * preDuplicateMergingGeneralTracks = TrackCollectionMerger.clone() @@ -20,7 +19,8 @@ # For Phase1PU70 from RecoTracker.FinalTrackSelectors.trackListMerger_cfi import trackListMerger as _trackListMerger -eras.trackingPhase1PU70.toReplaceWith(preDuplicateMergingGeneralTracks, _trackListMerger.clone( +from Configuration.Eras.Modifier_trackingPhase1PU70_cff import trackingPhase1PU70 +trackingPhase1PU70.toReplaceWith(preDuplicateMergingGeneralTracks, _trackListMerger.clone( TrackProducers = [ "earlyGeneralTracks", "muonSeededTracksInOut", @@ -45,7 +45,8 @@ )) # For Phase2PU140 -eras.trackingPhase2PU140.toReplaceWith(preDuplicateMergingGeneralTracks, _trackListMerger.clone( +from Configuration.Eras.Modifier_trackingPhase2PU140_cff import trackingPhase2PU140 +trackingPhase2PU140.toReplaceWith(preDuplicateMergingGeneralTracks, _trackListMerger.clone( TrackProducers = cms.VInputTag( cms.InputTag("earlyGeneralTracks"), cms.InputTag("muonSeededTracksInOut"), diff --git a/RecoTracker/IterativeTracking/python/DetachedQuadStep_cff.py b/RecoTracker/IterativeTracking/python/DetachedQuadStep_cff.py index 75793b09dde04..a69b007eb098f 100644 --- a/RecoTracker/IterativeTracking/python/DetachedQuadStep_cff.py +++ b/RecoTracker/IterativeTracking/python/DetachedQuadStep_cff.py @@ -1,5 +1,4 @@ import FWCore.ParameterSet.Config as cms -from Configuration.StandardSequences.Eras import eras import RecoTracker.IterativeTracking.iterativeTkConfig as _cfg ############################################### @@ -18,10 +17,12 @@ BPix = dict(skipClusters = cms.InputTag('detachedQuadStepClusters')), FPix = dict(skipClusters = cms.InputTag('detachedQuadStepClusters')) ) -eras.trackingPhase1.toModify(detachedQuadStepSeedLayers, +from Configuration.Eras.Modifier_trackingPhase1_cff import trackingPhase1 +trackingPhase1.toModify(detachedQuadStepSeedLayers, layerList = RecoPixelVertexing.PixelTriplets.quadrupletseedmerging_cff.PixelSeedMergerQuadruplets.layerList.value() ) -eras.trackingPhase2PU140.toModify(detachedQuadStepSeedLayers, +from Configuration.Eras.Modifier_trackingPhase2PU140_cff import trackingPhase2PU140 +trackingPhase2PU140.toModify(detachedQuadStepSeedLayers, layerList = RecoTracker.TkSeedingLayers.PixelLayerTriplets_cfi.PixelLayerTriplets.layerList.value() ) @@ -55,7 +56,7 @@ ClusterShapeCacheSrc = cms.InputTag('siPixelClusterShapeCache') ), ) -eras.trackingPhase1.toModify(detachedQuadStepSeeds, +trackingPhase1.toModify(detachedQuadStepSeeds, OrderedHitsFactoryPSet = cms.PSet( ComponentName = cms.string("CombinedHitQuadrupletGenerator"), GeneratorPSet = _PixelQuadrupletGenerator.clone( @@ -79,7 +80,8 @@ SeedingLayers = detachedQuadStepSeeds.OrderedHitsFactoryPSet.SeedingLayers, ), ) -eras.trackingPhase1PU70.toModify(detachedQuadStepSeeds, +from Configuration.Eras.Modifier_trackingPhase1PU70_cff import trackingPhase1PU70 +trackingPhase1PU70.toModify(detachedQuadStepSeeds, RegionFactoryPSet = dict( RegionPSet = _RegionPsetFomBeamSpotBlock.RegionPSet.clone( ptMin = 0.3, @@ -94,7 +96,7 @@ ttrhBuilderLabel = cms.string('PixelTTRHBuilderWithoutAngle') ) ) -eras.trackingPhase2PU140.toModify(detachedQuadStepSeeds, +trackingPhase2PU140.toModify(detachedQuadStepSeeds, RegionFactoryPSet = dict( RegionPSet = _RegionPsetFomBeamSpotBlock.RegionPSet.clone( ptMin = 0.45, @@ -123,13 +125,13 @@ maxCCCLostHits = 0, minGoodStripCharge = dict(refToPSet_ = 'SiStripClusterChargeCutLoose') ) -eras.trackingPhase1PU70.toReplaceWith(detachedQuadStepTrajectoryFilterBase, +trackingPhase1PU70.toReplaceWith(detachedQuadStepTrajectoryFilterBase, _detachedQuadStepTrajectoryFilterBase.clone( maxLostHitsFraction = 1./10., constantValueForLostHitsFractionFilter = 0.501, ) ) -eras.trackingPhase2PU140.toReplaceWith(detachedQuadStepTrajectoryFilterBase, +trackingPhase2PU140.toReplaceWith(detachedQuadStepTrajectoryFilterBase, _detachedQuadStepTrajectoryFilterBase.clone( maxLostHitsFraction = 1./10., constantValueForLostHitsFractionFilter = 0.301, @@ -138,10 +140,10 @@ detachedQuadStepTrajectoryFilter = _TrajectoryFilter_cff.CompositeTrajectoryFilter_block.clone( filters = [cms.PSet(refToPSet_ = cms.string('detachedQuadStepTrajectoryFilterBase'))] ) -eras.trackingPhase1PU70.toModify(detachedQuadStepTrajectoryFilter, +trackingPhase1PU70.toModify(detachedQuadStepTrajectoryFilter, filters = detachedQuadStepTrajectoryFilter.filters.value()+[cms.PSet(refToPSet_ = cms.string('ClusterShapeTrajectoryFilter'))] ) -eras.trackingPhase2PU140.toModify(detachedQuadStepTrajectoryFilter, +trackingPhase2PU140.toModify(detachedQuadStepTrajectoryFilter, filters = detachedQuadStepTrajectoryFilter.filters.value()+[cms.PSet(refToPSet_ = cms.string('ClusterShapeTrajectoryFilter'))] ) @@ -153,10 +155,10 @@ MaxChi2 = 9.0, clusterChargeCut = dict(refToPSet_ = 'SiStripClusterChargeCutTight'), ) -eras.trackingPhase1PU70.toModify(detachedQuadStepChi2Est, +trackingPhase1PU70.toModify(detachedQuadStepChi2Est, clusterChargeCut = dict(refToPSet_ = "SiStripClusterChargeCutNone") ) -eras.trackingPhase2PU140.toModify(detachedQuadStepChi2Est, +trackingPhase2PU140.toModify(detachedQuadStepChi2Est, MaxChi2 = 16.0, clusterChargeCut = dict(refToPSet_ = "SiStripClusterChargeCutNone") ) @@ -173,11 +175,11 @@ maxDPhiForLooperReconstruction = cms.double(2.0), maxPtForLooperReconstruction = cms.double(0.7) ) -eras.trackingPhase1PU70.toModify(detachedQuadStepTrajectoryBuilder, +trackingPhase1PU70.toModify(detachedQuadStepTrajectoryBuilder, maxCand = 2, alwaysUseInvalidHits = False, ) -eras.trackingPhase2PU140.toModify(detachedQuadStepTrajectoryBuilder, +trackingPhase2PU140.toModify(detachedQuadStepTrajectoryBuilder, maxCand = 2, alwaysUseInvalidHits = False, ) @@ -189,10 +191,10 @@ fractionShared = cms.double(0.13), allowSharedFirstHit = cms.bool(True) ) -eras.trackingPhase1PU70.toModify(detachedQuadStepTrajectoryCleanerBySharedHits, +trackingPhase1PU70.toModify(detachedQuadStepTrajectoryCleanerBySharedHits, fractionShared = 0.095 ) -eras.trackingPhase2PU140.toModify(detachedQuadStepTrajectoryCleanerBySharedHits, +trackingPhase2PU140.toModify(detachedQuadStepTrajectoryCleanerBySharedHits, fractionShared = 0.09 ) @@ -208,7 +210,7 @@ doSeedingRegionRebuilding = True, useHitsSplitting = True ) -eras.trackingPhase2PU140.toModify(detachedQuadStepTrackCandidates, +trackingPhase2PU140.toModify(detachedQuadStepTrackCandidates, clustersToSkip = None, phase2clustersToSkip = cms.InputTag("detachedQuadStepClusters") ) @@ -316,7 +318,7 @@ ] ) #end of clone -eras.trackingPhase2PU140.toModify(detachedQuadStepSelector, +trackingPhase2PU140.toModify(detachedQuadStepSelector, trackSelectors= cms.VPSet( RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.looseMTS.clone( name = 'detachedQuadStepVtxLoose', @@ -399,7 +401,7 @@ detachedQuadStep.inputClassifiers=['detachedQuadStepClassifier1','detachedQuadStepClassifier2'] import RecoTracker.FinalTrackSelectors.trackListMerger_cfi -eras.trackingPhase1PU70.toReplaceWith(detachedQuadStep, RecoTracker.FinalTrackSelectors.trackListMerger_cfi.trackListMerger.clone( +trackingPhase1PU70.toReplaceWith(detachedQuadStep, RecoTracker.FinalTrackSelectors.trackListMerger_cfi.trackListMerger.clone( TrackProducers = [ 'detachedQuadStepTracks', 'detachedQuadStepTracks', @@ -415,7 +417,7 @@ writeOnlyTrkQuals = True )) -eras.trackingPhase2PU140.toReplaceWith(detachedQuadStep, RecoTracker.FinalTrackSelectors.trackListMerger_cfi.trackListMerger.clone( +trackingPhase2PU140.toReplaceWith(detachedQuadStep, RecoTracker.FinalTrackSelectors.trackListMerger_cfi.trackListMerger.clone( TrackProducers = cms.VInputTag(cms.InputTag('detachedQuadStepTracks'), cms.InputTag('detachedQuadStepTracks')), hasSelector=cms.vint32(1,1), @@ -437,5 +439,5 @@ detachedQuadStep) _DetachedQuadStep_Phase1PU70 = DetachedQuadStep.copyAndExclude([detachedQuadStepClassifier1]) _DetachedQuadStep_Phase1PU70.replace(detachedQuadStepClassifier2, detachedQuadStepSelector) -eras.trackingPhase1PU70.toReplaceWith(DetachedQuadStep, _DetachedQuadStep_Phase1PU70) -eras.trackingPhase2PU140.toReplaceWith(DetachedQuadStep, _DetachedQuadStep_Phase1PU70) +trackingPhase1PU70.toReplaceWith(DetachedQuadStep, _DetachedQuadStep_Phase1PU70) +trackingPhase2PU140.toReplaceWith(DetachedQuadStep, _DetachedQuadStep_Phase1PU70) diff --git a/RecoTracker/IterativeTracking/python/DetachedTripletStep_cff.py b/RecoTracker/IterativeTracking/python/DetachedTripletStep_cff.py index b9b706c6d61d0..22bc4d4fbd0d1 100644 --- a/RecoTracker/IterativeTracking/python/DetachedTripletStep_cff.py +++ b/RecoTracker/IterativeTracking/python/DetachedTripletStep_cff.py @@ -1,5 +1,4 @@ import FWCore.ParameterSet.Config as cms -from Configuration.StandardSequences.Eras import eras from Configuration.Eras.Modifier_tracker_apv_vfp30_2016_cff import tracker_apv_vfp30_2016 as _tracker_apv_vfp30_2016 import RecoTracker.IterativeTracking.iterativeTkConfig as _cfg @@ -17,7 +16,8 @@ detachedTripletStepSeedLayers = RecoTracker.TkSeedingLayers.PixelLayerTriplets_cfi.PixelLayerTriplets.clone() detachedTripletStepSeedLayers.BPix.skipClusters = cms.InputTag('detachedTripletStepClusters') detachedTripletStepSeedLayers.FPix.skipClusters = cms.InputTag('detachedTripletStepClusters') -eras.trackingPhase1.toModify(detachedTripletStepSeedLayers, +from Configuration.Eras.Modifier_trackingPhase1_cff import trackingPhase1 +trackingPhase1.toModify(detachedTripletStepSeedLayers, layerList = [ 'BPix1+BPix2+BPix3', 'BPix2+BPix3+BPix4', @@ -69,8 +69,10 @@ maxCCCLostHits = 0, minGoodStripCharge = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutLoose')) ) +from Configuration.Eras.Modifier_tracker_apv_vfp30_2016_cff import tracker_apv_vfp30_2016 _tracker_apv_vfp30_2016.toModify(detachedTripletStepTrajectoryFilterBase, maxCCCLostHits = 2) -eras.trackingLowPU.toReplaceWith(detachedTripletStepTrajectoryFilterBase, _detachedTripletStepTrajectoryFilterBase.clone( +from Configuration.Eras.Modifier_trackingLowPU_cff import trackingLowPU +trackingLowPU.toReplaceWith(detachedTripletStepTrajectoryFilterBase, _detachedTripletStepTrajectoryFilterBase.clone( maxLostHitsFraction = 1./10., constantValueForLostHitsFractionFilter = 0.701, )) @@ -107,7 +109,7 @@ maxDPhiForLooperReconstruction = cms.double(2.0), maxPtForLooperReconstruction = cms.double(0.7) ) -eras.trackingLowPU.toModify(detachedTripletStepTrajectoryBuilder, +trackingLowPU.toModify(detachedTripletStepTrajectoryBuilder, maxCand = 2, alwaysUseInvalidHits = False, ) @@ -132,7 +134,7 @@ allowSharedFirstHit = cms.bool(True) ) detachedTripletStepTrackCandidates.TrajectoryCleaner = 'detachedTripletStepTrajectoryCleanerBySharedHits' -eras.trackingLowPU.toModify(detachedTripletStepTrajectoryCleanerBySharedHits, fractionShared = 0.19) +trackingLowPU.toModify(detachedTripletStepTrajectoryCleanerBySharedHits, fractionShared = 0.19) # TRACK FITTING @@ -244,7 +246,7 @@ ) #end of clone import RecoTracker.FinalTrackSelectors.trackListMerger_cfi -eras.trackingLowPU.toReplaceWith(detachedTripletStep, RecoTracker.FinalTrackSelectors.trackListMerger_cfi.trackListMerger.clone( +trackingLowPU.toReplaceWith(detachedTripletStep, RecoTracker.FinalTrackSelectors.trackListMerger_cfi.trackListMerger.clone( TrackProducers = [ 'detachedTripletStepTracks', 'detachedTripletStepTracks', @@ -267,4 +269,4 @@ detachedTripletStep) _DetachedTripletStep_LowPU = DetachedTripletStep.copyAndExclude([detachedTripletStepClassifier2]) _DetachedTripletStep_LowPU.replace(detachedTripletStepClassifier1, detachedTripletStepSelector) -eras.trackingLowPU.toReplaceWith(DetachedTripletStep, _DetachedTripletStep_LowPU) +trackingLowPU.toReplaceWith(DetachedTripletStep, _DetachedTripletStep_LowPU) diff --git a/RecoTracker/IterativeTracking/python/ElectronSeeds_cff.py b/RecoTracker/IterativeTracking/python/ElectronSeeds_cff.py index baf3618e8f1b0..423fce6ba0ccb 100644 --- a/RecoTracker/IterativeTracking/python/ElectronSeeds_cff.py +++ b/RecoTracker/IterativeTracking/python/ElectronSeeds_cff.py @@ -1,15 +1,16 @@ import FWCore.ParameterSet.Config as cms -from Configuration.StandardSequences.Eras import eras from RecoLocalTracker.SubCollectionProducers.SeedClusterRemover_cfi import seedClusterRemover initialStepSeedClusterMask = seedClusterRemover.clone( trajectories = cms.InputTag("initialStepSeeds"), oldClusterRemovalInfo = cms.InputTag("pixelLessStepClusters") ) -eras.trackingPhase1PU70.toModify(initialStepSeedClusterMask, oldClusterRemovalInfo = "highPtTripletStepClusters") +from Configuration.Eras.Modifier_trackingPhase1PU70_cff import trackingPhase1PU70 +trackingPhase1PU70.toModify(initialStepSeedClusterMask, oldClusterRemovalInfo = "highPtTripletStepClusters") from RecoLocalTracker.SubCollectionProducers.seedClusterRemoverPhase2_cfi import seedClusterRemoverPhase2 -eras.trackingPhase2PU140.toReplaceWith(initialStepSeedClusterMask, seedClusterRemoverPhase2.clone( +from Configuration.Eras.Modifier_trackingPhase2PU140_cff import trackingPhase2PU140 +trackingPhase2PU140.toReplaceWith(initialStepSeedClusterMask, seedClusterRemoverPhase2.clone( trajectories = cms.InputTag("initialStepSeeds"), oldClusterRemovalInfo = cms.InputTag("highPtTripletStepClusters") ) @@ -23,14 +24,14 @@ trajectories = cms.InputTag("pixelPairStepSeeds"), oldClusterRemovalInfo = cms.InputTag("initialStepSeedClusterMask") ) -eras.trackingPhase1PU70.toModify(pixelPairStepSeedClusterMask, oldClusterRemovalInfo = "highPtTripletStepSeedClusterMask") +trackingPhase1PU70.toModify(pixelPairStepSeedClusterMask, oldClusterRemovalInfo = "highPtTripletStepSeedClusterMask") -eras.trackingPhase2PU140.toReplaceWith(highPtTripletStepSeedClusterMask, seedClusterRemoverPhase2.clone( +trackingPhase2PU140.toReplaceWith(highPtTripletStepSeedClusterMask, seedClusterRemoverPhase2.clone( trajectories = cms.InputTag("highPtTripletStepSeeds"), oldClusterRemovalInfo = cms.InputTag("initialStepSeedClusterMask") ) ) -eras.trackingPhase2PU140.toReplaceWith(pixelPairStepSeedClusterMask, seedClusterRemoverPhase2.clone( +trackingPhase2PU140.toReplaceWith(pixelPairStepSeedClusterMask, seedClusterRemoverPhase2.clone( trajectories = cms.InputTag("pixelPairStepSeeds"), oldClusterRemovalInfo = cms.InputTag("highPtTripletStepSeedClusterMask") ) @@ -45,7 +46,8 @@ trajectories = cms.InputTag("mixedTripletStepSeeds"), oldClusterRemovalInfo = cms.InputTag("pixelPairStepSeedClusterMask") ) -eras.trackingPhase1.toModify(mixedTripletStepSeedClusterMask, +from Configuration.Eras.Modifier_trackingPhase1_cff import trackingPhase1 +trackingPhase1.toModify(mixedTripletStepSeedClusterMask, oldClusterRemovalInfo = "detachedTripletStepSeedClusterMask" ) pixelLessStepSeedClusterMask = seedClusterRemover.clone( @@ -81,13 +83,13 @@ 'BPix1+FPix2_pos+FPix3_pos', 'BPix1+FPix2_neg+FPix3_neg', 'BPix1+FPix1_pos+FPix3_pos', 'BPix1+FPix1_neg+FPix3_neg' ] -eras.trackingPhase1.toModify(tripletElectronSeedLayers, layerList = _layerListForPhase1) -eras.trackingPhase1PU70.toModify(tripletElectronSeedLayers, +trackingPhase1.toModify(tripletElectronSeedLayers, layerList = _layerListForPhase1) +trackingPhase1PU70.toModify(tripletElectronSeedLayers, layerList = _layerListForPhase1, BPix = dict(skipClusters = 'pixelPairStepSeedClusterMask'), FPix = dict(skipClusters = 'pixelPairStepSeedClusterMask') ) -eras.trackingPhase2PU140.toModify(tripletElectronSeedLayers, +trackingPhase2PU140.toModify(tripletElectronSeedLayers, layerList = _layerListForPhase1, BPix = dict(skipClusters = 'pixelPairStepSeedClusterMask'), FPix = dict(skipClusters = 'pixelPairStepSeedClusterMask') @@ -106,10 +108,10 @@ ) ) tripletElectronSeeds.OrderedHitsFactoryPSet.SeedingLayers = cms.InputTag('tripletElectronSeedLayers') -eras.trackingPhase1PU70.toModify(tripletElectronSeeds, +trackingPhase1PU70.toModify(tripletElectronSeeds, OrderedHitsFactoryPSet = dict(maxElement = cms.uint32(0)), # not sure if this has any effect ) -eras.trackingPhase2PU140.toModify(tripletElectronSeeds, +trackingPhase2PU140.toModify(tripletElectronSeeds, ClusterCheckPSet = dict( doClusterCheck = False ), OrderedHitsFactoryPSet = dict( GeneratorPSet = dict( maxElement = 0 )), SeedCreatorPSet = dict( magneticField = '', propagator = 'PropagatorWithMaterial') @@ -120,7 +122,7 @@ trajectories = cms.InputTag("tripletElectronSeeds"), oldClusterRemovalInfo = cms.InputTag("pixelLessStepSeedClusterMask") ) -eras.trackingPhase2PU140.toReplaceWith(tripletElectronClusterMask, seedClusterRemoverPhase2.clone( +trackingPhase2PU140.toReplaceWith(tripletElectronClusterMask, seedClusterRemoverPhase2.clone( trajectories = cms.InputTag("tripletElectronSeeds"), oldClusterRemovalInfo = cms.InputTag("pixelLessStepSeedClusterMask") ) @@ -143,7 +145,7 @@ skipClusters = cms.InputTag('tripletElectronClusterMask') ) ) -eras.trackingPhase1.toModify(pixelPairElectronSeedLayers, +trackingPhase1.toModify(pixelPairElectronSeedLayers, layerList = [ 'BPix1+BPix2', 'BPix1+BPix3', 'BPix1+BPix4', 'BPix2+BPix3', 'BPix2+BPix4', @@ -211,7 +213,7 @@ cms.InputTag('stripPairElectronSeeds') ) ) -eras.trackingPhase1.toModify(newCombinedSeeds, seedCollections = [ +trackingPhase1.toModify(newCombinedSeeds, seedCollections = [ 'initialStepSeeds', 'highPtTripletStepSeeds', 'mixedTripletStepSeeds', @@ -220,13 +222,13 @@ 'pixelPairElectronSeeds', 'stripPairElectronSeeds' ]) -eras.trackingPhase1PU70.toModify(newCombinedSeeds, seedCollections = [ +trackingPhase1PU70.toModify(newCombinedSeeds, seedCollections = [ 'initialStepSeeds', 'highPtTripletStepSeeds', 'pixelPairStepSeeds', 'tripletElectronSeeds' ]) -eras.trackingPhase2PU140.toModify(newCombinedSeeds, seedCollections = [ +trackingPhase2PU140.toModify(newCombinedSeeds, seedCollections = [ 'initialStepSeeds', 'highPtTripletStepSeeds', 'pixelPairStepSeeds', @@ -247,8 +249,8 @@ newCombinedSeeds) _electronSeedsSeq_Phase1 = electronSeedsSeq.copy() _electronSeedsSeq_Phase1.replace(pixelPairStepSeedClusterMask, detachedTripletStepSeedClusterMask) -eras.trackingPhase1.toReplaceWith(electronSeedsSeq, _electronSeedsSeq_Phase1) -eras.trackingPhase1PU70.toReplaceWith(electronSeedsSeq, cms.Sequence( +trackingPhase1.toReplaceWith(electronSeedsSeq, _electronSeedsSeq_Phase1) +trackingPhase1PU70.toReplaceWith(electronSeedsSeq, cms.Sequence( initialStepSeedClusterMask* highPtTripletStepSeedClusterMask* pixelPairStepSeedClusterMask* @@ -256,7 +258,7 @@ tripletElectronSeeds* newCombinedSeeds )) -eras.trackingPhase2PU140.toReplaceWith(electronSeedsSeq, cms.Sequence( +trackingPhase2PU140.toReplaceWith(electronSeedsSeq, cms.Sequence( initialStepSeedClusterMask* highPtTripletStepSeedClusterMask* pixelPairStepSeedClusterMask* diff --git a/RecoTracker/IterativeTracking/python/HighPtTripletStep_cff.py b/RecoTracker/IterativeTracking/python/HighPtTripletStep_cff.py index 1bb7400832aeb..b6ba1c6868516 100644 --- a/RecoTracker/IterativeTracking/python/HighPtTripletStep_cff.py +++ b/RecoTracker/IterativeTracking/python/HighPtTripletStep_cff.py @@ -1,5 +1,4 @@ import FWCore.ParameterSet.Config as cms -from Configuration.StandardSequences.Eras import eras import RecoTracker.IterativeTracking.iterativeTkConfig as _cfg ### high-pT triplets ### @@ -32,7 +31,8 @@ FPix = dict(skipClusters = cms.InputTag('highPtTripletStepClusters')) ) -eras.trackingPhase2PU140.toModify(highPtTripletStepSeedLayers, +from Configuration.Eras.Modifier_trackingPhase2PU140_cff import trackingPhase2PU140 +trackingPhase2PU140.toModify(highPtTripletStepSeedLayers, layerList = ['BPix1+BPix2+BPix3', 'BPix2+BPix3+BPix4', 'BPix1+BPix3+BPix4', 'BPix1+BPix2+BPix4', 'BPix2+BPix3+FPix1_pos', 'BPix2+BPix3+FPix1_neg', @@ -72,8 +72,9 @@ ) ) ) -eras.trackingPhase1PU70.toModify(highPtTripletStepSeeds, RegionFactoryPSet = dict(RegionPSet = dict(ptMin = 0.7))) -eras.trackingPhase2PU140.toModify(highPtTripletStepSeeds, +from Configuration.Eras.Modifier_trackingPhase1PU70_cff import trackingPhase1PU70 +trackingPhase1PU70.toModify(highPtTripletStepSeeds, RegionFactoryPSet = dict(RegionPSet = dict(ptMin = 0.7))) +trackingPhase2PU140.toModify(highPtTripletStepSeeds, ClusterCheckPSet = dict(doClusterCheck = False), RegionFactoryPSet = dict(RegionPSet = dict(ptMin = 0.9, originRadius = 0.03)), OrderedHitsFactoryPSet = dict( GeneratorPSet = dict(maxElement = 0 ) ), @@ -90,7 +91,7 @@ maxCCCLostHits = 0, minGoodStripCharge = dict(refToPSet_ = 'SiStripClusterChargeCutLoose') ) -eras.trackingPhase1PU70.toReplaceWith(highPtTripletStepTrajectoryFilterBase, _highPtTripletStepTrajectoryFilterBase) +trackingPhase1PU70.toReplaceWith(highPtTripletStepTrajectoryFilterBase, _highPtTripletStepTrajectoryFilterBase) highPtTripletStepTrajectoryFilter = _TrajectoryFilter_cff.CompositeTrajectoryFilter_block.clone( filters = [cms.PSet(refToPSet_ = cms.string('highPtTripletStepTrajectoryFilterBase'))] ) @@ -103,10 +104,10 @@ clusterChargeCut = dict(refToPSet_ = 'SiStripClusterChargeCutLoose'), pTChargeCutThreshold = 15. ) -eras.trackingPhase1PU70.toModify(highPtTripletStepChi2Est, +trackingPhase1PU70.toModify(highPtTripletStepChi2Est, clusterChargeCut = dict(refToPSet_ = "SiStripClusterChargeCutNone") ) -eras.trackingPhase2PU140.toModify(highPtTripletStepChi2Est, +trackingPhase2PU140.toModify(highPtTripletStepChi2Est, clusterChargeCut = dict(refToPSet_ = "SiStripClusterChargeCutNone"), MaxChi2 = cms.double(25.0) ) @@ -124,11 +125,11 @@ # of the outermost Tracker barrel layer (with B=3.8T) maxPtForLooperReconstruction = cms.double(0.7) ) -eras.trackingPhase1PU70.toModify(highPtTripletStepTrajectoryBuilder, +trackingPhase1PU70.toModify(highPtTripletStepTrajectoryBuilder, MeasurementTrackerName = '', maxCand = 4, ) -eras.trackingPhase2PU140.toModify(highPtTripletStepTrajectoryBuilder, +trackingPhase2PU140.toModify(highPtTripletStepTrajectoryBuilder, maxCand = 5, ) @@ -152,8 +153,8 @@ fractionShared = 0.16, allowSharedFirstHit = True ) -eras.trackingPhase1PU70.toModify(highPtTripletStepTrackCandidates, TrajectoryCleaner = 'highPtTripletStepTrajectoryCleanerBySharedHits') -eras.trackingPhase2PU140.toModify(highPtTripletStepTrackCandidates, +trackingPhase1PU70.toModify(highPtTripletStepTrackCandidates, TrajectoryCleaner = 'highPtTripletStepTrajectoryCleanerBySharedHits') +trackingPhase2PU140.toModify(highPtTripletStepTrackCandidates, TrajectoryCleaner = 'highPtTripletStepTrajectoryCleanerBySharedHits', clustersToSkip = None, phase2clustersToSkip = cms.InputTag("highPtTripletStepClusters") @@ -261,7 +262,7 @@ ] ) #end of clone -eras.trackingPhase2PU140.toModify(highPtTripletStepSelector, +trackingPhase2PU140.toModify(highPtTripletStepSelector, trackSelectors= cms.VPSet( RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.looseMTS.clone( name = 'highPtTripletStepLoose', @@ -315,5 +316,5 @@ highPtTripletStep) _HighPtTripletStep_Phase1PU70 = HighPtTripletStep.copy() _HighPtTripletStep_Phase1PU70.replace(highPtTripletStep, highPtTripletStepSelector) -eras.trackingPhase1PU70.toReplaceWith(HighPtTripletStep, _HighPtTripletStep_Phase1PU70) -eras.trackingPhase2PU140.toReplaceWith(HighPtTripletStep, _HighPtTripletStep_Phase1PU70) +trackingPhase1PU70.toReplaceWith(HighPtTripletStep, _HighPtTripletStep_Phase1PU70) +trackingPhase2PU140.toReplaceWith(HighPtTripletStep, _HighPtTripletStep_Phase1PU70) diff --git a/RecoTracker/IterativeTracking/python/InitialStepPreSplitting_cff.py b/RecoTracker/IterativeTracking/python/InitialStepPreSplitting_cff.py index 473eeb7aba2a2..eab1aa661d160 100644 --- a/RecoTracker/IterativeTracking/python/InitialStepPreSplitting_cff.py +++ b/RecoTracker/IterativeTracking/python/InitialStepPreSplitting_cff.py @@ -1,5 +1,4 @@ import FWCore.ParameterSet.Config as cms -from Configuration.StandardSequences.Eras import eras from Configuration.Eras.Modifier_tracker_apv_vfp30_2016_cff import tracker_apv_vfp30_2016 as _tracker_apv_vfp30_2016 ### STEP 0 ### @@ -14,7 +13,8 @@ initialStepSeedLayersPreSplitting = RecoTracker.TkSeedingLayers.PixelLayerTriplets_cfi.PixelLayerTriplets.clone() initialStepSeedLayersPreSplitting.FPix.HitProducer = 'siPixelRecHitsPreSplitting' initialStepSeedLayersPreSplitting.BPix.HitProducer = 'siPixelRecHitsPreSplitting' -eras.trackingPhase1.toModify(initialStepSeedLayersPreSplitting, +from Configuration.Eras.Modifier_trackingPhase1_cff import trackingPhase1 +trackingPhase1.toModify(initialStepSeedLayersPreSplitting, layerList = RecoPixelVertexing.PixelTriplets.quadrupletseedmerging_cff.PixelSeedMergerQuadruplets.layerList.value() ) @@ -39,7 +39,7 @@ initialStepSeedsPreSplitting.OrderedHitsFactoryPSet.GeneratorPSet.SeedComparitorPSet.clusterShapeCacheSrc = 'siPixelClusterShapeCachePreSplitting' initialStepSeedsPreSplitting.ClusterCheckPSet.PixelClusterCollectionLabel = 'siPixelClustersPreSplitting' -eras.trackingPhase1.toModify(initialStepSeedsPreSplitting, +trackingPhase1.toModify(initialStepSeedsPreSplitting, OrderedHitsFactoryPSet = cms.PSet( ComponentName = cms.string("CombinedHitQuadrupletGenerator"), GeneratorPSet = _PixelQuadrupletGenerator.clone( @@ -74,6 +74,7 @@ maxCCCLostHits = 0, minGoodStripCharge = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutLoose')) ) +from Configuration.Eras.Modifier_tracker_apv_vfp30_2016_cff import tracker_apv_vfp30_2016 _tracker_apv_vfp30_2016.toModify(initialStepTrajectoryFilterBasePreSplitting, maxCCCLostHits = 2) import RecoPixelVertexing.PixelLowPtUtilities.StripSubClusterShapeTrajectoryFilter_cfi initialStepTrajectoryFilterShapePreSplitting = RecoPixelVertexing.PixelLowPtUtilities.StripSubClusterShapeTrajectoryFilter_cfi.StripSubClusterShapeTrajectoryFilterTIX12.clone() @@ -193,15 +194,18 @@ # one place (within Reconstruction_cff) where siPixelClusters # module is defined. from RecoLocalTracker.SiPixelClusterizer.SiPixelClusterizer_cfi import siPixelClusters as _siPixelClusters -eras.trackingLowPU.toReplaceWith(siPixelClusters, _siPixelClusters) -eras.trackingPhase1PU70.toReplaceWith(siPixelClusters, _siPixelClusters) -eras.trackingPhase2PU140.toReplaceWith(siPixelClusters, _siPixelClusters) +from Configuration.Eras.Modifier_trackingLowPU_cff import trackingLowPU +trackingLowPU.toReplaceWith(siPixelClusters, _siPixelClusters) +from Configuration.Eras.Modifier_trackingPhase1PU70_cff import trackingPhase1PU70 +trackingPhase1PU70.toReplaceWith(siPixelClusters, _siPixelClusters) +from Configuration.Eras.Modifier_trackingPhase2PU140_cff import trackingPhase2PU140 +trackingPhase2PU140.toReplaceWith(siPixelClusters, _siPixelClusters) _InitialStepPreSplitting_LowPU_Phase1PU70 = cms.Sequence( siPixelClusters + siPixelRecHits + MeasurementTrackerEvent + siPixelClusterShapeCache ) -eras.trackingLowPU.toReplaceWith(InitialStepPreSplitting, _InitialStepPreSplitting_LowPU_Phase1PU70) -eras.trackingPhase1PU70.toReplaceWith(InitialStepPreSplitting, _InitialStepPreSplitting_LowPU_Phase1PU70) -eras.trackingPhase2PU140.toReplaceWith(InitialStepPreSplitting, _InitialStepPreSplitting_LowPU_Phase1PU70) +trackingLowPU.toReplaceWith(InitialStepPreSplitting, _InitialStepPreSplitting_LowPU_Phase1PU70) +trackingPhase1PU70.toReplaceWith(InitialStepPreSplitting, _InitialStepPreSplitting_LowPU_Phase1PU70) +trackingPhase2PU140.toReplaceWith(InitialStepPreSplitting, _InitialStepPreSplitting_LowPU_Phase1PU70) diff --git a/RecoTracker/IterativeTracking/python/InitialStep_cff.py b/RecoTracker/IterativeTracking/python/InitialStep_cff.py index bee53c2498ca5..6fbef95f4846c 100644 --- a/RecoTracker/IterativeTracking/python/InitialStep_cff.py +++ b/RecoTracker/IterativeTracking/python/InitialStep_cff.py @@ -1,5 +1,4 @@ import FWCore.ParameterSet.Config as cms -from Configuration.StandardSequences.Eras import eras from Configuration.Eras.Modifier_tracker_apv_vfp30_2016_cff import tracker_apv_vfp30_2016 as _tracker_apv_vfp30_2016 ### STEP 0 ### @@ -11,7 +10,8 @@ # SEEDING LAYERS import RecoTracker.TkSeedingLayers.PixelLayerTriplets_cfi initialStepSeedLayers = RecoTracker.TkSeedingLayers.PixelLayerTriplets_cfi.PixelLayerTriplets.clone() -eras.trackingPhase1.toModify(initialStepSeedLayers, +from Configuration.Eras.Modifier_trackingPhase1_cff import trackingPhase1 +trackingPhase1.toModify(initialStepSeedLayers, layerList = [ 'BPix1+BPix2+BPix3', 'BPix1+BPix2+FPix1_pos', @@ -46,11 +46,13 @@ mergeTriplets = cms.bool(True), ttrhBuilderLabel = cms.string('PixelTTRHBuilderWithoutAngle') ) -eras.trackingPhase1PU70.toModify(initialStepSeeds, +from Configuration.Eras.Modifier_trackingPhase1PU70_cff import trackingPhase1PU70 +trackingPhase1PU70.toModify(initialStepSeeds, RegionFactoryPSet = dict(RegionPSet = dict(ptMin = 0.7)), SeedMergerPSet = _SeedMergerPSet ) -eras.trackingPhase2PU140.toModify(initialStepSeeds, +from Configuration.Eras.Modifier_trackingPhase2PU140_cff import trackingPhase2PU140 +trackingPhase2PU140.toModify(initialStepSeeds, ClusterCheckPSet = dict(doClusterCheck = cms.bool(False)), OrderedHitsFactoryPSet = dict(GeneratorPSet = dict(maxElement = 0)), RegionFactoryPSet = dict(RegionPSet = dict(ptMin = 0.8)), @@ -59,7 +61,8 @@ ) -eras.trackingLowPU.toModify(initialStepSeeds, OrderedHitsFactoryPSet = dict(GeneratorPSet = dict(maxElement = 100000))) +from Configuration.Eras.Modifier_trackingLowPU_cff import trackingLowPU +trackingLowPU.toModify(initialStepSeeds, OrderedHitsFactoryPSet = dict(GeneratorPSet = dict(maxElement = 100000))) # building import TrackingTools.TrajectoryFiltering.TrajectoryFilter_cff @@ -71,6 +74,7 @@ maxCCCLostHits = 0, minGoodStripCharge = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutLoose')) ) +from Configuration.Eras.Modifier_tracker_apv_vfp30_2016_cff import tracker_apv_vfp30_2016 _tracker_apv_vfp30_2016.toModify(initialStepTrajectoryFilterBase, maxCCCLostHits = 2) initialStepTrajectoryFilterInOut = initialStepTrajectoryFilterBase.clone( minimumNumberOfHits = 4, @@ -78,8 +82,8 @@ strictSeedExtension = True, # don't allow inactive pixelSeedExtension = True, ) -eras.trackingLowPU.toReplaceWith(initialStepTrajectoryFilterBase, _initialStepTrajectoryFilterBase) -eras.trackingPhase1PU70.toReplaceWith(initialStepTrajectoryFilterBase, _initialStepTrajectoryFilterBase) +trackingLowPU.toReplaceWith(initialStepTrajectoryFilterBase, _initialStepTrajectoryFilterBase) +trackingPhase1PU70.toReplaceWith(initialStepTrajectoryFilterBase, _initialStepTrajectoryFilterBase) import RecoPixelVertexing.PixelLowPtUtilities.StripSubClusterShapeTrajectoryFilter_cfi initialStepTrajectoryFilterShape = RecoPixelVertexing.PixelLowPtUtilities.StripSubClusterShapeTrajectoryFilter_cfi.StripSubClusterShapeTrajectoryFilterTIX12.clone() @@ -91,7 +95,7 @@ ), ) -eras.trackingPhase2PU140.toReplaceWith(initialStepTrajectoryFilter, TrackingTools.TrajectoryFiltering.TrajectoryFilter_cff.CkfBaseTrajectoryFilter_block.clone( +trackingPhase2PU140.toReplaceWith(initialStepTrajectoryFilter, TrackingTools.TrajectoryFiltering.TrajectoryFilter_cff.CkfBaseTrajectoryFilter_block.clone( minimumNumberOfHits = 3, minPt = 0.2 ) @@ -107,10 +111,10 @@ _tracker_apv_vfp30_2016.toModify(initialStepChi2Est, clusterChargeCut = dict(refToPSet_ = "SiStripClusterChargeCutTiny") ) -eras.trackingPhase1PU70.toModify(initialStepChi2Est, +trackingPhase1PU70.toModify(initialStepChi2Est, clusterChargeCut = dict(refToPSet_ = 'SiStripClusterChargeCutNone'), ) -eras.trackingPhase2PU140.toModify(initialStepChi2Est, +trackingPhase2PU140.toModify(initialStepChi2Est, clusterChargeCut = dict(refToPSet_ = 'SiStripClusterChargeCutNone'), ) @@ -124,13 +128,13 @@ maxDPhiForLooperReconstruction = cms.double(2.0), maxPtForLooperReconstruction = cms.double(0.7) ) -eras.trackingLowPU.toModify(initialStepTrajectoryBuilder, maxCand = 5) -eras.trackingPhase1.toModify(initialStepTrajectoryBuilder, +trackingLowPU.toModify(initialStepTrajectoryBuilder, maxCand = 5) +trackingPhase1.toModify(initialStepTrajectoryBuilder, inOutTrajectoryFilter = dict(refToPSet_ = "initialStepTrajectoryFilterInOut"), useSameTrajFilter = False ) -eras.trackingPhase1PU70.toModify(initialStepTrajectoryBuilder, maxCand = 6) -eras.trackingPhase2PU140.toModify(initialStepTrajectoryBuilder, maxCand = 7, minNrOfHitsForRebuild = 1) +trackingPhase1PU70.toModify(initialStepTrajectoryBuilder, maxCand = 6) +trackingPhase2PU140.toModify(initialStepTrajectoryBuilder, maxCand = 7, minNrOfHitsForRebuild = 1) import RecoTracker.CkfPattern.CkfTrackCandidates_cfi initialStepTrackCandidates = RecoTracker.CkfPattern.CkfTrackCandidates_cfi.ckfTrackCandidates.clone( @@ -209,7 +213,7 @@ ), ] #end of vpset ) #end of clone -eras.trackingPhase1PU70.toModify(initialStepSelector, +trackingPhase1PU70.toModify(initialStepSelector, useAnyMVA = None, GBRForestLabel = None, trackSelectors = [ @@ -254,7 +258,7 @@ ] #end of vpset ) -eras.trackingPhase2PU140.toModify(initialStepSelector, +trackingPhase2PU140.toModify(initialStepSelector, useAnyMVA = None, GBRForestLabel = None, trackSelectors= cms.VPSet( @@ -312,8 +316,8 @@ initialStep) _InitialStep_LowPU = InitialStep.copyAndExclude([firstStepPrimaryVertices, initialStepClassifier1, initialStepClassifier2, initialStepClassifier3]) _InitialStep_LowPU.replace(initialStep, initialStepSelector) -eras.trackingLowPU.toReplaceWith(InitialStep, _InitialStep_LowPU) +trackingLowPU.toReplaceWith(InitialStep, _InitialStep_LowPU) _InitialStep_Phase1PU70 = InitialStep.copyAndExclude([firstStepPrimaryVertices, initialStepClassifier1, initialStepClassifier2, initialStepClassifier3]) _InitialStep_Phase1PU70.replace(initialStep, initialStepSelector) -eras.trackingPhase1PU70.toReplaceWith(InitialStep, _InitialStep_Phase1PU70) -eras.trackingPhase2PU140.toReplaceWith(InitialStep, _InitialStep_Phase1PU70) +trackingPhase1PU70.toReplaceWith(InitialStep, _InitialStep_Phase1PU70) +trackingPhase2PU140.toReplaceWith(InitialStep, _InitialStep_Phase1PU70) diff --git a/RecoTracker/IterativeTracking/python/JetCoreRegionalStep_cff.py b/RecoTracker/IterativeTracking/python/JetCoreRegionalStep_cff.py index 5d7f4bb309c5f..23d6861654592 100644 --- a/RecoTracker/IterativeTracking/python/JetCoreRegionalStep_cff.py +++ b/RecoTracker/IterativeTracking/python/JetCoreRegionalStep_cff.py @@ -1,5 +1,4 @@ import FWCore.ParameterSet.Config as cms -from Configuration.StandardSequences.Eras import eras # This step runs over all clusters @@ -48,7 +47,8 @@ #skipClusters = cms.InputTag('jetCoreRegionalStepClusters') ) ) -eras.trackingPhase1.toModify(jetCoreRegionalStepSeedLayers, +from Configuration.Eras.Modifier_trackingPhase1_cff import trackingPhase1 +trackingPhase1.toModify(jetCoreRegionalStepSeedLayers, layerList = [ 'BPix1+BPix2', 'BPix1+BPix3', 'BPix1+BPix4', 'BPix2+BPix3', 'BPix2+BPix4', diff --git a/RecoTracker/IterativeTracking/python/LowPtQuadStep_cff.py b/RecoTracker/IterativeTracking/python/LowPtQuadStep_cff.py index e185c4b384bb7..25396f0fe6443 100644 --- a/RecoTracker/IterativeTracking/python/LowPtQuadStep_cff.py +++ b/RecoTracker/IterativeTracking/python/LowPtQuadStep_cff.py @@ -1,5 +1,4 @@ import FWCore.ParameterSet.Config as cms -from Configuration.StandardSequences.Eras import eras import RecoTracker.IterativeTracking.iterativeTkConfig as _cfg # NEW CLUSTERS (remove previously used clusters) @@ -15,7 +14,8 @@ BPix = dict(skipClusters = cms.InputTag('lowPtQuadStepClusters')), FPix = dict(skipClusters = cms.InputTag('lowPtQuadStepClusters')) ) -eras.trackingPhase1.toModify(lowPtQuadStepSeedLayers, +from Configuration.Eras.Modifier_trackingPhase1_cff import trackingPhase1 +trackingPhase1.toModify(lowPtQuadStepSeedLayers, layerList = RecoPixelVertexing.PixelTriplets.quadrupletseedmerging_cff.PixelSeedMergerQuadruplets.layerList.value() ) @@ -42,7 +42,7 @@ ) ), ) -eras.trackingPhase1.toModify(lowPtQuadStepSeeds, +trackingPhase1.toModify(lowPtQuadStepSeeds, OrderedHitsFactoryPSet = cms.PSet( ComponentName = cms.string("CombinedHitQuadrupletGenerator"), GeneratorPSet = _PixelQuadrupletGenerator.clone( @@ -67,7 +67,8 @@ SeedingLayers = lowPtQuadStepSeeds.OrderedHitsFactoryPSet.SeedingLayers, ), ) -eras.trackingPhase1PU70.toModify(lowPtQuadStepSeeds, +from Configuration.Eras.Modifier_trackingPhase1PU70_cff import trackingPhase1PU70 +trackingPhase1PU70.toModify(lowPtQuadStepSeeds, SeedMergerPSet = cms.PSet( layerList = cms.PSet(refToPSet_ = cms.string("PixelSeedMergerQuadruplets")), addRemainingTriplets = cms.bool(False), @@ -75,7 +76,8 @@ ttrhBuilderLabel = cms.string('PixelTTRHBuilderWithoutAngle') ) ) -eras.trackingPhase2PU140.toModify(lowPtQuadStepSeeds, +from Configuration.Eras.Modifier_trackingPhase2PU140_cff import trackingPhase2PU140 +trackingPhase2PU140.toModify(lowPtQuadStepSeeds, ClusterCheckPSet = dict(doClusterCheck = False), RegionFactoryPSet = dict(RegionPSet = dict(ptMin = 0.35)), OrderedHitsFactoryPSet = dict( GeneratorPSet = dict(maxElement = 0 ) ), @@ -99,17 +101,17 @@ maxCCCLostHits = 0, minGoodStripCharge = dict(refToPSet_ = 'SiStripClusterChargeCutLoose') ) -eras.trackingPhase1PU70.toReplaceWith(lowPtQuadStepTrajectoryFilterBase, _lowPtQuadStepTrajectoryFilterBase) +trackingPhase1PU70.toReplaceWith(lowPtQuadStepTrajectoryFilterBase, _lowPtQuadStepTrajectoryFilterBase) from RecoPixelVertexing.PixelLowPtUtilities.ClusterShapeTrajectoryFilter_cfi import * # Composite filter lowPtQuadStepTrajectoryFilter = _TrajectoryFilter_cff.CompositeTrajectoryFilter_block.clone( filters = [cms.PSet(refToPSet_ = cms.string('lowPtQuadStepTrajectoryFilterBase'))] ) -eras.trackingPhase1PU70.toModify(lowPtQuadStepTrajectoryFilter, +trackingPhase1PU70.toModify(lowPtQuadStepTrajectoryFilter, filters = lowPtQuadStepTrajectoryFilter.filters.value() + [cms.PSet(refToPSet_ = cms.string('ClusterShapeTrajectoryFilter'))] ) -eras.trackingPhase2PU140.toModify(lowPtQuadStepTrajectoryFilter, +trackingPhase2PU140.toModify(lowPtQuadStepTrajectoryFilter, filters = lowPtQuadStepTrajectoryFilter.filters.value() + [cms.PSet(refToPSet_ = cms.string('ClusterShapeTrajectoryFilter'))] ) @@ -120,11 +122,11 @@ MaxChi2 = 9.0, clusterChargeCut = dict(refToPSet_ = ('SiStripClusterChargeCutTight')), ) -eras.trackingPhase1PU70.toModify(lowPtQuadStepChi2Est, +trackingPhase1PU70.toModify(lowPtQuadStepChi2Est, MaxChi2 = 25.0, clusterChargeCut = dict(refToPSet_ = 'SiStripClusterChargeCutNone') ) -eras.trackingPhase2PU140.toModify(lowPtQuadStepChi2Est, +trackingPhase2PU140.toModify(lowPtQuadStepChi2Est, MaxChi2 = 25.0, clusterChargeCut = dict(refToPSet_ = 'SiStripClusterChargeCutNone') ) @@ -141,7 +143,7 @@ # of the outermost Tracker barrel layer (with B=3.8T) maxPtForLooperReconstruction = cms.double(0.7) ) -eras.trackingPhase2PU140.toModify(lowPtQuadStepTrajectoryBuilder, maxCand = 5) +trackingPhase2PU140.toModify(lowPtQuadStepTrajectoryBuilder, maxCand = 5) # MAKING OF TRACK CANDIDATES from TrackingTools.TrajectoryCleaning.TrajectoryCleanerBySharedHits_cfi import trajectoryCleanerBySharedHits as _trajectoryCleanerBySharedHits @@ -150,8 +152,8 @@ fractionShared = 0.16, allowSharedFirstHit = True ) -eras.trackingPhase1PU70.toModify(lowPtQuadStepTrajectoryCleanerBySharedHits, fractionShared = 0.095) -eras.trackingPhase2PU140.toModify(lowPtQuadStepTrajectoryCleanerBySharedHits, fractionShared = 0.09) +trackingPhase1PU70.toModify(lowPtQuadStepTrajectoryCleanerBySharedHits, fractionShared = 0.095) +trackingPhase2PU140.toModify(lowPtQuadStepTrajectoryCleanerBySharedHits, fractionShared = 0.09) import RecoTracker.CkfPattern.CkfTrackCandidates_cfi lowPtQuadStepTrackCandidates = RecoTracker.CkfPattern.CkfTrackCandidates_cfi.ckfTrackCandidates.clone( @@ -165,7 +167,7 @@ doSeedingRegionRebuilding = True, useHitsSplitting = True ) -eras.trackingPhase2PU140.toModify(lowPtQuadStepTrackCandidates, +trackingPhase2PU140.toModify(lowPtQuadStepTrackCandidates, clustersToSkip = None, phase2clustersToSkip = cms.InputTag("lowPtQuadStepClusters") ) @@ -232,7 +234,7 @@ ] ) #end of clone -eras.trackingPhase2PU140.toModify(lowPtQuadStepSelector, +trackingPhase2PU140.toModify(lowPtQuadStepSelector, trackSelectors= cms.VPSet( RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.looseMTS.clone( name = 'lowPtQuadStepLoose', @@ -285,5 +287,5 @@ lowPtQuadStep) _LowPtQuadStep_Phase1PU70 = LowPtQuadStep.copy() _LowPtQuadStep_Phase1PU70.replace(lowPtQuadStep, lowPtQuadStepSelector) -eras.trackingPhase1PU70.toReplaceWith(LowPtQuadStep, _LowPtQuadStep_Phase1PU70) -eras.trackingPhase2PU140.toReplaceWith(LowPtQuadStep, _LowPtQuadStep_Phase1PU70) +trackingPhase1PU70.toReplaceWith(LowPtQuadStep, _LowPtQuadStep_Phase1PU70) +trackingPhase2PU140.toReplaceWith(LowPtQuadStep, _LowPtQuadStep_Phase1PU70) diff --git a/RecoTracker/IterativeTracking/python/LowPtTripletStep_cff.py b/RecoTracker/IterativeTracking/python/LowPtTripletStep_cff.py index d09edb6424755..923abaa007a33 100644 --- a/RecoTracker/IterativeTracking/python/LowPtTripletStep_cff.py +++ b/RecoTracker/IterativeTracking/python/LowPtTripletStep_cff.py @@ -1,5 +1,4 @@ import FWCore.ParameterSet.Config as cms -from Configuration.StandardSequences.Eras import eras from Configuration.Eras.Modifier_tracker_apv_vfp30_2016_cff import tracker_apv_vfp30_2016 as _tracker_apv_vfp30_2016 import RecoTracker.IterativeTracking.iterativeTkConfig as _cfg @@ -26,8 +25,10 @@ 'BPix1+FPix2_pos+FPix3_pos', 'BPix1+FPix2_neg+FPix3_neg', 'BPix1+FPix1_pos+FPix3_pos', 'BPix1+FPix1_neg+FPix3_neg' ] -eras.trackingPhase1.toModify(lowPtTripletStepSeedLayers, layerList = _layerListForPhase1) -eras.trackingPhase1PU70.toModify(lowPtTripletStepSeedLayers, layerList = _layerListForPhase1) +from Configuration.Eras.Modifier_trackingPhase1_cff import trackingPhase1 +trackingPhase1.toModify(lowPtTripletStepSeedLayers, layerList = _layerListForPhase1) +from Configuration.Eras.Modifier_trackingPhase1PU70_cff import trackingPhase1PU70 +trackingPhase1PU70.toModify(lowPtTripletStepSeedLayers, layerList = _layerListForPhase1) _layerListForPhase2 = ['BPix1+BPix2+BPix3', 'BPix2+BPix3+BPix4', 'BPix1+BPix3+BPix4', 'BPix1+BPix2+BPix4', @@ -42,7 +43,8 @@ 'FPix5_pos+FPix6_pos+FPix7_pos', 'FPix5_neg+FPix6_neg+FPix7_neg', 'FPix6_pos+FPix7_pos+FPix8_pos', 'FPix6_neg+FPix7_neg+FPix8_neg' ] -eras.trackingPhase2PU140.toModify(lowPtTripletStepSeedLayers, layerList = _layerListForPhase2) +from Configuration.Eras.Modifier_trackingPhase2PU140_cff import trackingPhase2PU140 +trackingPhase2PU140.toModify(lowPtTripletStepSeedLayers, layerList = _layerListForPhase2) # SEEDS import RecoTracker.TkSeedGenerator.GlobalSeedsFromTriplets_cff @@ -58,10 +60,10 @@ ) ) lowPtTripletStepSeeds.OrderedHitsFactoryPSet.SeedingLayers = 'lowPtTripletStepSeedLayers' -eras.trackingPhase1.toModify(lowPtTripletStepSeeds, # FIXME: Phase1PU70 value, let's see if we can lower it to Run2 value (0.2) +trackingPhase1.toModify(lowPtTripletStepSeeds, # FIXME: Phase1PU70 value, let's see if we can lower it to Run2 value (0.2) RegionFactoryPSet = dict(RegionPSet = dict(ptMin = 0.35)), ) -eras.trackingPhase1PU70.toModify(lowPtTripletStepSeeds, +trackingPhase1PU70.toModify(lowPtTripletStepSeeds, RegionFactoryPSet = dict( RegionPSet = dict( ptMin = 0.35, @@ -69,7 +71,7 @@ ) ), ) -eras.trackingPhase2PU140.toModify(lowPtTripletStepSeeds, +trackingPhase2PU140.toModify(lowPtTripletStepSeeds, ClusterCheckPSet = dict(doClusterCheck = False), RegionFactoryPSet = dict(RegionPSet = dict(ptMin = 0.45)), OrderedHitsFactoryPSet = dict( GeneratorPSet = dict(maxElement = 0 ) ), @@ -91,10 +93,12 @@ maxCCCLostHits = 0, minGoodStripCharge = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutLoose')) ) +from Configuration.Eras.Modifier_tracker_apv_vfp30_2016_cff import tracker_apv_vfp30_2016 _tracker_apv_vfp30_2016.toModify(lowPtTripletStepStandardTrajectoryFilter, maxCCCLostHits = 1) -eras.trackingLowPU.toReplaceWith(lowPtTripletStepStandardTrajectoryFilter, _lowPtTripletStepStandardTrajectoryFilterBase) -eras.trackingPhase1PU70.toReplaceWith(lowPtTripletStepStandardTrajectoryFilter, _lowPtTripletStepStandardTrajectoryFilterBase) -eras.trackingPhase2PU140.toReplaceWith(lowPtTripletStepStandardTrajectoryFilter, _lowPtTripletStepStandardTrajectoryFilterBase) +from Configuration.Eras.Modifier_trackingLowPU_cff import trackingLowPU +trackingLowPU.toReplaceWith(lowPtTripletStepStandardTrajectoryFilter, _lowPtTripletStepStandardTrajectoryFilterBase) +trackingPhase1PU70.toReplaceWith(lowPtTripletStepStandardTrajectoryFilter, _lowPtTripletStepStandardTrajectoryFilterBase) +trackingPhase2PU140.toReplaceWith(lowPtTripletStepStandardTrajectoryFilter, _lowPtTripletStepStandardTrajectoryFilterBase) from RecoPixelVertexing.PixelLowPtUtilities.ClusterShapeTrajectoryFilter_cfi import * # Composite filter @@ -103,10 +107,10 @@ # cms.PSet(refToPSet_ = cms.string('ClusterShapeTrajectoryFilter')) ] ) -eras.trackingPhase1PU70.toModify(lowPtTripletStepTrajectoryFilter, +trackingPhase1PU70.toModify(lowPtTripletStepTrajectoryFilter, filters = lowPtTripletStepTrajectoryFilter.filters + [cms.PSet(refToPSet_ = cms.string('ClusterShapeTrajectoryFilter'))] ) -eras.trackingPhase2PU140.toModify(lowPtTripletStepTrajectoryFilter, +trackingPhase2PU140.toModify(lowPtTripletStepTrajectoryFilter, filters = lowPtTripletStepTrajectoryFilter.filters + [cms.PSet(refToPSet_ = cms.string('ClusterShapeTrajectoryFilter'))] ) @@ -120,7 +124,7 @@ _tracker_apv_vfp30_2016.toModify(lowPtTripletStepChi2Est, clusterChargeCut = dict(refToPSet_ = "SiStripClusterChargeCutTiny") ) -eras.trackingPhase1PU70.toModify(lowPtTripletStepChi2Est, +trackingPhase1PU70.toModify(lowPtTripletStepChi2Est, clusterChargeCut = dict(refToPSet_ = 'SiStripClusterChargeCutNone'), ) @@ -136,8 +140,8 @@ # of the outermost Tracker barrel layer (with B=3.8T) maxPtForLooperReconstruction = cms.double(0.7) ) -eras.trackingLowPU.toModify(lowPtTripletStepTrajectoryBuilder, maxCand = 3) -eras.trackingPhase2PU140.toModify(lowPtTripletStepTrajectoryBuilder, maxCand = 3) +trackingLowPU.toModify(lowPtTripletStepTrajectoryBuilder, maxCand = 3) +trackingPhase2PU140.toModify(lowPtTripletStepTrajectoryBuilder, maxCand = 3) # MAKING OF TRACK CANDIDATES import RecoTracker.CkfPattern.CkfTrackCandidates_cfi @@ -152,7 +156,7 @@ doSeedingRegionRebuilding = True, useHitsSplitting = True ) -eras.trackingPhase2PU140.toModify(lowPtTripletStepTrackCandidates, +trackingPhase2PU140.toModify(lowPtTripletStepTrackCandidates, clustersToSkip = None, phase2clustersToSkip = cms.InputTag("lowPtTripletStepClusters") ) @@ -172,9 +176,9 @@ allowSharedFirstHit = cms.bool(True) ) lowPtTripletStepTrackCandidates.TrajectoryCleaner = 'lowPtTripletStepTrajectoryCleanerBySharedHits' -eras.trackingLowPU.toModify(lowPtTripletStepTrajectoryCleanerBySharedHits, fractionShared = 0.19) -eras.trackingPhase1PU70.toModify(lowPtTripletStepTrajectoryCleanerBySharedHits, fractionShared = 0.09) -eras.trackingPhase2PU140.toModify(lowPtTripletStepTrajectoryCleanerBySharedHits, fractionShared = 0.09) +trackingLowPU.toModify(lowPtTripletStepTrajectoryCleanerBySharedHits, fractionShared = 0.19) +trackingPhase1PU70.toModify(lowPtTripletStepTrajectoryCleanerBySharedHits, fractionShared = 0.09) +trackingPhase2PU140.toModify(lowPtTripletStepTrajectoryCleanerBySharedHits, fractionShared = 0.09) # Final selection @@ -189,7 +193,7 @@ # For Phase1 # MVA selection to be enabled after re-training, for time being we go with cut-based selector from RecoTracker.FinalTrackSelectors.TrackCutClassifier_cfi import TrackCutClassifier as _TrackCutClassifier -eras.trackingPhase1.toReplaceWith(lowPtTripletStep, _TrackCutClassifier.clone( +trackingPhase1.toReplaceWith(lowPtTripletStep, _TrackCutClassifier.clone( src = "lowPtTripletStepTracks", vertices = "firstStepPrimaryVertices", mva = dict ( @@ -233,7 +237,7 @@ ), ] #end of vpset ) #end of clone -eras.trackingPhase1PU70.toModify(lowPtTripletStepSelector, +trackingPhase1PU70.toModify(lowPtTripletStepSelector, useAnyMVA = None, GBRForestLabel = None, trackSelectors = [ @@ -278,7 +282,7 @@ ] #end of vpset ) #end of clone -eras.trackingPhase2PU140.toModify(lowPtTripletStepSelector, +trackingPhase2PU140.toModify(lowPtTripletStepSelector, useAnyMVA = None, GBRForestLabel = None, trackSelectors= cms.VPSet( @@ -335,8 +339,8 @@ lowPtTripletStep) _LowPtTripletStep_LowPU = LowPtTripletStep.copy() _LowPtTripletStep_LowPU.replace(lowPtTripletStep, lowPtTripletStepSelector) -eras.trackingLowPU.toReplaceWith(LowPtTripletStep, _LowPtTripletStep_LowPU) +trackingLowPU.toReplaceWith(LowPtTripletStep, _LowPtTripletStep_LowPU) _LowPtTripletStep_Phase1PU70 = LowPtTripletStep.copy() _LowPtTripletStep_Phase1PU70.replace(lowPtTripletStep, lowPtTripletStepSelector) -eras.trackingPhase1PU70.toReplaceWith(LowPtTripletStep, _LowPtTripletStep_Phase1PU70) -eras.trackingPhase2PU140.toReplaceWith(LowPtTripletStep, _LowPtTripletStep_Phase1PU70) +trackingPhase1PU70.toReplaceWith(LowPtTripletStep, _LowPtTripletStep_Phase1PU70) +trackingPhase2PU140.toReplaceWith(LowPtTripletStep, _LowPtTripletStep_Phase1PU70) diff --git a/RecoTracker/IterativeTracking/python/MixedTripletStep_cff.py b/RecoTracker/IterativeTracking/python/MixedTripletStep_cff.py index b57c27d0a3377..b6f46cf72ce32 100644 --- a/RecoTracker/IterativeTracking/python/MixedTripletStep_cff.py +++ b/RecoTracker/IterativeTracking/python/MixedTripletStep_cff.py @@ -1,5 +1,4 @@ import FWCore.ParameterSet.Config as cms -from Configuration.StandardSequences.Eras import eras import RecoTracker.IterativeTracking.iterativeTkConfig as _cfg ############################################################### @@ -19,8 +18,9 @@ mixedTripletStepClusters.oldClusterRemovalInfo = "chargeCut2069Clusters" for era in _cfg.nonDefaultEras(): getattr(eras, era).toReplaceWith(mixedTripletStepClusters, _cfg.clusterRemoverForIter("MixedTripletStep", era)) -eras.trackingPhase1.toModify(chargeCut2069Clusters, oldClusterRemovalInfo = mixedTripletStepClusters.oldClusterRemovalInfo.value()) -eras.trackingPhase1.toModify(mixedTripletStepClusters, oldClusterRemovalInfo="chargeCut2069Clusters") +from Configuration.Eras.Modifier_trackingPhase1_cff import trackingPhase1 +trackingPhase1.toModify(chargeCut2069Clusters, oldClusterRemovalInfo = mixedTripletStepClusters.oldClusterRemovalInfo.value()) +trackingPhase1.toModify(mixedTripletStepClusters, oldClusterRemovalInfo="chargeCut2069Clusters") # SEEDING LAYERS from RecoLocalTracker.SiStripClusterizer.SiStripClusterChargeCut_cfi import * @@ -50,7 +50,8 @@ skipClusters = cms.InputTag('mixedTripletStepClusters') ) ) -eras.trackingLowPU.toModify(mixedTripletStepSeedLayersA, +from Configuration.Eras.Modifier_trackingLowPU_cff import trackingLowPU +trackingLowPU.toModify(mixedTripletStepSeedLayersA, layerList = [ 'BPix1+BPix2+BPix3', 'BPix1+BPix2+FPix1_pos', 'BPix1+BPix2+FPix1_neg', @@ -61,7 +62,8 @@ ], TEC = dict(clusterChargeCut = dict(refToPSet_ = 'SiStripClusterChargeCutTiny')), ) -eras.trackingPhase1PU70.toModify(mixedTripletStepSeedLayersA, +from Configuration.Eras.Modifier_trackingPhase1PU70_cff import trackingPhase1PU70 +trackingPhase1PU70.toModify(mixedTripletStepSeedLayersA, layerList = [ 'BPix1+BPix2+FPix1_pos', 'BPix1+BPix2+FPix1_neg', 'BPix1+FPix1_pos+FPix2_pos', 'BPix1+FPix1_neg+FPix2_neg', @@ -104,11 +106,11 @@ ClusterShapeHitFilterName = cms.string('mixedTripletStepClusterShapeHitFilter'), ClusterShapeCacheSrc = cms.InputTag('siPixelClusterShapeCache') ) -eras.trackingLowPU.toModify(mixedTripletStepSeedsA, +trackingLowPU.toModify(mixedTripletStepSeedsA, RegionFactoryPSet = dict(RegionPSet = dict(originHalfLength = 10.0)), SeedComparitorPSet = dict(ClusterShapeHitFilterName = 'ClusterShapeHitFilter') ) -eras.trackingPhase1PU70.toModify( +trackingPhase1PU70.toModify( mixedTripletStepSeedsA, RegionFactoryPSet = dict(RegionPSet = dict(ptMin = 0.7)), SeedComparitorPSet = dict(ClusterShapeHitFilterName = 'ClusterShapeHitFilter'), @@ -128,12 +130,12 @@ skipClusters = cms.InputTag('mixedTripletStepClusters') ) ) -eras.trackingLowPU.toModify(mixedTripletStepSeedLayersB, +trackingLowPU.toModify(mixedTripletStepSeedLayersB, layerList = ['BPix2+BPix3+TIB1', 'BPix2+BPix3+TIB2'], TIB = dict(clusterChargeCut = dict(refToPSet_ = 'SiStripClusterChargeCutTiny')), ) -eras.trackingPhase1.toModify(mixedTripletStepSeedLayersB, layerList = ['BPix3+BPix4+TIB1']) -eras.trackingPhase1PU70.toModify(mixedTripletStepSeedLayersB, +trackingPhase1.toModify(mixedTripletStepSeedLayersB, layerList = ['BPix3+BPix4+TIB1']) +trackingPhase1PU70.toModify(mixedTripletStepSeedLayersB, layerList = [ 'BPix1+BPix2+BPix3', 'BPix2+BPix3+BPix4','BPix1+BPix2+BPix4', 'BPix1+BPix3+BPix4' ], @@ -161,8 +163,8 @@ ClusterShapeHitFilterName = cms.string('mixedTripletStepClusterShapeHitFilter'), ClusterShapeCacheSrc = cms.InputTag('siPixelClusterShapeCache') ) -eras.trackingLowPU.toModify(mixedTripletStepSeedsB, SeedComparitorPSet = dict(ClusterShapeHitFilterName = 'ClusterShapeHitFilter')) -eras.trackingPhase1PU70.toModify( +trackingLowPU.toModify(mixedTripletStepSeedsB, SeedComparitorPSet = dict(ClusterShapeHitFilterName = 'ClusterShapeHitFilter')) +trackingPhase1PU70.toModify( mixedTripletStepSeedsB, RegionFactoryPSet = dict( RegionPSet = dict( @@ -192,10 +194,10 @@ mixedTripletStepTrajectoryFilter = _mixedTripletStepTrajectoryFilterBase.clone( constantValueForLostHitsFractionFilter = 1.4, ) -eras.trackingLowPU.toReplaceWith(mixedTripletStepTrajectoryFilter, _mixedTripletStepTrajectoryFilterBase.clone( +trackingLowPU.toReplaceWith(mixedTripletStepTrajectoryFilter, _mixedTripletStepTrajectoryFilterBase.clone( maxLostHits = 0, )) -eras.trackingPhase1PU70.toReplaceWith(mixedTripletStepTrajectoryFilter, _mixedTripletStepTrajectoryFilterBase.clone( +trackingPhase1PU70.toReplaceWith(mixedTripletStepTrajectoryFilter, _mixedTripletStepTrajectoryFilterBase.clone( maxLostHits = 0, )) @@ -222,10 +224,10 @@ MaxChi2 = cms.double(16.0), clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutTight')) ) -eras.trackingLowPU.toModify(mixedTripletStepChi2Est, +trackingLowPU.toModify(mixedTripletStepChi2Est, clusterChargeCut = dict(refToPSet_ = 'SiStripClusterChargeCutTiny') ) -eras.trackingPhase1PU70.toModify(mixedTripletStepChi2Est, +trackingPhase1PU70.toModify(mixedTripletStepChi2Est, clusterChargeCut = dict(refToPSet_ = 'SiStripClusterChargeCutNone'), ) @@ -264,8 +266,8 @@ allowSharedFirstHit = cms.bool(True) ) mixedTripletStepTrackCandidates.TrajectoryCleaner = 'mixedTripletStepTrajectoryCleanerBySharedHits' -eras.trackingLowPU.toModify(mixedTripletStepTrajectoryCleanerBySharedHits, fractionShared = 0.19) -eras.trackingPhase1PU70.toModify(mixedTripletStepTrajectoryCleanerBySharedHits, fractionShared = 0.095) +trackingLowPU.toModify(mixedTripletStepTrajectoryCleanerBySharedHits, fractionShared = 0.19) +trackingPhase1PU70.toModify(mixedTripletStepTrajectoryCleanerBySharedHits, fractionShared = 0.095) # TRACK FITTING @@ -378,7 +380,7 @@ ) ] #end of vpset ) #end of clone -eras.trackingPhase1PU70.toModify(mixedTripletStepSelector, +trackingPhase1PU70.toModify(mixedTripletStepSelector, useAnyMVA = None, GBRForestLabel = None, trackSelectors = [ @@ -474,8 +476,8 @@ setsToMerge = [cms.PSet( tLists=cms.vint32(0,1), pQual=cms.bool(True) )], writeOnlyTrkQuals = True ) -eras.trackingLowPU.toReplaceWith(mixedTripletStep, _trackListMergerBase) -eras.trackingPhase1PU70.toReplaceWith(mixedTripletStep, _trackListMergerBase.clone( +trackingLowPU.toReplaceWith(mixedTripletStep, _trackListMergerBase) +trackingPhase1PU70.toReplaceWith(mixedTripletStep, _trackListMergerBase.clone( shareFrac = cms.double(0.095), indivShareFrac = [0.095,0.095], )) @@ -494,5 +496,5 @@ mixedTripletStep) _MixedTripletStep_LowPU_Phase1PU70 = MixedTripletStep.copyAndExclude([chargeCut2069Clusters, mixedTripletStepClassifier1]) _MixedTripletStep_LowPU_Phase1PU70.replace(mixedTripletStepClassifier2, mixedTripletStepSelector) -eras.trackingLowPU.toReplaceWith(MixedTripletStep, _MixedTripletStep_LowPU_Phase1PU70) -eras.trackingPhase1PU70.toReplaceWith(MixedTripletStep, _MixedTripletStep_LowPU_Phase1PU70) +trackingLowPU.toReplaceWith(MixedTripletStep, _MixedTripletStep_LowPU_Phase1PU70) +trackingPhase1PU70.toReplaceWith(MixedTripletStep, _MixedTripletStep_LowPU_Phase1PU70) diff --git a/RecoTracker/IterativeTracking/python/MuonSeededStep_cff.py b/RecoTracker/IterativeTracking/python/MuonSeededStep_cff.py index 17dacab432491..cb562a9bd14a4 100644 --- a/RecoTracker/IterativeTracking/python/MuonSeededStep_cff.py +++ b/RecoTracker/IterativeTracking/python/MuonSeededStep_cff.py @@ -1,5 +1,4 @@ import FWCore.ParameterSet.Config as cms -from Configuration.StandardSequences.Eras import eras ###### Muon reconstruction module ##### from RecoMuon.MuonIdentification.earlyMuons_cfi import earlyMuons @@ -39,10 +38,12 @@ muonSeededMeasurementEstimatorForInOut = _muonSeededMeasurementEstimatorForInOutBase.clone( MaxSagitta = cms.double(-1.) ) -eras.trackingPhase1PU70.toReplaceWith(muonSeededMeasurementEstimatorForInOut, _muonSeededMeasurementEstimatorForInOutBase.clone( +from Configuration.Eras.Modifier_trackingPhase1PU70_cff import trackingPhase1PU70 +trackingPhase1PU70.toReplaceWith(muonSeededMeasurementEstimatorForInOut, _muonSeededMeasurementEstimatorForInOutBase.clone( MaxChi2 = 400 )) -eras.trackingPhase2PU140.toModify(muonSeededMeasurementEstimatorForInOut, MaxChi2 = 400.0, MaxSagitta = 2) +from Configuration.Eras.Modifier_trackingPhase2PU140_cff import trackingPhase2PU140 +trackingPhase2PU140.toModify(muonSeededMeasurementEstimatorForInOut, MaxChi2 = 400.0, MaxSagitta = 2) _muonSeededMeasurementEstimatorForOutInBase = _Chi2MeasurementEstimator.clone( ComponentName = cms.string('muonSeededMeasurementEstimatorForOutIn'), @@ -52,7 +53,7 @@ muonSeededMeasurementEstimatorForOutIn = _muonSeededMeasurementEstimatorForOutInBase.clone( MaxSagitta = cms.double(-1.) ) -eras.trackingPhase1PU70.toReplaceWith(muonSeededMeasurementEstimatorForOutIn, _muonSeededMeasurementEstimatorForOutInBase) +trackingPhase1PU70.toReplaceWith(muonSeededMeasurementEstimatorForOutIn, _muonSeededMeasurementEstimatorForOutInBase) ###------------- TrajectoryFilter, defining selections on the trajectories while building them ---------------- import TrackingTools.TrajectoryFiltering.TrajectoryFilter_cff @@ -236,25 +237,25 @@ muonSeededSeedsOutIn + muonSeededTrackCandidatesOutIn + muonSeededTracksOutIn ) #Phase2 : just muon Seed InOut is used in this moment -eras.trackingPhase2PU140.toReplaceWith(muonSeededStepCore, muonSeededStepCoreInOut) +trackingPhase2PU140.toReplaceWith(muonSeededStepCore, muonSeededStepCoreInOut) muonSeededStepExtraInOut = cms.Sequence( muonSeededTracksInOutClassifier ) -eras.trackingPhase1PU70.toReplaceWith(muonSeededStepExtraInOut, cms.Sequence( +trackingPhase1PU70.toReplaceWith(muonSeededStepExtraInOut, cms.Sequence( muonSeededTracksInOutSelector )) -eras.trackingPhase2PU140.toReplaceWith(muonSeededStepExtraInOut, cms.Sequence( +trackingPhase2PU140.toReplaceWith(muonSeededStepExtraInOut, cms.Sequence( muonSeededTracksInOutSelector )) muonSeededStepExtra = cms.Sequence( muonSeededStepExtraInOut + muonSeededTracksOutInClassifier ) -eras.trackingPhase1PU70.toReplaceWith(muonSeededStepExtra, cms.Sequence( +trackingPhase1PU70.toReplaceWith(muonSeededStepExtra, cms.Sequence( muonSeededStepExtraInOut + muonSeededTracksOutInSelector )) -eras.trackingPhase2PU140.toReplaceWith(muonSeededStepExtra, cms.Sequence( +trackingPhase2PU140.toReplaceWith(muonSeededStepExtra, cms.Sequence( muonSeededStepExtraInOut )) diff --git a/RecoTracker/IterativeTracking/python/PixelLessStep_cff.py b/RecoTracker/IterativeTracking/python/PixelLessStep_cff.py index 892c37cae06d2..4df8ac317839d 100644 --- a/RecoTracker/IterativeTracking/python/PixelLessStep_cff.py +++ b/RecoTracker/IterativeTracking/python/PixelLessStep_cff.py @@ -1,5 +1,4 @@ import FWCore.ParameterSet.Config as cms -from Configuration.StandardSequences.Eras import eras import RecoTracker.IterativeTracking.iterativeTkConfig as _cfg ########################################################################## @@ -82,7 +81,8 @@ maxRing = cms.int32(3) ) ) -eras.trackingLowPU.toModify(pixelLessStepSeedLayers, +from Configuration.Eras.Modifier_trackingLowPU_cff import trackingLowPU +trackingLowPU.toModify(pixelLessStepSeedLayers, layerList = [ 'TIB1+TIB2', 'TID1_pos+TID2_pos','TID2_pos+TID3_pos', @@ -136,7 +136,7 @@ ) ) import RecoTracker.TkSeedGenerator.GlobalMixedSeeds_cff -eras.trackingLowPU.toReplaceWith(pixelLessStepSeeds, RecoTracker.TkSeedGenerator.GlobalMixedSeeds_cff.globalMixedSeeds.clone( +trackingLowPU.toReplaceWith(pixelLessStepSeeds, RecoTracker.TkSeedGenerator.GlobalMixedSeeds_cff.globalMixedSeeds.clone( OrderedHitsFactoryPSet = dict(SeedingLayers = 'pixelLessStepSeedLayers'), RegionFactoryPSet = dict(RegionPSet = dict( ptMin = 0.7, @@ -164,7 +164,7 @@ pixelLessStepTrajectoryFilter = _pixelLessStepTrajectoryFilterBase.clone( seedPairPenalty = 1, ) -eras.trackingLowPU.toReplaceWith(pixelLessStepTrajectoryFilter, _pixelLessStepTrajectoryFilterBase) +trackingLowPU.toReplaceWith(pixelLessStepTrajectoryFilter, _pixelLessStepTrajectoryFilterBase) import RecoTracker.MeasurementDet.Chi2ChargeMeasurementEstimator_cfi pixelLessStepChi2Est = RecoTracker.MeasurementDet.Chi2ChargeMeasurementEstimator_cfi.Chi2ChargeMeasurementEstimator.clone( @@ -173,7 +173,7 @@ MaxChi2 = cms.double(16.0), clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutTight')) ) -eras.trackingLowPU.toModify(pixelLessStepChi2Est, +trackingLowPU.toModify(pixelLessStepChi2Est, clusterChargeCut = dict(refToPSet_ = 'SiStripClusterChargeCutTiny') ) @@ -208,7 +208,7 @@ allowSharedFirstHit = cms.bool(True) ) pixelLessStepTrackCandidates.TrajectoryCleaner = 'pixelLessStepTrajectoryCleanerBySharedHits' -eras.trackingLowPU.toModify(pixelLessStepTrajectoryCleanerBySharedHits, fractionShared = 0.19) +trackingLowPU.toModify(pixelLessStepTrajectoryCleanerBySharedHits, fractionShared = 0.19) # TRACK FITTING @@ -296,4 +296,4 @@ pixelLessStep) _PixelLessStep_LowPU = PixelLessStep.copyAndExclude([pixelLessStepClassifier1, pixelLessStepClassifier2]) _PixelLessStep_LowPU.replace(pixelLessStep, pixelLessStepSelector) -eras.trackingLowPU.toReplaceWith(PixelLessStep, _PixelLessStep_LowPU) +trackingLowPU.toReplaceWith(PixelLessStep, _PixelLessStep_LowPU) diff --git a/RecoTracker/IterativeTracking/python/PixelPairStep_cff.py b/RecoTracker/IterativeTracking/python/PixelPairStep_cff.py index 330f3b88d79cb..3fef2bb9b098a 100644 --- a/RecoTracker/IterativeTracking/python/PixelPairStep_cff.py +++ b/RecoTracker/IterativeTracking/python/PixelPairStep_cff.py @@ -1,5 +1,4 @@ import FWCore.ParameterSet.Config as cms -from Configuration.StandardSequences.Eras import eras from Configuration.Eras.Modifier_tracker_apv_vfp30_2016_cff import tracker_apv_vfp30_2016 as _tracker_apv_vfp30_2016 import RecoTracker.IterativeTracking.iterativeTkConfig as _cfg @@ -26,7 +25,8 @@ skipClusters = cms.InputTag('pixelPairStepClusters') ) ) -eras.trackingPhase1PU70.toModify(pixelPairStepSeedLayers, +from Configuration.Eras.Modifier_trackingPhase1PU70_cff import trackingPhase1PU70 +trackingPhase1PU70.toModify(pixelPairStepSeedLayers, layerList = [ 'BPix1+BPix2', 'BPix1+BPix3', 'BPix2+BPix3', 'BPix2+BPix4', 'BPix3+BPix4', @@ -48,7 +48,8 @@ 'FPix4_pos+FPix5_pos', 'FPix4_neg+FPix5_neg', 'FPix5_pos+FPix6_pos', 'FPix5_neg+FPix6_neg' ] -eras.trackingPhase2PU140.toModify(pixelPairStepSeedLayers, +from Configuration.Eras.Modifier_trackingPhase2PU140_cff import trackingPhase2PU140 +trackingPhase2PU140.toModify(pixelPairStepSeedLayers, layerList = _layerListForPhase2, BPix = dict( useErrorsFromParam = cms.bool(True), @@ -82,13 +83,14 @@ ClusterShapeHitFilterName = cms.string('ClusterShapeHitFilter'), ClusterShapeCacheSrc = cms.InputTag('siPixelClusterShapeCache'), ) -eras.trackingLowPU.toModify(pixelPairStepSeeds, +from Configuration.Eras.Modifier_trackingLowPU_cff import trackingLowPU +trackingLowPU.toModify(pixelPairStepSeeds, RegionFactoryPSet = dict(RegionPSet = dict( VertexCollection = 'pixelVertices', useMultipleScattering = False )) ) -eras.trackingPhase1PU70.toModify(pixelPairStepSeeds, +trackingPhase1PU70.toModify(pixelPairStepSeeds, RegionFactoryPSet = dict( RegionPSet = dict( ptMin = 1.2, @@ -97,7 +99,7 @@ ) ), ) -eras.trackingPhase2PU140.toModify(pixelPairStepSeeds, +trackingPhase2PU140.toModify(pixelPairStepSeeds, RegionFactoryPSet = dict( RegionPSet = dict( ptMin = 1.3, @@ -121,13 +123,14 @@ maxCCCLostHits = 0, minGoodStripCharge = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutLoose')) ) +from Configuration.Eras.Modifier_tracker_apv_vfp30_2016_cff import tracker_apv_vfp30_2016 _tracker_apv_vfp30_2016.toModify(pixelPairStepTrajectoryFilterBase, maxCCCLostHits = 2) -eras.trackingLowPU.toReplaceWith(pixelPairStepTrajectoryFilterBase, _pixelPairStepTrajectoryFilterBase) -eras.trackingPhase1PU70.toReplaceWith(pixelPairStepTrajectoryFilterBase, _pixelPairStepTrajectoryFilterBase.clone( +trackingLowPU.toReplaceWith(pixelPairStepTrajectoryFilterBase, _pixelPairStepTrajectoryFilterBase) +trackingPhase1PU70.toReplaceWith(pixelPairStepTrajectoryFilterBase, _pixelPairStepTrajectoryFilterBase.clone( maxLostHitsFraction = 1./10., constantValueForLostHitsFractionFilter = 0.801, )) -eras.trackingPhase2PU140.toReplaceWith(pixelPairStepTrajectoryFilterBase, _pixelPairStepTrajectoryFilterBase.clone( +trackingPhase2PU140.toReplaceWith(pixelPairStepTrajectoryFilterBase, _pixelPairStepTrajectoryFilterBase.clone( maxLostHitsFraction = 1./10., constantValueForLostHitsFractionFilter = 0.701, )) @@ -154,10 +157,10 @@ _tracker_apv_vfp30_2016.toModify(pixelPairStepChi2Est, clusterChargeCut = dict(refToPSet_ = "SiStripClusterChargeCutTiny") ) -eras.trackingLowPU.toModify(pixelPairStepChi2Est, +trackingLowPU.toModify(pixelPairStepChi2Est, clusterChargeCut = dict(refToPSet_ = 'SiStripClusterChargeCutTiny'), ) -eras.trackingPhase1PU70.toModify(pixelPairStepChi2Est, +trackingPhase1PU70.toModify(pixelPairStepChi2Est, MaxChi2 = 16.0, clusterChargeCut = dict(refToPSet_ = 'SiStripClusterChargeCutNone'), ) @@ -172,7 +175,7 @@ maxDPhiForLooperReconstruction = cms.double(2.0), maxPtForLooperReconstruction = cms.double(0.7) ) -eras.trackingLowPU.toModify(pixelPairStepTrajectoryBuilder, maxCand = 2) +trackingLowPU.toModify(pixelPairStepTrajectoryBuilder, maxCand = 2) # MAKING OF TRACK CANDIDATES import RecoTracker.CkfPattern.CkfTrackCandidates_cfi @@ -185,7 +188,7 @@ onlyPixelHitsForSeedCleaner = cms.bool(True), ) -eras.trackingPhase2PU140.toModify(pixelPairStepTrackCandidates, +trackingPhase2PU140.toModify(pixelPairStepTrackCandidates, clustersToSkip = None, phase2clustersToSkip = cms.InputTag("pixelPairStepClusters"), TrajectoryCleaner = "pixelPairStepTrajectoryCleanerBySharedHits" @@ -197,8 +200,8 @@ fractionShared = 0.095, allowSharedFirstHit = True ) -eras.trackingPhase1PU70.toModify(pixelPairStepTrackCandidates, TrajectoryCleaner = 'pixelPairStepTrajectoryCleanerBySharedHits') -eras.trackingPhase2PU140.toModify(pixelPairStepTrajectoryCleanerBySharedHits, fractionShared = 0.09) +trackingPhase1PU70.toModify(pixelPairStepTrackCandidates, TrajectoryCleaner = 'pixelPairStepTrajectoryCleanerBySharedHits') +trackingPhase2PU140.toModify(pixelPairStepTrajectoryCleanerBySharedHits, fractionShared = 0.09) # TRACK FITTING import RecoTracker.TrackProducer.TrackProducer_cfi @@ -237,7 +240,7 @@ ), vertices = cms.InputTag("pixelVertices")#end of vpset ) #end of clone -eras.trackingPhase1PU70.toModify(pixelPairStepSelector, +trackingPhase1PU70.toModify(pixelPairStepSelector, useAnyMVA = None, GBRForestLabel = None, trackSelectors = [ @@ -282,7 +285,7 @@ ] #end of vpset ) #end of clone -eras.trackingPhase2PU140.toModify(pixelPairStepSelector, +trackingPhase2PU140.toModify(pixelPairStepSelector, useAnyMVA = None, GBRForestLabel = None, trackSelectors= cms.VPSet( @@ -338,6 +341,6 @@ pixelPairStep) _PixelPairStep_LowPU_Phase1PU70 = PixelPairStep.copy() _PixelPairStep_LowPU_Phase1PU70.replace(pixelPairStep, pixelPairStepSelector) -eras.trackingLowPU.toReplaceWith(PixelPairStep, _PixelPairStep_LowPU_Phase1PU70) -eras.trackingPhase1PU70.toReplaceWith(PixelPairStep, _PixelPairStep_LowPU_Phase1PU70) -eras.trackingPhase2PU140.toReplaceWith(PixelPairStep, _PixelPairStep_LowPU_Phase1PU70) +trackingLowPU.toReplaceWith(PixelPairStep, _PixelPairStep_LowPU_Phase1PU70) +trackingPhase1PU70.toReplaceWith(PixelPairStep, _PixelPairStep_LowPU_Phase1PU70) +trackingPhase2PU140.toReplaceWith(PixelPairStep, _PixelPairStep_LowPU_Phase1PU70) diff --git a/RecoTracker/IterativeTracking/python/TobTecStep_cff.py b/RecoTracker/IterativeTracking/python/TobTecStep_cff.py index d756ab662073a..464064466516c 100644 --- a/RecoTracker/IterativeTracking/python/TobTecStep_cff.py +++ b/RecoTracker/IterativeTracking/python/TobTecStep_cff.py @@ -1,5 +1,4 @@ import FWCore.ParameterSet.Config as cms -from Configuration.StandardSequences.Eras import eras import RecoTracker.IterativeTracking.iterativeTkConfig as _cfg ####################################################################### @@ -136,7 +135,8 @@ tobTecStepSeeds.seedCollections = cms.VInputTag(cms.InputTag('tobTecStepSeedsTripl'),cms.InputTag('tobTecStepSeedsPair')) # LowPU import RecoTracker.TkSeedGenerator.GlobalMixedSeeds_cff -eras.trackingLowPU.toReplaceWith(tobTecStepSeeds, RecoTracker.TkSeedGenerator.GlobalMixedSeeds_cff.globalMixedSeeds.clone( +from Configuration.Eras.Modifier_trackingLowPU_cff import trackingLowPU +trackingLowPU.toReplaceWith(tobTecStepSeeds, RecoTracker.TkSeedGenerator.GlobalMixedSeeds_cff.globalMixedSeeds.clone( OrderedHitsFactoryPSet = dict(SeedingLayers = 'tobTecStepSeedLayers'), RegionFactoryPSet = dict(RegionPSet = dict( ptMin = 0.6, @@ -145,7 +145,8 @@ )) )) # Phase1PU70 -eras.trackingPhase1PU70.toReplaceWith(tobTecStepSeeds, RecoTracker.TkSeedGenerator.GlobalMixedSeeds_cff.globalMixedSeeds.clone( +from Configuration.Eras.Modifier_trackingPhase1PU70_cff import trackingPhase1PU70 +trackingPhase1PU70.toReplaceWith(tobTecStepSeeds, RecoTracker.TkSeedGenerator.GlobalMixedSeeds_cff.globalMixedSeeds.clone( OrderedHitsFactoryPSet = dict(SeedingLayers = 'tobTecStepSeedLayers'), RegionFactoryPSet = dict( RegionPSet = dict( @@ -177,10 +178,10 @@ tobTecStepTrajectoryFilter = _tobTecStepTrajectoryFilterBase.clone( seedPairPenalty = 1, ) -eras.trackingLowPU.toReplaceWith(tobTecStepTrajectoryFilter, _tobTecStepTrajectoryFilterBase.clone( +trackingLowPU.toReplaceWith(tobTecStepTrajectoryFilter, _tobTecStepTrajectoryFilterBase.clone( minimumNumberOfHits = 6, )) -eras.trackingPhase1PU70.toReplaceWith(tobTecStepTrajectoryFilter, _tobTecStepTrajectoryFilterBase.clone( +trackingPhase1PU70.toReplaceWith(tobTecStepTrajectoryFilter, _tobTecStepTrajectoryFilterBase.clone( minimumNumberOfHits = 6, )) @@ -196,10 +197,10 @@ MaxChi2 = cms.double(16.0), clusterChargeCut = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutTight')) ) -eras.trackingLowPU.toModify(tobTecStepChi2Est, +trackingLowPU.toModify(tobTecStepChi2Est, clusterChargeCut = dict(refToPSet_ = 'SiStripClusterChargeCutTiny') ) -eras.trackingPhase1PU70.toModify(tobTecStepChi2Est, +trackingPhase1PU70.toModify(tobTecStepChi2Est, MaxChi2 = 9.0, clusterChargeCut = dict(refToPSet_ = 'SiStripClusterChargeCutNone'), ) @@ -225,7 +226,7 @@ # chose to "fix" the behaviour here, so the era is not fully # equivalent to the customize. To restore the customize behaviour, # uncomment the following lines -#eras.trackingLowPU.toModify(tobTecStepTrajectoryBuilder, +#trackingLowPU.toModify(tobTecStepTrajectoryBuilder, # inOutTrajectoryFilter = RecoTracker.CkfPattern.GroupedCkfTrajectoryBuilder_cfi.GroupedCkfTrajectoryBuilder.inOutTrajectoryFilter.clone(), # inOutTrajectoryFilterName = cms.PSet(refToPSet_ = cms.string('tobTecStepInOutTrajectoryFilter')) #) @@ -252,8 +253,8 @@ allowSharedFirstHit = cms.bool(True) ) tobTecStepTrackCandidates.TrajectoryCleaner = 'tobTecStepTrajectoryCleanerBySharedHits' -eras.trackingLowPU.toModify(tobTecStepTrajectoryCleanerBySharedHits, fractionShared = 0.19) -eras.trackingPhase1PU70.toModify(tobTecStepTrajectoryCleanerBySharedHits, fractionShared = 0.08) +trackingLowPU.toModify(tobTecStepTrajectoryCleanerBySharedHits, fractionShared = 0.19) +trackingPhase1PU70.toModify(tobTecStepTrajectoryCleanerBySharedHits, fractionShared = 0.08) # TRACK FITTING AND SMOOTHING OPTIONS import TrackingTools.TrackFitters.RungeKuttaFitters_cff @@ -264,8 +265,8 @@ Fitter = cms.string('tobTecStepRKFitter'), Smoother = cms.string('tobTecStepRKSmoother') ) -eras.trackingLowPU.toModify(tobTecStepFitterSmoother, MinNumberOfHits = 8) -eras.trackingPhase1PU70.toModify(tobTecStepFitterSmoother, MinNumberOfHits = 8) +trackingLowPU.toModify(tobTecStepFitterSmoother, MinNumberOfHits = 8) +trackingPhase1PU70.toModify(tobTecStepFitterSmoother, MinNumberOfHits = 8) tobTecStepFitterSmootherForLoopers = tobTecStepFitterSmoother.clone( ComponentName = 'tobTecStepFitterSmootherForLoopers', @@ -278,8 +279,8 @@ ComponentName = cms.string('tobTecStepRKFitter'), minHits = 7 ) -eras.trackingLowPU.toModify(tobTecStepRKTrajectoryFitter, minHits = 8) -eras.trackingPhase1PU70.toModify(tobTecStepRKTrajectoryFitter, minHits = 8) +trackingLowPU.toModify(tobTecStepRKTrajectoryFitter, minHits = 8) +trackingPhase1PU70.toModify(tobTecStepRKTrajectoryFitter, minHits = 8) tobTecStepRKTrajectoryFitterForLoopers = tobTecStepRKTrajectoryFitter.clone( ComponentName = cms.string('tobTecStepRKFitterForLoopers'), @@ -291,8 +292,8 @@ errorRescaling = 10.0, minHits = 7 ) -eras.trackingLowPU.toModify(tobTecStepRKTrajectorySmoother, minHits = 8) -eras.trackingPhase1PU70.toModify(tobTecStepRKTrajectorySmoother, minHits = 8) +trackingLowPU.toModify(tobTecStepRKTrajectorySmoother, minHits = 8) +trackingPhase1PU70.toModify(tobTecStepRKTrajectorySmoother, minHits = 8) tobTecStepRKTrajectorySmootherForLoopers = tobTecStepRKTrajectorySmoother.clone( ComponentName = cms.string('tobTecStepRKSmootherForLoopers'), @@ -335,7 +336,7 @@ tobTecStep.inputClassifiers=['tobTecStepClassifier1','tobTecStepClassifier2'] import RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi -eras.trackingLowPU.toReplaceWith(tobTecStep, RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.multiTrackSelector.clone( +trackingLowPU.toReplaceWith(tobTecStep, RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.multiTrackSelector.clone( src = 'tobTecStepTracks', useAnyMVA = cms.bool(False), GBRForestLabel = cms.string('MVASelectorIter6'), @@ -436,7 +437,7 @@ maxRing = cms.int32(5) ) ) -eras.trackingPhase1PU70.toModify(tobTecStepSeedLayers, +trackingPhase1PU70.toModify(tobTecStepSeedLayers, TOB = dict( skipClusters = 'tobTecStepSeedClusters', clusterChargeCut = dict(refToPSet_ = 'SiStripClusterChargeCutNone') @@ -494,7 +495,7 @@ ] #end of vpset ) #end of clone -eras.trackingLowPU.toReplaceWith(TobTecStep, cms.Sequence( +trackingLowPU.toReplaceWith(TobTecStep, cms.Sequence( tobTecStepClusters* tobTecStepSeedLayers* tobTecStepSeeds* @@ -502,7 +503,7 @@ tobTecStepTracks* tobTecStep )) -eras.trackingPhase1PU70.toReplaceWith(TobTecStep, cms.Sequence( +trackingPhase1PU70.toReplaceWith(TobTecStep, cms.Sequence( tobTecStepClusters* tobTecStepSeedClusters* tobTecStepSeedLayers* diff --git a/RecoTracker/MeasurementDet/python/MeasurementTrackerESProducer_cfi.py b/RecoTracker/MeasurementDet/python/MeasurementTrackerESProducer_cfi.py index ecddb85a336b0..f78b966b2bf9f 100644 --- a/RecoTracker/MeasurementDet/python/MeasurementTrackerESProducer_cfi.py +++ b/RecoTracker/MeasurementDet/python/MeasurementTrackerESProducer_cfi.py @@ -29,5 +29,5 @@ DebugPixelROCQualityDB = cms.untracked.bool(False), ## dump out info om module status ) -from Configuration.StandardSequences.Eras import eras -eras.trackingPhase2PU140.toModify(MeasurementTracker, Phase2StripCPE = cms.string('Phase2StripCPEGeometric')) +from Configuration.Eras.Modifier_trackingPhase2PU140_cff import trackingPhase2PU140 +trackingPhase2PU140.toModify(MeasurementTracker, Phase2StripCPE = cms.string('Phase2StripCPEGeometric')) diff --git a/RecoTracker/MeasurementDet/python/MeasurementTrackerEventProducer_cfi.py b/RecoTracker/MeasurementDet/python/MeasurementTrackerEventProducer_cfi.py index a16c0fd52dee5..c0bb66b955e6b 100644 --- a/RecoTracker/MeasurementDet/python/MeasurementTrackerEventProducer_cfi.py +++ b/RecoTracker/MeasurementDet/python/MeasurementTrackerEventProducer_cfi.py @@ -1,5 +1,4 @@ import FWCore.ParameterSet.Config as cms -from Configuration.StandardSequences.Eras import eras MeasurementTrackerEvent = cms.EDProducer("MeasurementTrackerEventProducer", measurementTracker = cms.string(''), @@ -16,7 +15,8 @@ ) # This customization will be removed once we have phase2 pixel digis # Need this line to stop error about missing siPixelDigis -eras.phase2_tracker.toModify(MeasurementTrackerEvent, # FIXME +from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker +phase2_tracker.toModify(MeasurementTrackerEvent, # FIXME inactivePixelDetectorLabels = [], Phase2TrackerCluster1DProducer = cms.string('siPhase2Clusters'), stripClusterProducer = '' diff --git a/RecoTracker/SpecialSeedGenerators/python/inOutSeedsFromTrackerMuons_cfi.py b/RecoTracker/SpecialSeedGenerators/python/inOutSeedsFromTrackerMuons_cfi.py index 0d1d78ff6a305..80fa55c211adf 100644 --- a/RecoTracker/SpecialSeedGenerators/python/inOutSeedsFromTrackerMuons_cfi.py +++ b/RecoTracker/SpecialSeedGenerators/python/inOutSeedsFromTrackerMuons_cfi.py @@ -23,6 +23,6 @@ # This customization will be removed once we get the templates for # phase2 pixel -from Configuration.StandardSequences.Eras import eras -eras.phase2_tracker.toModify(inOutSeedsFromTrackerMuons, TrackerRecHitBuilder = 'WithTrackAngle') # FIXME +from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker +phase2_tracker.toModify(inOutSeedsFromTrackerMuons, TrackerRecHitBuilder = 'WithTrackAngle') # FIXME diff --git a/RecoTracker/TkSeedGenerator/python/GlobalMixedSeeds_cff.py b/RecoTracker/TkSeedGenerator/python/GlobalMixedSeeds_cff.py index 71bfab58262c9..3872c1ccba0d7 100644 --- a/RecoTracker/TkSeedGenerator/python/GlobalMixedSeeds_cff.py +++ b/RecoTracker/TkSeedGenerator/python/GlobalMixedSeeds_cff.py @@ -1,5 +1,4 @@ import FWCore.ParameterSet.Config as cms -from Configuration.StandardSequences.Eras import eras # initialize magnetic field ######################### # initialize geometry ##################### @@ -26,6 +25,7 @@ maxElement = cms.uint32(1000000) ) ) -eras.trackingPhase1PU70.toModify(globalMixedSeeds, +from Configuration.Eras.Modifier_trackingPhase1PU70_cff import trackingPhase1PU70 +trackingPhase1PU70.toModify(globalMixedSeeds, OrderedHitsFactoryPSet = dict(maxElement = 0), ) diff --git a/RecoTracker/TkSeedGenerator/python/GlobalSeedsFromPairsWithVertices_cff.py b/RecoTracker/TkSeedGenerator/python/GlobalSeedsFromPairsWithVertices_cff.py index 9b7e72e2b31e1..d1cae32e9c236 100644 --- a/RecoTracker/TkSeedGenerator/python/GlobalSeedsFromPairsWithVertices_cff.py +++ b/RecoTracker/TkSeedGenerator/python/GlobalSeedsFromPairsWithVertices_cff.py @@ -1,5 +1,4 @@ import FWCore.ParameterSet.Config as cms -from Configuration.StandardSequences.Eras import eras from RecoLocalTracker.SiStripRecHitConverter.StripCPEfromTrackAngle_cfi import * @@ -26,7 +25,8 @@ ComponentName = cms.string('GlobalTrackingRegionWithVerticesProducer') ) ) -eras.trackingPhase1PU70.toModify(globalSeedsFromPairsWithVertices, +from Configuration.Eras.Modifier_trackingPhase1PU70_cff import trackingPhase1PU70 +trackingPhase1PU70.toModify(globalSeedsFromPairsWithVertices, OrderedHitsFactoryPSet = dict(maxElement = 0), ) diff --git a/RecoTracker/TkSeedGenerator/python/GlobalSeedsFromTriplets_cff.py b/RecoTracker/TkSeedGenerator/python/GlobalSeedsFromTriplets_cff.py index becedc5042bf9..ee09ba5c7988e 100644 --- a/RecoTracker/TkSeedGenerator/python/GlobalSeedsFromTriplets_cff.py +++ b/RecoTracker/TkSeedGenerator/python/GlobalSeedsFromTriplets_cff.py @@ -1,5 +1,4 @@ import FWCore.ParameterSet.Config as cms -from Configuration.StandardSequences.Eras import eras from RecoLocalTracker.SiStripRecHitConverter.StripCPEfromTrackAngle_cfi import * from RecoLocalTracker.SiStripRecHitConverter.SiStripRecHitMatcher_cfi import * @@ -25,6 +24,7 @@ # GeneratorPSet = cms.PSet(PixelTripletLargeTipGenerator) ) ) -eras.trackingPhase1PU70.toModify(globalSeedsFromTriplets, +from Configuration.Eras.Modifier_trackingPhase1PU70_cff import trackingPhase1PU70 +trackingPhase1PU70.toModify(globalSeedsFromTriplets, OrderedHitsFactoryPSet = dict(GeneratorPSet = dict(maxElement = 0)), ) diff --git a/RecoTracker/TkSeedGenerator/python/SeedFromConsecutiveHitsCreator_cfi.py b/RecoTracker/TkSeedGenerator/python/SeedFromConsecutiveHitsCreator_cfi.py index a8a531379d5bc..570ee4cbd2444 100644 --- a/RecoTracker/TkSeedGenerator/python/SeedFromConsecutiveHitsCreator_cfi.py +++ b/RecoTracker/TkSeedGenerator/python/SeedFromConsecutiveHitsCreator_cfi.py @@ -1,5 +1,4 @@ import FWCore.ParameterSet.Config as cms -from Configuration.StandardSequences.Eras import eras SeedFromConsecutiveHitsCreator = cms.PSet( ComponentName = cms.string('SeedFromConsecutiveHitsCreator'), @@ -13,7 +12,8 @@ TTRHBuilder = cms.string('WithTrackAngle'), forceKinematicWithRegionDirection = cms.bool(False) ) -eras.trackingPhase1PU70.toModify(SeedFromConsecutiveHitsCreator, +from Configuration.Eras.Modifier_trackingPhase1PU70_cff import trackingPhase1PU70 +trackingPhase1PU70.toModify(SeedFromConsecutiveHitsCreator, magneticField = '', propagator = 'PropagatorWithMaterial' ) diff --git a/RecoTracker/TkSeedGenerator/python/SeedGeneratorFromRegionHitsEDProducer_cfi.py b/RecoTracker/TkSeedGenerator/python/SeedGeneratorFromRegionHitsEDProducer_cfi.py index 4314bf90ddd2a..fd5cb27898753 100644 --- a/RecoTracker/TkSeedGenerator/python/SeedGeneratorFromRegionHitsEDProducer_cfi.py +++ b/RecoTracker/TkSeedGenerator/python/SeedGeneratorFromRegionHitsEDProducer_cfi.py @@ -1,5 +1,4 @@ import FWCore.ParameterSet.Config as cms -from Configuration.StandardSequences.Eras import eras from RecoTracker.TkTrackingRegions.GlobalTrackingRegionFromBeamSpot_cfi import * from RecoTracker.TkSeedGenerator.SeedFromConsecutiveHitsCreator_cfi import * @@ -37,6 +36,7 @@ ), ) # Disable too many clusters check until we have an updated cut string for phase1 -eras.phase1Pixel.toModify(seedGeneratorFromRegionHitsEDProducer, # FIXME +from Configuration.Eras.Modifier_phase1Pixel_cff import phase1Pixel +phase1Pixel.toModify(seedGeneratorFromRegionHitsEDProducer, # FIXME ClusterCheckPSet = dict(doClusterCheck = False) ) diff --git a/RecoTracker/TkSeedingLayers/python/PixelLayerTriplets_cfi.py b/RecoTracker/TkSeedingLayers/python/PixelLayerTriplets_cfi.py index d431d0d056274..5dd30ee1868c5 100644 --- a/RecoTracker/TkSeedingLayers/python/PixelLayerTriplets_cfi.py +++ b/RecoTracker/TkSeedingLayers/python/PixelLayerTriplets_cfi.py @@ -18,7 +18,6 @@ HitProducer = cms.string('siPixelRecHits'), ) -from Configuration.StandardSequences.Eras import eras _layersForPhase1 = [ 'BPix1+BPix2+BPix3', 'BPix2+BPix3+BPix4', @@ -35,8 +34,10 @@ 'FPix1_pos+FPix2_pos+FPix3_pos', 'FPix1_neg+FPix2_neg+FPix3_neg' ] -eras.trackingPhase1.toModify(PixelLayerTriplets, layerList=_layersForPhase1) -eras.trackingPhase1PU70.toModify(PixelLayerTriplets, layerList=_layersForPhase1) +from Configuration.Eras.Modifier_trackingPhase1_cff import trackingPhase1 +trackingPhase1.toModify(PixelLayerTriplets, layerList=_layersForPhase1) +from Configuration.Eras.Modifier_trackingPhase1PU70_cff import trackingPhase1PU70 +trackingPhase1PU70.toModify(PixelLayerTriplets, layerList=_layersForPhase1) _layersForPhase2 = [ 'BPix1+BPix2+BPix3', 'BPix2+BPix3+BPix4', 'BPix2+BPix3+FPix1_pos', 'BPix2+BPix3+FPix1_neg', @@ -52,5 +53,6 @@ 'FPix6_pos+FPix7_pos+FPix8_pos', 'FPix6_neg+FPix7_neg+FPix8_neg', 'FPix6_pos+FPix7_pos+FPix9_pos', 'FPix6_neg+FPix7_neg+FPix9_neg' ] -eras.trackingPhase2PU140.toModify(PixelLayerTriplets, layerList=_layersForPhase2) +from Configuration.Eras.Modifier_trackingPhase2PU140_cff import trackingPhase2PU140 +trackingPhase2PU140.toModify(PixelLayerTriplets, layerList=_layersForPhase2) diff --git a/RecoTracker/TkTrackingRegions/python/GlobalTrackingRegionWithVertices_cfi.py b/RecoTracker/TkTrackingRegions/python/GlobalTrackingRegionWithVertices_cfi.py index 0c2730f8764da..c4584dfaf806f 100644 --- a/RecoTracker/TkTrackingRegions/python/GlobalTrackingRegionWithVertices_cfi.py +++ b/RecoTracker/TkTrackingRegions/python/GlobalTrackingRegionWithVertices_cfi.py @@ -1,5 +1,4 @@ import FWCore.ParameterSet.Config as cms -from Configuration.StandardSequences.Eras import eras RegionPSetWithVerticesBlock = cms.PSet( RegionPSet = cms.PSet( @@ -17,6 +16,7 @@ nSigmaZ = cms.double(4.0) ) ) -eras.trackingLowPU.toModify(RegionPSetWithVerticesBlock, +from Configuration.Eras.Modifier_trackingLowPU_cff import trackingLowPU +trackingLowPU.toModify(RegionPSetWithVerticesBlock, RegionPSet = dict(VertexCollection = "pixelVertices") ) diff --git a/RecoTracker/TrackProducer/python/TrackProducer_cfi.py b/RecoTracker/TrackProducer/python/TrackProducer_cfi.py index 678f67b8ce70c..6cdb3fc0488cd 100644 --- a/RecoTracker/TrackProducer/python/TrackProducer_cfi.py +++ b/RecoTracker/TrackProducer/python/TrackProducer_cfi.py @@ -29,6 +29,6 @@ # This customization will be removed once we get the templates for # phase2 pixel -from Configuration.StandardSequences.Eras import eras -eras.phase2_tracker.toModify(TrackProducer, TTRHBuilder = 'WithTrackAngle') # FIXME +from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker +phase2_tracker.toModify(TrackProducer, TTRHBuilder = 'WithTrackAngle') # FIXME diff --git a/RecoTracker/TransientTrackingRecHit/python/TTRHBuilderWithTemplate_cfi.py b/RecoTracker/TransientTrackingRecHit/python/TTRHBuilderWithTemplate_cfi.py index 39c74cdc1069f..3c1f267f7dc33 100644 --- a/RecoTracker/TransientTrackingRecHit/python/TTRHBuilderWithTemplate_cfi.py +++ b/RecoTracker/TransientTrackingRecHit/python/TTRHBuilderWithTemplate_cfi.py @@ -8,6 +8,6 @@ ComputeCoarseLocalPositionFromDisk = cms.bool(False), ) -from Configuration.StandardSequences.Eras import eras -eras.trackingPhase2PU140.toModify(TTRHBuilderAngleAndTemplate, Phase2StripCPE = cms.string('Phase2StripCPEGeometric')) +from Configuration.Eras.Modifier_trackingPhase2PU140_cff import trackingPhase2PU140 +trackingPhase2PU140.toModify(TTRHBuilderAngleAndTemplate, Phase2StripCPE = cms.string('Phase2StripCPEGeometric')) diff --git a/RecoTracker/TransientTrackingRecHit/python/TransientTrackingRecHitBuilderWithoutRefit_cfi.py b/RecoTracker/TransientTrackingRecHit/python/TransientTrackingRecHitBuilderWithoutRefit_cfi.py index 21a5f4a7a0669..4539b58de03d8 100644 --- a/RecoTracker/TransientTrackingRecHit/python/TransientTrackingRecHitBuilderWithoutRefit_cfi.py +++ b/RecoTracker/TransientTrackingRecHit/python/TransientTrackingRecHitBuilderWithoutRefit_cfi.py @@ -8,6 +8,6 @@ ComputeCoarseLocalPositionFromDisk = cms.bool(False), ) -from Configuration.StandardSequences.Eras import eras -eras.trackingPhase2PU140.toModify(ttrhbwor, Phase2StripCPE = cms.string('Phase2StripCPEGeometric')) +from Configuration.Eras.Modifier_trackingPhase2PU140_cff import trackingPhase2PU140 +trackingPhase2PU140.toModify(ttrhbwor, Phase2StripCPE = cms.string('Phase2StripCPEGeometric')) diff --git a/RecoTracker/TransientTrackingRecHit/python/TransientTrackingRecHitBuilder_cfi.py b/RecoTracker/TransientTrackingRecHit/python/TransientTrackingRecHitBuilder_cfi.py index 9724cdf86115c..334375e14c0e2 100644 --- a/RecoTracker/TransientTrackingRecHit/python/TransientTrackingRecHitBuilder_cfi.py +++ b/RecoTracker/TransientTrackingRecHit/python/TransientTrackingRecHitBuilder_cfi.py @@ -8,6 +8,6 @@ ComputeCoarseLocalPositionFromDisk = cms.bool(False), ) -from Configuration.StandardSequences.Eras import eras -eras.trackingPhase2PU140.toModify(ttrhbwr, Phase2StripCPE = cms.string('Phase2StripCPEGeometric')) +from Configuration.Eras.Modifier_trackingPhase2PU140_cff import trackingPhase2PU140 +trackingPhase2PU140.toModify(ttrhbwr, Phase2StripCPE = cms.string('Phase2StripCPEGeometric')) diff --git a/RecoVertex/Configuration/python/RecoVertex_EventContent_cff.py b/RecoVertex/Configuration/python/RecoVertex_EventContent_cff.py index 2dbd4e256ea20..154a7284db12b 100644 --- a/RecoVertex/Configuration/python/RecoVertex_EventContent_cff.py +++ b/RecoVertex/Configuration/python/RecoVertex_EventContent_cff.py @@ -1,4 +1,5 @@ import FWCore.ParameterSet.Config as cms +from Configuration.Eras.Modifier_phase2_timing_cff import phase2_timing RecoVertexFEVT = cms.PSet( outputCommands = cms.untracked.vstring('keep *_offlinePrimaryVertices__*', @@ -33,10 +34,9 @@ 'keep *_offlinePrimaryVertices4DWithBS__*', 'keep *_trackTimeValueMapProducer_*_*' ] -from Configuration.StandardSequences.Eras import eras def _phase2_tktiming_AddNewContent(mod): temp = mod.outputCommands + _phase2_tktiming_RecoVertexEventContent - eras.phase2_timing.toModify( mod, outputCommands = temp ) + phase2_timing.toModify( mod, outputCommands = temp ) _phase2_tktiming_AddNewContent(RecoVertexFEVT) _phase2_tktiming_AddNewContent(RecoVertexRECO) diff --git a/RecoVertex/Configuration/python/RecoVertex_cff.py b/RecoVertex/Configuration/python/RecoVertex_cff.py index d22bbf442346f..e01e72dd4a3b6 100644 --- a/RecoVertex/Configuration/python/RecoVertex_cff.py +++ b/RecoVertex/Configuration/python/RecoVertex_cff.py @@ -49,7 +49,6 @@ from SimTracker.TrackerHitAssociation.tpClusterProducer_cfi import * from SimTracker.TrackAssociatorProducers.quickTrackAssociatorByHits_cfi import * from SimTracker.TrackAssociation.trackTimeValueMapProducer_cfi import * -from Configuration.StandardSequences.Eras import eras _phase2_tktiming_vertexreco = cms.Sequence( vertexreco.copy() * tpClusterProducer * quickTrackAssociatorByHits * @@ -62,13 +61,14 @@ offlinePrimaryVertices4DWithBS ) -eras.phase2_timing.toModify( quickTrackAssociatorByHits, +from Configuration.Eras.Modifier_phase2_timing_cff import phase2_timing +phase2_timing.toModify( quickTrackAssociatorByHits, pixelSimLinkSrc = cms.InputTag("simSiPixelDigis","Pixel"), stripSimLinkSrc = cms.InputTag("simSiPixelDigis","Tracker") ) -eras.phase2_timing.toModify( tpClusterProducer, +phase2_timing.toModify( tpClusterProducer, pixelSimLinkSrc = cms.InputTag("simSiPixelDigis", "Pixel"), phase2OTSimLinkSrc = cms.InputTag("simSiPixelDigis","Tracker") ) -eras.phase2_timing.toReplaceWith(vertexreco, _phase2_tktiming_vertexreco) +phase2_timing.toReplaceWith(vertexreco, _phase2_tktiming_vertexreco) diff --git a/RecoVertex/PrimaryVertexProducer/python/OfflinePrimaryVertices_cfi.py b/RecoVertex/PrimaryVertexProducer/python/OfflinePrimaryVertices_cfi.py index 2f0f70a9865fc..716d9986bd80c 100644 --- a/RecoVertex/PrimaryVertexProducer/python/OfflinePrimaryVertices_cfi.py +++ b/RecoVertex/PrimaryVertexProducer/python/OfflinePrimaryVertices_cfi.py @@ -64,6 +64,6 @@ # not included in data-taking, like it was the case for "Quiet Beam" # collisions on 2016 with run 269207. -from Configuration.StandardSequences.Eras import eras -eras.trackingLowPU.toModify(offlinePrimaryVertices, +from Configuration.Eras.Modifier_trackingLowPU_cff import trackingLowPU +trackingLowPU.toModify(offlinePrimaryVertices, TkFilterParameters = dict(minPixelLayersWithHits = 0)) diff --git a/SLHCUpgradeSimulations/Configuration/python/phase2TkFlat.py b/SLHCUpgradeSimulations/Configuration/python/phase2TkFlat.py index 5bb92c4ca8b32..dbc4916e0b68b 100644 --- a/SLHCUpgradeSimulations/Configuration/python/phase2TkFlat.py +++ b/SLHCUpgradeSimulations/Configuration/python/phase2TkFlat.py @@ -1,5 +1,4 @@ import FWCore.ParameterSet.Config as cms -from Configuration.StandardSequences.Eras import eras #import SLHCUpgradeSimulations.Configuration.customise_PFlow as customise_PFlow #GEN-SIM so far... diff --git a/SLHCUpgradeSimulations/Configuration/python/phase2TkTilted.py b/SLHCUpgradeSimulations/Configuration/python/phase2TkTilted.py index 4063328639a23..5fa58517846ab 100644 --- a/SLHCUpgradeSimulations/Configuration/python/phase2TkTilted.py +++ b/SLHCUpgradeSimulations/Configuration/python/phase2TkTilted.py @@ -1,5 +1,4 @@ import FWCore.ParameterSet.Config as cms -from Configuration.StandardSequences.Eras import eras #import SLHCUpgradeSimulations.Configuration.customise_PFlow as customise_PFlow #GEN-SIM so far... diff --git a/SLHCUpgradeSimulations/Configuration/python/phase2TkTilted4021.py b/SLHCUpgradeSimulations/Configuration/python/phase2TkTilted4021.py index 5c370808433cf..f5bb225107dff 100644 --- a/SLHCUpgradeSimulations/Configuration/python/phase2TkTilted4021.py +++ b/SLHCUpgradeSimulations/Configuration/python/phase2TkTilted4021.py @@ -1,5 +1,4 @@ import FWCore.ParameterSet.Config as cms -from Configuration.StandardSequences.Eras import eras #import SLHCUpgradeSimulations.Configuration.customise_PFlow as customise_PFlow #GEN-SIM so far... diff --git a/SimCalorimetry/Configuration/python/SimCalorimetry_EventContent_cff.py b/SimCalorimetry/Configuration/python/SimCalorimetry_EventContent_cff.py index 58ef42496f8ce..3e7b2ad29fd70 100644 --- a/SimCalorimetry/Configuration/python/SimCalorimetry_EventContent_cff.py +++ b/SimCalorimetry/Configuration/python/SimCalorimetry_EventContent_cff.py @@ -1,7 +1,6 @@ import FWCore.ParameterSet.Config as cms # This object modifies the event content for different scenarios -from Configuration.StandardSequences.Eras import eras SimCalorimetryFEVTDEBUG = cms.PSet( outputCommands = cms.untracked.vstring('keep *_simEcalDigis_*_*', @@ -26,11 +25,13 @@ # # Add extra event content if running in Run 2 # -eras.run2_common.toModify( SimCalorimetryFEVTDEBUG.outputCommands, func=lambda outputCommands: outputCommands.append('keep *_simHcalUnsuppressedDigis_*_*') ) -eras.run2_common.toModify( SimCalorimetryRAW.outputCommands, func=lambda outputCommands: outputCommands.append('keep *_simHcalUnsuppressedDigis_*_*') ) +from Configuration.Eras.Modifier_run2_common_cff import run2_common +run2_common.toModify( SimCalorimetryFEVTDEBUG.outputCommands, func=lambda outputCommands: outputCommands.append('keep *_simHcalUnsuppressedDigis_*_*') ) +run2_common.toModify( SimCalorimetryRAW.outputCommands, func=lambda outputCommands: outputCommands.append('keep *_simHcalUnsuppressedDigis_*_*') ) -eras.phase2_timing.toModify(SimCalorimetryFEVTDEBUG.outputCommands, func=lambda outputCommands: outputCommands.append('keep *_mix_EETimeDigi_*') ) -eras.phase2_timing.toModify(SimCalorimetryFEVTDEBUG.outputCommands, func=lambda outputCommands: outputCommands.append('keep *_mix_EBTimeDigi_*') ) +from Configuration.Eras.Modifier_phase2_timing_cff import phase2_timing +phase2_timing.toModify(SimCalorimetryFEVTDEBUG.outputCommands, func=lambda outputCommands: outputCommands.append('keep *_mix_EETimeDigi_*') ) +phase2_timing.toModify(SimCalorimetryFEVTDEBUG.outputCommands, func=lambda outputCommands: outputCommands.append('keep *_mix_EBTimeDigi_*') ) -eras.phase2_timing.toModify(SimCalorimetryRAW.outputCommands, func=lambda outputCommands: outputCommands.append('keep *_mix_EETimeDigi_*') ) -eras.phase2_timing.toModify(SimCalorimetryRAW.outputCommands, func=lambda outputCommands: outputCommands.append('keep *_mix_EBTimeDigi_*') ) +phase2_timing.toModify(SimCalorimetryRAW.outputCommands, func=lambda outputCommands: outputCommands.append('keep *_mix_EETimeDigi_*') ) +phase2_timing.toModify(SimCalorimetryRAW.outputCommands, func=lambda outputCommands: outputCommands.append('keep *_mix_EBTimeDigi_*') ) diff --git a/SimCalorimetry/Configuration/python/SimCalorimetry_cff.py b/SimCalorimetry/Configuration/python/SimCalorimetry_cff.py index b07ac2c0d924a..86cb0068f70e6 100644 --- a/SimCalorimetry/Configuration/python/SimCalorimetry_cff.py +++ b/SimCalorimetry/Configuration/python/SimCalorimetry_cff.py @@ -6,6 +6,6 @@ calDigi = cms.Sequence(ecalDigiSequence+hcalDigiSequence+castorDigiSequence) # fastsim has no castor model -from Configuration.StandardSequences.Eras import eras -if eras.fastSim.isChosen(): +from Configuration.Eras.Modifier_fastSim_cff import fastSim +if fastSim.isChosen(): calDigi.remove(castorDigiSequence) diff --git a/SimCalorimetry/Configuration/python/hcalDigiSequence_cff.py b/SimCalorimetry/Configuration/python/hcalDigiSequence_cff.py index 39795f91fc544..7939e5f48a69d 100644 --- a/SimCalorimetry/Configuration/python/hcalDigiSequence_cff.py +++ b/SimCalorimetry/Configuration/python/hcalDigiSequence_cff.py @@ -13,5 +13,5 @@ _phase2_hcalDigiSequence.remove(simHcalTriggerPrimitiveDigis) _phase2_hcalDigiSequence.remove(simHcalTTPDigis) -from Configuration.StandardSequences.Eras import eras -eras.phase2_hcal.toReplaceWith( hcalDigiSequence, _phase2_hcalDigiSequence ) +from Configuration.Eras.Modifier_phase2_hcal_cff import phase2_hcal +phase2_hcal.toReplaceWith( hcalDigiSequence, _phase2_hcalDigiSequence ) diff --git a/SimCalorimetry/EcalTrigPrimProducers/python/ecalTriggerPrimitiveDigis_cff.py b/SimCalorimetry/EcalTrigPrimProducers/python/ecalTriggerPrimitiveDigis_cff.py index a72dac6f35d9c..1b23381a89e18 100644 --- a/SimCalorimetry/EcalTrigPrimProducers/python/ecalTriggerPrimitiveDigis_cff.py +++ b/SimCalorimetry/EcalTrigPrimProducers/python/ecalTriggerPrimitiveDigis_cff.py @@ -10,5 +10,5 @@ #from SimCalorimetry.EcalTrigPrimProducers.ecalTrigPrimESProducer_cff import * #Common -from Configuration.StandardSequences.Eras import eras -eras.phase2_hgcal.toModify( simEcalTriggerPrimitiveDigis, BarrelOnly = cms.bool(True) ) +from Configuration.Eras.Modifier_phase2_hgcal_cff import phase2_hgcal +phase2_hgcal.toModify( simEcalTriggerPrimitiveDigis, BarrelOnly = cms.bool(True) ) diff --git a/SimCalorimetry/EcalTrigPrimProducers/python/ecalTriggerPrimitiveDigis_mc_cff.py b/SimCalorimetry/EcalTrigPrimProducers/python/ecalTriggerPrimitiveDigis_mc_cff.py index 35f4055935708..fda2cbaff206d 100644 --- a/SimCalorimetry/EcalTrigPrimProducers/python/ecalTriggerPrimitiveDigis_mc_cff.py +++ b/SimCalorimetry/EcalTrigPrimProducers/python/ecalTriggerPrimitiveDigis_mc_cff.py @@ -6,5 +6,5 @@ from SimCalorimetry.EcalTrigPrimProducers.ecalTrigPrimESProducer_mc_cff import * #Common -from Configuration.StandardSequences.Eras import eras -eras.phase2_hgcal.toModify( simEcalTriggerPrimitiveDigis, BarrelOnly = cms.bool(True) ) +from Configuration.Eras.Modifier_phase2_hgcal_cff import phase2_hgcal +phase2_hgcal.toModify( simEcalTriggerPrimitiveDigis, BarrelOnly = cms.bool(True) ) diff --git a/SimCalorimetry/EcalTrigPrimProducers/python/ecalTriggerPrimitiveDigis_with_suppressed_cff.py b/SimCalorimetry/EcalTrigPrimProducers/python/ecalTriggerPrimitiveDigis_with_suppressed_cff.py index d065a907ec9cf..2fe26537efa5c 100644 --- a/SimCalorimetry/EcalTrigPrimProducers/python/ecalTriggerPrimitiveDigis_with_suppressed_cff.py +++ b/SimCalorimetry/EcalTrigPrimProducers/python/ecalTriggerPrimitiveDigis_with_suppressed_cff.py @@ -8,5 +8,5 @@ #Common -from Configuration.StandardSequences.Eras import eras -eras.phase2_hgcal.toModify( simEcalTriggerPrimitiveDigis, BarrelOnly = cms.bool(True) ) +from Configuration.Eras.Modifier_phase2_hgcal_cff import phase2_hgcal +phase2_hgcal.toModify( simEcalTriggerPrimitiveDigis, BarrelOnly = cms.bool(True) ) diff --git a/SimCalorimetry/HcalSimProducers/python/hcalSimParameters_cfi.py b/SimCalorimetry/HcalSimProducers/python/hcalSimParameters_cfi.py index d1ae7394f7f37..538a5f3c11cf2 100644 --- a/SimCalorimetry/HcalSimProducers/python/hcalSimParameters_cfi.py +++ b/SimCalorimetry/HcalSimProducers/python/hcalSimParameters_cfi.py @@ -1,7 +1,6 @@ import FWCore.ParameterSet.Config as cms # This object modifies hcalSimParameters for different scenarios -from Configuration.StandardSequences.Eras import eras hcalSimParameters = cms.PSet( # In HF, the SimHits energy is actually @@ -105,7 +104,8 @@ hcalSimParameters.hoHamamatsu.sipmCrossTalk = cms.double(0.32) # Customises the HCal digitiser for post LS1 running -eras.run2_common.toModify( hcalSimParameters, +from Configuration.Eras.Modifier_run2_common_cff import run2_common +run2_common.toModify( hcalSimParameters, ho = dict( photoelectronsToAnalog = cms.vdouble([4.0]*16), siPMCode = cms.int32(1), @@ -116,7 +116,8 @@ hf2 = dict( samplingFactor = cms.double(0.67) ) ) -eras.run2_HE_2017.toModify( hcalSimParameters, +from Configuration.Eras.Modifier_run2_HE_2017_cff import run2_HE_2017 +run2_HE_2017.toModify( hcalSimParameters, he = dict( photoelectronsToAnalog = cms.vdouble([57.5]*14), pixels = cms.int32(27370), @@ -145,7 +146,8 @@ 190.94, 190.94, 190.94, 190.94, 190.94, 190.94, 190.94, 190.94, 190.94, 190.94 ) -eras.phase2_hcal.toModify( hcalSimParameters, +from Configuration.Eras.Modifier_phase2_hcal_cff import phase2_hcal +phase2_hcal.toModify( hcalSimParameters, hb = dict( photoelectronsToAnalog = cms.vdouble([57.5]*16), pixels = cms.int32(27370), diff --git a/SimCalorimetry/HcalSimProducers/python/hcalUnsuppressedDigis_cfi.py b/SimCalorimetry/HcalSimProducers/python/hcalUnsuppressedDigis_cfi.py index 50e6f0f7391b8..547d551489069 100644 --- a/SimCalorimetry/HcalSimProducers/python/hcalUnsuppressedDigis_cfi.py +++ b/SimCalorimetry/HcalSimProducers/python/hcalUnsuppressedDigis_cfi.py @@ -27,10 +27,11 @@ minFCToDelay=cms.double(5.) # old TC model! set to 5 for the new one ) -from Configuration.StandardSequences.Eras import eras -eras.fastSim.toModify( hcalSimBlock, hitsProducer=cms.string('famosSimHits') ) +from Configuration.Eras.Modifier_fastSim_cff import fastSim +fastSim.toModify( hcalSimBlock, hitsProducer=cms.string('famosSimHits') ) -eras.phase2_hcal.toModify( hcalSimBlock, +from Configuration.Eras.Modifier_phase2_hcal_cff import phase2_hcal +phase2_hcal.toModify( hcalSimBlock, HBHEUpgradeQIE = cms.bool(True), HFUpgradeQIE = cms.bool(True), TestNumbering = cms.bool(True) diff --git a/SimCalorimetry/HcalZeroSuppressionProducers/python/hcalDigisRealistic_cfi.py b/SimCalorimetry/HcalZeroSuppressionProducers/python/hcalDigisRealistic_cfi.py index 8185b478d8ee4..95b9d084a5c7d 100644 --- a/SimCalorimetry/HcalZeroSuppressionProducers/python/hcalDigisRealistic_cfi.py +++ b/SimCalorimetry/HcalZeroSuppressionProducers/python/hcalDigisRealistic_cfi.py @@ -21,8 +21,8 @@ useConfigZSvalues = cms.int32(0) ) -from Configuration.StandardSequences.Eras import eras -eras.phase2_hcal.toModify( simHcalDigis, +from Configuration.Eras.Modifier_phase2_hcal_cff import phase2_hcal +phase2_hcal.toModify( simHcalDigis, useConfigZSvalues = cms.int32(1), HBlevel = cms.int32(16), HElevel = cms.int32(16), diff --git a/SimG4Core/Application/python/g4SimHits_cfi.py b/SimG4Core/Application/python/g4SimHits_cfi.py index 735028821fee6..d85fcff47c1d1 100644 --- a/SimG4Core/Application/python/g4SimHits_cfi.py +++ b/SimG4Core/Application/python/g4SimHits_cfi.py @@ -6,7 +6,6 @@ from SimG4CMS.Calo.HFDarkeningParams_cff import * ## This object is used to customise g4SimHits for different running scenarios -from Configuration.StandardSequences.Eras import eras common_heavy_suppression = cms.PSet( NeutronThreshold = cms.double(30.0), @@ -461,4 +460,5 @@ ## ## Change the HFShowerLibrary file used for Run 2 ## -eras.run2_common.toModify( g4SimHits.HFShowerLibrary, FileName = 'SimG4CMS/Calo/data/HFShowerLibrary_npmt_noatt_eta4_16en_v3.root' ) +from Configuration.Eras.Modifier_run2_common_cff import run2_common +run2_common.toModify( g4SimHits.HFShowerLibrary, FileName = 'SimG4CMS/Calo/data/HFShowerLibrary_npmt_noatt_eta4_16en_v3.root' ) diff --git a/SimG4Core/Configuration/python/SimG4Core_cff.py b/SimG4Core/Configuration/python/SimG4Core_cff.py index 4517d913aefe1..72a1b0e468bdc 100644 --- a/SimG4Core/Configuration/python/SimG4Core_cff.py +++ b/SimG4Core/Configuration/python/SimG4Core_cff.py @@ -6,8 +6,9 @@ # from SimG4Core.Application.g4SimHits_cfi import * -from Configuration.StandardSequences.Eras import eras -eras.phase2_hcal.toModify( g4SimHits, HCalSD = dict( TestNumberingScheme = True ) ) -eras.phase2_timing.toModify( g4SimHits.ECalSD, +from Configuration.Eras.Modifier_phase2_hcal_cff import phase2_hcal +phase2_hcal.toModify( g4SimHits, HCalSD = dict( TestNumberingScheme = True ) ) +from Configuration.Eras.Modifier_phase2_timing_cff import phase2_timing +phase2_timing.toModify( g4SimHits.ECalSD, StoreLayerTimeSim = cms.untracked.bool(True), TimeSliceUnit = cms.double(0.001) ) diff --git a/SimGeneral/Configuration/python/SimGeneral_EventContent_cff.py b/SimGeneral/Configuration/python/SimGeneral_EventContent_cff.py index f587fb35c169c..d37153522d50b 100644 --- a/SimGeneral/Configuration/python/SimGeneral_EventContent_cff.py +++ b/SimGeneral/Configuration/python/SimGeneral_EventContent_cff.py @@ -28,13 +28,14 @@ # mods for HGCAL _phase2_hgc_extraCommands = [ 'keep *_mix_HGCDigisEE_*', 'keep *_mix_HGCDigisHEfront_*', 'keep *_mix_HGCDigisHEback_*', 'keep *_mix_MergedCaloTruth_*' ] -from Configuration.StandardSequences.Eras import eras -eras.phase2_hgcal.toModify( SimGeneralRAW, outputCommands = SimGeneralRAW.outputCommands + _phase2_hgc_extraCommands ) -eras.phase2_hgcal.toModify( SimGeneralFEVTDEBUG, outputCommands = SimGeneralFEVTDEBUG.outputCommands + _phase2_hgc_extraCommands ) -eras.phase2_hgcal.toModify( SimGeneralRECO, outputCommands = SimGeneralRECO.outputCommands + _phase2_hgc_extraCommands ) +from Configuration.Eras.Modifier_phase2_hgcal_cff import phase2_hgcal +phase2_hgcal.toModify( SimGeneralRAW, outputCommands = SimGeneralRAW.outputCommands + _phase2_hgc_extraCommands ) +phase2_hgcal.toModify( SimGeneralFEVTDEBUG, outputCommands = SimGeneralFEVTDEBUG.outputCommands + _phase2_hgc_extraCommands ) +phase2_hgcal.toModify( SimGeneralRECO, outputCommands = SimGeneralRECO.outputCommands + _phase2_hgc_extraCommands ) _phase2_timing_extraCommands = [ 'keep *_mix_InitialVertices_*' ] -eras.phase2_timing.toModify( SimGeneralRAW, outputCommands = SimGeneralRAW.outputCommands + _phase2_timing_extraCommands ) -eras.phase2_timing.toModify( SimGeneralFEVTDEBUG, outputCommands = SimGeneralFEVTDEBUG.outputCommands + _phase2_timing_extraCommands ) -eras.phase2_timing.toModify( SimGeneralRECO, outputCommands = SimGeneralRECO.outputCommands + _phase2_timing_extraCommands ) +from Configuration.Eras.Modifier_phase2_timing_cff import phase2_timing +phase2_timing.toModify( SimGeneralRAW, outputCommands = SimGeneralRAW.outputCommands + _phase2_timing_extraCommands ) +phase2_timing.toModify( SimGeneralFEVTDEBUG, outputCommands = SimGeneralFEVTDEBUG.outputCommands + _phase2_timing_extraCommands ) +phase2_timing.toModify( SimGeneralRECO, outputCommands = SimGeneralRECO.outputCommands + _phase2_timing_extraCommands ) diff --git a/SimGeneral/DataMixingModule/python/mixOne_simraw_on_sim_cfi.py b/SimGeneral/DataMixingModule/python/mixOne_simraw_on_sim_cfi.py index dab5123361824..38c073cba1353 100644 --- a/SimGeneral/DataMixingModule/python/mixOne_simraw_on_sim_cfi.py +++ b/SimGeneral/DataMixingModule/python/mixOne_simraw_on_sim_cfi.py @@ -256,8 +256,8 @@ mixData.doEE = cms.bool(True) mixData.doES = cms.bool(True) -from Configuration.StandardSequences.Eras import eras -if eras.fastSim.isChosen(): +from Configuration.Eras.Modifier_fastSim_cff import fastSim +if fastSim.isChosen(): # from signal: mix tracks not strip or pixel digis mixData.TrackerMergeType = "tracks" import FastSimulation.Tracking.recoTrackAccumulator_cfi diff --git a/SimGeneral/MixingModule/python/SiPixelSimParameters_cfi.py b/SimGeneral/MixingModule/python/SiPixelSimParameters_cfi.py index 733da1d768bec..1d86c8c3366ea 100644 --- a/SimGeneral/MixingModule/python/SiPixelSimParameters_cfi.py +++ b/SimGeneral/MixingModule/python/SiPixelSimParameters_cfi.py @@ -3,7 +3,6 @@ # This object is used to make configuration changes for different running # scenarios, in this case for Run 2. See the code at the end of the # SiPixelSimBlock definition. -from Configuration.StandardSequences.Eras import eras def _modifyPixelDigitizerForPhase1Pixel( digitizer ) : """ @@ -88,7 +87,8 @@ def _modifyPixelDigitizerForPhase1Pixel( digitizer ) : # # Apply the changes for the different Run 2 running scenarios # -eras.phase1Pixel.toModify( SiPixelSimBlock, func=_modifyPixelDigitizerForPhase1Pixel ) +from Configuration.Eras.Modifier_phase1Pixel_cff import phase1Pixel +phase1Pixel.toModify( SiPixelSimBlock, func=_modifyPixelDigitizerForPhase1Pixel ) # Threshold in electrons are the Official CRAFT09 numbers: # FPix(smearing)/BPix(smearing) = 2480(160)/2730(200) diff --git a/SimGeneral/MixingModule/python/aliases_PreMix_cfi.py b/SimGeneral/MixingModule/python/aliases_PreMix_cfi.py index e6af1cb254fb8..11edbab7dbeee 100644 --- a/SimGeneral/MixingModule/python/aliases_PreMix_cfi.py +++ b/SimGeneral/MixingModule/python/aliases_PreMix_cfi.py @@ -42,9 +42,10 @@ #) # no castor,pixel,strip digis in fastsim -from Configuration.StandardSequences.Eras import eras -eras.fastSim.toModify(simCastorDigis, mix = None) -eras.fastSim.toModify(simSiPixelDigis, mix = None) -eras.fastSim.toModify(simSiStripDigis, mix = None) +from Configuration.Eras.Modifier_fastSim_cff import fastSim +fastSim.toModify(simCastorDigis, mix = None) +fastSim.toModify(simSiPixelDigis, mix = None) +fastSim.toModify(simSiStripDigis, mix = None) -eras.phase2_common.toModify(simCastorDigis, mix = None) +from Configuration.Eras.Modifier_phase2_common_cff import phase2_common +phase2_common.toModify(simCastorDigis, mix = None) diff --git a/SimGeneral/MixingModule/python/aliases_cfi.py b/SimGeneral/MixingModule/python/aliases_cfi.py index e88bea87f655d..2eee8503b23a5 100644 --- a/SimGeneral/MixingModule/python/aliases_cfi.py +++ b/SimGeneral/MixingModule/python/aliases_cfi.py @@ -38,9 +38,10 @@ ) # no castor,pixel,strip digis in fastsim -from Configuration.StandardSequences.Eras import eras -eras.fastSim.toModify(simCastorDigis, mix = None) -eras.fastSim.toModify(simSiPixelDigis, mix = None) -eras.fastSim.toModify(simSiStripDigis, mix = None) +from Configuration.Eras.Modifier_fastSim_cff import fastSim +fastSim.toModify(simCastorDigis, mix = None) +fastSim.toModify(simSiPixelDigis, mix = None) +fastSim.toModify(simSiStripDigis, mix = None) -eras.phase2_common.toModify(simCastorDigis, mix = None) +from Configuration.Eras.Modifier_phase2_common_cff import phase2_common +phase2_common.toModify(simCastorDigis, mix = None) diff --git a/SimGeneral/MixingModule/python/caloTruthProducer_cfi.py b/SimGeneral/MixingModule/python/caloTruthProducer_cfi.py index d625aabcdb06b..60dd69ec8ef36 100644 --- a/SimGeneral/MixingModule/python/caloTruthProducer_cfi.py +++ b/SimGeneral/MixingModule/python/caloTruthProducer_cfi.py @@ -30,6 +30,6 @@ HepMCProductLabel = cms.InputTag('generatorSmeared') ) -from Configuration.StandardSequences.Eras import eras -if eras.fastSim.isChosen(): +from Configuration.Eras.Modifier_fastSim_cff import fastSim +if fastSim.isChosen(): caloParticles = cms.PSet() # don't allow this to run in fastsim diff --git a/SimGeneral/MixingModule/python/digi_MixPreMix_cfi.py b/SimGeneral/MixingModule/python/digi_MixPreMix_cfi.py index 487dd7cddde0f..4fd124e91cf35 100644 --- a/SimGeneral/MixingModule/python/digi_MixPreMix_cfi.py +++ b/SimGeneral/MixingModule/python/digi_MixPreMix_cfi.py @@ -28,15 +28,16 @@ theDigitizersMixPreMix.strip.FedAlgorithm = cms.int32(5) # special ZS mode: accept adc>0 theDigitizersMixPreMix.pixel.AddPixelInefficiency = cms.bool(False) # will be added in DataMixer -from Configuration.StandardSequences.Eras import eras -if eras.fastSim.isChosen(): +from Configuration.Eras.Modifier_fastSim_cff import fastSim +if fastSim.isChosen(): # fastsim does not model castor delattr(theDigitizersMixPreMix,"castor") # fastsim does not digitize pixel and strip hits delattr(theDigitizersMixPreMix,"pixel") delattr(theDigitizersMixPreMix,"strip") -eras.phase2_common.toModify( theDigitizersMixPreMix, castor = None ) +from Configuration.Eras.Modifier_phase2_common_cff import phase2_common +phase2_common.toModify( theDigitizersMixPreMix, castor = None ) theDigitizersMixPreMixValid = cms.PSet( theDigitizersMixPreMix, diff --git a/SimGeneral/MixingModule/python/digitizers_cfi.py b/SimGeneral/MixingModule/python/digitizers_cfi.py index 397202b7342ab..6d7d1e6370f93 100644 --- a/SimGeneral/MixingModule/python/digitizers_cfi.py +++ b/SimGeneral/MixingModule/python/digitizers_cfi.py @@ -33,8 +33,8 @@ ) ) -from Configuration.StandardSequences.Eras import eras -if eras.fastSim.isChosen(): +from Configuration.Eras.Modifier_fastSim_cff import fastSim +if fastSim.isChosen(): # fastsim does not model castor delattr(theDigitizers,"castor") # fastsim does not digitize pixel and strip hits @@ -45,16 +45,19 @@ from SimCalorimetry.HGCalSimProducers.hgcalDigitizer_cfi import hgceeDigitizer, hgchebackDigitizer, hgchefrontDigitizer -eras.phase2_hgcal.toModify( theDigitizers, +from Configuration.Eras.Modifier_phase2_hgcal_cff import phase2_hgcal +phase2_hgcal.toModify( theDigitizers, hgceeDigitizer = cms.PSet(hgceeDigitizer), #hgchebackDigitizer = cms.PSet(hgchebackDigitizer), hgchefrontDigitizer = cms.PSet(hgchefrontDigitizer), ) -eras.phase2_common.toModify( theDigitizers, castor = None ) +from Configuration.Eras.Modifier_phase2_common_cff import phase2_common +phase2_common.toModify( theDigitizers, castor = None ) from SimGeneral.MixingModule.ecalTimeDigitizer_cfi import ecalTimeDigitizer -eras.phase2_timing.toModify( theDigitizers, +from Configuration.Eras.Modifier_phase2_timing_cff import phase2_timing +phase2_timing.toModify( theDigitizers, ecalTime = ecalTimeDigitizer.clone() ) theDigitizersValid = cms.PSet( @@ -65,9 +68,9 @@ ) -eras.phase2_hgcal.toModify( theDigitizersValid, +phase2_hgcal.toModify( theDigitizersValid, calotruth = cms.PSet( caloParticles ) ) -eras.phase2_timing.toModify( theDigitizersValid.mergedtruth, +phase2_timing.toModify( theDigitizersValid.mergedtruth, createInitialVertexCollection = cms.bool(True) ) diff --git a/SimGeneral/MixingModule/python/ecalDigitizer_cfi.py b/SimGeneral/MixingModule/python/ecalDigitizer_cfi.py index 827e0a7282697..e2bc216dee516 100644 --- a/SimGeneral/MixingModule/python/ecalDigitizer_cfi.py +++ b/SimGeneral/MixingModule/python/ecalDigitizer_cfi.py @@ -21,14 +21,15 @@ makeDigiSimLinks = cms.untracked.bool(False) ) -from Configuration.StandardSequences.Eras import eras -if eras.fastSim.isChosen(): +from Configuration.Eras.Modifier_fastSim_cff import fastSim +if fastSim.isChosen(): ecalDigitizer.hitsProducer = cms.string("famosSimHits") ecalDigitizer.doEB = cms.bool(True) ecalDigitizer.doEE = cms.bool(True) ecalDigitizer.doES = cms.bool(True) -from Configuration.StandardSequences.Eras import eras -eras.phase2_common.toModify( ecalDigitizer, doES = cms.bool(False) ) -eras.phase2_hgcal.toModify( ecalDigitizer, doEE = cms.bool(False) ) +from Configuration.Eras.Modifier_phase2_common_cff import phase2_common +phase2_common.toModify( ecalDigitizer, doES = cms.bool(False) ) +from Configuration.Eras.Modifier_phase2_hgcal_cff import phase2_hgcal +phase2_hgcal.toModify( ecalDigitizer, doEE = cms.bool(False) ) diff --git a/SimGeneral/MixingModule/python/mixObjects_cfi.py b/SimGeneral/MixingModule/python/mixObjects_cfi.py index 18389bb265072..03a3f33b6d516 100644 --- a/SimGeneral/MixingModule/python/mixObjects_cfi.py +++ b/SimGeneral/MixingModule/python/mixObjects_cfi.py @@ -1,5 +1,4 @@ import FWCore.ParameterSet.Config as cms -from Configuration.StandardSequences.Eras import eras mixSimHits = cms.PSet( input = cms.VInputTag( # note that this list needs to be in the same order as the subdets @@ -51,7 +50,8 @@ ) # fastsim customs -if eras.fastSim.isChosen(): +from Configuration.Eras.Modifier_fastSim_cff import fastSim +if fastSim.isChosen(): mixSimHits.input = cms.VInputTag( cms.InputTag("MuonSimHits","MuonCSCHits"), cms.InputTag("MuonSimHits","MuonDTHits"), @@ -89,7 +89,7 @@ ) # fastsim customs -if eras.fastSim.isChosen(): +if fastSim.isChosen(): mixCaloHits.input = cms.VInputTag( cms.InputTag("famosSimHits","EcalHitsEB"), cms.InputTag("famosSimHits","EcalHitsEE"), @@ -114,7 +114,7 @@ ) # fastsim customs -if eras.fastSim.isChosen(): +if fastSim.isChosen(): mixSimTracks.input = cms.VInputTag(cms.InputTag("famosSimHits")) mixSimVertices.input = cms.VInputTag(cms.InputTag("famosSimHits")) @@ -149,7 +149,7 @@ ) # fastsim customs -if eras.fastSim.isChosen(): +if fastSim.isChosen(): theMixObjects = cms.PSet( theMixObjects, mixRecoTracks = cms.PSet(mixReconstructedTracks) @@ -221,22 +221,24 @@ from SimCalorimetry.HGCalSimProducers.hgcalDigitizer_cfi import hgceeDigitizer, hgchefrontDigitizer -from Configuration.StandardSequences.Eras import eras -eras.run3_GEM.toModify( theMixObjects, +from Configuration.Eras.Modifier_run3_GEM_cff import run3_GEM +run3_GEM.toModify( theMixObjects, mixSH = dict( input = theMixObjects.mixSH.input + [ cms.InputTag("g4SimHits","MuonGEMHits") ], subdets = theMixObjects.mixSH.subdets + [ 'MuonGEMHits' ], crossingFrames = theMixObjects.mixSH.crossingFrames + [ 'MuonGEMHits' ] ) ) -eras.phase2_muon.toModify( theMixObjects, +from Configuration.Eras.Modifier_phase2_muon_cff import phase2_muon +phase2_muon.toModify( theMixObjects, mixSH = dict( input = theMixObjects.mixSH.input + [ cms.InputTag("g4SimHits","MuonME0Hits") ], subdets = theMixObjects.mixSH.subdets + [ 'MuonME0Hits' ], crossingFrames = theMixObjects.mixSH.crossingFrames + [ 'MuonME0Hits' ] ) ) -eras.phase2_hgcal.toModify( theMixObjects, +from Configuration.Eras.Modifier_phase2_hgcal_cff import phase2_hgcal +phase2_hgcal.toModify( theMixObjects, mixCH = dict( input = theMixObjects.mixCH.input + [ cms.InputTag("g4SimHits",hgceeDigitizer.hitCollection.value()), cms.InputTag("g4SimHits",hgchefrontDigitizer.hitCollection.value()) ], diff --git a/SimGeneral/MixingModule/python/trackingTruthProducer_cfi.py b/SimGeneral/MixingModule/python/trackingTruthProducer_cfi.py index 09bc43795a99a..9f6b5418d809e 100644 --- a/SimGeneral/MixingModule/python/trackingTruthProducer_cfi.py +++ b/SimGeneral/MixingModule/python/trackingTruthProducer_cfi.py @@ -37,8 +37,8 @@ HepMCProductLabel = cms.InputTag('generatorSmeared') ) -from Configuration.StandardSequences.Eras import eras -if eras.fastSim.isChosen(): +from Configuration.Eras.Modifier_fastSim_cff import fastSim +if fastSim.isChosen(): # for unknown reasons, fastsim needs this flag on trackingParticles.allowDifferentSimHitProcesses = True # fastsim labels for simhits, simtracks, simvertices @@ -51,9 +51,10 @@ trackingParticles.simTrackCollection = cms.InputTag('famosSimHits') trackingParticles.simVertexCollection = cms.InputTag('famosSimHits') -from Configuration.StandardSequences.Eras import eras -eras.run3_GEM.toModify(trackingParticles, simHitCollections = dict( +from Configuration.Eras.Modifier_run3_GEM_cff import run3_GEM +run3_GEM.toModify(trackingParticles, simHitCollections = dict( muon = trackingParticles.simHitCollections.muon+[cms.InputTag("g4SimHits","MuonGEMHits")])) -eras.phase2_muon.toModify( trackingParticles, simHitCollections = dict( +from Configuration.Eras.Modifier_phase2_muon_cff import phase2_muon +phase2_muon.toModify( trackingParticles, simHitCollections = dict( muon = trackingParticles.simHitCollections.muon+[cms.InputTag("g4SimHits","MuonME0Hits")])) diff --git a/SimGeneral/TrackingAnalysis/python/TrackingParticleSelection_cfi.py b/SimGeneral/TrackingAnalysis/python/TrackingParticleSelection_cfi.py index c6c77e251242c..29080ff25105d 100644 --- a/SimGeneral/TrackingAnalysis/python/TrackingParticleSelection_cfi.py +++ b/SimGeneral/TrackingAnalysis/python/TrackingParticleSelection_cfi.py @@ -58,9 +58,10 @@ trackingParticleSelection = cms.Sequence(mergedtruth) -from Configuration.StandardSequences.Eras import eras -eras.run3_GEM.toModify(trackingParticleSelection, simHitCollections = dict( +from Configuration.Eras.Modifier_run3_GEM_cff import run3_GEM +run3_GEM.toModify(trackingParticleSelection, simHitCollections = dict( muon = trackingParticleSelection.simHitCollections.muon+["g4SimHitsMuonGEMHits"])) -eras.phase2_muon.toModify( trackingParticleSelection, simHitCollections = dict( +from Configuration.Eras.Modifier_phase2_muon_cff import phase2_muon +phase2_muon.toModify( trackingParticleSelection, simHitCollections = dict( muon = trackingParticleSelection.simHitCollections.muon+["g4SimHitsMuonME0Hits"])) diff --git a/SimGeneral/TrackingAnalysis/python/simHitTPAssociation_cfi.py b/SimGeneral/TrackingAnalysis/python/simHitTPAssociation_cfi.py index 522a24be9d682..d5235718ff454 100644 --- a/SimGeneral/TrackingAnalysis/python/simHitTPAssociation_cfi.py +++ b/SimGeneral/TrackingAnalysis/python/simHitTPAssociation_cfi.py @@ -19,8 +19,8 @@ trackingParticleSrc = cms.InputTag('mix', 'MergedTrackTruth') ) -from Configuration.StandardSequences.Eras import eras -if eras.fastSim.isChosen(): +from Configuration.Eras.Modifier_fastSim_cff import fastSim +if fastSim.isChosen(): simHitTPAssocProducer.simHitSrc = cms.VInputTag(cms.InputTag('famosSimHits','TrackerHits'), cms.InputTag("MuonSimHits","MuonCSCHits"), cms.InputTag("MuonSimHits","MuonDTHits"), diff --git a/SimGeneral/TrackingAnalysis/python/trackingParticleNumberOfLayersProducer_cff.py b/SimGeneral/TrackingAnalysis/python/trackingParticleNumberOfLayersProducer_cff.py index dbee36117a753..b78c2d314d830 100644 --- a/SimGeneral/TrackingAnalysis/python/trackingParticleNumberOfLayersProducer_cff.py +++ b/SimGeneral/TrackingAnalysis/python/trackingParticleNumberOfLayersProducer_cff.py @@ -1,3 +1,3 @@ from SimGeneral.TrackingAnalysis.trackingParticleNumberOfLayersProducer_cfi import * -from Configuration.StandardSequences.Eras import eras -eras.fastSim.toModify(trackingParticleNumberOfLayersProducer, simHits=['famosSimHits:TrackerHits']) +from Configuration.Eras.Modifier_fastSim_cff import fastSim +fastSim.toModify(trackingParticleNumberOfLayersProducer, simHits=['famosSimHits:TrackerHits']) diff --git a/SimMuon/CSCDigitizer/python/muonCSCDigis_cfi.py b/SimMuon/CSCDigitizer/python/muonCSCDigis_cfi.py index b01e61c6ba311..3a6679e077685 100644 --- a/SimMuon/CSCDigitizer/python/muonCSCDigis_cfi.py +++ b/SimMuon/CSCDigitizer/python/muonCSCDigis_cfi.py @@ -1,7 +1,6 @@ import FWCore.ParameterSet.Config as cms # This object is used to customise for different running scenarios, e.g. run2 -from Configuration.StandardSequences.Eras import eras simMuonCSCDigis = cms.EDProducer("CSCDigiProducer", strips = cms.PSet( @@ -85,9 +84,10 @@ ## ## Change the the bunch timing offsets if running in Run 2 ## -eras.run2_common.toModify( simMuonCSCDigis.strips, bunchTimingOffsets=[0.0, 37.53, 37.66, 55.4, 48.2, 54.45, 53.78, 53.38, 54.12, 51.98, 51.28] ) -eras.run2_common.toModify( simMuonCSCDigis.wires, bunchTimingOffsets=[0.0, 22.88, 22.55, 29.28, 30.0, 30.0, 30.5, 31.0, 29.5, 29.1, 29.88] ) +from Configuration.Eras.Modifier_run2_common_cff import run2_common +run2_common.toModify( simMuonCSCDigis.strips, bunchTimingOffsets=[0.0, 37.53, 37.66, 55.4, 48.2, 54.45, 53.78, 53.38, 54.12, 51.98, 51.28] ) +run2_common.toModify( simMuonCSCDigis.wires, bunchTimingOffsets=[0.0, 22.88, 22.55, 29.28, 30.0, 30.0, 30.5, 31.0, 29.5, 29.1, 29.88] ) -from Configuration.StandardSequences.Eras import eras -if eras.fastSim.isChosen(): +from Configuration.Eras.Modifier_fastSim_cff import fastSim +if fastSim.isChosen(): simMuonCSCDigis.InputCollection = 'MuonSimHitsMuonCSCHits' diff --git a/SimMuon/Configuration/python/SimMuon_EventContent_cff.py b/SimMuon/Configuration/python/SimMuon_EventContent_cff.py index 1d8abac90e1fc..11e472c22b7fc 100644 --- a/SimMuon/Configuration/python/SimMuon_EventContent_cff.py +++ b/SimMuon/Configuration/python/SimMuon_EventContent_cff.py @@ -7,7 +7,6 @@ import FWCore.ParameterSet.Config as cms # Used to make conditional changes for different running scenarios -from Configuration.StandardSequences.Eras import eras #Full Event content with DIGI SimMuonFEVTDEBUG = cms.PSet( @@ -25,8 +24,9 @@ # Add extra collections if running in Run 2. Not sure why but these # collections were added to pretty much all event content in the old # customisation function. -eras.run2_common.toModify( SimMuonRAW.outputCommands, func=lambda outputCommands: outputCommands.append('keep *_simMuonCSCDigis_*_*') ) -eras.run2_common.toModify( SimMuonRAW.outputCommands, func=lambda outputCommands: outputCommands.append('keep *_simMuonRPCDigis_*_*') ) +from Configuration.Eras.Modifier_run2_common_cff import run2_common +run2_common.toModify( SimMuonRAW.outputCommands, func=lambda outputCommands: outputCommands.append('keep *_simMuonCSCDigis_*_*') ) +run2_common.toModify( SimMuonRAW.outputCommands, func=lambda outputCommands: outputCommands.append('keep *_simMuonRPCDigis_*_*') ) #RECO content SimMuonRECO = cms.PSet( @@ -39,10 +39,11 @@ outputCommands = cms.untracked.vstring() ) -from Configuration.StandardSequences.Eras import eras -eras.run3_GEM.toModify( SimMuonFEVTDEBUG, outputCommands = SimMuonFEVTDEBUG.outputCommands + ['keep *_simMuonGEMDigis_*_*', +from Configuration.Eras.Modifier_run3_GEM_cff import run3_GEM +run3_GEM.toModify( SimMuonFEVTDEBUG, outputCommands = SimMuonFEVTDEBUG.outputCommands + ['keep *_simMuonGEMDigis_*_*', 'keep *_simMuonGEMPadDigis_*_*', 'keep *_simMuonGEMPadDigiClusters_*_*'] ) -eras.run3_GEM.toModify( SimMuonRAW, outputCommands = SimMuonRAW.outputCommands + ['keep StripDigiSimLinkedmDetSetVector_simMuonGEMDigis_*_*'] ) -eras.run3_GEM.toModify( SimMuonRECO, outputCommands = SimMuonRECO.outputCommands + ['keep StripDigiSimLinkedmDetSetVector_simMuonGEMDigis_*_*'] ) -eras.phase2_muon.toModify( SimMuonFEVTDEBUG, outputCommands = SimMuonFEVTDEBUG.outputCommands + ['keep *_simMuonME0Digis_*_*'] ) +run3_GEM.toModify( SimMuonRAW, outputCommands = SimMuonRAW.outputCommands + ['keep StripDigiSimLinkedmDetSetVector_simMuonGEMDigis_*_*'] ) +run3_GEM.toModify( SimMuonRECO, outputCommands = SimMuonRECO.outputCommands + ['keep StripDigiSimLinkedmDetSetVector_simMuonGEMDigis_*_*'] ) +from Configuration.Eras.Modifier_phase2_muon_cff import phase2_muon +phase2_muon.toModify( SimMuonFEVTDEBUG, outputCommands = SimMuonFEVTDEBUG.outputCommands + ['keep *_simMuonME0Digis_*_*'] ) diff --git a/SimMuon/Configuration/python/SimMuon_cff.py b/SimMuon/Configuration/python/SimMuon_cff.py index 263e90f201fc4..85a20fdab092c 100644 --- a/SimMuon/Configuration/python/SimMuon_cff.py +++ b/SimMuon/Configuration/python/SimMuon_cff.py @@ -42,7 +42,8 @@ def _modifySimMuonForPhase2( theProcess ): ) theProcess.rpcphase2recovery_esprefer = cms.ESPrefer("PoolDBESSource","rpcphase2recovery_essource") -from Configuration.StandardSequences.Eras import eras -eras.run3_GEM.toReplaceWith( muonDigi, _run3_muonDigi ) -eras.phase2_muon.toReplaceWith( muonDigi, _phase2_muonDigi ) -modifyConfigurationStandardSequencesSimMuonPhase2_ = eras.phase2_muon.makeProcessModifier( _modifySimMuonForPhase2 ) +from Configuration.Eras.Modifier_run3_GEM_cff import run3_GEM +run3_GEM.toReplaceWith( muonDigi, _run3_muonDigi ) +from Configuration.Eras.Modifier_phase2_muon_cff import phase2_muon +phase2_muon.toReplaceWith( muonDigi, _phase2_muonDigi ) +modifyConfigurationStandardSequencesSimMuonPhase2_ = phase2_muon.makeProcessModifier( _modifySimMuonForPhase2 ) diff --git a/SimMuon/DTDigitizer/python/muonDTDigis_cfi.py b/SimMuon/DTDigitizer/python/muonDTDigis_cfi.py index 5b7955448f72d..cc5a230566ff8 100644 --- a/SimMuon/DTDigitizer/python/muonDTDigis_cfi.py +++ b/SimMuon/DTDigitizer/python/muonDTDigis_cfi.py @@ -37,8 +37,8 @@ ) -from Configuration.StandardSequences.Eras import eras -if eras.fastSim.isChosen(): +from Configuration.Eras.Modifier_fastSim_cff import fastSim +if fastSim.isChosen(): simMuonDTDigis.InputCollection = 'MuonSimHitsMuonDTHits' diff --git a/SimMuon/MCTruth/python/MuonAssociatorByHits_cfi.py b/SimMuon/MCTruth/python/MuonAssociatorByHits_cfi.py index 0159917a083c2..2990c6e086317 100644 --- a/SimMuon/MCTruth/python/MuonAssociatorByHits_cfi.py +++ b/SimMuon/MCTruth/python/MuonAssociatorByHits_cfi.py @@ -93,8 +93,8 @@ ) -from Configuration.StandardSequences.Eras import eras -if eras.fastSim.isChosen(): +from Configuration.Eras.Modifier_fastSim_cff import fastSim +if fastSim.isChosen(): #if True: obj = muonAssociatorByHitsCommonParameters obj.simtracksTag = "famosSimHits" @@ -139,8 +139,9 @@ ignoreMissingTrackCollection = cms.untracked.bool(False), ) -from Configuration.StandardSequences.Eras import eras -eras.run3_GEM.toModify( muonAssociatorByHits, useGEMs = cms.bool(True) ) -eras.phase2_tracker.toModify( muonAssociatorByHits, pixelSimLinkSrc = "simSiPixelDigis:Pixel" ) -eras.phase2_tracker.toModify( muonAssociatorByHits, stripSimLinkSrc = "simSiPixelDigis:Tracker" ) +from Configuration.Eras.Modifier_run3_GEM_cff import run3_GEM +run3_GEM.toModify( muonAssociatorByHits, useGEMs = cms.bool(True) ) +from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker +phase2_tracker.toModify( muonAssociatorByHits, pixelSimLinkSrc = "simSiPixelDigis:Pixel" ) +phase2_tracker.toModify( muonAssociatorByHits, stripSimLinkSrc = "simSiPixelDigis:Tracker" ) diff --git a/SimMuon/MCTruth/python/muonAssociatorByHitsNoSimHitsHelper_cfi.py b/SimMuon/MCTruth/python/muonAssociatorByHitsNoSimHitsHelper_cfi.py index a2bcad37663e1..3d79fad9941eb 100644 --- a/SimMuon/MCTruth/python/muonAssociatorByHitsNoSimHitsHelper_cfi.py +++ b/SimMuon/MCTruth/python/muonAssociatorByHitsNoSimHitsHelper_cfi.py @@ -20,6 +20,6 @@ # use only muon system muonAssociatorByHitsNoSimHitsHelper.UseTracker = False -from Configuration.StandardSequences.Eras import eras -eras.phase2_tracker.toModify( muonAssociatorByHitsNoSimHitsHelper, pixelSimLinkSrc = "simSiPixelDigis:Pixel" ) -eras.phase2_tracker.toModify( muonAssociatorByHitsNoSimHitsHelper, stripSimLinkSrc = "simSiPixelDigis:Tracker" ) +from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker +phase2_tracker.toModify( muonAssociatorByHitsNoSimHitsHelper, pixelSimLinkSrc = "simSiPixelDigis:Pixel" ) +phase2_tracker.toModify( muonAssociatorByHitsNoSimHitsHelper, stripSimLinkSrc = "simSiPixelDigis:Tracker" ) diff --git a/SimMuon/RPCDigitizer/python/muonRPCDigis_cfi.py b/SimMuon/RPCDigitizer/python/muonRPCDigis_cfi.py index 67175e66afde2..93af7e1c980db 100644 --- a/SimMuon/RPCDigitizer/python/muonRPCDigis_cfi.py +++ b/SimMuon/RPCDigitizer/python/muonRPCDigis_cfi.py @@ -31,10 +31,11 @@ ) #the digitizer for PhaseII muon upgrade is RPCSimModelTiming and for the moment is based on RPCSimAverageNoiseEffCls -from Configuration.StandardSequences.Eras import eras -if eras.fastSim.isChosen(): +from Configuration.Eras.Modifier_fastSim_cff import fastSim +if fastSim.isChosen(): simMuonRPCDigis.InputCollection = 'MuonSimHitsMuonRPCHits' -if eras.phase2_muon.isChosen(): +from Configuration.Eras.Modifier_phase2_muon_cff import phase2_muon +if phase2_muon.isChosen(): simMuonRPCDigis = cms.EDProducer("RPCandIRPCDigiProducer", Noise = cms.bool(True), digiModelConfig = cms.PSet( diff --git a/SimTracker/TrackAssociatorProducers/python/quickTrackAssociatorByHits_cfi.py b/SimTracker/TrackAssociatorProducers/python/quickTrackAssociatorByHits_cfi.py index 44beec9b95a76..a300c432356f2 100644 --- a/SimTracker/TrackAssociatorProducers/python/quickTrackAssociatorByHits_cfi.py +++ b/SimTracker/TrackAssociatorProducers/python/quickTrackAssociatorByHits_cfi.py @@ -16,8 +16,8 @@ cluster2TPSrc = cms.InputTag("tpClusterProducer") ) -from Configuration.StandardSequences.Eras import eras -if eras.fastSim.isChosen(): +from Configuration.Eras.Modifier_fastSim_cff import fastSim +if fastSim.isChosen(): quickTrackAssociatorByHits.associateStrip = False quickTrackAssociatorByHits.associatePixel = False quickTrackAssociatorByHits.useClusterTPAssociation = False diff --git a/TrackingTools/TrackAssociator/python/DetIdAssociatorESProducer_cff.py b/TrackingTools/TrackAssociator/python/DetIdAssociatorESProducer_cff.py index f32823f176664..ef2a6935cdfde 100644 --- a/TrackingTools/TrackAssociator/python/DetIdAssociatorESProducer_cff.py +++ b/TrackingTools/TrackAssociator/python/DetIdAssociatorESProducer_cff.py @@ -1,7 +1,6 @@ import FWCore.ParameterSet.Config as cms # Use this object to make changes when different configurations are active -from Configuration.StandardSequences.Eras import eras ecalDetIdAssociator = cms.ESProducer("DetIdAssociatorESProducer", ComponentName = cms.string('EcalDetIdAssociator'), @@ -42,11 +41,14 @@ ) # If running in Run 2, include bad chambers -eras.run2_common.toModify( muonDetIdAssociator, includeBadChambers = True ) +from Configuration.Eras.Modifier_run2_common_cff import run2_common +run2_common.toModify( muonDetIdAssociator, includeBadChambers = True ) # include GEM & ME0 for phase2 -eras.run3_GEM.toModify( muonDetIdAssociator, includeGEM = True ) -eras.phase2_muon.toModify( muonDetIdAssociator, includeME0 = True ) +from Configuration.Eras.Modifier_run3_GEM_cff import run3_GEM +run3_GEM.toModify( muonDetIdAssociator, includeGEM = True ) +from Configuration.Eras.Modifier_phase2_muon_cff import phase2_muon +phase2_muon.toModify( muonDetIdAssociator, includeME0 = True ) preshowerDetIdAssociator = cms.ESProducer("DetIdAssociatorESProducer", ComponentName = cms.string('PreshowerDetIdAssociator'), diff --git a/Validation/Configuration/python/globalValidation_cff.py b/Validation/Configuration/python/globalValidation_cff.py index fa395bf0e7c2d..aac3c45573838 100644 --- a/Validation/Configuration/python/globalValidation_cff.py +++ b/Validation/Configuration/python/globalValidation_cff.py @@ -94,8 +94,8 @@ ) -from Configuration.StandardSequences.Eras import eras -if eras.fastSim.isChosen(): +from Configuration.Eras.Modifier_fastSim_cff import fastSim +if fastSim.isChosen(): # fastsim has no tracker digis and different tracker rechit and simhit structure => skipp globalValidation.remove(trackerHitsValidation) globalValidation.remove(trackerDigisValidation) @@ -161,6 +161,7 @@ _phase2_globalValidation = _run3_globalValidation.copy() _phase2_globalValidation += me0SimValid -from Configuration.StandardSequences.Eras import eras -eras.run3_GEM.toReplaceWith( globalValidation, _run3_globalValidation ) -eras.phase2_muon.toReplaceWith( globalValidation, _phase2_globalValidation ) +from Configuration.Eras.Modifier_run3_GEM_cff import run3_GEM +run3_GEM.toReplaceWith( globalValidation, _run3_globalValidation ) +from Configuration.Eras.Modifier_phase2_muon_cff import phase2_muon +phase2_muon.toReplaceWith( globalValidation, _phase2_globalValidation ) diff --git a/Validation/Configuration/python/postValidation_cff.py b/Validation/Configuration/python/postValidation_cff.py index c739b0e06ef63..a5190bfd97311 100644 --- a/Validation/Configuration/python/postValidation_cff.py +++ b/Validation/Configuration/python/postValidation_cff.py @@ -1,5 +1,4 @@ import FWCore.ParameterSet.Config as cms -from Configuration.StandardSequences.Eras import eras from Validation.RecoMuon.PostProcessor_cff import * from Validation.RecoTrack.PostProcessorTracker_cfi import * @@ -39,7 +38,8 @@ + bTagCollectorSequenceMCbcl + METPostProcessor ) -eras.phase1Pixel.toReplaceWith(postValidation, postValidation.copyAndExclude([ # FIXME +from Configuration.Eras.Modifier_phase1Pixel_cff import phase1Pixel +phase1Pixel.toReplaceWith(postValidation, postValidation.copyAndExclude([ # FIXME runTauEff # Excessive printouts because 2017 doesn't have HLT yet ])) @@ -103,6 +103,7 @@ _phase2_postValidation = _run3_postValidation.copy() _phase2_postValidation += hgcalPostProcessor -from Configuration.StandardSequences.Eras import eras -eras.run3_GEM.toReplaceWith( postValidation, _run3_postValidation ) -eras.phase2_hgcal.toReplaceWith( postValidation, _phase2_postValidation ) +from Configuration.Eras.Modifier_run3_GEM_cff import run3_GEM +run3_GEM.toReplaceWith( postValidation, _run3_postValidation ) +from Configuration.Eras.Modifier_phase2_hgcal_cff import phase2_hgcal +phase2_hgcal.toReplaceWith( postValidation, _phase2_postValidation ) diff --git a/Validation/DTRecHits/python/DTRecHitQualityAll_cfi.py b/Validation/DTRecHits/python/DTRecHitQualityAll_cfi.py index 75e442301d427..aee76b5455a0b 100644 --- a/Validation/DTRecHits/python/DTRecHitQualityAll_cfi.py +++ b/Validation/DTRecHits/python/DTRecHitQualityAll_cfi.py @@ -52,8 +52,8 @@ dtLocalRecoValidation = cms.Sequence(rechivalidation*seg2dvalidation*seg2dsuperphivalidation*seg4dvalidation) dtLocalRecoValidation_no2D = cms.Sequence(rechivalidation*seg2dsuperphivalidation*seg4dvalidation) -from Configuration.StandardSequences.Eras import eras -if eras.fastSim.isChosen(): +from Configuration.Eras.Modifier_fastSim_cff import fastSim +if fastSim.isChosen(): rechivalidation.simHitLabel = cms.untracked.InputTag("MuonSimHits","MuonDTHits") seg2dvalidation.simHitLabel = cms.untracked.InputTag("MuonSimHits","MuonDTHits") seg2dsuperphivalidation.simHitLabel = cms.untracked.InputTag("MuonSimHits","MuonDTHits") diff --git a/Validation/DTRecHits/python/DTRecHitQuality_cfi.py b/Validation/DTRecHits/python/DTRecHitQuality_cfi.py index 93f5c0c0fd078..951d51e10f60d 100644 --- a/Validation/DTRecHits/python/DTRecHitQuality_cfi.py +++ b/Validation/DTRecHits/python/DTRecHitQuality_cfi.py @@ -52,8 +52,8 @@ dtLocalRecoValidation = cms.Sequence(rechivalidation*seg2dvalidation*seg2dsuperphivalidation*seg4dvalidation) dtLocalRecoValidation_no2D = cms.Sequence(rechivalidation*seg2dsuperphivalidation*seg4dvalidation) -from Configuration.StandardSequences.Eras import eras -if eras.fastSim.isChosen(): +from Configuration.Eras.Modifier_fastSim_cff import fastSim +if fastSim.isChosen(): rechivalidation.simHitLabel = cms.untracked.InputTag("MuonSimHits","MuonDTHits") seg2dvalidation.simHitLabel = cms.untracked.InputTag("MuonSimHits","MuonDTHits") seg2dsuperphivalidation.simHitLabel = cms.untracked.InputTag("MuonSimHits","MuonDTHits") diff --git a/Validation/EcalDigis/python/ecalDigisValidation_cfi.py b/Validation/EcalDigis/python/ecalDigisValidation_cfi.py index c6648bfc64df4..a87730fbbc16b 100644 --- a/Validation/EcalDigis/python/ecalDigisValidation_cfi.py +++ b/Validation/EcalDigis/python/ecalDigisValidation_cfi.py @@ -10,8 +10,8 @@ moduleLabelG4 = cms.string('g4SimHits') ) -from Configuration.StandardSequences.Eras import eras -if eras.fastSim.isChosen(): +from Configuration.Eras.Modifier_fastSim_cff import fastSim +if fastSim.isChosen(): ecalDigisValidation.moduleLabelG4 = cms.string('famosSimHits') diff --git a/Validation/EcalDigis/python/ecalSelectiveReadoutValidation_cfi.py b/Validation/EcalDigis/python/ecalSelectiveReadoutValidation_cfi.py index adfb16aeb187e..21309d8cf676f 100644 --- a/Validation/EcalDigis/python/ecalSelectiveReadoutValidation_cfi.py +++ b/Validation/EcalDigis/python/ecalSelectiveReadoutValidation_cfi.py @@ -83,7 +83,7 @@ -from Configuration.StandardSequences.Eras import eras -if eras.fastSim.isChosen(): +from Configuration.Eras.Modifier_fastSim_cff import fastSim +if fastSim.isChosen(): ecalSelectiveReadoutValidation.EbSimHitCollection = cms.InputTag("famosSimHits","EcalHitsEB") ecalSelectiveReadoutValidation.EeSimHitCollection = cms.InputTag("famosSimHits","EcalHitsEE") diff --git a/Validation/EcalHits/python/ecalSimHitsValidation_cfi.py b/Validation/EcalHits/python/ecalSimHitsValidation_cfi.py index 90320ab7a8498..ec1870e5be1a8 100644 --- a/Validation/EcalHits/python/ecalSimHitsValidation_cfi.py +++ b/Validation/EcalHits/python/ecalSimHitsValidation_cfi.py @@ -10,6 +10,6 @@ moduleLabelG4 = cms.string('g4SimHits') ) -from Configuration.StandardSequences.Eras import eras -if eras.fastSim.isChosen(): +from Configuration.Eras.Modifier_fastSim_cff import fastSim +if fastSim.isChosen(): ecalSimHitsValidation.moduleLabelG4 = cms.string("famosSimHits") diff --git a/Validation/EcalRecHits/python/ecalRecHitsValidation_cfi.py b/Validation/EcalRecHits/python/ecalRecHitsValidation_cfi.py index 86c280eff527e..8838beb942fc5 100644 --- a/Validation/EcalRecHits/python/ecalRecHitsValidation_cfi.py +++ b/Validation/EcalRecHits/python/ecalRecHitsValidation_cfi.py @@ -12,6 +12,6 @@ moduleLabelMC = cms.string('generatorSmeared') ) -from Configuration.StandardSequences.Eras import eras -if eras.fastSim.isChosen(): +from Configuration.Eras.Modifier_fastSim_cff import fastSim +if fastSim.isChosen(): ecalRecHitsValidation.hitsProducer = "famosSimHits" diff --git a/Validation/HcalDigis/python/HcalDigisParam_cfi.py b/Validation/HcalDigis/python/HcalDigisParam_cfi.py index 24f37b0b2900a..34af24d4cc5ae 100644 --- a/Validation/HcalDigis/python/HcalDigisParam_cfi.py +++ b/Validation/HcalDigis/python/HcalDigisParam_cfi.py @@ -12,7 +12,7 @@ dataTPs = cms.InputTag("simHcalTriggerPrimitiveDigis") ) -from Configuration.StandardSequences.Eras import eras -if eras.fastSim.isChosen(): +from Configuration.Eras.Modifier_fastSim_cff import fastSim +if fastSim.isChosen(): hcaldigisAnalyzer.simHits = cms.untracked.InputTag("famosSimHits","HcalHits") diff --git a/Validation/HcalHits/python/HcalSimHitStudy_cfi.py b/Validation/HcalHits/python/HcalSimHitStudy_cfi.py index 46667333e2922..4ed1f255536da 100644 --- a/Validation/HcalHits/python/HcalSimHitStudy_cfi.py +++ b/Validation/HcalHits/python/HcalSimHitStudy_cfi.py @@ -8,6 +8,6 @@ ) -from Configuration.StandardSequences.Eras import eras -eras.fastSim.toModify( hcalSimHitStudy, ModuleLabel = cms.untracked.string('famosSimHits') ) +from Configuration.Eras.Modifier_fastSim_cff import fastSim +fastSim.toModify( hcalSimHitStudy, ModuleLabel = cms.untracked.string('famosSimHits') ) diff --git a/Validation/HcalHits/python/SimHitsValidationHcal_cfi.py b/Validation/HcalHits/python/SimHitsValidationHcal_cfi.py index d9586e4a60941..2fafe54c60459 100644 --- a/Validation/HcalHits/python/SimHitsValidationHcal_cfi.py +++ b/Validation/HcalHits/python/SimHitsValidationHcal_cfi.py @@ -7,5 +7,5 @@ TestNumber = cms.bool(False), ) -from Configuration.StandardSequences.Eras import eras -eras.fastSim.toModify( simHitsValidationHcal, ModuleLabel = cms.string("famosSimHits") ) +from Configuration.Eras.Modifier_fastSim_cff import fastSim +fastSim.toModify( simHitsValidationHcal, ModuleLabel = cms.string("famosSimHits") ) diff --git a/Validation/HcalRecHits/python/hcalRecHitsValidationSequence_cff.py b/Validation/HcalRecHits/python/hcalRecHitsValidationSequence_cff.py index 2dfaff96cd012..775ed1e41015e 100644 --- a/Validation/HcalRecHits/python/hcalRecHitsValidationSequence_cff.py +++ b/Validation/HcalRecHits/python/hcalRecHitsValidationSequence_cff.py @@ -10,6 +10,6 @@ hcalRecHitsValidationSequence = cms.Sequence(NoiseRatesValidation*RecHitsValidation) # fastsim hasn't got the right noise collection for the moment => no noise validation -from Configuration.StandardSequences.Eras import eras -if eras.fastSim.isChosen(): +from Configuration.Eras.Modifier_fastSim_cff import fastSim +if fastSim.isChosen(): hcalRecHitsValidationSequence.remove(NoiseRatesValidation) diff --git a/Validation/MuonCSCDigis/python/cscDigiValidation_cfi.py b/Validation/MuonCSCDigis/python/cscDigiValidation_cfi.py index d490f6c4659ab..72c72a2614e76 100644 --- a/Validation/MuonCSCDigis/python/cscDigiValidation_cfi.py +++ b/Validation/MuonCSCDigis/python/cscDigiValidation_cfi.py @@ -11,8 +11,8 @@ doSim = cms.bool(False) ) -from Configuration.StandardSequences.Eras import eras -if eras.fastSim.isChosen(): +from Configuration.Eras.Modifier_fastSim_cff import fastSim +if fastSim.isChosen(): cscDigiValidation.simHitsTag = cms.InputTag("mix", "MuonSimHitsMuonCSCHits") diff --git a/Validation/MuonDTDigis/python/dtDigiValidation_cfi.py b/Validation/MuonDTDigis/python/dtDigiValidation_cfi.py index 58476d1e25da8..991498fce1757 100644 --- a/Validation/MuonDTDigis/python/dtDigiValidation_cfi.py +++ b/Validation/MuonDTDigis/python/dtDigiValidation_cfi.py @@ -11,6 +11,6 @@ verbose = cms.untracked.bool(False) ) -from Configuration.StandardSequences.Eras import eras -if eras.fastSim.isChosen(): +from Configuration.Eras.Modifier_fastSim_cff import fastSim +if fastSim.isChosen(): muondtdigianalyzer.SimHitLabel = cms.InputTag("MuonSimHits","MuonDTHits") diff --git a/Validation/MuonHits/python/muonHitsValidation_cfi.py b/Validation/MuonHits/python/muonHitsValidation_cfi.py index 4e2c7bed6f533..dce3a821ce58b 100644 --- a/Validation/MuonHits/python/muonHitsValidation_cfi.py +++ b/Validation/MuonHits/python/muonHitsValidation_cfi.py @@ -16,8 +16,8 @@ Label = cms.string('Hits') ) -from Configuration.StandardSequences.Eras import eras -if eras.fastSim.isChosen(): +from Configuration.Eras.Modifier_fastSim_cff import fastSim +if fastSim.isChosen(): validSimHit.DTHitsSrc = cms.InputTag("MuonSimHits","MuonDTHits") validSimHit.CSCHitsSrc = cms.InputTag("MuonSimHits","MuonCSCHits") validSimHit.RPCHitsSrc = cms.InputTag("MuonSimHits","MuonRPCHits") diff --git a/Validation/MuonIdentification/python/muonIdVal_cfi.py b/Validation/MuonIdentification/python/muonIdVal_cfi.py index 5b8858e2d1b25..c76867206dc1a 100644 --- a/Validation/MuonIdentification/python/muonIdVal_cfi.py +++ b/Validation/MuonIdentification/python/muonIdVal_cfi.py @@ -21,6 +21,6 @@ ) # fastsim has no cosmic muon veto in place -from Configuration.StandardSequences.Eras import eras -if eras.fastSim.isChosen(): +from Configuration.Eras.Modifier_fastSim_cff import fastSim +if fastSim.isChosen(): muonIdVal.makeCosmicCompatibilityPlots = False diff --git a/Validation/MuonRPCDigis/python/validationMuonRPCDigis_cfi.py b/Validation/MuonRPCDigis/python/validationMuonRPCDigis_cfi.py index 8b73bc21b3056..3f7753632b573 100644 --- a/Validation/MuonRPCDigis/python/validationMuonRPCDigis_cfi.py +++ b/Validation/MuonRPCDigis/python/validationMuonRPCDigis_cfi.py @@ -11,7 +11,7 @@ outputFile = cms.untracked.string('') ) -from Configuration.StandardSequences.Eras import eras -if eras.fastSim.isChosen(): +from Configuration.Eras.Modifier_fastSim_cff import fastSim +if fastSim.isChosen(): validationMuonRPCDigis.simHitTag = cms.untracked.InputTag("MuonSimHits","MuonRPCHits") diff --git a/Validation/RPCRecHits/python/rpcRecHitValidation_cfi.py b/Validation/RPCRecHits/python/rpcRecHitValidation_cfi.py index 41b5d1e5ada04..cc6ccc691197d 100644 --- a/Validation/RPCRecHits/python/rpcRecHitValidation_cfi.py +++ b/Validation/RPCRecHits/python/rpcRecHitValidation_cfi.py @@ -11,7 +11,7 @@ rpcRecHitValidation_step = cms.Sequence(rpcRecHitV) -from Configuration.StandardSequences.Eras import eras -if eras.fastSim.isChosen(): +from Configuration.Eras.Modifier_fastSim_cff import fastSim +if fastSim.isChosen(): rpcRecHitV.simHit = cms.InputTag("MuonSimHits","MuonRPCHits") diff --git a/Validation/RecoEgamma/python/photonPostProcessor_cff.py b/Validation/RecoEgamma/python/photonPostProcessor_cff.py index 853f84cd216fb..7d14dde4eb56c 100644 --- a/Validation/RecoEgamma/python/photonPostProcessor_cff.py +++ b/Validation/RecoEgamma/python/photonPostProcessor_cff.py @@ -29,8 +29,8 @@ photonPostProcessor = cms.Sequence(photonPostprocessing*pfPhotonPostprocessing*conversionPostprocessing) #photonPostProcessor = cms.Sequence(photonPostprocessing*conversionPostprocessing) -from Configuration.StandardSequences.Eras import eras -if eras.fastSim.isChosen(): +from Configuration.Eras.Modifier_fastSim_cff import fastSim +if fastSim.isChosen(): photonPostprocessing.fastsim = cms.bool(True) oldpfPhotonPostprocessing.fastsim = cms.bool(True) diff --git a/Validation/RecoEgamma/python/photonValidator_cfi.py b/Validation/RecoEgamma/python/photonValidator_cfi.py index 0bd10489baba3..aef3d7dc8ae20 100644 --- a/Validation/RecoEgamma/python/photonValidator_cfi.py +++ b/Validation/RecoEgamma/python/photonValidator_cfi.py @@ -139,7 +139,7 @@ ) -from Configuration.StandardSequences.Eras import eras -if eras.fastSim.isChosen(): +from Configuration.Eras.Modifier_fastSim_cff import fastSim +if fastSim.isChosen(): photonValidation.fastSim = True diff --git a/Validation/RecoEgamma/python/tkConvValidator_cfi.py b/Validation/RecoEgamma/python/tkConvValidator_cfi.py index 1cc3e26bc11e8..1ca8465ad0b15 100644 --- a/Validation/RecoEgamma/python/tkConvValidator_cfi.py +++ b/Validation/RecoEgamma/python/tkConvValidator_cfi.py @@ -137,6 +137,6 @@ ) -from Configuration.StandardSequences.Eras import eras -if eras.fastSim.isChosen(): +from Configuration.Eras.Modifier_fastSim_cff import fastSim +if fastSim.isChosen(): tkConversionValidation.simTracks = cms.InputTag("famosSimHits") diff --git a/Validation/RecoMuon/python/MuonTrackValidator_cfi.py b/Validation/RecoMuon/python/MuonTrackValidator_cfi.py index 07ba48bda1d4a..200748465f6d8 100644 --- a/Validation/RecoMuon/python/MuonTrackValidator_cfi.py +++ b/Validation/RecoMuon/python/MuonTrackValidator_cfi.py @@ -114,5 +114,5 @@ nintZpos = cms.int32(100) ) -from Configuration.StandardSequences.Eras import eras -eras.run3_GEM.toModify( muonTrackValidator, useGEMs = cms.bool(True) ) +from Configuration.Eras.Modifier_run3_GEM_cff import run3_GEM +run3_GEM.toModify( muonTrackValidator, useGEMs = cms.bool(True) ) diff --git a/Validation/RecoMuon/python/associators_cff.py b/Validation/RecoMuon/python/associators_cff.py index 22693cdb531f6..4f4b8057e8328 100644 --- a/Validation/RecoMuon/python/associators_cff.py +++ b/Validation/RecoMuon/python/associators_cff.py @@ -386,8 +386,8 @@ # fastsim has no hlt specific dt hit collection -from Configuration.StandardSequences.Eras import eras -if eras.fastSim.isChosen(): +from Configuration.Eras.Modifier_fastSim_cff import fastSim +if fastSim.isChosen(): _DTrechitTag = SimMuon.MCTruth.MuonAssociatorByHits_cfi.muonAssociatorByHits.DTrechitTag tpToL3TkMuonAssociation.DTrechitTag = _DTrechitTag tpToL2MuonAssociation.DTrechitTag = _DTrechitTag diff --git a/Validation/RecoMuon/python/muonValidation_cff.py b/Validation/RecoMuon/python/muonValidation_cff.py index a7a68620ec88b..08a20c22cd36b 100644 --- a/Validation/RecoMuon/python/muonValidation_cff.py +++ b/Validation/RecoMuon/python/muonValidation_cff.py @@ -408,9 +408,9 @@ muonValidation_seq + muonValidationTEV_seq + muonValidationRefit_seq + muonValidationDisplaced_seq ) -from Configuration.StandardSequences.Eras import eras # no displaces in fastsim -if eras.fastSim.isChosen(): +from Configuration.Eras.Modifier_fastSim_cff import fastSim +if fastSim.isChosen(): recoMuonValidation = cms.Sequence(muonValidation_seq + muonValidationTEV_seq + muonValidationRefit_seq) # sequence for cosmic muons diff --git a/Validation/RecoTau/python/DQMMCValidation_cfi.py b/Validation/RecoTau/python/DQMMCValidation_cfi.py index f2ae72c46b0b5..b234c526cc6c7 100644 --- a/Validation/RecoTau/python/DQMMCValidation_cfi.py +++ b/Validation/RecoTau/python/DQMMCValidation_cfi.py @@ -1,4 +1,3 @@ -from Configuration.StandardSequences.Eras import eras from Validation.RecoTau.dataTypes.ValidateTausOnQCD_cff import * from Validation.RecoTau.dataTypes.ValidateTausOnRealData_cff import * @@ -19,7 +18,8 @@ TauValNumeratorAndDenominatorZMM+ TauValNumeratorAndDenominatorZTT ) -eras.phase1Pixel.toReplaceWith(pfTauRunDQMValidation, pfTauRunDQMValidation.copyAndExclude([ # FIXME +from Configuration.Eras.Modifier_phase1Pixel_cff import phase1Pixel +phase1Pixel.toReplaceWith(pfTauRunDQMValidation, pfTauRunDQMValidation.copyAndExclude([ # FIXME TauValNumeratorAndDenominatorRealData, # Excessive printouts because 2017 doesn't have HLT yet TauValNumeratorAndDenominatorRealElectronsData, # Excessive printouts because 2017 doesn't have HLT yet TauValNumeratorAndDenominatorRealMuonsData, # Excessive printouts because 2017 doesn't have HLT yet diff --git a/Validation/RecoTrack/python/MTVHistoProducerAlgoForTrackerBlock_cfi.py b/Validation/RecoTrack/python/MTVHistoProducerAlgoForTrackerBlock_cfi.py index 8e572787d422e..4c2cab788d67e 100644 --- a/Validation/RecoTrack/python/MTVHistoProducerAlgoForTrackerBlock_cfi.py +++ b/Validation/RecoTrack/python/MTVHistoProducerAlgoForTrackerBlock_cfi.py @@ -122,10 +122,11 @@ seedingLayerSets = cms.vstring(), ) -from Configuration.StandardSequences.Eras import eras def _modifyForPhase1(pset): pset.minEta = -3 pset.maxEta = 3 pset.nintEta = 60 -eras.phase1Pixel.toModify(MTVHistoProducerAlgoForTrackerBlock, _modifyForPhase1) -eras.phase2_tracker.toModify(MTVHistoProducerAlgoForTrackerBlock, minEta=-4.5, maxEta=4.5, nintEta = 90) +from Configuration.Eras.Modifier_phase1Pixel_cff import phase1Pixel +phase1Pixel.toModify(MTVHistoProducerAlgoForTrackerBlock, _modifyForPhase1) +from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker +phase2_tracker.toModify(MTVHistoProducerAlgoForTrackerBlock, minEta=-4.5, maxEta=4.5, nintEta = 90) diff --git a/Validation/RecoTrack/python/MultiTrackValidator_cfi.py b/Validation/RecoTrack/python/MultiTrackValidator_cfi.py index 603d416e217b7..54f7b4d186e2a 100644 --- a/Validation/RecoTrack/python/MultiTrackValidator_cfi.py +++ b/Validation/RecoTrack/python/MultiTrackValidator_cfi.py @@ -91,7 +91,7 @@ doSeedPlots = cms.untracked.bool(False), # input comes from TrackFromSeedProducer ) -from Configuration.StandardSequences.Eras import eras -if eras.fastSim.isChosen(): +from Configuration.Eras.Modifier_fastSim_cff import fastSim +if fastSim.isChosen(): multiTrackValidator.sim = [cms.InputTag('famosSimHits','TrackerHits')] diff --git a/Validation/RecoTrack/python/SiTrackingRecHitsValid_cff.py b/Validation/RecoTrack/python/SiTrackingRecHitsValid_cff.py index 8798a3e858258..6dfafeeaa9f1f 100644 --- a/Validation/RecoTrack/python/SiTrackingRecHitsValid_cff.py +++ b/Validation/RecoTrack/python/SiTrackingRecHitsValid_cff.py @@ -1,10 +1,10 @@ import FWCore.ParameterSet.Config as cms -from Configuration.StandardSequences.Eras import eras from RecoLocalTracker.SiStripRecHitConverter.StripCPE_cfi import * from Validation.RecoTrack.SiPixelTrackingRecHitsValid_cfi import * from Validation.RecoTrack.SiStripTrackingRecHitsValid_cfi import * trackingRecHitsValid = cms.Sequence(PixelTrackingRecHitsValid*StripTrackingRecHitsValid) -eras.phase1Pixel.toReplaceWith(trackingRecHitsValid, trackingRecHitsValid.copyAndExclude([ # FIXME +from Configuration.Eras.Modifier_phase1Pixel_cff import phase1Pixel +phase1Pixel.toReplaceWith(trackingRecHitsValid, trackingRecHitsValid.copyAndExclude([ # FIXME PixelTrackingRecHitsValid # Pixel validation needs to be migrated to phase1 ])) diff --git a/Validation/RecoTrack/python/TrackValidation_cff.py b/Validation/RecoTrack/python/TrackValidation_cff.py index bd50ca13c4ba0..64b1be2fab12a 100644 --- a/Validation/RecoTrack/python/TrackValidation_cff.py +++ b/Validation/RecoTrack/python/TrackValidation_cff.py @@ -17,7 +17,6 @@ from SimGeneral.TrackingAnalysis.trackingParticleNumberOfLayersProducer_cff import * from CommonTools.RecoAlgos.recoChargedRefCandidateToTrackRefProducer_cfi import recoChargedRefCandidateToTrackRefProducer as _recoChargedRefCandidateToTrackRefProducer -from Configuration.StandardSequences.Eras import eras import RecoTracker.IterativeTracking.iterativeTkConfig as _cfg ### First define the stuff for the standard validation sequence @@ -289,7 +288,8 @@ def _getSeedingLayers(seedProducers): #,maxpT = cms.double(3) #,nintpT = cms.int32(40) ) -eras.fastSim.toModify(trackValidator, +from Configuration.Eras.Modifier_fastSim_cff import fastSim +fastSim.toModify(trackValidator, dodEdxPlots = False) for era, postfix in _relevantEras: @@ -391,7 +391,7 @@ def _getSeedingLayers(seedProducers): VertexAssociatorByPositionAndTracks + trackingParticleNumberOfLayersProducer ) -eras.fastSim.toModify(tracksValidationTruth, lambda x: x.remove(tpClusterProducer)) +fastSim.toModify(tracksValidationTruth, lambda x: x.remove(tpClusterProducer)) tracksPreValidation = cms.Sequence( tracksValidationSelectors + @@ -401,7 +401,7 @@ def _getSeedingLayers(seedProducers): cms.ignore(trackingParticlesElectron) + trackingParticlesConversion ) -eras.fastSim.toReplaceWith(tracksPreValidation, tracksPreValidation.copyAndExclude([ +fastSim.toReplaceWith(tracksPreValidation, tracksPreValidation.copyAndExclude([ trackingParticlesElectron, trackingParticlesConversion ])) @@ -415,7 +415,7 @@ def _getSeedingLayers(seedProducers): trackValidatorConversion + trackValidatorGsfTracks ) -eras.fastSim.toReplaceWith(tracksValidation, tracksValidation.copyAndExclude([trackValidatorConversion, trackValidatorGsfTracks])) +fastSim.toReplaceWith(tracksValidation, tracksValidation.copyAndExclude([trackValidatorConversion, trackValidatorGsfTracks])) ### Then define stuff for standalone mode (i.e. MTV with RECO+DIGI input) @@ -470,7 +470,7 @@ def _getSeedingLayers(seedProducers): trackValidatorGsfTracks ) trackValidatorsStandalone = _trackValidatorsBase.copy() -eras.fastSim.toModify(trackValidatorsStandalone, lambda x: x.remove(trackValidatorConversionStandalone) ) +fastSim.toModify(trackValidatorsStandalone, lambda x: x.remove(trackValidatorConversionStandalone) ) tracksValidationStandalone = cms.Sequence( ak4PFL1FastL2L3CorrectorChain + @@ -522,7 +522,7 @@ def _getSeedingLayers(seedProducers): ) trackValidatorsTrackingOnly.replace(trackValidatorConversionStandalone, trackValidatorConversionTrackingOnly) trackValidatorsTrackingOnly.remove(trackValidatorGsfTracks) -eras.fastSim.toModify(trackValidatorsTrackingOnly, lambda x: x.remove(trackValidatorConversionTrackingOnly)) +fastSim.toModify(trackValidatorsTrackingOnly, lambda x: x.remove(trackValidatorConversionTrackingOnly)) tracksValidationTrackingOnly = cms.Sequence( diff --git a/Validation/RecoTrack/python/TrackingParticleSelectionForEfficiency_cfi.py b/Validation/RecoTrack/python/TrackingParticleSelectionForEfficiency_cfi.py index 619e1e0c87c8e..1953b2012e023 100644 --- a/Validation/RecoTrack/python/TrackingParticleSelectionForEfficiency_cfi.py +++ b/Validation/RecoTrack/python/TrackingParticleSelectionForEfficiency_cfi.py @@ -14,11 +14,13 @@ tipTP = cms.double(60) ) -from Configuration.StandardSequences.Eras import eras def _modifyForPhase1(pset): pset.minRapidityTP = -3 pset.maxRapidityTP = 3 -eras.phase1Pixel.toModify(TrackingParticleSelectionForEfficiency, _modifyForPhase1) -eras.phase2_tracker.toModify(TrackingParticleSelectionForEfficiency, minRapidityTP = -4.5, maxRapidityTP = 4.5) -if eras.fastSim.isChosen(): +from Configuration.Eras.Modifier_phase1Pixel_cff import phase1Pixel +phase1Pixel.toModify(TrackingParticleSelectionForEfficiency, _modifyForPhase1) +from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker +phase2_tracker.toModify(TrackingParticleSelectionForEfficiency, minRapidityTP = -4.5, maxRapidityTP = 4.5) +from Configuration.Eras.Modifier_fastSim_cff import fastSim +if fastSim.isChosen(): TrackingParticleSelectionForEfficiency.stableOnlyTP = True diff --git a/Validation/RecoTrack/python/TrackingParticleSelectionsForEfficiency_cff.py b/Validation/RecoTrack/python/TrackingParticleSelectionsForEfficiency_cff.py index b941843f9ad16..ce490c2bae52b 100644 --- a/Validation/RecoTrack/python/TrackingParticleSelectionsForEfficiency_cff.py +++ b/Validation/RecoTrack/python/TrackingParticleSelectionsForEfficiency_cff.py @@ -14,8 +14,8 @@ tip = cms.double(3.5) ) -from Configuration.StandardSequences.Eras import eras -if eras.fastSim.isChosen(): +from Configuration.Eras.Modifier_fastSim_cff import fastSim +if fastSim.isChosen(): generalTpSelectorBlock.stableOnly = True TpSelectorForEfficiencyVsEtaBlock = generalTpSelectorBlock.clone() @@ -27,7 +27,9 @@ def _modifyForPhase1(pset): pset.minRapidity = -3 pset.maxRapidity = 3 -eras.phase1Pixel.toModify(generalTpSelectorBlock, _modifyForPhase1) -eras.phase1Pixel.toModify(TpSelectorForEfficiencyVsEtaBlock, _modifyForPhase1) -eras.phase2_tracker.toModify(generalTpSelectorBlock, minRapidity=-4.5, maxRapidity=4.5) -eras.phase2_tracker.toModify(TpSelectorForEfficiencyVsEtaBlock, minRapidity=-4.5, maxRapidity=4.5) +from Configuration.Eras.Modifier_phase1Pixel_cff import phase1Pixel +phase1Pixel.toModify(generalTpSelectorBlock, _modifyForPhase1) +phase1Pixel.toModify(TpSelectorForEfficiencyVsEtaBlock, _modifyForPhase1) +from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker +phase2_tracker.toModify(generalTpSelectorBlock, minRapidity=-4.5, maxRapidity=4.5) +phase2_tracker.toModify(TpSelectorForEfficiencyVsEtaBlock, minRapidity=-4.5, maxRapidity=4.5) diff --git a/Validation/RecoTrack/python/trackingNtuple_cff.py b/Validation/RecoTrack/python/trackingNtuple_cff.py index 50ac393a395b9..43e6f5b878c78 100644 --- a/Validation/RecoTrack/python/trackingNtuple_cff.py +++ b/Validation/RecoTrack/python/trackingNtuple_cff.py @@ -1,5 +1,4 @@ import FWCore.ParameterSet.Config as cms -from Configuration.StandardSequences.Eras import eras from RecoLocalTracker.Configuration.RecoLocalTracker_cff import * from SimGeneral.TrackingAnalysis.simHitTPAssociation_cfi import * @@ -58,10 +57,12 @@ def _filterForNtuple(lst): (_seedSelectors, trackingNtupleSeedSelectors) = _TrackValidation_cff._addSeedToTrackProducers(_seedProducers, globals()) (_seedSelectors_trackingPhase1, _trackingNtupleSeedSelectors_trackingPhase1) = _TrackValidation_cff._addSeedToTrackProducers(_seedProducers_trackingPhase1, globals()) -eras.phase1Pixel.toReplaceWith(trackingNtupleSeedSelectors, _trackingNtupleSeedSelectors_trackingPhase1) +from Configuration.Eras.Modifier_phase1Pixel_cff import phase1Pixel +phase1Pixel.toReplaceWith(trackingNtupleSeedSelectors, _trackingNtupleSeedSelectors_trackingPhase1) trackingNtuple.seedTracks = _seedSelectors -eras.trackingPhase1.toModify(trackingNtuple, seedTracks = _seedSelectors_trackingPhase1) +from Configuration.Eras.Modifier_trackingPhase1_cff import trackingPhase1 +trackingPhase1.toModify(trackingNtuple, seedTracks = _seedSelectors_trackingPhase1) trackingNtupleSequence = cms.Sequence() # reproduce hits because they're not stored in RECO diff --git a/Validation/RecoVertex/python/PrimaryVertexAnalyzer4PUSlimmed_cfi.py b/Validation/RecoVertex/python/PrimaryVertexAnalyzer4PUSlimmed_cfi.py index 95bd7cabd5252..6b16f74cd7c93 100644 --- a/Validation/RecoVertex/python/PrimaryVertexAnalyzer4PUSlimmed_cfi.py +++ b/Validation/RecoVertex/python/PrimaryVertexAnalyzer4PUSlimmed_cfi.py @@ -1,5 +1,4 @@ import FWCore.ParameterSet.Config as cms -from Configuration.StandardSequences.Eras import eras selectedOfflinePrimaryVertices = cms.EDFilter("VertexSelector", src = cms.InputTag('offlinePrimaryVertices'), @@ -35,9 +34,12 @@ "firstStepPrimaryVertices" ] ) -eras.trackingLowPU.toModify(vertexAnalysisTrackingOnly, vertexRecoCollections = vertexAnalysis.vertexRecoCollections.value()) -eras.trackingPhase1PU70.toModify(vertexAnalysisTrackingOnly, vertexRecoCollections = vertexAnalysis.vertexRecoCollections.value()) -eras.trackingPhase2PU140.toModify(vertexAnalysisTrackingOnly, vertexRecoCollections = vertexAnalysis.vertexRecoCollections.value()) +from Configuration.Eras.Modifier_trackingLowPU_cff import trackingLowPU +trackingLowPU.toModify(vertexAnalysisTrackingOnly, vertexRecoCollections = vertexAnalysis.vertexRecoCollections.value()) +from Configuration.Eras.Modifier_trackingPhase1PU70_cff import trackingPhase1PU70 +trackingPhase1PU70.toModify(vertexAnalysisTrackingOnly, vertexRecoCollections = vertexAnalysis.vertexRecoCollections.value()) +from Configuration.Eras.Modifier_trackingPhase2PU140_cff import trackingPhase2PU140 +trackingPhase2PU140.toModify(vertexAnalysisTrackingOnly, vertexRecoCollections = vertexAnalysis.vertexRecoCollections.value()) pixelVertexAnalysisTrackingOnly = vertexAnalysis.clone( do_generic_sim_plots = False, @@ -78,6 +80,6 @@ + selectedPixelVertices + pixelVertexAnalysisTrackingOnly ) -eras.trackingLowPU.toReplaceWith(vertexAnalysisSequenceTrackingOnly, _vertexAnalysisSequenceTrackingOnly_trackingLowPU) -eras.trackingPhase1PU70.toReplaceWith(vertexAnalysisSequenceTrackingOnly, _vertexAnalysisSequenceTrackingOnly_trackingLowPU) -eras.trackingPhase2PU140.toReplaceWith(vertexAnalysisSequenceTrackingOnly, _vertexAnalysisSequenceTrackingOnly_trackingLowPU) +trackingLowPU.toReplaceWith(vertexAnalysisSequenceTrackingOnly, _vertexAnalysisSequenceTrackingOnly_trackingLowPU) +trackingPhase1PU70.toReplaceWith(vertexAnalysisSequenceTrackingOnly, _vertexAnalysisSequenceTrackingOnly_trackingLowPU) +trackingPhase2PU140.toReplaceWith(vertexAnalysisSequenceTrackingOnly, _vertexAnalysisSequenceTrackingOnly_trackingLowPU) From 1eb448176524ac5e23c5e48e0685ffa71741734d Mon Sep 17 00:00:00 2001 From: Kevin Pedro Date: Tue, 27 Sep 2016 12:55:53 -0500 Subject: [PATCH 2/2] restore eras import in tracking cffs (needs to be addressed separately) --- RecoTracker/IterativeTracking/python/DetachedQuadStep_cff.py | 1 + RecoTracker/IterativeTracking/python/DetachedTripletStep_cff.py | 1 + RecoTracker/IterativeTracking/python/HighPtTripletStep_cff.py | 1 + RecoTracker/IterativeTracking/python/LowPtQuadStep_cff.py | 1 + RecoTracker/IterativeTracking/python/LowPtTripletStep_cff.py | 1 + RecoTracker/IterativeTracking/python/MixedTripletStep_cff.py | 1 + RecoTracker/IterativeTracking/python/PixelLessStep_cff.py | 1 + RecoTracker/IterativeTracking/python/PixelPairStep_cff.py | 1 + RecoTracker/IterativeTracking/python/TobTecStep_cff.py | 1 + Validation/RecoTrack/python/TrackValidation_cff.py | 1 + 10 files changed, 10 insertions(+) diff --git a/RecoTracker/IterativeTracking/python/DetachedQuadStep_cff.py b/RecoTracker/IterativeTracking/python/DetachedQuadStep_cff.py index a69b007eb098f..7e855906e9bee 100644 --- a/RecoTracker/IterativeTracking/python/DetachedQuadStep_cff.py +++ b/RecoTracker/IterativeTracking/python/DetachedQuadStep_cff.py @@ -1,4 +1,5 @@ import FWCore.ParameterSet.Config as cms +from Configuration.StandardSequences.Eras import eras import RecoTracker.IterativeTracking.iterativeTkConfig as _cfg ############################################### diff --git a/RecoTracker/IterativeTracking/python/DetachedTripletStep_cff.py b/RecoTracker/IterativeTracking/python/DetachedTripletStep_cff.py index 22bc4d4fbd0d1..4ce92ca9b0b99 100644 --- a/RecoTracker/IterativeTracking/python/DetachedTripletStep_cff.py +++ b/RecoTracker/IterativeTracking/python/DetachedTripletStep_cff.py @@ -1,4 +1,5 @@ import FWCore.ParameterSet.Config as cms +from Configuration.StandardSequences.Eras import eras from Configuration.Eras.Modifier_tracker_apv_vfp30_2016_cff import tracker_apv_vfp30_2016 as _tracker_apv_vfp30_2016 import RecoTracker.IterativeTracking.iterativeTkConfig as _cfg diff --git a/RecoTracker/IterativeTracking/python/HighPtTripletStep_cff.py b/RecoTracker/IterativeTracking/python/HighPtTripletStep_cff.py index b6ba1c6868516..1e88d4c7cebfe 100644 --- a/RecoTracker/IterativeTracking/python/HighPtTripletStep_cff.py +++ b/RecoTracker/IterativeTracking/python/HighPtTripletStep_cff.py @@ -1,4 +1,5 @@ import FWCore.ParameterSet.Config as cms +from Configuration.StandardSequences.Eras import eras import RecoTracker.IterativeTracking.iterativeTkConfig as _cfg ### high-pT triplets ### diff --git a/RecoTracker/IterativeTracking/python/LowPtQuadStep_cff.py b/RecoTracker/IterativeTracking/python/LowPtQuadStep_cff.py index 25396f0fe6443..cacd59e299ab2 100644 --- a/RecoTracker/IterativeTracking/python/LowPtQuadStep_cff.py +++ b/RecoTracker/IterativeTracking/python/LowPtQuadStep_cff.py @@ -1,4 +1,5 @@ import FWCore.ParameterSet.Config as cms +from Configuration.StandardSequences.Eras import eras import RecoTracker.IterativeTracking.iterativeTkConfig as _cfg # NEW CLUSTERS (remove previously used clusters) diff --git a/RecoTracker/IterativeTracking/python/LowPtTripletStep_cff.py b/RecoTracker/IterativeTracking/python/LowPtTripletStep_cff.py index 923abaa007a33..42ea88846e2e0 100644 --- a/RecoTracker/IterativeTracking/python/LowPtTripletStep_cff.py +++ b/RecoTracker/IterativeTracking/python/LowPtTripletStep_cff.py @@ -1,4 +1,5 @@ import FWCore.ParameterSet.Config as cms +from Configuration.StandardSequences.Eras import eras from Configuration.Eras.Modifier_tracker_apv_vfp30_2016_cff import tracker_apv_vfp30_2016 as _tracker_apv_vfp30_2016 import RecoTracker.IterativeTracking.iterativeTkConfig as _cfg diff --git a/RecoTracker/IterativeTracking/python/MixedTripletStep_cff.py b/RecoTracker/IterativeTracking/python/MixedTripletStep_cff.py index b6f46cf72ce32..8f0324fcfb40b 100644 --- a/RecoTracker/IterativeTracking/python/MixedTripletStep_cff.py +++ b/RecoTracker/IterativeTracking/python/MixedTripletStep_cff.py @@ -1,4 +1,5 @@ import FWCore.ParameterSet.Config as cms +from Configuration.StandardSequences.Eras import eras import RecoTracker.IterativeTracking.iterativeTkConfig as _cfg ############################################################### diff --git a/RecoTracker/IterativeTracking/python/PixelLessStep_cff.py b/RecoTracker/IterativeTracking/python/PixelLessStep_cff.py index 4df8ac317839d..2a4697b371104 100644 --- a/RecoTracker/IterativeTracking/python/PixelLessStep_cff.py +++ b/RecoTracker/IterativeTracking/python/PixelLessStep_cff.py @@ -1,4 +1,5 @@ import FWCore.ParameterSet.Config as cms +from Configuration.StandardSequences.Eras import eras import RecoTracker.IterativeTracking.iterativeTkConfig as _cfg ########################################################################## diff --git a/RecoTracker/IterativeTracking/python/PixelPairStep_cff.py b/RecoTracker/IterativeTracking/python/PixelPairStep_cff.py index 3fef2bb9b098a..385cab7904922 100644 --- a/RecoTracker/IterativeTracking/python/PixelPairStep_cff.py +++ b/RecoTracker/IterativeTracking/python/PixelPairStep_cff.py @@ -1,4 +1,5 @@ import FWCore.ParameterSet.Config as cms +from Configuration.StandardSequences.Eras import eras from Configuration.Eras.Modifier_tracker_apv_vfp30_2016_cff import tracker_apv_vfp30_2016 as _tracker_apv_vfp30_2016 import RecoTracker.IterativeTracking.iterativeTkConfig as _cfg diff --git a/RecoTracker/IterativeTracking/python/TobTecStep_cff.py b/RecoTracker/IterativeTracking/python/TobTecStep_cff.py index 464064466516c..c4bf75059a1ef 100644 --- a/RecoTracker/IterativeTracking/python/TobTecStep_cff.py +++ b/RecoTracker/IterativeTracking/python/TobTecStep_cff.py @@ -1,4 +1,5 @@ import FWCore.ParameterSet.Config as cms +from Configuration.StandardSequences.Eras import eras import RecoTracker.IterativeTracking.iterativeTkConfig as _cfg ####################################################################### diff --git a/Validation/RecoTrack/python/TrackValidation_cff.py b/Validation/RecoTrack/python/TrackValidation_cff.py index 64b1be2fab12a..4478310afaa38 100644 --- a/Validation/RecoTrack/python/TrackValidation_cff.py +++ b/Validation/RecoTrack/python/TrackValidation_cff.py @@ -1,4 +1,5 @@ import FWCore.ParameterSet.Config as cms +from Configuration.StandardSequences.Eras import eras import SimTracker.TrackAssociatorProducers.trackAssociatorByChi2_cfi from SimTracker.TrackAssociatorProducers.quickTrackAssociatorByHits_cfi import *