Skip to content

Commit

Permalink
remove (most) direct importing of Configuration.StandardSequences.Eras
Browse files Browse the repository at this point in the history
  • Loading branch information
kpedro88 committed Sep 27, 2016
1 parent f948787 commit 183087b
Show file tree
Hide file tree
Showing 239 changed files with 1,078 additions and 961 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,8 @@

es_prefer_hcalHardcode = cms.ESPrefer("HcalHardcodeCalibrations", "es_hardcode")

from Configuration.StandardSequences.Eras import eras
eras.phase2_hcal.toModify( es_hardcode,
from Configuration.Eras.Modifier_phase2_hcal_cff import phase2_hcal
phase2_hcal.toModify( es_hardcode,
toGet = cms.untracked.vstring(
'GainWidths',
'MCParams',
Expand Down
4 changes: 2 additions & 2 deletions CalibMuon/CSCCalibration/python/CSCChannelMapper_cfi.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@
#
# Modify for running in run 2
#
from Configuration.StandardSequences.Eras import eras
eras.run2_common.toModify( CSCChannelMapperESProducer, AlgoName=cms.string("CSCChannelMapperPostls1") )
from Configuration.Eras.Modifier_run2_common_cff import run2_common
run2_common.toModify( CSCChannelMapperESProducer, AlgoName=cms.string("CSCChannelMapperPostls1") )
4 changes: 2 additions & 2 deletions CalibMuon/CSCCalibration/python/CSCIndexer_cfi.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@
#
# Modify for running in run 2
#
from Configuration.StandardSequences.Eras import eras
eras.run2_common.toModify( CSCIndexerESProducer, AlgoName=cms.string("CSCIndexerPostls1") )
from Configuration.Eras.Modifier_run2_common_cff import run2_common
run2_common.toModify( CSCIndexerESProducer, AlgoName=cms.string("CSCIndexerPostls1") )
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@
useBunchSpacingProducer = cms.bool(True)
)

from Configuration.StandardSequences.Eras import eras
eras.run2_common.toModify(HBHENoiseFilterResultProducer, IgnoreTS4TS5ifJetInLowBVRegion=False)
from Configuration.Eras.Modifier_run2_common_cff import run2_common
run2_common.toModify(HBHENoiseFilterResultProducer, IgnoreTS4TS5ifJetInLowBVRegion=False)
17 changes: 9 additions & 8 deletions Configuration/EventContent/python/EventContent_cff.py
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,8 @@
#
from FastSimulation.Configuration.EventContent_cff import FASTPUEventContent
import FastSimulation.Configuration.EventContent_cff as fastSimEC
from Configuration.StandardSequences.Eras import eras
if eras.fastSim.isChosen():
from Configuration.Eras.Modifier_fastSim_cff import fastSim
if fastSim.isChosen():
RecoLocalTrackerRECO.outputCommands = fastSimEC.RecoLocalTracker.outputCommands
RecoLocalTrackerFEVT.outputCommands = fastSimEC.RecoLocalTracker.outputCommands
SimG4CoreRAW = fastSimEC.SimRAW
Expand Down Expand Up @@ -448,7 +448,8 @@
RECOEventContent.outputCommands.extend(TcdsEventContent.outputCommands)
RECOEventContent.outputCommands.extend(CommonEventContent.outputCommands)
RECOEventContent.outputCommands.extend(EITopPAGEventContent.outputCommands)
eras.ctpps_2016.toModify(RECOEventContent, outputCommands = RECOEventContent.outputCommands + RecoCTPPSRECO.outputCommands)
from Configuration.Eras.Modifier_ctpps_2016_cff import ctpps_2016
ctpps_2016.toModify(RECOEventContent, outputCommands = RECOEventContent.outputCommands + RecoCTPPSRECO.outputCommands)

RAWRECOEventContent.outputCommands.extend(RECOEventContent.outputCommands)
RAWRECOEventContent.outputCommands.extend(cms.untracked.vstring(
Expand Down Expand Up @@ -479,7 +480,7 @@
AODEventContent.outputCommands.extend(TcdsEventContent.outputCommands)
AODEventContent.outputCommands.extend(CommonEventContent.outputCommands)
AODEventContent.outputCommands.extend(EITopPAGEventContent.outputCommands)
eras.ctpps_2016.toModify(AODEventContent, outputCommands = AODEventContent.outputCommands + RecoCTPPSAOD.outputCommands)
ctpps_2016.toModify(AODEventContent, outputCommands = AODEventContent.outputCommands + RecoCTPPSAOD.outputCommands)

RAWSIMEventContent.outputCommands.extend(RAWEventContent.outputCommands)
RAWSIMEventContent.outputCommands.extend(SimG4CoreRAW.outputCommands)
Expand Down Expand Up @@ -530,7 +531,7 @@
PREMIXEventContent.outputCommands.append('keep StripDigiSimLinkedmDetSetVector_simMuonCSCDigis_*_*')
PREMIXEventContent.outputCommands.append('keep RPCDigiSimLinkedmDetSetVector_*_*_*')
PREMIXEventContent.outputCommands.append('keep DTLayerIdDTDigiSimLinkMuonDigiCollection_*_*_*')
if eras.fastSim.isChosen():
if fastSim.isChosen():
PREMIXEventContent.outputCommands.extend(fastSimEC.extraPremixContent)

PREMIXRAWEventContent.outputCommands.extend(RAWSIMEventContent.outputCommands)
Expand All @@ -543,7 +544,7 @@
PREMIXRAWEventContent.outputCommands.append('keep *_*_MuonCSCWireDigiSimLinks_*')
PREMIXRAWEventContent.outputCommands.append('keep *_*_RPCDigiSimLink_*')
PREMIXRAWEventContent.outputCommands.append('keep DTLayerIdDTDigiSimLinkMuonDigiCollection_*_*_*')
if eras.fastSim.isChosen():
if fastSim.isChosen():
PREMIXEventContent.outputCommands.extend(fastSimEC.extraPremixContent)

REPACKRAWSIMEventContent.outputCommands.extend(REPACKRAWEventContent.outputCommands)
Expand Down Expand Up @@ -623,7 +624,7 @@
FEVTEventContent.outputCommands.extend(TcdsEventContent.outputCommands)
FEVTEventContent.outputCommands.extend(CommonEventContent.outputCommands)
FEVTEventContent.outputCommands.extend(EITopPAGEventContent.outputCommands)
eras.ctpps_2016.toModify(FEVTEventContent, outputCommands = FEVTEventContent.outputCommands + RecoCTPPSFEVT.outputCommands)
ctpps_2016.toModify(FEVTEventContent, outputCommands = FEVTEventContent.outputCommands + RecoCTPPSFEVT.outputCommands)

FEVTHLTALLEventContent.outputCommands.extend(FEVTEventContent.outputCommands)
FEVTHLTALLEventContent.outputCommands.append('keep *_*_*_HLT')
Expand Down Expand Up @@ -815,7 +816,7 @@ def SwapKeepAndDrop(l):

# in fastsim, normal digis are edaliases of simdigis
# drop the simdigis to avoid complaints from the outputmodule related to duplicated branches
if eras.fastSim.isChosen():
if fastSim.isChosen():
for _entry in [FEVTDEBUGHLTEventContent,FEVTDEBUGEventContent,RECOSIMEventContent,AODSIMEventContent,RAWAODSIMEventContent]:
fastSimEC.dropSimDigis(_entry.outputCommands)

4 changes: 2 additions & 2 deletions Configuration/StandardSequences/python/DataMixerPreMix_cff.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@

pdatamix = cms.Sequence(mixData+postDMDigi+addPileupInfo)

from Configuration.StandardSequences.Eras import eras
if eras.fastSim.isChosen():
from Configuration.Eras.Modifier_fastSim_cff import fastSim
if fastSim.isChosen():
# pretend these digis have been through digi2raw and raw2digi, by using the approprate aliases
# use an alias to make the mixed track collection available under the usual label
from FastSimulation.Configuration.DigiAliases_cff import loadDigiAliases
Expand Down
6 changes: 3 additions & 3 deletions Configuration/StandardSequences/python/DigiToRawDM_cff.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@
#castorRawData.CASTOR = cms.untracked.InputTag("castorDigis")
#

from Configuration.StandardSequences.Eras import eras
eras.run2_HCAL_2017.toModify( hcalRawDataVME,
from Configuration.Eras.Modifier_run2_HCAL_2017_cff import run2_HCAL_2017
run2_HCAL_2017.toModify( hcalRawDataVME,
HBHE = cms.untracked.InputTag(""),
HF = cms.untracked.InputTag(""),
)
eras.run2_HCAL_2017.toModify( hcalRawDatauHTR,
run2_HCAL_2017.toModify( hcalRawDatauHTR,
HBHE = cms.untracked.InputTag("DMHcalDigis"),
HF = cms.untracked.InputTag("DMHcalDigis")
)
Expand Down
10 changes: 6 additions & 4 deletions Configuration/StandardSequences/python/DigiToRaw_cff.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

# This object is used to make changes for different running scenarios. In
# this case for Run 2
from Configuration.StandardSequences.Eras import eras

from EventFilter.SiPixelRawToDigi.SiPixelDigiToRaw_cfi import *
from EventFilter.SiStripRawToDigi.SiStripDigiToRaw_cfi import *
Expand All @@ -25,11 +24,14 @@
ecalPacker.labelEBSRFlags = "simEcalDigis:ebSrFlags"
ecalPacker.labelEESRFlags = "simEcalDigis:eeSrFlags"

eras.phase2_common.toReplaceWith(DigiToRaw, DigiToRaw.copyAndExclude([castorRawData]))
from Configuration.Eras.Modifier_phase2_common_cff import phase2_common
phase2_common.toReplaceWith(DigiToRaw, DigiToRaw.copyAndExclude([castorRawData]))

#until we have hcal raw data for phase 2....
eras.phase2_hcal.toReplaceWith(DigiToRaw, DigiToRaw.copyAndExclude([hcalRawData]))
from Configuration.Eras.Modifier_phase2_hcal_cff import phase2_hcal
phase2_hcal.toReplaceWith(DigiToRaw, DigiToRaw.copyAndExclude([hcalRawData]))

if eras.fastSim.isChosen() :
from Configuration.Eras.Modifier_fastSim_cff import fastSim
if fastSim.isChosen() :
for _entry in [siPixelRawData,SiStripDigiToRaw,castorRawData]:
DigiToRaw.remove(_entry)
4 changes: 2 additions & 2 deletions Configuration/StandardSequences/python/Digi_PreMix_cff.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
# This is extra, since the configuration skips it anyway. Belts and suspenders.
pdigi.remove(simEcalPreshowerDigis)

from Configuration.StandardSequences.Eras import eras
if eras.fastSim.isChosen():
from Configuration.Eras.Modifier_fastSim_cff import fastSim
if fastSim.isChosen():
# no need for the aliases for usual mixing
del generalTracks,ecalPreshowerDigis,ecalDigis,hcalDigis,muonDTDigis,muonCSCDigis,muonRPCDigis
else:
Expand Down
8 changes: 4 additions & 4 deletions Configuration/StandardSequences/python/Digi_cff.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
pdigi_nogen=cms.Sequence(generatorSmeared*cms.SequencePlaceholder("randomEngineStateProducer")*cms.SequencePlaceholder("mix")*doAllDigi*addPileupInfo)
pdigi_valid_nogen=cms.Sequence(pdigi_nogen)

from Configuration.StandardSequences.Eras import eras
if eras.fastSim.isChosen():
from Configuration.Eras.Modifier_fastSim_cff import fastSim
if fastSim.isChosen():
# pretend these digis have been through digi2raw and raw2digi, by using the approprate aliases
# use an alias to make the mixed track collection available under the usual label
from FastSimulation.Configuration.DigiAliases_cff import loadDigiAliases
Expand All @@ -50,7 +50,7 @@ def _modifyDigitizerPhase2Hcal( theProcess ):
theProcess.es_hardcode = _es_hardcode
theProcess.es_prefer_hcalHardcode = _es_prefer_hcalHardcode

from Configuration.StandardSequences.Eras import eras
modifyDigitizerPhase2Hcal_ = eras.phase2_hcal.makeProcessModifier( _modifyDigitizerPhase2Hcal )
from Configuration.Eras.Modifier_phase2_hcal_cff import phase2_hcal
modifyDigitizerPhase2Hcal_ = phase2_hcal.makeProcessModifier( _modifyDigitizerPhase2Hcal )


12 changes: 7 additions & 5 deletions Configuration/StandardSequences/python/RawToDigi_cff.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

# This object is used to selectively make changes for different running
# scenarios. In this case it makes changes for Run 2.
from Configuration.StandardSequences.Eras import eras

from EventFilter.SiPixelRawToDigi.SiPixelRawToDigi_cfi import *

Expand Down Expand Up @@ -79,17 +78,20 @@
totemTriggerRawToDigi.rawDataTag = cms.InputTag("rawDataCollector")
totemRPRawToDigi.rawDataTag = cms.InputTag("rawDataCollector")

eras.phase2_common.toReplaceWith(RawToDigi, RawToDigi.copyAndExclude([castorDigis]))
from Configuration.Eras.Modifier_phase2_common_cff import phase2_common
phase2_common.toReplaceWith(RawToDigi, RawToDigi.copyAndExclude([castorDigis]))

# until we have hcal raw data for phase 2...
eras.phase2_hcal.toReplaceWith(RawToDigi, RawToDigi.copyAndExclude([hcalDigis]))
from Configuration.Eras.Modifier_phase2_hcal_cff import phase2_hcal
phase2_hcal.toReplaceWith(RawToDigi, RawToDigi.copyAndExclude([hcalDigis]))


# add CTPPS 2016 raw-to-digi modules
_ctpps_2016_RawToDigi = RawToDigi.copy()
_ctpps_2016_RawToDigi += totemTriggerRawToDigi + totemRPRawToDigi
eras.ctpps_2016.toReplaceWith(RawToDigi, _ctpps_2016_RawToDigi)
from Configuration.Eras.Modifier_ctpps_2016_cff import ctpps_2016
ctpps_2016.toReplaceWith(RawToDigi, _ctpps_2016_RawToDigi)

_ctpps_2016_RawToDigi_noTk = RawToDigi_noTk.copy()
_ctpps_2016_RawToDigi_noTk += totemTriggerRawToDigi + totemRPRawToDigi
eras.ctpps_2016.toReplaceWith(RawToDigi_noTk, _ctpps_2016_RawToDigi_noTk)
ctpps_2016.toReplaceWith(RawToDigi_noTk, _ctpps_2016_RawToDigi_noTk)
22 changes: 13 additions & 9 deletions Configuration/StandardSequences/python/Reconstruction_cff.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import FWCore.ParameterSet.Config as cms
from Configuration.StandardSequences.Eras import eras

from RecoLuminosity.LumiProducer.lumiProducer_cff import *
from RecoLuminosity.LumiProducer.bunchSpacingProducer_cfi import *
Expand Down Expand Up @@ -52,16 +51,18 @@

_phase2_localreco = localreco.copyAndExclude([castorreco])
_phase2_localreco_HcalNZS = localreco_HcalNZS.copyAndExclude([castorreco])
eras.phase2_common.toReplaceWith(localreco, _phase2_localreco)
eras.phase2_common.toReplaceWith(localreco_HcalNZS, _phase2_localreco_HcalNZS)
from Configuration.Eras.Modifier_phase2_common_cff import phase2_common
phase2_common.toReplaceWith(localreco, _phase2_localreco)
phase2_common.toReplaceWith(localreco_HcalNZS, _phase2_localreco_HcalNZS)

_ctpps_2016_localreco = localreco.copy()
_ctpps_2016_localreco += totemRPLocalReconstruction
eras.ctpps_2016.toReplaceWith(localreco, _ctpps_2016_localreco)
from Configuration.Eras.Modifier_ctpps_2016_cff import ctpps_2016
ctpps_2016.toReplaceWith(localreco, _ctpps_2016_localreco)

_ctpps_2016_localreco_HcalNZS = localreco_HcalNZS.copy()
_ctpps_2016_localreco_HcalNZS += totemRPLocalReconstruction
eras.ctpps_2016.toReplaceWith(localreco_HcalNZS, _ctpps_2016_localreco_HcalNZS)
ctpps_2016.toReplaceWith(localreco_HcalNZS, _ctpps_2016_localreco_HcalNZS)

#
# temporarily switching off recoGenJets; since this are MC and wil be moved to a proper sequence
Expand All @@ -78,9 +79,12 @@
vertexreco)
_globalreco_tracking_LowPU_Phase1PU70 = globalreco_tracking.copy()
_globalreco_tracking_LowPU_Phase1PU70.replace(trackingGlobalReco, recopixelvertexing+trackingGlobalReco)
eras.trackingLowPU.toReplaceWith(globalreco_tracking, _globalreco_tracking_LowPU_Phase1PU70)
eras.trackingPhase1PU70.toReplaceWith(globalreco_tracking, _globalreco_tracking_LowPU_Phase1PU70)
eras.trackingPhase2PU140.toReplaceWith(globalreco_tracking, _globalreco_tracking_LowPU_Phase1PU70)
from Configuration.Eras.Modifier_trackingLowPU_cff import trackingLowPU
trackingLowPU.toReplaceWith(globalreco_tracking, _globalreco_tracking_LowPU_Phase1PU70)
from Configuration.Eras.Modifier_trackingPhase1PU70_cff import trackingPhase1PU70
trackingPhase1PU70.toReplaceWith(globalreco_tracking, _globalreco_tracking_LowPU_Phase1PU70)
from Configuration.Eras.Modifier_trackingPhase2PU140_cff import trackingPhase2PU140
trackingPhase2PU140.toReplaceWith(globalreco_tracking, _globalreco_tracking_LowPU_Phase1PU70)

globalreco = cms.Sequence(globalreco_tracking*
hcalGlobalRecoSequence*
Expand All @@ -95,7 +99,7 @@
CastorFullReco)

_phase2_globalreco = globalreco.copyAndExclude([CastorFullReco])
eras.phase2_common.toReplaceWith(globalreco, _phase2_globalreco)
phase2_common.toReplaceWith(globalreco, _phase2_globalreco)

globalreco_plusPL= cms.Sequence(globalreco*ctfTracksPixelLess)

Expand Down
4 changes: 2 additions & 2 deletions Configuration/StandardSequences/python/SimL1EmulatorDM_cff.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import FWCore.ParameterSet.Config as cms

from Configuration.StandardSequences.SimL1Emulator_cff import *
from Configuration.StandardSequences.Eras import eras

# Modifications for DataMixer input:
simDtTriggerPrimitiveDigis.digiTag = 'mixData'
Expand All @@ -14,7 +13,8 @@
simHcalTechTrigDigis.ttpDigiCollection = "DMHcalTTPDigis"
#

if not eras.stage2L1Trigger.isChosen():
from Configuration.Eras.Modifier_stage2L1Trigger_cff import stage2L1Trigger
if not stage2L1Trigger.isChosen():
simRpcTriggerDigis.label = 'mixData'
simRctDigis.hcalDigis=cms.VInputTag(cms.InputTag("DMHcalTriggerPrimitiveDigis"))
simRctDigis.ecalDigis=cms.VInputTag(cms.InputTag("DMEcalTriggerPrimitiveDigis"))
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import FWCore.ParameterSet.Config as cms
from Configuration.StandardSequences.Eras import eras

## L1REPACK FULL: Re-Emulate all of L1 and repack into RAW


if not (eras.stage2L1Trigger.isChosen()):
from Configuration.Eras.Modifier_stage2L1Trigger_cff import stage2L1Trigger
if not (stage2L1Trigger.isChosen()):
print "L1T WARN: L1REPACK:Full2015Data only supports Stage 2 eras for now."
print "L1T WARN: Use a legacy version of L1REPACK for now."
else:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import FWCore.ParameterSet.Config as cms
from Configuration.StandardSequences.Eras import eras

## L1REPACK FULL: Re-Emulate all of L1 and repack into RAW


if not (eras.stage2L1Trigger.isChosen()):
from Configuration.Eras.Modifier_stage2L1Trigger_cff import stage2L1Trigger
if not (stage2L1Trigger.isChosen()):
print "L1T WARN: L1REPACK:FullMC (intended for MC events with RAW eventcontent) only supports Stage 2 eras for now."
print "L1T WARN: Use a legacy version of L1REPACK for now."
else:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import FWCore.ParameterSet.Config as cms
from Configuration.StandardSequences.Eras import eras

## L1REPACK FULL: Re-Emulate all of L1 and repack into RAW


if not (eras.stage2L1Trigger.isChosen()):
from Configuration.Eras.Modifier_stage2L1Trigger_cff import stage2L1Trigger
if not (stage2L1Trigger.isChosen()):
print "L1T WARN: L1REPACK:FullSimTP (intended for 2016 data) only supports Stage 2 eras for now."
print "L1T WARN: Use a legacy version of L1REPACK for now."
else:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import FWCore.ParameterSet.Config as cms
from Configuration.StandardSequences.Eras import eras

## L1REPACK FULL: Re-Emulate all of L1 and repack into RAW


if not (eras.stage2L1Trigger.isChosen()):
from Configuration.Eras.Modifier_stage2L1Trigger_cff import stage2L1Trigger
if not (stage2L1Trigger.isChosen()):
print "L1T WARN: L1REPACK:Full (intended for 2016 data) only supports Stage 2 eras for now."
print "L1T WARN: Use a legacy version of L1REPACK for now."
else:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import FWCore.ParameterSet.Config as cms
from Configuration.StandardSequences.Eras import eras

## L1REPACK FULL: Re-Emulate all of L1 and repack into RAW


if not (eras.stage2L1Trigger.isChosen()):
from Configuration.Eras.Modifier_stage2L1Trigger_cff import stage2L1Trigger
if not (stage2L1Trigger.isChosen()):
print "L1T WARN: L1REPACK:Full (intended for 2016 data) only supports Stage 2 eras for now."
print "L1T WARN: Use a legacy version of L1REPACK for now."
else:
Expand Down
4 changes: 2 additions & 2 deletions Configuration/StandardSequences/python/SimL1Emulator_cff.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
from L1Trigger.Configuration.SimL1Emulator_cff import *

# make trigger digis available under with the raw2digi names
from Configuration.StandardSequences.Eras import eras
if eras.fastSim.isChosen():
from Configuration.Eras.Modifier_fastSim_cff import fastSim
if fastSim.isChosen():
# pretend these digis have been through digi2raw and to the HLT internal raw2digi, by using the approprate aliases
# consider moving these mods to the HLT configuration
from FastSimulation.Configuration.DigiAliases_cff import loadTriggerDigiAliases
Expand Down
4 changes: 2 additions & 2 deletions DQM/BeamMonitor/python/AlcaBeamMonitor_cfi.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
# is not included in data-taking, like it was the case for "Quiet
# Beam" collisions on 2016 with run 269207.

from Configuration.StandardSequences.Eras import eras
eras.trackingLowPU.toModify(AlcaBeamMonitor,
from Configuration.Eras.Modifier_trackingLowPU_cff import trackingLowPU
trackingLowPU.toModify(AlcaBeamMonitor,
BeamFitter = dict(MaximumImpactParameter = 5.0,
MinimumInputTracks = 50))
4 changes: 2 additions & 2 deletions DQM/HcalTasks/python/OfflineSourceSequence_cosmic.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,6 @@
_phase1_hcalOfflineSourceSequence = hcalOfflineSourceSequence.copy()
_phase1_hcalOfflineSourceSequence.insert(0,digiPhase1Task)

from Configuration.StandardSequences.Eras import eras
eras.run2_HCAL_2017.toReplaceWith( hcalOfflineSourceSequence, _phase1_hcalOfflineSourceSequence )
from Configuration.Eras.Modifier_run2_HCAL_2017_cff import run2_HCAL_2017
run2_HCAL_2017.toReplaceWith( hcalOfflineSourceSequence, _phase1_hcalOfflineSourceSequence )

4 changes: 2 additions & 2 deletions DQM/HcalTasks/python/OfflineSourceSequence_hi.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,6 @@
_phase1_hcalOfflineSourceSequence = hcalOfflineSourceSequence.copy()
_phase1_hcalOfflineSourceSequence.insert(0,digiPhase1Task)

from Configuration.StandardSequences.Eras import eras
eras.run2_HCAL_2017.toReplaceWith( hcalOfflineSourceSequence, _phase1_hcalOfflineSourceSequence )
from Configuration.Eras.Modifier_run2_HCAL_2017_cff import run2_HCAL_2017
run2_HCAL_2017.toReplaceWith( hcalOfflineSourceSequence, _phase1_hcalOfflineSourceSequence )

Loading

0 comments on commit 183087b

Please sign in to comment.