Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Run3-gex108XD Modify muon numbering, adding scenarios for the corretced Run3 geometry in CMSSW version 12_2_X #36782

Merged
merged 3 commits into from Feb 7, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions Configuration/Eras/python/Modifier_run3_geomOld_cff.py
@@ -0,0 +1,4 @@
import FWCore.ParameterSet.Config as cms

run3_geomOld = cms.Modifier()

42 changes: 24 additions & 18 deletions Configuration/Geometry/python/dict2021Geometry.py
Expand Up @@ -100,7 +100,7 @@
'Geometry/TrackerCommonData/data/pixfwdCommon.xml',
'Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdCylinder.xml',
'Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdDisks.xml',
'Geometry/TrackerCommonData/data/PhaseI/v2/pixfwd.xml',
'Geometry/TrackerCommonData/data/PhaseI/v3/pixfwd.xml',
'Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdSupportRingParameters.xml',
'Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdInnerDiskZplus.xml',
'Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdInnerDiskZminus.xml',
Expand Down Expand Up @@ -303,7 +303,7 @@
'Geometry/TrackerCommonData/data/pixfwdCommon.xml',
'Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdCylinder.xml',
'Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdDisks.xml',
'Geometry/TrackerCommonData/data/PhaseI/v2/pixfwd.xml',
'Geometry/TrackerCommonData/data/PhaseI/v3/pixfwd.xml',
'Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdSupportRingParameters.xml',
'Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdInnerDiskZplus.xml',
'Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdInnerDiskZminus.xml',
Expand Down Expand Up @@ -513,7 +513,7 @@
'Geometry/TrackerCommonData/data/pixfwdCommon.xml',
'Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdCylinder.xml',
'Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdDisks.xml',
'Geometry/TrackerCommonData/data/PhaseI/v2/pixfwd.xml',
'Geometry/TrackerCommonData/data/PhaseI/v3/pixfwd.xml',
'Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdSupportRingParameters.xml',
'Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdInnerDiskZplus.xml',
'Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdInnerDiskZminus.xml',
Expand Down Expand Up @@ -717,7 +717,7 @@
'Geometry/TrackerCommonData/data/pixfwdCommon.xml',
'Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdCylinder.xml',
'Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdDisks.xml',
'Geometry/TrackerCommonData/data/PhaseI/v2/pixfwd.xml',
'Geometry/TrackerCommonData/data/PhaseI/v3/pixfwd.xml',
'Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdSupportRingParameters.xml',
'Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdInnerDiskZplus.xml',
'Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdInnerDiskZminus.xml',
Expand Down Expand Up @@ -921,7 +921,7 @@
'Geometry/TrackerCommonData/data/pixfwdCommon.xml',
'Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdCylinder.xml',
'Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdDisks.xml',
'Geometry/TrackerCommonData/data/PhaseI/v2/pixfwd.xml',
'Geometry/TrackerCommonData/data/PhaseI/v3/pixfwd.xml',
'Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdSupportRingParameters.xml',
'Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdInnerDiskZplus.xml',
'Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdInnerDiskZminus.xml',
Expand Down Expand Up @@ -1125,7 +1125,7 @@
'Geometry/TrackerCommonData/data/pixfwdCommon.xml',
'Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdCylinder.xml',
'Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdDisks.xml',
'Geometry/TrackerCommonData/data/PhaseI/v2/pixfwd.xml',
'Geometry/TrackerCommonData/data/PhaseI/v3/pixfwd.xml',
'Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdSupportRingParameters.xml',
'Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdInnerDiskZplus.xml',
'Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdInnerDiskZminus.xml',
Expand Down Expand Up @@ -1404,27 +1404,28 @@
'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml',
'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
'Geometry/MuonCommonData/data/muonYoke/2021/v5/muonYoke.xml',
'Geometry/MuonCommonData/data/mf/2021/v2/mf.xml',
'Geometry/MuonCommonData/data/rpcf/2015/v1/rpcf.xml',
'Geometry/MuonCommonData/data/mf/2021/v3/mf.xml',
'Geometry/MuonCommonData/data/rpcf/2021/v1/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',
'Geometry/MuonCommonData/data/csc/2021/v3/csc.xml',
'Geometry/MuonCommonData/data/mfshield/2017/v2/mfshield.xml',
],
2 : [
'Geometry/MuonCommonData/data/muonNumbering/2021/v3/muonNumbering.xml',
'Geometry/MuonCommonData/data/muonNumbering/2021/v5/muonNumbering.xml',
],
3 : [
'Geometry/MuonSimData/data/v2/muonSens.xml',
'Geometry/MuonSimData/data/muonSens/2021/v4/muonSens.xml',
'Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/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/RPCGeometryBuilder/data/2021/v1/RPCSpecs.xml',
'Geometry/GEMGeometryBuilder/data/GEMSpecsFilter/2021/v2/GEMSpecsFilter.xml',
'Geometry/GEMGeometryBuilder/data/GEMSpecs/2021/v2/GEMSpecs.xml',
],
4 : [
'Geometry/MuonSimData/data/muonProdCuts/2021/v1/muonProdCuts.xml',
'Geometry/MuonSimData/data/muonProdCuts/2021/v3/muonProdCuts.xml',
],
"sim" : [
'from Geometry.MuonNumbering.muonGeometryConstants_cff import *',
Expand All @@ -1450,8 +1451,10 @@
'Geometry/ForwardCommonData/data/forward/2021/v1/forward.xml',
'Geometry/ForwardCommonData/data/totemt2/2021/v1/totemt2.xml',
'Geometry/ForwardCommonData/data/forwardshield/2021/v1/forwardshield.xml',
'Geometry/ForwardCommonData/data/brmrotations.xml',
'Geometry/ForwardCommonData/data/brm/2021/v1/brm.xml',
'Geometry/ForwardCommonData/data/bhm.xml',
'Geometry/ForwardCommonData/data/pltbcm/2021/v1/pltbcm.xml',
'Geometry/ForwardCommonData/data/bcm1f/2021/v1/bcm1f.xml',
'Geometry/ForwardCommonData/data/plt/2021/v1/plt.xml',
'Geometry/ForwardCommonData/data/zdcmaterials/2021/v1/zdcmaterials.xml',
'Geometry/ForwardCommonData/data/lumimaterials.xml',
'Geometry/ForwardCommonData/data/zdcrotations.xml',
Expand All @@ -1461,13 +1464,16 @@
'Geometry/ForwardCommonData/data/cmszdc.xml',
],
3 : [
'Geometry/ForwardCommonData/data/brmsens.xml',
'Geometry/ForwardSimData/data/totemsensT2/2021/totemsensT2.xml',
'Geometry/ForwardCommonData/data/bhmsens.xml',
'Geometry/ForwardSimData/data/pltsens.xml',
'Geometry/ForwardSimData/data/bcm1fsens.xml',
'Geometry/ForwardSimData/data/zdcsens.xml',
],
4 : [
'Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml',
'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
'Geometry/ForwardSimData/data/bhmProdCuts/2021/v1/bhmProdCuts.xml',
'Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml',
],
"reco" :[
'from Geometry.ForwardGeometry.ForwardGeometry_cfi import *',
Expand Down
32 changes: 19 additions & 13 deletions Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021.xml
Expand Up @@ -29,7 +29,7 @@
<Include ref='Geometry/TrackerCommonData/data/pixfwdCommon.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdCylinder.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdDisks.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/v2/pixfwd.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/v3/pixfwd.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdSupportRingParameters.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdInnerDiskZplus.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdInnerDiskZminus.xml'/>
Expand Down Expand Up @@ -242,18 +242,21 @@
<Include ref='Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml'/>
<Include ref='Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml'/>
<Include ref='Geometry/MuonCommonData/data/muonYoke/2021/v5/muonYoke.xml'/>
<Include ref='Geometry/MuonCommonData/data/mf/2021/v2/mf.xml'/>
<Include ref='Geometry/MuonCommonData/data/rpcf/2015/v1/rpcf.xml'/>
<Include ref='Geometry/MuonCommonData/data/mf/2021/v3/mf.xml'/>
<Include ref='Geometry/MuonCommonData/data/rpcf/2021/v1/rpcf.xml'/>
<Include ref='Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml'/>
<Include ref='Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml'/>
<Include ref='Geometry/MuonCommonData/data/gem21/2021/v1/gem21.xml'/>
<Include ref='Geometry/MuonCommonData/data/csc/2021/v3/csc.xml'/>
<Include ref='Geometry/MuonCommonData/data/mfshield/2017/v2/mfshield.xml'/>
<Include ref='Geometry/MuonCommonData/data/muonNumbering/2021/v3/muonNumbering.xml'/>
<Include ref='Geometry/MuonCommonData/data/muonNumbering/2021/v5/muonNumbering.xml'/>
<Include ref='Geometry/ForwardCommonData/data/forward/2021/v1/forward.xml'/>
<Include ref='Geometry/ForwardCommonData/data/totemt2/2021/v1/totemt2.xml'/>
<Include ref='Geometry/ForwardCommonData/data/forwardshield/2021/v1/forwardshield.xml'/>
<Include ref='Geometry/ForwardCommonData/data/brmrotations.xml'/>
<Include ref='Geometry/ForwardCommonData/data/brm/2021/v1/brm.xml'/>
<Include ref='Geometry/ForwardCommonData/data/bhm.xml'/>
<Include ref='Geometry/ForwardCommonData/data/pltbcm/2021/v1/pltbcm.xml'/>
<Include ref='Geometry/ForwardCommonData/data/bcm1f/2021/v1/bcm1f.xml'/>
<Include ref='Geometry/ForwardCommonData/data/plt/2021/v1/plt.xml'/>
<Include ref='Geometry/ForwardCommonData/data/zdcmaterials/2021/v1/zdcmaterials.xml'/>
<Include ref='Geometry/ForwardCommonData/data/lumimaterials.xml'/>
<Include ref='Geometry/ForwardCommonData/data/zdcrotations.xml'/>
Expand Down Expand Up @@ -355,22 +358,25 @@
<Include ref='Geometry/HcalSimData/data/hfpmt.xml'/>
<Include ref='Geometry/HcalSimData/data/hffibrebundle.xml'/>
<Include ref='Geometry/HcalSimData/data/CaloUtil/2021/v1/CaloUtil.xml'/>
<Include ref='Geometry/MuonSimData/data/v2/muonSens.xml'/>
<Include ref='Geometry/MuonSimData/data/muonSens/2021/v4/muonSens.xml'/>
<Include ref='Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml'/>
<Include ref='Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml'/>
<Include ref='Geometry/CSCGeometryBuilder/data/cscSpecs.xml'/>
<Include ref='Geometry/RPCGeometryBuilder/data/RPCSpecs.xml'/>
<Include ref='Geometry/GEMGeometryBuilder/data/GEMSpecsFilter17.xml'/>
<Include ref='Geometry/GEMGeometryBuilder/data/v4/GEMSpecs.xml'/>
<Include ref='Geometry/ForwardCommonData/data/brmsens.xml'/>
<Include ref='Geometry/RPCGeometryBuilder/data/2021/v1/RPCSpecs.xml'/>
<Include ref='Geometry/GEMGeometryBuilder/data/GEMSpecsFilter/2021/v2/GEMSpecsFilter.xml'/>
<Include ref='Geometry/GEMGeometryBuilder/data/GEMSpecs/2021/v2/GEMSpecs.xml'/>
<Include ref='Geometry/ForwardSimData/data/totemsensT2/2021/totemsensT2.xml'/>
<Include ref='Geometry/ForwardCommonData/data/bhmsens.xml'/>
<Include ref='Geometry/ForwardSimData/data/pltsens.xml'/>
<Include ref='Geometry/ForwardSimData/data/bcm1fsens.xml'/>
<Include ref='Geometry/ForwardSimData/data/zdcsens.xml'/>
<Include ref='Geometry/HcalSimData/data/HcalProdCuts/2021/v2/HcalProdCuts.xml'/>
<Include ref='Geometry/EcalSimData/data/EcalProdCuts.xml'/>
<Include ref='Geometry/EcalSimData/data/ESProdCuts.xml'/>
<Include ref='Geometry/MuonSimData/data/muonProdCuts/2021/v1/muonProdCuts.xml'/>
<Include ref='Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml'/>
<Include ref='Geometry/MuonSimData/data/muonProdCuts/2021/v3/muonProdCuts.xml'/>
<Include ref='Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml'/>
<Include ref='Geometry/ForwardSimData/data/bhmProdCuts/2021/v1/bhmProdCuts.xml'/>
<Include ref='Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml'/>
<Include ref='Geometry/CMSCommonData/data/FieldParameters.xml'/>
</IncludeSection>
</DDDefinition>
Expand Up @@ -35,7 +35,7 @@
<Include ref='Geometry/TrackerCommonData/data/pixfwdCommon.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdCylinder.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdDisks.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/v2/pixfwd.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/v3/pixfwd.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdSupportRingParameters.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdInnerDiskZplus.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdInnerDiskZminus.xml'/>
Expand Down Expand Up @@ -242,18 +242,21 @@
<Include ref='Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml'/>
<Include ref='Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml'/>
<Include ref='Geometry/MuonCommonData/data/muonYoke/2021/v5/muonYoke.xml'/>
<Include ref='Geometry/MuonCommonData/data/mf/2021/v2/mf.xml'/>
<Include ref='Geometry/MuonCommonData/data/rpcf/2015/v1/rpcf.xml'/>
<Include ref='Geometry/MuonCommonData/data/mf/2021/v3/mf.xml'/>
<Include ref='Geometry/MuonCommonData/data/rpcf/2021/v1/rpcf.xml'/>
<Include ref='Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml'/>
<Include ref='Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml'/>
<Include ref='Geometry/MuonCommonData/data/gem21/2021/v1/gem21.xml'/>
<Include ref='Geometry/MuonCommonData/data/csc/2021/v3/csc.xml'/>
<Include ref='Geometry/MuonCommonData/data/mfshield/2017/v2/mfshield.xml'/>
<Include ref='Geometry/MuonCommonData/data/muonNumbering/2021/v3/muonNumbering.xml'/>
<Include ref='Geometry/MuonCommonData/data/muonNumbering/2021/v5/muonNumbering.xml'/>
<Include ref='Geometry/ForwardCommonData/data/forward/2021/v1/forward.xml'/>
<Include ref='Geometry/ForwardCommonData/data/totemt2/2021/v1/totemt2.xml'/>
<Include ref='Geometry/ForwardCommonData/data/forwardshield/2021/v1/forwardshield.xml'/>
<Include ref='Geometry/ForwardCommonData/data/brmrotations.xml'/>
<Include ref='Geometry/ForwardCommonData/data/brm/2021/v1/brm.xml'/>
<Include ref='Geometry/ForwardCommonData/data/bhm.xml'/>
<Include ref='Geometry/ForwardCommonData/data/pltbcm/2021/v1/pltbcm.xml'/>
<Include ref='Geometry/ForwardCommonData/data/bcm1f/2021/v1/bcm1f.xml'/>
<Include ref='Geometry/ForwardCommonData/data/plt/2021/v1/plt.xml'/>
<Include ref='Geometry/ForwardCommonData/data/zdcmaterials/2021/v1/zdcmaterials.xml'/>
<Include ref='Geometry/ForwardCommonData/data/lumimaterials.xml'/>
<Include ref='Geometry/ForwardCommonData/data/zdcrotations.xml'/>
Expand Down Expand Up @@ -355,22 +358,25 @@
<Include ref='Geometry/HcalSimData/data/hfpmt.xml'/>
<Include ref='Geometry/HcalSimData/data/hffibrebundle.xml'/>
<Include ref='Geometry/HcalSimData/data/CaloUtil/2021/v1/CaloUtil.xml'/>
<Include ref='Geometry/MuonSimData/data/v2/muonSens.xml'/>
<Include ref='Geometry/MuonSimData/data/muonSens/2021/v4/muonSens.xml'/>
<Include ref='Geometry/DTGeometryBuilder/data/dtSpecsFilter/2021/v1/dtSpecsFilter.xml'/>
<Include ref='Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml'/>
<Include ref='Geometry/CSCGeometryBuilder/data/cscSpecs.xml'/>
<Include ref='Geometry/RPCGeometryBuilder/data/RPCSpecs.xml'/>
<Include ref='Geometry/GEMGeometryBuilder/data/GEMSpecsFilter17.xml'/>
<Include ref='Geometry/GEMGeometryBuilder/data/v4/GEMSpecs.xml'/>
<Include ref='Geometry/ForwardCommonData/data/brmsens.xml'/>
<Include ref='Geometry/RPCGeometryBuilder/data/2021/v1/RPCSpecs.xml'/>
<Include ref='Geometry/GEMGeometryBuilder/data/GEMSpecsFilter/2021/v2/GEMSpecsFilter.xml'/>
<Include ref='Geometry/GEMGeometryBuilder/data/GEMSpecs/2021/v2/GEMSpecs.xml'/>
<Include ref='Geometry/ForwardSimData/data/totemsensT2/2021/totemsensT2.xml'/>
<Include ref='Geometry/ForwardCommonData/data/bhmsens.xml'/>
<Include ref='Geometry/ForwardSimData/data/pltsens.xml'/>
<Include ref='Geometry/ForwardSimData/data/bcm1fsens.xml'/>
<Include ref='Geometry/ForwardSimData/data/zdcsens.xml'/>
<Include ref='Geometry/HcalSimData/data/HcalProdCuts/2021/v2/HcalProdCuts.xml'/>
<Include ref='Geometry/EcalSimData/data/EcalProdCuts.xml'/>
<Include ref='Geometry/EcalSimData/data/ESProdCuts.xml'/>
<Include ref='Geometry/MuonSimData/data/muonProdCuts/2021/v1/muonProdCuts.xml'/>
<Include ref='Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml'/>
<Include ref='Geometry/MuonSimData/data/muonProdCuts/2021/v3/muonProdCuts.xml'/>
<Include ref='Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml'/>
<Include ref='Geometry/ForwardSimData/data/bhmProdCuts/2021/v1/bhmProdCuts.xml'/>
<Include ref='Geometry/ForwardSimData/data/zdcProdCuts/2021/v2/zdcProdCuts.xml'/>
<Include ref='Geometry/CMSCommonData/data/FieldParameters.xml'/>
</IncludeSection>
</DDDefinition>