Merge pull request #28429 from guitargeek/gsfElectronSequence_2

Phase out old pre-GED GsfElectron sequence

Configuration/PyReleaseValidation/python/MatrixReader.py

@@ -238,10 +238,7 @@ def readMatrix(self, fileNameIn, useInput=None, refRel=None, fromScratch=None):
                     continue
                 if self.wm:
                     #cannot put a certain number of things in wm
-                    if stepName in [
-                        #'HARVEST','HARVESTD','HARVESTDreHLT',
-                        'RECODFROMRAWRECO','SKIMD','SKIMCOSD','SKIMDreHLT'
-                        ]:
+                    if stepName in ['SKIMD','SKIMCOSD','SKIMDreHLT']:
                         continue
 
                 #replace stepName is needed
@@ -338,7 +335,6 @@ def showRaw(self, useInput, refRel=None, fromScratch=None, what='all',step1Only=
 
                 wfName,stepNames= name.split('+',1)
 
-                stepNames=stepNames.replace('+RECODFROMRAWRECO','')
                 stepNames=stepNames.replace('+SKIMCOSD','')
                 stepNames=stepNames.replace('+SKIMD','')
                 if 'HARVEST' in stepNames:

Configuration/PyReleaseValidation/python/relval_production.py

@@ -14,7 +14,7 @@
 workflows[1001] = [ '',['RunMinBias2011A','TIER0EXP','ALCAEXP','ALCAHARVDSIPIXELCALRUN1','ALCAHARVD1','ALCAHARVD2','ALCAHARVD3','ALCAHARVD4','ALCAHARVD5']]
 workflows[1001.2] = [ '',['RunZeroBias2017F','TIER0EXPRUN2','ALCAEXPRUN2','ALCAHARVDSIPIXELCAL']]
 
-workflows[1002]=['RRD',['RunMinBias2011A','RECODR1','COPYPASTE']]#,'RECODFROMRAWRECO']]
+workflows[1002]=['RRD',['RunMinBias2011A','RECODR1','COPYPASTE']]
 workflows[1003]=['', ['RunMinBias2012A','RECODDQM','HARVESTDDQM']]
 workflows[1004] = [ '',['RunHI2011','TIER0EXPHI','ALCAEXPHI','ALCAHARVD1HI','ALCAHARVD2HI','ALCAHARVD3HI','ALCAHARVD5HI']]
 

Configuration/PyReleaseValidation/python/relval_steps.py

@@ -2861,16 +2861,6 @@ def gen2018HiMix(fragment,howMuch):
 
 steps['RECOFROMRECOSt2']=steps['RECOFROMRECO']
 
-steps['RECODFROMRAWRECO']=merge([{'-s':'RAW2DIGI:RawToDigi_noTk,L1Reco,RECO:reconstruction_noTracking,EI',
-                                  '--filtername':'RECOfromRAWRECO',
-                                  '--process':'rereRECO',
-                                  '--datatier':'AOD',
-                                  '--eventcontent':'AOD',
-                                  '--secondfilein':'filelist:step1_dasquery.log',
-                                  },
-                                 steps['RECOD']])
-
-
 steps['COPYPASTE']={'-s':'NONE',
                     '--conditions':'auto:run1_mc',
                     '--output':'\'[{"t":"RAW","e":"ALL"}]\'',

Configuration/StandardSequences/python/Reconstruction_cff.py

@@ -251,38 +251,6 @@
 modulesToRemove.append(castorreco)
 ##it's OK according to Ronny modulesToRemove.append(CSCHaloData)#needs digis
 reconstruction_fromRECO = reconstruction.copyAndExclude(modulesToRemove+noTrackingAndDependent)
-noTrackingAndDependent.append(siPixelRecHitsPreSplitting)
-noTrackingAndDependent.append(siStripMatchedRecHits)
-noTrackingAndDependent.append(pixelTracks)
-noTrackingAndDependent.append(ckftracks)
-reconstruction_fromRECO_noTrackingTest = reconstruction.copyAndExclude(modulesToRemove+noTrackingAndDependent)
-##requires generalTracks trajectories
-noTrackingAndDependent.append(trackerDrivenElectronSeeds)
-noTrackingAndDependent.append(ecalDrivenElectronSeeds)
-noTrackingAndDependent.append(uncleanedOnlyElectronSeeds)
-noTrackingAndDependent.append(uncleanedOnlyElectronCkfTrackCandidates)
-noTrackingAndDependent.append(uncleanedOnlyElectronGsfTracks)
-noTrackingAndDependent.append(uncleanedOnlyGeneralConversionTrackProducer)
-noTrackingAndDependent.append(uncleanedOnlyGsfConversionTrackProducer)
-noTrackingAndDependent.append(uncleanedOnlyPfTrackElec)
-noTrackingAndDependent.append(uncleanedOnlyGsfElectronCores)
-noTrackingAndDependent.append(uncleanedOnlyPfTrack)
-noTrackingAndDependent.append(uncleanedOnlyGeneralInOutOutInConversionTrackMerger)#can live with
-noTrackingAndDependent.append(uncleanedOnlyGsfGeneralInOutOutInConversionTrackMerger)#can live with
-noTrackingAndDependent.append(uncleanedOnlyAllConversions)
-noTrackingAndDependent.append(uncleanedOnlyGsfElectrons)#can live with
-noTrackingAndDependent.append(electronMergedSeeds)
-noTrackingAndDependent.append(electronCkfTrackCandidates)
-noTrackingAndDependent.append(electronGsfTracks)
-noTrackingAndDependent.append(generalConversionTrackProducer)
-noTrackingAndDependent.append(generalInOutOutInConversionTrackMerger)
-noTrackingAndDependent.append(gsfGeneralInOutOutInConversionTrackMerger)
-noTrackingAndDependent.append(ecalDrivenGsfElectrons)
-noTrackingAndDependent.append(gsfConversionTrackProducer)
-noTrackingAndDependent.append(allConversions)
-noTrackingAndDependent.append(gsfElectrons)
-reconstruction_fromRECO_noTracking = reconstruction.copyAndExclude(modulesToRemove+noTrackingAndDependent)
-reconstruction_noTracking = reconstruction.copyAndExclude(noTrackingAndDependent)
 
 
 #sequences with additional stuff

RecoEgamma/Configuration/python/RecoEgammaCosmics_cff.py

@@ -1,16 +1,11 @@
 import FWCore.ParameterSet.Config as cms
 
-from RecoEgamma.EgammaElectronProducers.cosmicElectronSequence_cff import *
 from RecoEgamma.EgammaPhotonProducers.cosmicPhotonSequence_cff import *
 from RecoEgamma.EgammaPhotonProducers.cosmicConversionSequence_cff import *
 from RecoEgamma.EgammaPhotonProducers.cosmicConversionTrackSequence_cff import *
 from RecoEgamma.PhotonIdentification.photonId_cff import *
 
 egammarecoGlobal_cosmicsTask = cms.Task(cosmicConversionTrackTask)
 egammarecoGlobal_cosmics = cms.Sequence(egammarecoGlobal_cosmicsTask)
-egammarecoCosmics_woConvPhotonsTask = cms.Task(cosmicElectronTask,cosmicPhotonTask)
-egammarecoCosmics_woConvPhotons = cms.Sequence(egammarecoCosmics_woConvPhotonsTask)
-egammarecoCosmicsTask = cms.Task(cosmicElectronTask,cosmicConversionTask,cosmicPhotonTask,photonIDTask)
-egammarecoCosmics = cms.Sequence(egammarecoCosmicsTask)
 egammarecoCosmics_woElectronsTask = cms.Task(cosmicConversionTask,cosmicPhotonTask,photonIDTask)
 egammarecoCosmics_woElectrons = cms.Sequence(egammarecoCosmics_woElectronsTask)

RecoEgamma/Configuration/python/RecoEgamma_cff.py

@@ -16,10 +16,6 @@
 
 from RecoEgamma.EgammaIsolationAlgos.egmIsolationDefinitions_cff import *
 
-#importing new gedGsfElectronSequence :
-#from RecoEgamma.EgammaElectronProducers.gedGsfElectronSequence_cff import *
-from RecoEgamma.EgammaElectronProducers.pfBasedElectronIso_cff import *
-
 egammaGlobalRecoTask = cms.Task(electronGsfTrackingTask,conversionTrackTask,allConversionTask)
 egammaGlobalReco = cms.Sequence(egammaGlobalRecoTask)
 # this might be historical: not sure why we do this
@@ -28,38 +24,13 @@
 _fastSim_egammaGlobalRecoTask.replace(conversionTrackTask,conversionTrackTaskNoEcalSeeded)
 fastSim.toReplaceWith(egammaGlobalRecoTask, _fastSim_egammaGlobalRecoTask)
 
-egammarecoTask = cms.Task(gsfElectronTask,conversionTask,photonTask)
-egammareco = cms.Sequence(egammarecoTask)
 egammaHighLevelRecoPrePFTask = cms.Task(gsfEcalDrivenElectronTask,uncleanedOnlyElectronTask,conversionTask,photonTask)
 egammaHighLevelRecoPrePF = cms.Sequence(egammaHighLevelRecoPrePFTask)
-# not commisoned and not relevant in FastSim (?):
-fastSim.toReplaceWith(egammarecoTask, egammarecoTask.copyAndExclude([conversionTask]))
 fastSim.toReplaceWith(egammaHighLevelRecoPrePFTask,egammaHighLevelRecoPrePFTask.copyAndExclude([uncleanedOnlyElectronTask,conversionTask]))
 
-#egammaHighLevelRecoPostPFTask = cms.Task(gsfElectronMergingTask,interestingEgammaIsoDetIdsTask,photonIDTask,eIdTask,hfEMClusteringTask)
-#adding new gedGsfElectronTask and gedPhotonTask :
-#egammaHighLevelRecoPostPFTask = cms.Task(gsfElectronMergingTask,gedGsfElectronTask,interestingEgammaIsoDetIdsTask,gedPhotonTask,photonIDTask,eIdTask,hfEMClusteringTask)
 egammaHighLevelRecoPostPFTask = cms.Task(interestingEgammaIsoDetIdsTask,egmIsolationTask,photonIDTask,photonIDTaskGED,eIdTask,hfEMClusteringTask)
 egammaHighLevelRecoPostPF = cms.Sequence(egammaHighLevelRecoPostPFTask)
 
-egammarecoFullTask = cms.Task(egammarecoTask,interestingEgammaIsoDetIdsTask,egmIsolationTask,photonIDTask,eIdTask,hfEMClusteringTask)
-egammarecoFull = cms.Sequence(egammarecoFullTask)
-egammarecoWithIDTask = cms.Task(egammarecoTask,photonIDTask,eIdTask)
-egammarecoWithID = cms.Sequence(egammarecoWithIDTask)
-egammareco_woConvPhotonsTask = cms.Task(gsfElectronTask,photonTask)
-egammareco_woConvPhotons = cms.Sequence(egammareco_woConvPhotonsTask)
-egammareco_withIsolationTask = cms.Task(egammarecoTask,egammaIsolationTask)
-egammareco_withIsolation = cms.Sequence(egammareco_withIsolationTask)
-egammareco_withIsolation_woConvPhotonsTask = cms.Task(egammareco_woConvPhotonsTask,egammaIsolationTask)
-egammareco_withIsolation_woConvPhotons = cms.Sequence(egammareco_withIsolation_woConvPhotonsTask)
-egammareco_withPhotonIDTask = cms.Task(egammarecoTask,photonIDTask)
-egammareco_withPhotonID = cms.Sequence(egammareco_withPhotonIDTask)
-egammareco_withElectronIDTask = cms.Task(egammarecoTask,eIdTask)
-egammareco_withElectronID = cms.Sequence(egammareco_withElectronIDTask)
-
-egammarecoFull_woHFElectronsTask = cms.Task(egammarecoTask,interestingEgammaIsoDetIdsTask,photonIDTask,eIdTask)
-egammarecoFull_woHFElectrons = cms.Sequence(egammarecoFull_woHFElectronsTask)
-
 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