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.

Sign up for GitHub

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

Jump to bottom

Run3-gex174B Backport the most recent version of Run3 geometries of 2021 and 2023 from #43418 and earlier pull requests for GE21 and HCAL #43421

Closed
wants to merge 1 commit into from
Closed

Run3-gex174B Backport the most recent version of Run3 geometries of 2021 and 2023 from #43418 and earlier pull requests for GE21 and HCAL #43421

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 26 additions & 14 deletions Configuration/Geometry/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ The script also handles the common and forward elements of the geometry:
* O5: as O6, but with trackermaterial removed (they are in T5, T6, T7, T8)
* O6: 2021 baseline
* F1: 2021 baseline
* F2: same as F1 with modified file zdc.xmlfrom ZDC group
* F3: same as F2 with added simulti geometry for RPD

Several detector combinations have been generated:
* 2021 = T3+C1+M1+P7+O6+F1
Expand All @@ -50,7 +52,12 @@ Several detector combinations have been generated:
* 2021FlatMinus10Percent = T6+C1+M1+P7+O5+F1
* 2021FlatPlus05Percent = T7+C1+M1+P7+O5+F1
* 2021FlatPlus10Percent = T8+C1+M1+P7+O5+F1
* 2023 = T3+C1+M2+P7+O6+F1
* 2023 = T3+C1+M2+P7+O6+F3
* 2023ZeroMaterial = T4+C1+M1+P7+O4+F2
* 2023FlatMinus05Percent = T5+C1+M1+P7+O5+F2
* 2023FlatMinus10Percent = T6+C1+M1+P7+O5+F2
* 2023FlatPlus05Percent = T7+C1+M1+P7+O5+F2
* 2023FlatPlus10Percent = T8+C1+M1+P7+O5+F2

# Phase 2 Geometries

Expand All @@ -69,6 +76,8 @@ Tracker:
* T31: Phase2 tilted tracker. The tracker description is identical to T24/T21. The outer radius of the tracker volume is reduced to avoid a clash with the BTL geometry. The positions of the tracker components are not affected
* T32: Phase2 tilted tracker. The tracker description is identical to T25. The outer radius of the tracker volume is reduced to avoid a clash with the BTL geometry (same as T31). The positions of the tracker components are not affected. This geometry is intended as a transition step towards a realistic configuration with 3D sensors in TBPX layer1.
* T33: Phase2 tilted tracker. Identical to T32 apart from a more realistic description of the 3D sensors in TBPX layer1.
* T34: Same as T32 with the exception of modified Tracker volume so that it touches CALO on the outer side and BeamPipe on the inner side
* T35: Same as T33 with the exception of modified Tracker volume so that it touches CALO on the outer side and BeamPipe on the inner side

Calorimeters:
* C9: HGCal (v11 post TDR HGCal Geometry w/ corner centering for HE part) + Phase2 HCAL and EB + Tracker cables (used in 2026D49)
Expand All @@ -82,7 +91,7 @@ Calorimeters:
* C18: HGCal (v17 version of HGCal geometry created for a new flat file for silicon having 47 layers, ideas of cassettes, new orientation indices for full and partial wafers) + Phase2 HCAL and EB (used in 2026D92)
* C19: HGCal (v17 version of HGCal geometry as in C18 but without internal cells in the Geant4 geometry definition) + Phase2 HCAL and EB (used in 2026D93)
* C20: HGCal (v17 version of HGCal geometry as in C18) + HFNose with corrected wafer size + Phase2 HCAL and EB (used in 2026D93)
* C21: HGCal (v17 version of HGCal geometry as in C19 but turning off a;; dead areas and gaps) + Phase2 HCAL and EB (used in 2026D101)
* C21: HGCal (v17 version of HGCal geometry as in C19 but turning off all dead areas and gaps) + Phase2 HCAL and EB (used in 2026D101)

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
Expand All @@ -91,6 +100,7 @@ Muon system:
* M8: same as M7 with changed number of strips for GE21
* 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

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
Expand Down Expand Up @@ -118,17 +128,19 @@ The script also handles the common and forward elements of the geometry:
* F8: same as F6 or F7 without BRM

Several detector combinations have been generated:
* D86 = T24+C17+M10+I14+O8+F6
* D88 = T24+C17+M10+I15+O9+F6
* D91 = T30+C17+M10+I15+O9+F6
* D92 = T24+C18+M10+I15+O9+F6
* D93 = T24+C19+M10+I15+O9+F6
* D86 = T24+C17+M10+I14+O8+F8
* D88 = T24+C17+M10+I15+O9+F8
* D91 = T30+C17+M10+I15+O9+F8
* D92 = T24+C18+M10+I15+O9+F8
* D93 = T24+C19+M10+I15+O9+F8
* D94 = T24+C20+M10+I15+O9+F8
* D95 = T31+C17+M10+I16+O9+F6
* D96 = T31+C18+M10+I16+O9+F6
* D97 = T25+C17+M10+I15+O9+F6
* D98 = T32+C17+M10+I16+O9+F6 (Current Phase-2 baseline from CMSSW_13_2_0_pre2)
* D99 = T32+C18+M10+I16+O9+F6
* D100 = T33+C17+M10+I16+O9+F6
* D101 = T32+C21+M10+I15+O9+F6
* D95 = T31+C17+M10+I16+O9+F8
* D96 = T31+C18+M10+I16+O9+F8
* D97 = T25+C17+M10+I15+O9+F8
* D98 = T32+C17+M10+I16+O9+F8 (Current Phase-2 baseline from CMSSW_13_2_0_pre2)
* D99 = T32+C18+M10+I16+O9+F8
* D100 = T34+C17+M11+I16+O9+F8
* D101 = T34+C18+M11+I16+O9+F8
* D102 = T35+C17+M11+I16+O9+F8
* D103 = T34+C21+M11+I16+O9+F8

90 changes: 78 additions & 12 deletions Configuration/Geometry/python/dict2021Geometry.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1339,11 +1339,11 @@
'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
'Geometry/HcalCommonData/data/hcalSimNumbering/2021/v1/hcalSimNumbering.xml',
'Geometry/HcalCommonData/data/hcalRecNumbering/2021/hcalRecNumbering.xml',
'Geometry/HcalCommonData/data/hcalRecNumbering/2021/v1/hcalRecNumbering.xml',
],
3 : [
'Geometry/EcalSimData/data/ecalsens.xml',
'Geometry/HcalCommonData/data/hcalsens/2021/v1/hcalsenspmf.xml',
'Geometry/HcalCommonData/data/hcalsens/2021/v2/hcalsenspmf.xml',
'Geometry/HcalSimData/data/hf.xml',
'Geometry/HcalSimData/data/hfpmt.xml',
'Geometry/HcalSimData/data/hffibrebundle.xml',
Expand Down Expand Up @@ -1402,7 +1402,7 @@
'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',
'Geometry/MuonCommonData/data/gem21/2021/v2/gem21.xml',
'Geometry/MuonCommonData/data/csc/2021/v3/csc.xml',
'Geometry/MuonCommonData/data/mfshield/2017/v2/mfshield.xml',
],
Expand Down Expand Up @@ -1447,7 +1447,7 @@
'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/2023/v1/gem21.xml',
'Geometry/MuonCommonData/data/gem21/2023/v2/gem21.xml',
'Geometry/MuonCommonData/data/csc/2021/v3/csc.xml',
'Geometry/MuonCommonData/data/mfshield/2017/v2/mfshield.xml',
],
Expand Down Expand Up @@ -1484,7 +1484,7 @@
forwardDict = {
"abbrev" : "F",
"name" : "forward",
"default" : 1,
"default" : 3,
"F1" : {
2 : [
'Geometry/ForwardCommonData/data/forward/2021/v1/forward.xml',
Expand Down Expand Up @@ -1517,7 +1517,73 @@
"reco" :[
'from Geometry.ForwardGeometry.ForwardGeometry_cfi import *',
]
}
},
"F2" : {
2 : [
'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/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',
'Geometry/ForwardCommonData/data/lumirotations.xml',
'Geometry/ForwardCommonData/data/zdc/2021/v3/zdc.xml',
'Geometry/ForwardCommonData/data/zdclumi/2021/v2/zdclumi.xml',
'Geometry/ForwardCommonData/data/cmszdc.xml',
],
3 : [
'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/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 *',
]
},
"F3" : {
2 : [
'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/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',
'Geometry/ForwardCommonData/data/lumirotations.xml',
'Geometry/ForwardCommonData/data/zdc/2021/v3/zdc.xml',
'Geometry/ForwardCommonData/data/rpd/2021/v1/rpd.xml',
'Geometry/ForwardCommonData/data/cmszdc.xml',
],
3 : [
'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/2021/v1/zdcsens.xml',
],
4 : [
'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
'Geometry/ForwardSimData/data/bhmProdCuts/2021/v1/bhmProdCuts.xml',
'Geometry/ForwardSimData/data/zdcProdCuts/2021/v3/zdcProdCuts.xml',
],
"reco" :[
'from Geometry.ForwardGeometry.ForwardGeometry_cfi import *',
]
},
}

ppsDict = {
Expand Down Expand Up @@ -1633,12 +1699,12 @@
("O5","T6","C1","M1","F1","P7") : "2021FlatMinus10Percent",
("O5","T7","C1","M1","F1","P7") : "2021FlatPlus05Percent",
("O5","T8","C1","M1","F1","P7") : "2021FlatPlus10Percent",
("O6","T3","C1","M2","F1","P7") : "2023",
("O4","T4","C1","M2","F1","P7") : "2023ZeroMaterial",
("O5","T5","C1","M2","F1","P7") : "2023FlatMinus05Percent",
("O5","T6","C1","M2","F1","P7") : "2023FlatMinus10Percent",
("O5","T7","C1","M2","F1","P7") : "2023FlatPlus05Percent",
("O5","T8","C1","M2","F1","P7") : "2023FlatPlus10Percent",
("O6","T3","C1","M2","F3","P7") : "2023",
("O4","T4","C1","M2","F2","P7") : "2023ZeroMaterial",
("O5","T5","C1","M2","F2","P7") : "2023FlatMinus05Percent",
("O5","T6","C1","M2","F2","P7") : "2023FlatMinus10Percent",
("O5","T7","C1","M2","F2","P7") : "2023FlatPlus05Percent",
("O5","T8","C1","M2","F2","P7") : "2023FlatPlus10Percent",
}

deprecatedSubdets = set([ "T1", "T2", "O1", "O2", "O3", "P1", "P2", "P3",
Expand Down
6 changes: 3 additions & 3 deletions Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@
<Include ref='Geometry/HcalCommonData/data/hcalforwardalgo.xml'/>
<Include ref='Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml'/>
<Include ref='Geometry/HcalCommonData/data/hcalSimNumbering/2021/v1/hcalSimNumbering.xml'/>
<Include ref='Geometry/HcalCommonData/data/hcalRecNumbering/2021/hcalRecNumbering.xml'/>
<Include ref='Geometry/HcalCommonData/data/hcalRecNumbering/2021/v1/hcalRecNumbering.xml'/>
<Include ref='Geometry/MuonCommonData/data/mbCommon/2021/v2/mbCommon.xml'/>
<Include ref='Geometry/MuonCommonData/data/mb1/2021/v1/mb1.xml'/>
<Include ref='Geometry/MuonCommonData/data/mb2/2021/v1/mb2.xml'/>
Expand All @@ -246,7 +246,7 @@
<Include ref='Geometry/MuonCommonData/data/rpcf/2021/v2/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/gem21/2021/v2/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/v5/muonNumbering.xml'/>
Expand Down Expand Up @@ -353,7 +353,7 @@
<Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_123.xml'/>
<Include ref='Geometry/VeryForwardData/data/CTPPS_2021/RP_Dist_Beam_Cent/Simu/v1/RP_Dist_Beam_Cent.xml'/>
<Include ref='Geometry/EcalSimData/data/ecalsens.xml'/>
<Include ref='Geometry/HcalCommonData/data/hcalsens/2021/v1/hcalsenspmf.xml'/>
<Include ref='Geometry/HcalCommonData/data/hcalsens/2021/v2/hcalsenspmf.xml'/>
<Include ref='Geometry/HcalSimData/data/hf.xml'/>
<Include ref='Geometry/HcalSimData/data/hfpmt.xml'/>
<Include ref='Geometry/HcalSimData/data/hffibrebundle.xml'/>
Expand Down
6 changes: 3 additions & 3 deletions Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatMinus05Percent.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@
<Include ref='Geometry/HcalCommonData/data/hcalforwardalgo.xml'/>
<Include ref='Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml'/>
<Include ref='Geometry/HcalCommonData/data/hcalSimNumbering/2021/v1/hcalSimNumbering.xml'/>
<Include ref='Geometry/HcalCommonData/data/hcalRecNumbering/2021/hcalRecNumbering.xml'/>
<Include ref='Geometry/HcalCommonData/data/hcalRecNumbering/2021/v1/hcalRecNumbering.xml'/>
<Include ref='Geometry/MuonCommonData/data/mbCommon/2021/v2/mbCommon.xml'/>
<Include ref='Geometry/MuonCommonData/data/mb1/2021/v1/mb1.xml'/>
<Include ref='Geometry/MuonCommonData/data/mb2/2021/v1/mb2.xml'/>
Expand All @@ -246,7 +246,7 @@
<Include ref='Geometry/MuonCommonData/data/rpcf/2021/v2/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/gem21/2021/v2/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/v5/muonNumbering.xml'/>
Expand Down Expand Up @@ -353,7 +353,7 @@
<Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_123.xml'/>
<Include ref='Geometry/VeryForwardData/data/CTPPS_2021/RP_Dist_Beam_Cent/Simu/v1/RP_Dist_Beam_Cent.xml'/>
<Include ref='Geometry/EcalSimData/data/ecalsens.xml'/>
<Include ref='Geometry/HcalCommonData/data/hcalsens/2021/v1/hcalsenspmf.xml'/>
<Include ref='Geometry/HcalCommonData/data/hcalsens/2021/v2/hcalsenspmf.xml'/>
<Include ref='Geometry/HcalSimData/data/hf.xml'/>
<Include ref='Geometry/HcalSimData/data/hfpmt.xml'/>
<Include ref='Geometry/HcalSimData/data/hffibrebundle.xml'/>
Expand Down
6 changes: 3 additions & 3 deletions Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatMinus10Percent.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@
<Include ref='Geometry/HcalCommonData/data/hcalforwardalgo.xml'/>
<Include ref='Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml'/>
<Include ref='Geometry/HcalCommonData/data/hcalSimNumbering/2021/v1/hcalSimNumbering.xml'/>
<Include ref='Geometry/HcalCommonData/data/hcalRecNumbering/2021/hcalRecNumbering.xml'/>
<Include ref='Geometry/HcalCommonData/data/hcalRecNumbering/2021/v1/hcalRecNumbering.xml'/>
<Include ref='Geometry/MuonCommonData/data/mbCommon/2021/v2/mbCommon.xml'/>
<Include ref='Geometry/MuonCommonData/data/mb1/2021/v1/mb1.xml'/>
<Include ref='Geometry/MuonCommonData/data/mb2/2021/v1/mb2.xml'/>
Expand All @@ -246,7 +246,7 @@
<Include ref='Geometry/MuonCommonData/data/rpcf/2021/v2/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/gem21/2021/v2/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/v5/muonNumbering.xml'/>
Expand Down Expand Up @@ -353,7 +353,7 @@
<Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_123.xml'/>
<Include ref='Geometry/VeryForwardData/data/CTPPS_2021/RP_Dist_Beam_Cent/Simu/v1/RP_Dist_Beam_Cent.xml'/>
<Include ref='Geometry/EcalSimData/data/ecalsens.xml'/>
<Include ref='Geometry/HcalCommonData/data/hcalsens/2021/v1/hcalsenspmf.xml'/>
<Include ref='Geometry/HcalCommonData/data/hcalsens/2021/v2/hcalsenspmf.xml'/>
<Include ref='Geometry/HcalSimData/data/hf.xml'/>
<Include ref='Geometry/HcalSimData/data/hfpmt.xml'/>
<Include ref='Geometry/HcalSimData/data/hffibrebundle.xml'/>
Expand Down
6 changes: 3 additions & 3 deletions Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatPlus05Percent.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@
<Include ref='Geometry/HcalCommonData/data/hcalforwardalgo.xml'/>
<Include ref='Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml'/>
<Include ref='Geometry/HcalCommonData/data/hcalSimNumbering/2021/v1/hcalSimNumbering.xml'/>
<Include ref='Geometry/HcalCommonData/data/hcalRecNumbering/2021/hcalRecNumbering.xml'/>
<Include ref='Geometry/HcalCommonData/data/hcalRecNumbering/2021/v1/hcalRecNumbering.xml'/>
<Include ref='Geometry/MuonCommonData/data/mbCommon/2021/v2/mbCommon.xml'/>
<Include ref='Geometry/MuonCommonData/data/mb1/2021/v1/mb1.xml'/>
<Include ref='Geometry/MuonCommonData/data/mb2/2021/v1/mb2.xml'/>
Expand All @@ -246,7 +246,7 @@
<Include ref='Geometry/MuonCommonData/data/rpcf/2021/v2/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/gem21/2021/v2/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/v5/muonNumbering.xml'/>
Expand Down Expand Up @@ -353,7 +353,7 @@
<Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_123.xml'/>
<Include ref='Geometry/VeryForwardData/data/CTPPS_2021/RP_Dist_Beam_Cent/Simu/v1/RP_Dist_Beam_Cent.xml'/>
<Include ref='Geometry/EcalSimData/data/ecalsens.xml'/>
<Include ref='Geometry/HcalCommonData/data/hcalsens/2021/v1/hcalsenspmf.xml'/>
<Include ref='Geometry/HcalCommonData/data/hcalsens/2021/v2/hcalsenspmf.xml'/>
<Include ref='Geometry/HcalSimData/data/hf.xml'/>
<Include ref='Geometry/HcalSimData/data/hfpmt.xml'/>
<Include ref='Geometry/HcalSimData/data/hffibrebundle.xml'/>
Expand Down
Loading