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

Fixing HGCal Hexagonal Geometry Round 1 #13038

Merged
merged 3 commits into from
Jan 25, 2016
Merged

Fixing HGCal Hexagonal Geometry Round 1 #13038

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9a6e3db
fix baseline problems in the hexagonal geometry, still encounter inva…
lgray Jan 22, 2016
2295abc
rebasing cruft
lgray Jan 22, 2016
77089dd
fix unit test for square geom
lgray Jan 23, 2016
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
23 changes: 17 additions & 6 deletions Geometry/HGCalCommonData/data/v7/hgcalCons.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,25 @@
<DDDefinition xmlns="http://www.cern.ch/cms/DDL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.cern.ch/cms/DDL ../../../../DetectorDescription/Schema/DDLSchema.xsd">

<SpecParSection label="hgcalReco.xml" eval="true">
<SpecPar name="HGCalWafer">
<PartSelector path="//HGCalWafer.*"/>
<Parameter name="Volume" value="HGCalWafer" eval="false"/>
<SpecPar name="HGCalEEWafer">
<PartSelector path="//HGCalEEWafer.*"/>
<Parameter name="Volume" value="HGCalEEWafer" eval="false"/>
<Parameter name="WaferSize" value="[hgcal:WaferW]"/>
</SpecPar>
<SpecPar name="HGCalCell">
<PartSelector path="//HGCalCell.*"/>
<Parameter name="Volume" value="HGCalCell" eval="false"/>
<SpecPar name="HGCalHEWafer">
<PartSelector path="//HGCalHEWafer.*"/>
<Parameter name="Volume" value="HGCalHEWafer" eval="false"/>
<Parameter name="WaferSize" value="[hgcal:WaferW]"/>
</SpecPar>
<SpecPar name="HGCalEECell">
<PartSelector path="//HGCalEECell.*"/>
<Parameter name="Volume" value="HGCalEECell" eval="false"/>
<Parameter name="CellSize" value="[hgcalwafer:CellWF]"/>
<Parameter name="CellSize" value="[hgcalwafer:CellWC]"/>
</SpecPar>
<SpecPar name="HGCalHECell">
<PartSelector path="//HGCalHECell.*"/>
<Parameter name="Volume" value="HGCalHECell" eval="false"/>
<Parameter name="CellSize" value="[hgcalwafer:CellWF]"/>
<Parameter name="CellSize" value="[hgcalwafer:CellWC]"/>
</SpecPar>
Expand Down
4 changes: 2 additions & 2 deletions Geometry/HGCalCommonData/data/v7/hgcalEE.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<Algorithm name="hgcal:DDHGCalModuleAlgo">
<rParent name="hgcal:HGCalEE"/>
<Vector name="WaferName" type="string" nEntries="2">
hgcalwafer:HGCalWaferFine, hgcalwafer:HGCalWaferCoarse</Vector>
hgcalwafer:HGCalEEWaferFine, hgcalwafer:HGCalEEWaferCoarse</Vector>
<Vector name="MaterialNames" type="string" nEntries="15">
materials:Carbon_fibre_str_Upgrade2, materials:Tungsten,
materials:Tungsten, materials:Tungsten, hgcal:WCu, hgcal:WCu,
Expand Down Expand Up @@ -86,7 +86,7 @@

<SpecParSection label="hgcalEE.xml" eval="true">
<SpecPar name="HGCalEE">
<PartSelector path="//HGCalEESensitive.*"/>
<PartSelector path="//HGCalEESensitive.*"/>
<Parameter name="Volume" value="HGCalEESensitive" eval="false"/>
<Parameter name="GeometryMode" value="HGCalGeometryMode::Hexagon" eval="false"/>
<Parameter name="RadiusBound" value="[rMinFine]"/>
Expand Down
2 changes: 1 addition & 1 deletion Geometry/HGCalCommonData/data/v7/hgcalHEsil.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<Algorithm name="hgcal:DDHGCalModuleAlgo">
<rParent name="hgcal:HGCalHE"/>
<Vector name="WaferName" type="string" nEntries="2">
hgcalwafer:HGCalWaferFine, hgcalwafer:HGCalWaferCoarse</Vector>
hgcalwafer:HGCalHEWaferFine, hgcalwafer:HGCalHEWaferCoarse</Vector>
<Vector name="MaterialNames" type="string" nEntries="11">
materials:H_Brass, materials:Carbon_fibre_str_Upgrade2, materials:Copper,
materials:Copper, materials:Air, materials:M_NEMA FR4 plate,
Expand Down
237 changes: 210 additions & 27 deletions Geometry/HGCalCommonData/data/v7/hgcalwafer.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,68 +13,251 @@
</ConstantsSection>

<SolidSection label="hgcalwafer.xml">
<Polyhedra name="HGCalWafer" numSide="6" startPhi="330*deg" deltaPhi="360*deg">

<Polyhedra name="HGCalEEWafer" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
<ZSection z="-[WaferT]/2" rMin="0*fm" rMax="[WaferW]/2"/>
<ZSection z= "[WaferT]/2" rMin="0*fm" rMax="[WaferW]/2"/>
</Polyhedra>
<Polyhedra name="HGCalCellCoarse" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
<Polyhedra name="HGCalEECellCoarse" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
<ZSection z="-[WaferT]/2" rMin="0*fm" rMax="[CellWC]/2"/>
<ZSection z= "[WaferT]/2" rMin="0*fm" rMax="[CellWC]/2"/>
</Polyhedra>
<Polyhedra name="HGCalEECellFine" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
<ZSection z="-[WaferT]/2" rMin="0*fm" rMax="[CellWF]/2"/>
<ZSection z= "[WaferT]/2" rMin="0*fm" rMax="[CellWF]/2"/>
</Polyhedra>
<Polyhedra name="HGCalHEWafer" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
<ZSection z="-[WaferT]/2" rMin="0*fm" rMax="[WaferW]/2"/>
<ZSection z= "[WaferT]/2" rMin="0*fm" rMax="[WaferW]/2"/>
</Polyhedra>
<Polyhedra name="HGCalHECellCoarse" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
<ZSection z="-[WaferT]/2" rMin="0*fm" rMax="[CellWC]/2"/>
<ZSection z= "[WaferT]/2" rMin="0*fm" rMax="[CellWC]/2"/>
</Polyhedra>
<Polyhedra name="HGCalHECellFine" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
<ZSection z="-[WaferT]/2" rMin="0*fm" rMax="[CellWF]/2"/>
<ZSection z= "[WaferT]/2" rMin="0*fm" rMax="[CellWF]/2"/>
</Polyhedra>

<Box name="HGCalCellCoarseMask" dx="[CellWC]/2" dy="[CellWC]" dz="[WaferT]/2"/>
<SubtractionSolid name="HGCalCellCoarseHalf">
<rSolid name="HGCalCellCoarse"/>
<Box name="HGCalCellFineMask" dx="[CellWF]/2" dy="[CellWF]" dz="[WaferT]/2"/>

<SubtractionSolid name="HGCalEECellCoarseHalf">
<rSolid name="HGCalEECellCoarse"/>
<rSolid name="HGCalCellCoarseMask"/>
<rRotation name="rotations:000D"/>
<Translation x="[CellWC]/2" y="0.0*fm" z="0.0*fm"/>
</SubtractionSolid>
<Polyhedra name="HGCalCellFine" numSide="6" startPhi="330*deg" deltaPhi="360*deg">
<ZSection z="-[WaferT]/2" rMin="0*fm" rMax="[CellWF]/2"/>
<ZSection z= "[WaferT]/2" rMin="0*fm" rMax="[CellWF]/2"/>
</Polyhedra>
<Box name="HGCalCellFineMask" dx="[CellWF]/2" dy="[CellWF]" dz="[WaferT]/2"/>
<SubtractionSolid name="HGCalCellFineHalf">
<rSolid name="HGCalCellFine"/>
<SubtractionSolid name="HGCalHECellCoarseHalf">
<rSolid name="HGCalHECellCoarse"/>
<rSolid name="HGCalCellCoarseMask"/>
<rRotation name="rotations:000D"/>
<Translation x="[CellWC]/2" y="0.0*fm" z="0.0*fm"/>
</SubtractionSolid>

<SubtractionSolid name="HGCalEECellFineHalf">
<rSolid name="HGCalEECellFine"/>
<rSolid name="HGCalCellFineMask"/>
<rRotation name="rotations:000D"/>
<Translation x="[CellWF]/2" y="0.0*fm" z="0.0*fm"/>
</SubtractionSolid>
<SubtractionSolid name="HGCalHECellFineHalf">
<rSolid name="HGCalHECellFine"/>
<rSolid name="HGCalCellFineMask"/>
<rRotation name="rotations:000D"/>
<Translation x="[CellWF]/2" y="0.0*fm" z="0.0*fm"/>
</SubtractionSolid>


</SolidSection>

<LogicalPartSection label="hgcalwafer.xml">
<LogicalPart name="HGCalWaferCoarse" category="unspecified">
<rSolid name="HGCalWafer"/>
<LogicalPart name="HGCalEEWaferCoarse" category="unspecified">
<rSolid name="HGCalEEWafer"/>
<rMaterial name="materials:Air"/>
</LogicalPart>
<LogicalPart name="HGCalHEWaferCoarse" category="unspecified">
<rSolid name="HGCalHEWafer"/>
<rMaterial name="materials:Air"/>
</LogicalPart>

<LogicalPart name="HGCalEEWaferFine" category="unspecified">
<rSolid name="HGCalEEWafer"/>
<rMaterial name="materials:Air"/>
</LogicalPart>
<LogicalPart name="HGCalWaferFine" category="unspecified">
<rSolid name="HGCalWafer"/>
<LogicalPart name="HGCalHEWaferFine" category="unspecified">
<rSolid name="HGCalHEWafer"/>
<rMaterial name="materials:Air"/>
</LogicalPart>
<LogicalPart name="HGCalCellCoarse" category="unspecified">
<rSolid name="HGCalCellCoarse"/>

<LogicalPart name="HGCalEECellCoarse" category="unspecified">
<rSolid name="HGCalEECellCoarse"/>
<rMaterial name="materials:Silicon"/>
</LogicalPart>
<LogicalPart name="HGCalHECellCoarse" category="unspecified">
<rSolid name="HGCalHECellCoarse"/>
<rMaterial name="materials:Silicon"/>
</LogicalPart>

<LogicalPart name="HGCalEECellCoarseHalf" category="unspecified">
<rSolid name="HGCalEECellCoarseHalf"/>
<rMaterial name="materials:Silicon"/>
</LogicalPart>
<LogicalPart name="HGCalHECellCoarseHalf" category="unspecified">
<rSolid name="HGCalHECellCoarseHalf"/>
<rMaterial name="materials:Silicon"/>
</LogicalPart>
<LogicalPart name="HGCalCellCoarseHalf" category="unspecified">
<rSolid name="HGCalCellCoarseHalf"/>

<LogicalPart name="HGCalEECellFine" category="unspecified">
<rSolid name="HGCalEECellFine"/>
<rMaterial name="materials:Silicon"/>
</LogicalPart>
<LogicalPart name="HGCalHECellFine" category="unspecified">
<rSolid name="HGCalHECellFine"/>
<rMaterial name="materials:Silicon"/>
</LogicalPart>
<LogicalPart name="HGCalCellFine" category="unspecified">
<rSolid name="HGCalCellFine"/>

<LogicalPart name="HGCalEECellFineHalf" category="unspecified">
<rSolid name="HGCalEECellFineHalf"/>
<rMaterial name="materials:Silicon"/>
</LogicalPart>
<LogicalPart name="HGCalCellFineHalf" category="unspecified">
<rSolid name="HGCalCellFineHalf"/>
<LogicalPart name="HGCalHECellFineHalf" category="unspecified">
<rSolid name="HGCalHECellFineHalf"/>
<rMaterial name="materials:Silicon"/>
</LogicalPart>
</LogicalPartSection>

<PosPartSection label="hgcalwafer.xml">
<Algorithm name="hgcal:DDHGCalWaferAlgo">
<rParent name="hgcalwafer:HGCalWaferCoarse"/>
<rParent name="hgcalwafer:HGCalEEWaferCoarse"/>
<Numeric name="CellSize" value="[CellWC]"/>
<Numeric name="CellType" value="[TypeWC]"/>
<Vector name="ChildNames" type="string" nEntries="2">
HGCalEECellCoarse, HGCalEECellCoarseHalf</Vector>
<Vector name="PositionX" type="numeric" nEntries="133">
-1,1,-4,-2,0,2,4,
-7,-5,-3,-1,1,3,5,7,
-10,-8,-6,-4,-2,0,2,4,6,8,10,
-11,-9,-7,-5,-3,-1,1,3,5,7,9,11,
-10,-8,-6,-4,-2,0,2,4,6,8,10,
-11,-9,-7,-5,-3,-1,1,3,5,7,9,11,
-10,-8,-6,-4,-2,0,2,4,6,8,10,
-11,-9,-7,-5,-3,-1,1,3,5,7,9,11,
-10,-8,-6,-4,-2,0,2,4,6,8,10,
-11,-9,-7,-5,-3,-1,1,3,5,7,9,11,
-10,-8,-6,-4,-2,0,2,4,6,8,10,
-7,-5,-3,-1,1,3,5,7,
-4,-2,0,2,4,-1,1
</Vector>
<Vector name="PositionY" type="numeric" nEntries="133">
-42,-42,-36,-36,-36,-36,-36,
-30,-30,-30,-30,-30,-30,-30,-30,
-24,-24,-24,-24,-24,-24,-24,-24,-24,-24,-24,
-18,-18,-18,-18,-18,-18,-18,-18,-18,-18,-18,-18,
-12,-12,-12,-12,-12,-12,-12,-12,-12,-12,-12,
-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,-6,
0,0,0,0,0,0,0,0,0,0,0,
6,6,6,6,6,6,6,6,6,6,6,6,
12,12,12,12,12,12,12,12,12,12,12,
18,18,18,18,18,18,18,18,18,18,18,18,
24,24,24,24,24,24,24,24,24,24,24,
30,30,30,30,30,30,30,30,
36,36,36,36,36,42,42
</Vector>
<Vector name="Angles" type="numeric" nEntries="133">
240,300,240,0,0,0,300,240,0,0,0,0,0,0,300,240,0,0,0,0,0,0,0,0,0,300,
180,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
180,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
180,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
180,0,0,0,0,0,0,0,0,0,0,0,120,0,0,0,0,0,0,0,0,0,60,
120,0,0,0,0,0,0,60,120,0,0,0,60,120,60
</Vector>
<Vector name="DetectorType" type="numeric" nEntries="133">
1,1,1,0,0,0,1,1,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,1,
1,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,
1,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,
1,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,
1,0,0,0,0,0,0,0,0,0,0,1,
1,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,1,1,0,0,0,1,1,1
</Vector>
<String name="RotNameSpace" value="hgcalwafer"/>
</Algorithm>
<Algorithm name="hgcal:DDHGCalWaferAlgo">
<rParent name="hgcalwafer:HGCalEEWaferFine"/>
<Numeric name="CellSize" value="[CellWF]"/>
<Numeric name="CellType" value="[TypeWF]"/>
<Vector name="ChildNames" type="string" nEntries="2">
HGCalEECellFine, HGCalEECellFineHalf</Vector>
<Vector name="PositionX" type="numeric" nEntries="240">
-2,0,2,-5,-3,-1,1,3,5,
-8,-6,-4,-2,0,2,4,6,8,
-11,-9,-7,-5,-3,-1,1,3,5,7,9,11,
-14,-12,-10,-8,-6,-4,-2,0,2,4,6,8,10,12,14,
-15,-13,-11,-9,-7,-5,-3,-1,1,3,5,7,9,11,13,15,
-14,-12,-10,-8,-6,-4,-2,0,2,4,6,8,10,12,14,
-15,-13,-11,-9,-7,-5,-3,-1,1,3,5,7,9,11,13,15,
-14,-12,-10,-8,-6,-4,-2,0,2,4,6,8,10,12,14,
-15,-13,-11,-9,-7,-5,-3,-1,1,3,5,7,9,11,13,15,
-14,-12,-10,-8,-6,-4,-2,0,2,4,6,8,10,12,14,
-15,-13,-11,-9,-7,-5,-3,-1,1,3,5,7,9,11,13,15,
-14,-12,-10,-8,-6,-4,-2,0,2,4,6,8,10,12,14,
-15,-13,-11,-9,-7,-5,-3,-1,1,3,5,7,9,11,13,15,
-14,-12,-10,-8,-6,-4,-2,0,2,4,6,8,10,12,14,
-13,-11,-9,-7,-5,-3,-1,1,3,5,7,9,11,13,
-10,-8,-6,-4,-2,0,2,4,6,8,10,
-7,-5,-3,-1,1,3,5,7,
-4,-2,0,2,4,-1,1
</Vector>
<Vector name="PositionY" type="numeric" nEntries="240">
-56,-56,-56,-50,-50,-50,-50,-50,-50,
-44,-44,-44,-44,-44,-44,-44,-44,-44,
-38,-38,-38,-38,-38,-38,-38,-38,-38,-38,-38,-38,
-32,-32,-32,-32,-32,-32,-32,-32,-32,-32,-32,-32,-32,-32,-32,
-26,-26,-26,-26,-26,-26,-26,-26,-26,-26,-26,-26,-26,-26,-26,-26,
-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,-20,
-14,-14,-14,-14,-14,-14,-14,-14,-14,-14,-14,-14,-14,-14,-14,-14,
-8,-8,-8,-8,-8,-8,-8,-8,-8,-8,-8,-8,-8,-8,-8,
-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,-2,
4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,
10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,
16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,
22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,
28,28,28,28,28,28,28,28,28,28,28,28,28,28,28,
34,34,34,34,34,34,34,34,34,34,34,34,34,34,
40,40,40,40,40,40,40,40,40,40,40,
46,46,46,46,46,46,46,46,
52,52,52,52,52,58,58
</Vector>
<Vector name="Angles" type="numeric" nEntries="240">
240,0,300,240,0,0,0,0,300,240,0,0,0,0,0,0,0,300,
240,0,0,0,0,0,0,0,0,0,0,300,240,0,0,0,0,0,0,0,0,0,0,0,0,0,300,
180,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
180,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
180,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
180,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
180,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
120,0,0,0,0,0,0,0,0,0,0,0,0,60,120,0,0,0,0,0,0,0,0,0,60,
120,0,0,0,0,0,0,60,120,0,0,0,60,120,60
</Vector>
<Vector name="DetectorType" type="numeric" nEntries="240">
1,0,1,1,0,0,0,0,1,1,0,0,0,0,0,0,0,1,
1,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0,0,0,0,1,
1,0,0,0,0,0,0,1,1,0,0,0,1,1,1
</Vector>
<String name="RotNameSpace" value="hgcalwafer"/>
</Algorithm>
<Algorithm name="hgcal:DDHGCalWaferAlgo">
<rParent name="hgcalwafer:HGCalHEWaferCoarse"/>
<Numeric name="CellSize" value="[CellWC]"/>
<Numeric name="CellType" value="[TypeWC]"/>
<Vector name="ChildNames" type="string" nEntries="2">
HGCalCellCoarse, HGCalCellCoarseHalf</Vector>
HGCalHECellCoarse, HGCalHECellCoarseHalf</Vector>
<Vector name="PositionX" type="numeric" nEntries="133">
-1,1,-4,-2,0,2,4,
-7,-5,-3,-1,1,3,5,7,
Expand Down Expand Up @@ -124,11 +307,11 @@
<String name="RotNameSpace" value="hgcalwafer"/>
</Algorithm>
<Algorithm name="hgcal:DDHGCalWaferAlgo">
<rParent name="hgcalwafer:HGCalWaferFine"/>
<rParent name="hgcalwafer:HGCalHEWaferFine"/>
<Numeric name="CellSize" value="[CellWF]"/>
<Numeric name="CellType" value="[TypeWF]"/>
<Vector name="ChildNames" type="string" nEntries="2">
HGCalCellFine, HGCalCellFineHalf</Vector>
HGCalHECellFine, HGCalHECellFineHalf</Vector>
<Vector name="PositionX" type="numeric" nEntries="240">
-2,0,2,-5,-3,-1,1,3,5,
-8,-6,-4,-2,0,2,4,6,8,
Expand Down
Loading