Skip to content
New issue

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

#

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

Already on GitHub? # to your account

Enable mkFit initialStep for track building in phase-2 era, and introduce noMkFit phase-2 era(s) #47383

Merged
merged 1 commit into from
Feb 21, 2025
Merged

Enable mkFit initialStep for track building in phase-2 era, and introduce noMkFit phase-2 era(s) #47383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions Configuration/Eras/python/Era_Phase2C10_dd4hep_noMkFit_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_Phase2C10_dd4hep_cff import Phase2C10_dd4hep
from Configuration.Eras.ModifierChain_trackingMkFitProd_cff import trackingMkFitProdPhase2

Phase2C10_dd4hep_noMkFit = cms.ModifierChain(Phase2C10_dd4hep.copyAndExclude([trackingMkFitProdPhase2]))
7 changes: 7 additions & 0 deletions Configuration/Eras/python/Era_Phase2C10_noMkFit_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import FWCore.ParameterSet.Config as cms

from Configuration.Eras.Era_Phase2C10_cff import Phase2C10
from Configuration.Eras.ModifierChain_trackingMkFitProd_cff import trackingMkFitProdPhase2

Phase2C10_noMkFit = cms.ModifierChain(Phase2C10.copyAndExclude([trackingMkFitProdPhase2]))

6 changes: 6 additions & 0 deletions Configuration/Eras/python/Era_Phase2C11I13M9_noMkFit_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_Phase2C11I13M9_cff import Phase2C11I13M9
from Configuration.Eras.ModifierChain_trackingMkFitProd_cff import trackingMkFitProdPhase2

Phase2C11I13M9_noMkFit = cms.ModifierChain(Phase2C11I13M9.copyAndExclude([trackingMkFitProdPhase2]))
6 changes: 6 additions & 0 deletions Configuration/Eras/python/Era_Phase2C11I13T25M9_noMkFit_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_Phase2C11I13T25M9_cff import Phase2C11I13T25M9
from Configuration.Eras.ModifierChain_trackingMkFitProd_cff import trackingMkFitProdPhase2

Phase2C11I13T25M9_noMkFit = cms.ModifierChain(Phase2C11I13T25M9.copyAndExclude([trackingMkFitProdPhase2]))
6 changes: 6 additions & 0 deletions Configuration/Eras/python/Era_Phase2C11I13T26M9_noMkFit_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_Phase2C11I13T26M9_cff import Phase2C11I13T26M9
from Configuration.Eras.ModifierChain_trackingMkFitProd_cff import trackingMkFitProdPhase2

Phase2C11I13T26M9_noMkFit = cms.ModifierChain(Phase2C11I13T26M9.copyAndExclude([trackingMkFitProdPhase2]))
6 changes: 6 additions & 0 deletions Configuration/Eras/python/Era_Phase2C11I13_noMkFit_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_Phase2C11I13_cff import Phase2C11I13
from Configuration.Eras.ModifierChain_trackingMkFitProd_cff import trackingMkFitProdPhase2

Phase2C11I13_noMkFit = cms.ModifierChain(Phase2C11I13.copyAndExclude([trackingMkFitProdPhase2]))
6 changes: 6 additions & 0 deletions Configuration/Eras/python/Era_Phase2C11M9_noMkFit_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_Phase2C11M9_cff import Phase2C11M9
from Configuration.Eras.ModifierChain_trackingMkFitProd_cff import trackingMkFitProdPhase2

Phase2C11M9_noMkFit = cms.ModifierChain(Phase2C11M9.copyAndExclude([trackingMkFitProdPhase2]))
6 changes: 6 additions & 0 deletions Configuration/Eras/python/Era_Phase2C11_dd4hep_noMkFit_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_dd4hep_cff import Phase2C11_dd4hep
from Configuration.Eras.ModifierChain_trackingMkFitProd_cff import trackingMkFitProdPhase2

Phase2C11_dd4hep_noMkFit = cms.ModifierChain(Phase2C11_dd4hep.copyAndExclude([trackingMkFitProdPhase2]))
7 changes: 7 additions & 0 deletions Configuration/Eras/python/Era_Phase2C11_noMkFit_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import FWCore.ParameterSet.Config as cms

from Configuration.Eras.Era_Phase2C11_cff import Phase2C11
from Configuration.Eras.ModifierChain_trackingMkFitProd_cff import trackingMkFitProdPhase2

Phase2C11_noMkFit = cms.ModifierChain(Phase2C11.copyAndExclude([trackingMkFitProdPhase2]))

6 changes: 6 additions & 0 deletions Configuration/Eras/python/Era_Phase2C12_dd4hep_noMkFit_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_Phase2C12_dd4hep_cff import Phase2C12_dd4hep
from Configuration.Eras.ModifierChain_trackingMkFitProd_cff import trackingMkFitProdPhase2

Phase2C12_dd4hep_noMkFit = cms.ModifierChain(Phase2C12_dd4hep.copyAndExclude([trackingMkFitProdPhase2]))
7 changes: 7 additions & 0 deletions Configuration/Eras/python/Era_Phase2C12_noMkFit_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import FWCore.ParameterSet.Config as cms

from Configuration.Eras.Era_Phase2C12_cff import Phase2C12
from Configuration.Eras.ModifierChain_trackingMkFitProd_cff import trackingMkFitProdPhase2

Phase2C12_noMkFit = cms.ModifierChain(Phase2C12.copyAndExclude([trackingMkFitProdPhase2]))

6 changes: 6 additions & 0 deletions Configuration/Eras/python/Era_Phase2C17I13M9_noMkFit_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_Phase2C17I13M9_cff import Phase2C17I13M9
from Configuration.Eras.ModifierChain_trackingMkFitProd_cff import trackingMkFitProdPhase2

Phase2C17I13M9_noMkFit = cms.ModifierChain(Phase2C17I13M9.copyAndExclude([trackingMkFitProdPhase2]))
6 changes: 6 additions & 0 deletions Configuration/Eras/python/Era_Phase2C20I13M9_noMkFit_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_Phase2C20I13M9_cff import Phase2C20I13M9
from Configuration.Eras.ModifierChain_trackingMkFitProd_cff import trackingMkFitProdPhase2

Phase2C20I13M9_noMkFit = cms.ModifierChain(Phase2C20I13M9.copyAndExclude([trackingMkFitProdPhase2]))
6 changes: 6 additions & 0 deletions Configuration/Eras/python/Era_Phase2C22I13M9_noMkFit_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_Phase2C22I13M9_cff import Phase2C22I13M9
from Configuration.Eras.ModifierChain_trackingMkFitProd_cff import trackingMkFitProdPhase2

Phase2C22I13M9_noMkFit = cms.ModifierChain(Phase2C22I13M9.copyAndExclude([trackingMkFitProdPhase2]))
6 changes: 6 additions & 0 deletions Configuration/Eras/python/Era_Phase2C9_dd4hep_noMkFit_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_Phase2C9_dd4hep_cff import Phase2C9_dd4hep
from Configuration.Eras.ModifierChain_trackingMkFitProd_cff import trackingMkFitProdPhase2

Phase2C9_dd4hep_noMkFit = cms.ModifierChain(Phase2C9_dd4hep.copyAndExclude([trackingMkFitProdPhase2]))
7 changes: 7 additions & 0 deletions Configuration/Eras/python/Era_Phase2C9_noMkFit_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import FWCore.ParameterSet.Config as cms

from Configuration.Eras.Era_Phase2C9_cff import Phase2C9
from Configuration.Eras.ModifierChain_trackingMkFitProd_cff import trackingMkFitProdPhase2

Phase2C9_noMkFit = cms.ModifierChain(Phase2C9.copyAndExclude([trackingMkFitProdPhase2]))

3 changes: 2 additions & 1 deletion Configuration/Eras/python/Era_Phase2_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
from Configuration.Eras.Modifier_phase2_trigger_cff import phase2_trigger
from Configuration.Eras.Modifier_ctpps_2022_cff import ctpps_2022
from Configuration.ProcessModifiers.dd4hep_cff import dd4hep
from Configuration.Eras.ModifierChain_trackingMkFitProd_cff import trackingMkFitProdPhase2

Phase2 = cms.ModifierChain(Run3_noMkFit.copyAndExclude([phase1Pixel,trackingPhase1,seedingDeepCore,displacedRegionalTracking,ctpps_2022,dd4hep]),
phase2_common, phase2_tracker, trackingPhase2PU140, phase2_ecal, phase2_hcal, phase2_hgcal, phase2_muon, phase2_GEM, hcalHardcodeConditions, phase2_timing, phase2_timing_layer, phase2_trigger)
phase2_common, phase2_tracker, trackingPhase2PU140, phase2_ecal, phase2_hcal, phase2_hgcal, phase2_muon, phase2_GEM, hcalHardcodeConditions, phase2_timing, phase2_timing_layer, phase2_trigger, trackingMkFitProdPhase2)
6 changes: 6 additions & 0 deletions Configuration/Eras/python/Era_Phase2_noMkFit_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_Phase2_cff import Phase2
from Configuration.Eras.ModifierChain_trackingMkFitProd_cff import trackingMkFitProdPhase2

Phase2_noMkFit = cms.ModifierChain(Phase2.copyAndExclude([trackingMkFitProdPhase2]))
5 changes: 5 additions & 0 deletions Configuration/Eras/python/ModifierChain_trackingMkFitProd_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,8 @@
trackingMkFitDetachedTripletStep,
trackingMkFitPixelLessStep,
)

trackingMkFitProdPhase2 = cms.ModifierChain(
trackingMkFitCommon,
trackingMkFitInitialStep,
)
19 changes: 18 additions & 1 deletion Configuration/StandardSequences/python/Eras.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,22 +55,39 @@ def __init__(self):
'Run3_2025_UPC',
'Run3_2025_OXY',
'Phase2',
'Phase2_noMkFit',
'Phase2C9',
'Phase2C9_noMkFit',
'Phase2C10',
'Phase2C10_noMkFit',
'Phase2C11',
'Phase2C11_noMkFit',
'Phase2C12',
'Phase2C12_noMkFit',
'Phase2C9_dd4hep',
'Phase2C9_dd4hep_noMkFit',
'Phase2C10_dd4hep',
'Phase2C10_dd4hep_noMkFit',
'Phase2C11_dd4hep',
'Phase2C11_dd4hep_noMkFit',
'Phase2C11I13',
'Phase2C11I13_noMkFit',
'Phase2C12_dd4hep',
'Phase2C12_dd4hep_noMkFit',
'Phase2C11M9',
'Phase2C11M9_noMkFit',
'Phase2C11I13M9',
'Phase2C11I13M9_noMkFit',
'Phase2C11I13T25M9',
'Phase2C11I13T25M9_noMkFit',
'Phase2C11I13T26M9',
'Phase2C11I13T26M9_noMkFit',
'Phase2C17I13M9',
'Phase2C17I13M9_noMkFit',
'Phase2C20I13M9',
'Phase2C22I13M9'
'Phase2C20I13M9_noMkFit',
'Phase2C22I13M9',
'Phase2C22I13M9_noMkFit'
]

internalUseMods = ['run2_common', 'run2_25ns_specific',
Expand Down