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

Phase2 shashik04 #3285

Merged
merged 3 commits into from Apr 16, 2014
Merged

Phase2 shashik04 #3285

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
606dc42
Add active timing layer in ES region
Apr 10, 2014
69d3c7c
Fix problem for muons
Apr 10, 2014
26ccfff
Fix problem for muons
Apr 10, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions Geometry/CMSCommonData/python/cmsExtendedGeometry2019PFCalXML_cfi.py
View file
Open in desktop
Expand Up @@ -206,6 +206,8 @@
'Geometry/EcalCommonData/data/ebrot.xml',
'Geometry/EcalCommonData/data/eecon.xml',
'Geometry/EcalCommonData/data/ectkcable.xml',
'Geometry/EcalCommonData/data/PhaseII/escon.xml',
'Geometry/EcalCommonData/data/PhaseII/esalgo.xml',
'Geometry/HcalCommonData/data/hcalrotations.xml',
'Geometry/HcalCommonData/data/PhaseII/hcalalgo.xml',
'Geometry/HcalCommonData/data/hcalcablealgo.xml',
Expand Down
2 changes: 2 additions & 0 deletions Geometry/CMSCommonData/python/cmsExtendedGeometry2023CFCal4EtaXML_cfi.py
View file
Open in desktop
Expand Up @@ -56,6 +56,8 @@
'Geometry/EcalCommonData/data/ebrot.xml',
'Geometry/EcalCommonData/data/eecon.xml',
'Geometry/EcalCommonData/data/ectkcable.xml',
'Geometry/EcalCommonData/data/PhaseII/escon.xml',
'Geometry/EcalCommonData/data/PhaseII/esalgo.xml',
'Geometry/HcalCommonData/data/hcalrotations.xml',
'Geometry/HcalCommonData/data/PhaseII/NoHE/hcalalgo.xml',
'Geometry/HcalCommonData/data/hcalcablealgo.xml',
Expand Down
2 changes: 2 additions & 0 deletions Geometry/CMSCommonData/python/cmsExtendedGeometry2023CFCalXML_cfi.py
View file
Open in desktop
Expand Up @@ -56,6 +56,8 @@
'Geometry/EcalCommonData/data/ebrot.xml',
'Geometry/EcalCommonData/data/eecon.xml',
'Geometry/EcalCommonData/data/ectkcable.xml',
'Geometry/EcalCommonData/data/PhaseII/escon.xml',
'Geometry/EcalCommonData/data/PhaseII/esalgo.xml',
'Geometry/HcalCommonData/data/hcalrotations.xml',
'Geometry/HcalCommonData/data/PhaseII/NoHE/hcalalgo.xml',
'Geometry/HcalCommonData/data/hcalcablealgo.xml',
Expand Down
2 changes: 2 additions & 0 deletions Geometry/CMSCommonData/python/cmsExtendedGeometry2023HGCalMuon4EtaXML_cfi.py
View file
Open in desktop
Expand Up @@ -55,6 +55,8 @@
'Geometry/EcalCommonData/data/ebcon.xml',
'Geometry/EcalCommonData/data/ebrot.xml',
'Geometry/EcalCommonData/data/eecon.xml',
'Geometry/EcalCommonData/data/PhaseII/escon.xml',
'Geometry/EcalCommonData/data/PhaseII/esalgo.xml',
'Geometry/HcalCommonData/data/hcalrotations.xml',
'Geometry/HcalCommonData/data/PhaseII/NoHE/hcalalgo.xml',
'Geometry/HcalCommonData/data/hcalbarrelalgo.xml',
Expand Down
2 changes: 2 additions & 0 deletions Geometry/CMSCommonData/python/cmsExtendedGeometry2023HGCalMuonXML_cfi.py
View file
Open in desktop
Expand Up @@ -55,6 +55,8 @@
'Geometry/EcalCommonData/data/ebcon.xml',
'Geometry/EcalCommonData/data/ebrot.xml',
'Geometry/EcalCommonData/data/eecon.xml',
'Geometry/EcalCommonData/data/PhaseII/escon.xml',
'Geometry/EcalCommonData/data/PhaseII/esalgo.xml',
'Geometry/HcalCommonData/data/hcalrotations.xml',
'Geometry/HcalCommonData/data/PhaseII/NoHE/hcalalgo.xml',
'Geometry/HcalCommonData/data/hcalbarrelalgo.xml',
Expand Down
2 changes: 2 additions & 0 deletions Geometry/CMSCommonData/python/cmsExtendedGeometry2023HGCalXML_cfi.py
View file
Open in desktop
Expand Up @@ -56,6 +56,8 @@
'Geometry/EcalCommonData/data/ebrot.xml',
'Geometry/EcalCommonData/data/eecon.xml',
'Geometry/EcalCommonData/data/ectkcable.xml',
'Geometry/EcalCommonData/data/PhaseII/escon.xml',
'Geometry/EcalCommonData/data/PhaseII/esalgo.xml',
'Geometry/HcalCommonData/data/hcalrotations.xml',
'Geometry/HcalCommonData/data/PhaseII/NoHE/hcalalgo.xml',
'Geometry/HcalCommonData/data/hcalbarrelalgo.xml',
Expand Down
2 changes: 2 additions & 0 deletions Geometry/CMSCommonData/python/cmsExtendedGeometry2023SHCal4EtaXML_cfi.py
View file
Open in desktop
Expand Up @@ -56,6 +56,8 @@
'Geometry/EcalCommonData/data/ebrot.xml',
'Geometry/EcalCommonData/data/eecon.xml',
'Geometry/EcalCommonData/data/ectkcable.xml',
'Geometry/EcalCommonData/data/PhaseII/escon.xml',
'Geometry/EcalCommonData/data/PhaseII/esalgo.xml',
'Geometry/HcalCommonData/data/hcalrotations.xml',
'Geometry/HcalCommonData/data/PhaseII/hcalalgo.xml',
'Geometry/HcalCommonData/data/hcalcablealgo.xml',
Expand Down
2 changes: 2 additions & 0 deletions Geometry/CMSCommonData/python/cmsExtendedGeometry2023SHCalNoTaper4EtaXML_cfi.py
View file
Open in desktop
Expand Up @@ -56,6 +56,8 @@
'Geometry/EcalCommonData/data/ebrot.xml',
'Geometry/EcalCommonData/data/eecon.xml',
'Geometry/EcalCommonData/data/ectkcable.xml',
'Geometry/EcalCommonData/data/PhaseII/escon.xml',
'Geometry/EcalCommonData/data/PhaseII/esalgo.xml',
'Geometry/HcalCommonData/data/hcalrotations.xml',
'Geometry/HcalCommonData/data/PhaseII/hcalalgo.xml',
'Geometry/HcalCommonData/data/hcalcablealgo.xml',
Expand Down
2 changes: 2 additions & 0 deletions Geometry/CMSCommonData/python/cmsExtendedGeometry2023SHCalNoTaperXML_cfi.py
View file
Open in desktop
Expand Up @@ -56,6 +56,8 @@
'Geometry/EcalCommonData/data/ebrot.xml',
'Geometry/EcalCommonData/data/eecon.xml',
'Geometry/EcalCommonData/data/ectkcable.xml',
'Geometry/EcalCommonData/data/PhaseII/escon.xml',
'Geometry/EcalCommonData/data/PhaseII/esalgo.xml',
'Geometry/HcalCommonData/data/hcalrotations.xml',
'Geometry/HcalCommonData/data/PhaseII/hcalalgo.xml',
'Geometry/HcalCommonData/data/hcalcablealgo.xml',
Expand Down
2 changes: 2 additions & 0 deletions Geometry/CMSCommonData/python/cmsExtendedGeometry2023SHCalXML_cfi.py
View file
Open in desktop
Expand Up @@ -56,6 +56,8 @@
'Geometry/EcalCommonData/data/ebrot.xml',
'Geometry/EcalCommonData/data/eecon.xml',
'Geometry/EcalCommonData/data/ectkcable.xml',
'Geometry/EcalCommonData/data/PhaseII/escon.xml',
'Geometry/EcalCommonData/data/PhaseII/esalgo.xml',
'Geometry/HcalCommonData/data/hcalrotations.xml',
'Geometry/HcalCommonData/data/PhaseII/hcalalgo.xml',
'Geometry/HcalCommonData/data/hcalcablealgo.xml',
Expand Down
2 changes: 2 additions & 0 deletions Geometry/CMSCommonData/python/ecalhcalPhaseIIGeometryXML_cfi.py
View file
Open in desktop
Expand Up @@ -23,6 +23,8 @@
'Geometry/EcalCommonData/data/ebrot.xml',
'Geometry/EcalCommonData/data/eecon.xml',
'Geometry/EcalCommonData/data/ectkcable.xml',
'Geometry/EcalCommonData/data/PhaseII/escon.xml',
'Geometry/EcalCommonData/data/PhaseII/esalgo.xml',
'Geometry/HGCalCommonData/data/shashlikmodule.xml',
'Geometry/HGCalCommonData/data/shashliksupermodule.xml',
'Geometry/HGCalCommonData/data/shashlik.xml',
Expand Down
34 changes: 34 additions & 0 deletions Geometry/EcalCommonData/data/PhaseII/NoES/eregalgo.xml
View file
Open in desktop
@@ -0,0 +1,34 @@
<?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="eregalgo.xml">
<Polycone name="ECAL" startPhi="0*deg" deltaPhi="360*deg">
<ZSection z="-[ectkcable:z4CabEC]" rMin="[ectkcable:rMin2Cab]" rMax="[eecon:EBRMax]"/>
<ZSection z="-[ectkcable:z3CabEC]" rMin="[ectkcable:rMin2Cab]" rMax="[eecon:EBRMax]"/>
<ZSection z="-[ectkcable:z3CabEC]" rMin="[ectkcable:rMin1Cab]" rMax="[eecon:EBRMax]"/>
<ZSection z="-[ectkcable:z2CabEC]" rMin="[ectkcable:rMin0Cab]" rMax="[eecon:EBRMax]"/>
<ZSection z="-[ectkcable:z1CabEC]" rMin="[eecon:EBRMin]" rMax="[eecon:EBRMax]"/>
<ZSection z=" [ectkcable:z1CabEC]" rMin="[eecon:EBRMin]" rMax="[eecon:EBRMax]"/>
<ZSection z=" [ectkcable:z2CabEC]" rMin="[ectkcable:rMin0Cab]" rMax="[eecon:EBRMax]"/>
<ZSection z=" [ectkcable:z3CabEC]" rMin="[ectkcable:rMin1Cab]" rMax="[eecon:EBRMax]"/>
<ZSection z=" [ectkcable:z3CabEC]" rMin="[ectkcable:rMin2Cab]" rMax="[eecon:EBRMax]"/>
<ZSection z=" [ectkcable:z4CabEC]" rMin="[ectkcable:rMin2Cab]" rMax="[eecon:EBRMax]"/>
</Polycone>
</SolidSection>

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

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

</DDDefinition>
16 changes: 8 additions & 8 deletions Geometry/EcalCommonData/data/PhaseII/eregalgo.xml
View file
Open in desktop
Expand Up @@ -4,14 +4,14 @@
<SolidSection label="eregalgo.xml">
<Polycone name="ECAL" startPhi="0*deg" deltaPhi="360*deg">
<ZSection z="-[ectkcable:z4CabEC]" rMin="[ectkcable:rMin2Cab]" rMax="[eecon:EBRMax]"/>
<ZSection z="-[ectkcable:z3CabEC]" rMin="[ectkcable:rMin2Cab]" rMax="[eecon:EBRMax]"/>
<ZSection z="-[ectkcable:z3CabEC]" rMin="[ectkcable:rMin1Cab]" rMax="[eecon:EBRMax]"/>
<ZSection z="-[ectkcable:z2CabEC]" rMin="[ectkcable:rMin0Cab]" rMax="[eecon:EBRMax]"/>
<ZSection z="-[ectkcable:z1CabEC]" rMin="[eecon:EBRMin]" rMax="[eecon:EBRMax]"/>
<ZSection z=" [ectkcable:z1CabEC]" rMin="[eecon:EBRMin]" rMax="[eecon:EBRMax]"/>
<ZSection z=" [ectkcable:z2CabEC]" rMin="[ectkcable:rMin0Cab]" rMax="[eecon:EBRMax]"/>
<ZSection z=" [ectkcable:z3CabEC]" rMin="[ectkcable:rMin1Cab]" rMax="[eecon:EBRMax]"/>
<ZSection z=" [ectkcable:z3CabEC]" rMin="[ectkcable:rMin2Cab]" rMax="[eecon:EBRMax]"/>
<ZSection z="-[escon:ESRearZ]" rMin="[ectkcable:rMin2Cab]" rMax="[eecon:EBRMax]"/>
<ZSection z="-[escon:ESRearZ]" rMin="[escon:R_MIN]" rMax="[eecon:EBRMax]"/>
<ZSection z="-[escon:ESFrontZ]" rMin="[escon:R_MIN]" rMax="[eecon:EBRMax]"/>
<ZSection z="-[escon:ESFrontZ]" rMin="[eecon:EBRMin]" rMax="[eecon:EBRMax]"/>
<ZSection z=" [escon:ESFrontZ]" rMin="[eecon:EBRMin]" rMax="[eecon:EBRMax]"/>
<ZSection z=" [escon:ESFrontZ]" rMin="[escon:R_MIN]" rMax="[eecon:EBRMax]"/>
<ZSection z=" [escon:ESRearZ]" rMin="[escon:R_MIN]" rMax="[eecon:EBRMax]"/>
<ZSection z=" [escon:ESRearZ]" rMin="[ectkcable:rMin2Cab]" rMax="[eecon:EBRMax]"/>
<ZSection z=" [ectkcable:z4CabEC]" rMin="[ectkcable:rMin2Cab]" rMax="[eecon:EBRMax]"/>
</Polycone>
</SolidSection>
Expand Down
92 changes: 92 additions & 0 deletions Geometry/EcalCommonData/data/PhaseII/esalgo.xml
View file
Open in desktop
@@ -0,0 +1,92 @@
<?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="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">
<ZSection z="[escon:Front_window_Z]" rMin="[escon:R_MIN]" rMax="[escon:Front_window_Al]"/>
<ZSection z="[escon:Front_window_mid_Z]" rMin="[escon:R_MIN]" rMax="[escon:Front_window_Al]"/>
<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>
</SolidSection>

<LogicalPartSection label="esalgo.xml">
<LogicalPart name="SF" category="unspecified">
<rSolid name="SF"/>
<rMaterial name="materials:E_Air"/>
</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"/>
<rMaterial name="materials:E_Polythene"/>
</LogicalPart>
</LogicalPartSection>

<PosPartSection label="esalgo.xml">
<PosPart copyNumber="1">
<rParent name="eregalgo:ECAL"/>
<rChild name="esalgo:SF"/>
</PosPart>
<PosPart copyNumber="2">
<rParent name="eregalgo:ECAL"/>
<rChild name="esalgo:SF"/>
<rRotation name="rotations:180D"/>
</PosPart>
<PosPart copyNumber="1">
<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"/>
</PosPart>
</PosPartSection>

</DDDefinition>
33 changes: 33 additions & 0 deletions Geometry/EcalCommonData/data/PhaseII/escon.xml
View file
Open in desktop
@@ -0,0 +1,33 @@
<?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="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"/>
<!-- 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="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)"/>
<Constant name="Rear_window_mid_Z" value="([Rear_window_Z]+2.6*cm)"/>
<Constant name="Rear_window_Al" value="[R_MAX]-1.3*cm"/>
<!-- Constants for preshower neutron moderator (NM) -->
<Constant name="NM_Front_first_Z" value="([Front_window_Z]+0.9*cm)"/>
<Constant name="NM_Front_second_Z" value="([Front_window_Z]+2.7*cm)"/>
<Constant name="NM_Rear_first_Z" value="([Rear_window_Z]+0.9*cm)"/>
<Constant name="NM_Rear_second_Z" value="([Rear_window_Z]+2.7*cm)"/>
<Constant name="NM_RMIN_outer" value="37.1*cm"/>
<Constant name="NM_RMIN_inner" value="36.1*cm"/>
<Constant name="Front_NM_RMAX_outer" value="122.7*cm"/>
<Constant name="Front_NM_RMAX_inner" value="122.3*cm"/>
<Constant name="Rear_NM_RMAX_outer" value="[Front_NM_RMAX_outer]+0.1*cm"/>
<Constant name="Rear_NM_RMAX_inner" value="[Front_NM_RMAX_inner]-0.1*cm"/>
</ConstantsSection>

</DDDefinition>
31 changes: 3 additions & 28 deletions Geometry/HGCalCommonData/data/NoTaper/shashlik.xml
View file
Open in desktop
Expand Up @@ -10,11 +10,6 @@
<Constant name="rMaxSHCal1" value="154.0*cm"/>
<Constant name="rMaxSHCal2" value="181.2*cm"/>
<Constant name="deltaZ" value="2*cm"/>
<Constant name="modZ" value="14*cm"/>
<Constant name="modRmin1" value="[etaMax:slope]*([zSHCal1]-[modZ])"/>
<Constant name="modRmin2" value="[etaMax:slope]*[zSHCal1]"/>
<Constant name="modRmax1" value="135.*cm"/>
<Constant name="modRmax2" value="145.*cm"/>
<Constant name="thickBack" value="30.*cm"/>
<Constant name="zSHBack1" value="[zSHCal2]-[thickBack]"/>
<Constant name="zSHBack2" value="[zSHCal2]"/>
Expand All @@ -30,10 +25,6 @@
<ZSection z="[zSHCal1]" rMin="([rMinSHCal1] - 1.5*cm)" rMax="([rMaxSHCal1] + 0.16*cm)"/>
<ZSection z="[zSHCal2]" rMin="([rMinSHCal2] - 1.5*cm)" rMax="([rMaxSHCal2] + 0.16*cm)"/>
</Polycone>
<Polycone name="SHCalMod" startPhi="0*deg" deltaPhi="360*deg">
<ZSection z="([zSHCal1]-[modZ])" rMin="[modRmin1]" rMax="[modRmax1]"/>
<ZSection z="[zSHCal1]" rMin="[modRmin2]" rMax="[modRmax2]"/>
</Polycone>
<Polycone name="SHCalBack" startPhi="0*deg" deltaPhi="360*deg">
<ZSection z="[zSHBack1]" rMin="[backRmin1]" rMax="[backRmax1]"/>
<ZSection z="[zSHBack2]" rMin="[backRmin2]" rMax="[backRmax2]"/>
Expand All @@ -53,10 +44,6 @@
<rSolid name="SHCalEE"/>
<rMaterial name="materials:E_Air"/>
</LogicalPart>
<LogicalPart name="SHCalMod" category="unspecified">
<rSolid name="SHCalMod"/>
<rMaterial name="materials:Polyethylene"/>
</LogicalPart>
<LogicalPart name="SHCalBack" category="unspecified">
<rSolid name="SHCalBack"/>
<rMaterial name="materials:E_Air"/>
Expand All @@ -82,16 +69,6 @@
<rChild name="SHCalEE"/>
<rRotation name="rotations:180D"/>
</PosPart>
<PosPart copyNumber="1">
<rParent name="caloBase:CALO"/>
<rChild name="SHCalMod"/>
<rRotation name="rotations:000D"/>
</PosPart>
<PosPart copyNumber="2">
<rParent name="caloBase:CALO"/>
<rChild name="SHCalMod"/>
<rRotation name="rotations:180D"/>
</PosPart>
<PosPart copyNumber="1">
<rParent name="SHCalEE"/>
<rChild name="SHCalBack"/>
Expand All @@ -113,11 +90,9 @@
<Numeric name="startCopyNo" value="1"/>
<Numeric name="incrCopyNo" value="1"/>
<Numeric name="invert" value="1"/>
<!-- ccn: remove gaps, adjust rMin, rMax. Only valid for no-taper case -->
<Numeric name="rMin" value="[rMinSHCal1]+0.5*[shashliksupermodule:superModuleWidthFront]"/>
<Numeric name="rMax" value="[rMaxSHCal1]-0.5*[shashliksupermodule:superModuleWidthFront]"/>
<Numeric name="tiltAngle" value="atan((2.5*([shashlikmodule:widthBack]-[shashlikmodule:widthFront]))/[shashlikmodule:moduleThickness]) "/>
<!-- ccn: remove gap -->
<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>
Expand Down
8 changes: 4 additions & 4 deletions Geometry/HGCalCommonData/data/NoTaper/shashlikConstEta3.xml
View file
Open in desktop
Expand Up @@ -7,9 +7,9 @@
<Parameter name="OnlyForShashlikNumbering" value="SHCal" eval="false"/>
<Parameter name="firstRow" value="6"/>
<Parameter name="firstRow" value="6"/>
<Parameter name="firstRow" value="6"/>
<Parameter name="firstRow" value="5"/>
<Parameter name="firstRow" value="5"/>
<Parameter name="firstRow" value="3"/>
<Parameter name="firstRow" value="4"/>
<Parameter name="firstRow" value="1"/>
<Parameter name="firstRow" value="1"/>
<Parameter name="firstRow" value="1"/>
Expand Down Expand Up @@ -39,10 +39,10 @@
<Parameter name="lastRow" value="19"/>
<Parameter name="lastRow" value="18"/>
<Parameter name="lastRow" value="17"/>
<Parameter name="lastRow" value="17"/>
<Parameter name="lastRow" value="16"/>
<Parameter name="lastRow" value="16"/>
<Parameter name="lastRow" value="15"/>
<Parameter name="lastRow" value="14"/>
<Parameter name="lastRow" value="13"/>
<Parameter name="lastRow" value="12"/>
<Parameter name="lastRow" value="11"/>
<Parameter name="lastRow" value="9"/>
Expand Down
4 changes: 2 additions & 2 deletions Geometry/HGCalCommonData/data/NoTaper/shashlikConstEta4.xml
View file
Open in desktop
Expand Up @@ -39,10 +39,10 @@
<Parameter name="lastRow" value="19"/>
<Parameter name="lastRow" value="18"/>
<Parameter name="lastRow" value="17"/>
<Parameter name="lastRow" value="17"/>
<Parameter name="lastRow" value="16"/>
<Parameter name="lastRow" value="16"/>
<Parameter name="lastRow" value="15"/>
<Parameter name="lastRow" value="14"/>
<Parameter name="lastRow" value="13"/>
<Parameter name="lastRow" value="12"/>
<Parameter name="lastRow" value="11"/>
<Parameter name="lastRow" value="9"/>
Expand Down