Remove Event Interpretation (EI) from relval steps

Calibration/IsolatedParticles/test/python/HLT_IsoTrig_Data_New1.py

@@ -2,7 +2,7 @@
 # using: 
 # Revision: 1.19 
 # Source: /local/reps/CMSSW/CMSSW/Configuration/Applications/python/ConfigBuilder.py,v 
-# with command line options: step3 --conditions auto:run2_mc_GRun -n 10 --eventcontent FEVTDEBUGHLT,DQM -s RAW2DIGI,L1Reco,RECO,EI,VALIDATION,DQM --datatier GEN-SIM-RECO,DQM --customise SLHCUpgradeSimulations/Configuration/postLS1Customs.customisePostLS1 --geometry Extended2015 --magField 38T_PostLS1 --conditions auto:run2_mc_GRun --no_exec --filein file:step2.root --fileout file:step3.root
+# with command line options: step3 --conditions auto:run2_mc_GRun -n 10 --eventcontent FEVTDEBUGHLT,DQM -s RAW2DIGI,L1Reco,RECO,VALIDATION,DQM --datatier GEN-SIM-RECO,DQM --customise SLHCUpgradeSimulations/Configuration/postLS1Customs.customisePostLS1 --geometry Extended2015 --magField 38T_PostLS1 --conditions auto:run2_mc_GRun --no_exec --filein file:step2.root --fileout file:step3.root
 import FWCore.ParameterSet.Config as cms
 
 process = cms.Process('HLTNew1')
@@ -22,7 +22,6 @@
 process.load('Configuration.StandardSequences.RawToDigi_cff')
 process.load('Configuration.StandardSequences.L1Reco_cff')
 process.load('Configuration.StandardSequences.Reconstruction_cff')
-process.load('CommonTools.ParticleFlow.EITopPAG_cff')
 process.load('Configuration.StandardSequences.Validation_cff')
 process.load('DQMOffline.Configuration.DQMOfflineMC_cff')
 process.load('Configuration.StandardSequences.EndOfProcess_cff')
@@ -211,7 +210,6 @@
 process.raw2digi_step = cms.Path(process.RawToDigi)
 process.L1Reco_step = cms.Path(process.L1Reco)
 process.reconstruction_step = cms.Path(process.reconstruction)
-process.eventinterpretaion_step = cms.Path(process.EIsequence)
 process.prevalidation_step = cms.Path(process.prevalidation)
 process.dqmoffline_step = cms.Path(process.DQMOffline)
 process.validation_step = cms.EndPath(process.validation)

Configuration/Applications/python/ConfigBuilder.py

@@ -966,7 +966,6 @@ def define_Configs(self):
         self.PATDefaultCFF="Configuration/StandardSequences/PAT_cff"
         self.NANODefaultCFF="PhysicsTools/NanoAOD/nano_cff"
         self.NANOGENDefaultCFF="PhysicsTools/NanoAOD/nanogen_cff"
-        self.EIDefaultCFF=None
         self.SKIMDefaultCFF="Configuration/StandardSequences/Skims_cff"
         self.POSTRECODefaultCFF="Configuration/StandardSequences/PostRecoGenerator_cff"
         self.VALIDATIONDefaultCFF="Configuration/StandardSequences/Validation_cff"
@@ -1006,7 +1005,6 @@ def define_Configs(self):
         else:
             self.RECODefaultSeq='reconstruction_fromRECO'
         self.RECOSIMDefaultSeq='recosim'
-        self.EIDefaultSeq='top'
         self.POSTRECODefaultSeq=None
         self.L1HwValDefaultSeq='L1HwVal'
         self.DQMDefaultSeq='DQMOffline'
@@ -1735,18 +1733,6 @@ def prepare_NANOGEN(self, sequence = "nanoAOD"):
         else:
             self._options.customisation_file.insert(0, '.'.join([self.NANOGENDefaultCFF, custom]))
 
-    def prepare_EI(self, sequence = None):
-        ''' Enrich the schedule with event interpretation '''
-        from Configuration.StandardSequences.EventInterpretation import EventInterpretation
-        if sequence in EventInterpretation:
-            self.EIDefaultCFF = EventInterpretation[sequence]
-            sequence = 'EIsequence'
-        else:
-            raise Exception('Cannot set %s event interpretation'%( sequence) )
-        self.loadDefaultOrSpecifiedCFF(sequence,self.EIDefaultCFF)
-        self.scheduleSequence(sequence.split('.')[-1],'eventinterpretaion_step')
-        return
-
     def prepare_SKIM(self, sequence = "all"):
         ''' Enrich the schedule with skimming fragments'''
         skimConfig = self.loadDefaultOrSpecifiedCFF(sequence,self.SKIMDefaultCFF)

Configuration/DataProcessing/python/Impl/hcalnzs.py

@@ -16,7 +16,6 @@ def __init__(self):
         pp.__init__(self)
         self.recoSeq=':reconstruction_HcalNZS'
         self.cbSc='pp'
-        self.addEI=True
     """
     _hcalnzs_
 

Configuration/DataProcessing/python/Impl/hcalnzsEra_Run2_2016.py

@@ -17,7 +17,6 @@ def __init__(self):
         hcalnzs.__init__(self)
         self.recoSeq=':reconstruction_HcalNZS'
         self.cbSc='pp'
-        self.addEI=True
         self.eras = Run2_2016
         self.promptCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_2016' ]
         self.expressCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_2016' ]

Configuration/DataProcessing/python/Impl/hcalnzsEra_Run2_2017.py

@@ -17,7 +17,6 @@ def __init__(self):
         hcalnzs.__init__(self)
         self.recoSeq=':reconstruction_HcalNZS'
         self.cbSc='pp'
-        self.addEI=True
         self.eras = Run2_2017
         self.promptCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_2017' ]
         self.expressCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_2017' ]

Configuration/DataProcessing/python/Impl/hcalnzsEra_Run2_2018.py

@@ -17,7 +17,6 @@ def __init__(self):
         hcalnzs.__init__(self)
         self.recoSeq=':reconstruction_HcalNZS'
         self.cbSc='pp'
-        self.addEI=True
         self.eras = Run2_2018
         self.promptCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_2018' ]
         self.expressCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_2018' ]

Configuration/DataProcessing/python/Impl/hcalnzsEra_Run2_2018_highBetaStar.py

@@ -17,7 +17,6 @@ def __init__(self):
         hcalnzs.__init__(self)
         self.recoSeq=':reconstruction_HcalNZS'
         self.cbSc='pp'
-        self.addEI=True
         self.eras = Run2_2018_highBetaStar
         #keep post-era parts the same as in the default 2018 era
         self.promptCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_2018' ]

Configuration/DataProcessing/python/Impl/hcalnzsEra_Run2_25ns.py

@@ -17,7 +17,6 @@ def __init__(self):
         hcalnzs.__init__(self)
         self.recoSeq=':reconstruction_HcalNZS'
         self.cbSc='pp'
-        self.addEI=True
         self.eras = Run2_25ns
         self.promptCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_25ns' ]
         self.expressCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_25ns' ]

Configuration/DataProcessing/python/Impl/hcalnzsEra_Run3.py

@@ -17,7 +17,6 @@ def __init__(self):
         hcalnzs.__init__(self)
         self.recoSeq=':reconstruction_HcalNZS'
         self.cbSc='pp'
-        self.addEI=True
         self.eras = Run3
         self.promptCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3' ]
         self.expressCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3' ]

Configuration/DataProcessing/python/Impl/pp.py

@@ -18,7 +18,6 @@ def __init__(self):
         Reco.__init__(self)
         self.recoSeq=''
         self.cbSc='pp'
-        self.addEI=True
         self.isRepacked=False
         self.promptCustoms= [ 'Configuration/DataProcessing/RecoTLR.customisePrompt' ]
         self.expressCustoms=[ ]

Configuration/DataProcessing/python/Impl/ppEra_Run2_2016.py

@@ -20,7 +20,6 @@ def __init__(self):
         pp.__init__(self)
         self.recoSeq=''
         self.cbSc='pp'
-        self.addEI=True
         self.eras=Run2_2016
         self.promptCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_2016' ]
         self.expressCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_2016' ]

Configuration/DataProcessing/python/Impl/ppEra_Run2_2016_pA.py

@@ -20,7 +20,6 @@ def __init__(self):
         pp.__init__(self)
         self.recoSeq=''
         self.cbSc='pp'
-        self.addEI=True 
         self.eras=Run2_2016_pA
         self.promptCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_2016' ]
         self.expressCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_2016' ]

Configuration/DataProcessing/python/Impl/ppEra_Run2_2016_trackingLowPU.py

@@ -20,7 +20,6 @@ def __init__(self):
         pp.__init__(self)
         self.recoSeq=''
         self.cbSc='pp'
-        self.addEI=True
         self.eras=Run2_2016_trackingLowPU
         self.promptCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_2016' ]
         self.expressCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_2016' ]

Configuration/DataProcessing/python/Impl/ppEra_Run2_2017.py

@@ -20,7 +20,6 @@ def __init__(self):
         pp.__init__(self)
         self.recoSeq=''
         self.cbSc='pp'
-        self.addEI=True
         self.eras=Run2_2017
         self.promptCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_2017' ]
         self.expressCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_2017' ]

Configuration/DataProcessing/python/Impl/ppEra_Run2_2017_ppRef.py

@@ -20,7 +20,6 @@ def __init__(self):
         pp.__init__(self)
         self.recoSeq=''
         self.cbSc='pp'
-        self.addEI=True
         self.eras=Run2_2017_ppRef
         self.promptCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_2017_ppRef' ]
         self.expressCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_2017_ppRef' ]

Configuration/DataProcessing/python/Impl/ppEra_Run2_2017_pp_on_XeXe.py

@@ -20,7 +20,6 @@ def __init__(self):
         pp.__init__(self)
         self.recoSeq=''
         self.cbSc='pp'
-        self.addEI=True
         self.isRepacked=True
         self.eras=Run2_2017_pp_on_XeXe
         self.promptCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_2017_pp_on_XeXe' ]

Configuration/DataProcessing/python/Impl/ppEra_Run2_2017_trackingLowPU.py

@@ -20,7 +20,6 @@ def __init__(self):
         pp.__init__(self)
         self.recoSeq=''
         self.cbSc='pp'
-        self.addEI=True
         self.eras=Run2_2017_trackingLowPU
         self.promptCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_2017' ]
         self.expressCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_2017' ]

Configuration/DataProcessing/python/Impl/ppEra_Run2_2017_trackingOnly.py

@@ -22,7 +22,6 @@ def __init__(self):
         # some dedicated customization are required, though: customisePostEra_Run2_2017_trackingOnly
         self.recoSeq=':reconstruction_trackingOnly'
         self.cbSc='pp'
-        self.addEI=False
         self.eras=Run2_2017
         self.promptCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_2017' ]
         self.expressCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_2017_express_trackingOnly' ]

Configuration/DataProcessing/python/Impl/ppEra_Run2_2018.py

@@ -20,7 +20,6 @@ def __init__(self):
         pp.__init__(self)
         self.recoSeq=''
         self.cbSc='pp'
-        self.addEI=True
         self.eras=Run2_2018
         self.promptCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_2018' ]
         self.expressCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_2018' ]

Configuration/DataProcessing/python/Impl/ppEra_Run2_2018_highBetaStar.py

@@ -20,7 +20,6 @@ def __init__(self):
         pp.__init__(self)
         self.recoSeq=''
         self.cbSc='pp'
-        self.addEI=True
         self.eras=Run2_2018_highBetaStar
         #keep post-era parts the same as in the default 2018 era
         self.promptCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_2018' ]

Configuration/DataProcessing/python/Impl/ppEra_Run2_2018_pp_on_AA.py

@@ -20,7 +20,6 @@ def __init__(self):
         pp.__init__(self)
         self.recoSeq=''
         self.cbSc='pp'
-        self.addEI=True
         self.isRepacked=True
         self.eras=Run2_2018_pp_on_AA
         self.promptCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_2018_pp_on_AA' ]

Configuration/DataProcessing/python/Impl/ppEra_Run2_25ns.py

@@ -20,7 +20,6 @@ def __init__(self):
         pp.__init__(self)
         self.recoSeq=''
         self.cbSc='pp'
-        self.addEI=True
         self.eras=Run2_25ns
         self.promptCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_25ns' ]
         self.expressCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_25ns' ]

Configuration/DataProcessing/python/Impl/ppEra_Run2_50ns.py

@@ -20,7 +20,6 @@ def __init__(self):
         pp.__init__(self)
         self.recoSeq=''
         self.cbSc='pp'
-        self.addEI=True
         self.eras=Run2_50ns
     """
     _ppEra_Run2_50ns_

Configuration/DataProcessing/python/Impl/ppEra_Run3.py

@@ -20,7 +20,6 @@ def __init__(self):
         pp.__init__(self)
         self.recoSeq=''
         self.cbSc='pp'
-        self.addEI=True
         self.eras=Run3
         self.promptCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3' ]
         self.expressCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3' ]

Configuration/DataProcessing/python/Impl/trackingOnly.py

@@ -18,8 +18,6 @@ def __init__(self):
         # some dedicated customization are required, though: see specific era implementations
         self.recoSeq=':reconstruction_trackingOnly'
         self.cbSc='pp'
-        # don't run EI, because only tracking is done
-        self.addEI=False
     """
     _trackingOnly_
 

Configuration/DataProcessing/python/Impl/trackingOnlyEra_Run2_2017.py

@@ -22,7 +22,6 @@ def __init__(self):
         # some dedicated customization are required, though: customisePostEra_Run2_2017_trackingOnly
         self.recoSeq=':reconstruction_trackingOnly'
         self.cbSc='pp'
-        self.addEI=False
         self.eras=Run2_2017
         self.promptCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_2017' ]
         self.expressCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_2017_express_trackingOnly' ]

Configuration/DataProcessing/python/Impl/trackingOnlyEra_Run2_2018.py

@@ -22,7 +22,6 @@ def __init__(self):
         # some dedicated customization are required, though: customisePostEra_Run2_2018_trackingOnly
         self.recoSeq=':reconstruction_trackingOnly'
         self.cbSc='pp'
-        self.addEI=False
         self.eras=Run2_2018
         self.promptCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_2018' ]
         self.expressCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_2018_express_trackingOnly' ]

Configuration/DataProcessing/python/Impl/trackingOnlyEra_Run2_2018_highBetaStar.py

@@ -22,7 +22,6 @@ def __init__(self):
         # some dedicated customization are required, though: customisePostEra_Run2_2018_trackingOnly
         self.recoSeq=':reconstruction_trackingOnly'
         self.cbSc='pp'
-        self.addEI=False
         self.eras=Run2_2018_highBetaStar
         #keep post-era parts the same as in the default 2018 era
         self.promptCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_2018' ]

Configuration/DataProcessing/python/Impl/trackingOnlyEra_Run3.py

@@ -22,7 +22,6 @@ def __init__(self):
         # some dedicated customization are required, though: customisePostEra_Run3_trackingOnly
         self.recoSeq=':reconstruction_trackingOnly'
         self.cbSc='pp'
-        self.addEI=False
         self.eras=Run3
         self.promptCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3' ]
         self.expressCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run3_express_trackingOnly' ]

Configuration/DataProcessing/python/Reco.py

@@ -19,7 +19,6 @@ class Reco(Scenario):
     def __init__(self):
         Scenario.__init__(self)
         self.recoSeq=''
-        self.addEI=False
         self.cbSc=self.__class__.__name__
         self.promptModifiers = cms.ModifierChain()
         self.expressModifiers = cms.ModifierChain()
@@ -74,8 +73,6 @@ def promptReco(self, globalTag, **args):
             options.customisation_file=args['customs']
 
         eiStep=''
-        if self.addEI:
-            eiStep=',EI'
 
         options.step = 'RAW2DIGI,L1Reco,RECO'+self.recoSeq+eiStep+step+PhysicsSkimStep+miniAODStep+',DQM'+dqmStep+',ENDJOB'
 
@@ -118,8 +115,6 @@ def expressProcessing(self, globalTag, **args):
             options.nThreads=args['nThreads']
 
         eiStep=''
-        if self.addEI:
-            eiStep=',EI'
 
         options.step = 'RAW2DIGI,L1Reco,RECO'+self.recoSeq+eiStep+step+',DQM'+dqmStep+',ENDJOB'
 
@@ -161,8 +156,6 @@ def visualizationProcessing(self, globalTag, **args):
             options.step +='FILTER:'+args['preFilter']+','
 
         eiStep=''
-        if self.addEI:
-            eiStep=',EI'
 
         options.step += 'RAW2DIGI,L1Reco,RECO'+eiStep+',ENDJOB'
 

Configuration/EventContent/python/EventContent_cff.py

@@ -60,7 +60,6 @@
 from RecoEgamma.Configuration.RecoEgamma_EventContent_cff import *
 from RecoParticleFlow.Configuration.RecoParticleFlow_EventContent_cff import *
 from RecoVertex.BeamSpotProducer.BeamSpot_EventContent_cff import *
-from CommonTools.ParticleFlow.EITopPAG_EventContent_cff import EITopPAGEventContent
 from RecoPPS.Configuration.RecoCTPPS_EventContent_cff import *
 from RecoHGCal.Configuration.RecoHGCal_EventContent_cff import *
 
@@ -210,7 +209,6 @@ def SwapKeepAndDrop(l):
 RECOEventContent.outputCommands.extend(OnlineMetaDataContent.outputCommands)
 RECOEventContent.outputCommands.extend(TcdsEventContent.outputCommands)
 RECOEventContent.outputCommands.extend(CommonEventContent.outputCommands)
-RECOEventContent.outputCommands.extend(EITopPAGEventContent.outputCommands)
 
 from Configuration.Eras.Modifier_ctpps_cff import ctpps
 from Configuration.Eras.Modifier_phase2_hgcal_cff import phase2_hgcal
@@ -493,7 +491,6 @@ def SwapKeepAndDrop(l):
 FEVTEventContent.outputCommands.extend(OnlineMetaDataContent.outputCommands)
 FEVTEventContent.outputCommands.extend(TcdsEventContent.outputCommands)
 FEVTEventContent.outputCommands.extend(CommonEventContent.outputCommands)
-FEVTEventContent.outputCommands.extend(EITopPAGEventContent.outputCommands)
 
 ctpps.toModify(FEVTEventContent, 
     outputCommands = FEVTEventContent.outputCommands + RecoCTPPSFEVT.outputCommands)