Skip to content

Commit

Permalink
Merge pull request #32660 from bsunanda/Run4-hgx284
Browse files Browse the repository at this point in the history
Run4-hgx284 Algorithm to make partial silicon modules
  • Loading branch information
cmsbuild committed Jan 17, 2021
2 parents 0adbd0f + 7b087f9 commit 86a858d
Show file tree
Hide file tree
Showing 16 changed files with 2,941 additions and 14 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@
<IncludeSection>
<Include ref="Geometry/CMSCommonData/data/materials/2021/v1/materials.xml"/>
<Include ref="Geometry/CMSCommonData/data/rotations.xml"/>
<Include ref="Geometry/HGCalCommonData/test/cms.xml"/>
<Include ref="Geometry/HGCalCommonData/data/hgcalwafer/v1/cms.xml"/>
<Include ref="Geometry/HGCalCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml"/>
<Include ref="Geometry/HGCalCommonData/data/hgcalwafer/v15/hgcal.xml"/>
<Include ref="Geometry/HGCalCommonData/data/hgcalcell/v9/hgcalcell.xml"/>
<Include ref="Geometry/HGCalCommonData/data/hgcalcell/v15/hgcalcell.xml"/>
<Include ref="Geometry/HGCalCommonData/data/hgcalwafer/v15/hgcalwafer.xml"/>
<Include ref="Geometry/HGCalCommonData/data/hgcalwafer/v15/hgcalpos.xml"/>
<Include ref="Geometry/HGCalCommonData/data/dd4hep/world.xml"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<?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/HGCalCommonData/data/hgcalwafer/v1/cms.xml"/>
<Include ref="Geometry/HGCalCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml"/>
<Include ref="Geometry/HGCalCommonData/data/hgcalwafer/v15p/hgcal.xml"/>
<Include ref="Geometry/HGCalCommonData/data/hgcalcell/v15/hgcalcell.xml"/>
<Include ref="Geometry/HGCalCommonData/data/hgcalwafer/v15p/hgcalwafer.xml"/>
<Include ref="Geometry/HGCalCommonData/data/hgcalwafer/v15p/hgcalpos.xml"/>
<Include ref="Geometry/HGCalCommonData/data/dd4hep/world.xml"/>
</IncludeSection>

</DDDefinition>

36 changes: 36 additions & 0 deletions Geometry/HGCalCommonData/data/hgcalwafer/v1/cms.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<?xml version="1.0"?>
<DDDefinition>

<SolidSection label="hgcalwafer.xml">
<Tubs name="OCMS" rMin="0.0*fm" rMax="10.0*cm" dz="50*cm" startPhi="0*deg" deltaPhi="360*deg"/>
<Tubs name="CMSE" rMin="0.0*fm" rMax="10.0*cm" dz="50*cm" startPhi="0*deg" deltaPhi="360*deg"/>
</SolidSection>

<LogicalPartSection label="cms.xml">
<LogicalPart name="World" category="unspecified">
<rSolid name="OCMS"/>
<rMaterial name="materials:Air"/>
</LogicalPart>
<LogicalPart name="OCMS" category="unspecified">
<rSolid name="OCMS"/>
<rMaterial name="materials:Air"/>
</LogicalPart>
<LogicalPart name="CMSE" category="unspecified">
<rSolid name="CMSE"/>
<rMaterial name="materials:Air"/>
</LogicalPart>
</LogicalPartSection>

<PosPartSection label="cmsMother.xml">
<PosPart copyNumber="1">
<rParent name="cms:World"/>
<rChild name="cms:OCMS"/>
</PosPart>
<PosPart copyNumber="1">
<rParent name="cms:OCMS"/>
<rChild name="cms:CMSE"/>
<rRotation name="rotations:000D"/>
</PosPart>
</PosPartSection>

</DDDefinition>
2 changes: 1 addition & 1 deletion Geometry/HGCalCommonData/data/hgcalwafer/v15/hgcal.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<DDDefinition>

<ConstantsSection label="hgcal.xml" eval="true">
<Constant name="WaferSize" value="167.4408*mm"/>
<Constant name="WaferSize" value="166.4408*mm"/>
<Constant name="WaferThickness" value="0.31*mm"/>
<Constant name="SensorSeparation" value="1.00*mm"/>
<Constant name="ModuleThicknessEE" value="9.10*mm"/>
Expand Down
17 changes: 17 additions & 0 deletions Geometry/HGCalCommonData/data/hgcalwafer/v15p/hgcal.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version="1.0"?>
<DDDefinition>

<ConstantsSection label="hgcal.xml" eval="true">
<Constant name="WaferSize" value="166.4408*mm"/>
<Constant name="WaferThickness" value="0.31*mm"/>
<Constant name="SensorSeparation" value="1.00*mm"/>
<Constant name="ModuleThicknessEE" value="9.10*mm"/>
<Constant name="ModuleThicknessHE" value="8.60*mm"/>
<Constant name="CellThicknessFine" value="0.12*mm"/>
<Constant name="CellThicknessCoarse1" value="0.20*mm"/>
<Constant name="CellThicknessCoarse2" value="0.30*mm"/>
<Constant name="NumberOfCellsFine" value="12"/>
<Constant name="NumberOfCellsCoarse" value="8"/>
</ConstantsSection>

</DDDefinition>

0 comments on commit 86a858d

Please sign in to comment.