Skip to content

Commit

Permalink
Merge pull request #4176 from bsunanda/Phase2-hcx2
Browse files Browse the repository at this point in the history
Phase2 hcx2
  • Loading branch information
cmsbuild committed Jun 10, 2014
2 parents e39a217 + 958ca16 commit 9bfe6e8
Show file tree
Hide file tree
Showing 8 changed files with 527 additions and 43 deletions.
57 changes: 27 additions & 30 deletions Geometry/EcalCommonData/data/PhaseII/esalgo.xml
Expand Up @@ -4,7 +4,6 @@
<SolidSection label="esalgo.xml">
<Polycone name="SF" startPhi="0" deltaPhi="360*deg">
<ZSection z="[escon:ESFrontZ]" rMin="[escon:R_MIN]" rMax="[escon:Front_window_Al]"/>
<ZSection z="[escon:ESMidZ]" rMin="[escon:R_MIN]" rMax="[escon:R_MAX]"/>
<ZSection z="[escon:ESRearZ]" rMin="[escon:R_MIN]" rMax="[escon:R_MAX]"/>
</Polycone>
<Polycone name="SFFA" startPhi="0" deltaPhi="360*deg">
Expand All @@ -13,50 +12,36 @@
<ZSection z="[escon:Front_window_mid_Z]" rMin="[escon:R_MIN]" rMax="[escon:Window_backend_Al]"/>
<ZSection z="[escon:Front_window_Back_Z]" rMin="[escon:R_MIN]" rMax="[escon:Window_backend_Al]"/>
</Polycone>
<Polycone name="SFFN" startPhi="0" deltaPhi="360*deg">
<ZSection z="[escon:Front_window_Z]" rMin="[escon:NM_RMIN_outer]" rMax="[escon:Front_NM_RMAX_outer]"/>
<ZSection z="[escon:NM_Front_first_Z]" rMin="[escon:NM_RMIN_outer]" rMax="[escon:Front_NM_RMAX_outer]"/>
<ZSection z="[escon:NM_Front_first_Z]" rMin="[escon:NM_RMIN_inner]" rMax="[escon:Front_NM_RMAX_inner]"/>
<ZSection z="[escon:NM_Front_second_Z]" rMin="[escon:NM_RMIN_inner]" rMax="[escon:Front_NM_RMAX_inner]"/>
<ZSection z="[escon:NM_Front_second_Z]" rMin="[escon:NM_RMIN_outer]" rMax="[escon:Front_NM_RMAX_outer]"/>
<ZSection z="[escon:Front_window_Back_Z]" rMin="[escon:NM_RMIN_outer]" rMax="[escon:Front_NM_RMAX_outer]"/>
</Polycone>
<Polycone name="SFRA" startPhi="0" deltaPhi="360*deg">
<ZSection z="[escon:Rear_window_Z]" rMin="[escon:R_MIN]" rMax="[escon:Window_backend_Al]"/>
<ZSection z="[escon:Rear_window_mid_Z]" rMin="[escon:R_MIN]" rMax="[escon:Window_backend_Al]"/>
<ZSection z="[escon:Rear_window_mid_Z]" rMin="[escon:R_MIN]" rMax="[escon:Rear_window_Al]"/>
<ZSection z="[escon:Rear_window_Back_Z]" rMin="[escon:R_MIN]" rMax="[escon:Rear_window_Al]"/>
</Polycone>
<Polycone name="SFRN" startPhi="0" deltaPhi="360*deg">
<ZSection z="[escon:Rear_window_Z]" rMin="[escon:NM_RMIN_outer]" rMax="[escon:Rear_NM_RMAX_outer]"/>
<ZSection z="[escon:NM_Rear_first_Z]" rMin="[escon:NM_RMIN_outer]" rMax="[escon:Rear_NM_RMAX_outer]"/>
<ZSection z="[escon:NM_Rear_first_Z]" rMin="[escon:NM_RMIN_inner]" rMax="[escon:Rear_NM_RMAX_inner]"/>
<ZSection z="[escon:NM_Rear_second_Z]" rMin="[escon:NM_RMIN_inner]" rMax="[escon:Rear_NM_RMAX_inner]"/>
<ZSection z="[escon:NM_Rear_second_Z]" rMin="[escon:NM_RMIN_outer]" rMax="[escon:Rear_NM_RMAX_outer]"/>
<ZSection z="[escon:Rear_window_Back_Z]" rMin="[escon:NM_RMIN_outer]" rMax="[escon:Rear_NM_RMAX_outer]"/>
</Polycone>
<Tubs name="SFNM1" rMin="[escon:InnerNM1_RMin]" rMax="[escon:InnerNM1_RMax]" dz="[escon:InnerNM1_Dz]" startPhi="0*deg" deltaPhi="360*deg"/>
<Tubs name="SFNM2" rMin="[escon:InnerNM2_RMin]" rMax="[escon:InnerNM2_RMax]" dz="[escon:InnerNM2_Dz]" startPhi="0*deg" deltaPhi="360*deg"/>
</SolidSection>

<LogicalPartSection label="esalgo.xml">
<LogicalPart name="SF" category="unspecified">
<rSolid name="SF"/>
<rMaterial name="materials:E_Air"/>
<rMaterial name="materials:E_Polythene"/>
</LogicalPart>
<!-- LogicalPartSection label="Support Structures" -->
<LogicalPart name="SFFA" category="unspecified">
<rSolid name="SFFA"/>
<rMaterial name="materials:E_Aluminium"/>
</LogicalPart>
<LogicalPart name="SFFN" category="unspecified">
<rSolid name="SFFN"/>
<rMaterial name="materials:E_Polythene"/>
</LogicalPart>
<LogicalPart name="SFRA" category="unspecified">
<rSolid name="SFRA"/>
<rMaterial name="materials:E_Aluminium"/>
</LogicalPart>
<LogicalPart name="SFRN" category="unspecified">
<rSolid name="SFRN"/>
<LogicalPart name="SFNM1" category="unspecified">
<rSolid name="SFNM1"/>
<rMaterial name="materials:E_Polythene"/>
</LogicalPart>
<LogicalPart name="SFNM2" category="unspecified">
<rSolid name="SFNM2"/>
<rMaterial name="materials:E_Polythene"/>
</LogicalPart>
</LogicalPartSection>
Expand All @@ -75,17 +60,29 @@
<rParent name="esalgo:SF"/>
<rChild name="esalgo:SFFA"/>
</PosPart>
<PosPart copyNumber="1">
<rParent name="esalgo:SFFA"/>
<rChild name="esalgo:SFFN"/>
</PosPart>
<PosPart copyNumber="1">
<rParent name="esalgo:SF"/>
<rChild name="esalgo:SFRA"/>
</PosPart>
<PosPart copyNumber="1">
<rParent name="esalgo:SFRA"/>
<rChild name="esalgo:SFRN"/>
<rParent name="caloBase:CALO"/>
<rChild name="esalgo:SFNM1"/>
<Translation x="0*fm" y="0*fm" z="[escon:InnerNM1_Z]"/>
</PosPart>
<PosPart copyNumber="2">
<rParent name="caloBase:CALO"/>
<rChild name="esalgo:SFNM1"/>
<Translation x="0*fm" y="0*fm" z="-[escon:InnerNM1_Z]"/>
</PosPart>
<PosPart copyNumber="1">
<rParent name="caloBase:CALO"/>
<rChild name="esalgo:SFNM2"/>
<Translation x="0*fm" y="0*fm" z="[escon:InnerNM2_Z]"/>
</PosPart>
<PosPart copyNumber="2">
<rParent name="caloBase:CALO"/>
<rChild name="esalgo:SFNM2"/>
<Translation x="0*fm" y="0*fm" z="-[escon:InnerNM2_Z]"/>
</PosPart>
</PosPartSection>

Expand Down
19 changes: 14 additions & 5 deletions Geometry/EcalCommonData/data/PhaseII/escon.xml
@@ -1,17 +1,17 @@
<?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="escon.xml" eval="true">
<Constant name="ESFrontZ" value="2977*mm"/>
<Constant name="ESFrontZ" value="2990*mm"/>
<Constant name="ESRearZ" value="3170*mm"/>
<Constant name="ESMidZ" value="([ESFrontZ]+115.6*mm)"/>
<Constant name="R_MIN" value="31.1*cm"/>
<Constant name="R_MAX" value="140.0*cm"/>
<Constant name="P1" value="0.10*cm"/>
<Constant name="R_MIN" value="295*mm"/>
<Constant name="R_MAX" value="1421.5*mm"/>
<Constant name="P1" value="0.0*cm"/>
<!-- Constants for preshower front and rear window -->
<Constant name="Front_window_Z" value="([ESFrontZ]+[P1])"/>
<Constant name="Front_window_mid_Z" value="([Front_window_Z]+3.1*cm)"/>
<Constant name="Front_window_Back_Z" value="([Front_window_Z]+3.6*cm)"/>
<Constant name="Front_window_Al" value="[R_MAX]-9*cm"/>
<Constant name="Front_window_Al" value="1300*mm"/>
<Constant name="Window_backend_Al" value="[Front_window_Al]-3.5*cm"/>
<Constant name="Rear_window_Back_Z" value="([ESRearZ]-[P1])"/>
<Constant name="Rear_window_Z" value="([Rear_window_Back_Z]-3.6*cm)"/>
Expand All @@ -33,6 +33,15 @@
<Constant name="PRESH_MID_Z" value="1.8*cm"/>
<Constant name="PRESH_RMAX_BACK" value="140.0*cm"/>
<Constant name="PRESH_RMAX_FRONT" value="131.0*cm"/>
<!-- Constants for inner neutron moderator (NM) -->
<Constant name="InnerNM1_RMin" value="117.0*mm"/>
<Constant name="InnerNM1_RMax" value="213.0*mm"/>
<Constant name="InnerNM2_RMin" value="220.5*mm"/>
<Constant name="InnerNM2_RMax" value="255.0*mm"/>
<Constant name="InnerNM1_Dz" value="115.0*mm"/>
<Constant name="InnerNM1_Z" value="3235.0*mm"/>
<Constant name="InnerNM2_Dz" value="180.0*mm"/>
<Constant name="InnerNM2_Z" value="3170.0*mm"/>
</ConstantsSection>

</DDDefinition>
100 changes: 100 additions & 0 deletions Geometry/HGCalCommonData/data/Rebuild/shashlik.xml
@@ -0,0 +1,100 @@
<?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="shashlik.xml" eval="true">
<Constant name="zSHCal1" value="317.0*cm"/>
<Constant name="zSHCal2" value="360.4*cm"/>
<Constant name="rMinSHCal1" value="[etaMax:slope]*[zSHCal1]"/>
<Constant name="rMinSHCal2" value="[etaMax:slope]*[zSHCal2]"/>
<Constant name="rMaxSHCal1" value="154.0*cm"/>
<Constant name="rMaxSHCal2" value="175.0*cm"/>
<Constant name="deltaZ" value="2.0*cm"/>
<Constant name="thickBack" value="22.0*cm"/>
<Constant name="zSHBack1" value="[zSHCal2]-[thickBack]"/>
<Constant name="zSHBack2" value="[zSHCal2]"/>
<Constant name="zSHBack3" value="([zSHBack1]+6.*cm)"/>
<Constant name="backRmin1" value="[etaMax:slope]*[zSHBack1]"/>
<Constant name="backRmin2" value="[etaMax:slope]*[zSHBack2]"/>
<Constant name="backRmin3" value="[etaMax:slope]*[zSHBack3]"/>
<Constant name="backRmax1" value="164.3*cm"/>
<Constant name="backRmax2" value="[rMaxSHCal2]"/>
</ConstantsSection>

<SolidSection label="shashlik.xml">
<Polycone name="SHCalEE" startPhi="0*deg" deltaPhi="360*deg">
<ZSection z="[zSHCal1]" rMin="[rMinSHCal1]" rMax="[rMaxSHCal1]"/>
<ZSection z="[zSHCal2]" rMin="[rMinSHCal2]" rMax="[rMaxSHCal2]"/>
</Polycone>
<Polycone name="SHCalBack" startPhi="0*deg" deltaPhi="360*deg">
<ZSection z="[zSHBack1]" rMin="[backRmin1]" rMax="[backRmax1]"/>
<ZSection z="[zSHBack2]" rMin="[backRmin2]" rMax="[backRmax2]"/>
</Polycone>
<Polycone name="SHCalSS" startPhi="0*deg" deltaPhi="360*deg">
<ZSection z="[zSHBack1]" rMin="[backRmin1]" rMax="[backRmax1]"/>
<ZSection z="[zSHBack3]" rMin="[backRmin3]" rMax="[backRmax1]"/>
</Polycone>
<Polycone name="SHCalCables" startPhi="0*deg" deltaPhi="360*deg">
<ZSection z="[zSHBack3]" rMin="[backRmin3]" rMax="[backRmax1]"/>
<ZSection z="[zSHBack3]+4.8*cm" rMin="[backRmax1]" rMax="[backRmax1]"/>
</Polycone>
</SolidSection>

<LogicalPartSection label="shashlik.xml">
<LogicalPart name="SHCalEE" category="unspecified">
<rSolid name="SHCalEE"/>
<rMaterial name="materials:E_Air"/>
</LogicalPart>
<LogicalPart name="SHCalBack" category="unspecified">
<rSolid name="SHCalBack"/>
<rMaterial name="materials:E_Air"/>
</LogicalPart>
<LogicalPart name="SHCalSS" category="unspecified">
<rSolid name="SHCalSS"/>
<rMaterial name="materials:E_Aluminium"/>
</LogicalPart>
<LogicalPart name="SHCalCables" category="unspecified">
<rSolid name="SHCalCables"/>
<rMaterial name="materials:E_Copper"/>
</LogicalPart>
</LogicalPartSection>

<PosPartSection label="shashlik.xml">
<PosPart copyNumber="1">
<rParent name="caloBase:CALO"/>
<rChild name="SHCalEE"/>
<rRotation name="rotations:000D"/>
</PosPart>
<PosPart copyNumber="2">
<rParent name="caloBase:CALO"/>
<rChild name="SHCalEE"/>
<rRotation name="rotations:180D"/>
</PosPart>
<PosPart copyNumber="1">
<rParent name="SHCalEE"/>
<rChild name="SHCalBack"/>
</PosPart>
<PosPart copyNumber="1">
<rParent name="SHCalBack"/>
<rChild name="SHCalSS"/>
</PosPart>
<PosPart copyNumber="1">
<rParent name="SHCalBack"/>
<rChild name="SHCalCables"/>
</PosPart>
</PosPartSection>

<Algorithm name="shashlik:DDShashlikNoTaperEndcap">
<rParent name="SHCalEE"/>
<String name="ChildName" value="shashliksupermodule:ShashlikSupermodule"/>
<Numeric name="n" value="19"/>
<Numeric name="startCopyNo" value="1"/>
<Numeric name="incrCopyNo" value="1"/>
<Numeric name="invert" value="1"/>
<Numeric name="rMin" value="[rMinSHCal1]"/>
<Numeric name="rMax" value="[rMaxSHCal1]"/>
<Numeric name="tiltAngle" value="0"/>
<Numeric name="zoffset" value="[zSHCal1]+0.5*[shashlikmodule:moduleThickness]"/>
<Numeric name="xyoffset" value="0.5*([shashliksupermodule:superModuleWidthFront]+[shashliksupermodule:superModuleWidthBack])"/>
</Algorithm>

</DDDefinition>
48 changes: 48 additions & 0 deletions Geometry/HcalCommonData/data/PhaseII/Rebuild/hcalalgo.xml
@@ -0,0 +1,48 @@
<?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="hcalalgo.xml" eval="true">
<Constant name="z1HE" value="360.40*cm"/>
<Constant name="z2HE" value="524.50*cm"/>
<Constant name="z3HB" value="375.022*cm"/>
<Constant name="z4HB" value="446.079*cm"/>
<Constant name="z5HB" value="449.127*cm"/>
<Constant name="z6HB" value="[cms:CalorBeamZ2]"/>
<Constant name="rMin1HE" value="[z1HE]*[etaMax:slope]"/>
<Constant name="rMin2HE" value="[z2HE]*[etaMax:slope]"/>
<Constant name="rMin1" value="177.500*cm"/>
<Constant name="rMin4" value="277.071*cm"/>
<Constant name="rMin5" value="281.342*cm"/>
<Constant name="rOutHB" value="287.65*cm"/>
</ConstantsSection>

<SolidSection label="hcalalgo.xml">
<Polyhedra name="HCal" numSide="18" startPhi="350*deg" deltaPhi="360*deg">
<ZSection z="-[z6HB]" rMin="[rMin5]" rMax="[rOutHB]"/>
<ZSection z="-[z2HE]" rMin="[rMin5]" rMax="[rOutHB]"/>
<ZSection z="-[z2HE]" rMin="[rMin2HE]" rMax="[rOutHB]"/>
<ZSection z="-[z1HE]" rMin="[rMin1HE]" rMax="[rOutHB]"/>
<ZSection z="-[z1HE]" rMin="[rMin1]" rMax="[rOutHB]"/>
<ZSection z="[z1HE]" rMin="[rMin1]" rMax="[rOutHB]"/>
<ZSection z="[z1HE]" rMin="[rMin1HE]" rMax="[rOutHB]"/>
<ZSection z="[z2HE]" rMin="[rMin2HE]" rMax="[rOutHB]"/>
<ZSection z="[z2HE]" rMin="[rMin5]" rMax="[rOutHB]"/>
<ZSection z="[z6HB]" rMin="[rMin5]" rMax="[rOutHB]"/>
</Polyhedra>
</SolidSection>

<LogicalPartSection label="hcalalgo.xml">
<LogicalPart name="HCal" category="unspecified">
<rSolid name="HCal"/>
<rMaterial name="materials:Air"/>
</LogicalPart>
</LogicalPartSection>

<PosPartSection label="hcalalgo.xml">
<PosPart copyNumber="1">
<rParent name="caloBase:CALO"/>
<rChild name="hcalalgo:HCal"/>
<rRotation name="rotations:000D"/>
</PosPart>
</PosPartSection>
</DDDefinition>

0 comments on commit 9bfe6e8

Please sign in to comment.