Skip to content

Commit 281982a

Browse files
author
Franz
committed
Adressed the ESProducer parameter issue
1 parent c25822b commit 281982a

File tree

6 files changed

+5
-13
lines changed

6 files changed

+5
-13
lines changed
Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
import FWCore.ParameterSet.Config as cms
22

33
from Configuration.Eras.Era_Phase2C11I13_cff import Phase2C11I13
4-
from Configuration.Eras.Modifier_phase2_3DPixels_cff import phase2_3DPixels
5-
from Configuration.Eras.Modifier_phase2_squarePixels_cff import phase2_squarePixels
64
from Configuration.Eras.Modifier_phase2_brickedPixels_cff import phase2_brickedPixels
75
from Configuration.Eras.Modifier_phase2_GE0_cff import phase2_GE0
86

9-
Phase2C11I13T27M9 = cms.ModifierChain(Phase2C11I13, phase2_3DPixels, phase2_squarePixels, phase2_brickedPixels, phase2_GE0)
7+
Phase2C11I13T27M9 = cms.ModifierChain(Phase2C11I13, phase2_brickedPixels, phase2_GE0)

Configuration/Geometry/python/dict2026Geometry.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,7 @@
427427
'from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *',
428428
'trackerGeometry.applyAlignment = cms.bool(False)',
429429
],
430-
"era" : "phase2_tracker, phase2_3DPixels, phase2_brickedPixels, trackingPhase2PU140",
430+
"era" : "phase2_tracker, phase2_brickedPixels, trackingPhase2PU140",
431431
}
432432
}
433433

Configuration/ProcessModifiers/python/PixelCPEGenericForBricked_cff.py

Lines changed: 0 additions & 4 deletions
This file was deleted.

Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1354,7 +1354,6 @@ def condition(self, fragment, stepList, key, hasHarvest):
13541354
'Geom' : 'Extended2026D87', # N.B.: Geometry with bricked pixels in the Inner Tracker (+others)
13551355
'HLTmenu': '@fake2',
13561356
'GT' : 'auto:phase2_realistic_T27',
1357-
'ProcessModifier': 'PixelCPEGenericForBricked', # This swaps template reco CPE for generic reco CPE specialized for bricked
13581357
'Era' : 'Phase2C11I13T27M9', # customized for bricked pixels and Muon M9
13591358
'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal'],
13601359
},

RecoLocalTracker/SiPixelRecHits/python/PixelCPEGeneric_cfi.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,7 @@
5656
)
5757
# customize phase2 CPE generic for bricked pixels
5858
from Configuration.Eras.Modifier_phase2_brickedPixels_cff import phase2_brickedPixels
59-
from Configuration.ProcessModifiers.PixelCPEGenericForBricked_cff import PixelCPEGenericForBricked
60-
(phase2_tracker & (phase2_3DPixels & phase2_brickedPixels & PixelCPEGenericForBricked)).toModify(PixelCPEGenericESProducer,
59+
(phase2_tracker & phase2_brickedPixels ).toModify(PixelCPEGenericESProducer,
6160
ComponentName = 'PixelCPEGenericForBricked', # PixelCPEGenericForBricked is derived fromPixelCPEGeneric with changes in some of the methods to deal with bricked pixel topology
6261
UseErrorsFromTemplates = False, # no GenErrors
6362
LoadTemplatesFromDB = False, # do not load template

RecoTracker/TransientTrackingRecHit/python/TTRHBuilderWithTemplate_cfi.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@
1919
from Configuration.ProcessModifiers.PixelCPEGeneric_cff import PixelCPEGeneric
2020
PixelCPEGeneric.toModify(TTRHBuilderAngleAndTemplate, PixelCPE = 'PixelCPEGeneric')
2121

22-
from Configuration.ProcessModifiers.PixelCPEGenericForBricked_cff import PixelCPEGenericForBricked
23-
PixelCPEGenericForBricked.toModify(TTRHBuilderAngleAndTemplate, PixelCPE = 'PixelCPEGenericForBricked')
22+
from Configuration.Eras.Modifier_phase2_brickedPixels_cff import phase2_brickedPixels
23+
phase2_brickedPixels.toModify(TTRHBuilderAngleAndTemplate, PixelCPE = 'PixelCPEGenericForBricked')
2424

0 commit comments

Comments
 (0)