Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Consolidate and simplify MTD modifiers #28387

Merged
merged 3 commits into from
Nov 17, 2019
Merged

Consolidate and simplify MTD modifiers #28387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ae24cbd
consolidate MTD-related modifiers and eras
kpedro88 Nov 12, 2019
62f2b8d
simplify timing layer modifier usage
kpedro88 Nov 12, 2019
b6e659a
fix test configs
kpedro88 Nov 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions Configuration/Eras/python/Era_Phase2C10_timing_cff.py
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions Configuration/Eras/python/Era_Phase2C10_timing_layer_bar_cff.py
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions Configuration/Eras/python/Era_Phase2C4_timing_cff.py
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions Configuration/Eras/python/Era_Phase2C4_timing_layer_bar_cff.py
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions Configuration/Eras/python/Era_Phase2C6_timing_cff.py
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions Configuration/Eras/python/Era_Phase2C6_timing_layer_bar_cff.py
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions Configuration/Eras/python/Era_Phase2C8_timing_cff.py
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions Configuration/Eras/python/Era_Phase2C8_timing_layer_bar_cff.py
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions Configuration/Eras/python/Era_Phase2C9_timing_cff.py
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions Configuration/Eras/python/Era_Phase2C9_timing_layer_bar_cff.py
View file
Open in desktop

This file was deleted.

5 changes: 3 additions & 2 deletions Configuration/Eras/python/Era_Phase2_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
from Configuration.Eras.Modifier_phase1Pixel_cff import phase1Pixel
from Configuration.Eras.Modifier_trackingPhase1_cff import trackingPhase1
from Configuration.Eras.Modifier_hcalHardcodeConditions_cff import hcalHardcodeConditions
from Configuration.Eras.Modifier_phase2_timing_cff import phase2_timing
from Configuration.Eras.Modifier_phase2_timing_layer_cff import phase2_timing_layer


Phase2 = cms.ModifierChain(Run3.copyAndExclude([phase1Pixel,trackingPhase1]), phase2_common, phase2_tracker, trackingPhase2PU140, phase2_ecal, phase2_hcal, phase2_hgcal, phase2_muon, hcalHardcodeConditions)
Phase2 = cms.ModifierChain(Run3.copyAndExclude([phase1Pixel,trackingPhase1]), phase2_common, phase2_tracker, trackingPhase2PU140, phase2_ecal, phase2_hcal, phase2_hgcal, phase2_muon, hcalHardcodeConditions, phase2_timing, phase2_timing_layer)
7 changes: 0 additions & 7 deletions Configuration/Eras/python/Era_Phase2_timing_cff.py
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions Configuration/Eras/python/Era_Phase2_timing_layer_bar_cff.py
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions Configuration/Eras/python/Era_Phase2_timing_layer_cff.py
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions Configuration/Eras/python/Era_Phase2_timing_layer_tile_cff.py
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions Configuration/Eras/python/Modifier_phase2_timing_layer_bar_cff.py
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions Configuration/Eras/python/Modifier_phase2_timing_layer_tile_cff.py
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions Configuration/Geometry/python/dict2026Geometry.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -883,7 +883,7 @@
'from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import *',
'mtdGeometry.applyAlignment = cms.bool(False)'
],
"era" : "phase2_timing, phase2_timing_layer_bar",
"era" : "phase2_timing, phase2_timing_layer",
},
"I7" : {
1 : [
Expand Down Expand Up @@ -911,7 +911,7 @@
'from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import *',
'mtdGeometry.applyAlignment = cms.bool(False)'
],
"era" : "phase2_timing, phase2_timing_layer_bar",
"era" : "phase2_timing, phase2_timing_layer",
},
"I9" : {
1 : [
Expand Down Expand Up @@ -939,7 +939,7 @@
'from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import *',
'mtdGeometry.applyAlignment = cms.bool(False)'
],
"era" : "phase2_timing, phase2_timing_layer_bar",
"era" : "phase2_timing, phase2_timing_layer",
},
"I10" : {
1 : [
Expand Down Expand Up @@ -967,7 +967,7 @@
'from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import *',
'mtdGeometry.applyAlignment = cms.bool(False)'
],
"era" : "phase2_timing, phase2_timing_layer_bar",
"era" : "phase2_timing, phase2_timing_layer",
},
}

Expand Down
18 changes: 9 additions & 9 deletions Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -554,63 +554,63 @@ def condition(self, fragment, stepList, key, hasHarvest):
'Geom' : 'Extended2026D35',
'HLTmenu': '@fake2',
'GT' : 'auto:phase2_realistic_T6',
'Era' : 'Phase2C4_timing_layer_bar',
'Era' : 'Phase2C4',
'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFullTrigger','RecoFullGlobal', 'HARVESTFullGlobal'],
},
'2026D41' : {
'Geom' : 'Extended2026D41',
'HLTmenu': '@fake2',
'GT' : 'auto:phase2_realistic_T14',
'Era' : 'Phase2C8_timing_layer_bar',
'Era' : 'Phase2C8',
'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFullTrigger','RecoFullGlobal', 'HARVESTFullGlobal'],
},
'2026D43' : {
'Geom' : 'Extended2026D43',
'HLTmenu': '@fake2',
'GT' : 'auto:phase2_realistic_T14',
'Era' : 'Phase2C4_timing_layer_bar',
'Era' : 'Phase2C4',
'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFullTrigger','RecoFullGlobal', 'HARVESTFullGlobal'],
},
'2026D44' : {
'Geom' : 'Extended2026D44',
'HLTmenu': '@fake2',
'GT' : 'auto:phase2_realistic_T14',
'Era' : 'Phase2C6_timing_layer_bar',
'Era' : 'Phase2C6',
'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFullTrigger','RecoFullGlobal', 'HARVESTFullGlobal'],
},
'2026D45' : {
'Geom' : 'Extended2026D45',
'HLTmenu': '@fake2',
'GT' : 'auto:phase2_realistic_T15',
'Era' : 'Phase2C8_timing_layer_bar',
'Era' : 'Phase2C8',
'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFullTrigger','RecoFullGlobal', 'HARVESTFullGlobal'],
},
'2026D46' : {
'Geom' : 'Extended2026D46',
'HLTmenu': '@fake2',
'GT' : 'auto:phase2_realistic_T15',
'Era' : 'Phase2C9_timing_layer_bar',
'Era' : 'Phase2C9',
'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFullTrigger','RecoFullGlobal', 'HARVESTFullGlobal'],
},
'2026D47' : {
'Geom' : 'Extended2026D47',
'HLTmenu': '@fake2',
'GT' : 'auto:phase2_realistic_T15',
'Era' : 'Phase2C10_timing_layer_bar',
'Era' : 'Phase2C10',
'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFullTrigger','RecoFullGlobal', 'HARVESTFullGlobal'],
},
'2026D48' : {
'Geom' : 'Extended2026D48',
'HLTmenu': '@fake2',
'GT' : 'auto:phase2_realistic_T15',
'Era' : 'Phase2C9_timing_layer_bar',
'Era' : 'Phase2C9',
'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFullTrigger','RecoFullGlobal', 'HARVESTFullGlobal'],
},
'2026D49' : {
'Geom' : 'Extended2026D49',
'HLTmenu': '@fake2',
'GT' : 'auto:phase2_realistic_T15',
'Era' : 'Phase2C9_timing_layer_bar',
'Era' : 'Phase2C9',
'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFullTrigger','RecoFullGlobal', 'HARVESTFullGlobal'],
},
}
Expand Down
16 changes: 1 addition & 15 deletions Configuration/StandardSequences/python/Eras.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,25 +33,11 @@ def __init__(self):
'Run2_2018_highBetaStar',
'Run3',
'Phase2',
'Phase2_timing',
'Phase2_timing_layer',
'Phase2_timing_layer_tile',
'Phase2_timing_layer_bar',
'Phase2C4',
'Phase2C4_timing',
'Phase2C4_timing_layer_bar',
'Phase2C6',
'Phase2C6_timing',
'Phase2C6_timing_layer_bar',
'Phase2C8',
'Phase2C8_timing',
'Phase2C8_timing_layer_bar',
'Phase2C9',
'Phase2C9_timing',
'Phase2C9_timing_layer_bar',
'Phase2C10',
'Phase2C10_timing',
'Phase2C10_timing_layer_bar',
]

internalUseMods = ['run2_common', 'run2_25ns_specific',
Expand All @@ -65,7 +51,7 @@ def __init__(self):
'run2_CSC_2018',
'phase2_common', 'phase2_tracker',
'phase2_hgcal', 'phase2_muon', 'phase2_timing', 'phase2_hgcalV9', 'phase2_hfnose', 'phase2_hgcalV10', 'phase2_hgcalV11',
'phase2_timing_layer','phase2_timing_layer_tile','phase2_timing_layer_bar','phase2_hcal',
'phase2_timing_layer', 'phase2_hcal',
'trackingLowPU', 'trackingPhase1', 'ctpps_2016', 'ctpps_2017', 'ctpps_2018', 'trackingPhase2PU140','highBetaStar_2018',
'tracker_apv_vfp30_2016', 'pf_badHcalMitigation', 'run2_miniAOD_80XLegacy','run2_miniAOD_94XFall17', 'run2_nanoAOD_92X',
'run2_nanoAOD_94XMiniAODv1', 'run2_nanoAOD_94XMiniAODv2', 'run2_nanoAOD_94X2016',
Expand Down
4 changes: 1 addition & 3 deletions Configuration/StandardSequences/python/Reconstruction_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,9 +122,7 @@

_phase2_timing_layer_globalreco_tracking = globalreco_tracking.copy()
_phase2_timing_layer_globalreco_tracking += fastTimingGlobalReco
from Configuration.Eras.Modifier_phase2_timing_layer_tile_cff import phase2_timing_layer_tile
from Configuration.Eras.Modifier_phase2_timing_layer_bar_cff import phase2_timing_layer_bar
(phase2_timing_layer_tile | phase2_timing_layer_bar).toReplaceWith(globalreco_tracking,_phase2_timing_layer_globalreco_tracking)
phase2_timing_layer.toReplaceWith(globalreco_tracking,_phase2_timing_layer_globalreco_tracking)

globalreco = cms.Sequence(globalreco_tracking*
particleFlowCluster*
Expand Down
2 changes: 1 addition & 1 deletion Geometry/GEMGeometry/test/runGEMDetIdAnalysis_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import FWCore.ParameterSet.Config as cms
from Configuration.StandardSequences.Eras import eras

process = cms.Process('PROD',eras.Phase2C4_timing_layer_bar)
process = cms.Process('PROD',eras.Phase2C4)
process.load('FWCore.MessageService.MessageLogger_cfi')
process.load('DataFormats.MuonDetId.gemDetIdAnalyzer_cfi')

Expand Down
4 changes: 2 additions & 2 deletions Geometry/HGCalGeometry/test/python/testHGCalGeometryCheck_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
#process.load('Configuration.Geometry.GeometryExtended2026D35_cff')
#process.load('Configuration.Geometry.GeometryExtended2026D35Reco_cff')

from Configuration.Eras.Era_Phase2C4_timing_layer_bar_cff import Phase2C4_timing_layer_bar
process = cms.Process('PROD',Phase2C4_timing_layer_bar)
from Configuration.Eras.Era_Phase2C4_cff import Phase2C4
process = cms.Process('PROD',Phase2C4)
process.load('Configuration.Geometry.GeometryExtended2026D41_cff')
process.load('Configuration.Geometry.GeometryExtended2026D41Reco_cff')

Expand Down
2 changes: 1 addition & 1 deletion L1Trigger/L1THGCal/test/testHGCalL1TGeometryV10Imp2_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

from Configuration.StandardSequences.Eras import eras

process = cms.Process('DIGI',eras.Phase2C8_timing_layer_bar)
process = cms.Process('DIGI',eras.Phase2C8)

# import of standard configurations
process.load('Configuration.StandardSequences.Services_cff')
Expand Down
2 changes: 1 addition & 1 deletion L1Trigger/L1THGCal/test/testHGCalL1TGeometryV10_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

from Configuration.StandardSequences.Eras import eras

process = cms.Process('DIGI',eras.Phase2C8_timing_layer_bar)
process = cms.Process('DIGI',eras.Phase2C8)

# import of standard configurations
process.load('Configuration.StandardSequences.Services_cff')
Expand Down
12 changes: 5 additions & 7 deletions RecoLocalFastTime/Configuration/python/RecoLocalFastTime_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,10 @@

_phase2_timing_layer_fastTimingLocalReco = cms.Sequence(mtdUncalibratedRecHits*mtdRecHits*mtdClusters*mtdTrackingRecHits)

from Configuration.Eras.Modifier_phase2_timing_layer_tile_cff import phase2_timing_layer_tile
from Configuration.Eras.Modifier_phase2_timing_layer_bar_cff import phase2_timing_layer_bar
from Configuration.Eras.Modifier_phase2_timing_layer_cff import phase2_timing_layer

(phase2_timing_layer_bar | phase2_timing_layer_tile).toReplaceWith(fastTimingLocalReco,
_phase2_timing_layer_fastTimingLocalReco)
phase2_timing_layer.toReplaceWith(fastTimingLocalReco, _phase2_timing_layer_fastTimingLocalReco)

(phase2_timing_layer_tile | phase2_timing_layer_bar).toModify(mtdRecHits,
barrelUncalibratedRecHits = 'mtdUncalibratedRecHits:FTLBarrel',
endcapUncalibratedRecHits = 'mtdUncalibratedRecHits:FTLEndcap')
phase2_timing_layer.toModify(mtdRecHits,
barrelUncalibratedRecHits = 'mtdUncalibratedRecHits:FTLBarrel',
endcapUncalibratedRecHits = 'mtdUncalibratedRecHits:FTLEndcap')
5 changes: 2 additions & 3 deletions RecoParticleFlow/PFProducer/python/particleFlowBlock_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,8 +196,7 @@ def _findIndicesByModule(name):
)
)

from Configuration.Eras.Modifier_phase2_timing_layer_tile_cff import phase2_timing_layer_tile
from Configuration.Eras.Modifier_phase2_timing_layer_bar_cff import phase2_timing_layer_bar
from Configuration.Eras.Modifier_phase2_timing_layer_cff import phase2_timing_layer
_addTimingLayer = particleFlowBlock.elementImporters.copy()
_addTimingLayer.append( cms.PSet( importerName = cms.string("TrackTimingImporter"),
timeValueMap = cms.InputTag("tofPID:t0"),
Expand All @@ -215,7 +214,7 @@ def _findIndicesByModule(name):
elementImporters = _addTiming
)

(phase2_timing_layer_tile | phase2_timing_layer_bar).toModify(
phase2_timing_layer.toModify(
particleFlowBlock,
elementImporters = _addTimingLayer
)
Expand Down
5 changes: 2 additions & 3 deletions RecoParticleFlow/PFProducer/python/simPFProducer_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,8 @@
gsfTrackTimeErrorMap = cms.InputTag("gsfTrackTimeValueMapProducer:electronGsfTracksConfigurableFlatResolutionModelResolution"),
)

from Configuration.Eras.Modifier_phase2_timing_layer_tile_cff import phase2_timing_layer_tile
from Configuration.Eras.Modifier_phase2_timing_layer_bar_cff import phase2_timing_layer_bar
(phase2_timing_layer_tile | phase2_timing_layer_bar).toModify(
from Configuration.Eras.Modifier_phase2_timing_layer_cff import phase2_timing_layer
phase2_timing_layer.toModify(
simPFProducer,
trackTimeValueMap = cms.InputTag("tofPID:t0"),
trackTimeErrorMap = cms.InputTag("tofPID:sigmat0"),
Expand Down
5 changes: 2 additions & 3 deletions RecoVertex/Configuration/python/RecoVertex_EventContent_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@
)

from Configuration.Eras.Modifier_phase2_timing_cff import phase2_timing
from Configuration.Eras.Modifier_phase2_timing_layer_tile_cff import phase2_timing_layer_tile
from Configuration.Eras.Modifier_phase2_timing_layer_bar_cff import phase2_timing_layer_bar
from Configuration.Eras.Modifier_phase2_timing_layer_cff import phase2_timing_layer

_phase2_tktiming_RecoVertexEventContent = [ 'keep *_offlinePrimaryVertices4D__*',
'keep *_offlinePrimaryVertices4DWithBS__*',
Expand All @@ -51,7 +50,7 @@ def _phase2_tktiming_AddNewContent(mod):

def _phase2_tktiming_layer_AddNewContent(mod):
temp = mod.outputCommands + _phase2_tktiming_layer_RecoVertexEventContent
(phase2_timing_layer_tile | phase2_timing_layer_bar).toModify( mod, outputCommands = temp )
phase2_timing_layer.toModify( mod, outputCommands = temp )

_phase2_tktiming_layer_AddNewContent(RecoVertexFEVT)
_phase2_tktiming_layer_AddNewContent(RecoVertexRECO)
Expand Down
Loading