From ad598a6576ece743cf76c6249bec2c3394e11b04 Mon Sep 17 00:00:00 2001 From: Sunanda Date: Sun, 11 Jun 2023 15:43:11 +0200 Subject: [PATCH] Try to address the isssue of RPC geometry for Run3 applications --- .../MuonCommonData/data/rpcf/2021/v2/rpcf.xml | 616 ++++++++++++++++++ .../python/GeometryExtended2021Reco_cff.py | 53 ++ .../python/testExtendedGeometry2021XML_cfi.py | 2 +- 3 files changed, 670 insertions(+), 1 deletion(-) create mode 100644 Geometry/MuonCommonData/data/rpcf/2021/v2/rpcf.xml create mode 100644 Geometry/MuonCommonData/python/GeometryExtended2021Reco_cff.py diff --git a/Geometry/MuonCommonData/data/rpcf/2021/v2/rpcf.xml b/Geometry/MuonCommonData/data/rpcf/2021/v2/rpcf.xml new file mode 100644 index 0000000000000..6f844462d01df --- /dev/null +++ b/Geometry/MuonCommonData/data/rpcf/2021/v2/rpcf.xml @@ -0,0 +1,616 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Geometry/MuonCommonData/python/GeometryExtended2021Reco_cff.py b/Geometry/MuonCommonData/python/GeometryExtended2021Reco_cff.py new file mode 100644 index 0000000000000..60dfb0a86ed13 --- /dev/null +++ b/Geometry/MuonCommonData/python/GeometryExtended2021Reco_cff.py @@ -0,0 +1,53 @@ +import FWCore.ParameterSet.Config as cms + +from Geometry.MuonCommonData.testExtendedGeometry2021XML_cfi import * +from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cff import * +from Geometry.EcalCommonData.ecalSimulationParameters_cff import * +from Geometry.HcalCommonData.hcalDDDSimConstants_cff import * +from Geometry.MuonNumbering.muonGeometryConstants_cff import * +from Geometry.MuonNumbering.muonOffsetESProducer_cff import * + + +# tracker +from Geometry.CommonTopologies.globalTrackingGeometry_cfi import * +from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import * +from Geometry.TrackerGeometryBuilder.trackerParameters_cff import * +from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import * +from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import * + +# calo +from Geometry.CaloEventSetup.CaloTopology_cfi import * +from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import * +CaloGeometryBuilder = cms.ESProducer("CaloGeometryBuilder", + SelectedCalos = cms.vstring("HCAL", + "ZDC", + "EcalBarrel", + "EcalEndcap", + "EcalPreshower", + "TOWER", + ) +) +from Geometry.EcalAlgo.EcalGeometry_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.ForwardGeometry.ForwardGeometry_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.ForwardGeometry_cfi import * + +# pps + + diff --git a/Geometry/MuonCommonData/python/testExtendedGeometry2021XML_cfi.py b/Geometry/MuonCommonData/python/testExtendedGeometry2021XML_cfi.py index 36080e4238431..866adab69b5f9 100644 --- a/Geometry/MuonCommonData/python/testExtendedGeometry2021XML_cfi.py +++ b/Geometry/MuonCommonData/python/testExtendedGeometry2021XML_cfi.py @@ -241,7 +241,7 @@ 'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml', 'Geometry/MuonCommonData/data/muonYoke/2021/v5/muonYoke.xml', 'Geometry/MuonCommonData/data/mf/2021/v3/mf.xml', - 'Geometry/MuonCommonData/data/rpcf/2021/v1/rpcf.xml', + 'Geometry/MuonCommonData/data/rpcf/2021/v2/rpcf.xml', 'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml', 'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml', 'Geometry/MuonCommonData/data/gem21/2021/v1/gem21.xml',