diff --git a/Configuration/Eras/python/Era_Phase2C10_dd4hep_noMkFit_cff.py b/Configuration/Eras/python/Era_Phase2C10_dd4hep_noMkFit_cff.py new file mode 100644 index 0000000000000..98fea8c65d154 --- /dev/null +++ b/Configuration/Eras/python/Era_Phase2C10_dd4hep_noMkFit_cff.py @@ -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])) diff --git a/Configuration/Eras/python/Era_Phase2C10_noMkFit_cff.py b/Configuration/Eras/python/Era_Phase2C10_noMkFit_cff.py new file mode 100644 index 0000000000000..092578c6a5b3d --- /dev/null +++ b/Configuration/Eras/python/Era_Phase2C10_noMkFit_cff.py @@ -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])) + diff --git a/Configuration/Eras/python/Era_Phase2C11I13M9_noMkFit_cff.py b/Configuration/Eras/python/Era_Phase2C11I13M9_noMkFit_cff.py new file mode 100644 index 0000000000000..8aec59373802f --- /dev/null +++ b/Configuration/Eras/python/Era_Phase2C11I13M9_noMkFit_cff.py @@ -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])) diff --git a/Configuration/Eras/python/Era_Phase2C11I13T25M9_noMkFit_cff.py b/Configuration/Eras/python/Era_Phase2C11I13T25M9_noMkFit_cff.py new file mode 100644 index 0000000000000..a70311a764cfa --- /dev/null +++ b/Configuration/Eras/python/Era_Phase2C11I13T25M9_noMkFit_cff.py @@ -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])) diff --git a/Configuration/Eras/python/Era_Phase2C11I13T26M9_noMkFit_cff.py b/Configuration/Eras/python/Era_Phase2C11I13T26M9_noMkFit_cff.py new file mode 100644 index 0000000000000..17ded9427b21e --- /dev/null +++ b/Configuration/Eras/python/Era_Phase2C11I13T26M9_noMkFit_cff.py @@ -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])) diff --git a/Configuration/Eras/python/Era_Phase2C11I13_noMkFit_cff.py b/Configuration/Eras/python/Era_Phase2C11I13_noMkFit_cff.py new file mode 100644 index 0000000000000..c08d5338cf4ca --- /dev/null +++ b/Configuration/Eras/python/Era_Phase2C11I13_noMkFit_cff.py @@ -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])) diff --git a/Configuration/Eras/python/Era_Phase2C11M9_noMkFit_cff.py b/Configuration/Eras/python/Era_Phase2C11M9_noMkFit_cff.py new file mode 100644 index 0000000000000..990ff48ee2db7 --- /dev/null +++ b/Configuration/Eras/python/Era_Phase2C11M9_noMkFit_cff.py @@ -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])) diff --git a/Configuration/Eras/python/Era_Phase2C11_dd4hep_noMkFit_cff.py b/Configuration/Eras/python/Era_Phase2C11_dd4hep_noMkFit_cff.py new file mode 100644 index 0000000000000..13561dbbc8ed2 --- /dev/null +++ b/Configuration/Eras/python/Era_Phase2C11_dd4hep_noMkFit_cff.py @@ -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])) diff --git a/Configuration/Eras/python/Era_Phase2C11_noMkFit_cff.py b/Configuration/Eras/python/Era_Phase2C11_noMkFit_cff.py new file mode 100644 index 0000000000000..85c748b139267 --- /dev/null +++ b/Configuration/Eras/python/Era_Phase2C11_noMkFit_cff.py @@ -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])) + diff --git a/Configuration/Eras/python/Era_Phase2C12_dd4hep_noMkFit_cff.py b/Configuration/Eras/python/Era_Phase2C12_dd4hep_noMkFit_cff.py new file mode 100644 index 0000000000000..458fd89eb68d6 --- /dev/null +++ b/Configuration/Eras/python/Era_Phase2C12_dd4hep_noMkFit_cff.py @@ -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])) diff --git a/Configuration/Eras/python/Era_Phase2C12_noMkFit_cff.py b/Configuration/Eras/python/Era_Phase2C12_noMkFit_cff.py new file mode 100644 index 0000000000000..7ed99fa26940a --- /dev/null +++ b/Configuration/Eras/python/Era_Phase2C12_noMkFit_cff.py @@ -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])) + diff --git a/Configuration/Eras/python/Era_Phase2C17I13M9_noMkFit_cff.py b/Configuration/Eras/python/Era_Phase2C17I13M9_noMkFit_cff.py new file mode 100644 index 0000000000000..2c41046bbf27a --- /dev/null +++ b/Configuration/Eras/python/Era_Phase2C17I13M9_noMkFit_cff.py @@ -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])) diff --git a/Configuration/Eras/python/Era_Phase2C20I13M9_noMkFit_cff.py b/Configuration/Eras/python/Era_Phase2C20I13M9_noMkFit_cff.py new file mode 100644 index 0000000000000..b8089e6593480 --- /dev/null +++ b/Configuration/Eras/python/Era_Phase2C20I13M9_noMkFit_cff.py @@ -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])) diff --git a/Configuration/Eras/python/Era_Phase2C22I13M9_noMkFit_cff.py b/Configuration/Eras/python/Era_Phase2C22I13M9_noMkFit_cff.py new file mode 100644 index 0000000000000..c0f8cffd6590e --- /dev/null +++ b/Configuration/Eras/python/Era_Phase2C22I13M9_noMkFit_cff.py @@ -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])) diff --git a/Configuration/Eras/python/Era_Phase2C9_dd4hep_noMkFit_cff.py b/Configuration/Eras/python/Era_Phase2C9_dd4hep_noMkFit_cff.py new file mode 100644 index 0000000000000..226a1bfde204b --- /dev/null +++ b/Configuration/Eras/python/Era_Phase2C9_dd4hep_noMkFit_cff.py @@ -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])) diff --git a/Configuration/Eras/python/Era_Phase2C9_noMkFit_cff.py b/Configuration/Eras/python/Era_Phase2C9_noMkFit_cff.py new file mode 100644 index 0000000000000..7d9baa69e6825 --- /dev/null +++ b/Configuration/Eras/python/Era_Phase2C9_noMkFit_cff.py @@ -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])) + diff --git a/Configuration/Eras/python/Era_Phase2_cff.py b/Configuration/Eras/python/Era_Phase2_cff.py index 7ce7293175a3d..46432f200234e 100644 --- a/Configuration/Eras/python/Era_Phase2_cff.py +++ b/Configuration/Eras/python/Era_Phase2_cff.py @@ -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) diff --git a/Configuration/Eras/python/Era_Phase2_noMkFit_cff.py b/Configuration/Eras/python/Era_Phase2_noMkFit_cff.py new file mode 100644 index 0000000000000..5f516492c8232 --- /dev/null +++ b/Configuration/Eras/python/Era_Phase2_noMkFit_cff.py @@ -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])) diff --git a/Configuration/Eras/python/ModifierChain_trackingMkFitProd_cff.py b/Configuration/Eras/python/ModifierChain_trackingMkFitProd_cff.py index 448e0cad2e17a..1ff73fa857e11 100644 --- a/Configuration/Eras/python/ModifierChain_trackingMkFitProd_cff.py +++ b/Configuration/Eras/python/ModifierChain_trackingMkFitProd_cff.py @@ -18,3 +18,8 @@ trackingMkFitDetachedTripletStep, trackingMkFitPixelLessStep, ) + +trackingMkFitProdPhase2 = cms.ModifierChain( + trackingMkFitCommon, + trackingMkFitInitialStep, +) diff --git a/Configuration/StandardSequences/python/Eras.py b/Configuration/StandardSequences/python/Eras.py index 8cd3ecee770af..912a0021093ad 100644 --- a/Configuration/StandardSequences/python/Eras.py +++ b/Configuration/StandardSequences/python/Eras.py @@ -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',