Skip to content

Commit

Permalink
Merge pull request #37897 from bsunanda/Phase2-hgx312
Browse files Browse the repository at this point in the history 
Phase2-hgx312 Add dd4hep version of DDHGCalSiliconRotatedModule and add the v17 version full silicon layers of HE part of HGCal
  • Loading branch information
@cmsbuild
cmsbuild committed May 14, 2022
2 parents 780a5fc + 7ee01e9 commit 8692305
Show file tree
Hide file tree
Showing 18 changed files with 2,003 additions and 121 deletions.
41 changes: 41 additions & 0 deletions Geometry/HGCalCommonData/data/dd4hep/cms-test-ddhgcalEEV17-algorithm.xml
View file
@@ -0,0 +1,41 @@
<?xml version="1.0"?>
<DDDefinition>
<debug>
<!--
<debug_shapes/>
<debug_includes/>
<debug_rotations/>
<debug_includes/>
<debug_volumes/>
<debug_constants/>
<debug_namespaces/>
<debug_placements/>
<debug_algorithms/>
<debug_materials/>
<debug_visattr/>
-->
</debug>

<open_geometry/>
<close_geometry/>

<IncludeSection>
<Include ref="Geometry/CMSCommonData/data/materials/2021/v1/materials.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"/>
<Include ref="Geometry/CMSCommonData/data/cms/2026/v5/cms.xml"/>
<Include ref="Geometry/CMSCommonData/data/eta3/etaMax.xml"/>
<Include ref="Geometry/CMSCommonData/data/cmsMother.xml"/>
<Include ref="Geometry/CMSCommonData/data/caloBase/2026/v6/caloBase.xml"/>
<Include ref="Geometry/CMSCommonData/data/cmsCalo.xml"/>
<Include ref="Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml"/>
<Include ref="Geometry/HGCalCommonData/data/hgcal/v17/hgcal.xml"/>
<Include ref="Geometry/HGCalCommonData/data/hgcalcell/v17/hgcalcell.xml"/>
<Include ref="Geometry/HGCalCommonData/data/hgcalwafer/v17/hgcalwafer.xml"/>
<Include ref="Geometry/HGCalCommonData/data/hgcalEE/v17/hgcalEE.xml"/>
<Include ref="Geometry/CMSCommonData/data/FieldParameters.xml"/>
</IncludeSection>

</DDDefinition>

41 changes: 41 additions & 0 deletions Geometry/HGCalCommonData/data/dd4hep/cms-test-ddhgcalHEsilV17-algorithm.xml
View file
@@ -0,0 +1,41 @@
<?xml version="1.0"?>
<DDDefinition>
<debug>
<!--
<debug_shapes/>
<debug_includes/>
<debug_rotations/>
<debug_includes/>
<debug_volumes/>
<debug_constants/>
<debug_namespaces/>
<debug_placements/>
<debug_algorithms/>
<debug_materials/>
<debug_visattr/>
-->
</debug>

<open_geometry/>
<close_geometry/>

<IncludeSection>
<Include ref="Geometry/CMSCommonData/data/materials/2021/v1/materials.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"/>
<Include ref="Geometry/CMSCommonData/data/cms/2026/v5/cms.xml"/>
<Include ref="Geometry/CMSCommonData/data/eta3/etaMax.xml"/>
<Include ref="Geometry/CMSCommonData/data/cmsMother.xml"/>
<Include ref="Geometry/CMSCommonData/data/caloBase/2026/v6/caloBase.xml"/>
<Include ref="Geometry/CMSCommonData/data/cmsCalo.xml"/>
<Include ref="Geometry/HGCalCommonData/data/hgcalMaterial/v2/hgcalMaterial.xml"/>
<Include ref="Geometry/HGCalCommonData/data/hgcal/v17/hgcal.xml"/>
<Include ref="Geometry/HGCalCommonData/data/hgcalcell/v17/hgcalcell.xml"/>
<Include ref="Geometry/HGCalCommonData/data/hgcalwafer/v17/hgcalwafer.xml"/>
<Include ref="Geometry/HGCalCommonData/data/hgcalHEsil/v17/hgcalHEsil.xml"/>
<Include ref="Geometry/CMSCommonData/data/FieldParameters.xml"/>
</IncludeSection>

</DDDefinition>

105 changes: 53 additions & 52 deletions Geometry/HGCalCommonData/data/hgcalEE/v17/hgcalEE.xml
View file
Expand Up @@ -7,6 +7,7 @@
<Numeric name="WaferTypes" value="3"/>
<Numeric name="FacingTypes" value="2"/>
<Numeric name="OrientationTypes" value="6"/>
<Numeric name="PlaceOffset" value="0"/>
<Numeric name="FirstLayer" value="1"/>
<Numeric name="AbsorberMode" value="0"/>
<Numeric name="SensitiveMode" value="0"/>
Expand Down Expand Up @@ -2376,58 +2377,58 @@
6042, 6372, 6678, 7020, 7362, 7716
</Vector>
<Vector name="CassetteShift" type="numeric" nEntries="312">
0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0
0*mm, 0*mm, 0*mm, 0*mm, 0*mm, 0*mm,
0*mm, 0*mm, 0*mm, 0*mm, 0*mm, 0*mm,
0*mm, 0*mm, 0*mm, 0*mm, 0*mm, 0*mm,
0*mm, 0*mm, 0*mm, 0*mm, 0*mm, 0*mm,
0*mm, 0*mm, 0*mm, 0*mm, 0*mm, 0*mm,
0*mm, 0*mm, 0*mm, 0*mm, 0*mm, 0*mm,
0*mm, 0*mm, 0*mm, 0*mm, 0*mm, 0*mm,
0*mm, 0*mm, 0*mm, 0*mm, 0*mm, 0*mm,
0*mm, 0*mm, 0*mm, 0*mm, 0*mm, 0*mm,
0*mm, 0*mm, 0*mm, 0*mm, 0*mm, 0*mm,
0*mm, 0*mm, 0*mm, 0*mm, 0*mm, 0*mm,
0*mm, 0*mm, 0*mm, 0*mm, 0*mm, 0*mm,
0*mm, 0*mm, 0*mm, 0*mm, 0*mm, 0*mm,
0*mm, 0*mm, 0*mm, 0*mm, 0*mm, 0*mm,
0*mm, 0*mm, 0*mm, 0*mm, 0*mm, 0*mm,
0*mm, 0*mm, 0*mm, 0*mm, 0*mm, 0*mm,
0*mm, 0*mm, 0*mm, 0*mm, 0*mm, 0*mm,
0*mm, 0*mm, 0*mm, 0*mm, 0*mm, 0*mm,
0*mm, 0*mm, 0*mm, 0*mm, 0*mm, 0*mm,
0*mm, 0*mm, 0*mm, 0*mm, 0*mm, 0*mm,
0*mm, 0*mm, 0*mm, 0*mm, 0*mm, 0*mm,
0*mm, 0*mm, 0*mm, 0*mm, 0*mm, 0*mm,
0*mm, 0*mm, 0*mm, 0*mm, 0*mm, 0*mm,
0*mm, 0*mm, 0*mm, 0*mm, 0*mm, 0*mm,
0*mm, 0*mm, 0*mm, 0*mm, 0*mm, 0*mm,
0*mm, 0*mm, 0*mm, 0*mm, 0*mm, 0*mm,
0*mm, 0*mm, 0*mm, 0*mm, 0*mm, 0*mm,
0*mm, 0*mm, 0*mm, 0*mm, 0*mm, 0*mm,
0*mm, 0*mm, 0*mm, 0*mm, 0*mm, 0*mm,
0*mm, 0*mm, 0*mm, 0*mm, 0*mm, 0*mm,
0*mm, 0*mm, 0*mm, 0*mm, 0*mm, 0*mm,
0*mm, 0*mm, 0*mm, 0*mm, 0*mm, 0*mm,
0*mm, 0*mm, 0*mm, 0*mm, 0*mm, 0*mm,
0*mm, 0*mm, 0*mm, 0*mm, 0*mm, 0*mm,
0*mm, 0*mm, 0*mm, 0*mm, 0*mm, 0*mm,
0*mm, 0*mm, 0*mm, 0*mm, 0*mm, 0*mm,
0*mm, 0*mm, 0*mm, 0*mm, 0*mm, 0*mm,
0*mm, 0*mm, 0*mm, 0*mm, 0*mm, 0*mm,
0*mm, 0*mm, 0*mm, 0*mm, 0*mm, 0*mm,
0*mm, 0*mm, 0*mm, 0*mm, 0*mm, 0*mm,
0*mm, 0*mm, 0*mm, 0*mm, 0*mm, 0*mm,
0*mm, 0*mm, 0*mm, 0*mm, 0*mm, 0*mm,
0*mm, 0*mm, 0*mm, 0*mm, 0*mm, 0*mm,
0*mm, 0*mm, 0*mm, 0*mm, 0*mm, 0*mm,
0*mm, 0*mm, 0*mm, 0*mm, 0*mm, 0*mm,
0*mm, 0*mm, 0*mm, 0*mm, 0*mm, 0*mm,
0*mm, 0*mm, 0*mm, 0*mm, 0*mm, 0*mm,
0*mm, 0*mm, 0*mm, 0*mm, 0*mm, 0*mm,
0*mm, 0*mm, 0*mm, 0*mm, 0*mm, 0*mm,
0*mm, 0*mm, 0*mm, 0*mm, 0*mm, 0*mm,
0*mm, 0*mm, 0*mm, 0*mm, 0*mm, 0*mm,
0*mm, 0*mm, 0*mm, 0*mm, 0*mm, 0*mm
</Vector>
</Algorithm>
</PosPartSection>
Expand Down

0 comments on commit 8692305

Please sign in to comment.