Change all uses of "run2" to "run2_common"

Mark Grimes · Mark Grimes · commit 5e721ba47d82 · 2015-02-18T15:09:31.000+01:00
diff --git a/CalibMuon/CSCCalibration/python/CSCChannelMapper_cfi.py b/CalibMuon/CSCCalibration/python/CSCChannelMapper_cfi.py
@@ -13,4 +13,4 @@
 # Modify for running in run 2
 #
 from Configuration.StandardSequences.Eras import eras
-eras.run2.toModify( CSCChannelMapperESProducer, AlgoName=cms.string("CSCChannelMapperPostls1") )
+eras.run2_common.toModify( CSCChannelMapperESProducer, AlgoName=cms.string("CSCChannelMapperPostls1") )
diff --git a/CalibMuon/CSCCalibration/python/CSCIndexer_cfi.py b/CalibMuon/CSCCalibration/python/CSCIndexer_cfi.py
@@ -13,4 +13,4 @@
 # Modify for running in run 2
 #
 from Configuration.StandardSequences.Eras import eras
-eras.run2.toModify( CSCIndexerESProducer, AlgoName=cms.string("CSCIndexerPostls1") )
+eras.run2_common.toModify( CSCIndexerESProducer, AlgoName=cms.string("CSCIndexerPostls1") )
diff --git a/DQM/L1TMonitor/python/L1TCSCTF_cfi.py b/DQM/L1TMonitor/python/L1TCSCTF_cfi.py
@@ -18,4 +18,4 @@
 # Make changes for running in Run 2
 #
 from Configuration.StandardSequences.Eras import eras
-eras.run2.toModify( l1tCsctf, gangedME11a = False )
+eras.run2_common.toModify( l1tCsctf, gangedME11a = False )
diff --git a/EventFilter/CSCRawToDigi/python/cscPacker_cfi.py b/EventFilter/CSCRawToDigi/python/cscPacker_cfi.py
@@ -23,6 +23,6 @@
 ##
 from Configuration.StandardSequences.Eras import eras
 # packer - simply get rid of it
-eras.run2.toModify( cscpacker, useFormatVersion = cms.uint32(2013) )
-eras.run2.toModify( cscpacker, usePreTriggers = cms.bool(False) )
-eras.run2.toModify( cscpacker, packEverything = cms.bool(True) )
+eras.run2_common.toModify( cscpacker, useFormatVersion = cms.uint32(2013) )
+eras.run2_common.toModify( cscpacker, usePreTriggers = cms.bool(False) )
+eras.run2_common.toModify( cscpacker, packEverything = cms.bool(True) )
diff --git a/FastSimulation/Calorimetry/python/Calorimetry_cff.py b/FastSimulation/Calorimetry/python/Calorimetry_cff.py
@@ -294,4 +294,4 @@
 #
 # Modify for running in Run 2
 #
-eras.run2.toModify( FamosCalorimetryBlock.Calorimetry.HFShowerLibrary, useShowerLibrary=True )
+eras.run2_common.toModify( FamosCalorimetryBlock.Calorimetry.HFShowerLibrary, useShowerLibrary=True )
diff --git a/FastSimulation/Event/python/ParticleFilter_cfi.py b/FastSimulation/Event/python/ParticleFilter_cfi.py
@@ -18,5 +18,5 @@
 # Modify for running in Run 2
 #
 from Configuration.StandardSequences.Eras import eras
-eras.run2.toModify( ParticleFilterBlock.ParticleFilter, pTMin = 0.1 )
-eras.run2.toModify( ParticleFilterBlock.ParticleFilter, etaMax = 5.300 )
+eras.run2_common.toModify( ParticleFilterBlock.ParticleFilter, pTMin = 0.1 )
+eras.run2_common.toModify( ParticleFilterBlock.ParticleFilter, etaMax = 5.300 )
diff --git a/FastSimulation/PileUpProducer/python/PileUpFiles_cff.py b/FastSimulation/PileUpProducer/python/PileUpFiles_cff.py
@@ -71,5 +71,5 @@
 # Modify for running in Run 2
 #
 from Configuration.StandardSequences.Eras import eras
-eras.run2.toModify(puFileNames,fileNames=puFileNames_13TeV)
+eras.run2_common.toModify(puFileNames,fileNames=puFileNames_13TeV)
 
diff --git a/FastSimulation/TrajectoryManager/python/TrackerSimHits_cfi.py b/FastSimulation/TrajectoryManager/python/TrackerSimHits_cfi.py
@@ -13,4 +13,4 @@
 # Modify for running in Run 2
 #
 from Configuration.StandardSequences.Eras import eras
-eras.run2.toModify( TrackerSimHitsBlock.TrackerSimHits, pTmin = 0.1 )
+eras.run2_common.toModify( TrackerSimHitsBlock.TrackerSimHits, pTmin = 0.1 )
diff --git a/Geometry/CSCGeometryBuilder/python/cscGeometryDB_cfi.py b/Geometry/CSCGeometryBuilder/python/cscGeometryDB_cfi.py
@@ -22,4 +22,4 @@
 # Modify for running in run 2
 #
 from Configuration.StandardSequences.Eras import eras
-eras.run2.toModify( CSCGeometryESModule, useGangedStripsInME1a=False )
+eras.run2_common.toModify( CSCGeometryESModule, useGangedStripsInME1a=False )
diff --git a/Geometry/CSCGeometryBuilder/python/cscGeometry_cfi.py b/Geometry/CSCGeometryBuilder/python/cscGeometry_cfi.py
@@ -22,4 +22,4 @@
 # Modify for running in run 2
 #
 from Configuration.StandardSequences.Eras import eras
-eras.run2.toModify( CSCGeometryESModule, useGangedStripsInME1a=False )
+eras.run2_common.toModify( CSCGeometryESModule, useGangedStripsInME1a=False )
diff --git a/L1Trigger/CSCTrackFinder/python/csctfTrackDigis_cfi.py b/L1Trigger/CSCTrackFinder/python/csctfTrackDigis_cfi.py
@@ -127,5 +127,5 @@ def _modifyCsctfTrackDigisForRun2( object ) :
 # If the run2 era is active, make the required changes
 #
 from Configuration.StandardSequences.Eras import eras
-eras.run2.toModify( csctfTrackDigis, _modifyCsctfTrackDigisForRun2 )
+eras.run2_common.toModify( csctfTrackDigis, _modifyCsctfTrackDigisForRun2 )
 
diff --git a/L1Trigger/CSCTriggerPrimitives/python/cscTriggerPrimitiveDigis_cfi.py b/L1Trigger/CSCTriggerPrimitives/python/cscTriggerPrimitiveDigis_cfi.py
@@ -338,4 +338,4 @@ def _modifyCscTriggerPrimitiveDigisForRun2( object ) :
 # If the run2 era is active, make the required changes
 #
 from Configuration.StandardSequences.Eras import eras
-eras.run2.toModify( cscTriggerPrimitiveDigis, _modifyCscTriggerPrimitiveDigisForRun2 )
+eras.run2_common.toModify( cscTriggerPrimitiveDigis, _modifyCscTriggerPrimitiveDigisForRun2 )
diff --git a/RecoLocalMuon/CSCRecHitD/python/cscRecHitD_cfi.py b/RecoLocalMuon/CSCRecHitD/python/cscRecHitD_cfi.py
@@ -66,6 +66,6 @@
 ##
 ## Modify for running in Run 2
 ##
-eras.run2.toModify( csc2DRecHits, readBadChannels = False )
-eras.run2.toModify( csc2DRecHits, CSCUseGasGainCorrections = False )
+eras.run2_common.toModify( csc2DRecHits, readBadChannels = False )
+eras.run2_common.toModify( csc2DRecHits, CSCUseGasGainCorrections = False )
 
diff --git a/RecoParticleFlow/PFClusterProducer/python/particleFlowClusterHO_cfi.py b/RecoParticleFlow/PFClusterProducer/python/particleFlowClusterHO_cfi.py
@@ -106,4 +106,4 @@ def _modifyParticleFlowClusterHOForRun2( object ) :
     object.pfClusterBuilder.allCellsPositionCalc.logWeightDenominator = cms.double(0.05)
 
 # Call the function above to modify particleFlowClusterHO only if the run2 era is active
-eras.run2.toModify( particleFlowClusterHO, func=_modifyParticleFlowClusterHOForRun2 )
+eras.run2_common.toModify( particleFlowClusterHO, func=_modifyParticleFlowClusterHOForRun2 )
diff --git a/RecoParticleFlow/PFClusterProducer/python/particleFlowRecHitHO_cfi.py b/RecoParticleFlow/PFClusterProducer/python/particleFlowRecHitHO_cfi.py
@@ -53,4 +53,4 @@ def _modifyParticleFlowRecHitHOForRun2( object ) :
             )
         )
 
-eras.run2.toModify( particleFlowRecHitHO, func=_modifyParticleFlowRecHitHOForRun2 )
+eras.run2_common.toModify( particleFlowRecHitHO, func=_modifyParticleFlowRecHitHOForRun2 )
diff --git a/SimCalorimetry/Configuration/python/SimCalorimetry_EventContent_cff.py b/SimCalorimetry/Configuration/python/SimCalorimetry_EventContent_cff.py
@@ -26,5 +26,5 @@
 #
 # Add extra event content if running in Run 2
 #
-eras.run2.toModify( SimCalorimetryFEVTDEBUG.outputCommands, func=lambda outputCommands: outputCommands.append('keep *_simHcalUnsuppressedDigis_*_*') )
-eras.run2.toModify( SimCalorimetryRAW.outputCommands, func=lambda outputCommands: outputCommands.append('keep *_simHcalUnsuppressedDigis_*_*') )
+eras.run2_common.toModify( SimCalorimetryFEVTDEBUG.outputCommands, func=lambda outputCommands: outputCommands.append('keep *_simHcalUnsuppressedDigis_*_*') )
+eras.run2_common.toModify( SimCalorimetryRAW.outputCommands, func=lambda outputCommands: outputCommands.append('keep *_simHcalUnsuppressedDigis_*_*') )
diff --git a/SimCalorimetry/HcalSimProducers/python/hcalSimParameters_cfi.py b/SimCalorimetry/HcalSimProducers/python/hcalSimParameters_cfi.py
@@ -115,4 +115,4 @@ def _modifyHcalSimParametersForPostLS1( object ) :
     object.hf1.samplingFactor = cms.double(0.60)
     object.hf2.samplingFactor = cms.double(0.60)
 
-eras.run2.toModify( hcalSimParameters, func=_modifyHcalSimParametersForPostLS1 )
+eras.run2_common.toModify( hcalSimParameters, func=_modifyHcalSimParametersForPostLS1 )
diff --git a/SimG4Core/Application/python/g4SimHits_cfi.py b/SimG4Core/Application/python/g4SimHits_cfi.py
@@ -418,4 +418,4 @@
 ##
 ## Change the HFShowerLibrary file used for Run 2
 ##
-eras.run2.toModify( g4SimHits.HFShowerLibrary, FileName = 'SimG4CMS/Calo/data/HFShowerLibrary_npmt_noatt_eta4_16en_v3.root' )
+eras.run2_common.toModify( g4SimHits.HFShowerLibrary, FileName = 'SimG4CMS/Calo/data/HFShowerLibrary_npmt_noatt_eta4_16en_v3.root' )
diff --git a/SimGeneral/MixingModule/python/pixelDigitizer_cfi.py b/SimGeneral/MixingModule/python/pixelDigitizer_cfi.py
@@ -338,7 +338,7 @@ def _modifyPixelDigitizerForRun2( digitiserInstance ) :
     elif eras.bunchspacing50ns.isChosen() :
         modifyPixelDigitizerForRun2Bunchspacing50( digitiserInstance )
 
-eras.run2.toModify( pixelDigitizer, func=_modifyPixelDigitizerForRun2 )
+eras.run2_common.toModify( pixelDigitizer, func=_modifyPixelDigitizerForRun2 )
 
 
 # Threshold in electrons are the Official CRAFT09 numbers:
diff --git a/SimMuon/CSCDigitizer/python/muonCSCDigis_cfi.py b/SimMuon/CSCDigitizer/python/muonCSCDigis_cfi.py
@@ -84,6 +84,6 @@
 ##
 ## Change the the bunch timing offsets if running in Run 2
 ##
-eras.run2.toModify( simMuonCSCDigis.strips, bunchTimingOffsets=[0.0, 37.53, 37.66, 55.4, 48.2, 54.45, 53.78, 53.38, 54.12, 51.98, 51.28] )
-eras.run2.toModify( simMuonCSCDigis.wires, bunchTimingOffsets=[0.0, 22.88, 22.55, 29.28, 30.0, 30.0, 30.5, 31.0, 29.5, 29.1, 29.88] )
+eras.run2_common.toModify( simMuonCSCDigis.strips, bunchTimingOffsets=[0.0, 37.53, 37.66, 55.4, 48.2, 54.45, 53.78, 53.38, 54.12, 51.98, 51.28] )
+eras.run2_common.toModify( simMuonCSCDigis.wires, bunchTimingOffsets=[0.0, 22.88, 22.55, 29.28, 30.0, 30.0, 30.5, 31.0, 29.5, 29.1, 29.88] )
 
diff --git a/SimMuon/Configuration/python/SimMuon_EventContent_cff.py b/SimMuon/Configuration/python/SimMuon_EventContent_cff.py
@@ -25,8 +25,8 @@
 # Add extra collections if running in Run 2. Not sure why but these
 # collections were added to pretty much all event content in the old
 # customisation function.
-eras.run2.toModify( SimMuonRAW.outputCommands, func=lambda outputCommands: outputCommands.append('keep *_simMuonCSCDigis_*_*') )
-eras.run2.toModify( SimMuonRAW.outputCommands, func=lambda outputCommands: outputCommands.append('keep *_simMuonRPCDigis_*_*') )
+eras.run2_common.toModify( SimMuonRAW.outputCommands, func=lambda outputCommands: outputCommands.append('keep *_simMuonCSCDigis_*_*') )
+eras.run2_common.toModify( SimMuonRAW.outputCommands, func=lambda outputCommands: outputCommands.append('keep *_simMuonRPCDigis_*_*') )
 
 #RECO content
 SimMuonRECO = cms.PSet(

Original file line number	Diff line number	Diff line change
`@@ -13,4 +13,4 @@`
`13`	`13`	`# Modify for running in run 2`
`14`	`14`	`#`
`15`	`15`	`from Configuration.StandardSequences.Eras import eras`
`16`		`-eras.run2.toModify( CSCChannelMapperESProducer, AlgoName=cms.string("CSCChannelMapperPostls1") )`
	`16`	`+eras.run2_common.toModify( CSCChannelMapperESProducer, AlgoName=cms.string("CSCChannelMapperPostls1") )`
Original file line number	Diff line number	Diff line change
`@@ -18,4 +18,4 @@`
`18`	`18`	`# Make changes for running in Run 2`
`19`	`19`	`#`
`20`	`20`	`from Configuration.StandardSequences.Eras import eras`
`21`		`-eras.run2.toModify( l1tCsctf, gangedME11a = False )`
	`21`	`+eras.run2_common.toModify( l1tCsctf, gangedME11a = False )`
Original file line number	Diff line number	Diff line change
`@@ -294,4 +294,4 @@`
`294`	`294`	`#`
`295`	`295`	`# Modify for running in Run 2`
`296`	`296`	`#`
`297`		`-eras.run2.toModify( FamosCalorimetryBlock.Calorimetry.HFShowerLibrary, useShowerLibrary=True )`
	`297`	`+eras.run2_common.toModify( FamosCalorimetryBlock.Calorimetry.HFShowerLibrary, useShowerLibrary=True )`
Original file line number	Diff line number	Diff line change
`@@ -18,5 +18,5 @@`
`18`	`18`	`# Modify for running in Run 2`
`19`	`19`	`#`
`20`	`20`	`from Configuration.StandardSequences.Eras import eras`
`21`		`-eras.run2.toModify( ParticleFilterBlock.ParticleFilter, pTMin = 0.1 )`
`22`		`-eras.run2.toModify( ParticleFilterBlock.ParticleFilter, etaMax = 5.300 )`
	`21`	`+eras.run2_common.toModify( ParticleFilterBlock.ParticleFilter, pTMin = 0.1 )`
	`22`	`+eras.run2_common.toModify( ParticleFilterBlock.ParticleFilter, etaMax = 5.300 )`
Original file line number	Diff line number	Diff line change
`@@ -71,5 +71,5 @@`
`71`	`71`	`# Modify for running in Run 2`
`72`	`72`	`#`
`73`	`73`	`from Configuration.StandardSequences.Eras import eras`
`74`		`-eras.run2.toModify(puFileNames,fileNames=puFileNames_13TeV)`
	`74`	`+eras.run2_common.toModify(puFileNames,fileNames=puFileNames_13TeV)`
`75`	`75`
Original file line number	Diff line number	Diff line change
`@@ -22,4 +22,4 @@`
`22`	`22`	`# Modify for running in run 2`
`23`	`23`	`#`
`24`	`24`	`from Configuration.StandardSequences.Eras import eras`
`25`		`-eras.run2.toModify( CSCGeometryESModule, useGangedStripsInME1a=False )`
	`25`	`+eras.run2_common.toModify( CSCGeometryESModule, useGangedStripsInME1a=False )`