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.

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

ME0 Flexible Description #3255

Merged
merged 3 commits into from
Apr 9, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
'Geometry/MuonCommonData/data/v1/mb3.xml',
'Geometry/MuonCommonData/data/v1/mb4.xml',
'Geometry/MuonCommonData/data/design/muonYoke.xml',
'Geometry/MuonCommonData/data/v7/mf.xml',
'Geometry/MuonCommonData/data/PhaseII/v3/mf.xml',
'Geometry/MuonCommonData/data/PhaseII/v3/rpcf.xml',
'Geometry/MuonCommonData/data/v2/gemf.xml',
'Geometry/MuonCommonData/data/v4/gem11.xml',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
'Geometry/MuonCommonData/data/v1/mb3.xml',
'Geometry/MuonCommonData/data/v1/mb4.xml',
'Geometry/MuonCommonData/data/design/muonYoke.xml',
'Geometry/MuonCommonData/data/v7/mf.xml',
'Geometry/MuonCommonData/data/PhaseII/v3/mf.xml',
'Geometry/MuonCommonData/data/PhaseII/v3/rpcf.xml',
'Geometry/MuonCommonData/data/v2/gemf.xml',
'Geometry/MuonCommonData/data/v4/gem11.xml',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
'Geometry/MuonCommonData/data/v1/mb3.xml',
'Geometry/MuonCommonData/data/v1/mb4.xml',
'Geometry/MuonCommonData/data/design/muonYoke.xml',
'Geometry/MuonCommonData/data/v7/mf.xml',
'Geometry/MuonCommonData/data/PhaseII/v3/mf.xml',
'Geometry/MuonCommonData/data/PhaseII/v3/rpcf.xml',
'Geometry/MuonCommonData/data/v2/gemf.xml',
'Geometry/MuonCommonData/data/v4/gem11.xml',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
'Geometry/CMSCommonData/data/eta3/etaMax.xml',
'Geometry/CMSCommonData/data/PhaseII/caloBase.xml',
'Geometry/CMSCommonData/data/cmsCalo.xml',
'Geometry/CMSCommonData/data/muonBase.xml',
'Geometry/CMSCommonData/data/PhaseII/muonBase.xml',
'Geometry/CMSCommonData/data/cmsMuon.xml',
'Geometry/CMSCommonData/data/mgnt.xml',
'Geometry/CMSCommonData/data/PhaseI/beampipe.xml',
Expand Down Expand Up @@ -75,13 +75,14 @@
'Geometry/MuonCommonData/data/v1/mb3.xml',
'Geometry/MuonCommonData/data/v1/mb4.xml',
'Geometry/MuonCommonData/data/design/muonYoke.xml',
'Geometry/MuonCommonData/data/PhaseII/v2/mf.xml',
'Geometry/MuonCommonData/data/PhaseII/v3/mf.xml',
'Geometry/MuonCommonData/data/PhaseII/v3/rpcf.xml',
'Geometry/MuonCommonData/data/v2/gemf.xml',
'Geometry/MuonCommonData/data/v4/gem11.xml',
'Geometry/MuonCommonData/data/v6/gem21.xml',
'Geometry/MuonCommonData/data/v2/csc.xml',
'Geometry/MuonCommonData/data/PhaseII/v3/mfshield.xml',
'Geometry/MuonCommonData/data/v7/mfshield.xml',
'Geometry/MuonCommonData/data/v7/me0.xml',
'Geometry/ForwardCommonData/data/forward.xml',
'Geometry/ForwardCommonData/data/v2/forwardshield.xml',
'Geometry/ForwardCommonData/data/brmrotations.xml',
Expand All @@ -99,7 +100,7 @@
'Geometry/ForwardCommonData/data/zdc.xml',
'Geometry/ForwardCommonData/data/zdclumi.xml',
'Geometry/ForwardCommonData/data/cmszdc.xml')+cms.vstring(
'Geometry/MuonCommonData/data/PhaseII/v2/muonNumbering.xml',
'Geometry/MuonCommonData/data/PhaseII/v3/muonNumbering.xml',
'Geometry/TrackerCommonData/data/PhaseII/BarrelEndcap5D/trackerStructureTopology.xml',
'Geometry/TrackerSimData/data/PhaseII/BarrelEndcap5D/trackersens.xml',
'Geometry/TrackerRecoData/data/PhaseII/BarrelEndcap5D/trackerRecoMaterial.xml',
Expand All @@ -111,7 +112,7 @@
'Geometry/HcalSimData/data/hfpmt.xml',
'Geometry/HcalSimData/data/hffibrebundle.xml',
'Geometry/HcalSimData/data/CaloUtil.xml',
'Geometry/MuonSimData/data/PhaseII/v3/muonSens.xml',
'Geometry/MuonSimData/data/PhaseII/v4/muonSens.xml',
'Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml',
'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
Expand Down
11 changes: 9 additions & 2 deletions Geometry/MuonCommonData/data/PhaseII/v3/mf.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
<?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="z1ME0" value="5.241*m"/>
<Constant name="z2ME0" value="5.541*m"/>
<Constant name="rMinME0" value="[z1ME0]*[etaMax:slope]"/>
<Constant name="rMaxME0" value="2.73*m"/>
</ConstantsSection>

<SolidSection label="mf.xml">
<Polycone name="ME" startPhi="0*deg" deltaPhi="360*deg">
<ZSection z="524.1*cm" rMin="[cms:CalorBeamR2]" rMax="273.76*cm"/>
Expand All @@ -19,8 +26,8 @@
<ZSection z="[cms:MuonBeamZ2]" rMin="[cms:MERmin3]" rMax="[cms:CMSR1]"/>
</Polycone>
<Polycone name="ME0Ring" startPhi="0*deg" deltaPhi="360*deg">
<ZSection z="5.241*m " rMin="0.2*m " rMax="2.73*m "/>
<ZSection z="5.541*m " rMin="0.2*m " rMax="2.73*m "/>
<ZSection z="[z1ME0]" rMin="[rMinME0]" rMax="[rMaxME0]"/>
<ZSection z="[z2ME0]" rMin="[rMinME0]" rMax="[rMaxME0]"/>
</Polycone>
<Polycone name="ME1Ring" startPhi="0*deg" deltaPhi="360*deg">
<ZSection z="5.641*m " rMin="1.3*m " rMax="2.8*m "/>
Expand Down
6 changes: 3 additions & 3 deletions Geometry/MuonCommonData/data/v7/me0.xml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?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="me0.xml" eval="true">
<Constant name="rMin" value="30.*cm"/>
<Constant name="rMin" value="[mf:rMinME0] + 10.*cm"/>
<Constant name="rMax" value="149.5*cm"/>
<Constant name="dZ" value="58.62*cm"/>
<Constant name="dZ" value="0.5*([rMax]-[rMin])"/>
<Constant name="rPos" value="([dZ] + [rMin])"/>
<Constant name="z10" value="12.35*cm"/>
<Constant name="z20" value="([z10]-5*cm)"/>
Expand All @@ -15,7 +15,7 @@
<Constant name="xTop" value="(2.*[dZ]*tan(10*deg)+[xBot])"/>
</ConstantsSection>
<SolidSection label="me0.xml">
<Tubs name="ME0" rMin="[rMin]" rMax="[rMax]" dz="14.75*cm " startPhi="0*deg" deltaPhi="360*deg"/>
<Tubs name="ME0" rMin="[rMin]" rMax="[rMax]+2.5*cm" dz="14.75*cm " startPhi="0*deg" deltaPhi="360*deg"/>
<Trd1 name="ME0Box" dz="[dZ]" dy1="14.75*cm" dy2="14.75*cm" dx1="[xBot]" dx2="[xTop]" />
<Trd1 name="ME0L" dz="[dZ]" dy1="0.3*cm" dy2="0.3*cm" dx1="[xBot]" dx2="[xTop]" />
</SolidSection>
Expand Down
4 changes: 2 additions & 2 deletions Geometry/MuonCommonData/data/v7/mfshield.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
<ZSection z="6590*mm" rMin="67.5*cm " rMax="85*cm "/>
<ZSection z="6.835*m " rMin="701*mm" rMax="85*cm "/>
</Polycone>
<Tubs name="ShieldingBoronPoly_1_ME0" rMin="200*mm" rMax="250*mm" dz="15*cm " startPhi="0*deg" deltaPhi="360*deg"/>
<Tubs name="ShieldingAntinomyLead_1_ME0" rMin="250*mm" rMax="300*mm" dz="15*cm " startPhi="0*deg" deltaPhi="360*deg"/>
<Tubs name="ShieldingBoronPoly_1_ME0" rMin="[mf:rMinME0]" rMax="[mf:rMinME0] + 50*mm" dz="15*cm " startPhi="0*deg" deltaPhi="360*deg"/>
<Tubs name="ShieldingAntinomyLead_1_ME0" rMin="[mf:rMinME0] + 50*mm" rMax="[mf:rMinME0] + 100*mm" dz="15*cm " startPhi="0*deg" deltaPhi="360*deg"/>
<Tubs name="ShieldingBoronPoly_1_ME1" rMin="965*mm" rMax="1240*mm" dz="2*cm " startPhi="0*deg" deltaPhi="360*deg"/>
<Tubs name="ShieldingAntinomyLead_1_ME1" rMin="965*mm" rMax="1240*mm" dz="6.49995*mm " startPhi="0*deg" deltaPhi="360*deg"/>
<Tubs name="ShieldingBoronPoly_2_ME1" rMin="85.1*cm " rMax="88.1*cm " dz="148.5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
Expand Down