Skip to content

Commit

Permalink
Merge pull request #31286 from bsunanda/Run3-gex10
Browse files Browse the repository at this point in the history 
Run3-gex10 Recreate Run3 scenarios with the new xml files
  • Loading branch information
@cmsbuild
cmsbuild committed Sep 4, 2020
2 parents 5380779 + f291a9b commit ab2294c
Show file tree
Hide file tree
Showing 11 changed files with 928 additions and 182 deletions.
14 changes: 7 additions & 7 deletions Configuration/Geometry/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ The Run 3 geometry is automatically created using the script [generate2021Geomet
Different versions of various subdetectors can be combined. The available versions are:

Tracker:
* T1: 2021 baseline
* T2: as T1, but with zero material
* T3: 2021 baseline after separating tracker specific material
* T4: as T3, but with zero material

Calorimeters:
* C1: 2021 baseline
Expand All @@ -15,16 +15,16 @@ Muon system:
* M1: 2021 baseline

PPS:
* P1: 2021 baseline
* P2: 2021 baseline (after using its own material files for pixel)

The script also handles the common and forward elements of the geometry:
* O1: 2021 baseline
* O2: as O1, but with zero material
* O3: 2021 baseline
* O4: as O3, but with zero material
* F1: 2021 baseline

Several detector combinations have been generated:
* 2021 = T1+C1+M1+P1+O1+F1
* 2021ZeroMaterial = T2+C1+M1+P1+O2+F1
* 2021 = T3+C1+M1+P2+O3+F1
* 2021ZeroMaterial = T4+C1+M1+P2+O4+F1

# Phase 2 Geometries

Expand Down
576 changes: 571 additions & 5 deletions Configuration/Geometry/python/dict2021Geometry.py
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Configuration/Geometry/scripts/generate2021Geometry.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

if __name__ == "__main__":
# create geometry generator object w/ 2021 content and run it
generator2021 = GeometryGenerator("generate2021Geometry.py",2021,"","",maxSections,allDicts,detectorVersionDict,detectorVersionType=str)
generator2021 = GeometryGenerator("generate2021Geometry.py",2021,"","",maxSections,allDicts,detectorVersionDict,detectorVersionType=str,deprecatedSubdets=deprecatedSubdets)
generator2021.run()


70 changes: 35 additions & 35 deletions Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<close_geometry/>

<IncludeSection>
<Include ref='Geometry/CMSCommonData/data/materials/2021/v1/materials.xml'/>
<Include ref='Geometry/TrackerCommonData/data/Run2/trackermaterial.xml'/>
<Include ref='Geometry/CMSCommonData/data/materials/2021/v2/materials.xml'/>
<Include ref='Geometry/TrackerCommonData/data/trackermaterial/2021/v1/trackermaterial.xml'/>
<Include ref='Geometry/CMSCommonData/data/rotations.xml'/>
<Include ref='Geometry/CMSCommonData/data/extend/v2/cmsextent.xml'/>
<Include ref='Geometry/CMSCommonData/data/cavernData/2021/v1/cavernData.xml'/>
Expand All @@ -25,36 +25,36 @@
<Include ref='Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml'/>
<Include ref='Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/trackerParameters.xml'/>
<Include ref='Geometry/TrackerCommonData/data/pixfwdMaterials/2021/v1/pixfwdMaterials.xml'/>
<Include ref='Geometry/TrackerCommonData/data/pixfwdMaterials/2021/v2/pixfwdMaterials.xml'/>
<Include ref='Geometry/TrackerCommonData/data/pixfwdCommon.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/pixfwdCylinder.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/pixfwdDisks.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/pixfwd.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/pixfwdSupportRingParameters.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/pixfwdInnerDiskZplus.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/pixfwdInnerDiskZminus.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/pixfwdOuterDiskZplus.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/pixfwdOuterDiskZminus.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/pixfwdbladeInnerZplus.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/pixfwdbladeInnerZminus.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/pixfwdbladeOuterZplus.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/pixfwdbladeOuterZminus.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/pixbarmaterial.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/pixbarladder.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/pixbarladderfull0.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/pixbarladderfull1.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/pixbarladderfull2.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/pixbarladderfull3.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/pixbarlayer.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/pixbarlayer0.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/pixbarlayer1.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/pixbarlayer2.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/pixbarlayer3.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/v1/pixbar.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/v2/pixfwdSupportRingParameters.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdInnerDiskZplus.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdInnerDiskZminus.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdOuterDiskZplus.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdOuterDiskZminus.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdbladeInnerZplus.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdbladeInnerZminus.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdbladeOuterZplus.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdbladeOuterZminus.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/v2/pixbarmaterial.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/v2/pixbarladder.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/v2/pixbarladderfull0.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/v2/pixbarladderfull1.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/v2/pixbarladderfull2.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/v2/pixbarladderfull3.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/v2/pixbarlayer.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/v2/pixbarlayer0.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/v2/pixbarlayer1.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/v2/pixbarlayer2.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/v2/pixbarlayer3.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/v2/pixbar.xml'/>
<Include ref='Geometry/TrackerCommonData/data/Run2/trackerpatchpannel.xml'/>
<Include ref='Geometry/TrackerCommonData/data/Run2/trackerpixelnose.xml'/>
<Include ref='Geometry/TrackerCommonData/data/tibtidcommonmaterial.xml'/>
<Include ref='Geometry/TrackerCommonData/data/tibmaterial.xml'/>
<Include ref='Geometry/TrackerCommonData/data/tibtidcommonmaterial/2021/v1/tibtidcommonmaterial.xml'/>
<Include ref='Geometry/TrackerCommonData/data/tibmaterial/2021/v1/tibmaterial.xml'/>
<Include ref='Geometry/TrackerCommonData/data/tibmodpar.xml'/>
<Include ref='Geometry/TrackerCommonData/data/tibmodule0.xml'/>
<Include ref='Geometry/TrackerCommonData/data/tibmodule0a.xml'/>
Expand Down Expand Up @@ -87,7 +87,7 @@
<Include ref='Geometry/TrackerCommonData/data/tiblayer2.xml'/>
<Include ref='Geometry/TrackerCommonData/data/tiblayer3.xml'/>
<Include ref='Geometry/TrackerCommonData/data/tib.xml'/>
<Include ref='Geometry/TrackerCommonData/data/tidmaterial.xml'/>
<Include ref='Geometry/TrackerCommonData/data/tidmaterial/2021/v1/tidmaterial.xml'/>
<Include ref='Geometry/TrackerCommonData/data/tidmodpar.xml'/>
<Include ref='Geometry/TrackerCommonData/data/tidmodule0.xml'/>
<Include ref='Geometry/TrackerCommonData/data/tidmodule0r.xml'/>
Expand All @@ -110,7 +110,7 @@
<Include ref='Geometry/TrackerCommonData/data/tibtidservices.xml'/>
<Include ref='Geometry/TrackerCommonData/data/tibtidservicesf.xml'/>
<Include ref='Geometry/TrackerCommonData/data/tibtidservicesb.xml'/>
<Include ref='Geometry/TrackerCommonData/data/tobmaterial.xml'/>
<Include ref='Geometry/TrackerCommonData/data/tobmaterial/2021/v1/tobmaterial.xml'/>
<Include ref='Geometry/TrackerCommonData/data/tobmodpar.xml'/>
<Include ref='Geometry/TrackerCommonData/data/tobmodule0.xml'/>
<Include ref='Geometry/TrackerCommonData/data/tobmodule2.xml'/>
Expand Down Expand Up @@ -138,7 +138,7 @@
<Include ref='Geometry/TrackerCommonData/data/tobrod5h.xml'/>
<Include ref='Geometry/TrackerCommonData/data/tobrod5.xml'/>
<Include ref='Geometry/TrackerCommonData/data/v2/tob.xml'/>
<Include ref='Geometry/TrackerCommonData/data/tecmaterial.xml'/>
<Include ref='Geometry/TrackerCommonData/data/tecmaterial/2021/v1/tecmaterial.xml'/>
<Include ref='Geometry/TrackerCommonData/data/tecmodpar.xml'/>
<Include ref='Geometry/TrackerCommonData/data/tecmodule0.xml'/>
<Include ref='Geometry/TrackerCommonData/data/tecmodule0r.xml'/>
Expand Down Expand Up @@ -345,9 +345,9 @@
<Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_2018/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane4.xml'/>
<Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_2018/CTPPS_Diamond_Detector_Assembly.xml'/>
<Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_Sensitive_Dets_TimingHits.xml'/>
<Include ref='Geometry/VeryForwardData/data/ppstrackerMaterials.xml'/>
<Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_Module.xml'/>
<Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_Module_2x2.xml'/>
<Include ref='Geometry/VeryForwardData/data/ppstrackerMaterials/v1/ppstrackerMaterials.xml'/>
<Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_Module/v1/CTPPS_Pixel_Module.xml'/>
<Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_Module_2x2/v1/CTPPS_Pixel_Module_2x2.xml'/>
<Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2018/CTPPS_Pixel_Assembly_Box_Real_003.xml'/>
<Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2018/CTPPS_Pixel_Assembly_Box_Real_023.xml'/>
<Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2018/CTPPS_Pixel_Assembly_Box_Real_103.xml'/>
Expand Down
70 changes: 35 additions & 35 deletions Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021ZeroMaterial.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<close_geometry/>

<IncludeSection>
<Include ref='Geometry/CMSCommonData/data/materials/2021ZeroMaterial/v1/materials.xml'/>
<Include ref='Geometry/TrackerCommonData/data/trackermaterial/2017ZeroMaterial/v1/trackermaterial.xml'/>
<Include ref='Geometry/CMSCommonData/data/materials/2021/v2/materials.xml'/>
<Include ref='Geometry/TrackerCommonData/data/zeroMaterial/2021/v1/trackermaterial.xml'/>
<Include ref='Geometry/CMSCommonData/data/rotations.xml'/>
<Include ref='Geometry/CMSCommonData/data/extend/v2/cmsextent.xml'/>
<Include ref='Geometry/CMSCommonData/data/cavernData/2021/v1/cavernData.xml'/>
Expand All @@ -25,36 +25,36 @@
<Include ref='Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml'/>
<Include ref='Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/trackerParameters.xml'/>
<Include ref='Geometry/TrackerCommonData/data/pixfwdMaterials/2017ZeroMaterial/v1/pixfwdMaterials.xml'/>
<Include ref='Geometry/TrackerCommonData/data/zeroMaterial/2021/v1/pixfwdMaterials.xml'/>
<Include ref='Geometry/TrackerCommonData/data/pixfwdCommon.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/pixfwdCylinder.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/pixfwdDisks.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/pixfwd.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/pixfwdSupportRingParameters.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/pixfwdInnerDiskZplus.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/pixfwdInnerDiskZminus.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/pixfwdOuterDiskZplus.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/pixfwdOuterDiskZminus.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/pixfwdbladeInnerZplus.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/pixfwdbladeInnerZminus.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/pixfwdbladeOuterZplus.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/pixfwdbladeOuterZminus.xml'/>
<Include ref='Geometry/TrackerCommonData/data/pixbarmaterial/2017ZeroMaterial/v1/pixbarmaterial.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/pixbarladder.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/pixbarladderfull0.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/pixbarladderfull1.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/pixbarladderfull2.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/pixbarladderfull3.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/pixbarlayer.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/pixbarlayer0.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/pixbarlayer1.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/pixbarlayer2.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/pixbarlayer3.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/v1/pixbar.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/v2/pixfwdSupportRingParameters.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdInnerDiskZplus.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdInnerDiskZminus.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdOuterDiskZplus.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdOuterDiskZminus.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdbladeInnerZplus.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdbladeInnerZminus.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdbladeOuterZplus.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdbladeOuterZminus.xml'/>
<Include ref='Geometry/TrackerCommonData/data/zeroMaterial/2021/v1/pixbarmaterial.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/v2/pixbarladder.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/v2/pixbarladderfull0.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/v2/pixbarladderfull1.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/v2/pixbarladderfull2.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/v2/pixbarladderfull3.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/v2/pixbarlayer.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/v2/pixbarlayer0.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/v2/pixbarlayer1.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/v2/pixbarlayer2.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/v2/pixbarlayer3.xml'/>
<Include ref='Geometry/TrackerCommonData/data/PhaseI/v2/pixbar.xml'/>
<Include ref='Geometry/TrackerCommonData/data/Run2/trackerpatchpannel.xml'/>
<Include ref='Geometry/TrackerCommonData/data/Run2/trackerpixelnose.xml'/>
<Include ref='Geometry/TrackerCommonData/data/tibtidcommonmaterial/2017ZeroMaterial/v1/tibtidcommonmaterial.xml'/>
<Include ref='Geometry/TrackerCommonData/data/tibmaterial/2017ZeroMaterial/v1/tibmaterial.xml'/>
<Include ref='Geometry/TrackerCommonData/data/zeroMaterial/2021/v1/tibtidcommonmaterial.xml'/>
<Include ref='Geometry/TrackerCommonData/data/zeroMaterial/2021/v1/tibmaterial.xml'/>
<Include ref='Geometry/TrackerCommonData/data/tibmodpar.xml'/>
<Include ref='Geometry/TrackerCommonData/data/tibmodule0.xml'/>
<Include ref='Geometry/TrackerCommonData/data/tibmodule0a.xml'/>
Expand Down Expand Up @@ -87,7 +87,7 @@
<Include ref='Geometry/TrackerCommonData/data/tiblayer2.xml'/>
<Include ref='Geometry/TrackerCommonData/data/tiblayer3.xml'/>
<Include ref='Geometry/TrackerCommonData/data/tib.xml'/>
<Include ref='Geometry/TrackerCommonData/data/tidmaterial/2017ZeroMaterial/v1/tidmaterial.xml'/>
<Include ref='Geometry/TrackerCommonData/data/zeroMaterial/2021/v1/tidmaterial.xml'/>
<Include ref='Geometry/TrackerCommonData/data/tidmodpar.xml'/>
<Include ref='Geometry/TrackerCommonData/data/tidmodule0.xml'/>
<Include ref='Geometry/TrackerCommonData/data/tidmodule0r.xml'/>
Expand All @@ -110,7 +110,7 @@
<Include ref='Geometry/TrackerCommonData/data/tibtidservices.xml'/>
<Include ref='Geometry/TrackerCommonData/data/tibtidservicesf.xml'/>
<Include ref='Geometry/TrackerCommonData/data/tibtidservicesb.xml'/>
<Include ref='Geometry/TrackerCommonData/data/tobmaterial/2017ZeroMaterial/v1/tobmaterial.xml'/>
<Include ref='Geometry/TrackerCommonData/data/zeroMaterial/2021/v1/tobmaterial.xml'/>
<Include ref='Geometry/TrackerCommonData/data/tobmodpar.xml'/>
<Include ref='Geometry/TrackerCommonData/data/tobmodule0.xml'/>
<Include ref='Geometry/TrackerCommonData/data/tobmodule2.xml'/>
Expand Down Expand Up @@ -138,7 +138,7 @@
<Include ref='Geometry/TrackerCommonData/data/tobrod5h.xml'/>
<Include ref='Geometry/TrackerCommonData/data/tobrod5.xml'/>
<Include ref='Geometry/TrackerCommonData/data/v2/tob.xml'/>
<Include ref='Geometry/TrackerCommonData/data/tecmaterial/2017ZeroMaterial/v1/tecmaterial.xml'/>
<Include ref='Geometry/TrackerCommonData/data/zeroMaterial/2021/v1/tecmaterial.xml'/>
<Include ref='Geometry/TrackerCommonData/data/tecmodpar.xml'/>
<Include ref='Geometry/TrackerCommonData/data/tecmodule0.xml'/>
<Include ref='Geometry/TrackerCommonData/data/tecmodule0r.xml'/>
Expand Down Expand Up @@ -344,9 +344,9 @@
<Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_2018/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane4.xml'/>
<Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_2018/CTPPS_Diamond_Detector_Assembly.xml'/>
<Include ref='Geometry/VeryForwardData/data/CTPPS_Diamond_Sensitive_Dets_TimingHits.xml'/>
<Include ref='Geometry/VeryForwardData/data/ppstrackerMaterials.xml'/>
<Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_Module.xml'/>
<Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_Module_2x2.xml'/>
<Include ref='Geometry/VeryForwardData/data/ppstrackerMaterials/v1/ppstrackerMaterials.xml'/>
<Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_Module/v1/CTPPS_Pixel_Module.xml'/>
<Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_Module_2x2/v1/CTPPS_Pixel_Module_2x2.xml'/>
<Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2018/CTPPS_Pixel_Assembly_Box_Real_003.xml'/>
<Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2018/CTPPS_Pixel_Assembly_Box_Real_023.xml'/>
<Include ref='Geometry/VeryForwardData/data/CTPPS_Pixel_2018/CTPPS_Pixel_Assembly_Box_Real_103.xml'/>
Expand Down

0 comments on commit ab2294c

Please sign in to comment.