diff --git a/Configuration/Geometry/README.md b/Configuration/Geometry/README.md index 1e8c40f1a6112..4644450941c74 100644 --- a/Configuration/Geometry/README.md +++ b/Configuration/Geometry/README.md @@ -106,6 +106,7 @@ Calorimeters: * C22: HGCal (v18 version of HGCal geometry as in C18 with calibration cells, nonzero cssette retraction, correct mousebite, guard ring, proper cell size) + Phase2 HCAL and EB (used in Run4D104) * C23: HGCal (same as the v18 version which is in C22 but without internal cells in the Geant4 geometry defintiion) + Phase2 HCAL and EB (used in Run4D106) * C24: HGCal (v18 version of HGCal geometry as in C122 but turning off all dead areas and gaps) + Phase2 HCAL and EB (used in Run4D109) +* C25: HGCal (same as in C18) + Phase2 HCAL and EB (modified as in 2021) (used in Run4D116) Muon system: * M4: Phase2 muon system for TDR w/ GE2/1, ME0, RE3/1, RE4/1 (incl. granularity in ME0, staggered GE2/1), 96 iRPC strips, no overlaps, MB4Shields @@ -115,6 +116,7 @@ Muon system: * M9: same as M8 with GE0 replacing ME0 * M10: same as M9 but with a realistic support structure for GE0, Shield structure modified in muonYoke * M11: same as M10 but with a corrected eta partition sizes for GE21 +* M12: same as M11 with removal of overlas in GE0, MB3 and MuonYoke Fast Timing system: * I10: Fast Timing detector (LYSO barrel (bars along phi flat), silicon endcap), w/ passive materials, ETL in position defined in O4, material adjustments @@ -141,6 +143,7 @@ The script also handles the common and forward elements of the geometry: * F6: same as F4 with modifications needed for BRM and forward shield * F7: same as F6 with modifications needed for HFNose * F8: same as F6 or F7 without BRM +* F9: same as F8 with overlaps removed in ForwardShield Several detector combinations have been generated: * D95 = T31+C17+M10+I16+O9+F8 @@ -162,4 +165,6 @@ Several detector combinations have been generated: * D112 = T37+C24+M11+I17+O9+F8 * D113 = T38+C24+M11+I17+O9+F8 * D114 = T39+C19+M11+I17+O9+F8 +* D115 = T35+C20+M11+I17+O9+F8 +* D116 = T35+C25+M12+I17+O9+F9 (Same as D110 but some overlaps removed) diff --git a/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D116Reco_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D116Reco_cff.py new file mode 100644 index 0000000000000..422575b532001 --- /dev/null +++ b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D116Reco_cff.py @@ -0,0 +1,61 @@ +import FWCore.ParameterSet.Config as cms + +# This config was generated automatically using generateRun4Geometry.py +# If you notice a mistake, please update the generating script, not just this config + +from Configuration.Geometry.GeometryDD4hepExtendedRun4D116_cff import * + +# tracker +from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * +from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * +from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * +from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * +from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * +from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * +trackerGeometry.applyAlignment = True + +# calo +from Geometry.CaloEventSetup.HGCalTopology_cfi import * +from Geometry.HGCalGeometry.HGCalGeometryESProducer_cfi import * +from Geometry.CaloEventSetup.CaloTopology_cfi import * +from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import * +CaloGeometryBuilder = cms.ESProducer("CaloGeometryBuilder", + SelectedCalos = cms.vstring("HCAL", + "ZDC", + "EcalBarrel", + "TOWER", + "HGCalEESensitive", + "HGCalHESiliconSensitive", + "HGCalHEScintillatorSensitive" + ) +) +from Geometry.EcalAlgo.EcalBarrelGeometry_cfi import * +from Geometry.HcalEventSetup.HcalGeometry_cfi import * +from Geometry.HcalEventSetup.CaloTowerGeometry_cfi import * +from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * +from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * +from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * +from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * +from Geometry.EcalMapping.EcalMapping_cfi import * +from Geometry.EcalMapping.EcalMappingRecord_cfi import * + +# muon +from Geometry.MuonNumbering.muonNumberingInitialization_cfi import * +from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import * +from Geometry.GEMGeometryBuilder.gemGeometry_cff import * +from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * +from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * + +# forward +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * +from Geometry.ForwardGeometry.ZdcGeometry_cfi import * + +# timing +from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import * +from Geometry.MTDGeometryBuilder.mtdParameters_cff import * +from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * +from Geometry.MTDNumberingBuilder.mtdTopology_cfi import * +from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import * +from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import * +mtdGeometry.applyAlignment = False + diff --git a/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D116_cff.py b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D116_cff.py new file mode 100644 index 0000000000000..c49cf2870330f --- /dev/null +++ b/Configuration/Geometry/python/GeometryDD4hepExtendedRun4D116_cff.py @@ -0,0 +1,17 @@ +import FWCore.ParameterSet.Config as cms + +# This config was generated automatically using generateRun4Geometry.py +# If you notice a mistake, please update the generating script, not just this config + +from Configuration.Geometry.GeometryDD4hep_cff import * +DDDetectorESProducer.confGeomXMLFiles = cms.FileInPath("Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D116.xml") + +from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * +from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * +from Geometry.EcalCommonData.ecalSimulationParameters_cff import * +from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * +from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import * +from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import * +from Geometry.MuonNumbering.muonGeometryConstants_cff import * +from Geometry.MuonNumbering.muonOffsetESProducer_cff import * +from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * diff --git a/Configuration/Geometry/python/GeometryExtendedRun4D116Reco_cff.py b/Configuration/Geometry/python/GeometryExtendedRun4D116Reco_cff.py new file mode 100644 index 0000000000000..48d3b4754c934 --- /dev/null +++ b/Configuration/Geometry/python/GeometryExtendedRun4D116Reco_cff.py @@ -0,0 +1,61 @@ +import FWCore.ParameterSet.Config as cms + +# This config was generated automatically using generateRun4Geometry.py +# If you notice a mistake, please update the generating script, not just this config + +from Configuration.Geometry.GeometryExtendedRun4D116_cff import * + +# tracker +from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * +from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * +from Geometry.TrackerGeometryBuilder.TrackerAdditionalParametersPerDet_cfi import * +from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * +from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * +from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * +trackerGeometry.applyAlignment = True + +# calo +from Geometry.CaloEventSetup.HGCalTopology_cfi import * +from Geometry.HGCalGeometry.HGCalGeometryESProducer_cfi import * +from Geometry.CaloEventSetup.CaloTopology_cfi import * +from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import * +CaloGeometryBuilder = cms.ESProducer("CaloGeometryBuilder", + SelectedCalos = cms.vstring("HCAL", + "ZDC", + "EcalBarrel", + "TOWER", + "HGCalEESensitive", + "HGCalHESiliconSensitive", + "HGCalHEScintillatorSensitive" + ) +) +from Geometry.EcalAlgo.EcalBarrelGeometry_cfi import * +from Geometry.HcalEventSetup.HcalGeometry_cfi import * +from Geometry.HcalEventSetup.CaloTowerGeometry_cfi import * +from Geometry.HcalEventSetup.CaloTowerTopology_cfi import * +from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import * +from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import * +from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import * +from Geometry.EcalMapping.EcalMapping_cfi import * +from Geometry.EcalMapping.EcalMappingRecord_cfi import * + +# muon +from Geometry.MuonNumbering.muonNumberingInitialization_cfi import * +from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import * +from Geometry.GEMGeometryBuilder.gemGeometry_cff import * +from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import * +from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import * + +# forward +from Geometry.ForwardGeometry.zdcTopologyEP_cfi import * +from Geometry.ForwardGeometry.ZdcGeometry_cfi import * + +# timing +from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import * +from Geometry.MTDGeometryBuilder.mtdParameters_cff import * +from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * +from Geometry.MTDNumberingBuilder.mtdTopology_cfi import * +from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import * +from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import * +mtdGeometry.applyAlignment = False + diff --git a/Configuration/Geometry/python/GeometryExtendedRun4D116_cff.py b/Configuration/Geometry/python/GeometryExtendedRun4D116_cff.py new file mode 100644 index 0000000000000..ccf526aad9c86 --- /dev/null +++ b/Configuration/Geometry/python/GeometryExtendedRun4D116_cff.py @@ -0,0 +1,15 @@ +import FWCore.ParameterSet.Config as cms + +# This config was generated automatically using generateRun4Geometry.py +# If you notice a mistake, please update the generating script, not just this config + +from Geometry.CMSCommonData.cmsExtendedGeometryRun4D116XML_cfi import * +from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * +from SLHCUpgradeSimulations.Geometry.fakePhase2OuterTrackerConditions_cff import * +from Geometry.EcalCommonData.ecalSimulationParameters_cff import * +from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * +from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import * +from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import * +from Geometry.MuonNumbering.muonGeometryConstants_cff import * +from Geometry.MuonNumbering.muonOffsetESProducer_cff import * +from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cff import * diff --git a/Configuration/Geometry/python/dictRun4Geometry.py b/Configuration/Geometry/python/dictRun4Geometry.py index 649d52d65fe73..c517a0242cda0 100644 --- a/Configuration/Geometry/python/dictRun4Geometry.py +++ b/Configuration/Geometry/python/dictRun4Geometry.py @@ -1111,6 +1111,80 @@ ], "era" : "phase2_ecal, phase2_hcal, phase2_hgcal, hcalHardcodeConditions, phase2_hgcalV10, phase2_hgcalV11, phase2_hgcalV16, phase2_hfnose, phase2-hgcalV18", }, + "C25" : { + 1 : [ + 'Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml', + 'Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml', + 'Geometry/EcalCommonData/data/ectkcablemat/2026/v2/ectkcablemat.xml', + 'Geometry/EcalCommonData/data/ebalgo/2021/v1/ebalgo.xml', + 'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml', + 'Geometry/EcalCommonData/data/ebrot.xml', + 'Geometry/HcalCommonData/data/hcalrotations.xml', + 'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml', + 'Geometry/HcalCommonData/data/hcal/v2/hcalalgo.xml', + 'Geometry/HcalCommonData/data/hcalbarrelalgo.xml', + 'Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml', + 'Geometry/HcalCommonData/data/hcalouteralgo/v1/hcalouteralgo.xml', + 'Geometry/HcalCommonData/data/hcalforwardalgo.xml', + 'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v1/hcalSimNumbering.xml', + 'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/v2/hcalRecNumbering.xml', + 'Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml', + 'Geometry/HGCalCommonData/data/hgcal/v17/hgcal.xml', + 'Geometry/HGCalCommonData/data/hgcalcell/v17/hgcalcell.xml', + 'Geometry/HGCalCommonData/data/hgcalwafer/v17/hgcalwafer.xml', + 'Geometry/HGCalCommonData/data/hgcalEE/v17/hgcalEE.xml', + 'Geometry/HGCalCommonData/data/hgcalHEsil/v17/hgcalHEsil.xml', + 'Geometry/HGCalCommonData/data/hgcalHEmix/v17/hgcalHEmix.xml', + 'Geometry/HGCalCommonData/data/hgcalCons/v17/hgcalCons.xml', + 'Geometry/HGCalCommonData/data/hgcalConsData/v17/hgcalConsData.xml', + ], + 3 : [ + 'Geometry/EcalSimData/data/PhaseII/ecalsens.xml', + 'Geometry/HcalCommonData/data/hcalsens/NoHE/v1/hcalsenspmf.xml', + 'Geometry/HcalSimData/data/hf.xml', + 'Geometry/HcalSimData/data/hfpmt.xml', + 'Geometry/HcalSimData/data/hffibrebundle.xml', + 'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml', + 'Geometry/HGCalSimData/data/hgcsensv15.xml', + ], + 4 : [ + 'Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml', + 'Geometry/EcalSimData/data/EcalProdCuts.xml', + 'Geometry/HGCalSimData/data/hgcProdCutsv15.xml', + ], + "sim" : [ + 'from Geometry.EcalCommonData.ecalSimulationParameters_cff import *', + 'from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *', + 'from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import *', + 'from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import *' + ], + "reco" : [ + 'from Geometry.CaloEventSetup.HGCalTopology_cfi import *', + 'from Geometry.HGCalGeometry.HGCalGeometryESProducer_cfi import *', + 'from Geometry.CaloEventSetup.CaloTopology_cfi import *', + 'from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import *', + 'CaloGeometryBuilder = cms.ESProducer("CaloGeometryBuilder",', + ' SelectedCalos = cms.vstring("HCAL",', + ' "ZDC",', + ' "EcalBarrel",', + ' "TOWER",', + ' "HGCalEESensitive",', + ' "HGCalHESiliconSensitive",', + ' "HGCalHEScintillatorSensitive"', + ' )', + ')', + 'from Geometry.EcalAlgo.EcalBarrelGeometry_cfi import *', + 'from Geometry.HcalEventSetup.HcalGeometry_cfi import *', + 'from Geometry.HcalEventSetup.CaloTowerGeometry_cfi import *', + 'from Geometry.HcalEventSetup.CaloTowerTopology_cfi import *', + 'from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import *', + 'from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import *', + 'from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import *', + 'from Geometry.EcalMapping.EcalMapping_cfi import *', + 'from Geometry.EcalMapping.EcalMappingRecord_cfi import *', + ], + "era" : "phase2_ecal, phase2_hcal, phase2_hgcal, hcalHardcodeConditions, phase2_hgcalV10, phase2_hgcalV11, phase2_hgcalV16, phase2_hfnose", + }, } @@ -1212,6 +1286,53 @@ ], "era" : "phase2_muon, phase2_GEM, phase2_GE0", }, + "M12" : { + 1 : [ + 'Geometry/MuonCommonData/data/mbCommon/2021/v1/mbCommon.xml', + 'Geometry/MuonCommonData/data/mb1/2015/v2/mb1.xml', + 'Geometry/MuonCommonData/data/mb2/2015/v2/mb2.xml', + 'Geometry/MuonCommonData/data/mb3/2015/v3/mb3.xml', + 'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml', + 'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml', + 'Geometry/MuonCommonData/data/muonYoke/2026/v4/muonYoke.xml', + 'Geometry/MuonCommonData/data/mf/2026/v8/mf.xml', + 'Geometry/MuonCommonData/data/csc/2021/v2/csc.xml', + 'Geometry/MuonCommonData/data/rpcf/2026/v3/rpcf.xml', + 'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml', + 'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml', + 'Geometry/MuonCommonData/data/gem21/2026/v1/gem21.xml', + 'Geometry/MuonCommonData/data/mfshield/2026/v6/mfshield.xml', + 'Geometry/MuonCommonData/data/ge0/TDR_Dev/v5/ge0.xml', + 'Geometry/MuonCommonData/data/ge0shield/2026/v1/ge0shield.xml', + ], + 2 : [ + 'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v5/muonNumbering.xml', + ], + 3 : [ + 'Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml', + 'Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml', + 'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml', + 'Geometry/CSCGeometryBuilder/data/cscSpecs.xml', + 'Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml', + 'Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml', + 'Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml', + ], + 4 : [ + 'Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml', + ], + "sim" : [ + 'from Geometry.MuonNumbering.muonGeometryConstants_cff import *', + 'from Geometry.MuonNumbering.muonOffsetESProducer_cff import *', + ], + "reco" : [ + 'from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *', + 'from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *', + 'from Geometry.GEMGeometryBuilder.gemGeometry_cff import *', + 'from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import *', + 'from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *', + ], + "era" : "phase2_muon, phase2_GEM, phase2_GE0", + }, } forwardDict = { @@ -1241,6 +1362,29 @@ 'from Geometry.ForwardGeometry.ZdcGeometry_cfi import *', ] }, + "F9" : { + 1 : [ + 'Geometry/ForwardCommonData/data/forwardshield/2026/v5/forwardshield.xml', + 'Geometry/ForwardCommonData/data/zdcmaterials/2021/v1/zdcmaterials.xml', + 'Geometry/ForwardCommonData/data/lumimaterials.xml', + 'Geometry/ForwardCommonData/data/zdcrotations.xml', + 'Geometry/ForwardCommonData/data/lumirotations.xml', + 'Geometry/ForwardCommonData/data/zdc/2026/v1/zdc.xml', + 'Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml', + 'Geometry/ForwardCommonData/data/cmszdc.xml', + ], + 3 : [ + 'Geometry/ForwardSimData/data/zdcsens.xml', + ], + 4 : [ + 'Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml', + 'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml', + ], + "reco" :[ + 'from Geometry.ForwardGeometry.zdcTopologyEP_cfi import *', + 'from Geometry.ForwardGeometry.ZdcGeometry_cfi import *', + ] + }, } timingDict = { @@ -1384,6 +1528,7 @@ ("O9","T38","C24","M11","F8","I17") : "D113", ("O9","T39","C19","M11","F8","I17") : "D114", ("O9","T35","C20","M11","F8","I17") : "D115", + ("O9","T35","C25","M12","F9","I17") : "D116", } deprecatedDets = set([ "D1", "D2", "D3", "D5", "D6" , "D7", "D4", "D8" , "D9", "D12", "D13", "D15", "D10", "D11", "D14", "D16", "D17", "D18", "D19", "D20", "D21", "D22", "D23", "D24", "D25", "D26", "D27", "D28", "D29", "D30", "D31", "D32", "D33", "D34", "D36", "D37", "D38", "D39", "D40", "D42", "D35", "D41", "D43", "D44", "D45", "D46", "D48", "D47", "D50", "D51", "D52", "D53", "D54", "D55", "D56", "D57", "D58", "D59", "D61", "D62", "D63", "D64", "D65", "D66", "D67", "D69", "D71", "D72", "D73", "D74", "D75", "D78", "D79", "D87", "D89", "D90", "D49", "D60", "D68", "D70", "D76", "D77", "D80", "D81", "D82", "D83", "D84", "D85","D86","D88","D91","D92","D93","D94","D97"]) diff --git a/Configuration/PyReleaseValidation/python/relval_Run4.py b/Configuration/PyReleaseValidation/python/relval_Run4.py index 3b866ca55c000..bcf07e9a1ca19 100644 --- a/Configuration/PyReleaseValidation/python/relval_Run4.py +++ b/Configuration/PyReleaseValidation/python/relval_Run4.py @@ -35,6 +35,7 @@ numWFIB.extend([30834.0]) #Run4D113 numWFIB.extend([31234.0]) #Run4D114 numWFIB.extend([32034.0]) #Run4D115 +numWFIB.extend([32434.0]) #Run4D116 #Additional sample for short matrix and IB #Default Phase-2 Det NoPU diff --git a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py index fbfd6b28801aa..29373a9fcf206 100644 --- a/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py +++ b/Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py @@ -93,6 +93,8 @@ 'Run4D110SimOnGen', 'Run4D115', 'Run4D115PU', + 'Run4D116', + 'Run4D116PU', ] # pre-generation of WF numbers @@ -3494,6 +3496,13 @@ def condition(self, fragment, stepList, key, hasHarvest): 'Era' : 'Phase2C20I13M9', 'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal', 'ALCAPhase2'], }, + 'Run4D116' : { + 'Geom' : 'ExtendedRun4D116', + 'HLTmenu': '@relvalRun4', + 'GT' : 'auto:phase2_realistic_T33', + 'Era' : 'Phase2C17I13M9', + 'ScenToRun' : ['GenSimHLBeamSpot','DigiTrigger','RecoGlobal', 'HARVESTGlobal', 'ALCAPhase2'], + }, } # standard PU sequences diff --git a/Configuration/StandardSequences/python/GeometryConf.py b/Configuration/StandardSequences/python/GeometryConf.py index 2921e7eba69c6..7dae99e943a16 100644 --- a/Configuration/StandardSequences/python/GeometryConf.py +++ b/Configuration/StandardSequences/python/GeometryConf.py @@ -114,4 +114,6 @@ 'DD4hepExtendedRun4D114' : 'DD4hepExtendedRun4D114,DD4hepExtendedRun4D114Reco', 'ExtendedRun4D115' : 'ExtendedRun4D115,ExtendedRun4D115Reco', 'DD4hepExtendedRun4D115' : 'DD4hepExtendedRun4D115,DD4hepExtendedRun4D115Reco', + 'ExtendedRun4D116' : 'ExtendedRun4D116,ExtendedRun4D116Reco', + 'DD4hepExtendedRun4D116' : 'DD4hepExtendedRun4D116,DD4hepExtendedRun4D116Reco', } diff --git a/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D116.xml b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D116.xml new file mode 100644 index 0000000000000..ae6f3ba4dcf7e --- /dev/null +++ b/Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometryRun4D116.xml @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D116XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D116XML_cfi.py new file mode 100644 index 0000000000000..7c982eb460434 --- /dev/null +++ b/Geometry/CMSCommonData/python/cmsExtendedGeometryRun4D116XML_cfi.py @@ -0,0 +1,127 @@ +import FWCore.ParameterSet.Config as cms + +# This config was generated automatically using generateRun4Geometry.py +# If you notice a mistake, please update the generating script, not just this config + +XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource", + geomXMLFiles = cms.vstring( + 'Geometry/CMSCommonData/data/materials/2021/v1/materials.xml', + 'Geometry/CMSCommonData/data/rotations.xml', + 'Geometry/CMSCommonData/data/extend/v2/cmsextent.xml', + 'Geometry/CMSCommonData/data/cavernData/2021/v1/cavernData.xml', + 'Geometry/CMSCommonData/data/cms/2026/v5/cms.xml', + 'Geometry/CMSCommonData/data/cmsMother.xml', + 'Geometry/CMSCommonData/data/eta3/etaMax.xml', + 'Geometry/CMSCommonData/data/cmsTracker.xml', + 'Geometry/CMSCommonData/data/caloBase/2026/v7/caloBase.xml', + 'Geometry/CMSCommonData/data/cmsCalo.xml', + 'Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml', + 'Geometry/CMSCommonData/data/cmsMuon.xml', + 'Geometry/CMSCommonData/data/mgnt.xml', + 'Geometry/CMSCommonData/data/beampipe/2026/v3/beampipe.xml', + 'Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml', + 'Geometry/CMSCommonData/data/muonMB.xml', + 'Geometry/CMSCommonData/data/muonMagnet.xml', + 'Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml', + 'Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml', + 'Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml', + 'Geometry/TrackerCommonData/data/pixfwdCommon.xml', + 'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/pixfwd.xml', + 'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_OT800_IT615_2022_10/pixbar.xml', + 'Geometry/TrackerCommonData/data/trackermaterial.xml', + 'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_03/tracker.xml', + 'Geometry/TrackerCommonData/data/PhaseII/OuterTracker616_2020_04/otst.xml', + 'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_IT711_2023_05/pixel.xml', + 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerbar.xml', + 'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerfwd.xml', + 'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerStructureTopology.xml', + 'Geometry/TrackerCommonData/data/PhaseII/Tracker_DD4hep_compatible_IT711_2023_05/pixelStructureTopology.xml', + 'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackersens.xml', + 'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_IT711_2023_05/pixelsens.xml', + 'Geometry/TrackerRecoData/data/PhaseII/Tracker_DD4hep_compatible_IT711_2023_05/trackerRecoMaterial.xml', + 'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_2021_02/trackerProdCuts.xml', + 'Geometry/TrackerSimData/data/PhaseII/Tracker_DD4hep_compatible_IT711_2023_05/pixelProdCuts.xml', + 'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml', + 'Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml', + 'Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml', + 'Geometry/EcalCommonData/data/ectkcablemat/2026/v2/ectkcablemat.xml', + 'Geometry/EcalCommonData/data/ebalgo/2021/v1/ebalgo.xml', + 'Geometry/EcalCommonData/data/ebcon/2021/v1/ebcon.xml', + 'Geometry/EcalCommonData/data/ebrot.xml', + 'Geometry/HcalCommonData/data/hcalrotations.xml', + 'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml', + 'Geometry/HcalCommonData/data/hcal/v2/hcalalgo.xml', + 'Geometry/HcalCommonData/data/hcalbarrelalgo.xml', + 'Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml', + 'Geometry/HcalCommonData/data/hcalouteralgo/v1/hcalouteralgo.xml', + 'Geometry/HcalCommonData/data/hcalforwardalgo.xml', + 'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/v1/hcalSimNumbering.xml', + 'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/v2/hcalRecNumbering.xml', + 'Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml', + 'Geometry/HGCalCommonData/data/hgcal/v17/hgcal.xml', + 'Geometry/HGCalCommonData/data/hgcalcell/v17/hgcalcell.xml', + 'Geometry/HGCalCommonData/data/hgcalwafer/v17/hgcalwafer.xml', + 'Geometry/HGCalCommonData/data/hgcalEE/v17/hgcalEE.xml', + 'Geometry/HGCalCommonData/data/hgcalHEsil/v17/hgcalHEsil.xml', + 'Geometry/HGCalCommonData/data/hgcalHEmix/v17/hgcalHEmix.xml', + 'Geometry/HGCalCommonData/data/hgcalCons/v17/hgcalCons.xml', + 'Geometry/HGCalCommonData/data/hgcalConsData/v17/hgcalConsData.xml', + 'Geometry/MuonCommonData/data/mbCommon/2021/v1/mbCommon.xml', + 'Geometry/MuonCommonData/data/mb1/2015/v2/mb1.xml', + 'Geometry/MuonCommonData/data/mb2/2015/v2/mb2.xml', + 'Geometry/MuonCommonData/data/mb3/2015/v3/mb3.xml', + 'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml', + 'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml', + 'Geometry/MuonCommonData/data/muonYoke/2026/v4/muonYoke.xml', + 'Geometry/MuonCommonData/data/mf/2026/v8/mf.xml', + 'Geometry/MuonCommonData/data/csc/2021/v2/csc.xml', + 'Geometry/MuonCommonData/data/rpcf/2026/v3/rpcf.xml', + 'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml', + 'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml', + 'Geometry/MuonCommonData/data/gem21/2026/v1/gem21.xml', + 'Geometry/MuonCommonData/data/mfshield/2026/v6/mfshield.xml', + 'Geometry/MuonCommonData/data/ge0/TDR_Dev/v5/ge0.xml', + 'Geometry/MuonCommonData/data/ge0shield/2026/v1/ge0shield.xml', + 'Geometry/ForwardCommonData/data/forwardshield/2026/v5/forwardshield.xml', + 'Geometry/ForwardCommonData/data/zdcmaterials/2021/v1/zdcmaterials.xml', + 'Geometry/ForwardCommonData/data/lumimaterials.xml', + 'Geometry/ForwardCommonData/data/zdcrotations.xml', + 'Geometry/ForwardCommonData/data/lumirotations.xml', + 'Geometry/ForwardCommonData/data/zdc/2026/v1/zdc.xml', + 'Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml', + 'Geometry/ForwardCommonData/data/cmszdc.xml', + 'Geometry/MTDCommonData/data/mtdMaterial/v3/mtdMaterial.xml', + 'Geometry/MTDCommonData/data/btl/v3/btl.xml', + 'Geometry/MTDCommonData/data/etl/v8/etl.xml', + 'Geometry/MTDCommonData/data/mtdParameters/v5/mtdStructureTopology.xml', + 'Geometry/MTDCommonData/data/mtdParameters/v5/mtdParameters.xml', + )+ + cms.vstring( + 'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v5/muonNumbering.xml', + 'Geometry/EcalSimData/data/PhaseII/ecalsens.xml', + 'Geometry/HcalCommonData/data/hcalsens/NoHE/v1/hcalsenspmf.xml', + 'Geometry/HcalSimData/data/hf.xml', + 'Geometry/HcalSimData/data/hfpmt.xml', + 'Geometry/HcalSimData/data/hffibrebundle.xml', + 'Geometry/HcalSimData/data/CaloUtil/2026/v2c/CaloUtil.xml', + 'Geometry/HGCalSimData/data/hgcsensv15.xml', + 'Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml', + 'Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml', + 'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml', + 'Geometry/CSCGeometryBuilder/data/cscSpecs.xml', + 'Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml', + 'Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml', + 'Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml', + 'Geometry/ForwardSimData/data/zdcsens.xml', + 'Geometry/MTDSimData/data/v5/mtdsens.xml', + 'Geometry/HcalSimData/data/HcalProdCuts/2026/v1/HcalProdCuts.xml', + 'Geometry/EcalSimData/data/EcalProdCuts.xml', + 'Geometry/HGCalSimData/data/hgcProdCutsv15.xml', + 'Geometry/MuonSimData/data/muonProdCuts/2026/v2/muonProdCuts.xml', + 'Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml', + 'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml', + 'Geometry/MTDSimData/data/v5/mtdProdCuts.xml', + 'Geometry/CMSCommonData/data/FieldParameters.xml', + ), + rootNodeName = cms.string('cms:OCMS') +) diff --git a/Geometry/ForwardCommonData/data/forwardshield/2026/v5/forwardshield.xml b/Geometry/ForwardCommonData/data/forwardshield/2026/v5/forwardshield.xml new file mode 100644 index 0000000000000..506d79700ab44 --- /dev/null +++ b/Geometry/ForwardCommonData/data/forwardshield/2026/v5/forwardshield.xml @@ -0,0 +1,1176 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + forwardshield:VcalElecPMT + + + + + + 0., 0., 0. + + + + + + + + + + + + + + + + + + + forwardshield:FixedShieldTube5 + + + + + + 0., 0., 0. + + + + + + + + + + + + + + + + + + + forwardshield:FixedShieldTube6 + + + + + + 0., 0., 0. + + + + + + + + + + + + + + + + + + + forwardshield:FixedShieldTube7 + + + + + + 0., 0., 0. + + + + + + + + + + + + + + + + + + + forwardshield:FixedShieldTube8 + + + + + + 0., 0., 0. + + + + + + + + + + + + + + + + + + + forwardshield:FixedShieldTube9 + + + + + + 0., 0., 0. + + + + + + + + + + + + + + + + + + + Null, forwardshield:FibreBundle12, forwardshield:FibreBundle10, + forwardshield:FibreBundle8, forwardshield:FibreBundle6, + forwardshield:FibreBundle4, forwardshield:FibreBundle2, + Null, forwardshield:FibreBundle12, forwardshield:FibreBundle10, + forwardshield:FibreBundle8, forwardshield:FibreBundle6, + forwardshield:FibreBundle4, forwardshield:FibreBundle2, + Null, forwardshield:FibreBundle11, forwardshield:FibreBundle9, + forwardshield:FibreBundle7, forwardshield:FibreBundle5, + forwardshield:FibreBundle3, forwardshield:FibreBundle1, + Null, forwardshield:FibreBundle11, forwardshield:FibreBundle9, + forwardshield:FibreBundle7, forwardshield:FibreBundle5, + forwardshield:FibreBundle3, forwardshield:FibreBundle1 + + + + + + 0., 0., 0. + + + + + + Null, forwardshield:FibreBundle11, forwardshield:FibreBundle9, + forwardshield:FibreBundle7, forwardshield:FibreBundle5, + forwardshield:FibreBundle3, forwardshield:FibreBundle1, + Null, forwardshield:FibreBundle11, forwardshield:FibreBundle9, + forwardshield:FibreBundle7, forwardshield:FibreBundle5, + forwardshield:FibreBundle3, forwardshield:FibreBundle1, + Null, forwardshield:FibreBundle13, forwardshield:FibreBundle10, + forwardshield:FibreBundle8, forwardshield:FibreBundle6, + forwardshield:FibreBundle4, forwardshield:FibreBundle2, + Null, forwardshield:FibreBundle13, forwardshield:FibreBundle10, + forwardshield:FibreBundle8, forwardshield:FibreBundle6, + forwardshield:FibreBundle4, forwardshield:FibreBundle2 + + + + + + 0., 0., 0. + + + + + + + + + + + + + + + + + + + + + + + + + 551*mm2, 652*mm2, 469*mm2, 324*mm2, 231*mm2, 167*mm2, + 120*mm2, 88*mm2, 63*mm2, 46*mm2, 35*mm2, 52*mm2, 50*mm2 + + + 1231.0*mm, 1068.5*mm, 896.5*mm, 757.0*mm, 631.0*mm, 529.5*mm, + 444.5*mm, 373.0*mm, 313.0*mm, 263.0*mm, 220.5*mm, 185.0*mm, 147.0*mm + + + 1350.0*mm, 1350.0*mm, 1308.0*mm, 1308.0*mm, 1266.0*mm, 1266.0*mm, + 1224.0*mm, 1224.0*mm, 1182.0*mm, 1182.0*mm, 1140.0*mm, 1140.0*mm,1140.0*mm + + + -1, 11, 9, 7, 5, 3, 1, -1, 11, 9, 7, 5, 3, 1, + -1, 10, 8, 6, 4, 2, 0, -1, 10, 8, 6, 4, 2, 0 + + + + + + + + + + + + 551*mm2, 652*mm2, 469*mm2, 324*mm2, 231*mm2, 167*mm2, + 120*mm2, 88*mm2, 63*mm2, 46*mm2, 35*mm2, 52*mm2, 50*mm2 + + + 1231.0*mm, 1068.5*mm, 896.5*mm, 757.0*mm, 631.0*mm, 529.5*mm, + 444.5*mm, 373.0*mm, 313.0*mm, 263.0*mm, 220.5*mm, 185.0*mm, 147.0*mm + + + 1350.0*mm, 1350.0*mm, 1308.0*mm, 1308.0*mm, 1266.0*mm, 1266.0*mm, + 1224.0*mm, 1224.0*mm, 1182.0*mm, 1182.0*mm, 1140.0*mm, 1140.0*mm,1140.0*mm + + + -1, 10, 8, 6, 4, 2, 0, -1, 10, 8, 6, 4, 2, 0, + -1, 12, 9, 7, 5, 3, 1, -1, 12, 9, 7, 5, 3, 1 + + + + diff --git a/Geometry/MuonCommonData/data/ge0/TDR_Dev/v5/ge0.xml b/Geometry/MuonCommonData/data/ge0/TDR_Dev/v5/ge0.xml new file mode 100644 index 0000000000000..dd1fd9c73994e --- /dev/null +++ b/Geometry/MuonCommonData/data/ge0/TDR_Dev/v5/ge0.xml @@ -0,0 +1,565 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Geometry/MuonCommonData/data/mb3/2015/v3/mb3.xml b/Geometry/MuonCommonData/data/mb3/2015/v3/mb3.xml new file mode 100644 index 0000000000000..6437a778881fd --- /dev/null +++ b/Geometry/MuonCommonData/data/mb3/2015/v3/mb3.xml @@ -0,0 +1,1756 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0, 0, [mbCommon:MBPos_z] + 0.*deg, 0.*deg, 180*deg, 90.*deg, 0.*deg, 90.*deg, 0.*deg, 0.*deg, 270.*deg-[MB3PosAngle] + + + + + + + + + + + 0, 0, -[mbCommon:MBPos_z] + 90.*deg, 0.*deg, 90.*deg, 0.*deg, 0.*deg, 270.*deg-[MB3PosAngle] + + + + + + + + + + + 0, 0, -[mbCommon:MBPos_z] + 90.*deg, 0.*deg, 90.*deg, 0.*deg, 0.*deg, 270.*deg-[MB3PosAngle] + + + + + + + + + + + 0, 0, [mbCommon:MBPos_z] + 0.*deg, 0.*deg, 180*deg, 90.*deg, 0.*deg, 90.*deg, 0.*deg, 0.*deg, 270.*deg-[MB3PosAngle] + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0, 0, -[mbCommon:MBPos_z] + 90.*deg, 0.*deg, 90.*deg, 0.*deg, 0.*deg, 270.*deg-[MB3PosAngle] + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0, 0, [mbCommon:MBPos_z] + 0.*deg, 0.*deg, 180*deg, 90.*deg, 0.*deg, 90.*deg, 0.*deg, 0.*deg, 270.*deg-[MB3PosAngle] + + + + + + + + + + + 0, 0, -[mbCommon:MBPos_z] + 90.*deg, 0.*deg, 90.*deg, 0.*deg, 0.*deg, 270.*deg-[MB3PosAngle] + + + + + + + + + + + 0, 0, [mbCommon:MBPos_z] + 0.*deg, 0.*deg, 180*deg, 90.*deg, 0.*deg, 90.*deg, 0.*deg, 0.*deg, 270.*deg-[MB3PosAngle] + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -[mb3:MB3SLPhiL71]-[mbCommon:MBCell_width]+[mbCommon:MBIbeamWall], 0.*mm, 0.*mm + + + + + + + + + + + -[mb3:MB3SLPhiL71]-3*[mbCommon:MBCell_width]+[mbCommon:MBIbeamWall], 0.*mm, 0.*mm + + + + + + + + + + + -[mb3:MB3SLPhiL72]-[mbCommon:MBCell_width]+[mbCommon:MBIbeamWall], 0.*mm, 0.*mm + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -[mbCommon:MBSLZL56]-3*[mbCommon:MBCell_width]+[mbCommon:MBIbeamWall], 0.*mm, 0.*mm + + + + + + + + + + + -[mbCommon:MBSLZL57]-[mbCommon:MBCell_width]+[mbCommon:MBIbeamWall], 0.*mm, 0.*mm + + + + + + + + + + + -[mbCommon:MBSLZL58]-[mbCommon:MBCell_width]+[mbCommon:MBIbeamWall], 0.*mm, 0.*mm + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -[mb3:MB3SLPhiL71]-[mbCommon:MBCell_width]+[mbCommon:MBIbeamWall], 0.*mm, 0.*mm + + + + + + + + + + + -[mb3:MB3SLPhiL71]-3*[mbCommon:MBCell_width]+[mbCommon:MBIbeamWall], 0.*mm, 0.*mm + + + + + + + + + + + -[mb3:MB3SLPhiL72]-[mbCommon:MBCell_width]+[mbCommon:MBIbeamWall], 0.*mm, 0.*mm + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -[mbCommon:MBChimSLZL47]-[mbCommon:MBCell_width]+[mbCommon:MBIbeamWall], 0.*mm, 0.*mm + + + + + + + + + + + -[mbCommon:MBChimSLZL47]-3*[mbCommon:MBCell_width]+[mbCommon:MBIbeamWall], 0.*mm, 0.*mm + + + + + + + + + + + -[mbCommon:MBChimSLZL48]-[mbCommon:MBCell_width]+[mbCommon:MBIbeamWall], 0.*mm, 0.*mm + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Geometry/MuonCommonData/data/muonYoke/2026/v4/muonYoke.xml b/Geometry/MuonCommonData/data/muonYoke/2026/v4/muonYoke.xml new file mode 100644 index 0000000000000..5dff3b3bbb4a5 --- /dev/null +++ b/Geometry/MuonCommonData/data/muonYoke/2026/v4/muonYoke.xml @@ -0,0 +1,4511 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0, 0, 6.5900*m + 0.*deg, 0.*deg, -90*deg + + + + + + + + + + + 0, 0, 6.885*m + 0.*deg, 0.*deg, -90*deg + + + + + + + + + + + 0, 0, 7.099*m + 0.*deg, 0.*deg, -90*deg + + + + + + + + + + + 0, 0, 7.62*m + 0.*deg, 0.*deg, -90*deg + + + + + + + + + + + 0, 0, 7.565*m + 0*deg, 0.*deg, 0*deg + + + + + + + + + + + 0, 0, 8.2425*m + 0.*deg, 0.*deg, -90*deg + + + + + + + + + + + 0, 0, 8.870*m + 0.*deg, 0.*deg, -90*deg + + + + + + + + + + + 0, 0, 8.82*m + 0*deg, 0.*deg, 0*deg + + + + + + + + + + + 0, 0, 9.4975*m + 0.*deg, 0.*deg, -90*deg + + + + + + + + + + + 0, 0, 9.950*m + 0.*deg, 0.*deg, -90*deg + + + + + + + + + + + 0, 0, 9.9*m - 0.495*cm + 0*deg, 0.*deg, 0*deg + + + + + + + + + + + 0, 0, 10.4075*m + 0.*deg, 0.*deg, -90*deg + + + + + + + + + + + 0, 0, 10.7175*m + 0.455*cm + 0.*deg, 0.*deg, -90*deg + + + + + + + + + + + 0, 0, 10.7425*m + 0.455*cm + 0*deg, 0.*deg, 0*deg + + + + + + + + + + + + + + + 0, 0, 6.5900*m + 0.*deg, 0.*deg, -90*deg + + + + + + + + + + + 0, 0, 6.885*m + 0.*deg, 0.*deg, -90*deg + + + + + + + + + + + 0, 0, 7.099*m + 0.*deg, 0.*deg, -90*deg + + + + + + + + + + + 0, 0, 7.62*m + 0.*deg, 0.*deg, -90*deg + + + + + + + + + + + 0, 0, 7.565*m + 0*deg, 0.*deg, 0*deg + + + + + + + + + + + 0, 0, 8.2425*m + 0.*deg, 0.*deg, -90*deg + + + + + + + + + + + 0, 0, 8.870*m + 0.*deg, 0.*deg, -90*deg + + + + + + + + + + + 0, 0, 8.82*m + 0*deg, 0.*deg, 0*deg + + + + + + + + + + + 0, 0, 9.4975*m + 0.*deg, 0.*deg, -90*deg + + + + + + + + + + + 0, 0, 9.950*m + 0.*deg, 0.*deg, -90*deg + + + + + + + + + + + 0, 0, 9.9*m - 0.495*cm + 0*deg, 0.*deg, 0*deg + + + + + + + + + + + 0, 0, 10.4075*m + 0.*deg, 0.*deg, -90*deg + + + + + + + + + + + 0, 0, 10.7175*m + 0.455*cm + 0.*deg, 0.*deg, -90*deg + + + + + + + + + + + 0, 0, 10.7425*m + 0.455*cm + 0.*deg, 0*deg, 0.*deg + + + + + + + + + + + 0, 0, 0.63395*m + 0.*deg, 0.*deg, -102.7713*deg + + + + + + + + + + + 0, 0, -0.63395*m + 0.*deg, 0.*deg, -102.7713*deg + + + + + + + + + + + 0, 0, 0.62495*m + 0.*deg, 0.*deg, -90.8778*deg + + + + + + + + + + + 0, 0, -0.62495*m + 0.*deg, 0.*deg, -90.8778*deg + + + + + + + + + + + 0, 0, 0.*m + 0.*deg, 0.*deg, -78.0664*deg + + + + + + + + + + + 0, 0, 0.*m + 0.*deg, 0.*deg, -102.7713*deg + + + + + + + + + + + 0, 0, 0.*m + 0.*deg, 0.*deg, -102.7713*deg + + + + + + + + + + + 0, 0, -1.0639*m + 0.*deg, 0.*deg, -97.9027*deg + + + + + + + + + + + 0, 0, 1.0639*m + 0.*deg, 0.*deg, -97.9027*deg + + + + + + + + + + + 0, 0, -1.0639*m + 0.*deg, 0.*deg, -94.294*deg + + + + + + + + + + + 0, 0, 1.0639*m + 0.*deg, 0.*deg, -94.294*deg + + + + + + + + + + + 0, 0, 1.0639*m + 0.*deg, 0.*deg, -94.294*deg + + + + + + + + + + + + + + + + + 0, 0, -1.0639*m + 0.*deg, 0.*deg, -90*deg + + + + + + + + + + + 0, 0, -1.0639*m + 0.*deg, 0.*deg, -90*deg + + + + + + + + + + + 0, 0, 1.0639*m + 0.*deg, 0.*deg, -90*deg + + + + + + + + + + + 0, 0, 1.0639*m + 0.*deg, 0.*deg, -90*deg + + + + + + + + + + + 0, 0, -1.0639*m + 0.*deg, 0.*deg, -85.706*deg + + + + + + + + + + + 0, 0, 1.0639*m + 0.*deg, 0.*deg, 94.294*deg + + + + + + + + + + + 0, 0, 1.0639*m + 0.*deg, 0.*deg, 94.294*deg + + + + + + + + + + + + + + + + + 0, 0, -1.0639*m + 0.*deg, 0.*deg, -82.9603*deg + + + + + + + + + + + 0, 0, 1.0639*m + 0.*deg, 0.*deg, 97.0397*deg + + + + + + + + + + + 0, 0, 0.186*m + 0.*deg, 0.*deg, -90.8778*deg + + + + + + + + + + + 0, 0, -0.186*m + 0.*deg, 0.*deg, -90.8778*deg + + + + + + + + + + + 0, 0, 0.*m + 0.*deg, 0.*deg, -78.0664*deg + + + + + + + + + + + 0, 0, 0.*m + 0.*deg, 0.*deg, -78.0664*deg + + + + + + + + + + + 0, 0, 0.*m + 0.*deg, 0.*deg, -102.7713*deg + + + + + + + + + + + 0, 0, 0.*m + 0.*deg, 0.*deg, -102.7713*deg + + + + + + + + + + + 0, 0, 0.*m + 0.*deg, 0.*deg, -90.8778*deg + + + + + + + + + + + 0, 0, 0.*m + 0.*deg, 0.*deg, -90.8778*deg + + + + + + + + + + + 0, 0, 0.*m + 0.*deg, 0.*deg, -78.0664*deg + + + + + + + + + + + 0, 0, 0.*m + 0.*deg, 0.*deg, -78.0664*deg + + + + + + + + + + + 0, 0, 0.63395*m + 0.*deg, 0.*deg, -90*deg + + + + + + + + + + + 0, 0, -0.63395*m + 0.*deg, 0.*deg, -90*deg + + + + + + + + + + + 0, 0, -1.073*m + 0.*deg, 0.*deg, -100.132*deg + + + + + + + + + + + 0, 0, 1.073*m + 0.*deg, 0.*deg, -100.132*deg + + + + + + + + + + + 0, 0, -1.0729*m + 0.*deg, 0.*deg, -94.1649*deg + + + + + + + + + + + 0, 0, 1.0729*m + 0.*deg, 0.*deg, -94.1649*deg + + + + + + + + + + + 0, 0, 1.0729*m + 0.*deg, 0.*deg, -94.1649*deg + + + + + + + + + + + + + + + + + 0, 0, -1.0729*m + 0.*deg, 0.*deg, -90*deg + + + + + + + + + + + 0, 0, -1.0729*m + 0.*deg, 0.*deg, -90*deg + + + + + + + + + + + + + + + + + 0, 0, 1.0729*m + 0.*deg, 0.*deg, -90*deg + + + + + + + + + + + 0, 0, 1.0729*m + 0.*deg, 0.*deg, -90*deg + + + + + + + + + + + + + + + + + 0, 0, -1.0729*m + 0.*deg, 0.*deg, -85.8351*deg + + + + + + + + + + + 0, 0, 1.0729*m + 0.*deg, 0.*deg, -85.8351*deg + + + + + + + + + + + 0, 0, 1.0729*m + 0.*deg, 0.*deg, -85.8351*deg + + + + + + + + + + + + + + + + + 0, 0, -1.0729*m + 0.*deg, 0.*deg, -79.8677*deg + + + + + + + + + + + 0, 0, 1.0729*m + 0.*deg, 0.*deg, -79.8677*deg + + + + + + + + + + + 0, 0, 0.195*m + 0.*deg, 0.*deg, -90*deg + + + + + + + + + + + 0, 0, -0.195*m + 0.*deg, 0.*deg, -90*deg + + + + + + + + + + + 0, 0, 0.*m + 0.*deg, 0.*deg, -90*deg + + + + + + + + + + + 0, 0, 0.*m + 0.*deg, 0.*deg, -90*deg + + + + + + + + + + + 0, 0, 0.63405*m + 0.*deg, 0.*deg, -102.776*deg + + + + + + + + + + + 0, 0, -0.63405*m + 0.*deg, 0.*deg, -102.776*deg + + + + + + + + + + + 0, 0, 0.*m + 0.*deg, 0.*deg, -102.776*deg + + + + + + + + + + + 0, 0, 0.*m + 0.*deg, 0.*deg, -102.776*deg + + + + + + + + + + + 0, 0, 0.*m + 0.*deg, 0.*deg, -102.776*deg + + + + + + + + + + + 0, 0, 0.*m + 0.*deg, 0.*deg, -102.776*deg + + + + + + + + + + + 0, 0, 0.63395*m + 0.*deg, 0.*deg, -103.0847*deg + + + + + + + + + + + 0, 0, -0.63395*m + 0.*deg, 0.*deg, -103.0847*deg + + + + + + + + + + + 0, 0, 0.62495*m + 0.*deg, 0.*deg, -89.6287*deg + + + + + + + + + + + 0, 0, -0.62495*m + 0.*deg, 0.*deg, -89.6287*deg + + + + + + + + + + + 0, 0, 0.63395*m + 0.*deg, 0.*deg, -76.5635*deg + + + + + + + + + + + 0, 0, -0.63395*m + 0.*deg, 0.*deg, -76.5635*deg + + + + + + + + + + + 0, 0, 0.*m + 0.*deg, 0.*deg, -103.0847*deg + + + + + + + + + + + 0, 0, 0.*m + 0.*deg, 0.*deg, -103.0847*deg + + + + + + + + + + + 0, 0, -1.0639*m + 0.*deg, 0.*deg, -97.8748*deg + + + + + + + + + + + 0, 0, 1.0639*m + 0.*deg, 0.*deg, -97.8748*deg + + + + + + + + + + + 0, 0, -1.0639*m + 0.*deg, 0.*deg, -93.7125*deg + + + + + + + + + + + 0, 0, 1.0639*m + 0.*deg, 0.*deg, -93.7125*deg + + + + + + + + + + + 0, 0, 1.0639*m + 0.*deg, 0.*deg, -93.7125*deg + + + + + + + + + + + + + + + + + 0, 0, -1.0639*m + 0.*deg, 0.*deg, -90*deg + + + + + + + + + + + 0, 0, -1.0639*m + 0.*deg, 0.*deg, -90*deg + + + + + + + + + + + 0, 0, 1.0639*m + 0.*deg, 0.*deg, -90*deg + + + + + + + + + + + 0, 0, 1.0639*m + 0.*deg, 0.*deg, -90*deg + + + + + + + + + + + 0, 0, -1.0639*m + 0.*deg, 0.*deg, -86.2875*deg + + + + + + + + + + + 0, 0, 1.0639*m + 0.*deg, 0.*deg, -86.2875*deg + + + + + + + + + + + 0, 0, 1.0639*m + 0.*deg, 0.*deg, -86.2875*deg + + + + + + + + + + + + + + + + + 0, 0, -1.0639*m + 0.*deg, 0.*deg, -81.7612*deg + + + + + + + + + + + 0, 0, 1.0639*m + 0.*deg, 0.*deg, -81.7612*deg + + + + + + + + + + + 0, 0, 0.186*m + 0.*deg, 0.*deg, -89.6287*deg + + + + + + + + + + + 0, 0, -0.186*m + 0.*deg, 0.*deg, -89.6287*deg + + + + + + + + + + + 0, 0, 0.*m + 0.*deg, 0.*deg, -76.5635*deg + + + + + + + + + + + 0, 0, 0.*m + 0.*deg, 0.*deg, -76.5635*deg + + + + + + + + + + + 0, 0, 0.*m + 0.*deg, 0.*deg, -103.0847*deg + + + + + + + + + + + 0, 0, 0.*m + 0.*deg, 0.*deg, -103.0847*deg + + + + + + + + + + + 0, 0, 0.*m + 0.*deg, 0.*deg, -89.6287*deg + + + + + + + + + + + 0, 0, 0.*m + 0.*deg, 0.*deg, -89.6287*deg + + + + + + + + + + + 0, 0, 0.*m + 0.*deg, 0.*deg, -76.5635*deg + + + + + + + + + + + 0, 0, 0.*m + 0.*deg, 0.*deg, -76.5635*deg + + + + + + + + + + + 0, 0, 0.63395*m + 0.*deg, 0.*deg, -90*deg + + + + + + + + + + + 0, 0, -0.63395*m + 0.*deg, 0.*deg, -90*deg + + + + + + + + + + + 0, 0, -1.0729*m + 0.*deg, 0.*deg, -99.7567*deg + + + + + + + + + + + 0, 0, 1.0729*m + 0.*deg, 0.*deg, -99.7567*deg + + + + + + + + + + + 0, 0, -1.0729*m + 0.*deg, 0.*deg, -93.5375*deg + + + + + + + + + + + 0, 0, 1.0729*m + 0.*deg, 0.*deg, -93.5375*deg + + + + + + + + + + + 0, 0, 1.0729*m + 0.*deg, 0.*deg, -93.5375*deg + + + + + + + + + + + + + + + + + 0, 0, -1.0729*m + 0.*deg, 0.*deg, -90*deg + + + + + + + + + + + 0, 0, -1.0729*m + 0.*deg, 0.*deg, -90*deg + + + + + + + + + + + + + + + + + 0, 0, 1.0729*m + 0.*deg, 0.*deg, -90*deg + + + + + + + + + + + 0, 0, 1.0729*m + 0.*deg, 0.*deg, -90*deg + + + + + + + + + + + + + + + + + 0, 0, -1.0729*m + 0.*deg, 0.*deg, -86.4625*deg + + + + + + + + + + + 0, 0, 1.0729*m + 0.*deg, 0.*deg, -86.4625*deg + + + + + + + + + + + 0, 0, 1.0729*m + 0.*deg, 0.*deg, -86.4625*deg + + + + + + + + + + + + + + + + + 0, 0, -1.0729*m + 0.*deg, 0.*deg, -80.2433*deg + + + + + + + + + + + 0, 0, 1.0729*m + 0.*deg, 0.*deg, -80.2433*deg + + + + + + + + + + + 0, 0, 0.195*m + 0.*deg, 0.*deg, -90*deg + + + + + + + + + + + 0, 0, -0.195*m + 0.*deg, 0.*deg, -90*deg + + + + + + + + + + + 0, 0, 0.*m + 0.*deg, 0.*deg, -90*deg + + + + + + + + + + + 0, 0, 0.*m + 0.*deg, 0.*deg, -90*deg + + + + + + + + + + + 0, 0, 0.63395*m + 0.*deg, 0.*deg, -103.3987*deg + + + + + + + + + + + 0, 0, -0.63395*m + 0.*deg, 0.*deg, -103.3987*deg + + + + + + + + + + + 0, 0, 0.62495*m + 0.*deg, 0.*deg, -90.5026*deg + + + + + + + + + + + 0, 0, -0.62495*m + 0.*deg, 0.*deg, -90.5026*deg + + + + + + + + + + + 0, 0, 0.63395*m + 0.*deg, 0.*deg, -77.0779*deg + + + + + + + + + + + 0, 0, -0.63395*m + 0.*deg, 0.*deg, -77.0779*deg + + + + + + + + + + + 0, 0, 0.*m + 0.*deg, 0.*deg, -103.3987*deg + + + + + + + + + + + 0, 0, 0.*m + 0.*deg, 0.*deg, -103.3987*deg + + + + + + + + + + + 0, 0, -1.0639*m + 0.*deg, 0.*deg, -97.9976*deg + + + + + + + + + + + 0, 0, 1.0639*m + 0.*deg, 0.*deg, -97.9976*deg + + + + + + + + + + + 0, 0, -1.0639*m + 0.*deg, 0.*deg, -93.3782*deg + + + + + + + + + + + 0, 0, 1.0639*m + 0.*deg, 0.*deg, -93.3782*deg + + + + + + + + + + + 0, 0, 1.0639*m + 0.*deg, 0.*deg, -93.3782*deg + + + + + + + + + + + + + + + + + 0, 0, -1.0639*m + 0.*deg, 0.*deg, -90*deg + + + + + + + + + + + 0, 0, -1.0639*m + 0.*deg, 0.*deg, -90*deg + + + + + + + + + + + 0, 0, 1.0639*m + 0.*deg, 0.*deg, -90*deg + + + + + + + + + + + 0, 0, 1.0639*m + 0.*deg, 0.*deg, -90*deg + + + + + + + + + + + 0, 0, -1.0639*m + 0.*deg, 0.*deg, -86.6218*deg + + + + + + + + + + + 0, 0, 1.0639*m + 0.*deg, 0.*deg, -86.6218*deg + + + + + + + + + + + 0, 0, 1.0639*m + 0.*deg, 0.*deg, -86.6218*deg + + + + + + + + + + + + + + + + + 0, 0, -1.0639*m + 0.*deg, 0.*deg, -82.4959*deg + + + + + + + + + + + 0, 0, 1.0639*m + 0.*deg, 0.*deg, -82.4959*deg + + + + + + + + + + + 0, 0, 0.186*m + 0.*deg, 0.*deg, -90.5026*deg + + + + + + + + + + + 0, 0, -0.186*m + 0.*deg, 0.*deg, -90.5026*deg + + + + + + + + + + + 0, 0, 0.*m + 0.*deg, 0.*deg, -77.0779*deg + + + + + + + + + + + 0, 0, 0.*m + 0.*deg, 0.*deg, -77.0779*deg + + + + + + + + + + + 0, 0, 0.*m + 0.*deg, 0.*deg, -103.3987*deg + + + + + + + + + + + 0, 0, 0.*m + 0.*deg, 0.*deg, -103.3987*deg + + + + + + + + + + + 0, 0, 0.*m + 0.*deg, 0.*deg, -90.5026*deg + + + + + + + + + + + 0, 0, 0.*m + 0.*deg, 0.*deg, -90.5026*deg + + + + + + + + + + + 0, 0, 0.*m + 0.*deg, 0.*deg, -77.0779*deg + + + + + + + + + + + 0, 0, 0.*m + 0.*deg, 0.*deg, -77.0779*deg + + + + + + + + + + + 0, 0, 0.63395*m + 0.*deg, 0.*deg, -76.8409*deg + + + + + + + + + + + 0, 0, -0.63395*m + 0.*deg, 0.*deg, -76.8409*deg + + + + + + + + + + + 0, 0, 0.*m + 0.*deg, 0.*deg, -76.8409*deg + + + + + + + + + + + 0, 0, 0.*m + 0.*deg, 0.*deg, -76.8409*deg + + + + + + + + + + + 0, 0, 0.*m + 0.*deg, 0.*deg, -76.8409*deg + + + + + + + + + + + 0, 0, 0.*m + 0.*deg, 0.*deg, -76.8409*deg + + + + + + + + + + + 0, 0, 0.63395*m + 0.*deg, 0.*deg, -103.5332*deg + + + + + + + + + + + 0, 0, -0.63395*m + 0.*deg, 0.*deg, -103.5332*deg + + + + + + + + + + + 0, 0, 0.62495*m + 0.*deg, 0.*deg, -90.2228*deg + + + + + + + + + + + 0, 0, -0.62495*m + 0.*deg, 0.*deg, -90.2228*deg + + + + + + + + + + + 0, 0, 0.63395*m + 0.*deg, 0.*deg, -76.6776*deg + + + + + + + + + + + 0, 0, -0.63395*m + 0.*deg, 0.*deg, -76.6776*deg + + + + + + + + + + + 0, 0, 0.*m + 0.*deg, 0.*deg, -103.5332*deg + + + + + + + + + + + 0, 0, 0.*m + 0.*deg, 0.*deg, -103.5332*deg + + + + + + + + + + + 0, 0, -1.0639*m + 0.*deg, 0.*deg, -97.9814*deg + + + + + + + + + + + 0, 0, 1.0639*m + 0.*deg, 0.*deg, -97.9814*deg + + + + + + + + + + + 0, 0, -1.0639*m + 0.*deg, 0.*deg, -93.1208*deg + + + + + + + + + + + 0, 0, 1.0639*m + 0.*deg, 0.*deg, -93.1208*deg + + + + + + + + + + + 0, 0, 1.0639*m + 0.*deg, 0.*deg, -93.1208*deg + + + + + + + + + + + + + + + + + 0, 0, -1.0639*m + 0.*deg, 0.*deg, -90*deg + + + + + + + + + + + 0, 0, -1.0639*m + 0.*deg, 0.*deg, -90*deg + + + + + + + + + + + 0, 0, 1.0639*m + 0.*deg, 0.*deg, -90*deg + + + + + + + + + + + 0, 0, 1.0639*m + 0.*deg, 0.*deg, -90*deg + + + + + + + + + + + 0, 0, -1.0639*m + 0.*deg, 0.*deg, -86.8792*deg + + + + + + + + + + + 0, 0, 1.0639*m + 0.*deg, 0.*deg, -86.8792*deg + + + + + + + + + + + 0, 0, 1.0639*m + 0.*deg, 0.*deg, -86.8792*deg + + + + + + + + + + + + + + + + + 0, 0, -1.0639*m + 0.*deg, 0.*deg, -82.2371*deg + + + + + + + + + + + 0, 0, 1.0639*m + 0.*deg, 0.*deg, -82.2371*deg + + + + + + + + + + + 0, 0, 0.186*m + 0.*deg, 0.*deg, -90.2228*deg + + + + + + + + + + + 0, 0, -0.186*m + 0.*deg, 0.*deg, -90.2228*deg + + + + + + + + + + + 0, 0, 0.*m + 0.*deg, 0.*deg, -76.6776*deg + + + + + + + + + + + 0, 0, 0.*m + 0.*deg, 0.*deg, -76.6776*deg + + + + + + + + + + + 0, 0, 0.*m + 0.*deg, 0.*deg, -103.5332*deg + + + + + + + + + + + 0, 0, 0.*m + 0.*deg, 0.*deg, -103.5332*deg + + + + + + + + + + + 0, 0, 0.*m + 0.*deg, 0.*deg, -90.2234*deg + + + + + + + + + + + 0, 0, 0.*m + 0.*deg, 0.*deg, -90.2234*deg + + + + + + + + + + + 0, 0, 0.*m + 0.*deg, 0.*deg, -76.6782*deg + + + + + + + + + + + 0, 0, 0.*m + 0.*deg, 0.*deg, -76.6782*deg + + + + + + + + + + + 0, 0, 0.63395*m + 0.*deg, 0.*deg, -90*deg + + + + + + + + + + + 0, 0, -0.63395*m + 0.*deg, 0.*deg, -90*deg + + + + + + + + + + + 0, 0, -1.0729*m + 0.*deg, 0.*deg, -99.4324*deg + + + + + + + + + + + 0, 0, 1.0729*m + 0.*deg, 0.*deg, -99.4324*deg + + + + + + + + + + + 0, 0, -1.0729*m + 0.*deg, 0.*deg, -92.9962*deg + + + + + + + + + + + 0, 0, 1.0729*m + 0.*deg, 0.*deg, -92.9962*deg + + + + + + + + + + + 0, 0, 1.0729*m + 0.*deg, 0.*deg, -92.9962*deg + + + + + + + + + + + + + + + + + 0, 0, -1.0729*m + 0.*deg, 0.*deg, -90*deg + + + + + + + + + + + 0, 0, -1.0729*m + 0.*deg, 0.*deg, -90*deg + + + + + + + + + + + + + + + + + 0, 0, 1.0729*m + 0.*deg, 0.*deg, -90*deg + + + + + + + + + + + 0, 0, 1.0729*m + 0.*deg, 0.*deg, -90*deg + + + + + + + + + + + + + + + + + 0, 0, -1.0729*m + 0.*deg, 0.*deg, -87.0038*deg + + + + + + + + + + + 0, 0, 1.0729*m + 0.*deg, 0.*deg, -87.0038*deg + + + + + + + + + + + 0, 0, 1.0729*m + 0.*deg, 0.*deg, -87.0038*deg + + + + + + + + + + + + + + + + + 0, 0, -1.0729*m + 0.*deg, 0.*deg, -80.5676*deg + + + + + + + + + + + 0, 0, 1.0729*m + 0.*deg, 0.*deg, -80.5676*deg + + + + + + + + + + + 0, 0, 0.195*m + 0.*deg, 0.*deg, -90*deg + + + + + + + + + + + 0, 0, -0.195*m + 0.*deg, 0.*deg, -90*deg + + + + + + + + + + + 0, 0, 0.*m + 0.*deg, 0.*deg, -90*deg + + + + + + + + + + + 0, 0, 0.*m + 0.*deg, 0.*deg, -90*deg + + + + + + + + + + + 0, 0, 0.63395*m + 0.*deg, 0.*deg, -103.0516*deg + + + + + + + + + + + 0, 0, -0.63395*m + 0.*deg, 0.*deg, -103.0516*deg + + + + + + + + + + + 0, 0, 0.62495*m + 0.*deg, 0.*deg, -89.3702*deg + + + + + + + + + + + 0, 0, -0.62495*m + 0.*deg, 0.*deg, -89.3702*deg + + + + + + + + + + + 0, 0, 0.63395*m + 0.*deg, 0.*deg, -76.3521*deg + + + + + + + + + + + 0, 0, -0.63395*m + 0.*deg, 0.*deg, -76.3521*deg + + + + + + + + + + + 0, 0, 0.*m + 0.*deg, 0.*deg, -103.0516*deg + + + + + + + + + + + 0, 0, 0.*m + 0.*deg, 0.*deg, -103.0516*deg + + + + + + + + + + + 0, 0, -1.0639*m + 0.*deg, 0.*deg, -97.337*deg + + + + + + + + + + + 0, 0, 1.0639*m + 0.*deg, 0.*deg, -97.337*deg + + + + + + + + + + + 0, 0, -1.0639*m + 0.*deg, 0.*deg, -92.8811*deg + + + + + + + + + + + 0, 0, 1.0639*m + 0.*deg, 0.*deg, -92.8811*deg + + + + + + + + + + + 0, 0, 1.0639*m + 0.*deg, 0.*deg, -92.8811*deg + + + + + + + + + + + + + + + + + 0, 0, -1.0639*m + 0.*deg, 0.*deg, -90*deg + + + + + + + + + + + 0, 0, -1.0639*m + 0.*deg, 0.*deg, -90*deg + + + + + + + + + + + 0, 0, 1.0639*m + 0.*deg, 0.*deg, -90*deg + + + + + + + + + + + 0, 0, 1.0639*m + 0.*deg, 0.*deg, -90*deg + + + + + + + + + + + 0, 0, -1.0639*m + 0.*deg, 0.*deg, -87.1189*deg + + + + + + + + + + + 0, 0, 1.0639*m + 0.*deg, 0.*deg, -87.1189*deg + + + + + + + + + + + 0, 0, 1.0639*m + 0.*deg, 0.*deg, -87.1189*deg + + + + + + + + + + + + + + + + + 0, 0, -1.0639*m + 0.*deg, 0.*deg, -82.0437*deg + + + + + + + + + + + 0, 0, 1.0639*m + 0.*deg, 0.*deg, -82.0437*deg + + + + + + + + + + + 0, 0, 0.186*m + 0.*deg, 0.*deg, -89.3696*deg + + + + + + + + + + + 0, 0, -0.186*m + 0.*deg, 0.*deg, -89.3696*deg + + + + + + + + + + + 0, 0, 0.*m + 0.*deg, 0.*deg, -76.3516*deg + + + + + + + + + + + 0, 0, 0.*m + 0.*deg, 0.*deg, -76.3516*deg + + + + + + + + + + + 0, 0, 0.*m + 0.*deg, 0.*deg, -103.0516*deg + + + + + + + + + + + 0, 0, 0.*m + 0.*deg, 0.*deg, -103.0516*deg + + + + + + + + + + + 0, 0, 0.*m + 0.*deg, 0.*deg, -89.3696*deg + + + + + + + + + + + 0, 0, 0.*m + 0.*deg, 0.*deg, -89.3696*deg + + + + + + + + + + + 0, 0, 0.*m + 0.*deg, 0.*deg, -76.3516*deg + + + + + + + + + + + 0, 0, 0.*m + 0.*deg, 0.*deg, -76.3516*deg + + + + + + + + + + + + 0, 0, 0.*m + 0.*deg, 0.*deg, 270.00*deg + + + diff --git a/SimG4Core/PrintGeomInfo/test/python/g4DumpGeometry_cfg.py b/SimG4Core/PrintGeomInfo/test/python/g4DumpGeometry_cfg.py index cf988f96b8ceb..9d967f85cd6b0 100644 --- a/SimG4Core/PrintGeomInfo/test/python/g4DumpGeometry_cfg.py +++ b/SimG4Core/PrintGeomInfo/test/python/g4DumpGeometry_cfg.py @@ -1,25 +1,48 @@ +############################################################################### +# Way to use this: +# cmsRun g4DumpGeometry_cfg.py geometry=Run4D110 +# +# Options for geometry 2015, 2017, 2018, Run4D110, Run4D116 +# +############################################################################### import FWCore.ParameterSet.Config as cms +import os, sys, importlib, re +import FWCore.ParameterSet.VarParsing as VarParsing + +#################################################################### +### SETUP OPTIONS +options = VarParsing.VarParsing('standard') +options.register('geometry', + "Run4D110", + VarParsing.VarParsing.multiplicity.singleton, + VarParsing.VarParsing.varType.string, + "geometry of operations: 2015, 2017, 2018, Run4D110, Run4D116") + +### get and parse the command line arguments +options.parseArguments() + +print(options) + +#####p############################################################### +# Use the options + +geomFile = "Configuration.Geometry.GeometryExtended" + options.geometry + "Reco_cff" +outFile = options.geometry +print("Geometry file Name: ", geomFile) +print("Output Base file Name: ", outFile) process = cms.Process("G4PrintGeometry") -#process.load('Configuration.Geometry.GeometryExtended2015Reco_cff') -process.load('Configuration.Geometry.GeometryExtended2017Reco_cff') -#process.load('Configuration.Geometry.GeometryExtended2021Reco_cff') -#process.load('Configuration.Geometry.GeometryExtendedRun4D77Reco_cff') -#process.load('Configuration.Geometry.GeometryExtendedRun4D83Reco_cff') +process.load(geomFile) from SimG4Core.PrintGeomInfo.g4TestGeometry_cfi import * process = checkOverlap(process) -process.MessageLogger.cerr.enable = False -process.MessageLogger.files.Ecal2017 = dict(extension ="info") - # enable Geant4 overlap check process.g4SimHits.CheckGeometry = cms.bool(True) # Geant4 geometry check -process.g4SimHits.G4CheckOverlap.OutputBaseName = cms.string("2017") -#process.g4SimHits.G4CheckOverlap.OutputBaseName = cms.string("2026D77") +process.g4SimHits.G4CheckOverlap.OutputBaseName = cms.string(outFile) process.g4SimHits.G4CheckOverlap.OverlapFlag = cms.bool(False) process.g4SimHits.G4CheckOverlap.Tolerance = cms.double(0.0) process.g4SimHits.G4CheckOverlap.Resolution = cms.int32(10000) diff --git a/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckRun4DD4hep_cfg.py b/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckRun4DD4hep_cfg.py index 5f36abc9f00ae..495cc71037e9b 100644 --- a/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckRun4DD4hep_cfg.py +++ b/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckRun4DD4hep_cfg.py @@ -1,10 +1,10 @@ ############################################################################### # Way to use this: -# cmsRun g4OverlapCheck2026DD4hep_cfg.py geometry=D110 tol=0.01 +# cmsRun g4OverlapCheckRun4DD4hep_cfg.py geometry=D110 tol=0.01 # # Options for geometry D95, D96, D98, D99, D100, D101, D102, D103, D104, # D105, D106, D107, D108, D109, D110, D111, D112, D113, -# D114, D115 +# D114, D115, D116 # ############################################################################### import FWCore.ParameterSet.Config as cms @@ -18,7 +18,7 @@ "D110", VarParsing.VarParsing.multiplicity.singleton, VarParsing.VarParsing.varType.string, - "geometry of operations: D95, D96, D98, D99, D100, D101, D102, D103, D104, D105, D106, D107, D108, D109, D110, D111, D112, D113, D114, D115") + "geometry of operations: D95, D96, D98, D99, D100, D101, D102, D103, D104, D105, D106, D107, D108, D109, D110, D111, D112, D113, D114, D115, D116") options.register('tol', 0.01, VarParsing.VarParsing.multiplicity.singleton, @@ -42,8 +42,8 @@ from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9 process = cms.Process('OverlapCheck',Phase2C17I13M9,dd4hep) -geomFile = "Configuration.Geometry.GeometryDD4hepExtended2026" + options.geometry + "Reco_cff" -baseName = "cms2026" + options.geometry + "DD4hep" +geomFile = "Configuration.Geometry.GeometryDD4hepExtendedRun4" + options.geometry + "Reco_cff" +baseName = "cmsRun4" + options.geometry + "DD4hep" print("Geometry file Name: ", geomFile) print("Base file Name: ", baseName) diff --git a/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckRun4DDD_cfg.py b/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckRun4DDD_cfg.py index 408692d878902..cff8cf76ef094 100644 --- a/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckRun4DDD_cfg.py +++ b/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheckRun4DDD_cfg.py @@ -1,10 +1,10 @@ ############################################################################### # Way to use this: -# cmsRun g4OverlapCheck2026DDD_cfg.py geometry=D110 tol=0.01 +# cmsRun g4OverlapCheckRun4DDD_cfg.py geometry=D110 tol=0.01 # # Options for geometry D95, D96, D98, D99, D100, D101, D102, D103, D104, # D105, D106, D107, D108, D109, D110, D111, D112, D113, -# D114, D115 +# D114, D115, D116 # ############################################################################### import FWCore.ParameterSet.Config as cms @@ -18,7 +18,7 @@ "D110", VarParsing.VarParsing.multiplicity.singleton, VarParsing.VarParsing.varType.string, - "geometry of operations: D95, D96, D98, D99, D100, D101, D102, D103, D104, D105, D106, D107, D108, D109, D110, D111, D112, D113, D114, D115") + "geometry of operations: D95, D96, D98, D99, D100, D101, D102, D103, D104, D105, D106, D107, D108, D109, D110, D111, D112, D113, D114, D115, D116") options.register('tol', 0.01, VarParsing.VarParsing.multiplicity.singleton, @@ -41,8 +41,8 @@ from Configuration.Eras.Era_Phase2C17I13M9_cff import Phase2C17I13M9 process = cms.Process('OverlapCheck',Phase2C17I13M9) -geomFile = "Configuration.Geometry.GeometryExtended2026" + options.geometry + "Reco_cff" -baseName = "cms2026" + options.geometry + "DDD" +geomFile = "Configuration.Geometry.GeometryExtendedRun4" + options.geometry + "Reco_cff" +baseName = "cmsRun4" + options.geometry + "DDD" print("Geometry file Name: ", geomFile) print("Base file Name: ", baseName)