From ab5818d4ce7ac930725f39b60b712f33a5acf011 Mon Sep 17 00:00:00 2001 From: Matthew Date: Sun, 25 Oct 2020 17:13:09 +0100 Subject: [PATCH 1/2] Common pp_on_AA modifier for 2018 and run3 eras --- .../python/ALCARECOTkAlJpsiMuMu_cff.py | 8 +-- .../python/ALCARECOTkAlMinBias_cff.py | 16 ++--- .../python/ALCARECOTkAlMuonIsolated_cff.py | 16 ++--- .../python/ALCARECOTkAlUpsilonMuMu_cff.py | 8 +-- .../python/ALCARECOTkAlZMuMu_cff.py | 8 +-- .../python/ALCARECODtCalib_Output_cff.py | 8 +-- .../python/ALCARECODtCalib_cff.py | 12 ++-- .../python/ALCARECOSiPixelCalZeroBias_cff.py | 8 +-- .../ALCARECOHcalCalMinBias_Output_cff.py | 8 +-- .../python/ALCARECOHcalCalMinBias_cff.py | 16 ++--- .../ALCARECOSiStripCalMinBiasAAG_cff.py | 8 +-- .../python/ALCARECOSiStripCalMinBias_cff.py | 8 +-- .../python/ALCARECOSiStripCalZeroBias_cff.py | 14 ++--- .../Eras/python/Era_Run2_2018_pp_on_AA_cff.py | 3 +- .../Eras/python/Era_Run3_pp_on_PbPb_cff.py | 3 +- .../EventContent/python/EventContent_cff.py | 4 +- .../ProcessModifiers/python/pp_on_AA_cff.py | 3 + .../python/Reconstruction_cff.py | 7 +-- DQM/Physics/python/DQMPhysics_cff.py | 6 +- .../python/SiStripClientConfig_Tier0_cff.py | 8 +-- .../python/TrackingClientConfig_Tier0_cff.py | 8 +-- .../python/TrackCollections2monitor_cff.py | 4 +- .../python/ALCARECOHcalCalDQM_cff.py | 8 +-- .../Configuration/python/DQMOffline_cff.py | 4 +- .../EGamma/python/egammaDQMOffline_cff.py | 4 +- .../python/dataCertificationJetMET_cff.py | 4 +- DQMOffline/JetMET/python/jetAnalyzer_cff.py | 12 ++-- DQMOffline/RecoB/python/dqmAnalyzer_cff.py | 19 +++--- .../python/HLTMuonOfflineAnalyzer_cff.py | 6 +- .../b2gHadronicHLTEventValidation_cfi.py | 7 +-- .../Common/python/HLTValidation_cff.py | 4 +- .../python/mcMatchLayer0/jetFlavourId_cff.py | 19 +++--- .../python/mcMatchLayer0/jetMatch_cfi.py | 7 +-- .../python/producersLayer1/jetProducer_cff.py | 5 +- .../python/producersLayer1/jetProducer_cfi.py | 5 +- .../producersLayer1/patCandidates_cff.py | 7 +-- .../python/recoLayer0/jetCorrFactors_cfi.py | 5 +- .../selectedPatCandidates_cff.py | 7 +-- .../python/slimming/MicroEventContent_cff.py | 5 +- .../python/slimming/applySubstructure_cff.py | 11 ++-- .../python/slimming/isolatedTracks_cfi.py | 5 +- .../PatAlgos/python/slimming/miniAOD_tools.py | 58 +++++++++---------- .../python/slimming/packedPFCandidates_cfi.py | 5 +- .../python/slimming/slimmedCaloJets_cfi.py | 5 +- .../python/slimming/slimmedGenJets_cfi.py | 7 +-- .../python/slimming/slimmedMuons_cfi.py | 4 +- .../python/slimming/slimmedTrackExtras_cff.py | 4 +- .../PatAlgos/python/slimming/slimming_cff.py | 14 ++--- .../python/impactParameterTagInfos_cfi.py | 5 +- .../python/pfImpactParameterTagInfos_cfi.py | 5 +- .../combinedSecondaryVertexV2BJetTags_cfi.py | 4 +- .../python/softPFElectronTagInfos_cfi.py | 5 +- .../python/softPFMuonTagInfos_cfi.py | 5 +- .../python/RecoEcal_EventContent_cff.py | 6 +- RecoEcal/Configuration/python/RecoEcal_cff.py | 4 +- .../correctedIslandBarrelSuperClusters_cfi.py | 4 +- .../correctedIslandEndcapSuperClusters_cfi.py | 4 +- .../python/islandSuperClusters_cfi.py | 4 +- .../particleFlowSuperClusterECAL_cfi.py | 8 +-- .../python/reducedRecHitsSequence_cff.py | 18 +++--- .../python/RecoEgamma_EventContent_cff.py | 5 +- .../Configuration/python/RecoEgamma_cff.py | 5 +- .../python/ecalDrivenElectronSeeds_cff.py | 4 +- .../python/gedGsfElectrons_cfi.py | 6 +- .../python/gsfElectrons_cfi.py | 6 +- .../python/lowPtGsfElectrons_cfi.py | 6 +- .../interestingEgammaIsoDetIdsSequence_cff.py | 4 +- .../python/photonSequence_cff.py | 5 +- .../python/reducedEgamma_cfi.py | 5 +- .../egammaObjectModificationsInMiniAOD_cff.py | 5 +- .../python/HiCentrality_cfi.py | 15 +++-- .../python/RecoJetsGlobal_cff.py | 7 +-- .../python/RecoJets_EventContent_cff.py | 8 +-- .../python/ak5JTA_cff.py | 11 ++-- RecoJets/JetProducers/python/ak4PFJets_cfi.py | 9 ++- RecoJets/JetProducers/python/ak8PFJets_cfi.py | 7 +-- .../JetProducers/python/caloJetsForTrk_cff.py | 4 +- .../python/RecoLocalCalo_EventContent_cff.py | 4 +- .../python/HcalHitSelection_cfi.py | 4 +- RecoMET/Configuration/python/RecoPFMET_cff.py | 8 +-- .../python/muons1stStep_cfi.py | 4 +- .../python/RecoParticleFlow_cff.py | 4 +- .../python/particleFlowEGamma_cff.py | 4 +- .../python/mergedElectronSeeds_cfi.py | 4 +- .../python/trackerDrivenElectronSeeds_cfi.py | 4 +- .../PixelTripletLargeTipGenerator_cfi.py | 4 +- .../pixelTripletLargeTipEDProducer_cfi.py | 4 +- .../Configuration/python/RecoPFTauTag_cff.py | 6 +- .../python/boostedHPSPFTaus_cff.py | 5 +- .../python/RecoTracker_EventContent_cff.py | 20 +++---- .../python/ConversionStep_cff.py | 4 +- ...TrajectorySeedProducerFromSingleLeg_cfi.py | 6 +- .../python/DetachedQuadStep_cff.py | 9 ++- .../python/DetachedTripletStep_cff.py | 9 ++- .../python/ElectronSeeds_cff.py | 8 +-- .../python/HighPtTripletStep_cff.py | 9 ++- .../python/InitialStepPreSplitting_cff.py | 4 +- .../python/InitialStep_cff.py | 11 ++-- .../python/JetCoreRegionalStep_cff.py | 5 +- .../python/LowPtQuadStep_cff.py | 9 ++- .../python/LowPtTripletStep_cff.py | 9 ++- .../python/MixedTripletStep_cff.py | 15 +++-- .../python/PixelLessStep_cff.py | 9 ++- .../python/PixelPairStep_cff.py | 10 ++-- .../python/TobTecStep_cff.py | 12 ++-- .../python/iterativeTkConfig.py | 4 +- .../python/MultiHitGeneratorFromChi2_cfi.py | 5 +- ...edGeneratorFromRegionHitsEDProducer_cfi.py | 5 +- .../python/multiHitFromChi2EDProducer_cfi.py | 5 +- .../python/trackerClusterCheck_cfi.py | 4 +- .../globalTrackingRegionWithVertices_cff.py | 5 +- .../python/inclusiveVertexing_cff.py | 8 +-- .../python/OfflinePrimaryVertices_cfi.py | 4 +- .../python/generalV0Candidates_cff.py | 4 +- .../python/hcaltpdigi_cff.py | 6 +- .../python/SimGeneral_EventContent_cff.py | 4 +- .../python/GsfElectronTracking_cff.py | 4 +- .../python/globalValidation_cff.py | 4 +- .../python/egammaSCAnalyzer_cfi.py | 4 +- 119 files changed, 417 insertions(+), 462 deletions(-) create mode 100644 Configuration/ProcessModifiers/python/pp_on_AA_cff.py diff --git a/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlJpsiMuMu_cff.py b/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlJpsiMuMu_cff.py index 0f552ff8c40cb..b3aa73ff292c7 100644 --- a/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlJpsiMuMu_cff.py +++ b/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlJpsiMuMu_cff.py @@ -53,7 +53,7 @@ ## customizations for the pp_on_AA eras from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017 -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -(pp_on_XeXe_2017 | pp_on_AA_2018).toModify(ALCARECOTkAlJpsiMuMuHLT, - eventSetupPathsKey='TkAlJpsiMuMuHI' - ) +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA +(pp_on_XeXe_2017 | pp_on_AA).toModify(ALCARECOTkAlJpsiMuMuHLT, + eventSetupPathsKey='TkAlJpsiMuMuHI' +) diff --git a/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlMinBias_cff.py b/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlMinBias_cff.py index e4a7c6c4c3a89..a410530e44df5 100644 --- a/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlMinBias_cff.py +++ b/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlMinBias_cff.py @@ -48,12 +48,12 @@ ## customizations for the pp_on_AA eras from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017 -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -(pp_on_XeXe_2017 | pp_on_AA_2018).toModify(ALCARECOTkAlMinBiasHLT, - eventSetupPathsKey='TkAlMinBiasHI' - ) - -(pp_on_XeXe_2017 | pp_on_AA_2018).toModify(ALCARECOTkAlMinBias, - trackQualities = cms.vstring("highPurity") - ) +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA +(pp_on_XeXe_2017 | pp_on_AA).toModify(ALCARECOTkAlMinBiasHLT, + eventSetupPathsKey='TkAlMinBiasHI' +) + +(pp_on_XeXe_2017 | pp_on_AA).toModify(ALCARECOTkAlMinBias, + trackQualities = cms.vstring("highPurity") +) diff --git a/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlMuonIsolated_cff.py b/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlMuonIsolated_cff.py index 67ae6d501af84..c79272ddf8a33 100644 --- a/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlMuonIsolated_cff.py +++ b/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlMuonIsolated_cff.py @@ -52,11 +52,11 @@ ## customizations for the pp_on_AA eras from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017 -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -(pp_on_XeXe_2017 | pp_on_AA_2018).toModify(ALCARECOTkAlMuonIsolatedHLT, - eventSetupPathsKey='TkAlMuonIsolatedHI' - ) - -(pp_on_XeXe_2017 | pp_on_AA_2018).toModify(ALCARECOTkAlMuonIsolated.GlobalSelector, - minJetDeltaR=0.0 - ) +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA +(pp_on_XeXe_2017 | pp_on_AA).toModify(ALCARECOTkAlMuonIsolatedHLT, + eventSetupPathsKey='TkAlMuonIsolatedHI' +) + +(pp_on_XeXe_2017 | pp_on_AA).toModify(ALCARECOTkAlMuonIsolated.GlobalSelector, + minJetDeltaR=0.0 +) diff --git a/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlUpsilonMuMu_cff.py b/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlUpsilonMuMu_cff.py index 9ccc9f2b9667a..33e1f16f01757 100644 --- a/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlUpsilonMuMu_cff.py +++ b/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlUpsilonMuMu_cff.py @@ -58,7 +58,7 @@ ## customizations for the pp_on_AA eras from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017 -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -(pp_on_XeXe_2017 | pp_on_AA_2018).toModify(ALCARECOTkAlUpsilonMuMuHLT, - eventSetupPathsKey='TkAlUpsilonMuMuHI' - ) +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA +(pp_on_XeXe_2017 | pp_on_AA).toModify(ALCARECOTkAlUpsilonMuMuHLT, + eventSetupPathsKey='TkAlUpsilonMuMuHI' +) diff --git a/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlZMuMu_cff.py b/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlZMuMu_cff.py index fe51fc5e096be..4f32742a45127 100644 --- a/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlZMuMu_cff.py +++ b/Alignment/CommonAlignmentProducer/python/ALCARECOTkAlZMuMu_cff.py @@ -55,7 +55,7 @@ ## customizations for the pp_on_AA eras from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017 -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -(pp_on_XeXe_2017 | pp_on_AA_2018).toModify(ALCARECOTkAlZMuMuHLT, - eventSetupPathsKey='TkAlZMuMuHI' - ) +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA +(pp_on_XeXe_2017 | pp_on_AA).toModify(ALCARECOTkAlZMuMuHLT, + eventSetupPathsKey='TkAlZMuMuHI' +) diff --git a/CalibMuon/DTCalibration/python/ALCARECODtCalib_Output_cff.py b/CalibMuon/DTCalibration/python/ALCARECODtCalib_Output_cff.py index 3198f27d6b513..c7b2f457d94ea 100644 --- a/CalibMuon/DTCalibration/python/ALCARECODtCalib_Output_cff.py +++ b/CalibMuon/DTCalibration/python/ALCARECODtCalib_Output_cff.py @@ -41,8 +41,8 @@ OutALCARECODtCalib = copy.deepcopy(OutALCARECODtCalib_noDrop) OutALCARECODtCalib.outputCommands.insert(0, "drop *") -## customizations for the pp_on_AA_2018 eras -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 +## customizations for the pp_on_AA eras +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA OutALCARECODtCalibHI = copy.deepcopy(OutALCARECODtCalib_noDrop) OutALCARECODtCalibHI.outputCommands.insert(0, "drop *") @@ -50,5 +50,5 @@ OutALCARECODtCalibHI.outputCommands.append("keep *_offlinePrimaryVerticesWithBS_*_*") OutALCARECODtCalibHI.outputCommands.append("keep *_offlinePrimaryVerticesFromCosmicTracks_*_*") -#Specify to use HI output for the pp_on_AA_2018 eras -pp_on_AA_2018.toReplaceWith(OutALCARECODtCalib,OutALCARECODtCalibHI) +#Specify to use HI output for the pp_on_AA eras +pp_on_AA.toReplaceWith(OutALCARECODtCalib,OutALCARECODtCalibHI) diff --git a/CalibMuon/DTCalibration/python/ALCARECODtCalib_cff.py b/CalibMuon/DTCalibration/python/ALCARECODtCalib_cff.py index 023c0986a3c2d..2773cb3c5dbc9 100644 --- a/CalibMuon/DTCalibration/python/ALCARECODtCalib_cff.py +++ b/CalibMuon/DTCalibration/python/ALCARECODtCalib_cff.py @@ -22,13 +22,13 @@ seqALCARECODtCalib = cms.Sequence(primaryVertexFilter * noscraping * ALCARECODtCalibHLTFilter * DTCalibMuonSelection * dt4DSegmentsNoWire) -## customizations for the pp_on_AA_2018 eras -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -pp_on_AA_2018.toModify(ALCARECODtCalibHLTFilter, - eventSetupPathsKey='DtCalibHI' +## customizations for the pp_on_AA eras +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA +pp_on_AA.toModify(ALCARECODtCalibHLTFilter, + eventSetupPathsKey='DtCalibHI' ) seqALCARECODtCalibHI = cms.Sequence(ALCARECODtCalibHLTFilter * dt4DSegmentsNoWire) -#Specify to use HI sequence for the pp_on_AA_2018 eras -pp_on_AA_2018.toReplaceWith(seqALCARECODtCalib,seqALCARECODtCalibHI) +#Specify to use HI sequence for the pp_on_AA eras +pp_on_AA.toReplaceWith(seqALCARECODtCalib,seqALCARECODtCalibHI) diff --git a/CalibTracker/SiPixelQuality/python/ALCARECOSiPixelCalZeroBias_cff.py b/CalibTracker/SiPixelQuality/python/ALCARECOSiPixelCalZeroBias_cff.py index 235f117a3a9fd..514e3710c829d 100644 --- a/CalibTracker/SiPixelQuality/python/ALCARECOSiPixelCalZeroBias_cff.py +++ b/CalibTracker/SiPixelQuality/python/ALCARECOSiPixelCalZeroBias_cff.py @@ -31,7 +31,7 @@ ## customizations for the pp_on_AA eras from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017 -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -(pp_on_XeXe_2017 | pp_on_AA_2018).toModify(ALCARECOSiPixelCalZeroBiasHLT, - eventSetupPathsKey='SiStripCalZeroBiasHI' - ) +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA +(pp_on_XeXe_2017 | pp_on_AA).toModify(ALCARECOSiPixelCalZeroBiasHLT, + eventSetupPathsKey='SiStripCalZeroBiasHI' +) diff --git a/Calibration/HcalAlCaRecoProducers/python/ALCARECOHcalCalMinBias_Output_cff.py b/Calibration/HcalAlCaRecoProducers/python/ALCARECOHcalCalMinBias_Output_cff.py index b73590b5bf017..619b4762c95f9 100644 --- a/Calibration/HcalAlCaRecoProducers/python/ALCARECOHcalCalMinBias_Output_cff.py +++ b/Calibration/HcalAlCaRecoProducers/python/ALCARECOHcalCalMinBias_Output_cff.py @@ -24,11 +24,11 @@ OutALCARECOHcalCalMinBias=copy.deepcopy(OutALCARECOHcalCalMinBias_noDrop) OutALCARECOHcalCalMinBias.outputCommands.insert(0, "drop *") -## customizations for the pp_on_AA_2018 eras -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 +## customizations for the pp_on_AA eras +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA OutALCARECOHcalCalMinBiasHI = copy.deepcopy(OutALCARECOHcalCalMinBias_noDrop) OutALCARECOHcalCalMinBiasHI.outputCommands.insert(0, "drop *") OutALCARECOHcalCalMinBiasHI.outputCommands.insert(6, "keep HFRecHitsSorted_hfreco_*_*") -#Specify to use HI output for the pp_on_AA_2018 eras -pp_on_AA_2018.toReplaceWith(OutALCARECOHcalCalMinBias,OutALCARECOHcalCalMinBiasHI) +#Specify to use HI output for the pp_on_AA +pp_on_AA.toReplaceWith(OutALCARECOHcalCalMinBias,OutALCARECOHcalCalMinBiasHI) diff --git a/Calibration/HcalAlCaRecoProducers/python/ALCARECOHcalCalMinBias_cff.py b/Calibration/HcalAlCaRecoProducers/python/ALCARECOHcalCalMinBias_cff.py index b8eea4b29e2d7..d787fb5195847 100644 --- a/Calibration/HcalAlCaRecoProducers/python/ALCARECOHcalCalMinBias_cff.py +++ b/Calibration/HcalAlCaRecoProducers/python/ALCARECOHcalCalMinBias_cff.py @@ -13,10 +13,10 @@ throw = False #dont throw except on unknown path name ) -## customizations for the pp_on_AA_2018 eras -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -pp_on_AA_2018.toModify(hcalminbiasHLT, - eventSetupPathsKey='HcalCalMinBiasHI' +## customizations for the pp_on_AA eras +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA +pp_on_AA.toModify(hcalminbiasHLT, + eventSetupPathsKey='HcalCalMinBiasHI' ) @@ -67,11 +67,11 @@ seqALCARECOHcalCalMinBias = cms.Sequence(hbherecoMBNZS*horecoMBNZS*hbherecoNoise*hfrecoNoise*hfrecoMBNZS*horecoNoise) -#Specify to use HI output for the pp_on_AA_2018 eras +#Specify to use HI output for the pp_on_AA eras seqALCARECOHcalCalMinBiasHI = cms.Sequence(hbherecoNoise*hfrecoNoise*hfrecoMBNZS*horecoNoise) -pp_on_AA_2018.toReplaceWith(seqALCARECOHcalCalMinBias, - seqALCARECOHcalCalMinBiasHI -) +pp_on_AA.toReplaceWith(seqALCARECOHcalCalMinBias, + seqALCARECOHcalCalMinBiasHI + ) import RecoLocalCalo.HcalRecProducers.hfprereco_cfi hfprerecoNoise = RecoLocalCalo.HcalRecProducers.hfprereco_cfi.hfprereco.clone( diff --git a/Calibration/TkAlCaRecoProducers/python/ALCARECOSiStripCalMinBiasAAG_cff.py b/Calibration/TkAlCaRecoProducers/python/ALCARECOSiStripCalMinBiasAAG_cff.py index c1667eccd6f32..b1f865fc9ad96 100644 --- a/Calibration/TkAlCaRecoProducers/python/ALCARECOSiStripCalMinBiasAAG_cff.py +++ b/Calibration/TkAlCaRecoProducers/python/ALCARECOSiStripCalMinBiasAAG_cff.py @@ -44,7 +44,7 @@ ## customizations for the pp_on_AA eras from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017 -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -(pp_on_XeXe_2017 | pp_on_AA_2018).toModify(ALCARECOSiStripCalMinBiasAAGHLT, - eventSetupPathsKey='SiStripCalMinBiasAAGHI' - ) +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA +(pp_on_XeXe_2017 | pp_on_AA).toModify(ALCARECOSiStripCalMinBiasAAGHLT, + eventSetupPathsKey='SiStripCalMinBiasAAGHI' +) diff --git a/Calibration/TkAlCaRecoProducers/python/ALCARECOSiStripCalMinBias_cff.py b/Calibration/TkAlCaRecoProducers/python/ALCARECOSiStripCalMinBias_cff.py index 3fa4e6669b631..b2f88590caeab 100644 --- a/Calibration/TkAlCaRecoProducers/python/ALCARECOSiStripCalMinBias_cff.py +++ b/Calibration/TkAlCaRecoProducers/python/ALCARECOSiStripCalMinBias_cff.py @@ -42,7 +42,7 @@ ## customizations for the pp_on_AA eras from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017 -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -(pp_on_XeXe_2017 | pp_on_AA_2018).toModify(ALCARECOSiStripCalMinBiasHLT, - eventSetupPathsKey='SiStripCalMinBiasHI' - ) +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA +(pp_on_XeXe_2017 | pp_on_AA).toModify(ALCARECOSiStripCalMinBiasHLT, + eventSetupPathsKey='SiStripCalMinBiasHI' +) diff --git a/Calibration/TkAlCaRecoProducers/python/ALCARECOSiStripCalZeroBias_cff.py b/Calibration/TkAlCaRecoProducers/python/ALCARECOSiStripCalZeroBias_cff.py index c13016b72e898..398b38e7add29 100644 --- a/Calibration/TkAlCaRecoProducers/python/ALCARECOSiStripCalZeroBias_cff.py +++ b/Calibration/TkAlCaRecoProducers/python/ALCARECOSiStripCalZeroBias_cff.py @@ -58,10 +58,10 @@ ## customizations for the pp_on_AA eras from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017 -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -(pp_on_XeXe_2017 | pp_on_AA_2018).toModify(ALCARECOSiStripCalZeroBiasHLT, - eventSetupPathsKey='SiStripCalZeroBiasHI' - ) +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA +(pp_on_XeXe_2017 | pp_on_AA).toModify(ALCARECOSiStripCalZeroBiasHLT, + eventSetupPathsKey='SiStripCalZeroBiasHI' +) # Select pp-like events based on the pixel cluster multiplicity import HLTrigger.special.hltPixelActivityFilter_cfi @@ -72,6 +72,6 @@ seqALCARECOSiStripCalZeroBiasHI = cms.Sequence(ALCARECOSiStripCalZeroBiasHLT*HLTPixelActivityFilterForSiStripCalZeroBias*DCSStatusForSiStripCalZeroBias*calZeroBiasClusters*APVPhases*consecutiveHEs) #Specify we want to use our other sequence -(pp_on_XeXe_2017 | pp_on_AA_2018).toReplaceWith(seqALCARECOSiStripCalZeroBias, - seqALCARECOSiStripCalZeroBiasHI - ) +(pp_on_XeXe_2017 | pp_on_AA).toReplaceWith(seqALCARECOSiStripCalZeroBias, + seqALCARECOSiStripCalZeroBiasHI +) diff --git a/Configuration/Eras/python/Era_Run2_2018_pp_on_AA_cff.py b/Configuration/Eras/python/Era_Run2_2018_pp_on_AA_cff.py index 8a31d9a1b7847..8a52dee220994 100644 --- a/Configuration/Eras/python/Era_Run2_2018_pp_on_AA_cff.py +++ b/Configuration/Eras/python/Era_Run2_2018_pp_on_AA_cff.py @@ -1,7 +1,8 @@ import FWCore.ParameterSet.Config as cms from Configuration.Eras.Era_Run2_2018_cff import Run2_2018 +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 from Configuration.Eras.Modifier_pf_badHcalMitigation_cff import pf_badHcalMitigation -Run2_2018_pp_on_AA = cms.ModifierChain(Run2_2018, pp_on_AA_2018, pf_badHcalMitigation) +Run2_2018_pp_on_AA = cms.ModifierChain(Run2_2018, pp_on_AA, pp_on_AA_2018, pf_badHcalMitigation) diff --git a/Configuration/Eras/python/Era_Run3_pp_on_PbPb_cff.py b/Configuration/Eras/python/Era_Run3_pp_on_PbPb_cff.py index a035a85542f08..0312aad3064a6 100644 --- a/Configuration/Eras/python/Era_Run3_pp_on_PbPb_cff.py +++ b/Configuration/Eras/python/Era_Run3_pp_on_PbPb_cff.py @@ -1,6 +1,7 @@ import FWCore.ParameterSet.Config as cms from Configuration.Eras.Era_Run3_cff import Run3 +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA from Configuration.Eras.Modifier_pp_on_PbPb_run3_cff import pp_on_PbPb_run3 -Run3_pp_on_PbPb = cms.ModifierChain(Run3, pp_on_PbPb_run3) +Run3_pp_on_PbPb = cms.ModifierChain(Run3, pp_on_AA, pp_on_PbPb_run3) diff --git a/Configuration/EventContent/python/EventContent_cff.py b/Configuration/EventContent/python/EventContent_cff.py index 58db317d5a983..e7bd292dbf241 100644 --- a/Configuration/EventContent/python/EventContent_cff.py +++ b/Configuration/EventContent/python/EventContent_cff.py @@ -219,7 +219,7 @@ def SwapKeepAndDrop(l): from Configuration.Eras.Modifier_phase2_timing_layer_cff import phase2_timing_layer from Configuration.Eras.Modifier_run2_GEM_2017_cff import run2_GEM_2017 from Configuration.Eras.Modifier_run3_GEM_cff import run3_GEM -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA from RecoLocalFastTime.Configuration.RecoLocalFastTime_EventContent_cff import * from RecoMTD.Configuration.RecoMTD_EventContent_cff import * @@ -503,7 +503,7 @@ def SwapKeepAndDrop(l): outputCommands = FEVTEventContent.outputCommands + ['keep *_muonGEMDigis_*_*']) run3_GEM.toModify(FEVTEventContent, outputCommands = FEVTEventContent.outputCommands + ['keep *_muonGEMDigis_*_*']) -pp_on_AA_2018.toModify(FEVTEventContent, +pp_on_AA.toModify(FEVTEventContent, outputCommands = FEVTEventContent.outputCommands + ['keep FEDRawDataCollection_rawDataRepacker_*_*']) phase2_timing_layer.toModify(FEVTEventContent, outputCommands = FEVTEventContent.outputCommands + RecoLocalFastTimeFEVT.outputCommands) diff --git a/Configuration/ProcessModifiers/python/pp_on_AA_cff.py b/Configuration/ProcessModifiers/python/pp_on_AA_cff.py new file mode 100644 index 0000000000000..ceaabd399346f --- /dev/null +++ b/Configuration/ProcessModifiers/python/pp_on_AA_cff.py @@ -0,0 +1,3 @@ +import FWCore.ParameterSet.Config as cms + +pp_on_AA = cms.Modifier() diff --git a/Configuration/StandardSequences/python/Reconstruction_cff.py b/Configuration/StandardSequences/python/Reconstruction_cff.py index d297eeeaf7bc3..4a9f5ee6eaa82 100644 --- a/Configuration/StandardSequences/python/Reconstruction_cff.py +++ b/Configuration/StandardSequences/python/Reconstruction_cff.py @@ -181,8 +181,7 @@ # AA data with pp reco from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017 -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -from Configuration.Eras.Modifier_pp_on_PbPb_run3_cff import pp_on_PbPb_run3 +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA from RecoHI.HiTracking.HILowPtConformalPixelTracks_cfi import * from RecoHI.HiCentralityAlgos.HiCentrality_cfi import hiCentrality from RecoHI.HiCentralityAlgos.HiClusterCompatibility_cfi import hiClusterCompatibility @@ -190,8 +189,8 @@ _highlevelreco_HITask.add(hiConformalPixelTracksTaskPhase1) _highlevelreco_HITask.add(hiCentrality) _highlevelreco_HITask.add(hiClusterCompatibility) -(pp_on_XeXe_2017 | pp_on_AA_2018 | pp_on_PbPb_run3).toReplaceWith(highlevelrecoTask, _highlevelreco_HITask) -pp_on_AA_2018.toReplaceWith(highlevelrecoTask,highlevelrecoTask.copyAndExclude([PFTauTask])) +(pp_on_XeXe_2017 | pp_on_AA ).toReplaceWith(highlevelrecoTask, _highlevelreco_HITask) +pp_on_AA.toReplaceWith(highlevelrecoTask,highlevelrecoTask.copyAndExclude([PFTauTask])) # not commisoned and not relevant in FastSim (?): _fastSim_highlevelrecoTask = highlevelrecoTask.copyAndExclude([muoncosmichighlevelrecoTask]) diff --git a/DQM/Physics/python/DQMPhysics_cff.py b/DQM/Physics/python/DQMPhysics_cff.py index 2fc4e2aee7089..df8bea41e33de 100644 --- a/DQM/Physics/python/DQMPhysics_cff.py +++ b/DQM/Physics/python/DQMPhysics_cff.py @@ -50,11 +50,11 @@ dqmPhysicspA = dqmPhysics.copy() dqmPhysicspA += CentralitypADQM pA_2016.toReplaceWith(dqmPhysics, dqmPhysicspA) -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA _dqmPhysics = dqmPhysics.copy() _dqmPhysics += CentralityDQM -pp_on_AA_2018.toModify(CentralityDQM, vertexcollection=cms.InputTag("offlinePrimaryVertices")) -pp_on_AA_2018.toReplaceWith(dqmPhysics, _dqmPhysics) +pp_on_AA.toModify(CentralityDQM, vertexcollection=cms.InputTag("offlinePrimaryVertices")) +pp_on_AA.toReplaceWith(dqmPhysics, _dqmPhysics) bphysicsOniaDQMHI = bphysicsOniaDQM.clone(vertex=cms.InputTag("hiSelectedVertex")) dqmPhysicsHI = cms.Sequence(bphysicsOniaDQMHI+CentralityDQM) diff --git a/DQM/SiStripMonitorClient/python/SiStripClientConfig_Tier0_cff.py b/DQM/SiStripMonitorClient/python/SiStripClientConfig_Tier0_cff.py index c5d3aaa00f359..df3679b6d09f7 100644 --- a/DQM/SiStripMonitorClient/python/SiStripClientConfig_Tier0_cff.py +++ b/DQM/SiStripMonitorClient/python/SiStripClientConfig_Tier0_cff.py @@ -38,10 +38,10 @@ getQualityTestsFromFile = cms.untracked.bool(True) ) -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -pp_on_AA_2018.toModify(siStripQTester, - qtList = cms.untracked.FileInPath('DQM/SiStripMonitorClient/data/sistrip_qualitytest_config_tier0_heavyions.xml') - ) +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA +pp_on_AA.toModify(siStripQTester, + qtList = cms.untracked.FileInPath('DQM/SiStripMonitorClient/data/sistrip_qualitytest_config_tier0_heavyions.xml') +) from CalibTracker.SiStripESProducers.SiStripQualityESProducer_cfi import siStripQualityESProducer mergedSiStripQualityProducer = siStripQualityESProducer.clone( diff --git a/DQM/TrackingMonitorClient/python/TrackingClientConfig_Tier0_cff.py b/DQM/TrackingMonitorClient/python/TrackingClientConfig_Tier0_cff.py index 4c21a1012da3f..93d4038db9292 100644 --- a/DQM/TrackingMonitorClient/python/TrackingClientConfig_Tier0_cff.py +++ b/DQM/TrackingMonitorClient/python/TrackingClientConfig_Tier0_cff.py @@ -67,10 +67,10 @@ getQualityTestsFromFile = cms.untracked.bool(True) ) -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -pp_on_AA_2018.toModify(trackingQTester, - qtList = cms.untracked.FileInPath('DQM/TrackingMonitorClient/data/tracking_qualitytest_config_tier0_heavyions.xml') - ) +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA +pp_on_AA.toModify(trackingQTester, + qtList = cms.untracked.FileInPath('DQM/TrackingMonitorClient/data/tracking_qualitytest_config_tier0_heavyions.xml') +) from DQM.TrackingMonitorClient.TrackingEffFromHitPatternClientConfig_cff import trackingEffFromHitPattern from DQM.TrackingMonitorClient.TrackingEffFromHitPatternClientConfigZeroBias_cff import trackingEffFromHitPatternZeroBias diff --git a/DQM/TrackingMonitorSource/python/TrackCollections2monitor_cff.py b/DQM/TrackingMonitorSource/python/TrackCollections2monitor_cff.py index 43f11fb888d7a..723c75ed68e76 100644 --- a/DQM/TrackingMonitorSource/python/TrackCollections2monitor_cff.py +++ b/DQM/TrackingMonitorSource/python/TrackCollections2monitor_cff.py @@ -355,5 +355,5 @@ # if tracks != 'generalTracks': # selectedTracks2runSequence+=sequenceName[tracks] -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -pp_on_AA_2018.toModify(selectedTracks, func=lambda selectedTracks: selectedTracks.extend( ['hiConformalPixelTracksQA'] )) +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA +pp_on_AA.toModify(selectedTracks, func=lambda selectedTracks: selectedTracks.extend( ['hiConformalPixelTracksQA'] )) diff --git a/DQMOffline/Configuration/python/ALCARECOHcalCalDQM_cff.py b/DQMOffline/Configuration/python/ALCARECOHcalCalDQM_cff.py index 79eace593da10..0924c4e3c7970 100644 --- a/DQMOffline/Configuration/python/ALCARECOHcalCalDQM_cff.py +++ b/DQMOffline/Configuration/python/ALCARECOHcalCalDQM_cff.py @@ -17,10 +17,10 @@ ALCARECOHcalCalHODQM = DQMOffline.CalibCalo.MonitorHOAlCaRecoStream_cfi.MonitorHOAlCaRecoStream.clone() -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA -pp_on_AA_2018.toModify(ALCARECOHcalCalPhisymDQM, - hbheInputMB = "hbhereco", - hoInputMB = "horeco" +pp_on_AA.toModify(ALCARECOHcalCalPhisymDQM, + hbheInputMB = "hbhereco", + hoInputMB = "horeco" ) diff --git a/DQMOffline/Configuration/python/DQMOffline_cff.py b/DQMOffline/Configuration/python/DQMOffline_cff.py index 87e75e214825d..2001c22352a48 100644 --- a/DQMOffline/Configuration/python/DQMOffline_cff.py +++ b/DQMOffline/Configuration/python/DQMOffline_cff.py @@ -232,9 +232,9 @@ run3_GEM.toReplaceWith(DQMOfflineMuon, _run3_GEM_DQMOfflineMuon) #Taus not created in pp conditions for HI -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA _DQMOfflineTAU = cms.Sequence() -pp_on_AA_2018.toReplaceWith(DQMOfflineTAU, _DQMOfflineTAU) +pp_on_AA.toReplaceWith(DQMOfflineTAU, _DQMOfflineTAU) # miniAOD DQM validation diff --git a/DQMOffline/EGamma/python/egammaDQMOffline_cff.py b/DQMOffline/EGamma/python/egammaDQMOffline_cff.py index 94c4d5e63a8be..e16f0eff527d7 100644 --- a/DQMOffline/EGamma/python/egammaDQMOffline_cff.py +++ b/DQMOffline/EGamma/python/egammaDQMOffline_cff.py @@ -51,7 +51,7 @@ ) from Configuration.Eras.Modifier_peripheralPbPb_cff import peripheralPbPb -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017 -for e in [peripheralPbPb, pp_on_AA_2018, pp_on_XeXe_2017]: +for e in [peripheralPbPb, pp_on_AA, pp_on_XeXe_2017]: e.toModify(stdPhotonAnalysis, phoProducer = cms.InputTag('islandPhotons')) diff --git a/DQMOffline/JetMET/python/dataCertificationJetMET_cff.py b/DQMOffline/JetMET/python/dataCertificationJetMET_cff.py index 1f7658dc9a10a..7d260577d6dde 100644 --- a/DQMOffline/JetMET/python/dataCertificationJetMET_cff.py +++ b/DQMOffline/JetMET/python/dataCertificationJetMET_cff.py @@ -6,6 +6,6 @@ dataCertificationJetMETSequenceHI = cms.Sequence(qTesterJet + qTesterMET + dataCertificationJetMETHI) -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA -pp_on_AA_2018.toReplaceWith( dataCertificationJetMETSequence, dataCertificationJetMETSequenceHI ) +pp_on_AA.toReplaceWith( dataCertificationJetMETSequence, dataCertificationJetMETSequenceHI ) diff --git a/DQMOffline/JetMET/python/jetAnalyzer_cff.py b/DQMOffline/JetMET/python/jetAnalyzer_cff.py index 1fdec06197c19..a580d6b8468be 100644 --- a/DQMOffline/JetMET/python/jetAnalyzer_cff.py +++ b/DQMOffline/JetMET/python/jetAnalyzer_cff.py @@ -36,10 +36,10 @@ * jetDQMAnalyzerAkPU4PF * jetDQMAnalyzerAkCs4PF ) -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -pp_on_AA_2018.toReplaceWith( jetDQMAnalyzerSequence, _jetDQMAnalyzerSequenceHI ) -pp_on_AA_2018.toModify( jetDQMAnalyzerAkPU4Calo, srcVtx = cms.untracked.InputTag("offlinePrimaryVertices") ) -pp_on_AA_2018.toModify( jetDQMAnalyzerAkPU3PF, srcVtx = cms.untracked.InputTag("offlinePrimaryVertices") ) -pp_on_AA_2018.toModify( jetDQMAnalyzerAkPU4PF, srcVtx = cms.untracked.InputTag("offlinePrimaryVertices") ) -pp_on_AA_2018.toModify( jetDQMAnalyzerAkCs4PF, srcVtx = cms.untracked.InputTag("offlinePrimaryVertices") ) +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA +pp_on_AA.toReplaceWith( jetDQMAnalyzerSequence, _jetDQMAnalyzerSequenceHI ) +pp_on_AA.toModify( jetDQMAnalyzerAkPU4Calo, srcVtx = cms.untracked.InputTag("offlinePrimaryVertices") ) +pp_on_AA.toModify( jetDQMAnalyzerAkPU3PF, srcVtx = cms.untracked.InputTag("offlinePrimaryVertices") ) +pp_on_AA.toModify( jetDQMAnalyzerAkPU4PF, srcVtx = cms.untracked.InputTag("offlinePrimaryVertices") ) +pp_on_AA.toModify( jetDQMAnalyzerAkCs4PF, srcVtx = cms.untracked.InputTag("offlinePrimaryVertices") ) diff --git a/DQMOffline/RecoB/python/dqmAnalyzer_cff.py b/DQMOffline/RecoB/python/dqmAnalyzer_cff.py index 09d2b82039a91..c2998a217bb13 100644 --- a/DQMOffline/RecoB/python/dqmAnalyzer_cff.py +++ b/DQMOffline/RecoB/python/dqmAnalyzer_cff.py @@ -12,10 +12,10 @@ ## customizations for the pp_on_AA eras from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017 -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -(pp_on_XeXe_2017 | pp_on_AA_2018).toModify(bTagAnalysis, - doJEC=False - ) +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA +(pp_on_XeXe_2017 | pp_on_AA).toModify(bTagAnalysis, + doJEC=False +) ########## MC ############ @@ -43,9 +43,8 @@ resolveAmbiguities = cms.bool(True) ) -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -from Configuration.Eras.Modifier_pp_on_PbPb_run3_cff import pp_on_PbPb_run3 -(pp_on_AA_2018 | pp_on_PbPb_run3).toModify(newpatJetGenJetMatch, src = "akCs4PFJets") +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA +pp_on_AA.toModify(newpatJetGenJetMatch, src = "akCs4PFJets") # Module execution for MC from Validation.RecoB.bTagAnalysis_cfi import * @@ -60,9 +59,9 @@ bTagPlotsMC = cms.Sequence(bTagValidation) ## customizations for the pp_on_AA eras -(pp_on_XeXe_2017 | pp_on_AA_2018).toModify(bTagValidation, - doJEC=False - ) +(pp_on_XeXe_2017 | pp_on_AA).toModify(bTagValidation, + doJEC=False +) #to run on fullsim in the validation sequence, all histograms produced in the dqmoffline sequence bTagValidationNoall = bTagValidation.clone(flavPlots="bcl") diff --git a/DQMOffline/Trigger/python/HLTMuonOfflineAnalyzer_cff.py b/DQMOffline/Trigger/python/HLTMuonOfflineAnalyzer_cff.py index 84e939fc8abca..25ea90399626c 100644 --- a/DQMOffline/Trigger/python/HLTMuonOfflineAnalyzer_cff.py +++ b/DQMOffline/Trigger/python/HLTMuonOfflineAnalyzer_cff.py @@ -184,16 +184,16 @@ from Configuration.Eras.Modifier_pA_2016_cff import pA_2016 from Configuration.Eras.Modifier_ppRef_2017_cff import ppRef_2017 -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA for muAna in [globalAnalyzerTnP.targetParams, trackerAnalyzerTnP.targetParams, tightAnalyzerTnP.targetParams, looseAnalyzerTnP.targetParams, globalAnalyzerRef.targetParams, trackerAnalyzerRef.targetParams, tightAnalyzerRef.targetParams, looseAnalyzerRef.targetParams,]: - for e in [pA_2016, ppRef_2017, pp_on_AA_2018]: + for e in [pA_2016, ppRef_2017, pp_on_AA]: e.toModify(muAna, ptCut_Jpsi = cms.untracked.double( 5.0)) for muAna in [globalAnalyzerTnP.binParams, trackerAnalyzerTnP.binParams, tightAnalyzerTnP.binParams, looseAnalyzerTnP.binParams, globalAnalyzerRef.binParams, trackerAnalyzerRef.binParams, tightAnalyzerRef.binParams, looseAnalyzerRef.binParams]: - for e in [pA_2016, ppRef_2017, pp_on_AA_2018]: + for e in [pA_2016, ppRef_2017, pp_on_AA]: e.toModify(muAna, ptCoarse = cms.untracked.vdouble(0.,1.,2.,3.,4.,5.,7.,9.,12.,15.,20.,30.,40.)) diff --git a/HLTriggerOffline/B2G/python/b2gHadronicHLTEventValidation_cfi.py b/HLTriggerOffline/B2G/python/b2gHadronicHLTEventValidation_cfi.py index 2921613584a61..4217372f08810 100644 --- a/HLTriggerOffline/B2G/python/b2gHadronicHLTEventValidation_cfi.py +++ b/HLTriggerOffline/B2G/python/b2gHadronicHLTEventValidation_cfi.py @@ -52,7 +52,6 @@ ) # puppi jets don't exist in HI wfs, use Cs jets instead -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -from Configuration.Eras.Modifier_pp_on_PbPb_run3_cff import pp_on_PbPb_run3 -(pp_on_AA_2018 | pp_on_PbPb_run3).toModify(b2gSingleJetHLTValidation, sJets = "akCs4PFJets") -(pp_on_AA_2018 | pp_on_PbPb_run3).toModify(b2gDiJetHLTValidation, sJets = "akCs4PFJets") +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA +pp_on_AA.toModify(b2gSingleJetHLTValidation, sJets = "akCs4PFJets") +pp_on_AA.toModify(b2gDiJetHLTValidation, sJets = "akCs4PFJets") diff --git a/HLTriggerOffline/Common/python/HLTValidation_cff.py b/HLTriggerOffline/Common/python/HLTValidation_cff.py index f40d724241d11..7ac76ddbf0c8f 100644 --- a/HLTriggerOffline/Common/python/HLTValidation_cff.py +++ b/HLTriggerOffline/Common/python/HLTValidation_cff.py @@ -82,8 +82,8 @@ ])) from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017 -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -for e in [pp_on_XeXe_2017, pp_on_AA_2018]: +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA +for e in [pp_on_XeXe_2017, pp_on_AA]: e.toReplaceWith(hltvalidation, hltvalidation.copyAndExclude([HiggsValidationSequence])) hltvalidation_preprod = cms.Sequence( diff --git a/PhysicsTools/PatAlgos/python/mcMatchLayer0/jetFlavourId_cff.py b/PhysicsTools/PatAlgos/python/mcMatchLayer0/jetFlavourId_cff.py index 87a3077f68894..af5b55cde9b64 100644 --- a/PhysicsTools/PatAlgos/python/mcMatchLayer0/jetFlavourId_cff.py +++ b/PhysicsTools/PatAlgos/python/mcMatchLayer0/jetFlavourId_cff.py @@ -42,14 +42,13 @@ patJetFlavourIdTask = cms.Task(patJetPartons, patJetFlavourAssociation) patJetFlavourId = cms.Sequence(patJetFlavourIdTask) -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -from Configuration.Eras.Modifier_pp_on_PbPb_run3_cff import pp_on_PbPb_run3 -(pp_on_AA_2018 | pp_on_PbPb_run3).toModify(patJetPartons, particles = "hiSignalGenParticles") -(pp_on_AA_2018 | pp_on_PbPb_run3).toModify(patJetFlavourAssociation, - jets = 'akCs4PFJets', - rParam = 0.4, - ) -(pp_on_AA_2018 | pp_on_PbPb_run3).toModify(patJetPartonAssociationLegacy, - jets = "akCs4PFJets", - partons = "allPartons", +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA +pp_on_AA.toModify(patJetPartons, particles = "hiSignalGenParticles") +pp_on_AA.toModify(patJetFlavourAssociation, + jets = 'akCs4PFJets', + rParam = 0.4, +) +pp_on_AA.toModify(patJetPartonAssociationLegacy, + jets = "akCs4PFJets", + partons = "allPartons", ) diff --git a/PhysicsTools/PatAlgos/python/mcMatchLayer0/jetMatch_cfi.py b/PhysicsTools/PatAlgos/python/mcMatchLayer0/jetMatch_cfi.py index 7a104c6646a03..0e97ccfc919e4 100644 --- a/PhysicsTools/PatAlgos/python/mcMatchLayer0/jetMatch_cfi.py +++ b/PhysicsTools/PatAlgos/python/mcMatchLayer0/jetMatch_cfi.py @@ -27,12 +27,11 @@ resolveByMatchQuality = cms.bool(False), # False = just match input in order; True = pick lowest deltaR pair first ) -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -from Configuration.Eras.Modifier_pp_on_PbPb_run3_cff import pp_on_PbPb_run3 -(pp_on_AA_2018 | pp_on_PbPb_run3).toModify(patJetGenJetMatch, +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA +pp_on_AA.toModify(patJetGenJetMatch, maxDeltaR = 0.4, resolveByMatchQuality = True, src = "akCs4PFJets", ) -(pp_on_AA_2018 | pp_on_PbPb_run3).toModify(patJetPartonMatch, src = "akCs4PFJets") +pp_on_AA.toModify(patJetPartonMatch, src = "akCs4PFJets") diff --git a/PhysicsTools/PatAlgos/python/producersLayer1/jetProducer_cff.py b/PhysicsTools/PatAlgos/python/producersLayer1/jetProducer_cff.py index cfdc3762f12a9..4a6febc4257e1 100644 --- a/PhysicsTools/PatAlgos/python/producersLayer1/jetProducer_cff.py +++ b/PhysicsTools/PatAlgos/python/producersLayer1/jetProducer_cff.py @@ -24,9 +24,8 @@ makePatJetsTask.copy() ) -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -from Configuration.Eras.Modifier_pp_on_PbPb_run3_cff import pp_on_PbPb_run3 -(pp_on_AA_2018 | pp_on_PbPb_run3).toReplaceWith(makePatJetsTask, _makePatJetsTaskHI) +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA +pp_on_AA.toReplaceWith(makePatJetsTask, _makePatJetsTaskHI) makePatJets = cms.Sequence(makePatJetsTask) diff --git a/PhysicsTools/PatAlgos/python/producersLayer1/jetProducer_cfi.py b/PhysicsTools/PatAlgos/python/producersLayer1/jetProducer_cfi.py index 6b191dba32a74..c48510ccc20a9 100644 --- a/PhysicsTools/PatAlgos/python/producersLayer1/jetProducer_cfi.py +++ b/PhysicsTools/PatAlgos/python/producersLayer1/jetProducer_cfi.py @@ -99,9 +99,8 @@ resolutions = cms.PSet() ) -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -from Configuration.Eras.Modifier_pp_on_PbPb_run3_cff import pp_on_PbPb_run3 -(pp_on_AA_2018 | pp_on_PbPb_run3).toModify(_patJets, +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA +pp_on_AA.toModify(_patJets, jetSource = "akCs4PFJets", genJetMatch = "patJetGenJetMatch", genPartonMatch = "patJetPartonMatch", diff --git a/PhysicsTools/PatAlgos/python/producersLayer1/patCandidates_cff.py b/PhysicsTools/PatAlgos/python/producersLayer1/patCandidates_cff.py index d940d972c3e30..c8e9e1177acd3 100644 --- a/PhysicsTools/PatAlgos/python/producersLayer1/patCandidates_cff.py +++ b/PhysicsTools/PatAlgos/python/producersLayer1/patCandidates_cff.py @@ -37,10 +37,9 @@ _patCandidatesTask = patCandidatesTask.copy() _patCandidatesTask.remove(makePatOOTPhotonsTask) -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -from Configuration.Eras.Modifier_pp_on_PbPb_run3_cff import pp_on_PbPb_run3 -(pp_on_AA_2018 | pp_on_PbPb_run3).toReplaceWith(patCandidatesTask, _patCandidatesTask) -(pp_on_AA_2018 | pp_on_PbPb_run3).toModify(patCandidateSummary.candidates, func = lambda list: list.remove(cms.InputTag("patOOTPhotons")) ) +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA +pp_on_AA.toReplaceWith(patCandidatesTask, _patCandidatesTask) +pp_on_AA.toModify(patCandidateSummary.candidates, func = lambda list: list.remove(cms.InputTag("patOOTPhotons")) ) patCandidates = cms.Sequence(patCandidateSummary, patCandidatesTask) diff --git a/PhysicsTools/PatAlgos/python/recoLayer0/jetCorrFactors_cfi.py b/PhysicsTools/PatAlgos/python/recoLayer0/jetCorrFactors_cfi.py index 05822b077a224..37ac9bf3975dc 100644 --- a/PhysicsTools/PatAlgos/python/recoLayer0/jetCorrFactors_cfi.py +++ b/PhysicsTools/PatAlgos/python/recoLayer0/jetCorrFactors_cfi.py @@ -41,9 +41,8 @@ rho = cms.InputTag('fixedGridRhoFastjetAll'), ) -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -from Configuration.Eras.Modifier_pp_on_PbPb_run3_cff import pp_on_PbPb_run3 -(pp_on_AA_2018 | pp_on_PbPb_run3).toModify(patJetCorrFactors, +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA +pp_on_AA.toModify(patJetCorrFactors, useNPV = False, useRho = False, levels = ['L2Relative','L3Absolute'], diff --git a/PhysicsTools/PatAlgos/python/selectionLayer1/selectedPatCandidates_cff.py b/PhysicsTools/PatAlgos/python/selectionLayer1/selectedPatCandidates_cff.py index add5c311028ac..3431fa77972cd 100644 --- a/PhysicsTools/PatAlgos/python/selectionLayer1/selectedPatCandidates_cff.py +++ b/PhysicsTools/PatAlgos/python/selectionLayer1/selectedPatCandidates_cff.py @@ -35,7 +35,6 @@ selectedPatCandidates = cms.Sequence(selectedPatCandidateSummary, selectedPatCandidatesTask) -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -from Configuration.Eras.Modifier_pp_on_PbPb_run3_cff import pp_on_PbPb_run3 -(pp_on_AA_2018 | pp_on_PbPb_run3).toReplaceWith(selectedPatCandidatesTask, selectedPatCandidatesTask.copyAndExclude([selectedPatOOTPhotons])) -(pp_on_AA_2018 | pp_on_PbPb_run3).toModify(selectedPatCandidateSummary.candidates, func = lambda list: list.remove(cms.InputTag("selectedPatOOTPhotons")) ) +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA +pp_on_AA.toReplaceWith(selectedPatCandidatesTask, selectedPatCandidatesTask.copyAndExclude([selectedPatOOTPhotons])) +pp_on_AA.toModify(selectedPatCandidateSummary.candidates, func = lambda list: list.remove(cms.InputTag("selectedPatOOTPhotons")) ) diff --git a/PhysicsTools/PatAlgos/python/slimming/MicroEventContent_cff.py b/PhysicsTools/PatAlgos/python/slimming/MicroEventContent_cff.py index e9118bbbedc07..fbddf3a41729c 100644 --- a/PhysicsTools/PatAlgos/python/slimming/MicroEventContent_cff.py +++ b/PhysicsTools/PatAlgos/python/slimming/MicroEventContent_cff.py @@ -152,9 +152,8 @@ 'keep *_hiEvtPlane_*_*', 'keep *_hiEvtPlaneFlat_*_*' ] -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -from Configuration.Eras.Modifier_pp_on_PbPb_run3_cff import pp_on_PbPb_run3 -(pp_on_AA_2018 | pp_on_PbPb_run3).toModify(MicroEventContent, outputCommands = MicroEventContent.outputCommands + _pp_on_AA_extraCommands) +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA +pp_on_AA.toModify(MicroEventContent, outputCommands = MicroEventContent.outputCommands + _pp_on_AA_extraCommands) MicroEventContentMC = cms.PSet( outputCommands = cms.untracked.vstring(MicroEventContent.outputCommands) diff --git a/PhysicsTools/PatAlgos/python/slimming/applySubstructure_cff.py b/PhysicsTools/PatAlgos/python/slimming/applySubstructure_cff.py index 99b238370d6a8..3f000f13d7a77 100644 --- a/PhysicsTools/PatAlgos/python/slimming/applySubstructure_cff.py +++ b/PhysicsTools/PatAlgos/python/slimming/applySubstructure_cff.py @@ -24,8 +24,7 @@ def applySubstructure( process, postfix="" ) : from Configuration.ProcessModifiers.run2_miniAOD_UL_cff import run2_miniAOD_UL _run2_miniAOD_ANY = (run2_miniAOD_80XLegacy | run2_miniAOD_94XFall17 | run2_miniAOD_UL) from Configuration.Eras.Modifier_pA_2016_cff import pA_2016 - from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 - from Configuration.Eras.Modifier_pp_on_PbPb_run3_cff import pp_on_PbPb_run3 + from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA if postfix=='': # Avoid recomputing the PUPPI collections that are present in AOD _rerun_puppijets_task = task.copy() @@ -33,7 +32,7 @@ def applySubstructure( process, postfix="" ) : getattr(process,'ak8PFJetsPuppiConstituents'), getattr(process,'ak8PFJetsPuppiSoftDrop'), getattr(process,'ak8PFJetsPuppiSoftDropMass')) - (_run2_miniAOD_ANY | pA_2016 | pp_on_AA_2018 | pp_on_PbPb_run3).toReplaceWith(task, _rerun_puppijets_task) + (_run2_miniAOD_ANY | pA_2016 | pp_on_AA).toReplaceWith(task, _rerun_puppijets_task) else: task.add(getattr(process,'ak8PFJetsPuppi'+postfix), getattr(process,'ak8PFJetsPuppiConstituents'+postfix), @@ -54,7 +53,7 @@ def applySubstructure( process, postfix="" ) : dropSpecific = cms.bool(True), # Save space ), process, task ) - (pp_on_AA_2018 | pp_on_PbPb_run3).toModify( getattr(process,'slimmedGenJetsAK8SoftDropSubJets'), cut = 'pt<0', nLoose = 0) + pp_on_AA.toModify( getattr(process,'slimmedGenJetsAK8SoftDropSubJets'), cut = 'pt<0', nLoose = 0) ## PATify puppi soft drop fat jets addJetCollection( @@ -93,7 +92,7 @@ def applySubstructure( process, postfix="" ) : #too slow now ==> disable from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017 from Configuration.Eras.Modifier_phase2_common_cff import phase2_common - for e in [pp_on_XeXe_2017, pp_on_AA_2018, pp_on_PbPb_run3, phase2_common]: + for e in [pp_on_XeXe_2017, pp_on_AA, phase2_common]: e.toModify(getattr(process,'nb1AK8PuppiSoftDrop'+postfix), cuts = ['pt > 999999', 'pt > 999999', 'pt > 999999'] ) e.toModify(getattr(process,'nb2AK8PuppiSoftDrop'+postfix), cuts = ['pt > 999999', 'pt > 999999', 'pt > 999999'] ) @@ -108,7 +107,7 @@ def applySubstructure( process, postfix="" ) : getattr(process,"patJetsAK8PFPuppiSoftDropSubjets"+postfix).userData.userFloats.src += ['nb2AK8PuppiSoftDropSubjets'+postfix+':ecfN2','nb2AK8PuppiSoftDropSubjets'+postfix+':ecfN3'] getattr(process,"patJetsAK8PFPuppiSoftDropSubjets"+postfix).userData.userFloats.src += ['NjettinessAK8Subjets'+postfix+':tau1','NjettinessAK8Subjets'+postfix+':tau2','NjettinessAK8Subjets'+postfix+':tau3','NjettinessAK8Subjets'+postfix+':tau4'] - for e in [pp_on_XeXe_2017, pp_on_AA_2018, pp_on_PbPb_run3, phase2_common]: + for e in [pp_on_XeXe_2017, pp_on_AA, phase2_common]: e.toModify(getattr(process,'nb1AK8PuppiSoftDropSubjets'+postfix), cuts = ['pt > 999999', 'pt > 999999', 'pt > 999999'] ) e.toModify(getattr(process,'nb2AK8PuppiSoftDropSubjets'+postfix), cuts = ['pt > 999999', 'pt > 999999', 'pt > 999999'] ) diff --git a/PhysicsTools/PatAlgos/python/slimming/isolatedTracks_cfi.py b/PhysicsTools/PatAlgos/python/slimming/isolatedTracks_cfi.py index fe6cd6f2b3fb0..995d59f90ed12 100644 --- a/PhysicsTools/PatAlgos/python/slimming/isolatedTracks_cfi.py +++ b/PhysicsTools/PatAlgos/python/slimming/isolatedTracks_cfi.py @@ -64,9 +64,8 @@ saveDeDxHitInfoCut = cms.string("(%s) || (%s)" % (_susySoftDisappearingTrackCut,_exoHighPtTrackCut)), ) -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -from Configuration.Eras.Modifier_pp_on_PbPb_run3_cff import pp_on_PbPb_run3 -(pp_on_AA_2018 | pp_on_PbPb_run3).toModify(isolatedTracks, useHighPurity = True) +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA +pp_on_AA.toModify(isolatedTracks, useHighPurity = True) def miniAOD_customizeIsolatedTracksFastSim(process): """Switch off dE/dx hit info on fast sim, as it's not available""" diff --git a/PhysicsTools/PatAlgos/python/slimming/miniAOD_tools.py b/PhysicsTools/PatAlgos/python/slimming/miniAOD_tools.py index 4ea6e2565f864..f652b14bbbf4e 100644 --- a/PhysicsTools/PatAlgos/python/slimming/miniAOD_tools.py +++ b/PhysicsTools/PatAlgos/python/slimming/miniAOD_tools.py @@ -4,9 +4,7 @@ from PhysicsTools.PatAlgos.tools.helpers import getPatAlgosToolsTask, addToProcessAndTask -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -from Configuration.Eras.Modifier_pp_on_PbPb_run3_cff import pp_on_PbPb_run3 -_hiGeneral = pp_on_AA_2018 | pp_on_PbPb_run3 +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA def miniAOD_customizeCommon(process): process.patMuons.isoDeposits = cms.PSet() @@ -123,8 +121,8 @@ def miniAOD_customizeCommon(process): from Configuration.Eras.Modifier_phase2_muon_cff import phase2_muon phase2_muon.toModify(process.selectedPatMuons, cut = "pt > 5 || isPFMuon || (pt > 3 && (isGlobalMuon || isStandAloneMuon || numberOfMatches > 0 || muonID('RPCMuLoose') || muonID('ME0MuonArbitrated') || muonID('GEMMuonArbitrated')) )") - - _hiGeneral.toModify(process.selectedPatMuons, cut = "pt > 5 || isPFMuon || (pt > 1.2 && (isGlobalMuon || isStandAloneMuon) )") + from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA + pp_on_AA.toModify(process.selectedPatMuons, cut = "pt > 5 || isPFMuon || (pt > 1.2 && (isGlobalMuon || isStandAloneMuon) )") process.selectedPatElectrons.cut = cms.string("") process.selectedPatTaus.cut = cms.string("pt > 18. && tauID('decayModeFindingNewDMs')> 0.5") @@ -138,10 +136,10 @@ def _applySubstructure(process): from PhysicsTools.PatAlgos.slimming.applySubstructure_cff import applySubstructure applySubstructure( process ) - (~_hiGeneral).toModify(process, _applySubstructure) + (~pp_on_AA).toModify(process, _applySubstructure) - _hiGeneral.toModify(process, func = lambda p: addToProcessAndTask('slimmedJets', p.selectedPatJets.clone(), p, task)) - _hiGeneral.toModify(process, func = lambda p: addToProcessAndTask('slimmedJetsAK8', _dummyPatJets.clone(), p, task)) + pp_on_AA.toModify(process, func = lambda p: addToProcessAndTask('slimmedJets', p.selectedPatJets.clone(), p, task)) + pp_on_AA.toModify(process, func = lambda p: addToProcessAndTask('slimmedJetsAK8', _dummyPatJets.clone(), p, task)) # from PhysicsTools.PatAlgos.tools.trigTools import switchOnTriggerStandAlone @@ -179,7 +177,7 @@ def _applySubstructure(process): process.load('PhysicsTools.PatAlgos.slimming.slimmedMETs_cfi') task.add(process.slimmedMETs) - (~_hiGeneral).toModify(process.slimmedMETs, addDeepMETs = True) + (~pp_on_AA).toModify(process.slimmedMETs, addDeepMETs = True) def _add_slimmedMETsNoHF(process): addToProcessAndTask('slimmedMETsNoHF', process.slimmedMETs.clone(), process, task) @@ -194,7 +192,7 @@ def _add_slimmedMETsNoHF(process): process.slimmedMETsNoHF.tXYUncForT1Smear = cms.InputTag("patPFMetT1SmearTxyNoHF") process.slimmedMETsNoHF.tXYUncForT01Smear = cms.InputTag("patPFMetT0pcT1SmearTxyNoHF") del process.slimmedMETsNoHF.caloMET - (~_hiGeneral).toModify(process, _add_slimmedMETsNoHF) + (~pp_on_AA).toModify(process, _add_slimmedMETsNoHF) # ================== NoHF pfMET # ================== CHSMET @@ -266,7 +264,7 @@ def _add_deepFlavour(process): 'pfDeepCSVDiscriminatorsJetTags:CvsB', 'pfDeepCSVDiscriminatorsJetTags:CvsL', ]) - (~_hiGeneral).toModify(process, _add_deepFlavour) + (~pp_on_AA).toModify(process, _add_deepFlavour) ## CaloJets process.caloJetMap = cms.EDProducer("RecoJetDeltaRValueMapProducer", @@ -279,8 +277,8 @@ def _add_deepFlavour(process): task.add(process.caloJetMap) process.patJets.userData.userFloats.src += [ 'caloJetMap:pt', 'caloJetMap:emEnergyFraction' ] - _hiGeneral.toModify(process.patJets.userData.userInts, src = [] ) - _hiGeneral.toModify(process.patJets.userData.userFloats, src = [] ) + pp_on_AA.toModify(process.patJets.userData.userInts, src = [] ) + pp_on_AA.toModify(process.patJets.userData.userFloats, src = [] ) #Muon object modifications from PhysicsTools.PatAlgos.slimming.muonIsolationsPUPPI_cfi import makeInputForPUPPIIsolationMuon @@ -324,9 +322,9 @@ def _add_deepFlavour(process): keysForValueMaps = cms.InputTag('reducedEgamma','reducedGedGsfElectrons'), src = cms.InputTag("gedGsfElectronsFrom94XTo106X")) - from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 - pp_on_AA_2018.toModify(task, func=lambda t: t.add(process.gedGsfElectronsFrom94XTo106XTask)) - pp_on_AA_2018.toModify(process.electronMVAValueMapProducer, + from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA + pp_on_AA.toModify(task, func=lambda t: t.add(process.gedGsfElectronsFrom94XTo106XTask)) + pp_on_AA.toModify(process.electronMVAValueMapProducer, keysForValueMaps = cms.InputTag('reducedEgamma','reducedGedGsfElectrons'), src = "gedGsfElectronsFrom94XTo106X") @@ -415,7 +413,7 @@ def _add_deepFlavour(process): #-- Adding customization for 80X 2016 legacy reMiniAOD and 2018 heavy ions _makePatTausTaskWithTauReReco = process.makePatTausTask.copy() _makePatTausTaskWithTauReReco.add(process.PFTauTask) - (run2_miniAOD_80XLegacy | pp_on_AA_2018).toReplaceWith( + (run2_miniAOD_80XLegacy | pp_on_AA).toReplaceWith( process.makePatTausTask, _makePatTausTaskWithTauReReco ) @@ -425,7 +423,7 @@ def _add_deepFlavour(process): from Configuration.Eras.Modifier_pA_2016_cff import pA_2016 _rerun_puppijets_task = task.copy() _rerun_puppijets_task.add(process.puppi, process.ak4PFJetsPuppi) - (_run2_miniAOD_ANY | pA_2016 | pp_on_AA_2018 | pp_on_PbPb_run3 ).toReplaceWith(task, _rerun_puppijets_task) + (_run2_miniAOD_ANY | pA_2016 | pp_on_AA).toReplaceWith(task, _rerun_puppijets_task) from RecoJets.JetAssociationProducers.j2tParametersVX_cfi import j2tParametersVX process.ak4PFJetsPuppiTracksAssociatorAtVertex = cms.EDProducer("JetTracksAssociatorAtVertex", @@ -469,9 +467,9 @@ def _add_jetsPuppi(process): process.updatedPatJetsTransientCorrectedSlimmedDeepFlavour.addTagInfos = True process.updatedPatJetsTransientCorrectedSlimmedDeepFlavour.tagInfoSources = ["pixelClusterTagInfos"] _run2_miniAOD_ANY.toModify(process.updatedPatJetsTransientCorrectedSlimmedDeepFlavour, addTagInfos = False ) - (~_hiGeneral).toModify(process, _add_jetsPuppi) + (~pp_on_AA).toModify(process, _add_jetsPuppi) - _hiGeneral.toModify(process, func = lambda p: addToProcessAndTask('slimmedJetsPuppi', _dummyPatJets.clone(), p, task)) + pp_on_AA.toModify(process, func = lambda p: addToProcessAndTask('slimmedJetsPuppi', _dummyPatJets.clone(), p, task)) # Embed pixelClusterTagInfos in slimmedJets process.patJets.addTagInfos = True @@ -479,14 +477,14 @@ def _add_jetsPuppi(process): _run2_miniAOD_ANY.toModify(process.patJets, addTagInfos = False ) - _hiGeneral.toModify(process.patJets, tagInfoSources = cms.VInputTag(["impactParameterTagInfos","secondaryVertexTagInfos"]) ) + pp_on_AA.toModify(process.patJets, tagInfoSources = cms.VInputTag(["impactParameterTagInfos","secondaryVertexTagInfos"]) ) ## puppi met def _add_metPuppi(process): process.load('RecoMET.METProducers.pfMetPuppi_cfi') _rerun_puppimet_task = task.copy() _rerun_puppimet_task.add(process.puppiNoLep, process.pfMetPuppi) - (_run2_miniAOD_ANY | pA_2016 | pp_on_AA_2018).toReplaceWith(task, _rerun_puppimet_task) + (_run2_miniAOD_ANY | pA_2016 | pp_on_AA).toReplaceWith(task, _rerun_puppimet_task) runMetCorAndUncForMiniAODProduction(process, metType="Puppi", jetCollUnskimmed="slimmedJetsPuppi", @@ -494,7 +492,7 @@ def _add_metPuppi(process): jetFlavor="AK4PFPuppi", postfix="Puppi" ) - (~_hiGeneral).toModify(process, _add_metPuppi) + (~pp_on_AA).toModify(process, _add_metPuppi) process.load('PhysicsTools.PatAlgos.slimming.slimmedMETs_cfi') task.add(process.slimmedMETs) @@ -512,7 +510,7 @@ def _add_slimmedMETsPuppi(process): process.slimmedMETsPuppi.tXYUncForT1Smear = cms.InputTag("patPFMetT1SmearTxyPuppi") process.slimmedMETsPuppi.tXYUncForT01Smear = cms.InputTag("patPFMetT0pcT1SmearTxyPuppi") del process.slimmedMETsPuppi.caloMET - (~_hiGeneral).toModify(process, _add_slimmedMETsPuppi) + (~pp_on_AA).toModify(process, _add_slimmedMETsPuppi) def _add_deepMET(process): process.load('RecoMET.METPUSubtraction.deepMETProducer_cfi') @@ -538,7 +536,7 @@ def _add_deepMET(process): process.deepMETsResponseTune, graph_path="RecoMET/METPUSubtraction/data/deepmet/deepmet_resp_v1_2016.pb" ) - (~_hiGeneral).toModify(process, _add_deepMET) + (~pp_on_AA).toModify(process, _add_deepMET) # add DetIdAssociatorRecords to EventSetup (for isolatedTracks) process.load("TrackingTools.TrackAssociator.DetIdAssociatorESProducer_cff") @@ -559,7 +557,7 @@ def _add_deepMET(process): run2_L1prefiring.toModify(task, func=lambda t: t.add(process.prefiringweight)) from PhysicsTools.PatAlgos.producersHeavyIons.heavyIonJetSetup import removeL1FastJetJECs - _hiGeneral.toModify(process, removeL1FastJetJECs) + pp_on_AA.toModify(process, removeL1FastJetJECs) def miniAOD_customizeMC(process): task = getPatAlgosToolsTask(process) @@ -592,12 +590,12 @@ def miniAOD_customizeMC(process): process.tauGenJetsBoosted.GenParticles = "prunedGenParticles" process.patJetPartons.particles = "genParticles" process.patJetPartonMatch.matched = "prunedGenParticles" - _hiGeneral.toModify(process.patJetPartonMatch, matched = "hiSignalGenParticles") + pp_on_AA.toModify(process.patJetPartonMatch, matched = "hiSignalGenParticles") from Configuration.ProcessModifiers.genJetSubEvent_cff import genJetSubEvent genJetSubEvent.toModify(process.patJetPartonMatch, matched = "cleanedPartons") process.patJetPartonMatch.mcStatus = [ 3, 23 ] process.patJetGenJetMatch.matched = "slimmedGenJets" - (~_hiGeneral).toModify(process, patJetGenJetMatchAK8Puppi = dict(matched = "slimmedGenJetsAK8")) + (~pp_on_AA).toModify(process, patJetGenJetMatchAK8Puppi = dict(matched = "slimmedGenJetsAK8")) process.patMuons.embedGenMatch = False process.patElectrons.embedGenMatch = False process.patPhotons.embedGenMatch = False @@ -609,8 +607,8 @@ def miniAOD_customizeMC(process): process.patJetFlavourAssociation.rParam = 0.4 from PhysicsTools.PatAlgos.producersHeavyIons.heavyIonJetSetup import removeJECsForMC - _hiGeneral.toModify(process, removeJECsForMC) - _hiGeneral.toReplaceWith(task,task.copyAndExclude([process.slimmedGenJetsFlavourInfos])) + pp_on_AA.toModify(process, removeJECsForMC) + pp_on_AA.toReplaceWith(task,task.copyAndExclude([process.slimmedGenJetsFlavourInfos])) def miniAOD_customizeOutput(out): diff --git a/PhysicsTools/PatAlgos/python/slimming/packedPFCandidates_cfi.py b/PhysicsTools/PatAlgos/python/slimming/packedPFCandidates_cfi.py index d951ea4ad7d92..c719e6975d0f2 100644 --- a/PhysicsTools/PatAlgos/python/slimming/packedPFCandidates_cfi.py +++ b/PhysicsTools/PatAlgos/python/slimming/packedPFCandidates_cfi.py @@ -49,9 +49,8 @@ from Configuration.Eras.Modifier_phase2_timing_cff import phase2_timing phase2_timing.toModify(packedPFCandidates, storeTiming = cms.bool(True)) -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -from Configuration.Eras.Modifier_pp_on_PbPb_run3_cff import pp_on_PbPb_run3 -(pp_on_AA_2018 | pp_on_PbPb_run3).toModify(packedPFCandidates, PuppiSrc = "", PuppiNoLepSrc = "") +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA +pp_on_AA.toModify(packedPFCandidates, PuppiSrc = "", PuppiNoLepSrc = "") from Configuration.ProcessModifiers.run2_miniAOD_pp_on_AA_103X_cff import run2_miniAOD_pp_on_AA_103X run2_miniAOD_pp_on_AA_103X.toModify(packedPFCandidates, inputCollection = "cleanedParticleFlow", diff --git a/PhysicsTools/PatAlgos/python/slimming/slimmedCaloJets_cfi.py b/PhysicsTools/PatAlgos/python/slimming/slimmedCaloJets_cfi.py index f92987c92a3c5..29955489d41c0 100644 --- a/PhysicsTools/PatAlgos/python/slimming/slimmedCaloJets_cfi.py +++ b/PhysicsTools/PatAlgos/python/slimming/slimmedCaloJets_cfi.py @@ -5,6 +5,5 @@ cut = cms.string("pt>20") ) -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -from Configuration.Eras.Modifier_pp_on_PbPb_run3_cff import pp_on_PbPb_run3 -(pp_on_AA_2018 | pp_on_PbPb_run3).toModify(slimmedCaloJets, src = 'akPu4CaloJets') +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA +pp_on_AA.toModify(slimmedCaloJets, src = 'akPu4CaloJets') diff --git a/PhysicsTools/PatAlgos/python/slimming/slimmedGenJets_cfi.py b/PhysicsTools/PatAlgos/python/slimming/slimmedGenJets_cfi.py index 020c5e9f84196..860903307b777 100644 --- a/PhysicsTools/PatAlgos/python/slimming/slimmedGenJets_cfi.py +++ b/PhysicsTools/PatAlgos/python/slimming/slimmedGenJets_cfi.py @@ -20,9 +20,8 @@ dropSpecific = cms.bool(False), ) -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -from Configuration.Eras.Modifier_pp_on_PbPb_run3_cff import pp_on_PbPb_run3 -(pp_on_AA_2018 | pp_on_PbPb_run3).toModify(slimmedGenJets, src = "ak4HiSignalGenJets") -(pp_on_AA_2018 | pp_on_PbPb_run3).toModify(slimmedGenJetsAK8, cut = 'pt>9999', nLoose = 0) +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA +pp_on_AA.toModify(slimmedGenJets, src = "ak4HiSignalGenJets") +pp_on_AA.toModify(slimmedGenJetsAK8, cut = 'pt>9999', nLoose = 0) from Configuration.ProcessModifiers.genJetSubEvent_cff import genJetSubEvent genJetSubEvent.toModify(slimmedGenJets, src = "ak4HiGenJetsCleaned") diff --git a/PhysicsTools/PatAlgos/python/slimming/slimmedMuons_cfi.py b/PhysicsTools/PatAlgos/python/slimming/slimmedMuons_cfi.py index 49e4a415e5387..cec9ada436d44 100644 --- a/PhysicsTools/PatAlgos/python/slimming/slimmedMuons_cfi.py +++ b/PhysicsTools/PatAlgos/python/slimming/slimmedMuons_cfi.py @@ -22,10 +22,10 @@ # full set of track extras not available in existing AOD from Configuration.Eras.Modifier_run2_miniAOD_80XLegacy_cff import run2_miniAOD_80XLegacy from Configuration.Eras.Modifier_run2_miniAOD_94XFall17_cff import run2_miniAOD_94XFall17 -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA from Configuration.ProcessModifiers.miniAOD_skip_trackExtras_cff import miniAOD_skip_trackExtras -(run2_miniAOD_80XLegacy | run2_miniAOD_94XFall17 | pp_on_AA_2018 | miniAOD_skip_trackExtras).toModify(slimmedMuons, trackExtraAssocs = ["slimmedMuonTrackExtras"]) +(run2_miniAOD_80XLegacy | run2_miniAOD_94XFall17 | pp_on_AA | miniAOD_skip_trackExtras).toModify(slimmedMuons, trackExtraAssocs = ["slimmedMuonTrackExtras"]) from Configuration.ProcessModifiers.run2_miniAOD_pp_on_AA_103X_cff import run2_miniAOD_pp_on_AA_103X run2_miniAOD_pp_on_AA_103X.toModify(slimmedMuons, packedPFCandidates = ["packedPFCandidates","packedPFCandidatesRemoved"], diff --git a/PhysicsTools/PatAlgos/python/slimming/slimmedTrackExtras_cff.py b/PhysicsTools/PatAlgos/python/slimming/slimmedTrackExtras_cff.py index 9f13fc0f1fa2e..9a1be1d9dd932 100644 --- a/PhysicsTools/PatAlgos/python/slimming/slimmedTrackExtras_cff.py +++ b/PhysicsTools/PatAlgos/python/slimming/slimmedTrackExtras_cff.py @@ -20,10 +20,10 @@ # full set of track extras not available in existing AOD from Configuration.Eras.Modifier_run2_miniAOD_80XLegacy_cff import run2_miniAOD_80XLegacy from Configuration.Eras.Modifier_run2_miniAOD_94XFall17_cff import run2_miniAOD_94XFall17 -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA from Configuration.ProcessModifiers.miniAOD_skip_trackExtras_cff import miniAOD_skip_trackExtras -(run2_miniAOD_80XLegacy | run2_miniAOD_94XFall17 | pp_on_AA_2018 | miniAOD_skip_trackExtras).toModify(slimmedMuonTrackExtras, +(run2_miniAOD_80XLegacy | run2_miniAOD_94XFall17 | pp_on_AA | miniAOD_skip_trackExtras).toModify(slimmedMuonTrackExtras, trackExtraTags = ["standAloneMuons"], trackExtraAssocs = [], outputClusters = False) diff --git a/PhysicsTools/PatAlgos/python/slimming/slimming_cff.py b/PhysicsTools/PatAlgos/python/slimming/slimming_cff.py index 8921858d017ea..91db7a65d1a94 100644 --- a/PhysicsTools/PatAlgos/python/slimming/slimming_cff.py +++ b/PhysicsTools/PatAlgos/python/slimming/slimming_cff.py @@ -63,23 +63,21 @@ oniaPhotonCandidates ) -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -from Configuration.Eras.Modifier_pp_on_PbPb_run3_cff import pp_on_PbPb_run3 -(pp_on_AA_2018 | pp_on_PbPb_run3).toReplaceWith(slimmingTask, slimmingTask.copyAndExclude([slimmedOOTPhotons])) +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA +pp_on_AA.toReplaceWith(slimmingTask, slimmingTask.copyAndExclude([slimmedOOTPhotons])) from PhysicsTools.PatAlgos.slimming.hiPixelTracks_cfi import hiPixelTracks from RecoHI.HiEvtPlaneAlgos.HiEvtPlane_cfi import hiEvtPlane from RecoHI.HiEvtPlaneAlgos.hiEvtPlaneFlat_cfi import hiEvtPlaneFlat -(pp_on_AA_2018 | pp_on_PbPb_run3).toReplaceWith(slimmingTask, cms.Task(slimmingTask.copy(), hiPixelTracks, -hiEvtPlane, hiEvtPlaneFlat)) +pp_on_AA.toReplaceWith(slimmingTask, cms.Task(slimmingTask.copy(), hiPixelTracks, hiEvtPlane, hiEvtPlaneFlat)) -from Configuration.Eras.Modifier_pp_on_PbPb_run3_cff import pp_on_PbPb_run3 from PhysicsTools.PatAlgos.packedCandidateMuonID_cfi import packedCandidateMuonID from PhysicsTools.PatAlgos.packedPFCandidateTrackChi2_cfi import packedPFCandidateTrackChi2 from RecoHI.HiCentralityAlgos.CentralityBin_cfi import centralityBin from RecoHI.HiCentralityAlgos.hiHFfilters_cfi import hiHFfilters lostTrackChi2 = packedPFCandidateTrackChi2.clone(candidates = "lostTracks", doLostTracks = True) -(pp_on_AA_2018 | pp_on_PbPb_run3).toReplaceWith( - slimmingTask, + +pp_on_AA.toReplaceWith( + slimmingTask, cms.Task(slimmingTask.copy(), packedCandidateMuonID, packedPFCandidateTrackChi2, lostTrackChi2, centralityBin, hiHFfilters)) from Configuration.ProcessModifiers.run2_miniAOD_pp_on_AA_103X_cff import run2_miniAOD_pp_on_AA_103X run2_miniAOD_pp_on_AA_103X.toReplaceWith(slimmingTask,cms.Task(primaryVertexAssociationCleaned,slimmingTask.copy())) diff --git a/RecoBTag/ImpactParameter/python/impactParameterTagInfos_cfi.py b/RecoBTag/ImpactParameter/python/impactParameterTagInfos_cfi.py index 9e9a1f8c90151..e6ec5cd0ce40f 100644 --- a/RecoBTag/ImpactParameter/python/impactParameterTagInfos_cfi.py +++ b/RecoBTag/ImpactParameter/python/impactParameterTagInfos_cfi.py @@ -17,6 +17,5 @@ useTrackQuality = cms.bool(False) ) -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -from Configuration.Eras.Modifier_pp_on_PbPb_run3_cff import pp_on_PbPb_run3 -(pp_on_AA_2018 | pp_on_PbPb_run3).toModify(impactParameterTagInfos, jetTracks = "ak5JetTracksAssociatorAtVertex") +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA +pp_on_AA.toModify(impactParameterTagInfos, jetTracks = "ak5JetTracksAssociatorAtVertex") diff --git a/RecoBTag/ImpactParameter/python/pfImpactParameterTagInfos_cfi.py b/RecoBTag/ImpactParameter/python/pfImpactParameterTagInfos_cfi.py index 2dc3113fd4190..dae8fcc364c9c 100644 --- a/RecoBTag/ImpactParameter/python/pfImpactParameterTagInfos_cfi.py +++ b/RecoBTag/ImpactParameter/python/pfImpactParameterTagInfos_cfi.py @@ -20,6 +20,5 @@ maxDeltaR = cms.double(0.4) ) -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -from Configuration.Eras.Modifier_pp_on_PbPb_run3_cff import pp_on_PbPb_run3 -(pp_on_AA_2018 | pp_on_PbPb_run3).toModify(pfImpactParameterTagInfos, jets = "akCs4PFJets") +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA +pp_on_AA.toModify(pfImpactParameterTagInfos, jets = "akCs4PFJets") diff --git a/RecoBTag/SecondaryVertex/python/combinedSecondaryVertexV2BJetTags_cfi.py b/RecoBTag/SecondaryVertex/python/combinedSecondaryVertexV2BJetTags_cfi.py index edaf62b09956f..e563546dd8cbd 100644 --- a/RecoBTag/SecondaryVertex/python/combinedSecondaryVertexV2BJetTags_cfi.py +++ b/RecoBTag/SecondaryVertex/python/combinedSecondaryVertexV2BJetTags_cfi.py @@ -5,5 +5,5 @@ tagInfos = cms.VInputTag(cms.InputTag("impactParameterTagInfos"), cms.InputTag("secondaryVertexTagInfos")) ) -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -pp_on_AA_2018.toModify(combinedSecondaryVertexV2BJetTags,jetTagComputer = 'heavyIonCSVComputer') +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA +pp_on_AA.toModify(combinedSecondaryVertexV2BJetTags,jetTagComputer = 'heavyIonCSVComputer') diff --git a/RecoBTag/SoftLepton/python/softPFElectronTagInfos_cfi.py b/RecoBTag/SoftLepton/python/softPFElectronTagInfos_cfi.py index a7dcc3913b5c4..5ab6b9b7e0a67 100644 --- a/RecoBTag/SoftLepton/python/softPFElectronTagInfos_cfi.py +++ b/RecoBTag/SoftLepton/python/softPFElectronTagInfos_cfi.py @@ -8,6 +8,5 @@ MaxSip3Dsig=cms.double(200) ) -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -from Configuration.Eras.Modifier_pp_on_PbPb_run3_cff import pp_on_PbPb_run3 -(pp_on_AA_2018 | pp_on_PbPb_run3).toModify(softPFElectronsTagInfos, jets = "akCs4PFJets") +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA +pp_on_AA.toModify(softPFElectronsTagInfos, jets = "akCs4PFJets") diff --git a/RecoBTag/SoftLepton/python/softPFMuonTagInfos_cfi.py b/RecoBTag/SoftLepton/python/softPFMuonTagInfos_cfi.py index 46a0f6764a713..8224b2cf5fa3f 100644 --- a/RecoBTag/SoftLepton/python/softPFMuonTagInfos_cfi.py +++ b/RecoBTag/SoftLepton/python/softPFMuonTagInfos_cfi.py @@ -12,6 +12,5 @@ filterPromptMuons = cms.bool(False) ) -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -from Configuration.Eras.Modifier_pp_on_PbPb_run3_cff import pp_on_PbPb_run3 -(pp_on_AA_2018 | pp_on_PbPb_run3).toModify(softPFMuonsTagInfos, jets = "akCs4PFJets") +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA +pp_on_AA.toModify(softPFMuonsTagInfos, jets = "akCs4PFJets") diff --git a/RecoEcal/Configuration/python/RecoEcal_EventContent_cff.py b/RecoEcal/Configuration/python/RecoEcal_EventContent_cff.py index 66bf090fbf014..d179c3b108dd6 100644 --- a/RecoEcal/Configuration/python/RecoEcal_EventContent_cff.py +++ b/RecoEcal/Configuration/python/RecoEcal_EventContent_cff.py @@ -36,11 +36,11 @@ from Configuration.Eras.Modifier_pA_2016_cff import pA_2016 from Configuration.Eras.Modifier_peripheralPbPb_cff import peripheralPbPb -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017 from Configuration.Eras.Modifier_ppRef_2017_cff import ppRef_2017 #HI-specific products needed in pp scenario special configurations -for e in [pA_2016, peripheralPbPb, pp_on_AA_2018, pp_on_XeXe_2017, ppRef_2017]: +for e in [pA_2016, peripheralPbPb, pp_on_AA, pp_on_XeXe_2017, ppRef_2017]: e.toModify( RecoEcalAOD.outputCommands, func=lambda outputCommands: outputCommands.extend(['keep recoSuperClusters_correctedIslandBarrelSuperClusters_*_*', 'keep recoSuperClusters_correctedIslandEndcapSuperClusters_*_*']) @@ -70,7 +70,7 @@ phase2_hgcal.toModify(RecoEcalRECO, outputCommands = RecoEcalRECO.outputCommands + _phase2_hgcal_scCommands) -for e in [pA_2016, peripheralPbPb, pp_on_AA_2018, pp_on_XeXe_2017, ppRef_2017]: +for e in [pA_2016, peripheralPbPb, pp_on_AA, pp_on_XeXe_2017, ppRef_2017]: e.toModify( RecoEcalRECO.outputCommands, func=lambda outputCommands: outputCommands.extend(['keep recoCaloClusters_islandBasicClusters_*_*']) ) diff --git a/RecoEcal/Configuration/python/RecoEcal_cff.py b/RecoEcal/Configuration/python/RecoEcal_cff.py index 5fdcdbb9f2aa4..d1965c09152bc 100644 --- a/RecoEcal/Configuration/python/RecoEcal_cff.py +++ b/RecoEcal/Configuration/python/RecoEcal_cff.py @@ -27,7 +27,7 @@ from Configuration.Eras.Modifier_pA_2016_cff import pA_2016 from Configuration.Eras.Modifier_peripheralPbPb_cff import peripheralPbPb -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017 from Configuration.Eras.Modifier_ppRef_2017_cff import ppRef_2017 @@ -35,5 +35,5 @@ _ecalClustersHITask = ecalClustersTask.copy() _ecalClustersHITask.add(islandClusteringTask) -for e in [pA_2016, peripheralPbPb, pp_on_AA_2018, pp_on_XeXe_2017, ppRef_2017]: +for e in [pA_2016, peripheralPbPb, pp_on_AA, pp_on_XeXe_2017, ppRef_2017]: e.toReplaceWith(ecalClustersTask, _ecalClustersHITask) diff --git a/RecoEcal/EgammaClusterProducers/python/correctedIslandBarrelSuperClusters_cfi.py b/RecoEcal/EgammaClusterProducers/python/correctedIslandBarrelSuperClusters_cfi.py index 38a8a2937435d..f957422e6cb49 100644 --- a/RecoEcal/EgammaClusterProducers/python/correctedIslandBarrelSuperClusters_cfi.py +++ b/RecoEcal/EgammaClusterProducers/python/correctedIslandBarrelSuperClusters_cfi.py @@ -20,11 +20,11 @@ from Configuration.Eras.Modifier_pA_2016_cff import pA_2016 from Configuration.Eras.Modifier_peripheralPbPb_cff import peripheralPbPb -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017 from Configuration.Eras.Modifier_ppRef_2017_cff import ppRef_2017 from RecoHI.HiEgammaAlgos.HiCorrectedIslandBarrelSuperClusters_cfi import correctedIslandBarrelSuperClusters as _hiCorrectedIslandBarrelSuperClusters -for e in [pA_2016, peripheralPbPb, pp_on_AA_2018, pp_on_XeXe_2017, ppRef_2017]: +for e in [pA_2016, peripheralPbPb, pp_on_AA, pp_on_XeXe_2017, ppRef_2017]: e.toReplaceWith(correctedIslandBarrelSuperClusters, _hiCorrectedIslandBarrelSuperClusters) diff --git a/RecoEcal/EgammaClusterProducers/python/correctedIslandEndcapSuperClusters_cfi.py b/RecoEcal/EgammaClusterProducers/python/correctedIslandEndcapSuperClusters_cfi.py index 63e2c06fe379b..c4c736a64dbb9 100644 --- a/RecoEcal/EgammaClusterProducers/python/correctedIslandEndcapSuperClusters_cfi.py +++ b/RecoEcal/EgammaClusterProducers/python/correctedIslandEndcapSuperClusters_cfi.py @@ -21,10 +21,10 @@ from Configuration.Eras.Modifier_pA_2016_cff import pA_2016 from Configuration.Eras.Modifier_peripheralPbPb_cff import peripheralPbPb from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017 -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA from Configuration.Eras.Modifier_ppRef_2017_cff import ppRef_2017 from RecoHI.HiEgammaAlgos.HiCorrectedIslandEndcapSuperClusters_cfi import correctedIslandEndcapSuperClusters as _hiCorrectedIslandEndcapSuperClusters -for e in [pA_2016, peripheralPbPb, pp_on_XeXe_2017, pp_on_AA_2018, ppRef_2017]: +for e in [pA_2016, peripheralPbPb, pp_on_XeXe_2017, pp_on_AA, ppRef_2017]: e.toReplaceWith(correctedIslandEndcapSuperClusters, _hiCorrectedIslandEndcapSuperClusters) diff --git a/RecoEcal/EgammaClusterProducers/python/islandSuperClusters_cfi.py b/RecoEcal/EgammaClusterProducers/python/islandSuperClusters_cfi.py index 41ae3fff43252..9c4f072564d7d 100644 --- a/RecoEcal/EgammaClusterProducers/python/islandSuperClusters_cfi.py +++ b/RecoEcal/EgammaClusterProducers/python/islandSuperClusters_cfi.py @@ -29,11 +29,11 @@ from Configuration.Eras.Modifier_pA_2016_cff import pA_2016 from Configuration.Eras.Modifier_peripheralPbPb_cff import peripheralPbPb -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017 from Configuration.Eras.Modifier_ppRef_2017_cff import ppRef_2017 from RecoHI.HiEgammaAlgos.HiIslandSuperClusters_cfi import islandSuperClusters as _hiIslandSuperClusters -for e in [pA_2016, peripheralPbPb, pp_on_AA_2018, pp_on_XeXe_2017, ppRef_2017]: +for e in [pA_2016, peripheralPbPb, pp_on_AA, pp_on_XeXe_2017, ppRef_2017]: e.toReplaceWith(islandSuperClusters, _hiIslandSuperClusters) diff --git a/RecoEcal/EgammaClusterProducers/python/particleFlowSuperClusterECAL_cfi.py b/RecoEcal/EgammaClusterProducers/python/particleFlowSuperClusterECAL_cfi.py index 5ed2bf11d42f1..a41c8e07ccfd5 100644 --- a/RecoEcal/EgammaClusterProducers/python/particleFlowSuperClusterECAL_cfi.py +++ b/RecoEcal/EgammaClusterProducers/python/particleFlowSuperClusterECAL_cfi.py @@ -5,10 +5,10 @@ # define the default ECAL clustering (Mustache or Box) particleFlowSuperClusterECAL = _particleFlowSuperClusterECALMustache.clone() -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -pp_on_AA_2018.toModify(particleFlowSuperClusterECAL, useDynamicDPhiWindow = False) -pp_on_AA_2018.toModify(particleFlowSuperClusterECAL, phiwidth_SuperClusterBarrel = 0.20) -pp_on_AA_2018.toModify(particleFlowSuperClusterECAL, phiwidth_SuperClusterEndcap = 0.20) +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA +pp_on_AA.toModify(particleFlowSuperClusterECAL, useDynamicDPhiWindow = False) +pp_on_AA.toModify(particleFlowSuperClusterECAL, phiwidth_SuperClusterBarrel = 0.20) +pp_on_AA.toModify(particleFlowSuperClusterECAL, phiwidth_SuperClusterEndcap = 0.20) from Configuration.ProcessModifiers.egamma_lowPt_exclusive_cff import egamma_lowPt_exclusive egamma_lowPt_exclusive.toModify(particleFlowSuperClusterECAL, diff --git a/RecoEcal/EgammaClusterProducers/python/reducedRecHitsSequence_cff.py b/RecoEcal/EgammaClusterProducers/python/reducedRecHitsSequence_cff.py index b40b79cfa9376..bddb86f4f638b 100644 --- a/RecoEcal/EgammaClusterProducers/python/reducedRecHitsSequence_cff.py +++ b/RecoEcal/EgammaClusterProducers/python/reducedRecHitsSequence_cff.py @@ -186,15 +186,15 @@ _pp_on_AA_reducedEcalRecHitsTask.remove(interestingEcalDetIdOOTPFEE) _pp_on_AA_reducedEcalRecHitsTask.remove(interestingEcalDetIdOOTPFES) -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -pp_on_AA_2018.toReplaceWith(reducedEcalRecHitsTask, _pp_on_AA_reducedEcalRecHitsTask) - -pp_on_AA_2018.toModify(reducedEcalRecHitsEB.interestingDetIdCollections, func = lambda list: list.remove(cms.InputTag("interestingEcalDetIdOOTPFEB")) ) -pp_on_AA_2018.toModify(reducedEcalRecHitsEB.interestingDetIdCollections, func = lambda list: list.remove(cms.InputTag("interestingOotGamIsoDetIdEB")) ) -pp_on_AA_2018.toModify(reducedEcalRecHitsEE.interestingDetIdCollections, func = lambda list: list.remove(cms.InputTag("interestingEcalDetIdOOTPFEE")) ) -pp_on_AA_2018.toModify(reducedEcalRecHitsEE.interestingDetIdCollections, func = lambda list: list.remove(cms.InputTag("interestingOotGamIsoDetIdEE")) ) -pp_on_AA_2018.toModify(reducedEcalRecHitsES.interestingDetIds, func = lambda list: list.remove(cms.InputTag("interestingEcalDetIdOOTPFES")) ) -pp_on_AA_2018.toModify(reducedEcalRecHitsES.interestingDetIdsNotToClean, func = lambda list: list.remove(cms.InputTag("interestingOotEgammaIsoESDetId")) ) +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA +pp_on_AA.toReplaceWith(reducedEcalRecHitsTask, _pp_on_AA_reducedEcalRecHitsTask) + +pp_on_AA.toModify(reducedEcalRecHitsEB.interestingDetIdCollections, func = lambda list: list.remove(cms.InputTag("interestingEcalDetIdOOTPFEB")) ) +pp_on_AA.toModify(reducedEcalRecHitsEB.interestingDetIdCollections, func = lambda list: list.remove(cms.InputTag("interestingOotGamIsoDetIdEB")) ) +pp_on_AA.toModify(reducedEcalRecHitsEE.interestingDetIdCollections, func = lambda list: list.remove(cms.InputTag("interestingEcalDetIdOOTPFEE")) ) +pp_on_AA.toModify(reducedEcalRecHitsEE.interestingDetIdCollections, func = lambda list: list.remove(cms.InputTag("interestingOotGamIsoDetIdEE")) ) +pp_on_AA.toModify(reducedEcalRecHitsES.interestingDetIds, func = lambda list: list.remove(cms.InputTag("interestingEcalDetIdOOTPFES")) ) +pp_on_AA.toModify(reducedEcalRecHitsES.interestingDetIdsNotToClean, func = lambda list: list.remove(cms.InputTag("interestingOotEgammaIsoESDetId")) ) from Configuration.ProcessModifiers.egamma_lowPt_exclusive_cff import egamma_lowPt_exclusive egamma_lowPt_exclusive.toModify(reducedEcalRecHitsES, diff --git a/RecoEgamma/Configuration/python/RecoEgamma_EventContent_cff.py b/RecoEgamma/Configuration/python/RecoEgamma_EventContent_cff.py index 3888b001b48c4..42358054685bf 100644 --- a/RecoEgamma/Configuration/python/RecoEgamma_EventContent_cff.py +++ b/RecoEgamma/Configuration/python/RecoEgamma_EventContent_cff.py @@ -62,12 +62,11 @@ from Configuration.Eras.Modifier_pA_2016_cff import pA_2016 from Configuration.Eras.Modifier_peripheralPbPb_cff import peripheralPbPb -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017 from Configuration.Eras.Modifier_ppRef_2017_cff import ppRef_2017 -from Configuration.Eras.Modifier_pp_on_PbPb_run3_cff import pp_on_PbPb_run3 #HI-specific products needed in pp scenario special configurations -for e in [pA_2016, peripheralPbPb, pp_on_AA_2018, pp_on_XeXe_2017, ppRef_2017, pp_on_PbPb_run3]: +for e in [pA_2016, peripheralPbPb, pp_on_AA, pp_on_XeXe_2017, ppRef_2017]: e.toModify( RecoEgammaAOD.outputCommands, func=lambda outputCommands: outputCommands.extend(['keep recoHIPhotonIsolationedmValueMap_photonIsolationHIProducerppGED_*_*', 'keep recoHIPhotonIsolationedmValueMap_photonIsolationHIProducerpp_*_*', diff --git a/RecoEgamma/Configuration/python/RecoEgamma_cff.py b/RecoEgamma/Configuration/python/RecoEgamma_cff.py index d880b6f727fcd..ccc9cf6bd74a2 100644 --- a/RecoEgamma/Configuration/python/RecoEgamma_cff.py +++ b/RecoEgamma/Configuration/python/RecoEgamma_cff.py @@ -33,10 +33,9 @@ from Configuration.Eras.Modifier_pA_2016_cff import pA_2016 from Configuration.Eras.Modifier_peripheralPbPb_cff import peripheralPbPb -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017 from Configuration.Eras.Modifier_ppRef_2017_cff import ppRef_2017 -from Configuration.Eras.Modifier_pp_on_PbPb_run3_cff import pp_on_PbPb_run3 #HI-specific algorithms needed in pp scenario special configurations from RecoHI.HiEgammaAlgos.photonIsolationHIProducer_cfi import photonIsolationHIProducerpp from RecoHI.HiEgammaAlgos.photonIsolationHIProducer_cfi import photonIsolationHIProducerppGED @@ -46,5 +45,5 @@ _egammaHighLevelRecoPostPF_HITask.add(photonIsolationHIProducerpp) _egammaHighLevelRecoPostPF_HITask.add(photonIsolationHIProducerppGED) _egammaHighLevelRecoPostPF_HITask.add(photonIsolationHIProducerppIsland) -for e in [pA_2016, peripheralPbPb, pp_on_AA_2018, pp_on_XeXe_2017, ppRef_2017, pp_on_PbPb_run3]: +for e in [pA_2016, peripheralPbPb, pp_on_AA, pp_on_XeXe_2017, ppRef_2017]: e.toReplaceWith(egammaHighLevelRecoPostPFTask, _egammaHighLevelRecoPostPF_HITask) diff --git a/RecoEgamma/EgammaElectronProducers/python/ecalDrivenElectronSeeds_cff.py b/RecoEgamma/EgammaElectronProducers/python/ecalDrivenElectronSeeds_cff.py index 368a598e187e2..7ee843514e9e1 100644 --- a/RecoEgamma/EgammaElectronProducers/python/ecalDrivenElectronSeeds_cff.py +++ b/RecoEgamma/EgammaElectronProducers/python/ecalDrivenElectronSeeds_cff.py @@ -10,8 +10,8 @@ ecalDrivenElectronSeeds.initialSeedsVector = newCombinedSeeds.seedCollections -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -pp_on_AA_2018.toModify(ecalDrivenElectronSeeds, SCEtCut = 15.0) +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA +pp_on_AA.toModify(ecalDrivenElectronSeeds, SCEtCut = 15.0) from Configuration.Eras.Modifier_phase2_hgcal_cff import phase2_hgcal phase2_hgcal.toModify( diff --git a/RecoEgamma/EgammaElectronProducers/python/gedGsfElectrons_cfi.py b/RecoEgamma/EgammaElectronProducers/python/gedGsfElectrons_cfi.py index 8dfec71b84fcf..78fb28793ba9d 100644 --- a/RecoEgamma/EgammaElectronProducers/python/gedGsfElectrons_cfi.py +++ b/RecoEgamma/EgammaElectronProducers/python/gedGsfElectrons_cfi.py @@ -22,9 +22,9 @@ ) -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -pp_on_AA_2018.toModify(gedGsfElectronsTmp.preselection, minSCEtBarrel = 15.0) -pp_on_AA_2018.toModify(gedGsfElectronsTmp.preselection, minSCEtEndcaps = 15.0) +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA +pp_on_AA.toModify(gedGsfElectronsTmp.preselection, minSCEtBarrel = 15.0) +pp_on_AA.toModify(gedGsfElectronsTmp.preselection, minSCEtEndcaps = 15.0) from Configuration.ProcessModifiers.egamma_lowPt_exclusive_cff import egamma_lowPt_exclusive egamma_lowPt_exclusive.toModify(gedGsfElectronsTmp.preselection, diff --git a/RecoEgamma/EgammaElectronProducers/python/gsfElectrons_cfi.py b/RecoEgamma/EgammaElectronProducers/python/gsfElectrons_cfi.py index 04801b705451f..ca448c2721558 100644 --- a/RecoEgamma/EgammaElectronProducers/python/gsfElectrons_cfi.py +++ b/RecoEgamma/EgammaElectronProducers/python/gsfElectrons_cfi.py @@ -24,9 +24,9 @@ trkIsolHEEP04Cfg = trkIsol04CfgV2, ) -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -pp_on_AA_2018.toModify(ecalDrivenGsfElectrons.preselection, minSCEtBarrel = 15.0) -pp_on_AA_2018.toModify(ecalDrivenGsfElectrons.preselection, minSCEtEndcaps = 15.0) +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA +pp_on_AA.toModify(ecalDrivenGsfElectrons.preselection, minSCEtBarrel = 15.0) +pp_on_AA.toModify(ecalDrivenGsfElectrons.preselection, minSCEtEndcaps = 15.0) ecalDrivenGsfElectronsFromMultiCl = ecalDrivenGsfElectrons.clone( gsfElectronCoresTag = "ecalDrivenGsfElectronCoresFromMultiCl", diff --git a/RecoEgamma/EgammaElectronProducers/python/lowPtGsfElectrons_cfi.py b/RecoEgamma/EgammaElectronProducers/python/lowPtGsfElectrons_cfi.py index 5d194c6d999ba..5b8cc16ea5376 100644 --- a/RecoEgamma/EgammaElectronProducers/python/lowPtGsfElectrons_cfi.py +++ b/RecoEgamma/EgammaElectronProducers/python/lowPtGsfElectrons_cfi.py @@ -5,6 +5,6 @@ from Configuration.Eras.Modifier_fastSim_cff import fastSim fastSim.toModify(lowPtGsfElectrons,ctfTracksTag = "generalTracksBeforeMixing") -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -pp_on_AA_2018.toModify(lowPtGsfElectrons.preselection, minSCEtBarrel = 15.0) -pp_on_AA_2018.toModify(lowPtGsfElectrons.preselection, minSCEtEndcaps = 15.0) +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA +pp_on_AA.toModify(lowPtGsfElectrons.preselection, minSCEtBarrel = 15.0) +pp_on_AA.toModify(lowPtGsfElectrons.preselection, minSCEtEndcaps = 15.0) diff --git a/RecoEgamma/EgammaIsolationAlgos/python/interestingEgammaIsoDetIdsSequence_cff.py b/RecoEgamma/EgammaIsolationAlgos/python/interestingEgammaIsoDetIdsSequence_cff.py index feb86bbc385a3..41f8cb7059fd9 100644 --- a/RecoEgamma/EgammaIsolationAlgos/python/interestingEgammaIsoDetIdsSequence_cff.py +++ b/RecoEgamma/EgammaIsolationAlgos/python/interestingEgammaIsoDetIdsSequence_cff.py @@ -143,8 +143,8 @@ _pp_on_AA_interestingEgammaIsoDetIdsTask.remove(interestingOotEgammaIsoHCALDetId) _pp_on_AA_interestingEgammaIsoDetIdsTask.remove(interestingOotEgammaIsoESDetId) -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -pp_on_AA_2018.toReplaceWith(interestingEgammaIsoDetIdsTask, _pp_on_AA_interestingEgammaIsoDetIdsTask) +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA +pp_on_AA.toReplaceWith(interestingEgammaIsoDetIdsTask, _pp_on_AA_interestingEgammaIsoDetIdsTask) from Configuration.ProcessModifiers.egamma_lowPt_exclusive_cff import egamma_lowPt_exclusive egamma_lowPt_exclusive.toModify(interestingGedEgammaIsoESDetId, diff --git a/RecoEgamma/EgammaPhotonProducers/python/photonSequence_cff.py b/RecoEgamma/EgammaPhotonProducers/python/photonSequence_cff.py index c0b88a3112630..054db4642bf36 100644 --- a/RecoEgamma/EgammaPhotonProducers/python/photonSequence_cff.py +++ b/RecoEgamma/EgammaPhotonProducers/python/photonSequence_cff.py @@ -23,9 +23,8 @@ from Configuration.Eras.Modifier_pA_2016_cff import pA_2016 from Configuration.Eras.Modifier_peripheralPbPb_cff import peripheralPbPb -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017 from Configuration.Eras.Modifier_ppRef_2017_cff import ppRef_2017 -from Configuration.Eras.Modifier_pp_on_PbPb_run3_cff import pp_on_PbPb_run3 -for e in [pA_2016, peripheralPbPb, pp_on_AA_2018, pp_on_XeXe_2017, ppRef_2017, pp_on_PbPb_run3]: +for e in [pA_2016, peripheralPbPb, pp_on_AA, pp_on_XeXe_2017, ppRef_2017]: e.toReplaceWith(photonTask, _photonTaskWithIsland) diff --git a/RecoEgamma/EgammaPhotonProducers/python/reducedEgamma_cfi.py b/RecoEgamma/EgammaPhotonProducers/python/reducedEgamma_cfi.py index f52f741a65454..f075f384c4e29 100644 --- a/RecoEgamma/EgammaPhotonProducers/python/reducedEgamma_cfi.py +++ b/RecoEgamma/EgammaPhotonProducers/python/reducedEgamma_cfi.py @@ -115,9 +115,8 @@ modifyReducedEGammaRun2MiniAOD = ( run2_miniAOD_94XFall17 | run2_miniAOD_80XLegacy | run2_miniAOD_UL).makeProcessModifier(calibrateReducedEgamma) -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -from Configuration.Eras.Modifier_pp_on_PbPb_run3_cff import pp_on_PbPb_run3 -(pp_on_AA_2018 | pp_on_PbPb_run3).toModify(reducedEgamma, +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA +pp_on_AA.toModify(reducedEgamma, ootPhotons = cms.InputTag(""), keepPhotons = "pt>15 && abs(eta)<2.5", slimRelinkPhotons = "pt>15 && abs(eta)<2.5", diff --git a/RecoEgamma/EgammaTools/python/egammaObjectModificationsInMiniAOD_cff.py b/RecoEgamma/EgammaTools/python/egammaObjectModificationsInMiniAOD_cff.py index 4438ff524a50d..f0fd50c481616 100644 --- a/RecoEgamma/EgammaTools/python/egammaObjectModificationsInMiniAOD_cff.py +++ b/RecoEgamma/EgammaTools/python/egammaObjectModificationsInMiniAOD_cff.py @@ -169,6 +169,5 @@ def appendEgammaHIPhotonIsolationModifier(modifiers): run2_miniAOD_80XLegacy.toModify(egamma_modifications,appendEgamma8XLegacyAppendableModifiers) run2_miniAOD_80XLegacy.toModify(egamma_modifications,prependEgamma8XObjectUpdateModifier) -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -from Configuration.Eras.Modifier_pp_on_PbPb_run3_cff import pp_on_PbPb_run3 -(pp_on_AA_2018 | pp_on_PbPb_run3).toModify(egamma_modifications, appendEgammaHIPhotonIsolationModifier) +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA +pp_on_AA.toModify(egamma_modifications, appendEgammaHIPhotonIsolationModifier) diff --git a/RecoHI/HiCentralityAlgos/python/HiCentrality_cfi.py b/RecoHI/HiCentralityAlgos/python/HiCentrality_cfi.py index 684e615269e61..cadc6b45def02 100644 --- a/RecoHI/HiCentralityAlgos/python/HiCentrality_cfi.py +++ b/RecoHI/HiCentralityAlgos/python/HiCentrality_cfi.py @@ -35,12 +35,11 @@ ) from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017 -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -from Configuration.Eras.Modifier_pp_on_PbPb_run3_cff import pp_on_PbPb_run3 -(pp_on_XeXe_2017 | pp_on_AA_2018 | pp_on_PbPb_run3).toModify(hiCentrality, - producePixelTracks = True, - srcPixelTracks = "hiConformalPixelTracks", - srcTracks = "generalTracks", - srcVertex = "offlinePrimaryVertices" - ) +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA +(pp_on_XeXe_2017 | pp_on_AA).toModify(hiCentrality, + producePixelTracks = True, + srcPixelTracks = "hiConformalPixelTracks", + srcTracks = "generalTracks", + srcVertex = "offlinePrimaryVertices" +) diff --git a/RecoJets/Configuration/python/RecoJetsGlobal_cff.py b/RecoJets/Configuration/python/RecoJetsGlobal_cff.py index b487eec236168..0aaf458382f45 100644 --- a/RecoJets/Configuration/python/RecoJetsGlobal_cff.py +++ b/RecoJets/Configuration/python/RecoJetsGlobal_cff.py @@ -23,8 +23,7 @@ from RecoHI.HiJetAlgos.hiFJRhoProducer import hiFJRhoProducer from RecoHI.HiJetAlgos.HiRecoPFJets_cff import kt4PFJetsForRho from Configuration.Eras.Modifier_pA_2016_cff import pA_2016 -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -from Configuration.Eras.Modifier_pp_on_PbPb_run3_cff import pp_on_PbPb_run3 +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA from RecoHI.HiCentralityAlgos.pACentrality_cfi import pACentrality pA_2016.toModify(pACentrality, producePixelTracks = False) @@ -40,5 +39,5 @@ _jetHighLevelReco_HITask = cms.Task(recoPFJetsHITask,jetCorrectorsForRecoTask,recoJetAssociationsTask) _jetHighLevelReco_HI = cms.Sequence(_jetHighLevelReco_HITask) -(pp_on_AA_2018 | pp_on_PbPb_run3).toReplaceWith(jetGlobalRecoTask,_jetGlobalReco_HITask) -(pp_on_AA_2018 | pp_on_PbPb_run3).toReplaceWith(jetHighLevelRecoTask,_jetHighLevelReco_HITask) +pp_on_AA.toReplaceWith(jetGlobalRecoTask,_jetGlobalReco_HITask) +pp_on_AA.toReplaceWith(jetHighLevelRecoTask,_jetHighLevelReco_HITask) diff --git a/RecoJets/Configuration/python/RecoJets_EventContent_cff.py b/RecoJets/Configuration/python/RecoJets_EventContent_cff.py index c1bd0d76dec5b..f38a8f7f8e585 100644 --- a/RecoJets/Configuration/python/RecoJets_EventContent_cff.py +++ b/RecoJets/Configuration/python/RecoJets_EventContent_cff.py @@ -51,13 +51,13 @@ from Configuration.Eras.Modifier_pA_2016_cff import pA_2016 from Configuration.Eras.Modifier_peripheralPbPb_cff import peripheralPbPb from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017 -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA #products from regular pp which does not fit the normal AOD -for e in [pA_2016, peripheralPbPb, pp_on_XeXe_2017, pp_on_AA_2018]: +for e in [pA_2016, peripheralPbPb, pp_on_XeXe_2017, pp_on_AA]: e.toModify( RecoJetsAOD.outputCommands, func=lambda outputCommands: outputCommands.extend(['keep *_towerMaker_*_*']) ) -for e in [pp_on_XeXe_2017, pp_on_AA_2018]: +for e in [pp_on_XeXe_2017, pp_on_AA]: e.toModify( RecoJetsAOD.outputCommands, func=lambda outputCommands: outputCommands.extend(['keep recoCentrality*_hiCentrality_*_*', 'keep recoClusterCompatibility*_hiClusterCompatibility_*_*' @@ -75,7 +75,7 @@ func=lambda outputCommands: outputCommands.extend(['keep recoCentrality*_pACentrality_*_*']) ) -pp_on_AA_2018.toModify( RecoJetsAOD.outputCommands, +pp_on_AA.toModify( RecoJetsAOD.outputCommands, func=lambda outputCommands: outputCommands.extend(['keep *_hiCentrality_*_*', 'keep *_hiFJRhoProducer_*_*', 'keep *_akPu3PFJets_*_*', diff --git a/RecoJets/JetAssociationProducers/python/ak5JTA_cff.py b/RecoJets/JetAssociationProducers/python/ak5JTA_cff.py index 29228c9866218..33fb28da79a32 100644 --- a/RecoJets/JetAssociationProducers/python/ak5JTA_cff.py +++ b/RecoJets/JetAssociationProducers/python/ak5JTA_cff.py @@ -41,9 +41,8 @@ ak5JTAExplicitTask = cms.Task(ak5JetTracksAssociatorExplicit) ak5JTAExplicit = cms.Sequence(ak5JTAExplicitTask) -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -from Configuration.Eras.Modifier_pp_on_PbPb_run3_cff import pp_on_PbPb_run3 -(pp_on_AA_2018 | pp_on_PbPb_run3).toModify(ak5JetTracksAssociatorAtVertex, - jets = "akCs4PFJets", - tracks = "highPurityGeneralTracks" - ) +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA +pp_on_AA.toModify(ak5JetTracksAssociatorAtVertex, + jets = "akCs4PFJets", + tracks = "highPurityGeneralTracks" +) diff --git a/RecoJets/JetProducers/python/ak4PFJets_cfi.py b/RecoJets/JetProducers/python/ak4PFJets_cfi.py index 60954a960a4bf..ae000a73a3d4a 100644 --- a/RecoJets/JetProducers/python/ak4PFJets_cfi.py +++ b/RecoJets/JetProducers/python/ak4PFJets_cfi.py @@ -35,8 +35,7 @@ doAreaFastjet = True, jetPtMin = 100.0 ) -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -from Configuration.Eras.Modifier_pp_on_PbPb_run3_cff import pp_on_PbPb_run3 -(pp_on_AA_2018 | pp_on_PbPb_run3).toModify(ak4PFJets, src = "pfEmptyCollection") -(pp_on_AA_2018 | pp_on_PbPb_run3).toModify(ak4PFJetsCHS, src = "pfEmptyCollection") -(pp_on_AA_2018 | pp_on_PbPb_run3).toModify(ak4PFJetsPuppi, src = "pfEmptyCollection") +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA +pp_on_AA.toModify(ak4PFJets, src = "pfEmptyCollection") +pp_on_AA.toModify(ak4PFJetsCHS, src = "pfEmptyCollection") +pp_on_AA.toModify(ak4PFJetsPuppi, src = "pfEmptyCollection") diff --git a/RecoJets/JetProducers/python/ak8PFJets_cfi.py b/RecoJets/JetProducers/python/ak8PFJets_cfi.py index ea7e09882989f..8ba114acff736 100644 --- a/RecoJets/JetProducers/python/ak8PFJets_cfi.py +++ b/RecoJets/JetProducers/python/ak8PFJets_cfi.py @@ -25,10 +25,9 @@ src = "pfNoPileUpJME" ) -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -from Configuration.Eras.Modifier_pp_on_PbPb_run3_cff import pp_on_PbPb_run3 -(pp_on_AA_2018 | pp_on_PbPb_run3).toModify(ak8PFJetsCHS, src = "pfEmptyCollection") -(pp_on_AA_2018 | pp_on_PbPb_run3).toModify(ak8PFJetsPuppi, src = "pfEmptyCollection") +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA +pp_on_AA.toModify(ak8PFJetsCHS, src = "pfEmptyCollection") +pp_on_AA.toModify(ak8PFJetsPuppi, src = "pfEmptyCollection") ak8PFJetsCS = ak8PFJets.clone( useConstituentSubtraction = cms.bool(True), diff --git a/RecoJets/JetProducers/python/caloJetsForTrk_cff.py b/RecoJets/JetProducers/python/caloJetsForTrk_cff.py index 74eefb6fb599f..0f66e78976b33 100644 --- a/RecoJets/JetProducers/python/caloJetsForTrk_cff.py +++ b/RecoJets/JetProducers/python/caloJetsForTrk_cff.py @@ -12,8 +12,8 @@ src = 'caloTowerForTrk' ) -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -pp_on_AA_2018.toReplaceWith(ak4CaloJetsForTrk, _akPu4CaloJets.clone( +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA +pp_on_AA.toReplaceWith(ak4CaloJetsForTrk, _akPu4CaloJets.clone( srcPVs = 'firstStepPrimaryVerticesUnsorted', src = 'caloTowerForTrk') ) diff --git a/RecoLocalCalo/Configuration/python/RecoLocalCalo_EventContent_cff.py b/RecoLocalCalo/Configuration/python/RecoLocalCalo_EventContent_cff.py index 61c0810e92edf..3051952c64eca 100644 --- a/RecoLocalCalo/Configuration/python/RecoLocalCalo_EventContent_cff.py +++ b/RecoLocalCalo/Configuration/python/RecoLocalCalo_EventContent_cff.py @@ -18,7 +18,7 @@ from Configuration.Eras.Modifier_phase2_hgcal_cff import phase2_hgcal from Configuration.Eras.Modifier_phase2_hfnose_cff import phase2_hfnose from Configuration.Eras.Modifier_pA_2016_cff import pA_2016 -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA # don't modify AOD for HGCal yet, need "reduced" rechits collection first (i.e. requires reconstruction) phase2_hgcal.toModify( RecoLocalCaloAOD, outputCommands = RecoLocalCaloAOD.outputCommands + ['keep *_HGCalRecHit_*_*', @@ -29,7 +29,7 @@ outputCommands = RecoLocalCaloAOD.outputCommands + ['keep recoCaloClusters_hgcalLayerClustersHFNose_*_*', 'keep *_hgcalLayerClustersHFNose_timeLayerCluster_*', 'keep *_hgcalLayerClustersHFNose_InitialLayerClustersMask_*']) -(pA_2016|pp_on_AA_2018).toModify( RecoLocalCaloAOD.outputCommands, +(pA_2016|pp_on_AA).toModify( RecoLocalCaloAOD.outputCommands, func=lambda outputCommands: outputCommands.extend(['keep *_zdcreco_*_*', 'keep ZDCDataFramesSorted_hcalDigis_*_*', 'keep ZDCDataFramesSorted_castorDigis_*_*', diff --git a/RecoLocalCalo/HcalRecProducers/python/HcalHitSelection_cfi.py b/RecoLocalCalo/HcalRecProducers/python/HcalHitSelection_cfi.py index 3964fd5064e5d..a255a651eb754 100644 --- a/RecoLocalCalo/HcalRecProducers/python/HcalHitSelection_cfi.py +++ b/RecoLocalCalo/HcalRecProducers/python/HcalHitSelection_cfi.py @@ -19,5 +19,5 @@ interestingDetIds = () ) -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -pp_on_AA_2018.toModify(reducedHcalRecHits.interestingDetIds, func = lambda list: list.remove(cms.InputTag("interestingOotEgammaIsoHCALDetId")) ) +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA +pp_on_AA.toModify(reducedHcalRecHits.interestingDetIds, func = lambda list: list.remove(cms.InputTag("interestingOotEgammaIsoHCALDetId")) ) diff --git a/RecoMET/Configuration/python/RecoPFMET_cff.py b/RecoMET/Configuration/python/RecoPFMET_cff.py index fadf1839d5ca2..89b4afad19d63 100644 --- a/RecoMET/Configuration/python/RecoPFMET_cff.py +++ b/RecoMET/Configuration/python/RecoPFMET_cff.py @@ -11,7 +11,7 @@ recoPFMET = cms.Sequence(recoPFMETTask) ##____________________________________________________________________________|| -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -pp_on_AA_2018.toModify(pfMet, globalThreshold = 999.) -pp_on_AA_2018.toModify(pfChMet, globalThreshold = 999.) -pp_on_AA_2018.toModify(pfMetPuppi, globalThreshold = 999.) +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA +pp_on_AA.toModify(pfMet, globalThreshold = 999.) +pp_on_AA.toModify(pfChMet, globalThreshold = 999.) +pp_on_AA.toModify(pfMetPuppi, globalThreshold = 999.) diff --git a/RecoMuon/MuonIdentification/python/muons1stStep_cfi.py b/RecoMuon/MuonIdentification/python/muons1stStep_cfi.py index 4f407a1f3b36a..4cf0ab8b7aaf9 100644 --- a/RecoMuon/MuonIdentification/python/muons1stStep_cfi.py +++ b/RecoMuon/MuonIdentification/python/muons1stStep_cfi.py @@ -99,8 +99,8 @@ inputCollection = cms.InputTag("muons1stStep") ) -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -pp_on_AA_2018.toModify(muons1stStep, minPt = 0.8) +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA +pp_on_AA.toModify(muons1stStep, minPt = 0.8) from Configuration.ProcessModifiers.recoFromReco_cff import recoFromReco recoFromReco.toModify(muons1stStep,fillShowerDigis = False) diff --git a/RecoParticleFlow/Configuration/python/RecoParticleFlow_cff.py b/RecoParticleFlow/Configuration/python/RecoParticleFlow_cff.py index 88f9bb44d6129..3c91c95484e95 100644 --- a/RecoParticleFlow/Configuration/python/RecoParticleFlow_cff.py +++ b/RecoParticleFlow/Configuration/python/RecoParticleFlow_cff.py @@ -68,9 +68,9 @@ phase2_hgcal.toReplaceWith( particleFlowRecoTask, _phase2_hgcal_particleFlowRecoTask ) from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017 -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA -for e in [pp_on_XeXe_2017, pp_on_AA_2018]: +for e in [pp_on_XeXe_2017, pp_on_AA]: e.toModify(particleFlowDisplacedVertexCandidate, tracksSelectorParameters = dict(pt_min = 999999.0, nChi2_max = 0.0, diff --git a/RecoParticleFlow/PFProducer/python/particleFlowEGamma_cff.py b/RecoParticleFlow/PFProducer/python/particleFlowEGamma_cff.py index 445813ac8fa35..942ec3a6a5866 100644 --- a/RecoParticleFlow/PFProducer/python/particleFlowEGamma_cff.py +++ b/RecoParticleFlow/PFProducer/python/particleFlowEGamma_cff.py @@ -84,6 +84,6 @@ gedElectronPFIsoTask) particleFlowEGammaFinal = cms.Sequence(particleFlowEGammaFinalTask) -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -pp_on_AA_2018.toReplaceWith(particleFlowEGammaFullTask, particleFlowEGammaFullTask.copyAndExclude([ootPhotonTask])) +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA +pp_on_AA.toReplaceWith(particleFlowEGammaFullTask, particleFlowEGammaFullTask.copyAndExclude([ootPhotonTask])) diff --git a/RecoParticleFlow/PFTracking/python/mergedElectronSeeds_cfi.py b/RecoParticleFlow/PFTracking/python/mergedElectronSeeds_cfi.py index 186edfe069c66..7e71b38266f88 100644 --- a/RecoParticleFlow/PFTracking/python/mergedElectronSeeds_cfi.py +++ b/RecoParticleFlow/PFTracking/python/mergedElectronSeeds_cfi.py @@ -6,8 +6,8 @@ TkBasedSeeds = cms.InputTag("trackerDrivenElectronSeeds:SeedsForGsf") ) -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -pp_on_AA_2018.toModify(electronMergedSeeds, TkBasedSeeds = '') +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA +pp_on_AA.toModify(electronMergedSeeds, TkBasedSeeds = '') electronMergedSeedsFromMultiCl = electronMergedSeeds.clone( EcalBasedSeeds = 'ecalDrivenElectronSeedsFromMultiCl' diff --git a/RecoParticleFlow/PFTracking/python/trackerDrivenElectronSeeds_cfi.py b/RecoParticleFlow/PFTracking/python/trackerDrivenElectronSeeds_cfi.py index 4483381767409..c1657934f9f94 100644 --- a/RecoParticleFlow/PFTracking/python/trackerDrivenElectronSeeds_cfi.py +++ b/RecoParticleFlow/PFTracking/python/trackerDrivenElectronSeeds_cfi.py @@ -50,8 +50,8 @@ ) from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017 -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -for e in [pp_on_XeXe_2017, pp_on_AA_2018]: +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA +for e in [pp_on_XeXe_2017, pp_on_AA]: e.toModify(trackerDrivenElectronSeeds, MinPt = 5.0) # tracker driven electron seeds depend on the generalTracks trajectory collection diff --git a/RecoPixelVertexing/PixelTriplets/python/PixelTripletLargeTipGenerator_cfi.py b/RecoPixelVertexing/PixelTriplets/python/PixelTripletLargeTipGenerator_cfi.py index e48a5528bb765..339c148bb62ff 100644 --- a/RecoPixelVertexing/PixelTriplets/python/PixelTripletLargeTipGenerator_cfi.py +++ b/RecoPixelVertexing/PixelTriplets/python/PixelTripletLargeTipGenerator_cfi.py @@ -13,6 +13,6 @@ ) from Configuration.Eras.Modifier_peripheralPbPb_cff import peripheralPbPb from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017 -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -for e in [peripheralPbPb, pp_on_XeXe_2017, pp_on_AA_2018]: +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA +for e in [peripheralPbPb, pp_on_XeXe_2017, pp_on_AA]: e.toModify(PixelTripletLargeTipGenerator, maxElement = 1000000) diff --git a/RecoPixelVertexing/PixelTriplets/python/pixelTripletLargeTipEDProducer_cfi.py b/RecoPixelVertexing/PixelTriplets/python/pixelTripletLargeTipEDProducer_cfi.py index 07e53a6beca88..55a164a1398db 100644 --- a/RecoPixelVertexing/PixelTriplets/python/pixelTripletLargeTipEDProducer_cfi.py +++ b/RecoPixelVertexing/PixelTriplets/python/pixelTripletLargeTipEDProducer_cfi.py @@ -8,6 +8,6 @@ from Configuration.Eras.Modifier_peripheralPbPb_cff import peripheralPbPb from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017 -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -for e in [peripheralPbPb, pp_on_XeXe_2017, pp_on_AA_2018]: +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA +for e in [peripheralPbPb, pp_on_XeXe_2017, pp_on_AA]: e.toModify(pixelTripletLargeTipEDProducer, maxElement = 1000000) diff --git a/RecoTauTag/Configuration/python/RecoPFTauTag_cff.py b/RecoTauTag/Configuration/python/RecoPFTauTag_cff.py index 6f0daa60e09db..3427281c1c29c 100644 --- a/RecoTauTag/Configuration/python/RecoPFTauTag_cff.py +++ b/RecoTauTag/Configuration/python/RecoPFTauTag_cff.py @@ -24,8 +24,8 @@ ) from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017 -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -for e in [pp_on_XeXe_2017, pp_on_AA_2018]: +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA +for e in [pp_on_XeXe_2017, pp_on_AA]: e.toModify(recoTauAK4PFJets08Region, minJetPt = 999999.0) # Reconstruct the pi zeros in our pre-selected jets. @@ -57,7 +57,7 @@ chargedHadronSrc = "ak4PFJetsRecoTauChargedHadrons", piZeroSrc = "ak4PFJetsLegacyHPSPiZeros" ) -for e in [pp_on_XeXe_2017, pp_on_AA_2018]: +for e in [pp_on_XeXe_2017, pp_on_AA]: e.toModify(combinatoricRecoTaus, minJetPt = recoTauAK4PFJets08Region.minJetPt) #-------------------------------------------------------------------------------- diff --git a/RecoTauTag/Configuration/python/boostedHPSPFTaus_cff.py b/RecoTauTag/Configuration/python/boostedHPSPFTaus_cff.py index fc0a72531a0ea..7d5a6bd341a79 100644 --- a/RecoTauTag/Configuration/python/boostedHPSPFTaus_cff.py +++ b/RecoTauTag/Configuration/python/boostedHPSPFTaus_cff.py @@ -32,9 +32,8 @@ ) from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017 -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -from Configuration.Eras.Modifier_pp_on_PbPb_run3_cff import pp_on_PbPb_run3 -(pp_on_XeXe_2017 | pp_on_AA_2018 | pp_on_PbPb_run3).toModify(ca8PFJetsCHSprunedForBoostedTaus, inputEtMin = 999999.0, src = "particleFlow") +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA +(pp_on_XeXe_2017 | pp_on_AA).toModify(ca8PFJetsCHSprunedForBoostedTaus, inputEtMin = 999999.0, src = "particleFlow") boostedTauSeeds = cms.EDProducer("BoostedTauSeedsProducer", subjetSrc = cms.InputTag('ca8PFJetsCHSprunedForBoostedTaus', 'subJetsForSeedingBoostedTaus'), diff --git a/RecoTracker/Configuration/python/RecoTracker_EventContent_cff.py b/RecoTracker/Configuration/python/RecoTracker_EventContent_cff.py index 901f20bca544a..641ee50a8a9eb 100644 --- a/RecoTracker/Configuration/python/RecoTracker_EventContent_cff.py +++ b/RecoTracker/Configuration/python/RecoTracker_EventContent_cff.py @@ -18,10 +18,10 @@ ) ) #HI-specific products: needed in AOD, propagate to more inclusive tiers as well -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -pp_on_AA_2018.toModify( RecoTrackerAOD.outputCommands, - func=lambda outputCommands: outputCommands.extend(['keep recoTracks_hiConformalPixelTracks_*_*']) - ) +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA +pp_on_AA.toModify( RecoTrackerAOD.outputCommands, + func=lambda outputCommands: outputCommands.extend(['keep recoTracks_hiConformalPixelTracks_*_*']) +) #RECO content RecoTrackerRECO = cms.PSet( outputCommands = cms.untracked.vstring( @@ -38,12 +38,12 @@ ) ) RecoTrackerRECO.outputCommands.extend(RecoTrackerAOD.outputCommands) -pp_on_AA_2018.toModify( RecoTrackerRECO.outputCommands, - func=lambda outputCommands: outputCommands.extend([ - 'keep recoTrackExtras_hiConformalPixelTracks_*_*', - 'keep TrackingRecHitsOwned_hiConformalPixelTracks_*_*' - ]) - ) +pp_on_AA.toModify( RecoTrackerRECO.outputCommands, + func=lambda outputCommands: outputCommands.extend([ + 'keep recoTrackExtras_hiConformalPixelTracks_*_*', + 'keep TrackingRecHitsOwned_hiConformalPixelTracks_*_*' + ]) +) #Full Event content RecoTrackerFEVT = cms.PSet( outputCommands = cms.untracked.vstring() diff --git a/RecoTracker/ConversionSeedGenerators/python/ConversionStep_cff.py b/RecoTracker/ConversionSeedGenerators/python/ConversionStep_cff.py index 955a851007c46..d07c6d1233926 100644 --- a/RecoTracker/ConversionSeedGenerators/python/ConversionStep_cff.py +++ b/RecoTracker/ConversionSeedGenerators/python/ConversionStep_cff.py @@ -250,8 +250,8 @@ #photonConvTrajSeedFromQuadruplets.primaryVerticesTag = cms.InputTag('pixelVertices') from Configuration.Eras.Modifier_trackingLowPU_cff import trackingLowPU trackingLowPU.toModify(photonConvTrajSeedFromSingleLeg, primaryVerticesTag = 'pixelVertices') -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -pp_on_AA_2018.toModify(photonConvTrajSeedFromSingleLeg, vtxMinDoF = 999999.) +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA +pp_on_AA.toModify(photonConvTrajSeedFromSingleLeg, vtxMinDoF = 999999.) # TRACKER DATA CONTROL diff --git a/RecoTracker/ConversionSeedGenerators/python/PhotonConversionTrajectorySeedProducerFromSingleLeg_cfi.py b/RecoTracker/ConversionSeedGenerators/python/PhotonConversionTrajectorySeedProducerFromSingleLeg_cfi.py index b7aa23a49bbbd..2de005fbd6d89 100644 --- a/RecoTracker/ConversionSeedGenerators/python/PhotonConversionTrajectorySeedProducerFromSingleLeg_cfi.py +++ b/RecoTracker/ConversionSeedGenerators/python/PhotonConversionTrajectorySeedProducerFromSingleLeg_cfi.py @@ -68,15 +68,15 @@ ) from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017 -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -(pp_on_XeXe_2017 | pp_on_AA_2018 ).toModify(photonConvTrajSeedFromSingleLeg, +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA +(pp_on_XeXe_2017 | pp_on_AA ).toModify(photonConvTrajSeedFromSingleLeg, ClusterCheckPSet = dict(MaxNumberOfPixelClusters = 100000, cut = "strip < 1000000 && pixel < 100000 && (strip < 50000 + 10*pixel) && (pixel < 5000 + strip/2.)" ), OrderedHitsFactoryPSet = dict(maxElement = 100000) ) from RecoTracker.TkTrackingRegions.globalTrackingRegionWithVertices_cff import globalTrackingRegionWithVertices as _globalTrackingRegionWithVertices -(pp_on_XeXe_2017 | pp_on_AA_2018 ).toModify(photonConvTrajSeedFromSingleLeg, +(pp_on_XeXe_2017 | pp_on_AA ).toModify(photonConvTrajSeedFromSingleLeg, RegionFactoryPSet = dict(ComponentName = 'GlobalTrackingRegionWithVerticesProducer', RegionPSet = _globalTrackingRegionWithVertices.RegionPSet.clone( originRadius = 0, diff --git a/RecoTracker/IterativeTracking/python/DetachedQuadStep_cff.py b/RecoTracker/IterativeTracking/python/DetachedQuadStep_cff.py index dd7e55b6eff9a..df61a9fb7bad1 100644 --- a/RecoTracker/IterativeTracking/python/DetachedQuadStep_cff.py +++ b/RecoTracker/IterativeTracking/python/DetachedQuadStep_cff.py @@ -37,9 +37,9 @@ ))) from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017 -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA from RecoTracker.TkTrackingRegions.globalTrackingRegionWithVertices_cff import globalTrackingRegionWithVertices as _globalTrackingRegionWithVertices -(pp_on_XeXe_2017 | pp_on_AA_2018).toReplaceWith(detachedQuadStepTrackingRegions, +(pp_on_XeXe_2017 | pp_on_AA).toReplaceWith(detachedQuadStepTrackingRegions, _globalTrackingRegionWithVertices.clone(RegionPSet=dict( fixedError = 3.75, ptMin = 0.9, @@ -130,8 +130,7 @@ filters = detachedQuadStepTrajectoryFilter.filters.value()+[cms.PSet(refToPSet_ = cms.string('ClusterShapeTrajectoryFilter'))] ) -for e in [pp_on_XeXe_2017, pp_on_AA_2018]: - e.toModify(detachedQuadStepTrajectoryFilterBase, minPt=0.9) +(pp_on_XeXe_2017 | pp_on_AA).toModify(detachedQuadStepTrajectoryFilterBase, minPt=0.9) import RecoTracker.MeasurementDet.Chi2ChargeMeasurementEstimator_cfi detachedQuadStepChi2Est = RecoTracker.MeasurementDet.Chi2ChargeMeasurementEstimator_cfi.Chi2ChargeMeasurementEstimator.clone( @@ -220,7 +219,7 @@ )) highBetaStar_2018.toModify(detachedQuadStep,qualityCuts = [-0.7,0.0,0.5]) -pp_on_AA_2018.toModify(detachedQuadStep, +pp_on_AA.toModify(detachedQuadStep, mva = dict(GBRForestLabel = 'HIMVASelectorDetachedQuadStep_Phase1'), qualityCuts = [-0.2, 0.2, 0.5], ) diff --git a/RecoTracker/IterativeTracking/python/DetachedTripletStep_cff.py b/RecoTracker/IterativeTracking/python/DetachedTripletStep_cff.py index 77182fb282b6d..658878cd8f8fd 100644 --- a/RecoTracker/IterativeTracking/python/DetachedTripletStep_cff.py +++ b/RecoTracker/IterativeTracking/python/DetachedTripletStep_cff.py @@ -52,9 +52,9 @@ trackingPhase1.toModify(detachedTripletStepTrackingRegions, RegionPSet = dict(ptMin = 0.25)) from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017 -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA from RecoTracker.TkTrackingRegions.globalTrackingRegionWithVertices_cff import globalTrackingRegionWithVertices as _globalTrackingRegionWithVertices -(pp_on_XeXe_2017 | pp_on_AA_2018).toReplaceWith(detachedTripletStepTrackingRegions, +(pp_on_XeXe_2017 | pp_on_AA).toReplaceWith(detachedTripletStepTrackingRegions, _globalTrackingRegionWithVertices.clone(RegionPSet=dict( fixedError = 2.5, ptMin = 0.9, @@ -151,8 +151,7 @@ constantValueForLostHitsFractionFilter = 0.701, )) -for e in [pp_on_XeXe_2017, pp_on_AA_2018]: - e.toModify(detachedTripletStepTrajectoryFilterBase, minPt=0.9) +(pp_on_XeXe_2017 | pp_on_AA).toModify(detachedTripletStepTrajectoryFilterBase, minPt=0.9) import RecoPixelVertexing.PixelLowPtUtilities.StripSubClusterShapeTrajectoryFilter_cfi detachedTripletStepTrajectoryFilterShape = RecoPixelVertexing.PixelLowPtUtilities.StripSubClusterShapeTrajectoryFilter_cfi.StripSubClusterShapeTrajectoryFilterTIX12.clone() @@ -269,7 +268,7 @@ (trackdnn & fastSim).toModify(detachedTripletStep,vertices = 'firstStepPrimaryVerticesBeforeMixing') highBetaStar_2018.toModify(detachedTripletStep,qualityCuts = [-0.5,0.0,0.5]) -pp_on_AA_2018.toModify(detachedTripletStep, +pp_on_AA.toModify(detachedTripletStep, mva = dict(GBRForestLabel = 'HIMVASelectorDetachedTripletStep_Phase1'), qualityCuts = [-0.2, 0.4, 0.85], ) diff --git a/RecoTracker/IterativeTracking/python/ElectronSeeds_cff.py b/RecoTracker/IterativeTracking/python/ElectronSeeds_cff.py index 7004889ddaf2e..db92a7df14fb4 100644 --- a/RecoTracker/IterativeTracking/python/ElectronSeeds_cff.py +++ b/RecoTracker/IterativeTracking/python/ElectronSeeds_cff.py @@ -94,9 +94,9 @@ nSigmaZ = 4.0 )) -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA from RecoTracker.TkTrackingRegions.globalTrackingRegionWithVertices_cff import globalTrackingRegionWithVertices as _globalTrackingRegionWithVertices -pp_on_AA_2018.toReplaceWith(tripletElectronTrackingRegions, +pp_on_AA.toReplaceWith(tripletElectronTrackingRegions, _globalTrackingRegionWithVertices.clone( RegionPSet = dict( fixedError = 0.5, @@ -174,7 +174,7 @@ originRadius = 0.015, fixedError = 0.03, )) -pp_on_AA_2018.toModify(pixelPairElectronTrackingRegions, RegionPSet = dict(ptMin = 8.0)) +pp_on_AA.toModify(pixelPairElectronTrackingRegions, RegionPSet = dict(ptMin = 8.0)) from RecoTracker.TkHitPairs.hitPairEDProducer_cfi import hitPairEDProducer as _hitPairEDProducer pixelPairElectronHitDoublets = _hitPairEDProducer.clone( seedingLayers = 'pixelPairElectronSeedLayers', @@ -221,7 +221,7 @@ originHalfLength = 12.0, originRadius = 0.4, )) -pp_on_AA_2018.toReplaceWith(stripPairElectronTrackingRegions, +pp_on_AA.toReplaceWith(stripPairElectronTrackingRegions, _globalTrackingRegionWithVertices.clone( RegionPSet = dict( fixedError = 0.5, diff --git a/RecoTracker/IterativeTracking/python/HighPtTripletStep_cff.py b/RecoTracker/IterativeTracking/python/HighPtTripletStep_cff.py index ad72a25b1959c..efe2111bd5462 100644 --- a/RecoTracker/IterativeTracking/python/HighPtTripletStep_cff.py +++ b/RecoTracker/IterativeTracking/python/HighPtTripletStep_cff.py @@ -67,9 +67,9 @@ trackingPhase2PU140.toModify(highPtTripletStepTrackingRegions, RegionPSet = dict(ptMin = 0.7, originRadius = 0.02)) from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017 -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA from RecoTracker.TkTrackingRegions.globalTrackingRegionWithVertices_cff import globalTrackingRegionWithVertices as _globalTrackingRegionWithVertices -(pp_on_XeXe_2017 | pp_on_AA_2018).toReplaceWith(highPtTripletStepTrackingRegions, +(pp_on_XeXe_2017 | pp_on_AA).toReplaceWith(highPtTripletStepTrackingRegions, _globalTrackingRegionWithVertices.clone(RegionPSet=dict( fixedError = 0.2, ptMin = 0.7, @@ -148,8 +148,7 @@ ) trackingPhase2PU140.toReplaceWith(highPtTripletStepTrajectoryFilterBase, _highPtTripletStepTrajectoryFilterBase) -for e in [pp_on_XeXe_2017, pp_on_AA_2018]: - e.toModify(highPtTripletStepTrajectoryFilterBase, minPt=0.7) +(pp_on_XeXe_2017 | pp_on_AA).toModify(highPtTripletStepTrajectoryFilterBase, minPt=0.7) highBetaStar_2018.toModify(highPtTripletStepTrajectoryFilterBase, minPt=0.05) highPtTripletStepTrajectoryFilter = _TrajectoryFilter_cff.CompositeTrajectoryFilter_block.clone( @@ -262,7 +261,7 @@ )) highBetaStar_2018.toModify(highPtTripletStep,qualityCuts = [-0.2,0.3,0.4]) -pp_on_AA_2018.toModify(highPtTripletStep, +pp_on_AA.toModify(highPtTripletStep, mva = dict(GBRForestLabel = 'HIMVASelectorHighPtTripletStep_Phase1'), qualityCuts = [-0.9, -0.3, 0.85], ) diff --git a/RecoTracker/IterativeTracking/python/InitialStepPreSplitting_cff.py b/RecoTracker/IterativeTracking/python/InitialStepPreSplitting_cff.py index 97a27bac037cd..826412e2db73f 100644 --- a/RecoTracker/IterativeTracking/python/InitialStepPreSplitting_cff.py +++ b/RecoTracker/IterativeTracking/python/InitialStepPreSplitting_cff.py @@ -143,8 +143,8 @@ vertexCollections = [_offlinePrimaryVertices.vertexCollections[0].clone()] ) from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017 -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -(pp_on_XeXe_2017 | pp_on_AA_2018).toModify(firstStepPrimaryVerticesPreSplitting, TkFilterParameters = dict(trackQuality = 'any')) +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA +(pp_on_XeXe_2017 | pp_on_AA).toModify(firstStepPrimaryVerticesPreSplitting, TkFilterParameters = dict(trackQuality = 'any')) #Jet Core emulation to identify jet-tracks from RecoTracker.IterativeTracking.InitialStep_cff import initialStepTrackRefsForJets, caloTowerForTrk, ak4CaloJetsForTrk diff --git a/RecoTracker/IterativeTracking/python/InitialStep_cff.py b/RecoTracker/IterativeTracking/python/InitialStep_cff.py index a04086a3f3314..c3296859b1a0e 100644 --- a/RecoTracker/IterativeTracking/python/InitialStep_cff.py +++ b/RecoTracker/IterativeTracking/python/InitialStep_cff.py @@ -148,9 +148,8 @@ _tracker_apv_vfp30_2016.toModify(initialStepTrajectoryFilterBase, maxCCCLostHits = 2) from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017 -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -for e in [pp_on_XeXe_2017, pp_on_AA_2018]: - e.toModify(initialStepTrajectoryFilterBase, minPt=0.6) +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA +(pp_on_XeXe_2017 | pp_on_AA).toModify(initialStepTrajectoryFilterBase, minPt=0.6) highBetaStar_2018.toModify(initialStepTrajectoryFilterBase, minPt = 0.05) initialStepTrajectoryFilterInOut = initialStepTrajectoryFilterBase.clone( @@ -262,9 +261,7 @@ TrackLabel = 'initialStepTracks', vertexCollections = [_offlinePrimaryVertices.vertexCollections[0].clone()] ) -from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017 -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -(pp_on_XeXe_2017 | pp_on_AA_2018).toModify(firstStepPrimaryVerticesUnsorted, TkFilterParameters = dict(trackQuality = 'any')) +(pp_on_XeXe_2017 | pp_on_AA).toModify(firstStepPrimaryVerticesUnsorted, TkFilterParameters = dict(trackQuality = 'any')) # we need a replacment for the firstStepPrimaryVerticesUnsorted # that includes tracker information of signal and pile up @@ -326,7 +323,7 @@ )) (trackdnn & fastSim).toModify(initialStep,vertices = 'firstStepPrimaryVerticesBeforeMixing') -pp_on_AA_2018.toModify(initialStep, +pp_on_AA.toModify(initialStep, mva = dict(GBRForestLabel = 'HIMVASelectorInitialStep_Phase1'), qualityCuts = [-0.9, -0.5, 0.2], ) diff --git a/RecoTracker/IterativeTracking/python/JetCoreRegionalStep_cff.py b/RecoTracker/IterativeTracking/python/JetCoreRegionalStep_cff.py index 0a8f2e1d5516a..7df01c115c676 100644 --- a/RecoTracker/IterativeTracking/python/JetCoreRegionalStep_cff.py +++ b/RecoTracker/IterativeTracking/python/JetCoreRegionalStep_cff.py @@ -96,9 +96,8 @@ ) from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017 -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -for e in [pp_on_XeXe_2017, pp_on_AA_2018]: - e.toModify(jetCoreRegionalStepTrajectoryFilter, minPt=5.0) +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA +(pp_on_XeXe_2017 | pp_on_AA).toModify(jetCoreRegionalStepTrajectoryFilter, minPt=5.0) import TrackingTools.KalmanUpdators.Chi2MeasurementEstimator_cfi jetCoreRegionalStepChi2Est = TrackingTools.KalmanUpdators.Chi2MeasurementEstimator_cfi.Chi2MeasurementEstimator.clone( diff --git a/RecoTracker/IterativeTracking/python/LowPtQuadStep_cff.py b/RecoTracker/IterativeTracking/python/LowPtQuadStep_cff.py index 3173217de15df..6d1e137901549 100644 --- a/RecoTracker/IterativeTracking/python/LowPtQuadStep_cff.py +++ b/RecoTracker/IterativeTracking/python/LowPtQuadStep_cff.py @@ -29,9 +29,9 @@ trackingPhase2PU140.toModify(lowPtQuadStepTrackingRegions, RegionPSet = dict(ptMin = 0.35,originRadius = 0.025)) from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017 -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA from RecoTracker.TkTrackingRegions.globalTrackingRegionWithVertices_cff import globalTrackingRegionWithVertices as _globalTrackingRegionWithVertices -(pp_on_XeXe_2017 | pp_on_AA_2018).toReplaceWith(lowPtQuadStepTrackingRegions, +(pp_on_XeXe_2017 | pp_on_AA).toReplaceWith(lowPtQuadStepTrackingRegions, _globalTrackingRegionWithVertices.clone(RegionPSet=dict( fixedError = 0.5, ptMin = 0.49, @@ -110,8 +110,7 @@ ) trackingPhase2PU140.toReplaceWith(lowPtQuadStepTrajectoryFilterBase, _lowPtQuadStepTrajectoryFilterBase) -for e in [pp_on_XeXe_2017, pp_on_AA_2018]: - e.toModify(lowPtQuadStepTrajectoryFilterBase, minPt=0.49) +(pp_on_XeXe_2017 | pp_on_AA).toModify(lowPtQuadStepTrajectoryFilterBase, minPt=0.49) from RecoPixelVertexing.PixelLowPtUtilities.ClusterShapeTrajectoryFilter_cfi import * # Composite filter @@ -213,7 +212,7 @@ )) highBetaStar_2018.toModify(lowPtQuadStep,qualityCuts = [-0.9,-0.35,-0.15]) -pp_on_AA_2018.toModify(lowPtQuadStep, +pp_on_AA.toModify(lowPtQuadStep, mva = dict(GBRForestLabel = 'HIMVASelectorLowPtQuadStep_Phase1'), qualityCuts = [-0.9, -0.4, 0.3], ) diff --git a/RecoTracker/IterativeTracking/python/LowPtTripletStep_cff.py b/RecoTracker/IterativeTracking/python/LowPtTripletStep_cff.py index 266a80b156123..9ebd3a52da078 100644 --- a/RecoTracker/IterativeTracking/python/LowPtTripletStep_cff.py +++ b/RecoTracker/IterativeTracking/python/LowPtTripletStep_cff.py @@ -62,9 +62,9 @@ trackingPhase2PU140.toModify(lowPtTripletStepTrackingRegions, RegionPSet = dict(ptMin = 0.40)) from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017 -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA from RecoTracker.TkTrackingRegions.globalTrackingRegionWithVertices_cff import globalTrackingRegionWithVertices as _globalTrackingRegionWithVertices -(pp_on_XeXe_2017 | pp_on_AA_2018).toReplaceWith(lowPtTripletStepTrackingRegions, +(pp_on_XeXe_2017 | pp_on_AA).toReplaceWith(lowPtTripletStepTrackingRegions, _globalTrackingRegionWithVertices.clone(RegionPSet=dict( useFixedError = False, ptMin = 0.49, @@ -172,8 +172,7 @@ trackingLowPU.toReplaceWith(lowPtTripletStepStandardTrajectoryFilter, _lowPtTripletStepStandardTrajectoryFilterBase) trackingPhase2PU140.toReplaceWith(lowPtTripletStepStandardTrajectoryFilter, _lowPtTripletStepStandardTrajectoryFilterBase) -for e in [pp_on_XeXe_2017, pp_on_AA_2018]: - e.toModify(lowPtTripletStepStandardTrajectoryFilter, minPt=0.49) +(pp_on_XeXe_2017 | pp_on_AA).toModify(lowPtTripletStepStandardTrajectoryFilter, minPt=0.49) from RecoPixelVertexing.PixelLowPtUtilities.ClusterShapeTrajectoryFilter_cfi import * # Composite filter @@ -288,7 +287,7 @@ )) highBetaStar_2018.toModify(lowPtTripletStep,qualityCuts = [-0.7,-0.3,-0.1]) -pp_on_AA_2018.toModify(lowPtTripletStep, +pp_on_AA.toModify(lowPtTripletStep, mva = dict(GBRForestLabel = 'HIMVASelectorLowPtTripletStep_Phase1'), qualityCuts = [-0.8, -0.4, 0.5], ) diff --git a/RecoTracker/IterativeTracking/python/MixedTripletStep_cff.py b/RecoTracker/IterativeTracking/python/MixedTripletStep_cff.py index 62b81ceb94452..2795d77035499 100644 --- a/RecoTracker/IterativeTracking/python/MixedTripletStep_cff.py +++ b/RecoTracker/IterativeTracking/python/MixedTripletStep_cff.py @@ -95,7 +95,7 @@ mixedTripletStepTrackingRegionsA = _mixedTripletStepTrackingRegionsCommon.clone() from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017 -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA from RecoTracker.TkTrackingRegions.globalTrackingRegionWithVertices_cff import globalTrackingRegionWithVertices as _globalTrackingRegionWithVertices _mixedTripletStepTrackingRegionsCommon_pp_on_HI = _globalTrackingRegionWithVertices.clone( RegionPSet=dict( @@ -110,7 +110,7 @@ scalingEndNPix = 35000 ) ) -(pp_on_XeXe_2017 | pp_on_AA_2018).toReplaceWith(mixedTripletStepTrackingRegionsA,_mixedTripletStepTrackingRegionsCommon_pp_on_HI) +(pp_on_XeXe_2017 | pp_on_AA).toReplaceWith(mixedTripletStepTrackingRegionsA,_mixedTripletStepTrackingRegionsCommon_pp_on_HI) # seeding @@ -182,7 +182,7 @@ # TrackingRegion mixedTripletStepTrackingRegionsB = _mixedTripletStepTrackingRegionsCommon.clone(RegionPSet = dict(ptMin=0.6, originHalfLength=10.0)) -(pp_on_XeXe_2017 | pp_on_AA_2018).toReplaceWith(mixedTripletStepTrackingRegionsB, +(pp_on_XeXe_2017 | pp_on_AA).toReplaceWith(mixedTripletStepTrackingRegionsB, _mixedTripletStepTrackingRegionsCommon_pp_on_HI.clone(RegionPSet=dict( fixedError = 2.5, ptMin = 0.6,) @@ -228,8 +228,7 @@ maxLostHits = 0, )) -for e in [pp_on_XeXe_2017, pp_on_AA_2018]: - e.toModify(mixedTripletStepTrajectoryFilter, minPt=0.4) +(pp_on_XeXe_2017 | pp_on_AA).toModify(mixedTripletStepTrajectoryFilter, minPt=0.4) # Propagator taking into account momentum uncertainty in multiple scattering calculation. import TrackingTools.MaterialEffects.MaterialPropagatorParabolicMf_cff @@ -239,7 +238,7 @@ ComponentName = 'mixedTripletStepPropagator', ptMin = 0.1 ) -for e in [pp_on_XeXe_2017, pp_on_AA_2018]: +for e in [pp_on_XeXe_2017, pp_on_AA]: e.toModify(mixedTripletStepPropagator, ptMin=0.4) highBetaStar_2018.toModify(mixedTripletStepPropagator,ptMin = 0.05) @@ -249,7 +248,7 @@ ComponentName = 'mixedTripletStepPropagatorOpposite', ptMin = 0.1 ) -for e in [pp_on_XeXe_2017, pp_on_AA_2018]: +for e in [pp_on_XeXe_2017, pp_on_AA]: e.toModify(mixedTripletStepPropagatorOpposite, ptMin=0.4) highBetaStar_2018.toModify(mixedTripletStepPropagatorOpposite,ptMin = 0.05) @@ -354,7 +353,7 @@ (trackdnn & fastSim).toModify(mixedTripletStep,vertices = 'firstStepPrimaryVerticesBeforeMixing') highBetaStar_2018.toModify(mixedTripletStep,qualityCuts = [-0.7,0.0,0.5]) -pp_on_AA_2018.toModify(mixedTripletStep, qualityCuts = [-0.5,0.0,0.9]) +pp_on_AA.toModify(mixedTripletStep, qualityCuts = [-0.5,0.0,0.9]) # For LowPU import RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi diff --git a/RecoTracker/IterativeTracking/python/PixelLessStep_cff.py b/RecoTracker/IterativeTracking/python/PixelLessStep_cff.py index 904b1d81aedf0..1d76dc3b1fe80 100644 --- a/RecoTracker/IterativeTracking/python/PixelLessStep_cff.py +++ b/RecoTracker/IterativeTracking/python/PixelLessStep_cff.py @@ -142,9 +142,9 @@ )) from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017 -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA from RecoTracker.IterativeTracking.MixedTripletStep_cff import _mixedTripletStepTrackingRegionsCommon_pp_on_HI -(pp_on_XeXe_2017 | pp_on_AA_2018).toReplaceWith(pixelLessStepTrackingRegions, +(pp_on_XeXe_2017 | pp_on_AA).toReplaceWith(pixelLessStepTrackingRegions, _mixedTripletStepTrackingRegionsCommon_pp_on_HI.clone(RegionPSet=dict( ptMinScaling4BigEvts = False, fixedError = 3.0, @@ -238,8 +238,7 @@ seedPairPenalty = 1, ) trackingLowPU.toReplaceWith(pixelLessStepTrajectoryFilter, _pixelLessStepTrajectoryFilterBase) -for e in [pp_on_XeXe_2017, pp_on_AA_2018]: - e.toModify(pixelLessStepTrajectoryFilter, minPt=2.0) +(pp_on_XeXe_2017 | pp_on_AA).toModify(pixelLessStepTrajectoryFilter, minPt=2.0) vectorHits.toReplaceWith(pixelLessStepTrajectoryFilter, _pixelLessStepTrajectoryFilterBase) vectorHits.toModify(pixelLessStepTrajectoryFilter, minimumNumberOfHits = 4, maxLostHits = 1) @@ -353,7 +352,7 @@ )) (trackdnn & fastSim).toModify(pixelLessStep,vertices = 'firstStepPrimaryVerticesBeforeMixing') -pp_on_AA_2018.toModify(pixelLessStep, qualityCuts = [-0.4,0.0,0.8]) +pp_on_AA.toModify(pixelLessStep, qualityCuts = [-0.4,0.0,0.8]) # For LowPU import RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi diff --git a/RecoTracker/IterativeTracking/python/PixelPairStep_cff.py b/RecoTracker/IterativeTracking/python/PixelPairStep_cff.py index 81eb716d6a39b..e945486cbb2cc 100644 --- a/RecoTracker/IterativeTracking/python/PixelPairStep_cff.py +++ b/RecoTracker/IterativeTracking/python/PixelPairStep_cff.py @@ -171,8 +171,8 @@ )) #include commented lines from above in pp_on_XY eras; global seeds (A) are not used in this era b/c timing from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017 -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -(pp_on_XeXe_2017 | pp_on_AA_2018).toModify(pixelPairStepTrackingRegionsSeedLayersB, layerList = [ +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA +(pp_on_XeXe_2017 | pp_on_AA).toModify(pixelPairStepTrackingRegionsSeedLayersB, layerList = [ 'BPix1+BPix2', 'BPix1+BPix3', 'BPix1+BPix4', 'BPix2+BPix3', 'BPix2+BPix4','BPix3+BPix4', 'BPix1+FPix1_pos' , 'BPix1+FPix1_neg', 'BPix1+FPix2_pos' , 'BPix1+FPix2_neg', @@ -201,7 +201,7 @@ (trackingPhase1 & ~fastSim).toReplaceWith(pixelPairStepSeeds, _pixelPairStepSeedsMerged) #only use region B for pp_on_XY era for timing reasons -(pp_on_XeXe_2017 | pp_on_AA_2018).toReplaceWith(pixelPairStepSeeds, pixelPairStepSeedsB) +(pp_on_XeXe_2017 | pp_on_AA).toReplaceWith(pixelPairStepSeeds, pixelPairStepSeedsB) # QUALITY CUTS DURING TRACK BUILDING import TrackingTools.TrajectoryFiltering.TrajectoryFilter_cff @@ -346,7 +346,7 @@ )) highBetaStar_2018.toModify(pixelPairStep,qualityCuts = [-0.95,0.0,0.3]) -pp_on_AA_2018.toModify(pixelPairStep, qualityCuts = [-0.2, 0.0, 0.98]) +pp_on_AA.toModify(pixelPairStep, qualityCuts = [-0.2, 0.0, 0.98]) fastSim.toModify(pixelPairStep, vertices = 'firstStepPrimaryVerticesBeforeMixing') # For LowPU and Phase2PU140 @@ -447,7 +447,7 @@ trackingPhase1.toReplaceWith(PixelPairStepTask, _PixelPairStepTask_Phase1) _PixelPairStepTask_pp_on_AA.replace(pixelPairStepHitDoublets, cms.Task(pixelPairStepTrackingRegionsSeedLayersB,pixelPairStepHitDoubletsB)) -(pp_on_XeXe_2017 | pp_on_AA_2018).toReplaceWith(PixelPairStepTask, _PixelPairStepTask_pp_on_AA) +(pp_on_XeXe_2017 | pp_on_AA).toReplaceWith(PixelPairStepTask, _PixelPairStepTask_pp_on_AA) #fastSim import FastSimulation.Tracking.FastTrackerRecHitMaskProducer_cfi diff --git a/RecoTracker/IterativeTracking/python/TobTecStep_cff.py b/RecoTracker/IterativeTracking/python/TobTecStep_cff.py index 38f916dea3ea8..f452ce46244d0 100644 --- a/RecoTracker/IterativeTracking/python/TobTecStep_cff.py +++ b/RecoTracker/IterativeTracking/python/TobTecStep_cff.py @@ -51,9 +51,9 @@ )) from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017 -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA from RecoTracker.IterativeTracking.MixedTripletStep_cff import _mixedTripletStepTrackingRegionsCommon_pp_on_HI -(pp_on_XeXe_2017 | pp_on_AA_2018).toReplaceWith(tobTecStepTrackingRegionsTripl, +(pp_on_XeXe_2017 | pp_on_AA).toReplaceWith(tobTecStepTrackingRegionsTripl, _mixedTripletStepTrackingRegionsCommon_pp_on_HI.clone(RegionPSet=dict( ptMinScaling4BigEvts = False, fixedError = 5.0, @@ -147,7 +147,7 @@ originRadius = 6.0, )) -(pp_on_XeXe_2017 | pp_on_AA_2018).toReplaceWith(tobTecStepTrackingRegionsPair, +(pp_on_XeXe_2017 | pp_on_AA).toReplaceWith(tobTecStepTrackingRegionsPair, _mixedTripletStepTrackingRegionsCommon_pp_on_HI.clone(RegionPSet = dict( ptMinScaling4BigEvts = False, fixedError = 7.5, @@ -207,8 +207,8 @@ trackingLowPU.toReplaceWith(tobTecStepTrajectoryFilter, _tobTecStepTrajectoryFilterBase.clone( minimumNumberOfHits = 6, )) -for e in [pp_on_XeXe_2017, pp_on_AA_2018]: - e.toModify(tobTecStepTrajectoryFilter, minPt=2.0) + +(pp_on_XeXe_2017 | pp_on_AA).toModify(tobTecStepTrajectoryFilter, minPt=2.0) tobTecStepInOutTrajectoryFilter = tobTecStepTrajectoryFilter.clone( minimumNumberOfHits = 4, @@ -380,7 +380,7 @@ )) (trackdnn & fastSim).toModify(tobTecStep,vertices = 'firstStepPrimaryVerticesBeforeMixing') -pp_on_AA_2018.toModify(tobTecStep, qualityCuts = [-0.6,-0.3,0.7]) +pp_on_AA.toModify(tobTecStep, qualityCuts = [-0.6,-0.3,0.7]) import RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi trackingLowPU.toReplaceWith(tobTecStep, RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.multiTrackSelector.clone( diff --git a/RecoTracker/IterativeTracking/python/iterativeTkConfig.py b/RecoTracker/IterativeTracking/python/iterativeTkConfig.py index 0f187dcf4184b..7af0227d97cb7 100644 --- a/RecoTracker/IterativeTracking/python/iterativeTkConfig.py +++ b/RecoTracker/IterativeTracking/python/iterativeTkConfig.py @@ -99,8 +99,8 @@ minNumberOfLayersWithMeasBeforeFiltering = 0, ) -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -pp_on_AA_2018.toModify(_trackClusterRemoverBase, TrackQuality = 'tight') +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA +pp_on_AA.toModify(_trackClusterRemoverBase, TrackQuality = 'tight') #Phase2 : configuring the phase2 track Cluster Remover from RecoLocalTracker.SubCollectionProducers.phase2trackClusterRemover_cfi import phase2trackClusterRemover as _phase2trackClusterRemover diff --git a/RecoTracker/TkSeedGenerator/python/MultiHitGeneratorFromChi2_cfi.py b/RecoTracker/TkSeedGenerator/python/MultiHitGeneratorFromChi2_cfi.py index 8e31dc8a8e3c0..83f5936a8ba31 100644 --- a/RecoTracker/TkSeedGenerator/python/MultiHitGeneratorFromChi2_cfi.py +++ b/RecoTracker/TkSeedGenerator/python/MultiHitGeneratorFromChi2_cfi.py @@ -28,7 +28,6 @@ from Configuration.Eras.Modifier_peripheralPbPb_cff import peripheralPbPb from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017 -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -for e in [peripheralPbPb, pp_on_XeXe_2017, pp_on_AA_2018]: - e.toModify(MultiHitGeneratorFromChi2, maxElement = 1000000) +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA +(peripheralPbPb | pp_on_XeXe_2017 | pp_on_AA).toModify(MultiHitGeneratorFromChi2, maxElement = 1000000) diff --git a/RecoTracker/TkSeedGenerator/python/SeedGeneratorFromRegionHitsEDProducer_cfi.py b/RecoTracker/TkSeedGenerator/python/SeedGeneratorFromRegionHitsEDProducer_cfi.py index ceb96030988d6..40a6304b444d8 100644 --- a/RecoTracker/TkSeedGenerator/python/SeedGeneratorFromRegionHitsEDProducer_cfi.py +++ b/RecoTracker/TkSeedGenerator/python/SeedGeneratorFromRegionHitsEDProducer_cfi.py @@ -49,9 +49,8 @@ ) from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017 -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -for e in [pp_on_XeXe_2017, pp_on_AA_2018]: - e.toModify(seedGeneratorFromRegionHitsEDProducer, +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA +(pp_on_XeXe_2017 | pp_on_AA).toModify(seedGeneratorFromRegionHitsEDProducer, ClusterCheckPSet = dict(doClusterCheck = True, # FIXMETOO cut = "strip < 1000000 && pixel < 100000 && (strip < 50000 + 10*pixel) && (pixel < 5000 + strip/2.)", MaxNumberOfPixelClusters = 100000) diff --git a/RecoTracker/TkSeedGenerator/python/multiHitFromChi2EDProducer_cfi.py b/RecoTracker/TkSeedGenerator/python/multiHitFromChi2EDProducer_cfi.py index ea0c2e855afc6..95dd507d2e78c 100644 --- a/RecoTracker/TkSeedGenerator/python/multiHitFromChi2EDProducer_cfi.py +++ b/RecoTracker/TkSeedGenerator/python/multiHitFromChi2EDProducer_cfi.py @@ -3,6 +3,5 @@ from Configuration.Eras.Modifier_peripheralPbPb_cff import peripheralPbPb from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017 -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -for e in [peripheralPbPb, pp_on_XeXe_2017, pp_on_AA_2018]: - e.toModify(multiHitFromChi2EDProducer, maxElement = 1000000) +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA +(peripheralPbPb | pp_on_XeXe_2017 | pp_on_AA).toModify(multiHitFromChi2EDProducer, maxElement = 1000000) diff --git a/RecoTracker/TkSeedGenerator/python/trackerClusterCheck_cfi.py b/RecoTracker/TkSeedGenerator/python/trackerClusterCheck_cfi.py index 33acaab08f4d1..d6071f52b432c 100644 --- a/RecoTracker/TkSeedGenerator/python/trackerClusterCheck_cfi.py +++ b/RecoTracker/TkSeedGenerator/python/trackerClusterCheck_cfi.py @@ -19,8 +19,8 @@ MaxNumberOfPixelClusters = 100000 ) -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -pp_on_AA_2018.toModify(trackerClusterCheck, +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA +pp_on_AA.toModify(trackerClusterCheck, doClusterCheck=True, cut = "strip < 1000000 && pixel < 150000 && (strip < 50000 + 10*pixel) && (pixel < 5000 + strip/2.)", MaxNumberOfPixelClusters = 150000, diff --git a/RecoTracker/TkTrackingRegions/python/globalTrackingRegionWithVertices_cff.py b/RecoTracker/TkTrackingRegions/python/globalTrackingRegionWithVertices_cff.py index 7a49867230deb..21e1f2860b391 100644 --- a/RecoTracker/TkTrackingRegions/python/globalTrackingRegionWithVertices_cff.py +++ b/RecoTracker/TkTrackingRegions/python/globalTrackingRegionWithVertices_cff.py @@ -2,10 +2,9 @@ from Configuration.Eras.Modifier_trackingLowPU_cff import trackingLowPU trackingLowPU.toModify(globalTrackingRegionWithVertices, RegionPSet = dict(VertexCollection = "pixelVertices")) from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017 -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA -for e in [pp_on_XeXe_2017, pp_on_AA_2018]: - e.toModify(globalTrackingRegionWithVertices, RegionPSet = dict( +(pp_on_XeXe_2017 | pp_on_AA).toModify(globalTrackingRegionWithVertices, RegionPSet = dict( VertexCollection = "firstStepPrimaryVertices", beamSpot = "offlineBeamSpot", maxNVertices = -1, diff --git a/RecoVertex/AdaptiveVertexFinder/python/inclusiveVertexing_cff.py b/RecoVertex/AdaptiveVertexFinder/python/inclusiveVertexing_cff.py index b9d72ec95a8d9..7c16f4c6705b2 100644 --- a/RecoVertex/AdaptiveVertexFinder/python/inclusiveVertexing_cff.py +++ b/RecoVertex/AdaptiveVertexFinder/python/inclusiveVertexing_cff.py @@ -62,9 +62,9 @@ pp_on_XeXe_2017.toModify(inclusiveVertexFinder, minHits = 10, minPt = 1.0) pp_on_XeXe_2017.toModify(inclusiveCandidateVertexFinder, minHits = 10, minPt = 1.0) pp_on_XeXe_2017.toModify(inclusiveCandidateVertexFinderCvsL, minHits = 10, minPt = 1.0) -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -pp_on_AA_2018.toModify(inclusiveVertexFinder, minHits = 999, minPt = 999.0) -pp_on_AA_2018.toModify(inclusiveCandidateVertexFinder, minHits = 999, minPt = 999.0) -pp_on_AA_2018.toModify(inclusiveCandidateVertexFinderCvsL, minHits = 999, minPt = 999.0) +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA +pp_on_AA.toModify(inclusiveVertexFinder, minHits = 999, minPt = 999.0) +pp_on_AA.toModify(inclusiveCandidateVertexFinder, minHits = 999, minPt = 999.0) +pp_on_AA.toModify(inclusiveCandidateVertexFinderCvsL, minHits = 999, minPt = 999.0) diff --git a/RecoVertex/PrimaryVertexProducer/python/OfflinePrimaryVertices_cfi.py b/RecoVertex/PrimaryVertexProducer/python/OfflinePrimaryVertices_cfi.py index 2a5b1e5104b4f..a1e70c4ae91fd 100644 --- a/RecoVertex/PrimaryVertexProducer/python/OfflinePrimaryVertices_cfi.py +++ b/RecoVertex/PrimaryVertexProducer/python/OfflinePrimaryVertices_cfi.py @@ -64,8 +64,8 @@ TkFilterParameters = dict(maxEta = 4.0)) from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017 -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -(pp_on_XeXe_2017 | pp_on_AA_2018).toModify(offlinePrimaryVertices, +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA +(pp_on_XeXe_2017 | pp_on_AA).toModify(offlinePrimaryVertices, TkFilterParameters = dict( maxD0Significance = 2.0, maxD0Error = 10.0, diff --git a/RecoVertex/V0Producer/python/generalV0Candidates_cff.py b/RecoVertex/V0Producer/python/generalV0Candidates_cff.py index f6eed9c34ea45..e672ecde7b100 100644 --- a/RecoVertex/V0Producer/python/generalV0Candidates_cff.py +++ b/RecoVertex/V0Producer/python/generalV0Candidates_cff.py @@ -9,5 +9,5 @@ # ctfV0Producer from RecoVertex.V0Producer.generalV0Candidates_cfi import * -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -pp_on_AA_2018.toModify(generalV0Candidates, tkPtCut = 999.) +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA +pp_on_AA.toModify(generalV0Candidates, tkPtCut = 999.) diff --git a/SimCalorimetry/HcalTrigPrimProducers/python/hcaltpdigi_cff.py b/SimCalorimetry/HcalTrigPrimProducers/python/hcaltpdigi_cff.py index 9be3e467e0b24..3d1165b9b6102 100644 --- a/SimCalorimetry/HcalTrigPrimProducers/python/hcaltpdigi_cff.py +++ b/SimCalorimetry/HcalTrigPrimProducers/python/hcaltpdigi_cff.py @@ -5,7 +5,7 @@ import FWCore.ParameterSet.Config as cms from Configuration.Eras.Modifier_run2_HCAL_2018_cff import run2_HCAL_2018 -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA from SimCalorimetry.HcalTrigPrimProducers.hcaltpdigi_cfi import * from CalibCalorimetry.CaloTPG.CaloTPGTranscoder_cfi import * @@ -27,5 +27,5 @@ run2_HCAL_2018.toModify(CaloTPGTranscoder, linearLUTs=cms.bool(True)) run2_HCAL_2018.toModify(HcalTPGCoderULUT, linearLUTs=cms.bool(True)) -pp_on_AA_2018.toModify(CaloTPGTranscoder, FG_HF_thresholds = cms.vuint32(15, 19)) -pp_on_AA_2018.toModify(HcalTPGCoderULUT, FG_HF_thresholds = cms.vuint32(15, 19)) +pp_on_AA.toModify(CaloTPGTranscoder, FG_HF_thresholds = cms.vuint32(15, 19)) +pp_on_AA.toModify(HcalTPGCoderULUT, FG_HF_thresholds = cms.vuint32(15, 19)) diff --git a/SimGeneral/Configuration/python/SimGeneral_EventContent_cff.py b/SimGeneral/Configuration/python/SimGeneral_EventContent_cff.py index e5fe2fb528459..aa7313e15e3cd 100644 --- a/SimGeneral/Configuration/python/SimGeneral_EventContent_cff.py +++ b/SimGeneral/Configuration/python/SimGeneral_EventContent_cff.py @@ -35,8 +35,8 @@ _pp_on_AA_extraCommands = ['keep CrossingFramePlaybackInfoNew_mix_*_*','keep *_heavyIon_*_*'] from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017 -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -for e in [pp_on_XeXe_2017, pp_on_AA_2018]: +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA +for e in [pp_on_XeXe_2017, pp_on_AA]: e.toModify( SimGeneralRAW, outputCommands = SimGeneralRAW.outputCommands + _pp_on_AA_extraCommands ) e.toModify( SimGeneralFEVTDEBUG, outputCommands = SimGeneralFEVTDEBUG.outputCommands + _pp_on_AA_extraCommands ) e.toModify( SimGeneralRECO, outputCommands = SimGeneralRECO.outputCommands + _pp_on_AA_extraCommands ) diff --git a/TrackingTools/GsfTracking/python/GsfElectronTracking_cff.py b/TrackingTools/GsfTracking/python/GsfElectronTracking_cff.py index 53ab9495b27fb..c558d1e67eb61 100644 --- a/TrackingTools/GsfTracking/python/GsfElectronTracking_cff.py +++ b/TrackingTools/GsfTracking/python/GsfElectronTracking_cff.py @@ -10,8 +10,8 @@ _electronSeedsTaskFromMultiCl.add(cms.Task(ecalDrivenElectronSeedsFromMultiCl,electronMergedSeedsFromMultiCl)) _electronSeedsFromMultiCl = cms.Sequence(_electronSeedsTaskFromMultiCl) -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -pp_on_AA_2018.toReplaceWith(electronSeedsTask, electronSeedsTask.copyAndExclude([trackerDrivenElectronSeeds])) +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA +pp_on_AA.toReplaceWith(electronSeedsTask, electronSeedsTask.copyAndExclude([trackerDrivenElectronSeeds])) from Configuration.Eras.Modifier_phase2_hgcal_cff import phase2_hgcal phase2_hgcal.toReplaceWith( diff --git a/Validation/Configuration/python/globalValidation_cff.py b/Validation/Configuration/python/globalValidation_cff.py index 3928a748b104b..0a98acf89ad69 100644 --- a/Validation/Configuration/python/globalValidation_cff.py +++ b/Validation/Configuration/python/globalValidation_cff.py @@ -241,7 +241,7 @@ from Configuration.Eras.Modifier_phase2_GE0_cff import phase2_GE0 phase2_GE0.toReplaceWith( globalValidation, _phase2_ge0_globalValidation ) phase2_GE0.toReplaceWith( globalPrevalidationMuons, globalPrevalidationMuons.copyAndExclude([me0SimValid]) ) -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 -pp_on_AA_2018.toReplaceWith(globalValidation, globalValidation.copyAndExclude([pfTauRunDQMValidation])) +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA +pp_on_AA.toReplaceWith(globalValidation, globalValidation.copyAndExclude([pfTauRunDQMValidation])) from Configuration.Eras.Modifier_phase2_timing_layer_cff import phase2_timing_layer phase2_timing_layer.toReplaceWith(globalValidationMTD, cms.Sequence(mtdSimValid+mtdDigiValid+mtdRecoValid)) diff --git a/Validation/EcalClusters/python/egammaSCAnalyzer_cfi.py b/Validation/EcalClusters/python/egammaSCAnalyzer_cfi.py index 393b75523c620..c35417c2b68ce 100644 --- a/Validation/EcalClusters/python/egammaSCAnalyzer_cfi.py +++ b/Validation/EcalClusters/python/egammaSCAnalyzer_cfi.py @@ -56,9 +56,9 @@ from Configuration.Eras.Modifier_peripheralPbPb_cff import peripheralPbPb -from Configuration.Eras.Modifier_pp_on_AA_2018_cff import pp_on_AA_2018 +from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA from Configuration.Eras.Modifier_pp_on_XeXe_2017_cff import pp_on_XeXe_2017 -for e in [peripheralPbPb, pp_on_AA_2018, pp_on_XeXe_2017]: +for e in [peripheralPbPb, pp_on_AA, pp_on_XeXe_2017]: e.toModify(egammaSuperClusterAnalyzer, barrelCorSuperClusterCollection = cms.InputTag("correctedIslandBarrelSuperClusters")) e.toModify(egammaSuperClusterAnalyzer, barrelRawSuperClusterCollection = cms.InputTag("islandSuperClusters","islandBarrelSuperClusters")) e.toModify(egammaSuperClusterAnalyzer, endcapCorSuperClusterCollection = cms.InputTag("correctedIslandEndcapSuperClusters")) From 1cb8edeaac2b9ec2fddb11d9f5efc93f773d3ca0 Mon Sep 17 00:00:00 2001 From: Matthew Date: Fri, 30 Oct 2020 06:12:42 +0100 Subject: [PATCH 2/2] fix typo in era name --- PhysicsTools/PatAlgos/python/slimming/slimming_cff.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PhysicsTools/PatAlgos/python/slimming/slimming_cff.py b/PhysicsTools/PatAlgos/python/slimming/slimming_cff.py index 91db7a65d1a94..4b97dbfae42ff 100644 --- a/PhysicsTools/PatAlgos/python/slimming/slimming_cff.py +++ b/PhysicsTools/PatAlgos/python/slimming/slimming_cff.py @@ -83,7 +83,7 @@ run2_miniAOD_pp_on_AA_103X.toReplaceWith(slimmingTask,cms.Task(primaryVertexAssociationCleaned,slimmingTask.copy())) from RecoHI.HiTracking.miniAODVertexRecovery_cff import offlinePrimaryVerticesRecovery, offlineSlimmedPrimaryVerticesRecovery -pp_on_AA_2018.toReplaceWith( +pp_on_AA.toReplaceWith( slimmingTask, cms.Task(slimmingTask.copy(), offlinePrimaryVerticesRecovery, offlineSlimmedPrimaryVerticesRecovery))