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

Improve DD4hep workflow perf, step 3: Also reduced the number of paths (with regex) looped over for HCAL #32540

Merged
merged 18 commits into from Jan 12, 2021
Merged

Improve DD4hep workflow perf, step 3: Also reduced the number of paths (with regex) looped over for HCAL #32540

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
da1aab6
Remove regex from Geometry/TrackerRecoData/data/PhaseI/trackerRecoMat…
ghugo83 Dec 16, 2020
f52b55b
Also remove regex from trackingMaterialGroups_ForPhaseI.xml (but now …
ghugo83 Dec 16, 2020
cc83df3
Truncate the unnecessary Tracker/subdetector heads in the paths. This…
ghugo83 Dec 16, 2020
51565c8
Remove regex from Geometry/TrackerRecoData/data/PhaseI/trackerRecoMat…
ghugo83 Dec 16, 2020
aaf4029
Also remove regex from SimTracker/TrackerMaterialAnalysis/data/tracki…
ghugo83 Dec 16, 2020
0880035
Create v1 for Phase 1 trackerRecoMaterial.xml
ghugo83 Dec 17, 2020
95053db
Call no-regex version of Phase1/trackerRecoMaterial.xml in 2021 geome…
ghugo83 Dec 17, 2020
0ff94d6
Also load the no-regex XML file in materials test.
ghugo83 Dec 17, 2020
6bcd698
Also remove parents volumes from paths in PhaseI/v1/trackerRecoMateri…
ghugo83 Dec 17, 2020
c2f90bb
Moved trackingMaterialGroups_ForPhaseI.xml to v1
ghugo83 Dec 18, 2020
f7702d3
Update 2021 geometry scenarios to call v1 version of trackingMaterial…
ghugo83 Dec 18, 2020
8b3d69f
Also update MaterialAnalyzer scripts in SimTracker/TrackerMaterialAna…
ghugo83 Dec 18, 2020
b0854c4
Magic: rename SpecPar sections in HCAL allow speedup in DD4hep workfl…
ghugo83 Dec 18, 2020
389c28e
Update 2021 scenarios to call v1 versions of hcalSimNumbering.xml, hc…
ghugo83 Dec 18, 2020
d935460
Rename the v1 version files: data/v1/hcalsenspmf.xml to data/hcalsens…
ghugo83 Dec 21, 2020
a2d27f1
Propagate renaming of v1 version files (there should not directly be …
ghugo83 Dec 21, 2020
6d520e8
Propagate renaming of v1 version files to material analyzer tests
ghugo83 Dec 21, 2020
8121aeb
Renaming of data/hcalsens/2021/v1/hcalsenspmf.xml
ghugo83 Dec 21, 2020
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
36 changes: 18 additions & 18 deletions Configuration/Geometry/python/dict2021Geometry.py
View file
Open in desktop
Expand Up @@ -335,8 +335,8 @@
'Geometry/TrackerCommonData/data/trackerother.xml',
'Geometry/TrackerCommonData/data/PhaseI/trackerStructureTopology.xml',
'Geometry/TrackerSimData/data/PhaseI/trackersens.xml',
'Geometry/TrackerRecoData/data/PhaseI/trackerRecoMaterial.xml',
'SimTracker/TrackerMaterialAnalysis/data/trackingMaterialGroups_ForPhaseI.xml',
'Geometry/TrackerRecoData/data/PhaseI/v1/trackerRecoMaterial.xml',
'SimTracker/TrackerMaterialAnalysis/data/v1/trackingMaterialGroups_ForPhaseI.xml',
'Geometry/TrackerSimData/data/PhaseI/trackerProdCuts.xml',
'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
],
Expand Down Expand Up @@ -538,7 +538,7 @@
'Geometry/TrackerCommonData/data/trackerother.xml',
'Geometry/TrackerCommonData/data/PhaseI/trackerStructureTopology.xml',
'Geometry/TrackerSimData/data/PhaseI/trackersens.xml',
'Geometry/TrackerRecoData/data/PhaseI/trackerRecoMaterial.xml',
'Geometry/TrackerRecoData/data/PhaseI/v1/trackerRecoMaterial.xml',
'Geometry/TrackerSimData/data/PhaseI/trackerProdCuts.xml',
'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
],
Expand Down Expand Up @@ -740,8 +740,8 @@
'Geometry/TrackerCommonData/data/trackerother.xml',
'Geometry/TrackerCommonData/data/PhaseI/trackerStructureTopology.xml',
'Geometry/TrackerSimData/data/PhaseI/trackersens.xml',
'Geometry/TrackerRecoData/data/PhaseI/trackerRecoMaterial.xml',
'SimTracker/TrackerMaterialAnalysis/data/trackingMaterialGroups_ForPhaseI.xml',
'Geometry/TrackerRecoData/data/PhaseI/v1/trackerRecoMaterial.xml',
'SimTracker/TrackerMaterialAnalysis/data/v1/trackingMaterialGroups_ForPhaseI.xml',
'Geometry/TrackerSimData/data/PhaseI/trackerProdCuts.xml',
'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
],
Expand Down Expand Up @@ -943,8 +943,8 @@
'Geometry/TrackerCommonData/data/trackerother.xml',
'Geometry/TrackerCommonData/data/PhaseI/trackerStructureTopology.xml',
'Geometry/TrackerSimData/data/PhaseI/trackersens.xml',
'Geometry/TrackerRecoData/data/PhaseI/trackerRecoMaterial.xml',
'SimTracker/TrackerMaterialAnalysis/data/trackingMaterialGroups_ForPhaseI.xml',
'Geometry/TrackerRecoData/data/PhaseI/v1/trackerRecoMaterial.xml',
'SimTracker/TrackerMaterialAnalysis/data/v1/trackingMaterialGroups_ForPhaseI.xml',
'Geometry/TrackerSimData/data/PhaseI/trackerProdCuts.xml',
'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
],
Expand Down Expand Up @@ -1147,8 +1147,8 @@
'Geometry/TrackerCommonData/data/trackerother.xml',
'Geometry/TrackerCommonData/data/PhaseI/trackerStructureTopology.xml',
'Geometry/TrackerSimData/data/PhaseI/trackersens.xml',
'Geometry/TrackerRecoData/data/PhaseI/trackerRecoMaterial.xml',
'SimTracker/TrackerMaterialAnalysis/data/trackingMaterialGroups_ForPhaseI.xml',
'Geometry/TrackerRecoData/data/PhaseI/v1/trackerRecoMaterial.xml',
'SimTracker/TrackerMaterialAnalysis/data/v1/trackingMaterialGroups_ForPhaseI.xml',
'Geometry/TrackerSimData/data/PhaseI/trackerProdCuts.xml',
'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
],
Expand Down Expand Up @@ -1351,8 +1351,8 @@
'Geometry/TrackerCommonData/data/trackerother.xml',
'Geometry/TrackerCommonData/data/PhaseI/trackerStructureTopology.xml',
'Geometry/TrackerSimData/data/PhaseI/trackersens.xml',
'Geometry/TrackerRecoData/data/PhaseI/trackerRecoMaterial.xml',
'SimTracker/TrackerMaterialAnalysis/data/trackingMaterialGroups_ForPhaseI.xml',
'Geometry/TrackerRecoData/data/PhaseI/v1/trackerRecoMaterial.xml',
'SimTracker/TrackerMaterialAnalysis/data/v1/trackingMaterialGroups_ForPhaseI.xml',
'Geometry/TrackerSimData/data/PhaseI/trackerProdCuts.xml',
'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
],
Expand Down Expand Up @@ -1555,8 +1555,8 @@
'Geometry/TrackerCommonData/data/trackerother.xml',
'Geometry/TrackerCommonData/data/PhaseI/trackerStructureTopology.xml',
'Geometry/TrackerSimData/data/PhaseI/trackersens.xml',
'Geometry/TrackerRecoData/data/PhaseI/trackerRecoMaterial.xml',
'SimTracker/TrackerMaterialAnalysis/data/trackingMaterialGroups_ForPhaseI.xml',
'Geometry/TrackerRecoData/data/PhaseI/v1/trackerRecoMaterial.xml',
'SimTracker/TrackerMaterialAnalysis/data/v1/trackingMaterialGroups_ForPhaseI.xml',
'Geometry/TrackerSimData/data/PhaseI/trackerProdCuts.xml',
'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
],
Expand Down Expand Up @@ -1759,8 +1759,8 @@
'Geometry/TrackerCommonData/data/trackerother.xml',
'Geometry/TrackerCommonData/data/PhaseI/trackerStructureTopology.xml',
'Geometry/TrackerSimData/data/PhaseI/trackersens.xml',
'Geometry/TrackerRecoData/data/PhaseI/trackerRecoMaterial.xml',
'SimTracker/TrackerMaterialAnalysis/data/trackingMaterialGroups_ForPhaseI.xml',
'Geometry/TrackerRecoData/data/PhaseI/v1/trackerRecoMaterial.xml',
'SimTracker/TrackerMaterialAnalysis/data/v1/trackingMaterialGroups_ForPhaseI.xml',
'Geometry/TrackerSimData/data/PhaseI/trackerProdCuts.xml',
'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
],
Expand Down Expand Up @@ -1805,19 +1805,19 @@
'Geometry/HcalCommonData/data/hcalouteralgo.xml',
'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
'Geometry/HcalCommonData/data/hcalSimNumbering/2021/hcalSimNumbering.xml',
'Geometry/HcalCommonData/data/hcalSimNumbering/2021/v1/hcalSimNumbering.xml',
'Geometry/HcalCommonData/data/hcalRecNumbering/2021/hcalRecNumbering.xml',
],
3 : [
'Geometry/EcalSimData/data/ecalsens.xml',
'Geometry/HcalCommonData/data/hcalsenspmf.xml',
'Geometry/HcalCommonData/data/v1/hcalsenspmf.xml',
'Geometry/HcalSimData/data/hf.xml',
'Geometry/HcalSimData/data/hfpmt.xml',
'Geometry/HcalSimData/data/hffibrebundle.xml',
'Geometry/HcalSimData/data/CaloUtil.xml',
],
4 : [
'Geometry/HcalSimData/data/HcalProdCuts.xml',
'Geometry/HcalSimData/data/v1/HcalProdCuts.xml',
'Geometry/EcalSimData/data/EcalProdCuts.xml',
'Geometry/EcalSimData/data/ESProdCuts.xml',
],
Expand Down
10 changes: 5 additions & 5 deletions Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021.xml
View file
Open in desktop
Expand Up @@ -208,8 +208,8 @@
<Include ref='Geometry/TrackerCommonData/data/trackerother.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/trackerStructureTopology.xml'/>
<Include ref='Geometry/TrackerSimData/data/PhaseI/trackersens.xml'/>
<Include ref='Geometry/TrackerRecoData/data/PhaseI/trackerRecoMaterial.xml'/>
<Include ref='SimTracker/TrackerMaterialAnalysis/data/trackingMaterialGroups_ForPhaseI.xml'/>
<Include ref='Geometry/TrackerRecoData/data/PhaseI/v1/trackerRecoMaterial.xml'/>
<Include ref='SimTracker/TrackerMaterialAnalysis/data/v1/trackingMaterialGroups_ForPhaseI.xml'/>
<Include ref='Geometry/TrackerSimData/data/PhaseI/trackerProdCuts.xml'/>
<Include ref='Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml'/>
<Include ref='Geometry/EcalCommonData/data/eregalgo/2017/v1/eregalgo.xml'/>
Expand All @@ -233,7 +233,7 @@
<Include ref='Geometry/HcalCommonData/data/hcalouteralgo.xml'/>
<Include ref='Geometry/HcalCommonData/data/hcalforwardalgo.xml'/>
<Include ref='Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml'/>
<Include ref='Geometry/HcalCommonData/data/hcalSimNumbering/2021/hcalSimNumbering.xml'/>
<Include ref='Geometry/HcalCommonData/data/hcalSimNumbering/2021/v1/hcalSimNumbering.xml'/>
<Include ref='Geometry/HcalCommonData/data/hcalRecNumbering/2021/hcalRecNumbering.xml'/>
<Include ref='Geometry/MuonCommonData/data/mbCommon/2021/v2/mbCommon.xml'/>
<Include ref='Geometry/MuonCommonData/data/mb1/2021/v1/mb1.xml'/>
Expand Down Expand Up @@ -355,7 +355,7 @@
<Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_Sens.xml'/>
<Include ref='Geometry/VeryForwardData/data/CTPPS_2018/RP_Dist_Beam_Cent.xml'/>
<Include ref='Geometry/EcalSimData/data/ecalsens.xml'/>
<Include ref='Geometry/HcalCommonData/data/hcalsenspmf.xml'/>
<Include ref='Geometry/HcalCommonData/data/v1/hcalsenspmf.xml'/>
<Include ref='Geometry/HcalSimData/data/hf.xml'/>
<Include ref='Geometry/HcalSimData/data/hfpmt.xml'/>
<Include ref='Geometry/HcalSimData/data/hffibrebundle.xml'/>
Expand All @@ -370,7 +370,7 @@
<Include ref='Geometry/ForwardCommonData/data/brmsens.xml'/>
<Include ref='Geometry/ForwardSimData/data/totemsensT2/2021/totemsensT2.xml'/>
<Include ref='Geometry/ForwardSimData/data/zdcsens.xml'/>
<Include ref='Geometry/HcalSimData/data/HcalProdCuts.xml'/>
<Include ref='Geometry/HcalSimData/data/v1/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'/>
Expand Down
10 changes: 5 additions & 5 deletions Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatMinus05Percent.xml
View file
Open in desktop
Expand Up @@ -208,8 +208,8 @@
<Include ref='Geometry/TrackerCommonData/data/trackerother.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/trackerStructureTopology.xml'/>
<Include ref='Geometry/TrackerSimData/data/PhaseI/trackersens.xml'/>
<Include ref='Geometry/TrackerRecoData/data/PhaseI/trackerRecoMaterial.xml'/>
<Include ref='SimTracker/TrackerMaterialAnalysis/data/trackingMaterialGroups_ForPhaseI.xml'/>
<Include ref='Geometry/TrackerRecoData/data/PhaseI/v1/trackerRecoMaterial.xml'/>
<Include ref='SimTracker/TrackerMaterialAnalysis/data/v1/trackingMaterialGroups_ForPhaseI.xml'/>
<Include ref='Geometry/TrackerSimData/data/PhaseI/trackerProdCuts.xml'/>
<Include ref='Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml'/>
<Include ref='Geometry/EcalCommonData/data/eregalgo/2017/v1/eregalgo.xml'/>
Expand All @@ -233,7 +233,7 @@
<Include ref='Geometry/HcalCommonData/data/hcalouteralgo.xml'/>
<Include ref='Geometry/HcalCommonData/data/hcalforwardalgo.xml'/>
<Include ref='Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml'/>
<Include ref='Geometry/HcalCommonData/data/hcalSimNumbering/2021/hcalSimNumbering.xml'/>
<Include ref='Geometry/HcalCommonData/data/hcalSimNumbering/2021/v1/hcalSimNumbering.xml'/>
<Include ref='Geometry/HcalCommonData/data/hcalRecNumbering/2021/hcalRecNumbering.xml'/>
<Include ref='Geometry/MuonCommonData/data/mbCommon/2021/v2/mbCommon.xml'/>
<Include ref='Geometry/MuonCommonData/data/mb1/2021/v1/mb1.xml'/>
Expand Down Expand Up @@ -355,7 +355,7 @@
<Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_Sens.xml'/>
<Include ref='Geometry/VeryForwardData/data/CTPPS_2018/RP_Dist_Beam_Cent.xml'/>
<Include ref='Geometry/EcalSimData/data/ecalsens.xml'/>
<Include ref='Geometry/HcalCommonData/data/hcalsenspmf.xml'/>
<Include ref='Geometry/HcalCommonData/data/v1/hcalsenspmf.xml'/>
<Include ref='Geometry/HcalSimData/data/hf.xml'/>
<Include ref='Geometry/HcalSimData/data/hfpmt.xml'/>
<Include ref='Geometry/HcalSimData/data/hffibrebundle.xml'/>
Expand All @@ -370,7 +370,7 @@
<Include ref='Geometry/ForwardCommonData/data/brmsens.xml'/>
<Include ref='Geometry/ForwardSimData/data/totemsensT2/2021/totemsensT2.xml'/>
<Include ref='Geometry/ForwardSimData/data/zdcsens.xml'/>
<Include ref='Geometry/HcalSimData/data/HcalProdCuts.xml'/>
<Include ref='Geometry/HcalSimData/data/v1/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'/>
Expand Down
10 changes: 5 additions & 5 deletions Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatMinus10Percent.xml
View file
Open in desktop
Expand Up @@ -208,8 +208,8 @@
<Include ref='Geometry/TrackerCommonData/data/trackerother.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/trackerStructureTopology.xml'/>
<Include ref='Geometry/TrackerSimData/data/PhaseI/trackersens.xml'/>
<Include ref='Geometry/TrackerRecoData/data/PhaseI/trackerRecoMaterial.xml'/>
<Include ref='SimTracker/TrackerMaterialAnalysis/data/trackingMaterialGroups_ForPhaseI.xml'/>
<Include ref='Geometry/TrackerRecoData/data/PhaseI/v1/trackerRecoMaterial.xml'/>
<Include ref='SimTracker/TrackerMaterialAnalysis/data/v1/trackingMaterialGroups_ForPhaseI.xml'/>
<Include ref='Geometry/TrackerSimData/data/PhaseI/trackerProdCuts.xml'/>
<Include ref='Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml'/>
<Include ref='Geometry/EcalCommonData/data/eregalgo/2017/v1/eregalgo.xml'/>
Expand All @@ -233,7 +233,7 @@
<Include ref='Geometry/HcalCommonData/data/hcalouteralgo.xml'/>
<Include ref='Geometry/HcalCommonData/data/hcalforwardalgo.xml'/>
<Include ref='Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml'/>
<Include ref='Geometry/HcalCommonData/data/hcalSimNumbering/2021/hcalSimNumbering.xml'/>
<Include ref='Geometry/HcalCommonData/data/hcalSimNumbering/2021/v1/hcalSimNumbering.xml'/>
<Include ref='Geometry/HcalCommonData/data/hcalRecNumbering/2021/hcalRecNumbering.xml'/>
<Include ref='Geometry/MuonCommonData/data/mbCommon/2021/v2/mbCommon.xml'/>
<Include ref='Geometry/MuonCommonData/data/mb1/2021/v1/mb1.xml'/>
Expand Down Expand Up @@ -355,7 +355,7 @@
<Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_Sens.xml'/>
<Include ref='Geometry/VeryForwardData/data/CTPPS_2018/RP_Dist_Beam_Cent.xml'/>
<Include ref='Geometry/EcalSimData/data/ecalsens.xml'/>
<Include ref='Geometry/HcalCommonData/data/hcalsenspmf.xml'/>
<Include ref='Geometry/HcalCommonData/data/v1/hcalsenspmf.xml'/>
<Include ref='Geometry/HcalSimData/data/hf.xml'/>
<Include ref='Geometry/HcalSimData/data/hfpmt.xml'/>
<Include ref='Geometry/HcalSimData/data/hffibrebundle.xml'/>
Expand All @@ -370,7 +370,7 @@
<Include ref='Geometry/ForwardCommonData/data/brmsens.xml'/>
<Include ref='Geometry/ForwardSimData/data/totemsensT2/2021/totemsensT2.xml'/>
<Include ref='Geometry/ForwardSimData/data/zdcsens.xml'/>
<Include ref='Geometry/HcalSimData/data/HcalProdCuts.xml'/>
<Include ref='Geometry/HcalSimData/data/v1/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'/>
Expand Down
10 changes: 5 additions & 5 deletions Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatPlus05Percent.xml
View file
Open in desktop
Expand Up @@ -208,8 +208,8 @@
<Include ref='Geometry/TrackerCommonData/data/trackerother.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/trackerStructureTopology.xml'/>
<Include ref='Geometry/TrackerSimData/data/PhaseI/trackersens.xml'/>
<Include ref='Geometry/TrackerRecoData/data/PhaseI/trackerRecoMaterial.xml'/>
<Include ref='SimTracker/TrackerMaterialAnalysis/data/trackingMaterialGroups_ForPhaseI.xml'/>
<Include ref='Geometry/TrackerRecoData/data/PhaseI/v1/trackerRecoMaterial.xml'/>
<Include ref='SimTracker/TrackerMaterialAnalysis/data/v1/trackingMaterialGroups_ForPhaseI.xml'/>
<Include ref='Geometry/TrackerSimData/data/PhaseI/trackerProdCuts.xml'/>
<Include ref='Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml'/>
<Include ref='Geometry/EcalCommonData/data/eregalgo/2017/v1/eregalgo.xml'/>
Expand All @@ -233,7 +233,7 @@
<Include ref='Geometry/HcalCommonData/data/hcalouteralgo.xml'/>
<Include ref='Geometry/HcalCommonData/data/hcalforwardalgo.xml'/>
<Include ref='Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml'/>
<Include ref='Geometry/HcalCommonData/data/hcalSimNumbering/2021/hcalSimNumbering.xml'/>
<Include ref='Geometry/HcalCommonData/data/hcalSimNumbering/2021/v1/hcalSimNumbering.xml'/>
<Include ref='Geometry/HcalCommonData/data/hcalRecNumbering/2021/hcalRecNumbering.xml'/>
<Include ref='Geometry/MuonCommonData/data/mbCommon/2021/v2/mbCommon.xml'/>
<Include ref='Geometry/MuonCommonData/data/mb1/2021/v1/mb1.xml'/>
Expand Down Expand Up @@ -355,7 +355,7 @@
<Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_Sens.xml'/>
<Include ref='Geometry/VeryForwardData/data/CTPPS_2018/RP_Dist_Beam_Cent.xml'/>
<Include ref='Geometry/EcalSimData/data/ecalsens.xml'/>
<Include ref='Geometry/HcalCommonData/data/hcalsenspmf.xml'/>
<Include ref='Geometry/HcalCommonData/data/v1/hcalsenspmf.xml'/>
<Include ref='Geometry/HcalSimData/data/hf.xml'/>
<Include ref='Geometry/HcalSimData/data/hfpmt.xml'/>
<Include ref='Geometry/HcalSimData/data/hffibrebundle.xml'/>
Expand All @@ -370,7 +370,7 @@
<Include ref='Geometry/ForwardCommonData/data/brmsens.xml'/>
<Include ref='Geometry/ForwardSimData/data/totemsensT2/2021/totemsensT2.xml'/>
<Include ref='Geometry/ForwardSimData/data/zdcsens.xml'/>
<Include ref='Geometry/HcalSimData/data/HcalProdCuts.xml'/>
<Include ref='Geometry/HcalSimData/data/v1/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'/>
Expand Down
10 changes: 5 additions & 5 deletions Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021FlatPlus10Percent.xml
View file
Open in desktop
Expand Up @@ -208,8 +208,8 @@
<Include ref='Geometry/TrackerCommonData/data/trackerother.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/trackerStructureTopology.xml'/>
<Include ref='Geometry/TrackerSimData/data/PhaseI/trackersens.xml'/>
<Include ref='Geometry/TrackerRecoData/data/PhaseI/trackerRecoMaterial.xml'/>
<Include ref='SimTracker/TrackerMaterialAnalysis/data/trackingMaterialGroups_ForPhaseI.xml'/>
<Include ref='Geometry/TrackerRecoData/data/PhaseI/v1/trackerRecoMaterial.xml'/>
<Include ref='SimTracker/TrackerMaterialAnalysis/data/v1/trackingMaterialGroups_ForPhaseI.xml'/>
<Include ref='Geometry/TrackerSimData/data/PhaseI/trackerProdCuts.xml'/>
<Include ref='Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml'/>
<Include ref='Geometry/EcalCommonData/data/eregalgo/2017/v1/eregalgo.xml'/>
Expand All @@ -233,7 +233,7 @@
<Include ref='Geometry/HcalCommonData/data/hcalouteralgo.xml'/>
<Include ref='Geometry/HcalCommonData/data/hcalforwardalgo.xml'/>
<Include ref='Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml'/>
<Include ref='Geometry/HcalCommonData/data/hcalSimNumbering/2021/hcalSimNumbering.xml'/>
<Include ref='Geometry/HcalCommonData/data/hcalSimNumbering/2021/v1/hcalSimNumbering.xml'/>
<Include ref='Geometry/HcalCommonData/data/hcalRecNumbering/2021/hcalRecNumbering.xml'/>
<Include ref='Geometry/MuonCommonData/data/mbCommon/2021/v2/mbCommon.xml'/>
<Include ref='Geometry/MuonCommonData/data/mb1/2021/v1/mb1.xml'/>
Expand Down Expand Up @@ -355,7 +355,7 @@
<Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_Sens.xml'/>
<Include ref='Geometry/VeryForwardData/data/CTPPS_2018/RP_Dist_Beam_Cent.xml'/>
<Include ref='Geometry/EcalSimData/data/ecalsens.xml'/>
<Include ref='Geometry/HcalCommonData/data/hcalsenspmf.xml'/>
<Include ref='Geometry/HcalCommonData/data/v1/hcalsenspmf.xml'/>
<Include ref='Geometry/HcalSimData/data/hf.xml'/>
<Include ref='Geometry/HcalSimData/data/hfpmt.xml'/>
<Include ref='Geometry/HcalSimData/data/hffibrebundle.xml'/>
Expand All @@ -370,7 +370,7 @@
<Include ref='Geometry/ForwardCommonData/data/brmsens.xml'/>
<Include ref='Geometry/ForwardSimData/data/totemsensT2/2021/totemsensT2.xml'/>
<Include ref='Geometry/ForwardSimData/data/zdcsens.xml'/>
<Include ref='Geometry/HcalSimData/data/HcalProdCuts.xml'/>
<Include ref='Geometry/HcalSimData/data/v1/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'/>
Expand Down