diff --git a/Configuration/AlCa/python/autoCond.py b/Configuration/AlCa/python/autoCond.py index 71f64d4710653..86efe1467507f 100644 --- a/Configuration/AlCa/python/autoCond.py +++ b/Configuration/AlCa/python/autoCond.py @@ -81,7 +81,7 @@ # GlobalTag for MC production with realistic conditions for Phase1 2024 'phase1_2024_realistic' : '112X_mcRun3_2024_realistic_v7', # GT containing realistic conditions for Phase1 2024 # GlobalTag for MC production with realistic conditions for Phase2 - 'phase2_realistic' : '110X_mcRun4_realistic_v3' + 'phase2_realistic' : '112X_mcRun4_realistic_v1' } aliases = { diff --git a/Configuration/AlCa/python/autoCondPhase2.py b/Configuration/AlCa/python/autoCondPhase2.py index dee37dd0af3e9..2e96a137e8bf4 100644 --- a/Configuration/AlCa/python/autoCondPhase2.py +++ b/Configuration/AlCa/python/autoCondPhase2.py @@ -80,24 +80,28 @@ } ## -## Outer Tracker records +## Outer Tracker records (to be filled if necessary) ## ''' -tempConnectionString="frontier://FrontierPrep/CMS_CONDITIONS" - allTags["OTLA"] = { - 'T15' : ( ','.join( [ 'SiPhase2OuterTrackerLorentzAngle_T15_v0' ,TrackerLARecord,tempConnectionString, "", "2020-07-19 17:00:00.000"] ), ), #uH = 0.07/T - 'T17' : ( ','.join( [ 'SiPhase2OuterTrackerLorentzAngle_T15_v0' ,TrackerLARecord,tempConnectionString, "", "2020-07-19 17:00:00.000"] ), ), #uH = 0.07/T - 'T19' : ( ','.join( [ 'SiPhase2OuterTrackerLorentzAngle_T15_v0' ,TrackerLARecord,tempConnectionString, "", "2020-07-19 17:00:00.000"] ), ), #uH = 0.07/T - 'T20' : ( ','.join( [ 'SiPhase2OuterTrackerLorentzAngle_T15_v0' ,TrackerLARecord,tempConnectionString, "", "2020-07-19 17:00:00.000"] ), ), #uH = 0.07/T + 'T15' : ( ','.join( [ 'SiPhase2OuterTrackerLorentzAngle_v0_mc' ,TrackerLARecord,connectionString, "", "2020-07-19 17:00:00.000"] ), ), #uH = 0.07/T + 'T17' : ( ','.join( [ 'SiPhase2OuterTrackerLorentzAngle_v0_mc' ,TrackerLARecord,connectionString, "", "2020-07-19 17:00:00.000"] ), ), #uH = 0.07/T + 'T19' : ( ','.join( [ 'SiPhase2OuterTrackerLorentzAngle_v0_mc' ,TrackerLARecord,connectionString, "", "2020-07-19 17:00:00.000"] ), ), #uH = 0.07/T + 'T20' : ( ','.join( [ 'SiPhase2OuterTrackerLorentzAngle_v0_mc' ,TrackerLARecord,connectionString, "", "2020-07-19 17:00:00.000"] ), ), #uH = 0.07/T + 'T21' : ( ','.join( [ 'SiPhase2OuterTrackerLorentzAngle_v0_mc' ,TrackerLARecord,connectionString, "", "2020-07-19 17:00:00.000"] ), ), #uH = 0.07/T + 'T22' : ( ','.join( [ 'SiPhase2OuterTrackerLorentzAngle_v0_mc' ,TrackerLARecord,connectionString, "", "2020-07-19 17:00:00.000"] ), ), #uH = 0.07/T + 'T23' : ( ','.join( [ 'SiPhase2OuterTrackerLorentzAngle_v0_mc' ,TrackerLARecord,connectionString, "", "2020-07-19 17:00:00.000"] ), ), #uH = 0.07/T } allTags["SimOTLA"] = { - 'T15' : ( ','.join( [ 'SiPhase2OuterTrackerLorentzAngle_T15_v0' ,TrackerSimLARecord,tempConnectionString, "", "2020-07-19 17:00:00.000"] ), ), #uH = 0.07/T - 'T17' : ( ','.join( [ 'SiPhase2OuterTrackerLorentzAngle_T15_v0' ,TrackerSimLARecord,tempConnectionString, "", "2020-07-19 17:00:00.000"] ), ), #uH = 0.07/T - 'T19' : ( ','.join( [ 'SiPhase2OuterTrackerLorentzAngle_T15_v0' ,TrackerSimLARecord,tempConnectionString, "", "2020-07-19 17:00:00.000"] ), ), #uH = 0.07/T - 'T20' : ( ','.join( [ 'SiPhase2OuterTrackerLorentzAngle_T15_v0' ,TrackerSimLARecord,tempConnectionString, "", "2020-07-19 17:00:00.000"] ), ), #uH = 0.07/T + 'T15' : ( ','.join( [ 'SiPhase2OuterTrackerLorentzAngleSim_v0_mc' ,TrackerSimLARecord,connectionString, "", "2020-07-19 17:00:00.000"] ), ), #uH = 0.07/T + 'T17' : ( ','.join( [ 'SiPhase2OuterTrackerLorentzAngleSim_v0_mc' ,TrackerSimLARecord,connectionString, "", "2020-07-19 17:00:00.000"] ), ), #uH = 0.07/T + 'T19' : ( ','.join( [ 'SiPhase2OuterTrackerLorentzAngleSim_v0_mc' ,TrackerSimLARecord,connectionString, "", "2020-07-19 17:00:00.000"] ), ), #uH = 0.07/T + 'T20' : ( ','.join( [ 'SiPhase2OuterTrackerLorentzAngleSim_v0_mc' ,TrackerSimLARecord,connectionString, "", "2020-07-19 17:00:00.000"] ), ), #uH = 0.07/T + 'T21' : ( ','.join( [ 'SiPhase2OuterTrackerLorentzAngleSim_v0_mc' ,TrackerSimLARecord,connectionString, "", "2020-07-19 17:00:00.000"] ), ), #uH = 0.07/T + 'T22' : ( ','.join( [ 'SiPhase2OuterTrackerLorentzAngleSim_v0_mc' ,TrackerSimLARecord,connectionString, "", "2020-07-19 17:00:00.000"] ), ), #uH = 0.07/T + 'T23' : ( ','.join( [ 'SiPhase2OuterTrackerLorentzAngleSim_v0_mc' ,TrackerSimLARecord,connectionString, "", "2020-07-19 17:00:00.000"] ), ), #uH = 0.07/T } ''' ## diff --git a/Configuration/Geometry/python/GeometryExtended2026D49_cff.py b/Configuration/Geometry/python/GeometryExtended2026D49_cff.py index 0730f4c809c3c..802b568544cb6 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D49_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2026D49_cff.py @@ -5,7 +5,6 @@ from Geometry.CMSCommonData.cmsExtendedGeometry2026D49XML_cfi import * from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import * -from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * from Geometry.EcalCommonData.ecalSimulationParameters_cff import * from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2026D50_cff.py b/Configuration/Geometry/python/GeometryExtended2026D50_cff.py index 10061320d7d6b..13d4532ffff2f 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D50_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2026D50_cff.py @@ -5,7 +5,6 @@ from Geometry.CMSCommonData.cmsExtendedGeometry2026D50XML_cfi import * from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import * -from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * from Geometry.EcalCommonData.ecalSimulationParameters_cff import * from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2026D51_cff.py b/Configuration/Geometry/python/GeometryExtended2026D51_cff.py index d70141546f045..48211910a9c40 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D51_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2026D51_cff.py @@ -5,7 +5,6 @@ from Geometry.CMSCommonData.cmsExtendedGeometry2026D51XML_cfi import * from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import * -from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * from Geometry.EcalCommonData.ecalSimulationParameters_cff import * from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2026D53_cff.py b/Configuration/Geometry/python/GeometryExtended2026D53_cff.py index 989e498bbd4cd..f5e33d7f57578 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D53_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2026D53_cff.py @@ -5,7 +5,6 @@ from Geometry.CMSCommonData.cmsExtendedGeometry2026D53XML_cfi import * from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import * -from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * from Geometry.EcalCommonData.ecalSimulationParameters_cff import * from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2026D54_cff.py b/Configuration/Geometry/python/GeometryExtended2026D54_cff.py index 6cce43733626c..1d77b0915d6aa 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D54_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2026D54_cff.py @@ -5,7 +5,6 @@ from Geometry.CMSCommonData.cmsExtendedGeometry2026D54XML_cfi import * from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import * -from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * from Geometry.EcalCommonData.ecalSimulationParameters_cff import * from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2026D56_cff.py b/Configuration/Geometry/python/GeometryExtended2026D56_cff.py index bfbfd96374af2..9d49bb981e8fb 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D56_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2026D56_cff.py @@ -5,7 +5,6 @@ from Geometry.CMSCommonData.cmsExtendedGeometry2026D56XML_cfi import * from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import * -from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * from Geometry.EcalCommonData.ecalSimulationParameters_cff import * from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2026D57_cff.py b/Configuration/Geometry/python/GeometryExtended2026D57_cff.py index 2099230fa850f..35d72ada0d153 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D57_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2026D57_cff.py @@ -5,7 +5,6 @@ from Geometry.CMSCommonData.cmsExtendedGeometry2026D57XML_cfi import * from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import * -from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * from Geometry.EcalCommonData.ecalSimulationParameters_cff import * from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2026D58_cff.py b/Configuration/Geometry/python/GeometryExtended2026D58_cff.py index bef0e7a662de4..b22a26b360e99 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D58_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2026D58_cff.py @@ -5,7 +5,6 @@ from Geometry.CMSCommonData.cmsExtendedGeometry2026D58XML_cfi import * from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import * -from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * from Geometry.EcalCommonData.ecalSimulationParameters_cff import * from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2026D59_cff.py b/Configuration/Geometry/python/GeometryExtended2026D59_cff.py index ac5b291d68982..30d2925623d5f 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D59_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2026D59_cff.py @@ -5,7 +5,6 @@ from Geometry.CMSCommonData.cmsExtendedGeometry2026D59XML_cfi import * from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import * -from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * from Geometry.EcalCommonData.ecalSimulationParameters_cff import * from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2026D60_cff.py b/Configuration/Geometry/python/GeometryExtended2026D60_cff.py index f8f68ab1bb356..4dad626983181 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D60_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2026D60_cff.py @@ -5,7 +5,6 @@ from Geometry.CMSCommonData.cmsExtendedGeometry2026D60XML_cfi import * from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import * -from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * from Geometry.EcalCommonData.ecalSimulationParameters_cff import * from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2026D61_cff.py b/Configuration/Geometry/python/GeometryExtended2026D61_cff.py index f47889a7c12b0..4cfd417095473 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D61_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2026D61_cff.py @@ -5,7 +5,6 @@ from Geometry.CMSCommonData.cmsExtendedGeometry2026D61XML_cfi import * from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import * -from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * from Geometry.EcalCommonData.ecalSimulationParameters_cff import * from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2026D62_cff.py b/Configuration/Geometry/python/GeometryExtended2026D62_cff.py index 3d1a0ef88e93f..e1e8bd16f8e03 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D62_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2026D62_cff.py @@ -5,7 +5,6 @@ from Geometry.CMSCommonData.cmsExtendedGeometry2026D62XML_cfi import * from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import * -from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * from Geometry.EcalCommonData.ecalSimulationParameters_cff import * from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2026D63_cff.py b/Configuration/Geometry/python/GeometryExtended2026D63_cff.py index f9819dbc9dfc6..2ebaa71be01fa 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D63_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2026D63_cff.py @@ -5,7 +5,6 @@ from Geometry.CMSCommonData.cmsExtendedGeometry2026D63XML_cfi import * from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import * -from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * from Geometry.EcalCommonData.ecalSimulationParameters_cff import * from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2026D64_cff.py b/Configuration/Geometry/python/GeometryExtended2026D64_cff.py index e0591bacad87d..6ba9965f0e3b9 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D64_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2026D64_cff.py @@ -5,7 +5,6 @@ from Geometry.CMSCommonData.cmsExtendedGeometry2026D64XML_cfi import * from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import * -from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * from Geometry.EcalCommonData.ecalSimulationParameters_cff import * from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import * diff --git a/Configuration/Geometry/python/GeometryExtended2026D65_cff.py b/Configuration/Geometry/python/GeometryExtended2026D65_cff.py index 8aa7a8b545f99..a7d70bc3521f1 100644 --- a/Configuration/Geometry/python/GeometryExtended2026D65_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2026D65_cff.py @@ -5,7 +5,6 @@ from Geometry.CMSCommonData.cmsExtendedGeometry2026D65XML_cfi import * from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import * -from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * from Geometry.EcalCommonData.ecalSimulationParameters_cff import * from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import * diff --git a/Configuration/Geometry/python/dict2026Geometry.py b/Configuration/Geometry/python/dict2026Geometry.py index a6b2fe7e0b958..6c755bfbae522 100644 --- a/Configuration/Geometry/python/dict2026Geometry.py +++ b/Configuration/Geometry/python/dict2026Geometry.py @@ -142,7 +142,6 @@ ], "sim" : [ 'from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *', - 'from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import *', ], "reco" : [ 'from Geometry.CommonTopologies.globalTrackingGeometry_cfi import *', @@ -177,7 +176,6 @@ ], "sim" : [ 'from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *', - 'from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import *', ], "reco" : [ 'from Geometry.CommonTopologies.globalTrackingGeometry_cfi import *', @@ -212,7 +210,6 @@ ], "sim" : [ 'from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *', - 'from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import *', ], "reco" : [ 'from Geometry.CommonTopologies.globalTrackingGeometry_cfi import *', @@ -247,7 +244,6 @@ ], "sim" : [ 'from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *', - 'from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import *', ], "reco" : [ 'from Geometry.CommonTopologies.globalTrackingGeometry_cfi import *', @@ -283,7 +279,6 @@ ], "sim" : [ 'from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *', - 'from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import *', ], "reco" : [ 'from Geometry.CommonTopologies.globalTrackingGeometry_cfi import *', @@ -319,7 +314,6 @@ ], "sim" : [ 'from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *', - 'from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import *', ], "reco" : [ 'from Geometry.CommonTopologies.globalTrackingGeometry_cfi import *', @@ -354,7 +348,6 @@ ], "sim" : [ 'from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *', - 'from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import *', ], "reco" : [ 'from Geometry.CommonTopologies.globalTrackingGeometry_cfi import *',