Skip to content

Phase-2 Inner Tracker local reconstruction configuration updates #32789

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

Merged
cmsbuild merged 3 commits into from
Feb 9, 2021
Merged

Phase-2 Inner Tracker local reconstruction configuration updates #32789

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
0986d06
update paylaods for T21 and T22 to the latest version
mmusich Jan 28, 2021
6854ca0
add specific Eras for square and 3D Inner Tracker pixels, and use it …
mmusich Jan 28, 2021
b6b3a4c
rename phase2_PixelCPEGeneric_cff to PixelCPEGeneric_cff
mmusich Feb 3, 2021
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
12 changes: 6 additions & 6 deletions Configuration/AlCa/python/autoCondPhase2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,15 @@
}

allTags["GenError"] = {
'T15' : ( ','.join( [ 'SiPixelGenErrorDBObject_phase2_IT_v6.1.5_25x100_v2_mc' ,SiPixelGenErrorRecord,connectionString, "", "2020-10-16 10:00:00"] ), ), # cell is 25um (local-x) x 100um (local-y) , VBias=350V
'T21' : ( ','.join( [ 'SiPixelGenErrorDBObject_phase2_IT_v6.1.5_25x100_v2_mc',SiPixelGenErrorRecord,connectionString, "", "2020-10-16 10:00:00"] ), ), # cell is 25um (local-x) x 100um (local-y) , VBias=350V
'T22' : ( ','.join( [ 'SiPixelGenErrorDBObject_phase2_IT_v6.1.5_50x50_v4_mc' ,SiPixelGenErrorRecord,connectionString, "", "2020-10-19 23:00:00"] ), ), # cell is 50um (local-x) x 50um (local-y) , VBias=350V
'T15' : ( ','.join( [ 'SiPixelGenErrorDBObject_phase2_IT_v6.1.5_25x100_v3_mc',SiPixelGenErrorRecord,connectionString, "", "2021-01-27 10:00:00"] ), ), # cell is 25um (local-x) x 100um (local-y) , VBias=350V
'T21' : ( ','.join( [ 'SiPixelGenErrorDBObject_phase2_IT_v6.1.5_25x100_v3_mc',SiPixelGenErrorRecord,connectionString, "", "2021-01-27 10:00:00"] ), ), # cell is 25um (local-x) x 100um (local-y) , VBias=350V
'T22' : ( ','.join( [ 'SiPixelGenErrorDBObject_phase2_IT_v6.1.5_50x50_v5_mc' ,SiPixelGenErrorRecord,connectionString, "", "2021-01-27 10:00:00"] ), ), # cell is 50um (local-x) x 50um (local-y) , VBias=350V
}

allTags["Template"] = {
'T15' : ( ','.join( [ 'SiPixelTemplateDBObject_phase2_IT_v6.1.5_25x100_v2_mc',SiPixelTemplatesRecord,connectionString, "", "2020-10-16 10:00:00"] ), ), # cell is 25um (local-x) x 100um (local-y) , VBias=350V
'T21' : ( ','.join( [ 'SiPixelTemplateDBObject_phase2_IT_v6.1.5_25x100_v2_mc',SiPixelTemplatesRecord,connectionString, "", "2020-10-16 10:00:00"] ), ), # cell is 25um (local-x) x 100um (local-y) , VBias=350V
'T22' : ( ','.join( [ 'SiPixelTemplateDBObject_phase2_IT_v6.1.5_50x50_v4_mc' ,SiPixelTemplatesRecord,connectionString, "", "2020-10-19 23:00:00"] ), ), # cell is 50um (local-x) x 50um (local-y) , VBias=350V
'T15' : ( ','.join( [ 'SiPixelTemplateDBObject_phase2_IT_v6.1.5_25x100_v3_mc',SiPixelTemplatesRecord,connectionString, "", "2021-01-27 10:00:00"] ), ), # cell is 25um (local-x) x 100um (local-y) , VBias=350V
'T21' : ( ','.join( [ 'SiPixelTemplateDBObject_phase2_IT_v6.1.5_25x100_v3_mc',SiPixelTemplatesRecord,connectionString, "", "2021-01-27 10:00:00"] ), ), # cell is 25um (local-x) x 100um (local-y) , VBias=350V
'T22' : ( ','.join( [ 'SiPixelTemplateDBObject_phase2_IT_v6.1.5_50x50_v5_mc' ,SiPixelTemplatesRecord,connectionString, "", "2021-01-27 10:00:00"] ), ), # cell is 50um (local-x) x 50um (local-y) , VBias=350V
}

##
Expand Down
6 changes: 6 additions & 0 deletions Configuration/Eras/python/Era_Phase2C11T22_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import FWCore.ParameterSet.Config as cms

from Configuration.Eras.Era_Phase2C11_cff import Phase2C11
from Configuration.Eras.Modifier_phase2_squarePixels_cff import phase2_squarePixels

Phase2C11T22 = cms.ModifierChain(Phase2C11, phase2_squarePixels)
6 changes: 6 additions & 0 deletions Configuration/Eras/python/Era_Phase2C11T23_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import FWCore.ParameterSet.Config as cms

from Configuration.Eras.Era_Phase2C11_cff import Phase2C11
from Configuration.Eras.Modifier_phase2_3DPixels_cff import phase2_3DPixels

Phase2C11T23 = cms.ModifierChain(Phase2C11, phase2_3DPixels)
3 changes: 3 additions & 0 deletions Configuration/Eras/python/Modifier_phase2_3DPixels_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import FWCore.ParameterSet.Config as cms

phase2_3DPixels = cms.Modifier()
3 changes: 3 additions & 0 deletions Configuration/Eras/python/Modifier_phase2_squarePixels_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import FWCore.ParameterSet.Config as cms

phase2_squarePixels = cms.Modifier()
4 changes: 2 additions & 2 deletions Configuration/Geometry/python/dict2026Geometry.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@
'from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *',
'trackerGeometry.applyAlignment = cms.bool(False)',
],
"era" : "phase2_tracker, trackingPhase2PU140",
"era" : "phase2_tracker, phase2_squarePixels, trackingPhase2PU140",
},
"T23" : {
1 : [
Expand Down Expand Up @@ -255,7 +255,7 @@
'from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *',
'trackerGeometry.applyAlignment = cms.bool(False)',
],
"era" : "phase2_tracker, trackingPhase2PU140",
"era" : "phase2_tracker, phase2_3DPixels, trackingPhase2PU140",
}
}

Expand Down
2 changes: 1 addition & 1 deletion ...iers/python/phase2_PixelCPEGeneric_cff.py → ...ssModifiers/python/PixelCPEGeneric_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import FWCore.ParameterSet.Config as cms

# This modifier is to run the Pixel Generic CPE algorithm in Phase-2 workflows
phase2_PixelCPEGeneric = cms.Modifier()
PixelCPEGeneric = cms.Modifier()
13 changes: 7 additions & 6 deletions Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1069,18 +1069,19 @@ def condition(self, fragment, stepList, key, hasHarvest):
'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal'],
},
'2026D64' : {
'Geom' : 'Extended2026D64', # N.B.: Geometry with square 50x50 um2 pixels in the Inner Tracker.
'Geom' : 'Extended2026D64', # N.B.: Geometry with square 50x50 um2 pixels in the Inner Tracker.
'HLTmenu': '@fake2',
'GT' : 'auto:phase2_realistic_T22',
'Era' : 'Phase2C11',
'ProcessModifier': 'PixelCPEGeneric', # This swaps template reco CPE for generic reco CPE
'Era' : 'Phase2C11T22', # customized for square pixels
'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal'],
},
'2026D65' : {
'Geom' : 'Extended2026D65', # N.B.: Geometry with 3D pixels in the Inner Tracker.
'Geom' : 'Extended2026D65', # N.B.: Geometry with 3D pixels in the Inner Tracker.
'HLTmenu': '@fake2',
'GT' : 'auto:phase2_realistic_T23', # This symbolic GT has no pixel template / GenError informations.
'ProcessModifier': 'phase2_PixelCPEGeneric', # This modifier removes all need for IT template information. DO NOT USE for standard planar sensors.
'Era' : 'Phase2C11',
'GT' : 'auto:phase2_realistic_T23', # This symbolic GT has no pixel template / GenError informations.
'ProcessModifier': 'PixelCPEGeneric', # This swaps template reco CPE for generic reco CPE
'Era' : 'Phase2C11T23', # customizes for 3D Pixels
'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal'],
},
'2026D66' : {
Expand Down
3 changes: 3 additions & 0 deletions Configuration/StandardSequences/python/Eras.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ def __init__(self):
'Phase2C10_dd4hep',
'Phase2C11_dd4hep',
'Phase2C11_etlV4',
'Phase2C11T22',
'Phase2C11T23',
'Phase2C12_dd4hep',
'Phase2C11M9',
]
Expand All @@ -61,6 +63,7 @@ def __init__(self):
'phase2_hgcal', 'phase2_timing', 'phase2_hfnose', 'phase2_hgcalV10', 'phase2_hgcalV11', 'phase2_hgcalV12',
'phase2_timing_layer', 'phase2_hcal', 'phase2_ecal','phase2_ecal_devel',
'phase2_trigger',
'phase2_squarePixels', 'phase2_3DPixels',
'trackingLowPU', 'trackingPhase1', 'ctpps_2016', 'ctpps_2017', 'ctpps_2018', 'ctpps_2021', '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
22 changes: 15 additions & 7 deletions RecoLocalTracker/SiPixelRecHits/python/PixelCPEGeneric_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
from Configuration.Eras.Modifier_run3_common_cff import run3_common
run3_common.toModify(PixelCPEGenericESProducer, IrradiationBiasCorrection = True)


# customize the Pixel CPE generic producer for phase2
from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker
phase2_tracker.toModify(PixelCPEGenericESProducer,
Expand All @@ -21,10 +20,19 @@
Upgrade = True # use 'upgrade' version of hardcoded CPE errors
)

# customize the Pixel CPE generic producer for phase2 3D pixels
# Will remove any usage of template / genError payloads from the reconstruction
from Configuration.Eras.Modifier_phase2_3DPixels_cff import phase2_3DPixels
(phase2_tracker & phase2_3DPixels).toModify(PixelCPEGenericESProducer,
UseErrorsFromTemplates = False, # no GenErrors
LoadTemplatesFromDB = False, # do not load templates
)

# customize the Pixel CPE generic producer in order not to use any template information
from Configuration.ProcessModifiers.phase2_PixelCPEGeneric_cff import phase2_PixelCPEGeneric
phase2_PixelCPEGeneric.toModify(PixelCPEGenericESProducer,
UseErrorsFromTemplates = False, # no GenErrors
LoadTemplatesFromDB = False, # do not load templates
)
# customize the Pixel CPE generic producer for phase2 square pixels
# Do use Template errors for square pixels even in the first tracking step
# This is needed because hardcoded errors in https://github.com/cms-sw/cmssw/blob/master/RecoLocalTracker/SiPixelRecHits/src/PixelCPEGeneric.cc#L113
# have been optimized for rectangular 25x100 pixels, and in the current generic reco setup we use hardcoded errors for the first tracking pass
from Configuration.Eras.Modifier_phase2_squarePixels_cff import phase2_squarePixels
(phase2_tracker & phase2_squarePixels).toModify(PixelCPEGenericESProducer,
NoTemplateErrorsWhenNoTrkAngles = False # use genErrors in the seeding step (when no track angles are available)
)
4 changes: 2 additions & 2 deletions RecoTracker/TransientTrackingRecHit/python/TTRHBuilderWithTemplate_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@
phase1Pixel.toModify(TTRHBuilderAngleAndTemplate, PixelCPE = 'PixelCPEClusterRepair')

# Turn off template reco for phase 2 (when not supported)
from Configuration.ProcessModifiers.phase2_PixelCPEGeneric_cff import phase2_PixelCPEGeneric
phase2_PixelCPEGeneric.toModify(TTRHBuilderAngleAndTemplate, PixelCPE = 'PixelCPEGeneric')
from Configuration.ProcessModifiers.PixelCPEGeneric_cff import PixelCPEGeneric
PixelCPEGeneric.toModify(TTRHBuilderAngleAndTemplate, PixelCPE = 'PixelCPEGeneric')
4 changes: 2 additions & 2 deletions SimTracker/SiPhase2Digitizer/test/PixelTestBeamValidator_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import FWCore.ParameterSet.Config as cms

from Configuration.Eras.Era_Phase2C9_cff import Phase2C9
from Configuration.ProcessModifiers.phase2_PixelCPEGeneric_cff import phase2_PixelCPEGeneric
from Configuration.ProcessModifiers.PixelCPEGeneric_cff import PixelCPEGeneric

process = cms.Process('digiTest',Phase2C9,phase2_PixelCPEGeneric)
process = cms.Process('digiTest',Phase2C9,PixelCPEGeneric)

import FWCore.ParameterSet.VarParsing as VarParsing
options = VarParsing.VarParsing ("analysis")
Expand Down