Skip to content

Commit 38e3ea5

Browse files
cmsbuildcmsbuild
authored
Merge pull request #47383 from trackreco/mkFitPhase2Enable
Enable mkFit initialStep for track building in phase-2 era, and introduce noMkFit phase-2 era(s)
2 parents 99e7e8a + 2cc100f commit 38e3ea5

20 files changed

+131
-2
lines changed

‎Configuration/Eras/python/Era_Phase2C10_dd4hep_noMkFit_cff.py

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
import FWCore.ParameterSet.Config as cms
2+
3+
from Configuration.Eras.Era_Phase2C10_dd4hep_cff import Phase2C10_dd4hep
4+
from Configuration.Eras.ModifierChain_trackingMkFitProd_cff import trackingMkFitProdPhase2
5+
6+
Phase2C10_dd4hep_noMkFit = cms.ModifierChain(Phase2C10_dd4hep.copyAndExclude([trackingMkFitProdPhase2]))

‎Configuration/Eras/python/Era_Phase2C10_noMkFit_cff.py

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
import FWCore.ParameterSet.Config as cms
2+
3+
from Configuration.Eras.Era_Phase2C10_cff import Phase2C10
4+
from Configuration.Eras.ModifierChain_trackingMkFitProd_cff import trackingMkFitProdPhase2
5+
6+
Phase2C10_noMkFit = cms.ModifierChain(Phase2C10.copyAndExclude([trackingMkFitProdPhase2]))
7+

‎Configuration/Eras/python/Era_Phase2C11I13M9_noMkFit_cff.py

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
import FWCore.ParameterSet.Config as cms
2+
3+
from Configuration.Eras.Era_Phase2C11I13M9_cff import Phase2C11I13M9
4+
from Configuration.Eras.ModifierChain_trackingMkFitProd_cff import trackingMkFitProdPhase2
5+
6+
Phase2C11I13M9_noMkFit = cms.ModifierChain(Phase2C11I13M9.copyAndExclude([trackingMkFitProdPhase2]))

‎Configuration/Eras/python/Era_Phase2C11I13T25M9_noMkFit_cff.py

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
import FWCore.ParameterSet.Config as cms
2+
3+
from Configuration.Eras.Era_Phase2C11I13T25M9_cff import Phase2C11I13T25M9
4+
from Configuration.Eras.ModifierChain_trackingMkFitProd_cff import trackingMkFitProdPhase2
5+
6+
Phase2C11I13T25M9_noMkFit = cms.ModifierChain(Phase2C11I13T25M9.copyAndExclude([trackingMkFitProdPhase2]))

‎Configuration/Eras/python/Era_Phase2C11I13T26M9_noMkFit_cff.py

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
import FWCore.ParameterSet.Config as cms
2+
3+
from Configuration.Eras.Era_Phase2C11I13T26M9_cff import Phase2C11I13T26M9
4+
from Configuration.Eras.ModifierChain_trackingMkFitProd_cff import trackingMkFitProdPhase2
5+
6+
Phase2C11I13T26M9_noMkFit = cms.ModifierChain(Phase2C11I13T26M9.copyAndExclude([trackingMkFitProdPhase2]))

‎Configuration/Eras/python/Era_Phase2C11I13_noMkFit_cff.py

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
import FWCore.ParameterSet.Config as cms
2+
3+
from Configuration.Eras.Era_Phase2C11I13_cff import Phase2C11I13
4+
from Configuration.Eras.ModifierChain_trackingMkFitProd_cff import trackingMkFitProdPhase2
5+
6+
Phase2C11I13_noMkFit = cms.ModifierChain(Phase2C11I13.copyAndExclude([trackingMkFitProdPhase2]))

‎Configuration/Eras/python/Era_Phase2C11M9_noMkFit_cff.py

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
import FWCore.ParameterSet.Config as cms
2+
3+
from Configuration.Eras.Era_Phase2C11M9_cff import Phase2C11M9
4+
from Configuration.Eras.ModifierChain_trackingMkFitProd_cff import trackingMkFitProdPhase2
5+
6+
Phase2C11M9_noMkFit = cms.ModifierChain(Phase2C11M9.copyAndExclude([trackingMkFitProdPhase2]))

‎Configuration/Eras/python/Era_Phase2C11_dd4hep_noMkFit_cff.py

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
import FWCore.ParameterSet.Config as cms
2+
3+
from Configuration.Eras.Era_Phase2C11_dd4hep_cff import Phase2C11_dd4hep
4+
from Configuration.Eras.ModifierChain_trackingMkFitProd_cff import trackingMkFitProdPhase2
5+
6+
Phase2C11_dd4hep_noMkFit = cms.ModifierChain(Phase2C11_dd4hep.copyAndExclude([trackingMkFitProdPhase2]))

‎Configuration/Eras/python/Era_Phase2C11_noMkFit_cff.py

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
import FWCore.ParameterSet.Config as cms
2+
3+
from Configuration.Eras.Era_Phase2C11_cff import Phase2C11
4+
from Configuration.Eras.ModifierChain_trackingMkFitProd_cff import trackingMkFitProdPhase2
5+
6+
Phase2C11_noMkFit = cms.ModifierChain(Phase2C11.copyAndExclude([trackingMkFitProdPhase2]))
7+

‎Configuration/Eras/python/Era_Phase2C12_dd4hep_noMkFit_cff.py

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
import FWCore.ParameterSet.Config as cms
2+
3+
from Configuration.Eras.Era_Phase2C12_dd4hep_cff import Phase2C12_dd4hep
4+
from Configuration.Eras.ModifierChain_trackingMkFitProd_cff import trackingMkFitProdPhase2
5+
6+
Phase2C12_dd4hep_noMkFit = cms.ModifierChain(Phase2C12_dd4hep.copyAndExclude([trackingMkFitProdPhase2]))

‎Configuration/Eras/python/Era_Phase2C12_noMkFit_cff.py

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
import FWCore.ParameterSet.Config as cms
2+
3+
from Configuration.Eras.Era_Phase2C12_cff import Phase2C12
4+
from Configuration.Eras.ModifierChain_trackingMkFitProd_cff import trackingMkFitProdPhase2
5+
6+
Phase2C12_noMkFit = cms.ModifierChain(Phase2C12.copyAndExclude([trackingMkFitProdPhase2]))
7+

‎Configuration/Eras/python/Era_Phase2C17I13M9_noMkFit_cff.py

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
import FWCore.ParameterSet.Config as cms
2+
3+
from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9
4+
from Configuration.Eras.ModifierChain_trackingMkFitProd_cff import trackingMkFitProdPhase2
5+
6+
Phase2C17I13M9_noMkFit = cms.ModifierChain(Phase2C17I13M9.copyAndExclude([trackingMkFitProdPhase2]))

‎Configuration/Eras/python/Era_Phase2C20I13M9_noMkFit_cff.py

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
import FWCore.ParameterSet.Config as cms
2+
3+
from Configuration.Eras.Era_Phase2C20I13M9_cff import Phase2C20I13M9
4+
from Configuration.Eras.ModifierChain_trackingMkFitProd_cff import trackingMkFitProdPhase2
5+
6+
Phase2C20I13M9_noMkFit = cms.ModifierChain(Phase2C20I13M9.copyAndExclude([trackingMkFitProdPhase2]))

‎Configuration/Eras/python/Era_Phase2C22I13M9_noMkFit_cff.py

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
import FWCore.ParameterSet.Config as cms
2+
3+
from Configuration.Eras.Era_Phase2C22I13M9_cff import Phase2C22I13M9
4+
from Configuration.Eras.ModifierChain_trackingMkFitProd_cff import trackingMkFitProdPhase2
5+
6+
Phase2C22I13M9_noMkFit = cms.ModifierChain(Phase2C22I13M9.copyAndExclude([trackingMkFitProdPhase2]))

‎Configuration/Eras/python/Era_Phase2C9_dd4hep_noMkFit_cff.py

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
import FWCore.ParameterSet.Config as cms
2+
3+
from Configuration.Eras.Era_Phase2C9_dd4hep_cff import Phase2C9_dd4hep
4+
from Configuration.Eras.ModifierChain_trackingMkFitProd_cff import trackingMkFitProdPhase2
5+
6+
Phase2C9_dd4hep_noMkFit = cms.ModifierChain(Phase2C9_dd4hep.copyAndExclude([trackingMkFitProdPhase2]))

‎Configuration/Eras/python/Era_Phase2C9_noMkFit_cff.py

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
import FWCore.ParameterSet.Config as cms
2+
3+
from Configuration.Eras.Era_Phase2C9_cff import Phase2C9
4+
from Configuration.Eras.ModifierChain_trackingMkFitProd_cff import trackingMkFitProdPhase2
5+
6+
Phase2C9_noMkFit = cms.ModifierChain(Phase2C9.copyAndExclude([trackingMkFitProdPhase2]))
7+

‎Configuration/Eras/python/Era_Phase2_cff.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
from Configuration.Eras.Modifier_phase2_trigger_cff import phase2_trigger
2020
from Configuration.Eras.Modifier_ctpps_2022_cff import ctpps_2022
2121
from Configuration.ProcessModifiers.dd4hep_cff import dd4hep
22+
from Configuration.Eras.ModifierChain_trackingMkFitProd_cff import trackingMkFitProdPhase2
2223

2324
Phase2 = cms.ModifierChain(Run3_noMkFit.copyAndExclude([phase1Pixel,trackingPhase1,seedingDeepCore,displacedRegionalTracking,ctpps_2022,dd4hep]),
24-
phase2_common, phase2_tracker, trackingPhase2PU140, phase2_ecal, phase2_hcal, phase2_hgcal, phase2_muon, phase2_GEM, hcalHardcodeConditions, phase2_timing, phase2_timing_layer, phase2_trigger)
25+
phase2_common, phase2_tracker, trackingPhase2PU140, phase2_ecal, phase2_hcal, phase2_hgcal, phase2_muon, phase2_GEM, hcalHardcodeConditions, phase2_timing, phase2_timing_layer, phase2_trigger, trackingMkFitProdPhase2)

‎Configuration/Eras/python/Era_Phase2_noMkFit_cff.py

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
import FWCore.ParameterSet.Config as cms
2+
3+
from Configuration.Eras.Era_Phase2_cff import Phase2
4+
from Configuration.Eras.ModifierChain_trackingMkFitProd_cff import trackingMkFitProdPhase2
5+
6+
Phase2_noMkFit = cms.ModifierChain(Phase2.copyAndExclude([trackingMkFitProdPhase2]))

‎Configuration/Eras/python/ModifierChain_trackingMkFitProd_cff.py

+5
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,8 @@
1818
trackingMkFitDetachedTripletStep,
1919
trackingMkFitPixelLessStep,
2020
)
21+
22+
trackingMkFitProdPhase2 = cms.ModifierChain(
23+
trackingMkFitCommon,
24+
trackingMkFitInitialStep,
25+
)

‎Configuration/StandardSequences/python/Eras.py

+18-1
Original file line numberDiff line numberDiff line change
@@ -55,22 +55,39 @@ def __init__(self):
5555
'Run3_2025_UPC',
5656
'Run3_2025_OXY',
5757
'Phase2',
58+
'Phase2_noMkFit',
5859
'Phase2C9',
60+
'Phase2C9_noMkFit',
5961
'Phase2C10',
62+
'Phase2C10_noMkFit',
6063
'Phase2C11',
64+
'Phase2C11_noMkFit',
6165
'Phase2C12',
66+
'Phase2C12_noMkFit',
6267
'Phase2C9_dd4hep',
68+
'Phase2C9_dd4hep_noMkFit',
6369
'Phase2C10_dd4hep',
70+
'Phase2C10_dd4hep_noMkFit',
6471
'Phase2C11_dd4hep',
72+
'Phase2C11_dd4hep_noMkFit',
6573
'Phase2C11I13',
74+
'Phase2C11I13_noMkFit',
6675
'Phase2C12_dd4hep',
76+
'Phase2C12_dd4hep_noMkFit',
6777
'Phase2C11M9',
78+
'Phase2C11M9_noMkFit',
6879
'Phase2C11I13M9',
80+
'Phase2C11I13M9_noMkFit',
6981
'Phase2C11I13T25M9',
82+
'Phase2C11I13T25M9_noMkFit',
7083
'Phase2C11I13T26M9',
84+
'Phase2C11I13T26M9_noMkFit',
7185
'Phase2C17I13M9',
86+
'Phase2C17I13M9_noMkFit',
7287
'Phase2C20I13M9',
73-
'Phase2C22I13M9'
88+
'Phase2C20I13M9_noMkFit',
89+
'Phase2C22I13M9',
90+
'Phase2C22I13M9_noMkFit'
7491
]
7592

7693
internalUseMods = ['run2_common', 'run2_25ns_specific',

0 commit comments

Comments
 (0)