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

bsunanda:Run2-gem07 Update the latest GEM geometry for GE11 #9113

Merged
merged 3 commits into from May 29, 2015
Merged

bsunanda:Run2-gem07 Update the latest GEM geometry for GE11 #9113

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
ac0ee2f
Update the latest GEM geometry for GE11
May 15, 2015
75eba9c
One missing commits
May 18, 2015
0ca68c9
Conform the 3 files with the other GE11 files
May 18, 2015
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
64 changes: 32 additions & 32 deletions Geometry/MuonCommonData/data/v2/gem11.xml
View file
Open in desktop
Expand Up @@ -849,32 +849,6 @@
</PosPart>
</PosPartSection>

<Algorithm name="muon:DDGEMAngular">
<rParent name="gem11:GEMDisk11P"/>
<String name="ChildName" value="GEMBox11S"/>
<String name="RotNameSpace" value="gemf"/>
<Numeric name="n" value="18"/>
<Numeric name="startCopyNo" value="2"/>
<Numeric name="incrCopyNo" value="2"/>
<Numeric name="invert" value="1"/>
<Numeric name="stepAngle" value="20*deg"/>
<Numeric name="startAngle" value="0*deg"/>
<Numeric name="rPosition" value="[rPos]"/>
<Numeric name="zoffset" value="+28.70*mm"/>
</Algorithm>
<Algorithm name="muon:DDGEMAngular">
<rParent name="gem11:GEMDisk11P"/>
<String name="ChildName" value="GEMBox11S"/>
<String name="RotNameSpace" value="gemf"/>
<Numeric name="n" value="18"/>
<Numeric name="startCopyNo" value="1"/>
<Numeric name="incrCopyNo" value="2"/>
<Numeric name="invert" value="1"/>
<Numeric name="stepAngle" value="20*deg"/>
<Numeric name="startAngle" value="0*deg"/>
<Numeric name="rPosition" value="[rPos]"/>
<Numeric name="zoffset" value=" -9.70*mm"/>
</Algorithm>
<Algorithm name="muon:DDGEMAngular">
<rParent name="gem11:GEMDisk11P"/>
<String name="ChildName" value="GEMBox11S"/>
Expand Down Expand Up @@ -902,28 +876,28 @@
<Numeric name="zoffset" value="-28.90*mm"/>
</Algorithm>
<Algorithm name="muon:DDGEMAngular">
<rParent name="gem11:GEMDisk11N"/>
<rParent name="gem11:GEMDisk11P"/>
<String name="ChildName" value="GEMBox11S"/>
<String name="RotNameSpace" value="gemf"/>
<Numeric name="n" value="18"/>
<Numeric name="startCopyNo" value="2"/>
<Numeric name="incrCopyNo" value="2"/>
<Numeric name="invert" value="1"/>
<Numeric name="stepAngle" value="-20*deg"/>
<Numeric name="startAngle" value="180*deg"/>
<Numeric name="stepAngle" value="20*deg"/>
<Numeric name="startAngle" value="0*deg"/>
<Numeric name="rPosition" value="[rPos]"/>
<Numeric name="zoffset" value="+28.70*mm"/>
</Algorithm>
<Algorithm name="muon:DDGEMAngular">
<rParent name="gem11:GEMDisk11N"/>
<rParent name="gem11:GEMDisk11P"/>
<String name="ChildName" value="GEMBox11S"/>
<String name="RotNameSpace" value="gemf"/>
<Numeric name="n" value="18"/>
<Numeric name="startCopyNo" value="1"/>
<Numeric name="incrCopyNo" value="2"/>
<Numeric name="invert" value="1"/>
<Numeric name="stepAngle" value="-20*deg"/>
<Numeric name="startAngle" value="180*deg"/>
<Numeric name="stepAngle" value="20*deg"/>
<Numeric name="startAngle" value="0*deg"/>
<Numeric name="rPosition" value="[rPos]"/>
<Numeric name="zoffset" value=" -9.70*mm"/>
</Algorithm>
Expand Down Expand Up @@ -953,6 +927,32 @@
<Numeric name="rPosition" value="[rPos]"/>
<Numeric name="zoffset" value="-28.90*mm"/>
</Algorithm>
<Algorithm name="muon:DDGEMAngular">
<rParent name="gem11:GEMDisk11N"/>
<String name="ChildName" value="GEMBox11S"/>
<String name="RotNameSpace" value="gemf"/>
<Numeric name="n" value="18"/>
<Numeric name="startCopyNo" value="2"/>
<Numeric name="incrCopyNo" value="2"/>
<Numeric name="invert" value="1"/>
<Numeric name="stepAngle" value="-20*deg"/>
<Numeric name="startAngle" value="180*deg"/>
<Numeric name="rPosition" value="[rPos]"/>
<Numeric name="zoffset" value="+28.70*mm"/>
</Algorithm>
<Algorithm name="muon:DDGEMAngular">
<rParent name="gem11:GEMDisk11N"/>
<String name="ChildName" value="GEMBox11S"/>
<String name="RotNameSpace" value="gemf"/>
<Numeric name="n" value="18"/>
<Numeric name="startCopyNo" value="1"/>
<Numeric name="incrCopyNo" value="2"/>
<Numeric name="invert" value="1"/>
<Numeric name="stepAngle" value="-20*deg"/>
<Numeric name="startAngle" value="180*deg"/>
<Numeric name="rPosition" value="[rPos]"/>
<Numeric name="zoffset" value=" -9.70*mm"/>
</Algorithm>

</DDDefinition>

64 changes: 32 additions & 32 deletions Geometry/MuonCommonData/data/v3/gem11.xml
View file
Open in desktop
Expand Up @@ -956,32 +956,6 @@
</PosPart>
</PosPartSection>

<Algorithm name="muon:DDGEMAngular">
<rParent name="gem11:GEMDisk11P"/>
<String name="ChildName" value="GEMBox11S"/>
<String name="RotNameSpace" value="gemf"/>
<Numeric name="n" value="18"/>
<Numeric name="startCopyNo" value="2"/>
<Numeric name="incrCopyNo" value="2"/>
<Numeric name="invert" value="1"/>
<Numeric name="stepAngle" value="20*deg"/>
<Numeric name="startAngle" value="0*deg"/>
<Numeric name="rPosition" value="[rPos]"/>
<Numeric name="zoffset" value="+28.70*mm"/>
</Algorithm>
<Algorithm name="muon:DDGEMAngular">
<rParent name="gem11:GEMDisk11P"/>
<String name="ChildName" value="GEMBox11S"/>
<String name="RotNameSpace" value="gemf"/>
<Numeric name="n" value="18"/>
<Numeric name="startCopyNo" value="1"/>
<Numeric name="incrCopyNo" value="2"/>
<Numeric name="invert" value="1"/>
<Numeric name="stepAngle" value="20*deg"/>
<Numeric name="startAngle" value="0*deg"/>
<Numeric name="rPosition" value="[rPos]"/>
<Numeric name="zoffset" value=" -9.70*mm"/>
</Algorithm>
<Algorithm name="muon:DDGEMAngular">
<rParent name="gem11:GEMDisk11P"/>
<String name="ChildName" value="GEMBox11S"/>
Expand Down Expand Up @@ -1009,28 +983,28 @@
<Numeric name="zoffset" value="-28.90*mm"/>
</Algorithm>
<Algorithm name="muon:DDGEMAngular">
<rParent name="gem11:GEMDisk11N"/>
<rParent name="gem11:GEMDisk11P"/>
<String name="ChildName" value="GEMBox11S"/>
<String name="RotNameSpace" value="gemf"/>
<Numeric name="n" value="18"/>
<Numeric name="startCopyNo" value="2"/>
<Numeric name="incrCopyNo" value="2"/>
<Numeric name="invert" value="1"/>
<Numeric name="stepAngle" value="-20*deg"/>
<Numeric name="startAngle" value="180*deg"/>
<Numeric name="stepAngle" value="20*deg"/>
<Numeric name="startAngle" value="0*deg"/>
<Numeric name="rPosition" value="[rPos]"/>
<Numeric name="zoffset" value="+28.70*mm"/>
</Algorithm>
<Algorithm name="muon:DDGEMAngular">
<rParent name="gem11:GEMDisk11N"/>
<rParent name="gem11:GEMDisk11P"/>
<String name="ChildName" value="GEMBox11S"/>
<String name="RotNameSpace" value="gemf"/>
<Numeric name="n" value="18"/>
<Numeric name="startCopyNo" value="1"/>
<Numeric name="incrCopyNo" value="2"/>
<Numeric name="invert" value="1"/>
<Numeric name="stepAngle" value="-20*deg"/>
<Numeric name="startAngle" value="180*deg"/>
<Numeric name="stepAngle" value="20*deg"/>
<Numeric name="startAngle" value="0*deg"/>
<Numeric name="rPosition" value="[rPos]"/>
<Numeric name="zoffset" value=" -9.70*mm"/>
</Algorithm>
Expand Down Expand Up @@ -1060,6 +1034,32 @@
<Numeric name="rPosition" value="[rPos]"/>
<Numeric name="zoffset" value="-28.90*mm"/>
</Algorithm>
<Algorithm name="muon:DDGEMAngular">
<rParent name="gem11:GEMDisk11N"/>
<String name="ChildName" value="GEMBox11S"/>
<String name="RotNameSpace" value="gemf"/>
<Numeric name="n" value="18"/>
<Numeric name="startCopyNo" value="2"/>
<Numeric name="incrCopyNo" value="2"/>
<Numeric name="invert" value="1"/>
<Numeric name="stepAngle" value="-20*deg"/>
<Numeric name="startAngle" value="180*deg"/>
<Numeric name="rPosition" value="[rPos]"/>
<Numeric name="zoffset" value="+28.70*mm"/>
</Algorithm>
<Algorithm name="muon:DDGEMAngular">
<rParent name="gem11:GEMDisk11N"/>
<String name="ChildName" value="GEMBox11S"/>
<String name="RotNameSpace" value="gemf"/>
<Numeric name="n" value="18"/>
<Numeric name="startCopyNo" value="1"/>
<Numeric name="incrCopyNo" value="2"/>
<Numeric name="invert" value="1"/>
<Numeric name="stepAngle" value="-20*deg"/>
<Numeric name="startAngle" value="180*deg"/>
<Numeric name="rPosition" value="[rPos]"/>
<Numeric name="zoffset" value=" -9.70*mm"/>
</Algorithm>

</DDDefinition>

12 changes: 6 additions & 6 deletions Geometry/MuonCommonData/data/v4/gem11.xml
View file
Open in desktop
Expand Up @@ -254,11 +254,11 @@
<Trd1 name="GFA103" dz="[dzS3]" dy1="[dyGap3]" dy2="[dyGap3]" dx1="[dx31]" dx2="[dx32]" />
<Trd1 name="GFA104" dz="[dzS4]" dy1="[dyGap3]" dy2="[dyGap3]" dx1="[dx41]" dx2="[dx42]" />
<Trd1 name="GFA105" dz="[dzS5]" dy1="[dyGap3]" dy2="[dyGap3]" dx1="[dx51]" dx2="[dx52]" />
<Trd1 name="GFA106" dz="[dzS6]" dy1="[dyGap3]" dy2="[dyGap3]" dx1="[dx61]" dx2="[dx62]" />
<Trd1 name="GFA107" dz="[dzS7]" dy1="[dyGap3]" dy2="[dyGap3]" dx1="[dx71]" dx2="[dx72]" />
<Trd1 name="GFA108" dz="[dzS8]" dy1="[dyGap3]" dy2="[dyGap3]" dx1="[dx81]" dx2="[dx82]" />
<Trd1 name="GFA109" dz="[dzS9]" dy1="[dyGap3]" dy2="[dyGap3]" dx1="[dx91]" dx2="[dx92]" />
<Trd1 name="GFA110" dz="[dzS0]" dy1="[dyGap3]" dy2="[dyGap3]" dx1="[dx01]" dx2="[dx92]" />
<Trd1 name="GFA106" dz="[dzS6]" dy1="[dyGap3]" dy2="[dyGap3]" dx1="[dx61]" dx2="[dx62]" />
<Trd1 name="GFA107" dz="[dzS7]" dy1="[dyGap3]" dy2="[dyGap3]" dx1="[dx71]" dx2="[dx72]" />
<Trd1 name="GFA108" dz="[dzS8]" dy1="[dyGap3]" dy2="[dyGap3]" dx1="[dx81]" dx2="[dx82]" />
<Trd1 name="GFA109" dz="[dzS9]" dy1="[dyGap3]" dy2="[dyGap3]" dx1="[dx91]" dx2="[dx92]" />
<Trd1 name="GFA110" dz="[dzS0]" dy1="[dyGap3]" dy2="[dyGap3]" dx1="[dx01]" dx2="[dx02]" />
<Trd1 name="GGA101" dz="[dzS1]" dy1="[dyGap2]" dy2="[dyGap2]" dx1="[dx11]" dx2="[dx12]" />
<Trd1 name="GGA102" dz="[dzS2]" dy1="[dyGap2]" dy2="[dyGap2]" dx1="[dx21]" dx2="[dx22]" />
<Trd1 name="GGA103" dz="[dzS3]" dy1="[dyGap2]" dy2="[dyGap2]" dx1="[dx31]" dx2="[dx32]" />
Expand All @@ -268,7 +268,7 @@
<Trd1 name="GGA107" dz="[dzS7]" dy1="[dyGap2]" dy2="[dyGap2]" dx1="[dx71]" dx2="[dx72]" />
<Trd1 name="GGA108" dz="[dzS8]" dy1="[dyGap2]" dy2="[dyGap2]" dx1="[dx81]" dx2="[dx82]" />
<Trd1 name="GGA109" dz="[dzS9]" dy1="[dyGap2]" dy2="[dyGap2]" dx1="[dx91]" dx2="[dx92]" />
<Trd1 name="GGA110" dz="[dzS0]" dy1="[dyGap2]" dy2="[dyGap2]" dx1="[dx01]" dx2="[dx92]" />
<Trd1 name="GGA110" dz="[dzS0]" dy1="[dyGap2]" dy2="[dyGap2]" dx1="[dx01]" dx2="[dx02]" />
<Trd1 name="GHA101" dz="[dzS1]" dy1="[dyGap1]" dy2="[dyGap1]" dx1="[dx11]" dx2="[dx12]" />
<Trd1 name="GHA102" dz="[dzS2]" dy1="[dyGap1]" dy2="[dyGap1]" dx1="[dx21]" dx2="[dx22]" />
<Trd1 name="GHA103" dz="[dzS3]" dy1="[dyGap1]" dy2="[dyGap1]" dx1="[dx31]" dx2="[dx32]" />
Expand Down
64 changes: 32 additions & 32 deletions Geometry/MuonCommonData/data/v5/gem11.xml
View file
Open in desktop
Expand Up @@ -888,32 +888,6 @@
</PosPart>
</PosPartSection>

<Algorithm name="muon:DDGEMAngular">
<rParent name="gem11:GEMDisk11P"/>
<String name="ChildName" value="GEMBox11S"/>
<String name="RotNameSpace" value="gemf"/>
<Numeric name="n" value="18"/>
<Numeric name="startCopyNo" value="2"/>
<Numeric name="incrCopyNo" value="2"/>
<Numeric name="invert" value="1"/>
<Numeric name="stepAngle" value="20*deg"/>
<Numeric name="startAngle" value="0*deg"/>
<Numeric name="rPosition" value="[rPos]"/>
<Numeric name="zoffset" value="+28.70*mm"/>
</Algorithm>
<Algorithm name="muon:DDGEMAngular">
<rParent name="gem11:GEMDisk11P"/>
<String name="ChildName" value="GEMBox11S"/>
<String name="RotNameSpace" value="gemf"/>
<Numeric name="n" value="18"/>
<Numeric name="startCopyNo" value="1"/>
<Numeric name="incrCopyNo" value="2"/>
<Numeric name="invert" value="1"/>
<Numeric name="stepAngle" value="20*deg"/>
<Numeric name="startAngle" value="0*deg"/>
<Numeric name="rPosition" value="[rPos]"/>
<Numeric name="zoffset" value=" -9.70*mm"/>
</Algorithm>
<Algorithm name="muon:DDGEMAngular">
<rParent name="gem11:GEMDisk11P"/>
<String name="ChildName" value="GEMBox11S"/>
Expand Down Expand Up @@ -941,28 +915,28 @@
<Numeric name="zoffset" value="-28.90*mm"/>
</Algorithm>
<Algorithm name="muon:DDGEMAngular">
<rParent name="gem11:GEMDisk11N"/>
<rParent name="gem11:GEMDisk11P"/>
<String name="ChildName" value="GEMBox11S"/>
<String name="RotNameSpace" value="gemf"/>
<Numeric name="n" value="18"/>
<Numeric name="startCopyNo" value="2"/>
<Numeric name="incrCopyNo" value="2"/>
<Numeric name="invert" value="1"/>
<Numeric name="stepAngle" value="-20*deg"/>
<Numeric name="startAngle" value="180*deg"/>
<Numeric name="stepAngle" value="20*deg"/>
<Numeric name="startAngle" value="0*deg"/>
<Numeric name="rPosition" value="[rPos]"/>
<Numeric name="zoffset" value="+28.70*mm"/>
</Algorithm>
<Algorithm name="muon:DDGEMAngular">
<rParent name="gem11:GEMDisk11N"/>
<rParent name="gem11:GEMDisk11P"/>
<String name="ChildName" value="GEMBox11S"/>
<String name="RotNameSpace" value="gemf"/>
<Numeric name="n" value="18"/>
<Numeric name="startCopyNo" value="1"/>
<Numeric name="incrCopyNo" value="2"/>
<Numeric name="invert" value="1"/>
<Numeric name="stepAngle" value="-20*deg"/>
<Numeric name="startAngle" value="180*deg"/>
<Numeric name="stepAngle" value="20*deg"/>
<Numeric name="startAngle" value="0*deg"/>
<Numeric name="rPosition" value="[rPos]"/>
<Numeric name="zoffset" value=" -9.70*mm"/>
</Algorithm>
Expand Down Expand Up @@ -992,5 +966,31 @@
<Numeric name="rPosition" value="[rPos]"/>
<Numeric name="zoffset" value="-28.90*mm"/>
</Algorithm>
<Algorithm name="muon:DDGEMAngular">
<rParent name="gem11:GEMDisk11N"/>
<String name="ChildName" value="GEMBox11S"/>
<String name="RotNameSpace" value="gemf"/>
<Numeric name="n" value="18"/>
<Numeric name="startCopyNo" value="2"/>
<Numeric name="incrCopyNo" value="2"/>
<Numeric name="invert" value="1"/>
<Numeric name="stepAngle" value="-20*deg"/>
<Numeric name="startAngle" value="180*deg"/>
<Numeric name="rPosition" value="[rPos]"/>
<Numeric name="zoffset" value="+28.70*mm"/>
</Algorithm>
<Algorithm name="muon:DDGEMAngular">
<rParent name="gem11:GEMDisk11N"/>
<String name="ChildName" value="GEMBox11S"/>
<String name="RotNameSpace" value="gemf"/>
<Numeric name="n" value="18"/>
<Numeric name="startCopyNo" value="1"/>
<Numeric name="incrCopyNo" value="2"/>
<Numeric name="invert" value="1"/>
<Numeric name="stepAngle" value="-20*deg"/>
<Numeric name="startAngle" value="180*deg"/>
<Numeric name="rPosition" value="[rPos]"/>
<Numeric name="zoffset" value=" -9.70*mm"/>
</Algorithm>

</DDDefinition>