From a6f591b76d6edcae486b44fcac83827be4d3e879 Mon Sep 17 00:00:00 2001 From: mmusich Date: Sat, 11 Jul 2020 16:37:55 +0200 Subject: [PATCH] further geometry clean-up --- Configuration/AlCa/python/autoCondPhase2.py | 49 +++++++++---------- .../python/GeometryExtended2026D49_cff.py | 1 - .../python/GeometryExtended2026D50_cff.py | 1 - .../python/GeometryExtended2026D51_cff.py | 1 - .../python/GeometryExtended2026D53_cff.py | 1 - .../python/GeometryExtended2026D54_cff.py | 1 - .../python/GeometryExtended2026D56_cff.py | 1 - .../python/GeometryExtended2026D57_cff.py | 1 - .../python/GeometryExtended2026D58_cff.py | 1 - .../python/GeometryExtended2026D59_cff.py | 1 - .../python/GeometryExtended2026D60_cff.py | 1 - .../python/GeometryExtended2026D61_cff.py | 1 - .../Geometry/python/dict2026Geometry.py | 4 -- .../python/upgradeWorkflowComponents.py | 10 ++-- .../test/GeometryExtended2026GE0Test_cff.py | 1 - .../python/fakeConditions_phase2TkT14_cff.py | 7 --- .../python/fakeConditions_phase2TkT5_cff.py | 13 ----- .../python/fakeConditions_phase2TkT6_cff.py | 8 --- .../python/fakeConditions_phase2TkT7_cff.py | 13 ----- .../python/fakeConditions_phase2TkT8_cff.py | 13 ----- .../test/phase2_digi_reco_pixelntuple_cfg.py | 2 +- .../test/phase2_reco_pixelntuple_cfg.py | 2 +- .../test/TrackingMaterialAnalyser_dd4hep.py | 1 - 23 files changed, 30 insertions(+), 104 deletions(-) delete mode 100644 SLHCUpgradeSimulations/Geometry/python/fakeConditions_phase2TkT14_cff.py delete mode 100644 SLHCUpgradeSimulations/Geometry/python/fakeConditions_phase2TkT5_cff.py delete mode 100644 SLHCUpgradeSimulations/Geometry/python/fakeConditions_phase2TkT6_cff.py delete mode 100644 SLHCUpgradeSimulations/Geometry/python/fakeConditions_phase2TkT7_cff.py delete mode 100644 SLHCUpgradeSimulations/Geometry/python/fakeConditions_phase2TkT8_cff.py diff --git a/Configuration/AlCa/python/autoCondPhase2.py b/Configuration/AlCa/python/autoCondPhase2.py index a6a36eb982071..80b9dde4cbb76 100644 --- a/Configuration/AlCa/python/autoCondPhase2.py +++ b/Configuration/AlCa/python/autoCondPhase2.py @@ -7,56 +7,57 @@ SiPixelGenErrorRecord = "SiPixelGenErrorDBObjectRcd" SiPixelTemplatesRecord = "SiPixelTemplateDBObjectRcd" SiPixel2DTemplatesRecord = "SiPixel2DTemplateDBObjectRcd" -TrackerDTCCablingRecord = "TrackerDetToDTCELinkCablingMapRcd" + +## +## Active geometries: https://github.com/cms-sw/cmssw/blob/master/Configuration/Geometry/README.md +## +## T15: Phase2 tilted tracker (v6.1.6) w/ phase 2 pixel (v6.1.3) (Active geometry: same as T14. Material Budget: major update in IT, gathering info from recent Mechanical designs.) +## T17: Phase2 tilted tracker (v6.1.6) w/ phase 2 pixel (v6.1.5) TFPX: Changed sensors spacing within all double-disks + Increased distance between Disks 6 and 7 + Put TBPX portcards between Disks 6 and 7. +## T19: Phase2 tilted tracker (v6.1.6) w/ phase 2 pixel (v7.0.0) Inner Tracker description with 3D sensors in TBPX L1 + TBPX L2 + TFPX R1. +## T20: Phase2 tilted tracker (v6.1.6) Outer Tracker: All sensors 200 um -> 290 um + Update in Module MB + PS modules: s-sensor 164 um longer + Major update in OTST MB. Inner Tracker: (v6.1.5) from T17 is called. +## #combines in a single dict of dict the tags defined below allTags={} -## As Outer Tracker in T6 is different from all the subsequent active ones (>=T14), this needs to be specified outside of the Global Tag. -allTags["DTCCabling"] = { - "T6" : ( ','.join( [ 'TrackerDetToDTCELinkCablingMap__OT614_200_IT404_layer2_10G__T6__OTOnly' ,TrackerDTCCablingRecord, connectionString, "", "2020-03-27 11:30:00.000"] ), ), # DTC cabling map provided for T6 geometry (taken from http://ghugo.web.cern.ch/ghugo/layouts/cabling/OT614_200_IT404_layer2_10G/cablingOuter.html) -} - -#v5 versions of LA used to match versioning of pixel templates, but values are identical to v2 allTags["LA"] = { - 'T6' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_T6_v5_mc' ,SiPixelLARecord,connectionString, "", "2020-05-05 20:00:00.000"] ), ), #uH = 0.106/T (TBPX), uH=0.0/T (TEPX+TFPX) - 'T14' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_T14_v5_mc' ,SiPixelLARecord,connectionString, "", "2020-05-05 20:00:00.000"] ), ), #uH = 0.106/T (TBPX), uH=0.0/T (TEPX+TFPX) 'T15' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_T15_v5_mc' ,SiPixelLARecord,connectionString, "", "2020-05-05 20:00:00.000"] ), ), #uH = 0.053/T (TBPX), uH=0.0/T (TEPX+TFPX) + 'T17' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_T15_v5_mc' ,SiPixelLARecord,connectionString, "", "2020-05-05 20:00:00.000"] ), ), #uH = 0.053/T (TBPX), uH=0.0/T (TEPX+TFPX) 'T19' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_T19_v1_mc' ,SiPixelLARecord,connectionString, "", "2020-02-23 14:00:00.000"] ), ), #uH = 0.053/T (TBPX L3,L4), uH=0.0/T (TBPX L1,L2, TEPX+TFPX) + 'T20' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_T15_v5_mc' ,SiPixelLARecord,connectionString, "", "2020-05-05 20:00:00.000"] ), ), #uH = 0.053/T (TBPX), uH=0.0/T (TEPX+TFPX) } allTags["LAWidth"] = { - 'T6' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_T6_mc_forWidthEmpty' ,SiPixelLARecord,connectionString, "forWidth", "2019-11-05 20:00:00.000"] ), ), # uH=0.0/T (fall-back to offset) - 'T14' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_T14_mc_forWidthEmpty' ,SiPixelLARecord,connectionString, "forWidth", "2019-11-05 20:00:00.000"] ), ), # uH=0.0/T (fall-back to offset) 'T15' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_T15_mc_forWidthEmpty' ,SiPixelLARecord,connectionString, "forWidth", "2019-11-05 20:00:00.000"] ), ), # uH=0.0/T (fall-back to offset) + 'T17' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_T15_mc_forWidthEmpty' ,SiPixelLARecord,connectionString, "forWidth", "2019-11-05 20:00:00.000"] ), ), # uH=0.0/T (fall-back to offset) 'T19' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_T19_mc_forWidthEmpty' ,SiPixelLARecord,connectionString, "forWidth", "2020-02-23 14:00:00.000"] ), ), # uH=0.0/T (fall-back to offset) + 'T20' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_T15_mc_forWidthEmpty' ,SiPixelLARecord,connectionString, "forWidth", "2019-11-05 20:00:00.000"] ), ), # uH=0.0/T (fall-back to offset) } allTags["LAfromAlignment"] = { - 'T6' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_T6_mc_forWidthEmpty' ,SiPixelLARecord,connectionString, "fromAlignment", "2019-11-05 20:00:00.000"] ), ), # uH=0.0/T (not in use) - 'T14' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_T14_mc_forWidthEmpty' ,SiPixelLARecord,connectionString, "fromAlignment", "2019-11-05 20:00:00.000"] ), ), # uH=0.0/T (not in use) 'T15' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_T15_mc_forWidthEmpty' ,SiPixelLARecord,connectionString, "fromAlignment", "2019-11-05 20:00:00.000"] ), ), # uH=0.0/T (not in use) + 'T17' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_T15_mc_forWidthEmpty' ,SiPixelLARecord,connectionString, "fromAlignment", "2019-11-05 20:00:00.000"] ), ), # uH=0.0/T (not in use) 'T19' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_T19_mc_forWidthEmpty' ,SiPixelLARecord,connectionString, "fromAlignment", "2020-02-23 14:00:00.000"] ), ), # uH=0.0/T (not in use) + 'T20' : ( ','.join( [ 'SiPixelLorentzAngle_phase2_T15_mc_forWidthEmpty' ,SiPixelLARecord,connectionString, "fromAlignment", "2019-11-05 20:00:00.000"] ), ), # uH=0.0/T (not in use) } -#v5 versions of SimLA used to match versioning of pixel templates, but values are indentical to v2 allTags["SimLA"] = { - 'T6' : ( ','.join( [ 'SiPixelSimLorentzAngle_phase2_T6_v5_mc' ,SiPixelSimLARecord,connectionString, "", "2020-05-05 20:00:00.000"] ), ), #uH = 0.106/T (TBPX), uH=0.0/T (TEPX+TFPX) - 'T14' : ( ','.join( [ 'SiPixelSimLorentzAngle_phase2_T14_v5_mc' ,SiPixelSimLARecord,connectionString, "", "2020-05-05 20:00:00.000"] ), ), #uH = 0.106/T (TBPX), uH=0.0/T (TEPX+TFPX) 'T15' : ( ','.join( [ 'SiPixelSimLorentzAngle_phase2_T15_v5_mc' ,SiPixelSimLARecord,connectionString, "", "2020-05-05 20:00:00.000"] ), ), #uH = 0.053/T (TBPX), uH=0.0/T (TEPX+TFPX) + 'T17' : ( ','.join( [ 'SiPixelSimLorentzAngle_phase2_T15_v5_mc' ,SiPixelSimLARecord,connectionString, "", "2020-05-05 20:00:00.000"] ), ), #uH = 0.053/T (TBPX), uH=0.0/T (TEPX+TFPX) 'T19' : ( ','.join( [ 'SiPixelSimLorentzAngle_phase2_T19_v1_mc' ,SiPixelSimLARecord,connectionString, "", "2020-02-23 14:00:00.000"] ), ), #uH = 0.053/T (TBPX L3,L4), uH=0.0/T (TBPX L1,L2, TEPX+TFPX) + 'T20' : ( ','.join( [ 'SiPixelSimLorentzAngle_phase2_T15_v5_mc' ,SiPixelSimLARecord,connectionString, "", "2020-05-05 20:00:00.000"] ), ), #uH = 0.053/T (TBPX), uH=0.0/T (TEPX+TFPX) } allTags["GenError"] = { - 'T6' : ( ','.join( [ 'SiPixelGenErrorDBObject_phase2_T6_v5_mc' ,SiPixelGenErrorRecord,connectionString, "", "2020-05-02 23:00:00.000"] ), ), # cell is 25um (local-x) x 100um (local-y) , VBias=350V - 'T14' : ( ','.join( [ 'SiPixelGenErrorDBObject_phase2_T14_v5_mc' ,SiPixelGenErrorRecord,connectionString, "", "2020-05-02 23:00:00.000"] ), ), # cell is 25um (local-x) x 100um (local-y) , VBias=350V 'T15' : ( ','.join( [ 'SiPixelGenErrorDBObject_phase2_T15_v5_mc' ,SiPixelGenErrorRecord,connectionString, "", "2020-05-02 23:00:00.000"] ), ), # cell is 25um (local-x) x 100um (local-y) , VBias=350V + 'T17' : ( ','.join( [ 'SiPixelGenErrorDBObject_phase2_T15_v5_mc' ,SiPixelGenErrorRecord,connectionString, "", "2020-05-02 23:00:00.000"] ), ), # cell is 25um (local-x) x 100um (local-y) , VBias=350V + 'T20' : ( ','.join( [ 'SiPixelGenErrorDBObject_phase2_T15_v5_mc' ,SiPixelGenErrorRecord,connectionString, "", "2020-05-02 23:00:00.000"] ), ), # cell is 25um (local-x) x 100um (local-y) , VBias=350V } allTags["Template"] = { - 'T6' : ( ','.join( [ 'SiPixelTemplateDBObject_phase2_T6_v5_mc' ,SiPixelTemplatesRecord,connectionString, "", "2020-05-02 23:00:00.000"] ), ), # cell is 25um (local-x) x 100um (local-y) , VBias=350V - 'T14' : ( ','.join( [ 'SiPixelTemplateDBObject_phase2_T14_v5_mc',SiPixelTemplatesRecord,connectionString, "", "2020-05-02 23:00:00.000"] ), ), # cell is 25um (local-x) x 100um (local-y) , VBias=350V 'T15' : ( ','.join( [ 'SiPixelTemplateDBObject_phase2_T15_v5_mc',SiPixelTemplatesRecord,connectionString, "", "2020-05-02 23:00:00.000"] ), ), # cell is 25um (local-x) x 100um (local-y) , VBias=350V + 'T17' : ( ','.join( [ 'SiPixelTemplateDBObject_phase2_T15_v5_mc',SiPixelTemplatesRecord,connectionString, "", "2020-05-02 23:00:00.000"] ), ), # cell is 25um (local-x) x 100um (local-y) , VBias=350V + 'T20' : ( ','.join( [ 'SiPixelTemplateDBObject_phase2_T15_v5_mc',SiPixelTemplatesRecord,connectionString, "", "2020-05-02 23:00:00.000"] ), ), # cell is 25um (local-x) x 100um (local-y) , VBias=350V } ## @@ -64,22 +65,18 @@ ## allTags["Template2Dnum"] = { - 'T6' : ( ','.join( [ 'SiPixel2DTemplateDBObject_phase2_T6_v0_num' ,SiPixel2DTemplatesRecord,connectionString, "numerator", "2019-07-15 12:00:00.000"] ), ), - 'T14' : ( ','.join( [ 'SiPixel2DTemplateDBObject_phase2_T14_v0_num' ,SiPixel2DTemplatesRecord,connectionString, "numerator", "2019-07-15 12:00:00.000"] ), ), 'T15' : ( ','.join( [ 'SiPixel2DTemplateDBObject_phase2_T15_v0_num' ,SiPixel2DTemplatesRecord,connectionString, "numerator", "2019-07-15 12:00:00.000"] ), ), } allTags["Template2Dden"] = { - 'T6' : ( ','.join( [ 'SiPixel2DTemplateDBObject_phase2_T6_v0_den' ,SiPixel2DTemplatesRecord,connectionString, "denominator", "2019-07-15 12:00:00.000"] ), ), - 'T14' : ( ','.join( [ 'SiPixel2DTemplateDBObject_phase2_T14_v0_den' ,SiPixel2DTemplatesRecord,connectionString, "denominator", "2019-07-15 12:00:00.000"] ), ), 'T15' : ( ','.join( [ 'SiPixel2DTemplateDBObject_phase2_T15_v0_den' ,SiPixel2DTemplatesRecord,connectionString, "denominator", "2019-07-15 12:00:00.000"] ), ), } # list of active tags to be replaced -activeKeys = ["DTCCabling","LA","LAWidth","SimLA","LAfromAlignment","GenError","Template"] +activeKeys = ["LA","LAWidth","SimLA","LAfromAlignment","GenError","Template"] # list of geometries supported -activeDets = ["T6","T14","T15","T19"] +activeDets = ["T15","T17","T19","T20"] phase2GTs = {} for det in activeDets: appendedTags = () diff --git a/Configuration/Geometry/python/GeometryExtended2026D49_cff.py b/Configuration/Geometry/python/GeometryExtended2026D49_cff.py index 838ab71cf698c..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.fakeConditions_phase2TkT14_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 495d2320fe203..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.fakeConditions_phase2TkT14_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 5dc5020978195..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.fakeConditions_phase2TkT14_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 077441914596d..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.fakeConditions_phase2TkT14_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 92a627d2ada74..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.fakeConditions_phase2TkT14_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 7c7ca1193ee48..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.fakeConditions_phase2TkT14_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 e6666fe5ce0f1..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.fakeConditions_phase2TkT14_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 2fd3eda75aff4..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.fakeConditions_phase2TkT14_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 6fbe6f1be14d6..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.fakeConditions_phase2TkT14_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 ec0fa392a8b04..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.fakeConditions_phase2TkT14_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 22efa9cef7f74..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.fakeConditions_phase2TkT14_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 f60dd3bd3ec2d..cae8177539d00 100644 --- a/Configuration/Geometry/python/dict2026Geometry.py +++ b/Configuration/Geometry/python/dict2026Geometry.py @@ -114,7 +114,6 @@ ], "sim" : [ 'from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *', - 'from SLHCUpgradeSimulations.Geometry.fakeConditions_phase2TkT14_cff import *', ], "reco" : [ 'from Geometry.CommonTopologies.globalTrackingGeometry_cfi import *', @@ -149,7 +148,6 @@ ], "sim" : [ 'from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *', - 'from SLHCUpgradeSimulations.Geometry.fakeConditions_phase2TkT14_cff import *', ], "reco" : [ 'from Geometry.CommonTopologies.globalTrackingGeometry_cfi import *', @@ -184,7 +182,6 @@ ], "sim" : [ 'from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *', - 'from SLHCUpgradeSimulations.Geometry.fakeConditions_phase2TkT14_cff import *', ], "reco" : [ 'from Geometry.CommonTopologies.globalTrackingGeometry_cfi import *', @@ -219,7 +216,6 @@ ], "sim" : [ 'from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *', - 'from SLHCUpgradeSimulations.Geometry.fakeConditions_phase2TkT14_cff import *', ], "reco" : [ 'from Geometry.CommonTopologies.globalTrackingGeometry_cfi import *', diff --git a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py index b743c33f73e75..2adffdb8464e1 100644 --- a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py +++ b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py @@ -883,28 +883,28 @@ def condition(self, fragment, stepList, key, hasHarvest): '2026D56' : { 'Geom' : 'Extended2026D56', 'HLTmenu': '@fake2', - 'GT' : 'auto:phase2_realistic_T15', + 'GT' : 'auto:phase2_realistic_T20', 'Era' : 'Phase2C9', 'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFullTrigger','RecoFullGlobal', 'HARVESTFullGlobal'], }, '2026D57' : { 'Geom' : 'Extended2026D57', 'HLTmenu': '@fake2', - 'GT' : 'auto:phase2_realistic_T15', + 'GT' : 'auto:phase2_realistic_T17', 'Era' : 'Phase2C11', 'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFullTrigger','RecoFullGlobal', 'HARVESTFullGlobal'], }, '2026D58' : { 'Geom' : 'Extended2026D58', 'HLTmenu': '@fake2', - 'GT' : 'auto:phase2_realistic_T15', + 'GT' : 'auto:phase2_realistic_T17', 'Era' : 'Phase2C12', 'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFullTrigger','RecoFullGlobal', 'HARVESTFullGlobal'], }, '2026D59' : { 'Geom' : 'Extended2026D59', 'HLTmenu': '@fake2', - 'GT' : 'auto:phase2_realistic_T15', + 'GT' : 'auto:phase2_realistic_T17', 'Era' : 'Phase2C11', 'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFullTrigger','RecoFullGlobal', 'HARVESTFullGlobal'], }, @@ -918,7 +918,7 @@ def condition(self, fragment, stepList, key, hasHarvest): '2026D61' : { 'Geom' : 'Extended2026D61', 'HLTmenu': '@fake2', - 'GT' : 'auto:phase2_realistic_T15', + 'GT' : 'auto:phase2_realistic_T17', 'ProcessModifier': 'phase2_PixelCPEGeneric', 'Era' : 'Phase2C9', 'ScenToRun' : ['GenSimHLBeamSpotFull','DigiFullTrigger','RecoFullGlobal', 'HARVESTFullGlobal'], diff --git a/Geometry/GEMGeometry/test/GeometryExtended2026GE0Test_cff.py b/Geometry/GEMGeometry/test/GeometryExtended2026GE0Test_cff.py index e4d5928022a3c..4149ec78b38eb 100644 --- a/Geometry/GEMGeometry/test/GeometryExtended2026GE0Test_cff.py +++ b/Geometry/GEMGeometry/test/GeometryExtended2026GE0Test_cff.py @@ -5,7 +5,6 @@ from cmsExtendedGeometry2026GE0TestXML_cfi import * from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import * -from SLHCUpgradeSimulations.Geometry.fakeConditions_phase2TkT14_cff import * from Geometry.EcalCommonData.ecalSimulationParameters_cff import * from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import * diff --git a/SLHCUpgradeSimulations/Geometry/python/fakeConditions_phase2TkT14_cff.py b/SLHCUpgradeSimulations/Geometry/python/fakeConditions_phase2TkT14_cff.py deleted file mode 100644 index 27671ffdbaf23..0000000000000 --- a/SLHCUpgradeSimulations/Geometry/python/fakeConditions_phase2TkT14_cff.py +++ /dev/null @@ -1,7 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -siPixelFakeGainOfflineESSource = cms.ESSource("SiPixelFakeGainOfflineESSource", - file = -cms.FileInPath('SLHCUpgradeSimulations/Geometry/data/PhaseII/Tilted/EmptyPixelSkimmedGeometry.txt') - ) -es_prefer_fake_gain = cms.ESPrefer("SiPixelFakeGainOfflineESSource","siPixelFakeGainOfflineESSource") diff --git a/SLHCUpgradeSimulations/Geometry/python/fakeConditions_phase2TkT5_cff.py b/SLHCUpgradeSimulations/Geometry/python/fakeConditions_phase2TkT5_cff.py deleted file mode 100644 index d1bfc6ff4bc59..0000000000000 --- a/SLHCUpgradeSimulations/Geometry/python/fakeConditions_phase2TkT5_cff.py +++ /dev/null @@ -1,13 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -siPixelFakeGainOfflineESSource = cms.ESSource("SiPixelFakeGainOfflineESSource", - file = -cms.FileInPath('SLHCUpgradeSimulations/Geometry/data/PhaseII/Tilted/EmptyPixelSkimmedGeometry.txt') - ) -es_prefer_fake_gain = cms.ESPrefer("SiPixelFakeGainOfflineESSource","siPixelFakeGainOfflineESSource") - -siPixelFakeLorentzAngleESSource = cms.ESSource("SiPixelFakeLorentzAngleESSource", - file = -cms.FileInPath('SLHCUpgradeSimulations/Geometry/data/PhaseII/Tilted/PixelSkimmedGeometryT5.txt') - ) -es_prefer_fake_lorentz = cms.ESPrefer("SiPixelFakeLorentzAngleESSource","siPixelFakeLorentzAngleESSource") diff --git a/SLHCUpgradeSimulations/Geometry/python/fakeConditions_phase2TkT6_cff.py b/SLHCUpgradeSimulations/Geometry/python/fakeConditions_phase2TkT6_cff.py deleted file mode 100644 index b439b87852559..0000000000000 --- a/SLHCUpgradeSimulations/Geometry/python/fakeConditions_phase2TkT6_cff.py +++ /dev/null @@ -1,8 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -siPixelFakeGainOfflineESSource = cms.ESSource("SiPixelFakeGainOfflineESSource", - file = -cms.FileInPath('SLHCUpgradeSimulations/Geometry/data/PhaseII/Tilted/EmptyPixelSkimmedGeometry.txt') - ) -es_prefer_fake_gain = cms.ESPrefer("SiPixelFakeGainOfflineESSource","siPixelFakeGainOfflineESSource") - diff --git a/SLHCUpgradeSimulations/Geometry/python/fakeConditions_phase2TkT7_cff.py b/SLHCUpgradeSimulations/Geometry/python/fakeConditions_phase2TkT7_cff.py deleted file mode 100644 index e3ce508d68c6e..0000000000000 --- a/SLHCUpgradeSimulations/Geometry/python/fakeConditions_phase2TkT7_cff.py +++ /dev/null @@ -1,13 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -siPixelFakeGainOfflineESSource = cms.ESSource("SiPixelFakeGainOfflineESSource", - file = -cms.FileInPath('SLHCUpgradeSimulations/Geometry/data/PhaseII/Tilted/EmptyPixelSkimmedGeometry.txt') - ) -es_prefer_fake_gain = cms.ESPrefer("SiPixelFakeGainOfflineESSource","siPixelFakeGainOfflineESSource") - -siPixelFakeLorentzAngleESSource = cms.ESSource("SiPixelFakeLorentzAngleESSource", - file = -cms.FileInPath('SLHCUpgradeSimulations/Geometry/data/PhaseII/Tilted/PixelSkimmedGeometryT7.txt') - ) -es_prefer_fake_lorentz = cms.ESPrefer("SiPixelFakeLorentzAngleESSource","siPixelFakeLorentzAngleESSource") diff --git a/SLHCUpgradeSimulations/Geometry/python/fakeConditions_phase2TkT8_cff.py b/SLHCUpgradeSimulations/Geometry/python/fakeConditions_phase2TkT8_cff.py deleted file mode 100644 index b7ea153c5a539..0000000000000 --- a/SLHCUpgradeSimulations/Geometry/python/fakeConditions_phase2TkT8_cff.py +++ /dev/null @@ -1,13 +0,0 @@ -import FWCore.ParameterSet.Config as cms - -siPixelFakeGainOfflineESSource = cms.ESSource("SiPixelFakeGainOfflineESSource", - file = -cms.FileInPath('SLHCUpgradeSimulations/Geometry/data/PhaseII/Tilted/EmptyPixelSkimmedGeometry.txt') - ) -es_prefer_fake_gain = cms.ESPrefer("SiPixelFakeGainOfflineESSource","siPixelFakeGainOfflineESSource") - -siPixelFakeLorentzAngleESSource = cms.ESSource("SiPixelFakeLorentzAngleESSource", - file = -cms.FileInPath('SLHCUpgradeSimulations/Geometry/data/PhaseII/Tilted/PixelSkimmedGeometryT8.txt') - ) -es_prefer_fake_lorentz = cms.ESPrefer("SiPixelFakeLorentzAngleESSource","siPixelFakeLorentzAngleESSource") diff --git a/SLHCUpgradeSimulations/Geometry/test/phase2_digi_reco_pixelntuple_cfg.py b/SLHCUpgradeSimulations/Geometry/test/phase2_digi_reco_pixelntuple_cfg.py index 69650e060803a..713d424998b18 100644 --- a/SLHCUpgradeSimulations/Geometry/test/phase2_digi_reco_pixelntuple_cfg.py +++ b/SLHCUpgradeSimulations/Geometry/test/phase2_digi_reco_pixelntuple_cfg.py @@ -102,7 +102,7 @@ process.siPixelClustersPreSplitting.ElectronPerADCGain = cms.double(135.) from Configuration.AlCa.GlobalTag import GlobalTag -process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_T14', '') +process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_T15', '') # Path and EndPath definitions process.digitisation_step = cms.Path(process.pdigi_valid) diff --git a/SLHCUpgradeSimulations/Geometry/test/phase2_reco_pixelntuple_cfg.py b/SLHCUpgradeSimulations/Geometry/test/phase2_reco_pixelntuple_cfg.py index 7dddcf3c470c5..b1be5af325f31 100644 --- a/SLHCUpgradeSimulations/Geometry/test/phase2_reco_pixelntuple_cfg.py +++ b/SLHCUpgradeSimulations/Geometry/test/phase2_reco_pixelntuple_cfg.py @@ -84,7 +84,7 @@ # Other statements process.mix.digitizers = cms.PSet(process.theDigitizersValid) from Configuration.AlCa.GlobalTag import GlobalTag -process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_T14', '') +process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_T15', '') # Path and EndPath definitions process.digitisation_step = cms.Path(process.pdigi_valid) diff --git a/SimTracker/TrackerMaterialAnalysis/test/TrackingMaterialAnalyser_dd4hep.py b/SimTracker/TrackerMaterialAnalysis/test/TrackingMaterialAnalyser_dd4hep.py index 44478f0e8bd5c..ef299613581dd 100755 --- a/SimTracker/TrackerMaterialAnalysis/test/TrackingMaterialAnalyser_dd4hep.py +++ b/SimTracker/TrackerMaterialAnalysis/test/TrackingMaterialAnalyser_dd4hep.py @@ -132,7 +132,6 @@ ) from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * -from SLHCUpgradeSimulations.Geometry.fakeConditions_phase2TkT14_cff import * from Geometry.EcalCommonData.ecalSimulationParameters_cff import * from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import *