Skip to content

Commit

Permalink
Remove a few bugs in HGC code and add example for TB
Browse files Browse the repository at this point in the history
  • Loading branch information
Sunanda committed Feb 19, 2016
1 parent aa97d14 commit f47a160
Show file tree
Hide file tree
Showing 12 changed files with 483 additions and 75 deletions.
35 changes: 35 additions & 0 deletions Geometry/HGCalCommonData/data/TB160/cms.xml
@@ -0,0 +1,35 @@
<?xml version="1.0"?>
<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">

<SolidSection label="hgcalwafer.xml">
<Tubs name="OCMS" rMin="0.0*fm" rMax="2.0*m" dz="50*cm" startPhi="0*deg" deltaPhi="360*deg"/>
<Tubs name="CMSE" rMin="0.0*fm" rMax="2.0*m" 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"/>
</PosPart>
</PosPartSection>

</DDDefinition>
14 changes: 14 additions & 0 deletions Geometry/HGCalCommonData/data/TB160/hgcProdCuts.xml
@@ -0,0 +1,14 @@
<?xml version="1.0"?>
<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="hgcProdCuts.xml" eval="true">
<SpecPar name="hgcProdCutsEE">
<PartSelector path="//HGCalEE"/>
<Parameter name="CMSCutsRegion" value="HGCalEERegion" eval="false"/>
<Parameter name="ProdCutsForElectrons" value="0.03*mm"/>
<Parameter name="ProdCutsForPositrons" value="0.03*mm"/>
<Parameter name="ProdCutsForGamma" value="0.03*mm"/>
</SpecPar>
</SpecParSection>

</DDDefinition>
58 changes: 58 additions & 0 deletions Geometry/HGCalCommonData/data/TB160/hgcal.xml
@@ -0,0 +1,58 @@
<?xml version="1.0"?>
<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">

<ConstantsSection label="hgcal.xml" eval="true">
<Constant name="rmax" value="50.*cm"/>
<Constant name="rmaxEE" value="45.0*cm"/>
<Constant name="zCalor" value="15.*cm"/>
<Constant name="zminEE" value="0.0*fm"/>
<Constant name="zmaxEE" value="30.0*cm"/>
<Constant name="zposCalo" value="15.0*cm"/>
<Constant name="zposEE" value="-10.0*cm"/>
<Constant name="WaferW" value="123.7*mm"/>
</ConstantsSection>

<MaterialSection label="hgcal.xml">
<CompositeMaterial name="WCu" density="14.979*g/cm3" symbol=" " method="mixture by weight">
<MaterialFraction fraction="0.75">
<rMaterial name="materials:Tungsten"/>
</MaterialFraction>
<MaterialFraction fraction="0.25">
<rMaterial name="materials:Copper"/>
</MaterialFraction>
</CompositeMaterial>
</MaterialSection>

<SolidSection label="hgcal.xml">
<Tubs name="HGCal" rMin="0.0*fm" rMax="[rmax]" dz="[zCalor]" startPhi="0*deg" deltaPhi="360*deg"/>
<Polycone name="HGCalEE" startPhi="0*deg" deltaPhi="360*deg">
<ZSection z="[zminEE]" rMin="0.0*fm" rMax="[rmaxEE]"/>
<ZSection z="[zmaxEE]" rMin="0.0*fm" rMax="[rmaxEE]"/>
</Polycone>
</SolidSection>

<LogicalPartSection label="hgcal.xml">
<LogicalPart name="HGCal" category="unspecified">
<rSolid name="HGCal"/>
<rMaterial name="materials:Air"/>
</LogicalPart>
<LogicalPart name="HGCalEE" category="unspecified">
<rSolid name="HGCalEE"/>
<rMaterial name="materials:Air"/>
</LogicalPart>
</LogicalPartSection>

<PosPartSection label="hgcal.xml">
<PosPart copyNumber="1">
<rParent name="cms:CMSE"/>
<rChild name="hgcal:HGCal"/>
<Translation x="0*fm" y="0*fm" z="[zposCalo]"/>
</PosPart>
<PosPart copyNumber="1">
<rParent name="hgcal:HGCal"/>
<rChild name="hgcal:HGCalEE"/>
<Translation x="0*fm" y="0*fm" z="[zposEE]"/>
<rRotation name="rotations:000D"/>
</PosPart>
</PosPartSection>
</DDDefinition>
94 changes: 94 additions & 0 deletions Geometry/HGCalCommonData/data/TB160/hgcalCons.xml
@@ -0,0 +1,94 @@
<?xml version="1.0"?>
<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="HGCalEEWafer">
<PartSelector path="//HGCalEEWafer.*"/>
<Parameter name="Volume" value="HGCalEEWafer" 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="HGCalEEReco">
<PartSelector path="//HGCalEESensitive.*"/>
<Parameter name="Volume" value="HGCalEESensitive" eval="false"/>
<Parameter name="GroupingZFine" value="1"/>
<Parameter name="GroupingZFine" value="-1"/>
<Parameter name="GroupingZFine" value="-1"/>
<Parameter name="GroupingZFine" value="2"/>
<Parameter name="GroupingZFine" value="-1"/>
<Parameter name="GroupingZFine" value="-1"/>
<Parameter name="GroupingZFine" value="3"/>
<Parameter name="GroupingZFine" value="-1"/>
<Parameter name="GroupingZFine" value="-1"/>
<Parameter name="GroupingZFine" value="4"/>
<Parameter name="GroupingZFine" value="-1"/>
<Parameter name="GroupingZFine" value="-1"/>
<Parameter name="GroupingZFine" value="5"/>
<Parameter name="GroupingZFine" value="-1"/>
<Parameter name="GroupingZFine" value="-1"/>
<Parameter name="GroupingZFine" value="6"/>
<Parameter name="GroupingZFine" value="-1"/>
<Parameter name="GroupingZFine" value="-1"/>
<Parameter name="GroupingZFine" value="7"/>
<Parameter name="GroupingZFine" value="-1"/>
<Parameter name="GroupingZFine" value="-1"/>
<Parameter name="GroupingZFine" value="8"/>
<Parameter name="GroupingZFine" value="-1"/>
<Parameter name="GroupingZFine" value="-1"/>
<Parameter name="GroupingZMid" value="1"/>
<Parameter name="GroupingZMid" value="1"/>
<Parameter name="GroupingZMid" value="-1"/>
<Parameter name="GroupingZMid" value="2"/>
<Parameter name="GroupingZMid" value="2"/>
<Parameter name="GroupingZMid" value="-1"/>
<Parameter name="GroupingZMid" value="3"/>
<Parameter name="GroupingZMid" value="3"/>
<Parameter name="GroupingZMid" value="-1"/>
<Parameter name="GroupingZMid" value="4"/>
<Parameter name="GroupingZMid" value="4"/>
<Parameter name="GroupingZMid" value="-1"/>
<Parameter name="GroupingZMid" value="5"/>
<Parameter name="GroupingZMid" value="5"/>
<Parameter name="GroupingZMid" value="-1"/>
<Parameter name="GroupingZMid" value="6"/>
<Parameter name="GroupingZMid" value="6"/>
<Parameter name="GroupingZMid" value="-1"/>
<Parameter name="GroupingZMid" value="7"/>
<Parameter name="GroupingZMid" value="7"/>
<Parameter name="GroupingZMid" value="-1"/>
<Parameter name="GroupingZMid" value="8"/>
<Parameter name="GroupingZMid" value="8"/>
<Parameter name="GroupingZMid" value="-1"/>
<Parameter name="GroupingZOut" value="1"/>
<Parameter name="GroupingZOut" value="1"/>
<Parameter name="GroupingZOut" value="1"/>
<Parameter name="GroupingZOut" value="2"/>
<Parameter name="GroupingZOut" value="2"/>
<Parameter name="GroupingZOut" value="2"/>
<Parameter name="GroupingZOut" value="3"/>
<Parameter name="GroupingZOut" value="3"/>
<Parameter name="GroupingZOut" value="3"/>
<Parameter name="GroupingZOut" value="4"/>
<Parameter name="GroupingZOut" value="4"/>
<Parameter name="GroupingZOut" value="4"/>
<Parameter name="GroupingZOut" value="5"/>
<Parameter name="GroupingZOut" value="5"/>
<Parameter name="GroupingZOut" value="5"/>
<Parameter name="GroupingZOut" value="6"/>
<Parameter name="GroupingZOut" value="6"/>
<Parameter name="GroupingZOut" value="6"/>
<Parameter name="GroupingZOut" value="7"/>
<Parameter name="GroupingZOut" value="7"/>
<Parameter name="GroupingZOut" value="7"/>
<Parameter name="GroupingZOut" value="8"/>
<Parameter name="GroupingZOut" value="8"/>
<Parameter name="GroupingZOut" value="8"/>
</SpecPar>
</SpecParSection>

</DDDefinition>
72 changes: 72 additions & 0 deletions Geometry/HGCalCommonData/data/TB160/hgcalEE.xml
@@ -0,0 +1,72 @@
<?xml version="1.0"?>
<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">

<ConstantsSection label="hgcalEE.xml" eval="true">
<Constant name="rMinFine" value="0.0*fm"/>
<Constant name="rMaxFine" value="75.0*cm"/>
<Constant name="rMaxMiddle" value="120.0*cm"/>
<Constant name="rMaxCoarse" value="2000.0*cm"/>
</ConstantsSection>

<PosPartSection label="hgcalEE.xml">
<Algorithm name="hgcal:DDHGCalModuleAlgo">
<rParent name="hgcal:HGCalEE"/>
<Vector name="WaferName" type="string" nEntries="2">
hgcalwafer:HGCalEEWaferFine, hgcalwafer:HGCalEEWaferCoarse</Vector>
<Vector name="MaterialNames" type="string" nEntries="12">
materials:Carbon_fibre_str_Upgrade2, materials:Tungsten,
materials:Tungsten, materials:Tungsten, hgcal:WCu, hgcal:WCu,
hgcal:WCu, materials:Copper, materials:Copper, materials:Air,
materials:M_NEMA FR4 plate, materials:Air</Vector>
<Vector name="VolumeNames" type="string" nEntries="12">
EEModule, EEAbsorber1, EEAbsorber2, EEAbsorber3, EEAbsorber4,
EEAbsorber5, EEAbsorber6, EECuFrame, EEHeatShield, EESensitive,
EEPCB, EEAirGap</Vector>
<Vector name="Thickness" type="numeric" nEntries="12">
0.5*mm, 2.0*mm, 2.8*mm, 4.2*mm, 0.6*mm, 1.2*mm, 2.2*mm,
0.5*mm, 6.0*mm, 0.1*mm, 2.0*mm, 2.0*mm</Vector>
<Vector name="Layers" type="numeric" nEntries="4">
18, 18, 18, 18</Vector>
<Vector name="LayerThick" type="numeric" nEntries="4">
19.8*mm, 19.8*mm, 19.8*mm, 19.8*mm</Vector>
<Vector name="LayerType" type="numeric" nEntries="72">
0, 1, 0, 7, 11, 10, 9, 9, 9, 4, 8, 4, 9, 9, 9, 10, 11, 7,
0, 1, 0, 7, 11, 10, 9, 9, 9, 4, 8, 4, 9, 9, 9, 10, 11, 7,
0, 1, 0, 7, 11, 10, 9, 9, 9, 4, 8, 4, 9, 9, 9, 10, 11, 7,
0, 1, 0, 7, 11, 10, 9, 9, 9, 4, 8, 4, 9, 9, 9, 10, 11, 7
</Vector>
<Vector name="LayerSense" type="numeric" nEntries="72">
0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0,
0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0,
0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0,
0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0
</Vector>
<Numeric name="zMinBlock" value="[hgcal:zminEE]"/>
<Numeric name="rMaxFine" value="[rMaxFine]"/>
<Numeric name="waferW" value="[hgcal:WaferW]"/>
<Numeric name="Sectors" value="12"/>
<Vector name="SlopeBottom" type="numeric" nEntries="2">
0.0, 0.0</Vector>
<Vector name="SlopeTop" type="numeric" nEntries="2">
0, 0</Vector>
<Vector name="ZFront" type="numeric" nEntries="2">
[hgcal:zminEE], [hgcal:zmaxEE]</Vector>
<Vector name="RMaxFront" type="numeric" nEntries="2">
[hgcal:rmaxEE], [hgcal:rmaxEE]</Vector>
<String name="RotNameSpace" value="hgcalmodule"/>
</Algorithm>
</PosPartSection>

<SpecParSection label="hgcalEE.xml" eval="true">
<SpecPar name="HGCalEE">
<PartSelector path="//HGCalEESensitive.*"/>
<Parameter name="Volume" value="HGCalEESensitive" eval="false"/>
<Parameter name="GeometryMode" value="HGCalGeometryMode::Hexagon" eval="false"/>
<Parameter name="RadiusBound" value="[rMinFine]"/>
<Parameter name="RadiusBound" value="[rMaxFine]"/>
<Parameter name="RadiusBound" value="[rMaxMiddle]"/>
<Parameter name="RadiusBound" value="[rMaxCoarse]"/>
</SpecPar>
</SpecParSection>

</DDDefinition>
11 changes: 11 additions & 0 deletions Geometry/HGCalCommonData/data/TB160/hgcalsense.xml
@@ -0,0 +1,11 @@
<?xml version="1.0"?>
<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="hgcalsense.xml" eval="true">
<SpecPar name="hgcee">
<PartSelector path="//HGCalEECell.*"/>
<Parameter name="SensitiveDetector" value="HGCSensitiveDetector" eval="false"/>
<Parameter name="ReadOutName" value="HGCHitsEE" eval="false"/>
</SpecPar>
</SpecParSection>
</DDDefinition>

0 comments on commit f47a160

Please sign in to comment.