From 0c7fd696e606657994e997dca445626510eb904f Mon Sep 17 00:00:00 2001 From: Gaelle Date: Thu, 25 Apr 2019 16:06:38 +0200 Subject: [PATCH 01/10] First obvious changes --- Configuration/AlCa/python/autoCond.py | 10 ++++---- ...cff.py => GeometryExtended2021Reco_cff.py} | 2 +- ...019_cff.py => GeometryExtended2021_cff.py} | 2 +- .../PyReleaseValidation/python/relval_2017.py | 2 +- .../python/upgradeWorkflowComponents.py | 24 +++++++++---------- .../scripts/runTheMatrix.py | 2 +- .../StandardSequences/python/GeometryConf.py | 4 ++-- .../Geometry/python/dumpRecoGeometry_cfg.py | 8 +++---- .../Geometry/python/dumpSimGeometry_cfg.py | 6 ++--- .../data/cms/{2019 => 2021}/v1/cms.xml | 0 .../data/cms/{2019 => 2021}/v2/cms.xml | 0 .../data/cms/{2019 => 2021}/v3/cms.xml | 0 ...i.py => cmsExtendedGeometry2021XML_cfi.py} | 8 +++---- .../{2019 => 2021}/hcalRecNumbering.xml | 0 .../{2019 => 2021}/hcalSimNumbering.xml | 0 .../data/{2019 => 2021}/muonProdCuts.xml | 0 .../test/dumpSimGeometry_cfg.py | 6 ++--- .../TrackTrigger/python/TkOnlyFlatGeom_cff.py | 2 +- .../python/TkOnlyTiltedGeom_cff.py | 2 +- .../test/runME0MuonReco_Example.py | 4 ++-- .../python/particleFlowClusterHCAL_cfi.py | 2 +- .../python/particleFlowRecHitHBHE_cfi.py | 2 +- .../test/runRPCDigiProducer_cfg.py | 16 ++++++------- 23 files changed, 51 insertions(+), 51 deletions(-) rename Configuration/Geometry/python/{GeometryExtended2019Reco_cff.py => GeometryExtended2021Reco_cff.py} (95%) rename Configuration/Geometry/python/{GeometryExtended2019_cff.py => GeometryExtended2021_cff.py} (83%) rename Geometry/CMSCommonData/data/cms/{2019 => 2021}/v1/cms.xml (100%) rename Geometry/CMSCommonData/data/cms/{2019 => 2021}/v2/cms.xml (100%) rename Geometry/CMSCommonData/data/cms/{2019 => 2021}/v3/cms.xml (100%) rename Geometry/CMSCommonData/python/{cmsExtendedGeometry2019XML_cfi.py => cmsExtendedGeometry2021XML_cfi.py} (98%) rename Geometry/HcalCommonData/data/hcalRecNumbering/{2019 => 2021}/hcalRecNumbering.xml (100%) rename Geometry/HcalCommonData/data/hcalSimNumbering/{2019 => 2021}/hcalSimNumbering.xml (100%) rename Geometry/MuonSimData/data/{2019 => 2021}/muonProdCuts.xml (100%) diff --git a/Configuration/AlCa/python/autoCond.py b/Configuration/AlCa/python/autoCond.py index 511a13ea62be1..9fdaadacf7a83 100644 --- a/Configuration/AlCa/python/autoCond.py +++ b/Configuration/AlCa/python/autoCond.py @@ -63,10 +63,10 @@ 'phase1_2018_cosmics' : '106X_upgrade2018cosmics_realistic_deco_v3', # GlobalTag for MC production (cosmics) with realistic conditions for full Phase1 2018 detector, Strip tracker in PEAK mode 'phase1_2018_cosmics_peak' : '106X_upgrade2018cosmics_realistic_peak_v3', - # GlobalTag for MC production with perfectly aligned and calibrated detector for Phase1 2019 - 'phase1_2019_design' : '106X_postLS2_design_v4', # GT containing design conditions for postLS2 - # GlobalTag for MC production with realistic conditions for Phase1 2019 - 'phase1_2019_realistic' : '106X_postLS2_realistic_v4', # GT containing realistic conditions for postLS2 + # GlobalTag for MC production with perfectly aligned and calibrated detector for Phase1 2021 + 'phase1_2021_design' : '106X_postLS2_design_v4', # GT containing design conditions for postLS2 + # GlobalTag for MC production with realistic conditions for Phase1 2021 + 'phase1_2021_realistic' : '106X_postLS2_realistic_v4', # GT containing realistic conditions for postLS2 # GlobalTag for MC production with realistic conditions for Phase2 2023 'phase2_realistic' : '106X_upgrade2023_realistic_v2' } @@ -97,5 +97,5 @@ autoCond['upgradePLS1'] = ( autoCond['run2_mc'] ) autoCond['upgradePLS150ns'] = ( autoCond['run2_mc_50ns'] ) autoCond['upgrade2017'] = ( autoCond['phase1_2017_design'] ) -autoCond['upgrade2019'] = ( autoCond['phase1_2019_design'] ) +autoCond['upgrade2021'] = ( autoCond['phase1_2021_design'] ) autoCond['upgradePLS3'] = ( autoCond['phase2_realistic'] ) diff --git a/Configuration/Geometry/python/GeometryExtended2019Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2021Reco_cff.py similarity index 95% rename from Configuration/Geometry/python/GeometryExtended2019Reco_cff.py rename to Configuration/Geometry/python/GeometryExtended2021Reco_cff.py index d17217fb2f679..230b463ab5696 100644 --- a/Configuration/Geometry/python/GeometryExtended2019Reco_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2021Reco_cff.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms # Ideal geometry, needed for transient ECAL alignement -from Configuration.Geometry.GeometryExtended2019_cff import * +from Configuration.Geometry.GeometryExtended2021_cff import * diff --git a/Configuration/Geometry/python/GeometryExtended2019_cff.py b/Configuration/Geometry/python/GeometryExtended2021_cff.py similarity index 83% rename from Configuration/Geometry/python/GeometryExtended2019_cff.py rename to Configuration/Geometry/python/GeometryExtended2021_cff.py index 36e4c5c804fda..e6850d1aa49b9 100644 --- a/Configuration/Geometry/python/GeometryExtended2019_cff.py +++ b/Configuration/Geometry/python/GeometryExtended2021_cff.py @@ -4,7 +4,7 @@ # Geometry master configuration # # Ideal geometry, needed for simulation -from Geometry.CMSCommonData.cmsExtendedGeometry2019XML_cfi import * +from Geometry.CMSCommonData.cmsExtendedGeometry2021XML_cfi import * from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import * from Geometry.HcalCommonData.hcalParameters_cfi import * from Geometry.HcalCommonData.hcalDDDSimConstants_cfi import * diff --git a/Configuration/PyReleaseValidation/python/relval_2017.py b/Configuration/PyReleaseValidation/python/relval_2017.py index 1891cac97950a..c54e8b490e092 100644 --- a/Configuration/PyReleaseValidation/python/relval_2017.py +++ b/Configuration/PyReleaseValidation/python/relval_2017.py @@ -23,7 +23,7 @@ # he collapse: TTbar, TTbar PU, TTbar design # killStuckTBM: TTbar, ZMM # ParkingBPH: TTbar -# 2019 (ZMM, TTbar, ZEE, MinBias, TTbar PU, ZEE PU, TTbar design) +# 2021 (ZMM, TTbar, ZEE, MinBias, TTbar PU, ZEE PU, TTbar design) numWFIB = [10001.0,10002.0,10003.0,10004.0,10005.0,10006.0,10007.0,10008.0,10009.0,10059.0,10071.0, 10042.0,10024.0,10025.0,10026.0,10023.0,10224.0,10225.0,10424.0, 10024.1,10024.2,10024.3,10024.4,10024.5, diff --git a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py index 20fa0853d9e73..13672488ff137 100644 --- a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py +++ b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py @@ -13,10 +13,10 @@ '2018PU', '2018Design', '2018DesignPU', - '2019', - '2019PU', - '2019Design', - '2019DesignPU', + '2021', + '2021PU', + '2021Design', + '2021DesignPU', ] upgradeKeys[2023] = [ @@ -278,16 +278,16 @@ 'BeamSpot': 'GaussSigmaZ4cm', 'ScenToRun' : ['GenSimFull','DigiFull','RecoFull','HARVESTFull'], }, - '2019' : { + '2021' : { 'Geom' : 'DB:Extended', - 'GT' : 'auto:phase1_2019_realistic', + 'GT' : 'auto:phase1_2021_realistic', 'HLTmenu': '@relval2017', 'Era' : 'Run3', 'ScenToRun' : ['GenSimFull','DigiFull','RecoFull','HARVESTFull','ALCAFull'], }, - '2019Design' : { + '2021Design' : { 'Geom' : 'DB:Extended', - 'GT' : 'auto:phase1_2019_design', + 'GT' : 'auto:phase1_2021_design', 'HLTmenu': '@relval2017', 'Era' : 'Run3', 'BeamSpot': 'GaussSigmaZ4cm', @@ -305,10 +305,10 @@ upgradeProperties[2017]['2018DesignPU'] = deepcopy(upgradeProperties[2017]['2018Design']) upgradeProperties[2017]['2018DesignPU']['ScenToRun'] = ['GenSimFull','DigiFullPU','RecoFullPU','HARVESTFullPU'] -upgradeProperties[2017]['2019PU'] = deepcopy(upgradeProperties[2017]['2019']) -upgradeProperties[2017]['2019PU']['ScenToRun'] = ['GenSimFull','DigiFullPU','RecoFullPU','HARVESTFullPU','NanoFull'] -upgradeProperties[2017]['2019DesignPU'] = deepcopy(upgradeProperties[2017]['2019Design']) -upgradeProperties[2017]['2019DesignPU']['ScenToRun'] = ['GenSimFull','DigiFullPU','RecoFullPU','HARVESTFullPU'] +upgradeProperties[2017]['2021PU'] = deepcopy(upgradeProperties[2017]['2021']) +upgradeProperties[2017]['2021PU']['ScenToRun'] = ['GenSimFull','DigiFullPU','RecoFullPU','HARVESTFullPU','NanoFull'] +upgradeProperties[2017]['2021DesignPU'] = deepcopy(upgradeProperties[2017]['2021Design']) +upgradeProperties[2017]['2021DesignPU']['ScenToRun'] = ['GenSimFull','DigiFullPU','RecoFullPU','HARVESTFullPU'] upgradeProperties[2023] = { '2023D17' : { diff --git a/Configuration/PyReleaseValidation/scripts/runTheMatrix.py b/Configuration/PyReleaseValidation/scripts/runTheMatrix.py index 753d3350e1c64..aad73d543cad3 100755 --- a/Configuration/PyReleaseValidation/scripts/runTheMatrix.py +++ b/Configuration/PyReleaseValidation/scripts/runTheMatrix.py @@ -74,7 +74,7 @@ def runSelected(opt): 10024.0, #2017 ttbar 10224.0, #2017 ttbar PU 10824.0, #2018 ttbar - 11624.0, #2019 ttbar + 11624.0, #2021 ttbar 20034.0, #2023D17 ttbar (TDR baseline Muon/Barrel) 21234.0, #2023D21 ttbar (Inner Tracker with lower radii than in TDR) 27434.0, #2023D35 to exercise new HGCal + new MTD diff --git a/Configuration/StandardSequences/python/GeometryConf.py b/Configuration/StandardSequences/python/GeometryConf.py index cfecde9dddf34..c1727cb6a51c5 100644 --- a/Configuration/StandardSequences/python/GeometryConf.py +++ b/Configuration/StandardSequences/python/GeometryConf.py @@ -9,7 +9,7 @@ 'DBExtended2017' : 'DB:Extended', 'DBExtended2017ZeroMaterial' : 'DB:Extended2017ZeroMaterial', 'DBExtended2018' : 'DB:Extended', - 'DBExtended2019' : 'DB:Extended2019', + 'DBExtended2021' : 'DB:Extended2021', 'DBExtended2023' : 'DB:Extended2023', 'DBIdeal2015' : 'DB:Ideal2015', 'DBIdeal2015dev' : 'DB:Ideal2015dev', @@ -23,7 +23,7 @@ 'Extended2018' : 'Extended2018,Extended2018Reco', 'Extended2017Plan1' : 'Extended2017Plan1,Extended2017Plan1Reco', 'Extended2017Plan1ZeroMaterial' : 'Extended2017Plan1ZeroMaterial,Extended2017Plan1ZeroMaterialReco', - 'Extended2019' : 'Extended2019,Extended2019Reco', + 'Extended2021' : 'Extended2021,Extended2021Reco', 'All' : 'Configuration.Geometry.GeometrySimAll_cff,Reco', 'ECALHCAL' : 'Configuration.Geometry.GeometrySimECALHCAL_cff,Configuration.Geometry.GeometryRecoECALHCAL_cff', 'TrackerOnly' : 'Configuration.Geometry.GeometrySimTracker_cff,Configuration.Geometry.GeometryRecoTracker_cff', diff --git a/Fireworks/Geometry/python/dumpRecoGeometry_cfg.py b/Fireworks/Geometry/python/dumpRecoGeometry_cfg.py index 40421834f76d1..bad6eb8d2a1bc 100644 --- a/Fireworks/Geometry/python/dumpRecoGeometry_cfg.py +++ b/Fireworks/Geometry/python/dumpRecoGeometry_cfg.py @@ -5,7 +5,7 @@ from FWCore.Utilities.Enumerate import Enumerate from Configuration.Geometry.dict2023Geometry import detectorVersionDict -varType = Enumerate ("Run1 2015 2017 2019 2023 MaPSA") +varType = Enumerate ("Run1 2015 2017 2021 2023 MaPSA") defaultVersion=str(); def help(): @@ -64,13 +64,13 @@ def recoGeoLoad(score): process.GlobalTag.globaltag = autoCond['upgrade2017'] process.load('Configuration.Geometry.GeometryExtended2017Reco_cff') - elif score == "2019": + elif score == "2021": process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") from Configuration.AlCa.autoCond import autoCond - process.GlobalTag.globaltag = autoCond['upgrade2019'] + process.GlobalTag.globaltag = autoCond['upgrade2021'] ## NOTE: There is no PTrackerParameters Rcd in this GT yet process.load('Geometry.TrackerGeometryBuilder.trackerParameters_cfi') - process.load('Configuration.Geometry.GeometryExtended2019Reco_cff') + process.load('Configuration.Geometry.GeometryExtended2021Reco_cff') ## NOTE: There are no Muon alignement records in the GT yet process.DTGeometryESModule.applyAlignment = cms.bool(False) process.CSCGeometryESModule.applyAlignment = cms.bool(False) diff --git a/Fireworks/Geometry/python/dumpSimGeometry_cfg.py b/Fireworks/Geometry/python/dumpSimGeometry_cfg.py index 0b615de10f684..b5c8ec9b87fa8 100644 --- a/Fireworks/Geometry/python/dumpSimGeometry_cfg.py +++ b/Fireworks/Geometry/python/dumpSimGeometry_cfg.py @@ -5,7 +5,7 @@ from FWCore.Utilities.Enumerate import Enumerate from Configuration.Geometry.dict2023Geometry import detectorVersionDict -varType = Enumerate ("Run1 2015 2015dev 2017 2017Muon 2019 2023") +varType = Enumerate ("Run1 2015 2015dev 2017 2017Muon 2021 2023") defaultVersion=str(); def help(): @@ -46,8 +46,8 @@ def simGeoLoad(score): elif score == "2017Muon": process.load("Geometry.CMSCommonData.cmsExtendedGeometry2017MuonXML_cfi") - elif score == "2019": - process.load("Geometry.CMSCommonData.cmsExtendedGeometry2019XML_cfi") + elif score == "2021": + process.load("Geometry.CMSCommonData.cmsExtendedGeometry2021XML_cfi") elif score == "2023": versionCheck(options.version) diff --git a/Geometry/CMSCommonData/data/cms/2019/v1/cms.xml b/Geometry/CMSCommonData/data/cms/2021/v1/cms.xml similarity index 100% rename from Geometry/CMSCommonData/data/cms/2019/v1/cms.xml rename to Geometry/CMSCommonData/data/cms/2021/v1/cms.xml diff --git a/Geometry/CMSCommonData/data/cms/2019/v2/cms.xml b/Geometry/CMSCommonData/data/cms/2021/v2/cms.xml similarity index 100% rename from Geometry/CMSCommonData/data/cms/2019/v2/cms.xml rename to Geometry/CMSCommonData/data/cms/2021/v2/cms.xml diff --git a/Geometry/CMSCommonData/data/cms/2019/v3/cms.xml b/Geometry/CMSCommonData/data/cms/2021/v3/cms.xml similarity index 100% rename from Geometry/CMSCommonData/data/cms/2019/v3/cms.xml rename to Geometry/CMSCommonData/data/cms/2021/v3/cms.xml diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2019XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2021XML_cfi.py similarity index 98% rename from Geometry/CMSCommonData/python/cmsExtendedGeometry2019XML_cfi.py rename to Geometry/CMSCommonData/python/cmsExtendedGeometry2021XML_cfi.py index 4be614a5fab3c..ddbb53e5a7341 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2019XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2021XML_cfi.py @@ -7,7 +7,7 @@ 'Geometry/CMSCommonData/data/materials.xml', 'Geometry/CMSCommonData/data/rotations.xml', 'Geometry/CMSCommonData/data/extend/v2/cmsextent.xml', - 'Geometry/CMSCommonData/data/cms/2019/v2/cms.xml', + 'Geometry/CMSCommonData/data/cms/2021/v2/cms.xml', 'Geometry/CMSCommonData/data/cmsMother.xml', 'Geometry/CMSCommonData/data/eta3/etaMax.xml', 'Geometry/CMSCommonData/data/cmsTracker.xml', @@ -227,8 +227,8 @@ 'Geometry/HcalCommonData/data/hcalouteralgo.xml', 'Geometry/HcalCommonData/data/hcalforwardalgo.xml', 'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml', - 'Geometry/HcalCommonData/data/hcalSimNumbering/2019/hcalSimNumbering.xml', - 'Geometry/HcalCommonData/data/hcalRecNumbering/2019/hcalRecNumbering.xml', + 'Geometry/HcalCommonData/data/hcalSimNumbering/2021/hcalSimNumbering.xml', + 'Geometry/HcalCommonData/data/hcalRecNumbering/2021/hcalRecNumbering.xml', 'Geometry/MuonCommonData/data/mbCommon/2017/v2/mbCommon.xml', 'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml', 'Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml', @@ -275,7 +275,7 @@ 'Geometry/EcalSimData/data/ESProdCuts.xml', 'Geometry/TrackerSimData/data/PhaseI/trackerProdCuts.xml', 'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml', - 'Geometry/MuonSimData/data/2019/muonProdCuts.xml', + 'Geometry/MuonSimData/data/2021/muonProdCuts.xml', 'Geometry/ForwardSimData/data/zdcProdCuts.xml', 'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml', 'Geometry/CMSCommonData/data/FieldParameters.xml'), diff --git a/Geometry/HcalCommonData/data/hcalRecNumbering/2019/hcalRecNumbering.xml b/Geometry/HcalCommonData/data/hcalRecNumbering/2021/hcalRecNumbering.xml similarity index 100% rename from Geometry/HcalCommonData/data/hcalRecNumbering/2019/hcalRecNumbering.xml rename to Geometry/HcalCommonData/data/hcalRecNumbering/2021/hcalRecNumbering.xml diff --git a/Geometry/HcalCommonData/data/hcalSimNumbering/2019/hcalSimNumbering.xml b/Geometry/HcalCommonData/data/hcalSimNumbering/2021/hcalSimNumbering.xml similarity index 100% rename from Geometry/HcalCommonData/data/hcalSimNumbering/2019/hcalSimNumbering.xml rename to Geometry/HcalCommonData/data/hcalSimNumbering/2021/hcalSimNumbering.xml diff --git a/Geometry/MuonSimData/data/2019/muonProdCuts.xml b/Geometry/MuonSimData/data/2021/muonProdCuts.xml similarity index 100% rename from Geometry/MuonSimData/data/2019/muonProdCuts.xml rename to Geometry/MuonSimData/data/2021/muonProdCuts.xml diff --git a/Geometry/TrackerNumberingBuilder/test/dumpSimGeometry_cfg.py b/Geometry/TrackerNumberingBuilder/test/dumpSimGeometry_cfg.py index 71bfe64b328c1..bf3e25341d2e6 100644 --- a/Geometry/TrackerNumberingBuilder/test/dumpSimGeometry_cfg.py +++ b/Geometry/TrackerNumberingBuilder/test/dumpSimGeometry_cfg.py @@ -4,7 +4,7 @@ import FWCore.ParameterSet.VarParsing as VarParsing from FWCore.Utilities.Enumerate import Enumerate -varType = Enumerate ("Run1 Ideal2015 Ideal2015dev 2015 2015dev GEMDev RPC4RE11 2017 2019 2023 2023dev 2023sim 2023Muon MaPSA CRack DB") +varType = Enumerate ("Run1 Ideal2015 Ideal2015dev 2015 2015dev GEMDev RPC4RE11 2017 2021 2023 2023dev 2023sim 2023Muon MaPSA CRack DB") def help(): print("Usage: cmsRun dumpSimGeometry_cfg.py tag=TAG ") @@ -43,8 +43,8 @@ def simGeoLoad(score): elif score == "2017": process.load('Geometry.CMSCommonData.cmsExtendedGeometry2017XML_cfi') - elif score == "2019": - process.load('Configuration.Geometry.GeometryExtended2019Reco_cff') + elif score == "2021": + process.load('Configuration.Geometry.GeometryExtended2021Reco_cff') elif score == "2023dev": process.load('Geometry.CMSCommonData.cmsExtendedGeometry2023devXML_cfi') diff --git a/L1Trigger/TrackTrigger/python/TkOnlyFlatGeom_cff.py b/L1Trigger/TrackTrigger/python/TkOnlyFlatGeom_cff.py index 83dd82d8bf257..fbe522d9b9a75 100644 --- a/L1Trigger/TrackTrigger/python/TkOnlyFlatGeom_cff.py +++ b/L1Trigger/TrackTrigger/python/TkOnlyFlatGeom_cff.py @@ -33,7 +33,7 @@ 'Geometry/CMSCommonData/data/materials.xml', 'Geometry/CMSCommonData/data/rotations.xml', 'Geometry/CMSCommonData/data/extend/cmsextent.xml', - 'Geometry/CMSCommonData/data/cms/2019/v1/cms.xml', + 'Geometry/CMSCommonData/data/cms/2021/v1/cms.xml', 'Geometry/CMSCommonData/data/cmsMother.xml', 'Geometry/CMSCommonData/data/cmsTracker.xml', 'Geometry/CMSCommonData/data/eta3/etaMax.xml', diff --git a/L1Trigger/TrackTrigger/python/TkOnlyTiltedGeom_cff.py b/L1Trigger/TrackTrigger/python/TkOnlyTiltedGeom_cff.py index 0aa169ead7ca4..61d2f80a7800e 100644 --- a/L1Trigger/TrackTrigger/python/TkOnlyTiltedGeom_cff.py +++ b/L1Trigger/TrackTrigger/python/TkOnlyTiltedGeom_cff.py @@ -34,7 +34,7 @@ 'Geometry/CMSCommonData/data/materials.xml', 'Geometry/CMSCommonData/data/rotations.xml', 'Geometry/CMSCommonData/data/extend/cmsextent.xml', - 'Geometry/CMSCommonData/data/cms/2019/v1/cms.xml', + 'Geometry/CMSCommonData/data/cms/2021/v1/cms.xml', 'Geometry/CMSCommonData/data/cmsMother.xml', 'Geometry/CMSCommonData/data/cmsTracker.xml', 'Geometry/CMSCommonData/data/eta3/etaMax.xml', diff --git a/RecoMuon/MuonIdentification/test/runME0MuonReco_Example.py b/RecoMuon/MuonIdentification/test/runME0MuonReco_Example.py index ca536620344c1..1c35fa2c8dfc7 100644 --- a/RecoMuon/MuonIdentification/test/runME0MuonReco_Example.py +++ b/RecoMuon/MuonIdentification/test/runME0MuonReco_Example.py @@ -19,9 +19,9 @@ process.load('TrackPropagation.SteppingHelixPropagator.SteppingHelixPropagatorOpposite_cfi') process.load('TrackPropagation.SteppingHelixPropagator.SteppingHelixPropagatorAlong_cfi') -## global tag for 2019 upgrade studies +## global tag for 2021 upgrade studies from Configuration.AlCa.GlobalTag import GlobalTag -#process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:upgrade2019', '') +#process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:upgrade2021', '') #process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:upgradePLS3', '') process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run2_mc', '') diff --git a/RecoParticleFlow/PFClusterProducer/python/particleFlowClusterHCAL_cfi.py b/RecoParticleFlow/PFClusterProducer/python/particleFlowClusterHCAL_cfi.py index 94aaf14000537..a37a6f16f57ff 100644 --- a/RecoParticleFlow/PFClusterProducer/python/particleFlowClusterHCAL_cfi.py +++ b/RecoParticleFlow/PFClusterProducer/python/particleFlowClusterHCAL_cfi.py @@ -43,7 +43,7 @@ ), ) -# offline 2019 +# offline 2021 from Configuration.Eras.Modifier_run3_HB_cff import run3_HB run3_HB.toModify(particleFlowClusterHCAL, pfClusterBuilder = dict( diff --git a/RecoParticleFlow/PFClusterProducer/python/particleFlowRecHitHBHE_cfi.py b/RecoParticleFlow/PFClusterProducer/python/particleFlowRecHitHBHE_cfi.py index 1584d80f51c2f..596a49bd693a7 100644 --- a/RecoParticleFlow/PFClusterProducer/python/particleFlowRecHitHBHE_cfi.py +++ b/RecoParticleFlow/PFClusterProducer/python/particleFlowRecHitHBHE_cfi.py @@ -51,7 +51,7 @@ producers = {0 : dict(qualityTests = {0 : dict(cuts = {1 : dict(threshold = _thresholdsHEphase1) } ) } ) }, ) -# offline 2019 +# offline 2021 from Configuration.Eras.Modifier_run3_HB_cff import run3_HB run3_HB.toModify(particleFlowRecHitHBHE, producers = {0 : dict(qualityTests = {0 : dict(cuts = {0 : dict(threshold = _thresholdsHBphase1) } ) } ) }, diff --git a/SimMuon/RPCDigitizer/test/runRPCDigiProducer_cfg.py b/SimMuon/RPCDigitizer/test/runRPCDigiProducer_cfg.py index e69fa74457e9e..15efdb3ad8815 100644 --- a/SimMuon/RPCDigitizer/test/runRPCDigiProducer_cfg.py +++ b/SimMuon/RPCDigitizer/test/runRPCDigiProducer_cfg.py @@ -38,23 +38,23 @@ # process.load('Configuration.StandardSequences.MagneticField_38T_PostLS1_cff') ############################# -### 2019 Geometry w/ GEM ### +### 2021 Geometry w/ GEM ### ############################ -# process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase1_2019_design', '') -# from SLHCUpgradeSimulations.Configuration.fixMissingUpgradeGTPayloads import fixRPCConditions # RPC Conditions for Phase2 Detector (2019) -# process = fixRPCConditions(process) # RPC Conditions for Phase2 Detector (2019) +# process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase1_2021_design', '') +# from SLHCUpgradeSimulations.Configuration.fixMissingUpgradeGTPayloads import fixRPCConditions # RPC Conditions for Phase2 Detector (2021) +# process = fixRPCConditions(process) # RPC Conditions for Phase2 Detector (2021) ### Info: ### conditions for RPC in 2023 are not updated for higher noises or lower efficiency -### conditions for RPC in 2019 loaded by the global tag are the same as he 2023 conditions +### conditions for RPC in 2021 loaded by the global tag are the same as he 2023 conditions ### by default it will not work because it uses the previous RPC Simulation Model (RPCSimAverageNoiseEffCls) ### while the newer RPC Simulation Model (RPCSimAsymmetricCls) is loaded in CMSSW ### by loading the fixRPCConditions the previous RPC Simulation Model will be loaded -### in future we ll have to give different conditions payload to the 2019 geometry +### in future we ll have to give different conditions payload to the 2021 geometry ### such that the newest RPC Simulation Model (RPCSimAsymmetricCls.h) can be used. # from SimMuon.GEMDigitizer.customizeGEMDigi import customize_digi_addGEM_muon_only # Customize for CSC + DT + GEM + RPC # process = customize_digi_addGEM_muon_only(process) # Digi only Muon Detectors -# process.load('Configuration.Geometry.GeometryExtended2019Reco_cff') -# process.load('Configuration.Geometry.GeometryExtended2019_cff') +# process.load('Configuration.Geometry.GeometryExtended2021Reco_cff') +# process.load('Configuration.Geometry.GeometryExtended2021_cff') # process.load('Configuration.StandardSequences.MagneticField_38T_PostLS1_cff') ############################ From bcc6ef1f3e52b93a4f71c1e466dd3303b2c88e63 Mon Sep 17 00:00:00 2001 From: Gaelle Date: Thu, 25 Apr 2019 16:17:29 +0200 Subject: [PATCH 02/10] 2nd round of 2019 migration --- .../DDCMS/data/cms-2015-muon-geometry.xml | 2 +- .../dtSpecsFilter/{2019 => 2021}/v1/dtSpecsFilter.xml | 0 ...totemTest2019XML_cfi.py => totemTest2021XML_cfi.py} | 10 +++++----- .../{totemTest2019_cff.py => totemTest2021_cff.py} | 2 +- Geometry/HGCalCommonData/python/testFastTimeXML_cfi.py | 2 +- Geometry/HGCalCommonData/python/testHGCV7XML_cfi.py | 2 +- Geometry/HGCalCommonData/python/testHGCV9XML_cfi.py | 2 +- Geometry/HGCalCommonData/python/testHGCXML_cfi.py | 2 +- Geometry/HGCalCommonData/python/testHGCalEEXML_cfi.py | 2 +- .../HGCalCommonData/python/testHGCalHEmixXML_cfi.py | 2 +- .../HGCalCommonData/python/testHGCalHEsilXML_cfi.py | 2 +- Geometry/HGCalCommonData/python/testHGCalXML_cfi.py | 2 +- 12 files changed, 15 insertions(+), 15 deletions(-) rename Geometry/DTGeometryBuilder/data/dtSpecsFilter/{2019 => 2021}/v1/dtSpecsFilter.xml (100%) rename Geometry/ForwardCommonData/python/{totemTest2019XML_cfi.py => totemTest2021XML_cfi.py} (98%) rename Geometry/ForwardCommonData/python/{totemTest2019_cff.py => totemTest2021_cff.py} (81%) diff --git a/DetectorDescription/DDCMS/data/cms-2015-muon-geometry.xml b/DetectorDescription/DDCMS/data/cms-2015-muon-geometry.xml index 3b2e3eecbff54..37f82bc858c08 100644 --- a/DetectorDescription/DDCMS/data/cms-2015-muon-geometry.xml +++ b/DetectorDescription/DDCMS/data/cms-2015-muon-geometry.xml @@ -57,7 +57,7 @@ - + diff --git a/Geometry/DTGeometryBuilder/data/dtSpecsFilter/2019/v1/dtSpecsFilter.xml b/Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml similarity index 100% rename from Geometry/DTGeometryBuilder/data/dtSpecsFilter/2019/v1/dtSpecsFilter.xml rename to Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml diff --git a/Geometry/ForwardCommonData/python/totemTest2019XML_cfi.py b/Geometry/ForwardCommonData/python/totemTest2021XML_cfi.py similarity index 98% rename from Geometry/ForwardCommonData/python/totemTest2019XML_cfi.py rename to Geometry/ForwardCommonData/python/totemTest2021XML_cfi.py index d9d0138c9c155..c84b83400d213 100644 --- a/Geometry/ForwardCommonData/python/totemTest2019XML_cfi.py +++ b/Geometry/ForwardCommonData/python/totemTest2021XML_cfi.py @@ -7,7 +7,7 @@ 'Geometry/CMSCommonData/data/materials.xml', 'Geometry/CMSCommonData/data/rotations.xml', 'Geometry/CMSCommonData/data/extend/v2/cmsextent.xml', - 'Geometry/CMSCommonData/data/cms/2019/v3/cms.xml', + 'Geometry/CMSCommonData/data/cms/2021/v3/cms.xml', 'Geometry/CMSCommonData/data/cmsMother.xml', 'Geometry/CMSCommonData/data/eta3/etaMax.xml', 'Geometry/CMSCommonData/data/cmsTracker.xml', @@ -227,8 +227,8 @@ 'Geometry/HcalCommonData/data/hcalouteralgo.xml', 'Geometry/HcalCommonData/data/hcalforwardalgo.xml', 'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml', - 'Geometry/HcalCommonData/data/hcalSimNumbering/2019/hcalSimNumbering.xml', - 'Geometry/HcalCommonData/data/hcalRecNumbering/2019/hcalRecNumbering.xml', + 'Geometry/HcalCommonData/data/hcalSimNumbering/2021/hcalSimNumbering.xml', + 'Geometry/HcalCommonData/data/hcalRecNumbering/2021/hcalRecNumbering.xml', 'Geometry/MuonCommonData/data/mbCommon/2017/v2/mbCommon.xml', 'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml', 'Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml', @@ -246,7 +246,7 @@ 'Geometry/ForwardCommonData/data/PostLS2/bcml2.xml', 'Geometry/ForwardCommonData/data/brmrotations.xml', 'Geometry/ForwardCommonData/data/PostLS2/brm.xml', - 'Geometry/ForwardCommonData/data/totemTest/2019/totemTest.xml', + 'Geometry/ForwardCommonData/data/totemTest/2021/totemTest.xml', 'Geometry/ForwardCommonData/data/zdcmaterials.xml', 'Geometry/ForwardCommonData/data/lumimaterials.xml', 'Geometry/ForwardCommonData/data/zdcrotations.xml', @@ -254,7 +254,7 @@ 'Geometry/ForwardCommonData/data/zdc.xml', 'Geometry/ForwardCommonData/data/zdclumi.xml', 'Geometry/ForwardCommonData/data/cmszdc.xml')+cms.vstring( - 'Geometry/MuonCommonData/data/muonNumbering/2019/v2/muonNumbering.xml', + 'Geometry/MuonCommonData/data/muonNumbering/2021/v2/muonNumbering.xml', 'Geometry/TrackerCommonData/data/PhaseI/trackerStructureTopology.xml', 'Geometry/TrackerSimData/data/PhaseI/trackersens.xml', 'Geometry/TrackerRecoData/data/PhaseI/trackerRecoMaterial.xml', diff --git a/Geometry/ForwardCommonData/python/totemTest2019_cff.py b/Geometry/ForwardCommonData/python/totemTest2021_cff.py similarity index 81% rename from Geometry/ForwardCommonData/python/totemTest2019_cff.py rename to Geometry/ForwardCommonData/python/totemTest2021_cff.py index 1223aee56bb45..616b3547d4344 100644 --- a/Geometry/ForwardCommonData/python/totemTest2019_cff.py +++ b/Geometry/ForwardCommonData/python/totemTest2021_cff.py @@ -1,7 +1,7 @@ import FWCore.ParameterSet.Config as cms # Geometry for simulation -from Geometry.ForwardCommonData.totemTest2019XML_cfi import * +from Geometry.ForwardCommonData.totemTest2021XML_cfi import * from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import * from Geometry.HcalCommonData.hcalParameters_cfi import * from Geometry.HcalCommonData.hcalDDDSimConstants_cfi import * diff --git a/Geometry/HGCalCommonData/python/testFastTimeXML_cfi.py b/Geometry/HGCalCommonData/python/testFastTimeXML_cfi.py index 4b78041d8c59d..7fd61a03e088a 100644 --- a/Geometry/HGCalCommonData/python/testFastTimeXML_cfi.py +++ b/Geometry/HGCalCommonData/python/testFastTimeXML_cfi.py @@ -8,7 +8,7 @@ 'Geometry/CMSCommonData/data/materials.xml', 'Geometry/CMSCommonData/data/rotations.xml', 'Geometry/CMSCommonData/data/extend/cmsextent.xml', - 'Geometry/CMSCommonData/data/cms/2019/v1/cms.xml', + 'Geometry/CMSCommonData/data/cms/2021/v1/cms.xml', 'Geometry/CMSCommonData/data/eta3/etaMax.xml', 'Geometry/CMSCommonData/data/cmsMother.xml', 'Geometry/CMSCommonData/data/cmsTracker.xml', diff --git a/Geometry/HGCalCommonData/python/testHGCV7XML_cfi.py b/Geometry/HGCalCommonData/python/testHGCV7XML_cfi.py index 070f71d765492..94d7ca9ab359e 100644 --- a/Geometry/HGCalCommonData/python/testHGCV7XML_cfi.py +++ b/Geometry/HGCalCommonData/python/testHGCV7XML_cfi.py @@ -8,7 +8,7 @@ 'Geometry/CMSCommonData/data/materials.xml', 'Geometry/CMSCommonData/data/rotations.xml', 'Geometry/CMSCommonData/data/extend/cmsextent.xml', - 'Geometry/CMSCommonData/data/cms/2019/v1/cms.xml', + 'Geometry/CMSCommonData/data/cms/2021/v1/cms.xml', 'Geometry/CMSCommonData/data/eta3/etaMax.xml', 'Geometry/CMSCommonData/data/cmsMother.xml', 'Geometry/CMSCommonData/data/cmsTracker.xml', diff --git a/Geometry/HGCalCommonData/python/testHGCV9XML_cfi.py b/Geometry/HGCalCommonData/python/testHGCV9XML_cfi.py index b01cb6e84554c..d651b27b41f29 100644 --- a/Geometry/HGCalCommonData/python/testHGCV9XML_cfi.py +++ b/Geometry/HGCalCommonData/python/testHGCV9XML_cfi.py @@ -6,7 +6,7 @@ 'Geometry/CMSCommonData/data/materials.xml', 'Geometry/CMSCommonData/data/rotations.xml', 'Geometry/CMSCommonData/data/extend/cmsextent.xml', - 'Geometry/CMSCommonData/data/cms/2019/v1/cms.xml', + 'Geometry/CMSCommonData/data/cms/2021/v1/cms.xml', 'Geometry/CMSCommonData/data/eta3/etaMax.xml', 'Geometry/CMSCommonData/data/cmsMother.xml', 'Geometry/CMSCommonData/data/caloBase/2023/v1/caloBase.xml', diff --git a/Geometry/HGCalCommonData/python/testHGCXML_cfi.py b/Geometry/HGCalCommonData/python/testHGCXML_cfi.py index 8e1b0be31b6ed..92d3c90adca35 100644 --- a/Geometry/HGCalCommonData/python/testHGCXML_cfi.py +++ b/Geometry/HGCalCommonData/python/testHGCXML_cfi.py @@ -5,7 +5,7 @@ 'Geometry/CMSCommonData/data/materials.xml', 'Geometry/CMSCommonData/data/rotations.xml', 'Geometry/CMSCommonData/data/extend/cmsextent.xml', - 'Geometry/CMSCommonData/data/cms/2019/v1/cms.xml', + 'Geometry/CMSCommonData/data/cms/2021/v1/cms.xml', 'Geometry/CMSCommonData/data/eta3/etaMax.xml', 'Geometry/CMSCommonData/data/cmsMother.xml', 'Geometry/CMSCommonData/data/caloBase/2023/v1/caloBase.xml', diff --git a/Geometry/HGCalCommonData/python/testHGCalEEXML_cfi.py b/Geometry/HGCalCommonData/python/testHGCalEEXML_cfi.py index c1fbde1a61f86..a8e7bc9040640 100644 --- a/Geometry/HGCalCommonData/python/testHGCalEEXML_cfi.py +++ b/Geometry/HGCalCommonData/python/testHGCalEEXML_cfi.py @@ -5,7 +5,7 @@ 'Geometry/CMSCommonData/data/materials.xml', 'Geometry/CMSCommonData/data/rotations.xml', 'Geometry/CMSCommonData/data/extend/cmsextent.xml', - 'Geometry/CMSCommonData/data/cms/2019/v1/cms.xml', + 'Geometry/CMSCommonData/data/cms/2021/v1/cms.xml', 'Geometry/CMSCommonData/data/eta3/etaMax.xml', 'Geometry/CMSCommonData/data/cmsMother.xml', 'Geometry/CMSCommonData/data/caloBase/2023/v1/caloBase.xml', diff --git a/Geometry/HGCalCommonData/python/testHGCalHEmixXML_cfi.py b/Geometry/HGCalCommonData/python/testHGCalHEmixXML_cfi.py index a7de10f28f9bb..df0efd994bf8d 100644 --- a/Geometry/HGCalCommonData/python/testHGCalHEmixXML_cfi.py +++ b/Geometry/HGCalCommonData/python/testHGCalHEmixXML_cfi.py @@ -5,7 +5,7 @@ 'Geometry/CMSCommonData/data/materials.xml', 'Geometry/CMSCommonData/data/rotations.xml', 'Geometry/CMSCommonData/data/extend/cmsextent.xml', - 'Geometry/CMSCommonData/data/cms/2019/v1/cms.xml', + 'Geometry/CMSCommonData/data/cms/2021/v1/cms.xml', 'Geometry/CMSCommonData/data/eta3/etaMax.xml', 'Geometry/CMSCommonData/data/cmsMother.xml', 'Geometry/CMSCommonData/data/caloBase/2023/v1/caloBase.xml', diff --git a/Geometry/HGCalCommonData/python/testHGCalHEsilXML_cfi.py b/Geometry/HGCalCommonData/python/testHGCalHEsilXML_cfi.py index 89f319450ded8..7bc28ce98a730 100644 --- a/Geometry/HGCalCommonData/python/testHGCalHEsilXML_cfi.py +++ b/Geometry/HGCalCommonData/python/testHGCalHEsilXML_cfi.py @@ -5,7 +5,7 @@ 'Geometry/CMSCommonData/data/materials.xml', 'Geometry/CMSCommonData/data/rotations.xml', 'Geometry/CMSCommonData/data/extend/cmsextent.xml', - 'Geometry/CMSCommonData/data/cms/2019/v1/cms.xml', + 'Geometry/CMSCommonData/data/cms/2021/v1/cms.xml', 'Geometry/CMSCommonData/data/eta3/etaMax.xml', 'Geometry/CMSCommonData/data/cmsMother.xml', 'Geometry/CMSCommonData/data/caloBase/2023/v1/caloBase.xml', diff --git a/Geometry/HGCalCommonData/python/testHGCalXML_cfi.py b/Geometry/HGCalCommonData/python/testHGCalXML_cfi.py index 070f71d765492..94d7ca9ab359e 100644 --- a/Geometry/HGCalCommonData/python/testHGCalXML_cfi.py +++ b/Geometry/HGCalCommonData/python/testHGCalXML_cfi.py @@ -8,7 +8,7 @@ 'Geometry/CMSCommonData/data/materials.xml', 'Geometry/CMSCommonData/data/rotations.xml', 'Geometry/CMSCommonData/data/extend/cmsextent.xml', - 'Geometry/CMSCommonData/data/cms/2019/v1/cms.xml', + 'Geometry/CMSCommonData/data/cms/2021/v1/cms.xml', 'Geometry/CMSCommonData/data/eta3/etaMax.xml', 'Geometry/CMSCommonData/data/cmsMother.xml', 'Geometry/CMSCommonData/data/cmsTracker.xml', From 8ca73299484b339940aa39eb956472b12f6088d0 Mon Sep 17 00:00:00 2001 From: Gaelle Date: Thu, 25 Apr 2019 16:53:56 +0200 Subject: [PATCH 03/10] 2021 Migration --- CalibCalorimetry/CaloTPG/src/CaloTPGTranscoderULUT.cc | 4 ++-- .../HcalCalibAlgos/macros/HBHEMuonOfflineAnalyzer.C | 4 ++-- .../IsolatedParticles/macros/HBHEMuonOfflineSimAnalyzer.C | 4 ++-- .../data/hcalRecNumbering/2021/hcalRecNumbering.xml | 2 +- .../data/hcalRecNumbering/2023/hcalRecNumbering.xml | 2 +- .../data/hcalRecNumbering/Eta4/hcalRecNumbering.xml | 2 +- .../data/hcalRecNumbering/HGCal/hcalRecNumbering.xml | 2 +- .../data/hcalRecNumbering/NoHE/hcalRecNumbering.xml | 2 +- .../data/hcalRecNumbering/PhaseII/hcalRecNumbering.xml | 2 +- .../data/hcalRecNumbering/Rebuild/hcalRecNumbering.xml | 2 +- .../data/hcalRecNumbering/RebuildHE/hcalRecNumbering.xml | 2 +- Geometry/HcalCommonData/interface/HcalTopologyMode.h | 2 +- .../HcalCommonData/python/testPhase1GeometryXML_cfi.py | 8 ++++---- Geometry/HcalCommonData/src/HcalTopologyMode.cc | 2 +- 14 files changed, 20 insertions(+), 20 deletions(-) diff --git a/CalibCalorimetry/CaloTPG/src/CaloTPGTranscoderULUT.cc b/CalibCalorimetry/CaloTPG/src/CaloTPGTranscoderULUT.cc index a32aa436aa6e9..7479f5dd73def 100644 --- a/CalibCalorimetry/CaloTPG/src/CaloTPGTranscoderULUT.cc +++ b/CalibCalorimetry/CaloTPG/src/CaloTPGTranscoderULUT.cc @@ -240,7 +240,7 @@ CaloTPGTranscoderULUT::getOutputLUTSize(const HcalTrigTowerDetId& id) const return QIE11_OUTPUT_LUT_SIZE; else return QIE10_OUTPUT_LUT_SIZE; - case HcalTopologyMode::TriggerMode_2019: + case HcalTopologyMode::TriggerMode_2021: if (id.ietaAbs() <= theTopology->lastHERing()) return QIE11_OUTPUT_LUT_SIZE; else @@ -268,7 +268,7 @@ CaloTPGTranscoderULUT::isOnlyQIE11(const HcalTrigTowerDetId& id) const if (id.ietaAbs() <= theTopology->lastHBRing()) return false; return true; - case HcalTopologyMode::TriggerMode_2019: + case HcalTopologyMode::TriggerMode_2021: return true; default: throw cms::Exception("CaloTPGTranscoderULUT") diff --git a/Calibration/HcalCalibAlgos/macros/HBHEMuonOfflineAnalyzer.C b/Calibration/HcalCalibAlgos/macros/HBHEMuonOfflineAnalyzer.C index 20f961f96c102..f19e6504f685e 100644 --- a/Calibration/HcalCalibAlgos/macros/HBHEMuonOfflineAnalyzer.C +++ b/Calibration/HcalCalibAlgos/macros/HBHEMuonOfflineAnalyzer.C @@ -342,7 +342,7 @@ public : int runHi=99999999, int etaMin=1, int etaMax=29, bool debug=false); // mode of LHC is kept 1 for 2017 scenario as no change in depth segmentation - // mode of LHC is 0 for 2019 + // mode of LHC is 0 for 2021 virtual ~HBHEMuonOfflineAnalyzer(); virtual Int_t Cut(Long64_t entry); @@ -1712,7 +1712,7 @@ int HBHEMuonOfflineAnalyzer::nDepthBins(int eta, int phi) { int nDepthR3[29]={4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,3,5,6,6,6,6,6,6,6,7,7,7,3}; // Run 4 scenario int nDepthR4[29]={4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,7,7,7,7,7,7,7,7,7,7,7,7,7}; - // for 2019 scenario multi depth segmentation + // for 2021 scenario multi depth segmentation // int nDepth[29]={3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,5,5,5,5,5,5,5,5,5,5,5,5,5}; // modeLHC_ = 0 --> nbin defined maxDepthHB/HE // = 1 --> corresponds to Run 1 (valid till 2016) diff --git a/Calibration/IsolatedParticles/macros/HBHEMuonOfflineSimAnalyzer.C b/Calibration/IsolatedParticles/macros/HBHEMuonOfflineSimAnalyzer.C index e25bb87d03146..d533a42c0cefc 100644 --- a/Calibration/IsolatedParticles/macros/HBHEMuonOfflineSimAnalyzer.C +++ b/Calibration/IsolatedParticles/macros/HBHEMuonOfflineSimAnalyzer.C @@ -113,7 +113,7 @@ public : HBHEMuonOfflineSimAnalyzer(const char *infile, const char *outfile="dyll_PU20_25_output_10.root", const int mode=0, const int maxDHB=4, const int maxDHE=7); // mode of LHC is kept 1 for 2017 scenario as no change in depth segmentation - // mode of LHC is 0 for 2019 + // mode of LHC is 0 for 2021 virtual ~HBHEMuonOfflineSimAnalyzer(); virtual Int_t Cut(Long64_t entry); virtual Int_t GetEntry(Long64_t entry); @@ -862,7 +862,7 @@ void HBHEMuonOfflineSimAnalyzer::WriteHistograms() { int HBHEMuonOfflineSimAnalyzer::NDepthBins(int eta) { // int nDepth[29]={1,1,1,1,1,1,1,1,1,1,1,1,1,1,2,3,1,2,2,2,2,2,2,2,2,2,3,3,2}; - // for 2019 scenario multi depth segmentation + // for 2021 scenario multi depth segmentation // int nDepth[29]={3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,5,5,5,5,5,5,5,5,5,5,5,5,5}; int nDepth[29]={4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,7,7,7,7,7,7,7,7,7,7,7,7,7}; diff --git a/Geometry/HcalCommonData/data/hcalRecNumbering/2021/hcalRecNumbering.xml b/Geometry/HcalCommonData/data/hcalRecNumbering/2021/hcalRecNumbering.xml index f42f64ac0a028..523688c6716b6 100644 --- a/Geometry/HcalCommonData/data/hcalRecNumbering/2021/hcalRecNumbering.xml +++ b/Geometry/HcalCommonData/data/hcalRecNumbering/2021/hcalRecNumbering.xml @@ -35,7 +35,7 @@ - + diff --git a/Geometry/HcalCommonData/data/hcalRecNumbering/2023/hcalRecNumbering.xml b/Geometry/HcalCommonData/data/hcalRecNumbering/2023/hcalRecNumbering.xml index d48c85f8f1a60..5d831661835d5 100644 --- a/Geometry/HcalCommonData/data/hcalRecNumbering/2023/hcalRecNumbering.xml +++ b/Geometry/HcalCommonData/data/hcalRecNumbering/2023/hcalRecNumbering.xml @@ -36,7 +36,7 @@ - + diff --git a/Geometry/HcalCommonData/data/hcalRecNumbering/Eta4/hcalRecNumbering.xml b/Geometry/HcalCommonData/data/hcalRecNumbering/Eta4/hcalRecNumbering.xml index f233b798b3b3b..b741e0e096b7c 100644 --- a/Geometry/HcalCommonData/data/hcalRecNumbering/Eta4/hcalRecNumbering.xml +++ b/Geometry/HcalCommonData/data/hcalRecNumbering/Eta4/hcalRecNumbering.xml @@ -32,7 +32,7 @@ - + diff --git a/Geometry/HcalCommonData/data/hcalRecNumbering/HGCal/hcalRecNumbering.xml b/Geometry/HcalCommonData/data/hcalRecNumbering/HGCal/hcalRecNumbering.xml index e92475aa14235..876e93ae9e770 100644 --- a/Geometry/HcalCommonData/data/hcalRecNumbering/HGCal/hcalRecNumbering.xml +++ b/Geometry/HcalCommonData/data/hcalRecNumbering/HGCal/hcalRecNumbering.xml @@ -34,7 +34,7 @@ - + diff --git a/Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/hcalRecNumbering.xml b/Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/hcalRecNumbering.xml index 4975cb93fbd55..32cbf5280ea5d 100644 --- a/Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/hcalRecNumbering.xml +++ b/Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/hcalRecNumbering.xml @@ -21,7 +21,7 @@ - + diff --git a/Geometry/HcalCommonData/data/hcalRecNumbering/PhaseII/hcalRecNumbering.xml b/Geometry/HcalCommonData/data/hcalRecNumbering/PhaseII/hcalRecNumbering.xml index 113830b823d1e..3a6946c34be2b 100644 --- a/Geometry/HcalCommonData/data/hcalRecNumbering/PhaseII/hcalRecNumbering.xml +++ b/Geometry/HcalCommonData/data/hcalRecNumbering/PhaseII/hcalRecNumbering.xml @@ -28,7 +28,7 @@ - + diff --git a/Geometry/HcalCommonData/data/hcalRecNumbering/Rebuild/hcalRecNumbering.xml b/Geometry/HcalCommonData/data/hcalRecNumbering/Rebuild/hcalRecNumbering.xml index 667a0e3b875a4..4960536d49d33 100644 --- a/Geometry/HcalCommonData/data/hcalRecNumbering/Rebuild/hcalRecNumbering.xml +++ b/Geometry/HcalCommonData/data/hcalRecNumbering/Rebuild/hcalRecNumbering.xml @@ -28,7 +28,7 @@ - + diff --git a/Geometry/HcalCommonData/data/hcalRecNumbering/RebuildHE/hcalRecNumbering.xml b/Geometry/HcalCommonData/data/hcalRecNumbering/RebuildHE/hcalRecNumbering.xml index 93a020727e7b7..2f47fcbda4e51 100644 --- a/Geometry/HcalCommonData/data/hcalRecNumbering/RebuildHE/hcalRecNumbering.xml +++ b/Geometry/HcalCommonData/data/hcalRecNumbering/RebuildHE/hcalRecNumbering.xml @@ -37,7 +37,7 @@ - + diff --git a/Geometry/HcalCommonData/interface/HcalTopologyMode.h b/Geometry/HcalCommonData/interface/HcalTopologyMode.h index 20deaf77cf958..b054afae89d13 100644 --- a/Geometry/HcalCommonData/interface/HcalTopologyMode.h +++ b/Geometry/HcalCommonData/interface/HcalTopologyMode.h @@ -33,7 +33,7 @@ namespace HcalTopologyMode { TriggerMode_2017=3, // HF upgraded to QIE10 TriggerMode_2017plan1=4, // HF upgraded to QIE10, 1 RBX of HE to QIE11 TriggerMode_2018=5, // HF upgraded to QIE10, HE to QIE11 - TriggerMode_2019=6 // HF upgraded to QIE10, HBHE to QIE11 + TriggerMode_2021=6 // HF upgraded to QIE10, HBHE to QIE11 }; } diff --git a/Geometry/HcalCommonData/python/testPhase1GeometryXML_cfi.py b/Geometry/HcalCommonData/python/testPhase1GeometryXML_cfi.py index 7acaefb33e8d5..94dc16aa6d485 100644 --- a/Geometry/HcalCommonData/python/testPhase1GeometryXML_cfi.py +++ b/Geometry/HcalCommonData/python/testPhase1GeometryXML_cfi.py @@ -6,7 +6,7 @@ geomXMLFiles = cms.vstring('Geometry/CMSCommonData/data/materials.xml', 'Geometry/CMSCommonData/data/rotations.xml', 'Geometry/CMSCommonData/data/extend/cmsextent.xml', - 'Geometry/CMSCommonData/data/cms/2019/v1/cms.xml', + 'Geometry/CMSCommonData/data/cms/2021/v1/cms.xml', 'Geometry/CMSCommonData/data/cmsMother.xml', 'Geometry/CMSCommonData/data/eta3/etaMax.xml', 'Geometry/CMSCommonData/data/cmsTracker.xml', @@ -224,8 +224,8 @@ 'Geometry/HcalCommonData/data/hcalouteralgo.xml', 'Geometry/HcalCommonData/data/hcalforwardalgo.xml', 'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml', - 'Geometry/HcalCommonData/data/hcalSimNumbering/2019/hcalSimNumbering.xml', - 'Geometry/HcalCommonData/data/hcalRecNumbering/2019/hcalRecNumbering.xml', + 'Geometry/HcalCommonData/data/hcalSimNumbering/2021/hcalSimNumbering.xml', + 'Geometry/HcalCommonData/data/hcalRecNumbering/2021/hcalRecNumbering.xml', 'Geometry/MuonCommonData/data/mbCommon/2017/v1/mbCommon.xml', 'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml', 'Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml', @@ -248,7 +248,7 @@ 'Geometry/ForwardCommonData/data/zdc.xml', 'Geometry/ForwardCommonData/data/zdclumi.xml', 'Geometry/ForwardCommonData/data/cmszdc.xml')+cms.vstring( - 'Geometry/MuonCommonData/data/muonNumbering/2019/v1/muonNumbering.xml', + 'Geometry/MuonCommonData/data/muonNumbering/2021/v1/muonNumbering.xml', 'Geometry/TrackerCommonData/data/PhaseI/trackerStructureTopology.xml', 'Geometry/TrackerSimData/data/PhaseI/trackersens.xml', 'Geometry/TrackerRecoData/data/PhaseI/trackerRecoMaterial.xml', diff --git a/Geometry/HcalCommonData/src/HcalTopologyMode.cc b/Geometry/HcalCommonData/src/HcalTopologyMode.cc index 55a5bc26bcd7f..c52ac83e6deec 100644 --- a/Geometry/HcalCommonData/src/HcalTopologyMode.cc +++ b/Geometry/HcalCommonData/src/HcalTopologyMode.cc @@ -15,5 +15,5 @@ StringToEnumParser::StringToEnumParser() { enumMap["HcalTopologyMode::TriggerMode_2017"] = HcalTopologyMode::TriggerMode_2017; enumMap["HcalTopologyMode::TriggerMode_2017plan1"] = HcalTopologyMode::TriggerMode_2017plan1; enumMap["HcalTopologyMode::TriggerMode_2018"] = HcalTopologyMode::TriggerMode_2018; - enumMap["HcalTopologyMode::TriggerMode_2019"] = HcalTopologyMode::TriggerMode_2019; + enumMap["HcalTopologyMode::TriggerMode_2021"] = HcalTopologyMode::TriggerMode_2021; } From ec90ee3f4de2d10f6964439577c6f4437dfd98eb Mon Sep 17 00:00:00 2001 From: Gaelle Date: Thu, 25 Apr 2019 17:10:38 +0200 Subject: [PATCH 04/10] Finishing with relval step .... --- Configuration/PyReleaseValidation/python/relval_steps.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py index daf079bce3278..067e4c8203396 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -2932,8 +2932,8 @@ def gen2018HiMix(fragment,howMuch): defaultDataSets['2017Design']='CMSSW_10_0_0_pre2-100X_mc2017_design_IdealBS_v1-v' defaultDataSets['2018']='CMSSW_10_5_0_pre1-103X_upgrade2018_realistic_v8-v' defaultDataSets['2018Design']='CMSSW_10_5_0_pre1-103X_upgrade2018_design_v4-v' -defaultDataSets['2019']='CMSSW_10_6_0_pre3-105X_postLS2_realistic_v6-v' -defaultDataSets['2019Design']='CMSSW_10_6_0_pre3-105X_postLS2_realistic_v6-v' +defaultDataSets['2021']='CMSSW_10_6_0_pre3-105X_postLS2_realistic_v6-v' +defaultDataSets['2021Design']='CMSSW_10_6_0_pre3-105X_postLS2_realistic_v6-v' defaultDataSets['2023D17']='CMSSW_10_2_0_pre2-101X_upgrade2023_realistic_v5_2023D17noPU-v' defaultDataSets['2023D19']='' defaultDataSets['2023D21']='' @@ -2977,7 +2977,11 @@ def gen2018HiMix(fragment,howMuch): PUDataSets[ds]={'-n':10,'--pileup':'AVE_35_BX_25ns','--pileup_input':'das:/RelValMinBias_13/%s/GEN-SIM'%(name,)} elif '2018' in name: PUDataSets[ds]={'-n':10,'--pileup':'AVE_50_BX_25ns','--pileup_input':'das:/RelValMinBias_13/%s/GEN-SIM'%(name,)} +<<<<<<< HEAD elif 'postLS2' in name: +======= + elif '2021' in name: +>>>>>>> Finishing with relval step .... PUDataSets[ds]={'-n':10,'--pileup':'AVE_50_BX_25ns','--pileup_input':'das:/RelValMinBias_13/%s/GEN-SIM'%(name,)} elif '2023' in name: PUDataSets[ds]={'-n':10,'--pileup':'AVE_200_BX_25ns','--pileup_input':'das:/RelValMinBias_14TeV/%s/GEN-SIM'%(name,)} From 608342c1fe384a51b68a94308be875e6ceca51ac Mon Sep 17 00:00:00 2001 From: Gaelle Date: Thu, 25 Apr 2019 17:29:14 +0200 Subject: [PATCH 05/10] forgot the lack od 2021 in the GT name --- Configuration/PyReleaseValidation/python/relval_steps.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py index 067e4c8203396..27a171db23caa 100644 --- a/Configuration/PyReleaseValidation/python/relval_steps.py +++ b/Configuration/PyReleaseValidation/python/relval_steps.py @@ -2977,11 +2977,7 @@ def gen2018HiMix(fragment,howMuch): PUDataSets[ds]={'-n':10,'--pileup':'AVE_35_BX_25ns','--pileup_input':'das:/RelValMinBias_13/%s/GEN-SIM'%(name,)} elif '2018' in name: PUDataSets[ds]={'-n':10,'--pileup':'AVE_50_BX_25ns','--pileup_input':'das:/RelValMinBias_13/%s/GEN-SIM'%(name,)} -<<<<<<< HEAD elif 'postLS2' in name: -======= - elif '2021' in name: ->>>>>>> Finishing with relval step .... PUDataSets[ds]={'-n':10,'--pileup':'AVE_50_BX_25ns','--pileup_input':'das:/RelValMinBias_13/%s/GEN-SIM'%(name,)} elif '2023' in name: PUDataSets[ds]={'-n':10,'--pileup':'AVE_200_BX_25ns','--pileup_input':'das:/RelValMinBias_14TeV/%s/GEN-SIM'%(name,)} From bfeb537ad5ac625da7dc618960cf814d7c426fa1 Mon Sep 17 00:00:00 2001 From: Gaelle Date: Tue, 30 Apr 2019 15:09:04 +0200 Subject: [PATCH 06/10] Preserving 2019 for actual changes during this particular year --- Geometry/CMSCommonData/data/cms/{2021 => 2019}/v1/cms.xml | 0 Geometry/CMSCommonData/data/cms/{2021 => 2019}/v2/cms.xml | 0 Geometry/CMSCommonData/data/cms/{2021 => 2019}/v3/cms.xml | 0 Geometry/CMSCommonData/python/cmsExtendedGeometry2021XML_cfi.py | 2 +- Geometry/ForwardCommonData/python/totemTest2021XML_cfi.py | 2 +- Geometry/HGCalCommonData/python/testFastTimeXML_cfi.py | 2 +- Geometry/HGCalCommonData/python/testHGCV7XML_cfi.py | 2 +- Geometry/HGCalCommonData/python/testHGCV9XML_cfi.py | 2 +- Geometry/HGCalCommonData/python/testHGCXML_cfi.py | 2 +- Geometry/HGCalCommonData/python/testHGCalEEXML_cfi.py | 2 +- Geometry/HGCalCommonData/python/testHGCalHEmixXML_cfi.py | 2 +- Geometry/HGCalCommonData/python/testHGCalHEsilXML_cfi.py | 2 +- Geometry/HGCalCommonData/python/testHGCalXML_cfi.py | 2 +- Geometry/HcalCommonData/python/testPhase1GeometryXML_cfi.py | 2 +- 14 files changed, 11 insertions(+), 11 deletions(-) rename Geometry/CMSCommonData/data/cms/{2021 => 2019}/v1/cms.xml (100%) rename Geometry/CMSCommonData/data/cms/{2021 => 2019}/v2/cms.xml (100%) rename Geometry/CMSCommonData/data/cms/{2021 => 2019}/v3/cms.xml (100%) diff --git a/Geometry/CMSCommonData/data/cms/2021/v1/cms.xml b/Geometry/CMSCommonData/data/cms/2019/v1/cms.xml similarity index 100% rename from Geometry/CMSCommonData/data/cms/2021/v1/cms.xml rename to Geometry/CMSCommonData/data/cms/2019/v1/cms.xml diff --git a/Geometry/CMSCommonData/data/cms/2021/v2/cms.xml b/Geometry/CMSCommonData/data/cms/2019/v2/cms.xml similarity index 100% rename from Geometry/CMSCommonData/data/cms/2021/v2/cms.xml rename to Geometry/CMSCommonData/data/cms/2019/v2/cms.xml diff --git a/Geometry/CMSCommonData/data/cms/2021/v3/cms.xml b/Geometry/CMSCommonData/data/cms/2019/v3/cms.xml similarity index 100% rename from Geometry/CMSCommonData/data/cms/2021/v3/cms.xml rename to Geometry/CMSCommonData/data/cms/2019/v3/cms.xml diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2021XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2021XML_cfi.py index ddbb53e5a7341..807e3ea06a4cb 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2021XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2021XML_cfi.py @@ -7,7 +7,7 @@ 'Geometry/CMSCommonData/data/materials.xml', 'Geometry/CMSCommonData/data/rotations.xml', 'Geometry/CMSCommonData/data/extend/v2/cmsextent.xml', - 'Geometry/CMSCommonData/data/cms/2021/v2/cms.xml', + 'Geometry/CMSCommonData/data/cms/2019/v2/cms.xml', 'Geometry/CMSCommonData/data/cmsMother.xml', 'Geometry/CMSCommonData/data/eta3/etaMax.xml', 'Geometry/CMSCommonData/data/cmsTracker.xml', diff --git a/Geometry/ForwardCommonData/python/totemTest2021XML_cfi.py b/Geometry/ForwardCommonData/python/totemTest2021XML_cfi.py index c84b83400d213..4f27853621bb0 100644 --- a/Geometry/ForwardCommonData/python/totemTest2021XML_cfi.py +++ b/Geometry/ForwardCommonData/python/totemTest2021XML_cfi.py @@ -7,7 +7,7 @@ 'Geometry/CMSCommonData/data/materials.xml', 'Geometry/CMSCommonData/data/rotations.xml', 'Geometry/CMSCommonData/data/extend/v2/cmsextent.xml', - 'Geometry/CMSCommonData/data/cms/2021/v3/cms.xml', + 'Geometry/CMSCommonData/data/cms/2019/v3/cms.xml', 'Geometry/CMSCommonData/data/cmsMother.xml', 'Geometry/CMSCommonData/data/eta3/etaMax.xml', 'Geometry/CMSCommonData/data/cmsTracker.xml', diff --git a/Geometry/HGCalCommonData/python/testFastTimeXML_cfi.py b/Geometry/HGCalCommonData/python/testFastTimeXML_cfi.py index 7fd61a03e088a..4b78041d8c59d 100644 --- a/Geometry/HGCalCommonData/python/testFastTimeXML_cfi.py +++ b/Geometry/HGCalCommonData/python/testFastTimeXML_cfi.py @@ -8,7 +8,7 @@ 'Geometry/CMSCommonData/data/materials.xml', 'Geometry/CMSCommonData/data/rotations.xml', 'Geometry/CMSCommonData/data/extend/cmsextent.xml', - 'Geometry/CMSCommonData/data/cms/2021/v1/cms.xml', + 'Geometry/CMSCommonData/data/cms/2019/v1/cms.xml', 'Geometry/CMSCommonData/data/eta3/etaMax.xml', 'Geometry/CMSCommonData/data/cmsMother.xml', 'Geometry/CMSCommonData/data/cmsTracker.xml', diff --git a/Geometry/HGCalCommonData/python/testHGCV7XML_cfi.py b/Geometry/HGCalCommonData/python/testHGCV7XML_cfi.py index 94d7ca9ab359e..070f71d765492 100644 --- a/Geometry/HGCalCommonData/python/testHGCV7XML_cfi.py +++ b/Geometry/HGCalCommonData/python/testHGCV7XML_cfi.py @@ -8,7 +8,7 @@ 'Geometry/CMSCommonData/data/materials.xml', 'Geometry/CMSCommonData/data/rotations.xml', 'Geometry/CMSCommonData/data/extend/cmsextent.xml', - 'Geometry/CMSCommonData/data/cms/2021/v1/cms.xml', + 'Geometry/CMSCommonData/data/cms/2019/v1/cms.xml', 'Geometry/CMSCommonData/data/eta3/etaMax.xml', 'Geometry/CMSCommonData/data/cmsMother.xml', 'Geometry/CMSCommonData/data/cmsTracker.xml', diff --git a/Geometry/HGCalCommonData/python/testHGCV9XML_cfi.py b/Geometry/HGCalCommonData/python/testHGCV9XML_cfi.py index d651b27b41f29..b01cb6e84554c 100644 --- a/Geometry/HGCalCommonData/python/testHGCV9XML_cfi.py +++ b/Geometry/HGCalCommonData/python/testHGCV9XML_cfi.py @@ -6,7 +6,7 @@ 'Geometry/CMSCommonData/data/materials.xml', 'Geometry/CMSCommonData/data/rotations.xml', 'Geometry/CMSCommonData/data/extend/cmsextent.xml', - 'Geometry/CMSCommonData/data/cms/2021/v1/cms.xml', + 'Geometry/CMSCommonData/data/cms/2019/v1/cms.xml', 'Geometry/CMSCommonData/data/eta3/etaMax.xml', 'Geometry/CMSCommonData/data/cmsMother.xml', 'Geometry/CMSCommonData/data/caloBase/2023/v1/caloBase.xml', diff --git a/Geometry/HGCalCommonData/python/testHGCXML_cfi.py b/Geometry/HGCalCommonData/python/testHGCXML_cfi.py index 92d3c90adca35..8e1b0be31b6ed 100644 --- a/Geometry/HGCalCommonData/python/testHGCXML_cfi.py +++ b/Geometry/HGCalCommonData/python/testHGCXML_cfi.py @@ -5,7 +5,7 @@ 'Geometry/CMSCommonData/data/materials.xml', 'Geometry/CMSCommonData/data/rotations.xml', 'Geometry/CMSCommonData/data/extend/cmsextent.xml', - 'Geometry/CMSCommonData/data/cms/2021/v1/cms.xml', + 'Geometry/CMSCommonData/data/cms/2019/v1/cms.xml', 'Geometry/CMSCommonData/data/eta3/etaMax.xml', 'Geometry/CMSCommonData/data/cmsMother.xml', 'Geometry/CMSCommonData/data/caloBase/2023/v1/caloBase.xml', diff --git a/Geometry/HGCalCommonData/python/testHGCalEEXML_cfi.py b/Geometry/HGCalCommonData/python/testHGCalEEXML_cfi.py index a8e7bc9040640..c1fbde1a61f86 100644 --- a/Geometry/HGCalCommonData/python/testHGCalEEXML_cfi.py +++ b/Geometry/HGCalCommonData/python/testHGCalEEXML_cfi.py @@ -5,7 +5,7 @@ 'Geometry/CMSCommonData/data/materials.xml', 'Geometry/CMSCommonData/data/rotations.xml', 'Geometry/CMSCommonData/data/extend/cmsextent.xml', - 'Geometry/CMSCommonData/data/cms/2021/v1/cms.xml', + 'Geometry/CMSCommonData/data/cms/2019/v1/cms.xml', 'Geometry/CMSCommonData/data/eta3/etaMax.xml', 'Geometry/CMSCommonData/data/cmsMother.xml', 'Geometry/CMSCommonData/data/caloBase/2023/v1/caloBase.xml', diff --git a/Geometry/HGCalCommonData/python/testHGCalHEmixXML_cfi.py b/Geometry/HGCalCommonData/python/testHGCalHEmixXML_cfi.py index df0efd994bf8d..a7de10f28f9bb 100644 --- a/Geometry/HGCalCommonData/python/testHGCalHEmixXML_cfi.py +++ b/Geometry/HGCalCommonData/python/testHGCalHEmixXML_cfi.py @@ -5,7 +5,7 @@ 'Geometry/CMSCommonData/data/materials.xml', 'Geometry/CMSCommonData/data/rotations.xml', 'Geometry/CMSCommonData/data/extend/cmsextent.xml', - 'Geometry/CMSCommonData/data/cms/2021/v1/cms.xml', + 'Geometry/CMSCommonData/data/cms/2019/v1/cms.xml', 'Geometry/CMSCommonData/data/eta3/etaMax.xml', 'Geometry/CMSCommonData/data/cmsMother.xml', 'Geometry/CMSCommonData/data/caloBase/2023/v1/caloBase.xml', diff --git a/Geometry/HGCalCommonData/python/testHGCalHEsilXML_cfi.py b/Geometry/HGCalCommonData/python/testHGCalHEsilXML_cfi.py index 7bc28ce98a730..89f319450ded8 100644 --- a/Geometry/HGCalCommonData/python/testHGCalHEsilXML_cfi.py +++ b/Geometry/HGCalCommonData/python/testHGCalHEsilXML_cfi.py @@ -5,7 +5,7 @@ 'Geometry/CMSCommonData/data/materials.xml', 'Geometry/CMSCommonData/data/rotations.xml', 'Geometry/CMSCommonData/data/extend/cmsextent.xml', - 'Geometry/CMSCommonData/data/cms/2021/v1/cms.xml', + 'Geometry/CMSCommonData/data/cms/2019/v1/cms.xml', 'Geometry/CMSCommonData/data/eta3/etaMax.xml', 'Geometry/CMSCommonData/data/cmsMother.xml', 'Geometry/CMSCommonData/data/caloBase/2023/v1/caloBase.xml', diff --git a/Geometry/HGCalCommonData/python/testHGCalXML_cfi.py b/Geometry/HGCalCommonData/python/testHGCalXML_cfi.py index 94d7ca9ab359e..070f71d765492 100644 --- a/Geometry/HGCalCommonData/python/testHGCalXML_cfi.py +++ b/Geometry/HGCalCommonData/python/testHGCalXML_cfi.py @@ -8,7 +8,7 @@ 'Geometry/CMSCommonData/data/materials.xml', 'Geometry/CMSCommonData/data/rotations.xml', 'Geometry/CMSCommonData/data/extend/cmsextent.xml', - 'Geometry/CMSCommonData/data/cms/2021/v1/cms.xml', + 'Geometry/CMSCommonData/data/cms/2019/v1/cms.xml', 'Geometry/CMSCommonData/data/eta3/etaMax.xml', 'Geometry/CMSCommonData/data/cmsMother.xml', 'Geometry/CMSCommonData/data/cmsTracker.xml', diff --git a/Geometry/HcalCommonData/python/testPhase1GeometryXML_cfi.py b/Geometry/HcalCommonData/python/testPhase1GeometryXML_cfi.py index 94dc16aa6d485..dfa468c711d0e 100644 --- a/Geometry/HcalCommonData/python/testPhase1GeometryXML_cfi.py +++ b/Geometry/HcalCommonData/python/testPhase1GeometryXML_cfi.py @@ -6,7 +6,7 @@ geomXMLFiles = cms.vstring('Geometry/CMSCommonData/data/materials.xml', 'Geometry/CMSCommonData/data/rotations.xml', 'Geometry/CMSCommonData/data/extend/cmsextent.xml', - 'Geometry/CMSCommonData/data/cms/2021/v1/cms.xml', + 'Geometry/CMSCommonData/data/cms/2019/v1/cms.xml', 'Geometry/CMSCommonData/data/cmsMother.xml', 'Geometry/CMSCommonData/data/eta3/etaMax.xml', 'Geometry/CMSCommonData/data/cmsTracker.xml', From c1d7538a3f7a12587e06498eafc0773f16042d8a Mon Sep 17 00:00:00 2001 From: Gaelle Date: Tue, 30 Apr 2019 15:13:16 +0200 Subject: [PATCH 07/10] Preserving 2019 for actual changes during this particular year --- L1Trigger/TrackTrigger/python/TkOnlyFlatGeom_cff.py | 2 +- L1Trigger/TrackTrigger/python/TkOnlyTiltedGeom_cff.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/L1Trigger/TrackTrigger/python/TkOnlyFlatGeom_cff.py b/L1Trigger/TrackTrigger/python/TkOnlyFlatGeom_cff.py index fbe522d9b9a75..83dd82d8bf257 100644 --- a/L1Trigger/TrackTrigger/python/TkOnlyFlatGeom_cff.py +++ b/L1Trigger/TrackTrigger/python/TkOnlyFlatGeom_cff.py @@ -33,7 +33,7 @@ 'Geometry/CMSCommonData/data/materials.xml', 'Geometry/CMSCommonData/data/rotations.xml', 'Geometry/CMSCommonData/data/extend/cmsextent.xml', - 'Geometry/CMSCommonData/data/cms/2021/v1/cms.xml', + 'Geometry/CMSCommonData/data/cms/2019/v1/cms.xml', 'Geometry/CMSCommonData/data/cmsMother.xml', 'Geometry/CMSCommonData/data/cmsTracker.xml', 'Geometry/CMSCommonData/data/eta3/etaMax.xml', diff --git a/L1Trigger/TrackTrigger/python/TkOnlyTiltedGeom_cff.py b/L1Trigger/TrackTrigger/python/TkOnlyTiltedGeom_cff.py index 61d2f80a7800e..0aa169ead7ca4 100644 --- a/L1Trigger/TrackTrigger/python/TkOnlyTiltedGeom_cff.py +++ b/L1Trigger/TrackTrigger/python/TkOnlyTiltedGeom_cff.py @@ -34,7 +34,7 @@ 'Geometry/CMSCommonData/data/materials.xml', 'Geometry/CMSCommonData/data/rotations.xml', 'Geometry/CMSCommonData/data/extend/cmsextent.xml', - 'Geometry/CMSCommonData/data/cms/2021/v1/cms.xml', + 'Geometry/CMSCommonData/data/cms/2019/v1/cms.xml', 'Geometry/CMSCommonData/data/cmsMother.xml', 'Geometry/CMSCommonData/data/cmsTracker.xml', 'Geometry/CMSCommonData/data/eta3/etaMax.xml', From 8898bfff5f361dca465581986fa2075df1984b58 Mon Sep 17 00:00:00 2001 From: Gaelle Date: Fri, 3 May 2019 09:59:02 +0200 Subject: [PATCH 08/10] Keeping 2019 for DB tag and updating GeometryConf --- .../StandardSequences/python/GeometryConf.py | 2 +- .../python/cmsExtendedGeometry2019XML_cfi.py | 285 ++++++++++++++++++ .../2019/hcalRecNumbering.xml | 42 +++ .../2019/hcalSimNumbering.xml | 101 +++++++ .../MuonSimData/data/2019/muonProdCuts.xml | 70 +++++ 5 files changed, 499 insertions(+), 1 deletion(-) create mode 100644 Geometry/CMSCommonData/python/cmsExtendedGeometry2019XML_cfi.py create mode 100644 Geometry/HcalCommonData/data/hcalRecNumbering/2019/hcalRecNumbering.xml create mode 100644 Geometry/HcalCommonData/data/hcalSimNumbering/2019/hcalSimNumbering.xml create mode 100644 Geometry/MuonSimData/data/2019/muonProdCuts.xml diff --git a/Configuration/StandardSequences/python/GeometryConf.py b/Configuration/StandardSequences/python/GeometryConf.py index c1727cb6a51c5..be7b210f9d268 100644 --- a/Configuration/StandardSequences/python/GeometryConf.py +++ b/Configuration/StandardSequences/python/GeometryConf.py @@ -9,7 +9,7 @@ 'DBExtended2017' : 'DB:Extended', 'DBExtended2017ZeroMaterial' : 'DB:Extended2017ZeroMaterial', 'DBExtended2018' : 'DB:Extended', - 'DBExtended2021' : 'DB:Extended2021', + 'DBExtended2021' : 'DB:Extended', 'DBExtended2023' : 'DB:Extended2023', 'DBIdeal2015' : 'DB:Ideal2015', 'DBIdeal2015dev' : 'DB:Ideal2015dev', diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2019XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2019XML_cfi.py new file mode 100644 index 0000000000000..807e3ea06a4cb --- /dev/null +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2019XML_cfi.py @@ -0,0 +1,285 @@ +import FWCore.ParameterSet.Config as cms + +## 2015 + new phase 1 pixel detector + +XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource", + geomXMLFiles = cms.vstring( + 'Geometry/CMSCommonData/data/materials.xml', + 'Geometry/CMSCommonData/data/rotations.xml', + 'Geometry/CMSCommonData/data/extend/v2/cmsextent.xml', + 'Geometry/CMSCommonData/data/cms/2019/v2/cms.xml', + 'Geometry/CMSCommonData/data/cmsMother.xml', + 'Geometry/CMSCommonData/data/eta3/etaMax.xml', + 'Geometry/CMSCommonData/data/cmsTracker.xml', + 'Geometry/CMSCommonData/data/caloBase/2017/v1/caloBase.xml', + 'Geometry/CMSCommonData/data/cmsCalo.xml', + 'Geometry/CMSCommonData/data/muonBase/2017/v1/muonBase.xml', + 'Geometry/CMSCommonData/data/cmsMuon.xml', + 'Geometry/CMSCommonData/data/mgnt.xml', + 'Geometry/CMSCommonData/data/beampipe/2023/v1/beampipe.xml', + 'Geometry/CMSCommonData/data/cmsBeam/2023/v1/cmsBeam.xml', + 'Geometry/CMSCommonData/data/muonMB.xml', + 'Geometry/CMSCommonData/data/muonMagnet.xml', + 'Geometry/CMSCommonData/data/cavern/2017/v2/cavern.xml', + 'Geometry/CMSCommonData/data/cavernData/2017/v1/cavernData.xml', + 'Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml', + 'Geometry/TrackerCommonData/data/PhaseI/trackerParameters.xml', + 'Geometry/TrackerCommonData/data/PhaseI/pixfwdMaterials.xml', + 'Geometry/TrackerCommonData/data/pixfwdCommon.xml', + 'Geometry/TrackerCommonData/data/PhaseI/pixfwdCylinder.xml', + 'Geometry/TrackerCommonData/data/PhaseI/pixfwd.xml', + 'Geometry/TrackerCommonData/data/PhaseI/pixfwdDisks.xml', + 'Geometry/TrackerCommonData/data/PhaseI/pixfwdSupportRingParameters.xml', + 'Geometry/TrackerCommonData/data/PhaseI/pixfwdInnerDiskZplus.xml', + 'Geometry/TrackerCommonData/data/PhaseI/pixfwdInnerDiskZminus.xml', + 'Geometry/TrackerCommonData/data/PhaseI/pixfwdOuterDiskZplus.xml', + 'Geometry/TrackerCommonData/data/PhaseI/pixfwdOuterDiskZminus.xml', + 'Geometry/TrackerCommonData/data/PhaseI/pixfwdbladeInnerZplus.xml', + 'Geometry/TrackerCommonData/data/PhaseI/pixfwdbladeInnerZminus.xml', + 'Geometry/TrackerCommonData/data/PhaseI/pixfwdbladeOuterZplus.xml', + 'Geometry/TrackerCommonData/data/PhaseI/pixfwdbladeOuterZminus.xml', + 'Geometry/TrackerCommonData/data/PhaseI/pixbarmaterial.xml', + 'Geometry/TrackerCommonData/data/PhaseI/pixbarladder.xml', + 'Geometry/TrackerCommonData/data/PhaseI/pixbarladderfull0.xml', + 'Geometry/TrackerCommonData/data/PhaseI/pixbarladderfull1.xml', + 'Geometry/TrackerCommonData/data/PhaseI/pixbarladderfull2.xml', + 'Geometry/TrackerCommonData/data/PhaseI/pixbarladderfull3.xml', + 'Geometry/TrackerCommonData/data/PhaseI/pixbarlayer.xml', + 'Geometry/TrackerCommonData/data/PhaseI/pixbarlayer0.xml', + 'Geometry/TrackerCommonData/data/PhaseI/pixbarlayer1.xml', + 'Geometry/TrackerCommonData/data/PhaseI/pixbarlayer2.xml', + 'Geometry/TrackerCommonData/data/PhaseI/pixbarlayer3.xml', + 'Geometry/TrackerCommonData/data/PhaseI/pixbar.xml', + 'Geometry/TrackerCommonData/data/Run2/trackerpatchpannel.xml', + 'Geometry/TrackerCommonData/data/Run2/trackerpixelnose.xml', + 'Geometry/TrackerCommonData/data/tibtidcommonmaterial.xml', + 'Geometry/TrackerCommonData/data/tibmaterial.xml', + 'Geometry/TrackerCommonData/data/tibmodpar.xml', + 'Geometry/TrackerCommonData/data/tibmodule0.xml', + 'Geometry/TrackerCommonData/data/tibmodule0a.xml', + 'Geometry/TrackerCommonData/data/tibmodule0b.xml', + 'Geometry/TrackerCommonData/data/tibmodule2.xml', + 'Geometry/TrackerCommonData/data/tibstringpar.xml', + 'Geometry/TrackerCommonData/data/tibstring0ll.xml', + 'Geometry/TrackerCommonData/data/tibstring0lr.xml', + 'Geometry/TrackerCommonData/data/tibstring0ul.xml', + 'Geometry/TrackerCommonData/data/tibstring0ur.xml', + 'Geometry/TrackerCommonData/data/tibstring0.xml', + 'Geometry/TrackerCommonData/data/tibstring1ll.xml', + 'Geometry/TrackerCommonData/data/tibstring1lr.xml', + 'Geometry/TrackerCommonData/data/tibstring1ul.xml', + 'Geometry/TrackerCommonData/data/tibstring1ur.xml', + 'Geometry/TrackerCommonData/data/tibstring1.xml', + 'Geometry/TrackerCommonData/data/tibstring2ll.xml', + 'Geometry/TrackerCommonData/data/tibstring2lr.xml', + 'Geometry/TrackerCommonData/data/tibstring2ul.xml', + 'Geometry/TrackerCommonData/data/tibstring2ur.xml', + 'Geometry/TrackerCommonData/data/tibstring2.xml', + 'Geometry/TrackerCommonData/data/tibstring3ll.xml', + 'Geometry/TrackerCommonData/data/tibstring3lr.xml', + 'Geometry/TrackerCommonData/data/tibstring3ul.xml', + 'Geometry/TrackerCommonData/data/tibstring3ur.xml', + 'Geometry/TrackerCommonData/data/tibstring3.xml', + 'Geometry/TrackerCommonData/data/tiblayerpar.xml', + 'Geometry/TrackerCommonData/data/tiblayer0.xml', + 'Geometry/TrackerCommonData/data/tiblayer1.xml', + 'Geometry/TrackerCommonData/data/tiblayer2.xml', + 'Geometry/TrackerCommonData/data/tiblayer3.xml', + 'Geometry/TrackerCommonData/data/tib.xml', + 'Geometry/TrackerCommonData/data/tidmaterial.xml', + 'Geometry/TrackerCommonData/data/tidmodpar.xml', + 'Geometry/TrackerCommonData/data/tidmodule0.xml', + 'Geometry/TrackerCommonData/data/tidmodule0r.xml', + 'Geometry/TrackerCommonData/data/tidmodule0l.xml', + 'Geometry/TrackerCommonData/data/tidmodule1.xml', + 'Geometry/TrackerCommonData/data/tidmodule1r.xml', + 'Geometry/TrackerCommonData/data/tidmodule1l.xml', + 'Geometry/TrackerCommonData/data/tidmodule2.xml', + 'Geometry/TrackerCommonData/data/tidringpar.xml', + 'Geometry/TrackerCommonData/data/tidring0.xml', + 'Geometry/TrackerCommonData/data/tidring0f.xml', + 'Geometry/TrackerCommonData/data/tidring0b.xml', + 'Geometry/TrackerCommonData/data/tidring1.xml', + 'Geometry/TrackerCommonData/data/tidring1f.xml', + 'Geometry/TrackerCommonData/data/tidring1b.xml', + 'Geometry/TrackerCommonData/data/tidring2.xml', + 'Geometry/TrackerCommonData/data/tid.xml', + 'Geometry/TrackerCommonData/data/tidf.xml', + 'Geometry/TrackerCommonData/data/tidb.xml', + 'Geometry/TrackerCommonData/data/tibtidservices.xml', + 'Geometry/TrackerCommonData/data/tibtidservicesf.xml', + 'Geometry/TrackerCommonData/data/tibtidservicesb.xml', + 'Geometry/TrackerCommonData/data/tobmaterial.xml', + 'Geometry/TrackerCommonData/data/tobmodpar.xml', + 'Geometry/TrackerCommonData/data/tobmodule0.xml', + 'Geometry/TrackerCommonData/data/tobmodule2.xml', + 'Geometry/TrackerCommonData/data/tobmodule4.xml', + 'Geometry/TrackerCommonData/data/tobrodpar.xml', + 'Geometry/TrackerCommonData/data/tobrod0c.xml', + 'Geometry/TrackerCommonData/data/tobrod0l.xml', + 'Geometry/TrackerCommonData/data/tobrod0h.xml', + 'Geometry/TrackerCommonData/data/tobrod0.xml', + 'Geometry/TrackerCommonData/data/tobrod1l.xml', + 'Geometry/TrackerCommonData/data/tobrod1h.xml', + 'Geometry/TrackerCommonData/data/tobrod1.xml', + 'Geometry/TrackerCommonData/data/tobrod2c.xml', + 'Geometry/TrackerCommonData/data/tobrod2l.xml', + 'Geometry/TrackerCommonData/data/tobrod2h.xml', + 'Geometry/TrackerCommonData/data/tobrod2.xml', + 'Geometry/TrackerCommonData/data/tobrod3l.xml', + 'Geometry/TrackerCommonData/data/tobrod3h.xml', + 'Geometry/TrackerCommonData/data/tobrod3.xml', + 'Geometry/TrackerCommonData/data/tobrod4c.xml', + 'Geometry/TrackerCommonData/data/tobrod4l.xml', + 'Geometry/TrackerCommonData/data/tobrod4h.xml', + 'Geometry/TrackerCommonData/data/tobrod4.xml', + 'Geometry/TrackerCommonData/data/tobrod5l.xml', + 'Geometry/TrackerCommonData/data/tobrod5h.xml', + 'Geometry/TrackerCommonData/data/tobrod5.xml', + 'Geometry/TrackerCommonData/data/v2/tob.xml', + 'Geometry/TrackerCommonData/data/tecmaterial.xml', + 'Geometry/TrackerCommonData/data/tecmodpar.xml', + 'Geometry/TrackerCommonData/data/tecmodule0.xml', + 'Geometry/TrackerCommonData/data/tecmodule0r.xml', + 'Geometry/TrackerCommonData/data/tecmodule0s.xml', + 'Geometry/TrackerCommonData/data/tecmodule1.xml', + 'Geometry/TrackerCommonData/data/tecmodule1r.xml', + 'Geometry/TrackerCommonData/data/tecmodule1s.xml', + 'Geometry/TrackerCommonData/data/tecmodule2.xml', + 'Geometry/TrackerCommonData/data/tecmodule3.xml', + 'Geometry/TrackerCommonData/data/tecmodule4.xml', + 'Geometry/TrackerCommonData/data/tecmodule4r.xml', + 'Geometry/TrackerCommonData/data/tecmodule4s.xml', + 'Geometry/TrackerCommonData/data/tecmodule5.xml', + 'Geometry/TrackerCommonData/data/tecmodule6.xml', + 'Geometry/TrackerCommonData/data/tecpetpar.xml', + 'Geometry/TrackerCommonData/data/tecring0.xml', + 'Geometry/TrackerCommonData/data/tecring1.xml', + 'Geometry/TrackerCommonData/data/tecring2.xml', + 'Geometry/TrackerCommonData/data/tecring3.xml', + 'Geometry/TrackerCommonData/data/tecring4.xml', + 'Geometry/TrackerCommonData/data/tecring5.xml', + 'Geometry/TrackerCommonData/data/tecring6.xml', + 'Geometry/TrackerCommonData/data/tecring0f.xml', + 'Geometry/TrackerCommonData/data/tecring1f.xml', + 'Geometry/TrackerCommonData/data/tecring2f.xml', + 'Geometry/TrackerCommonData/data/tecring3f.xml', + 'Geometry/TrackerCommonData/data/tecring4f.xml', + 'Geometry/TrackerCommonData/data/tecring5f.xml', + 'Geometry/TrackerCommonData/data/tecring6f.xml', + 'Geometry/TrackerCommonData/data/tecring0b.xml', + 'Geometry/TrackerCommonData/data/tecring1b.xml', + 'Geometry/TrackerCommonData/data/tecring2b.xml', + 'Geometry/TrackerCommonData/data/tecring3b.xml', + 'Geometry/TrackerCommonData/data/tecring4b.xml', + 'Geometry/TrackerCommonData/data/tecring5b.xml', + 'Geometry/TrackerCommonData/data/tecring6b.xml', + 'Geometry/TrackerCommonData/data/tecpetalf.xml', + 'Geometry/TrackerCommonData/data/tecpetalb.xml', + 'Geometry/TrackerCommonData/data/tecpetal0.xml', + 'Geometry/TrackerCommonData/data/tecpetal0f.xml', + 'Geometry/TrackerCommonData/data/tecpetal0b.xml', + 'Geometry/TrackerCommonData/data/tecpetal3.xml', + 'Geometry/TrackerCommonData/data/tecpetal3f.xml', + 'Geometry/TrackerCommonData/data/tecpetal3b.xml', + 'Geometry/TrackerCommonData/data/tecpetal6f.xml', + 'Geometry/TrackerCommonData/data/tecpetal6b.xml', + 'Geometry/TrackerCommonData/data/tecpetal8f.xml', + 'Geometry/TrackerCommonData/data/tecpetal8b.xml', + 'Geometry/TrackerCommonData/data/tecwheel.xml', + 'Geometry/TrackerCommonData/data/tecwheela.xml', + 'Geometry/TrackerCommonData/data/tecwheelb.xml', + 'Geometry/TrackerCommonData/data/tecwheelc.xml', + 'Geometry/TrackerCommonData/data/tecwheeld.xml', + 'Geometry/TrackerCommonData/data/tecwheel6.xml', + 'Geometry/TrackerCommonData/data/tecservices.xml', + 'Geometry/TrackerCommonData/data/tecbackplate.xml', + 'Geometry/TrackerCommonData/data/tec.xml', + 'Geometry/TrackerCommonData/data/Run2/trackermaterial.xml', + 'Geometry/TrackerCommonData/data/Run2/tracker.xml', + 'Geometry/TrackerCommonData/data/trackerpixbar.xml', + 'Geometry/TrackerCommonData/data/PhaseI/trackerpixfwd.xml', + 'Geometry/TrackerCommonData/data/trackertibtidservices.xml', + 'Geometry/TrackerCommonData/data/trackertib.xml', + 'Geometry/TrackerCommonData/data/trackertid.xml', + 'Geometry/TrackerCommonData/data/trackertob.xml', + 'Geometry/TrackerCommonData/data/trackertec.xml', + 'Geometry/TrackerCommonData/data/v2/trackerbulkhead.xml', + 'Geometry/TrackerCommonData/data/trackerother.xml', + 'Geometry/EcalCommonData/data/Run2/eregalgo.xml', + 'Geometry/EcalCommonData/data/ebalgo.xml', + 'Geometry/EcalCommonData/data/ebcon.xml', + 'Geometry/EcalCommonData/data/ebrot.xml', + 'Geometry/EcalCommonData/data/eecon.xml', + 'Geometry/EcalCommonData/data/eefixed.xml', + 'Geometry/EcalCommonData/data/eehier.xml', + 'Geometry/EcalCommonData/data/eealgo.xml', + 'Geometry/EcalCommonData/data/escon.xml', + 'Geometry/EcalCommonData/data/esalgo.xml', + 'Geometry/EcalCommonData/data/eeF.xml', + 'Geometry/EcalCommonData/data/eeB.xml', + 'Geometry/EcalCommonData/data/ectkcable.xml', + 'Geometry/HcalCommonData/data/hcalrotations.xml', + 'Geometry/HcalCommonData/data/hcal/PhaseI/hcalalgo.xml', + 'Geometry/HcalCommonData/data/hcalcablealgo.xml', + 'Geometry/HcalCommonData/data/hcalbarrelalgo.xml', + 'Geometry/HcalCommonData/data/hcalendcap/PhaseI/hcalendcapalgo.xml', + 'Geometry/HcalCommonData/data/hcalouteralgo.xml', + 'Geometry/HcalCommonData/data/hcalforwardalgo.xml', + 'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml', + 'Geometry/HcalCommonData/data/hcalSimNumbering/2021/hcalSimNumbering.xml', + 'Geometry/HcalCommonData/data/hcalRecNumbering/2021/hcalRecNumbering.xml', + 'Geometry/MuonCommonData/data/mbCommon/2017/v2/mbCommon.xml', + 'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml', + 'Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml', + 'Geometry/MuonCommonData/data/mb3/2015/v1/mb3.xml', + 'Geometry/MuonCommonData/data/mb4/2015/v1/mb4.xml', + 'Geometry/MuonCommonData/data/design/muonYoke.xml', + 'Geometry/MuonCommonData/data/mf/2017/v2/mf.xml', + 'Geometry/MuonCommonData/data/rpcf/2015/v1/rpcf.xml', + 'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml', + 'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml', + 'Geometry/MuonCommonData/data/csc/2015/v1/csc.xml', + 'Geometry/MuonCommonData/data/mfshield/2017/v1/mfshield.xml', + 'Geometry/ForwardCommonData/data/forwardshield/2017/v1/forwardshield.xml', + 'Geometry/ForwardCommonData/data/brmrotations.xml', + 'Geometry/ForwardCommonData/data/PostLS2/brm.xml', + 'Geometry/ForwardCommonData/data/zdcmaterials.xml', + 'Geometry/ForwardCommonData/data/lumimaterials.xml', + 'Geometry/ForwardCommonData/data/zdcrotations.xml', + 'Geometry/ForwardCommonData/data/lumirotations.xml', + 'Geometry/ForwardCommonData/data/zdc.xml', + 'Geometry/ForwardCommonData/data/zdclumi.xml', + 'Geometry/ForwardCommonData/data/cmszdc.xml')+cms.vstring( + 'Geometry/MuonCommonData/data/muonNumbering/2017/v1/muonNumbering.xml', + 'Geometry/TrackerCommonData/data/PhaseI/trackerStructureTopology.xml', + 'Geometry/TrackerSimData/data/PhaseI/trackersens.xml', + 'Geometry/TrackerRecoData/data/PhaseI/trackerRecoMaterial.xml', + 'Geometry/EcalSimData/data/ecalsens.xml', + 'Geometry/HcalCommonData/data/hcalsenspmf.xml', + 'Geometry/HcalSimData/data/hf.xml', + 'Geometry/HcalSimData/data/hfpmt.xml', + 'Geometry/HcalSimData/data/hffibrebundle.xml', + 'Geometry/HcalSimData/data/CaloUtil.xml', + 'Geometry/MuonSimData/data/v2/muonSens.xml', + 'Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml', + 'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml', + 'Geometry/CSCGeometryBuilder/data/cscSpecs.xml', + 'Geometry/RPCGeometryBuilder/data/RPCSpecs.xml', + 'Geometry/GEMGeometryBuilder/data/GEMSpecsFilter17.xml', + 'Geometry/GEMGeometryBuilder/data/v4/GEMSpecs.xml', + 'Geometry/ForwardCommonData/data/brmsens.xml', + 'Geometry/ForwardSimData/data/zdcsens.xml', + 'Geometry/HcalSimData/data/HcalProdCuts.xml', + 'Geometry/EcalSimData/data/EcalProdCuts.xml', + 'Geometry/EcalSimData/data/ESProdCuts.xml', + 'Geometry/TrackerSimData/data/PhaseI/trackerProdCuts.xml', + 'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml', + 'Geometry/MuonSimData/data/2021/muonProdCuts.xml', + 'Geometry/ForwardSimData/data/zdcProdCuts.xml', + 'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml', + 'Geometry/CMSCommonData/data/FieldParameters.xml'), + rootNodeName = cms.string('cms:OCMS') +) + + diff --git a/Geometry/HcalCommonData/data/hcalRecNumbering/2019/hcalRecNumbering.xml b/Geometry/HcalCommonData/data/hcalRecNumbering/2019/hcalRecNumbering.xml new file mode 100644 index 0000000000000..523688c6716b6 --- /dev/null +++ b/Geometry/HcalCommonData/data/hcalRecNumbering/2019/hcalRecNumbering.xml @@ -0,0 +1,42 @@ + + + + + + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 + + + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 + + + 1, 2, 2, 2, 2, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4 + + + 1, 1, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4 + + + 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3 + + + 1, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5 + + + 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4, 5, 5, 5, 5, 6, 6, 6, 6 + + + 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7 + + + + + + + + + + + + + diff --git a/Geometry/HcalCommonData/data/hcalSimNumbering/2019/hcalSimNumbering.xml b/Geometry/HcalCommonData/data/hcalSimNumbering/2019/hcalSimNumbering.xml new file mode 100644 index 0000000000000..6e83def0e1c8a --- /dev/null +++ b/Geometry/HcalCommonData/data/hcalSimNumbering/2019/hcalSimNumbering.xml @@ -0,0 +1,101 @@ + + + + + + 0.0*deg, 0.0*deg, 0.0*deg, 10.0*deg, 10.0*deg + + + 0.000, 0.087, 0.174, 0.261, 0.348, 0.435, 0.522, 0.609, 0.696, + 0.783, 0.870, 0.957, 1.044, 1.131, 1.218, 1.305, 1.392, 1.479, + 1.566, 1.653, 1.740, 1.830, 1.930, 2.043, 2.172, 2.322, 2.500, + 2.650, 2.868, 3.000 + + + 12.50*cm, 16.90*cm, 20.10*cm, 24.00*cm, 28.60*cm, 34.00*cm, + 40.60*cm, 48.30*cm, 57.60*cm, 68.60*cm, 81.80*cm, 97.50*cm, + 116.20*cm, 130.00*cm + + + 5.0*deg, 5.0*deg, 5.0*deg, 5.0*deg, 5.0*deg, 5.0*deg, 5.0*deg, + 5.0*deg, 5.0*deg, 5.0*deg, 5.0*deg, 5.0*deg, 5.0*deg, 5.0*deg, + 5.0*deg, 5.0*deg, 5.0*deg, 5.0*deg, 5.0*deg, 5.0*deg, 10.0*deg, + 10.0*deg, 10.0*deg, 10.0*deg, 10.0*deg, 10.0*deg, 10.0*deg, + 10.0*deg, 10.0*deg + + + 10.0*deg, 10.0*deg, 10.0*deg, 10.0*deg, 10.0*deg, 10.0*deg, + 10.0*deg, 10.0*deg, 10.0*deg, 10.0*deg, 10.0*deg, 20.0*deg, + 20.0*deg + + + 1, 2, 2, 2, 2, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4 + + + 1, 1, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4 + + + 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3 + + + 1, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5 + + + 1, 1, 2, 2, 2, 3, 3, 3, 4, 4, 4, 5, 5, 5, 5, 6, 6, 6, 6 + + + 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7 + + + 1, 16, 29, 1 + + + 16, 29, 41, 15 + + + 4, 7, 4, 4 + + + 1.392, 3.000, 5.500, 1.305 + + + 22.0*cm, 165.0*cm, 30.0*cm, 0.0*cm, 1115.0*cm, 0.375*cm, + 1137.0*cm + + + 15, 29, 4, 10, 5, 2, 4, 18, 19, 11, 12, 13, 14, 3, 4, 3, 1, 0 + + + 1.2, 1.2 + + + 117.0, 117.0, 117.0, 217.0 + + + 0, 0, 0, 0 + + + 178.0, 178.0, 178.0, 178.0, 178.0, 178.0, 178.0 + + + 0, 0, 0, 0, 0, 0, 0 + + + 2.840, 2.090, 2.840, 2.090 + + + 0, 0, 0, 0 + + + + + + + + + + + + + + diff --git a/Geometry/MuonSimData/data/2019/muonProdCuts.xml b/Geometry/MuonSimData/data/2019/muonProdCuts.xml new file mode 100644 index 0000000000000..eb262412498f3 --- /dev/null +++ b/Geometry/MuonSimData/data/2019/muonProdCuts.xml @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From e9bc773b8149f0e83bea7e41c3e9b709263d8410 Mon Sep 17 00:00:00 2001 From: Gaelle Date: Fri, 3 May 2019 10:02:46 +0200 Subject: [PATCH 09/10] Keeping 2019 in 2019XML_cfi --- .../CMSCommonData/python/cmsExtendedGeometry2019XML_cfi.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2019XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2019XML_cfi.py index 807e3ea06a4cb..4be614a5fab3c 100644 --- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2019XML_cfi.py +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2019XML_cfi.py @@ -227,8 +227,8 @@ 'Geometry/HcalCommonData/data/hcalouteralgo.xml', 'Geometry/HcalCommonData/data/hcalforwardalgo.xml', 'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml', - 'Geometry/HcalCommonData/data/hcalSimNumbering/2021/hcalSimNumbering.xml', - 'Geometry/HcalCommonData/data/hcalRecNumbering/2021/hcalRecNumbering.xml', + 'Geometry/HcalCommonData/data/hcalSimNumbering/2019/hcalSimNumbering.xml', + 'Geometry/HcalCommonData/data/hcalRecNumbering/2019/hcalRecNumbering.xml', 'Geometry/MuonCommonData/data/mbCommon/2017/v2/mbCommon.xml', 'Geometry/MuonCommonData/data/mb1/2015/v1/mb1.xml', 'Geometry/MuonCommonData/data/mb2/2015/v1/mb2.xml', @@ -275,7 +275,7 @@ 'Geometry/EcalSimData/data/ESProdCuts.xml', 'Geometry/TrackerSimData/data/PhaseI/trackerProdCuts.xml', 'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml', - 'Geometry/MuonSimData/data/2021/muonProdCuts.xml', + 'Geometry/MuonSimData/data/2019/muonProdCuts.xml', 'Geometry/ForwardSimData/data/zdcProdCuts.xml', 'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml', 'Geometry/CMSCommonData/data/FieldParameters.xml'), From a87a02059bc357cf065cb86f3f3411342b36ed6e Mon Sep 17 00:00:00 2001 From: Gaelle Date: Tue, 7 May 2019 12:21:16 +0200 Subject: [PATCH 10/10] addressing Ianna's comments --- .../python/totemTest2021XML_cfi.py | 2 +- .../muonNumbering/2021/v1/muonNumbering.xml | 439 ++++++++++++++++++ .../data/2021/{ => v1}/muonProdCuts.xml | 0 3 files changed, 440 insertions(+), 1 deletion(-) create mode 100644 Geometry/MuonCommonData/data/muonNumbering/2021/v1/muonNumbering.xml rename Geometry/MuonSimData/data/2021/{ => v1}/muonProdCuts.xml (100%) diff --git a/Geometry/ForwardCommonData/python/totemTest2021XML_cfi.py b/Geometry/ForwardCommonData/python/totemTest2021XML_cfi.py index 4f27853621bb0..bbea4840febe7 100644 --- a/Geometry/ForwardCommonData/python/totemTest2021XML_cfi.py +++ b/Geometry/ForwardCommonData/python/totemTest2021XML_cfi.py @@ -254,7 +254,7 @@ 'Geometry/ForwardCommonData/data/zdc.xml', 'Geometry/ForwardCommonData/data/zdclumi.xml', 'Geometry/ForwardCommonData/data/cmszdc.xml')+cms.vstring( - 'Geometry/MuonCommonData/data/muonNumbering/2021/v2/muonNumbering.xml', + 'Geometry/MuonCommonData/data/muonNumbering/2021/v1/muonNumbering.xml', 'Geometry/TrackerCommonData/data/PhaseI/trackerStructureTopology.xml', 'Geometry/TrackerSimData/data/PhaseI/trackersens.xml', 'Geometry/TrackerRecoData/data/PhaseI/trackerRecoMaterial.xml', diff --git a/Geometry/MuonCommonData/data/muonNumbering/2021/v1/muonNumbering.xml b/Geometry/MuonCommonData/data/muonNumbering/2021/v1/muonNumbering.xml new file mode 100644 index 0000000000000..02568b19d6e71 --- /dev/null +++ b/Geometry/MuonCommonData/data/muonNumbering/2021/v1/muonNumbering.xml @@ -0,0 +1,439 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Geometry/MuonSimData/data/2021/muonProdCuts.xml b/Geometry/MuonSimData/data/2021/v1/muonProdCuts.xml similarity index 100% rename from Geometry/MuonSimData/data/2021/muonProdCuts.xml rename to Geometry/MuonSimData/data/2021/v1/muonProdCuts.xml