Skip to content

Commit

Permalink
Merge pull request #31367 from bsunanda/Phase2-gem53
Browse files Browse the repository at this point in the history
Phase2-gem53 Preparation for a new muon scenario with GE0 rather than ME0
  • Loading branch information
cmsbuild authored Sep 9, 2020
2 parents 29368d3 + 8c7e86f commit 5b573a1
Show file tree
Hide file tree
Showing 12 changed files with 1,463 additions and 43 deletions.
29 changes: 29 additions & 0 deletions Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<?xml version="1.0"?>
<DDDefinition>
<SpecParSection label="GEMSpecs.xml">
<SpecPar name="nStripsGE0" eval="true">
<PartSelector path="//GHA0.."/>
<Parameter name="nStrips" value="384"/>
</SpecPar>
<SpecPar name="nStripsGE11" eval="true">
<PartSelector path="//GHA1.."/>
<Parameter name="nStrips" value="384"/>
</SpecPar>
<SpecPar name="nStripsGE21" eval="true">
<PartSelector path="//GHA2.."/>
<Parameter name="nStrips" value="384"/>
</SpecPar>
<SpecPar name="nPadsGE0" eval="true">
<PartSelector path="//GHA0.."/>
<Parameter name="nPads" value="192"/>
</SpecPar>
<SpecPar name="nPadsGE11" eval="true">
<PartSelector path="//GHA1.."/>
<Parameter name="nPads" value="192"/>
</SpecPar>
<SpecPar name="nPadsGE21" eval="true">
<PartSelector path="//GHA2.."/>
<Parameter name="nPads" value="384"/>
</SpecPar>
</SpecParSection>
</DDDefinition>
19 changes: 19 additions & 0 deletions Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?xml version="1.0"?>
<DDDefinition>
<SpecParSection label="GEMSpecsFilter.xml">
<SpecPar name="MuonGEMTree">
<PartSelector path="//GEMBox11L"/>
<PartSelector path="//GSAX11L"/>
<PartSelector path="//GEMBox11S"/>
<PartSelector path="//GSAX11S"/>
<PartSelector path="//GHA1..*"/>
<PartSelector path="//GEMBox21.*"/>
<PartSelector path="//GSAX21.*"/>
<PartSelector path="//GHA2..*"/>
<PartSelector path="//GE0Box"/>
<PartSelector path="//GE0L"/>
<PartSelector path="//GHA0..*"/>
<Parameter name="MuStructure" value="MuonEndCapGEM"/>
</SpecPar>
</SpecParSection>
</DDDefinition>
26 changes: 13 additions & 13 deletions Geometry/MuonCommonData/data/dd4hep/testGE0XML.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
<Include ref='Geometry/CMSCommonData/data/rotations.xml'/>
<Include ref='Geometry/CMSCommonData/data/extend/v2/cmsextent.xml'/>
<Include ref='Geometry/CMSCommonData/data/cavernData/2021/v1/cavernData.xml'/>
<Include ref='Geometry/CMSCommonData/data/cms/2026/v3/cms.xml'/>
<Include ref='Geometry/CMSCommonData/data/cms/2026/v5/cms.xml'/>
<Include ref='Geometry/CMSCommonData/data/cmsMother.xml'/>
<Include ref='Geometry/CMSCommonData/data/eta3/etaMax.xml'/>
<Include ref='Geometry/CMSCommonData/data/caloBase/2026/v2/caloBase.xml'/>
<Include ref='Geometry/CMSCommonData/data/caloBase/2026/v5/caloBase.xml'/>
<Include ref='Geometry/CMSCommonData/data/cmsCalo.xml'/>
<Include ref='Geometry/CMSCommonData/data/muonBase/2026/v3/muonBase.xml'/>
<Include ref='Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml'/>
<Include ref='Geometry/CMSCommonData/data/cmsMuon.xml'/>
<Include ref='Geometry/CMSCommonData/data/mgnt.xml'/>
<Include ref='Geometry/CMSCommonData/data/muonMB.xml'/>
Expand All @@ -24,23 +24,23 @@
<Include ref='Geometry/MuonCommonData/data/mb3/2015/v2/mb3.xml'/>
<Include ref='Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml'/>
<Include ref='Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml'/>
<Include ref='Geometry/MuonCommonData/data/muonYoke/2021/v2/muonYoke.xml'/>
<Include ref='Geometry/MuonCommonData/data/csc/2021/v1/csc.xml'/>
<Include ref='Geometry/MuonCommonData/data/mf/2026/v4/mf.xml'/>
<Include ref='Geometry/MuonCommonData/data/rpcf/2026/v2/rpcf.xml'/>
<Include ref='Geometry/MuonCommonData/data/muonYoke/2026/v1/muonYoke.xml'/>
<Include ref='Geometry/MuonCommonData/data/mf/2026/v7/mf.xml'/>
<Include ref='Geometry/MuonCommonData/data/csc/2021/v2/csc.xml'/>
<Include ref='Geometry/MuonCommonData/data/rpcf/2026/v3/rpcf.xml'/>
<Include ref='Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml'/>
<Include ref='Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml'/>
<Include ref='Geometry/MuonCommonData/data/gem21/TDR_Dev/gem21.xml'/>
<Include ref='Geometry/MuonCommonData/data/mfshield/2026/v2/mfshield.xml'/>
<Include ref='Geometry/MuonCommonData/data/ge0/TDR_Dev/v2/ge0.xml'/>
<Include ref='Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v2/muonNumbering.xml'/>
<Include ref='Geometry/MuonCommonData/data/gem21/TDR_Eta16/gem21.xml'/>
<Include ref='Geometry/MuonCommonData/data/mfshield/2026/v5/mfshield.xml'/>
<Include ref='Geometry/MuonCommonData/data/ge0/TDR_Dev/v3/ge0.xml'/>
<Include ref='Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/v3/muonNumbering.xml'/>
<Include ref='Geometry/MuonSimData/data/PhaseII/v2/muonSens.xml'/>
<Include ref='Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml'/>
<Include ref='Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml'/>
<Include ref='Geometry/CSCGeometryBuilder/data/cscSpecs.xml'/>
<Include ref='Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml'/>
<Include ref='Geometry/GEMGeometryBuilder/data/v9/GEMSpecsFilter.xml'/>
<Include ref='Geometry/GEMGeometryBuilder/data/v9/GEMSpecs.xml'/>
<Include ref='Geometry/GEMGeometryBuilder/data/v12/GEMSpecsFilter.xml'/>
<Include ref='Geometry/GEMGeometryBuilder/data/v12/GEMSpecs.xml'/>
<Include ref='Geometry/MuonSimData/data/PhaseII/muonProdCuts.xml'/>
<Include ref='Geometry/CMSCommonData/data/FieldParameters.xml'/>
</IncludeSection>
Expand Down
12 changes: 6 additions & 6 deletions Geometry/MuonCommonData/data/dd4hep/testGEMXML.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@
<Include ref='Geometry/CMSCommonData/data/rotations.xml'/>
<Include ref='Geometry/CMSCommonData/data/extend/v2/cmsextent.xml'/>
<Include ref='Geometry/CMSCommonData/data/cavernData/2021/v1/cavernData.xml'/>
<Include ref='Geometry/CMSCommonData/data/cms/2026/v3/cms.xml'/>
<Include ref='Geometry/CMSCommonData/data/cms/2026/v5/cms.xml'/>
<Include ref='Geometry/CMSCommonData/data/cmsMother.xml'/>
<Include ref='Geometry/CMSCommonData/data/eta3/etaMax.xml'/>
<Include ref='Geometry/CMSCommonData/data/caloBase/2026/v2/caloBase.xml'/>
<Include ref='Geometry/CMSCommonData/data/caloBase/2026/v5/caloBase.xml'/>
<Include ref='Geometry/CMSCommonData/data/cmsCalo.xml'/>
<Include ref='Geometry/CMSCommonData/data/muonBase/2026/v3/muonBase.xml'/>
<Include ref='Geometry/CMSCommonData/data/muonBase/2026/v5/muonBase.xml'/>
<Include ref='Geometry/CMSCommonData/data/cmsMuon.xml'/>
<Include ref='Geometry/CMSCommonData/data/mgnt.xml'/>
<Include ref='Geometry/CMSCommonData/data/beampipe/2026/v1/beampipe.xml'/>
<Include ref='Geometry/CMSCommonData/data/beampipe/2026/v3/beampipe.xml'/>
<Include ref='Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml'/>
<Include ref='Geometry/CMSCommonData/data/muonMB.xml'/>
<Include ref='Geometry/CMSCommonData/data/muonMagnet.xml'/>
Expand All @@ -41,8 +41,8 @@
<Include ref='Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml'/>
<Include ref='Geometry/CSCGeometryBuilder/data/cscSpecs.xml'/>
<Include ref='Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml'/>
<Include ref='Geometry/GEMGeometryBuilder/data/v7/GEMSpecsFilter.xml'/>
<Include ref='Geometry/GEMGeometryBuilder/data/v7/GEMSpecs.xml'/>
<Include ref='Geometry/GEMGeometryBuilder/data/v11/GEMSpecsFilter.xml'/>
<Include ref='Geometry/GEMGeometryBuilder/data/v11/GEMSpecs.xml'/>
<Include ref='Geometry/MuonSimData/data/PhaseII/muonProdCuts.xml'/>
<Include ref='Geometry/CMSCommonData/data/FieldParameters.xml'/>
</IncludeSection>
Expand Down
222 changes: 222 additions & 0 deletions Geometry/MuonCommonData/data/mf/2026/v7/mf.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,222 @@
<?xml version="1.0"?>
<DDDefinition>

<ConstantsSection label="mf.xml" eval="true">
<Constant name="z1GE0" value="[cms:CalorBeamZ3]"/>
<Constant name="z2GE0" value="[cms:CalorBeamZ2]"/>
<Constant name="dzGE0" value="138.0*mm"/>
<Constant name="rMinGE0" value="[cms:CalorBeamZ4]*[etaMax:slope]"/>
<Constant name="rMaxGE0" value="[cms:CalorMuonR2]"/>
<Constant name="rMaxFGE0" value="[cms:CalorMuonR3]"/>
</ConstantsSection>

<SolidSection label="mf.xml">
<Polycone name="ME" startPhi="0*deg" deltaPhi="360*deg">
<ZSection z="[z1GE0]" rMin="[cms:CalorBeamR2]" rMax="[rMaxGE0]"/>
<ZSection z="[cms:CalorBeamZ2]" rMin="[cms:CalorBeamR2]" rMax="[rMaxGE0]"/>
<ZSection z="[cms:CalorBeamZ2]" rMin="[cms:CalorBeamR2]" rMax="[cms:CalorMuonR]"/>
<ZSection z="[cms:MuonBeamZ0]" rMin="[cms:MuonBeamR0]" rMax="[cms:CalorMuonR]"/>
<ZSection z="[cms:MuonBeamZ0]" rMin="[cms:MERmin0]" rMax="[cms:MBarRmin]"/>
<ZSection z="[cms:MEndcapZ0]" rMin="[cms:MERmin1]" rMax="[cms:MBarRmin]"/>
<ZSection z="[cms:MBarZ]" rMin="[cms:MERmin1]" rMax="[cms:MBarRmin]"/>
<ZSection z="[cms:MBarZ]" rMin="[cms:MERmin1]" rMax="[cms:CMSR4]"/>
<ZSection z="[cms:MEndcapZ1]" rMin="[cms:MERmin2]" rMax="[cms:CMSR4]"/>
<ZSection z="[cms:TotemMuonZ1]" rMin="[cms:TotemMuonR1]" rMax="[cms:CMSR4]"/>
<ZSection z="[cms:TotemMuonZ1]" rMin="[cms:TotemMuonR2]" rMax="[cms:CMSR4]"/>
<ZSection z="[cms:TotemMuonZ2]" rMin="[cms:TotemMuonR2]" rMax="[cms:CMSR4]"/>
<ZSection z="[cms:TotemMuonZ2]" rMin="[cms:MERmin3]" rMax="[cms:CMSR4]"/>
<ZSection z="[cms:MuonBeamZ2]" rMin="[cms:MERmin3]" rMax="[cms:CMSR4]"/>
</Polycone>
<Polycone name="GE0Ring" startPhi="0*deg" deltaPhi="360*deg">
<ZSection z="[z1GE0]" rMin="[rMinGE0]" rMax="[rMaxGE0]"/>
<ZSection z="[z2GE0]" rMin="[rMinGE0]" rMax="[rMaxGE0]"/>
</Polycone>
<Polycone name="ME1Ring" startPhi="0*deg" deltaPhi="360*deg">
<ZSection z="5.641*m " rMin="1.15*m" rMax="2.8*m "/>
<ZSection z="5.674*m " rMin="1.15*m" rMax="2.8*m "/>
<ZSection z="5.674*m " rMin="85*cm " rMax="2.8*m "/>
<ZSection z="6.345*m " rMin="85*cm " rMax="2.8*m "/>
</Polycone>
<Tubs name="ME12Ring" rMin="2.734*m " rMax="4.685*m " dz="311.8875*mm" startPhi="0*deg" deltaPhi="360*deg"/>
<Polyhedra name="ME13Ring" numSide="36" startPhi="355*deg" deltaPhi="360*deg">
<ZSection z="6.625*m " rMin="4.955*m " rMax="7*m "/>
<ZSection z="7.265*m " rMin="4.955*m " rMax="7*m "/>
</Polyhedra>
<Polycone name="ME2Ring" startPhi="0*deg" deltaPhi="360*deg">
<ZSection z="7865*mm" rMin="1142*mm" rMax="7020*mm"/>
<ZSection z="8509*mm" rMin="1142*mm" rMax="7020*mm"/>
<ZSection z="8509*mm" rMin="1361*mm" rMax="7020*mm"/>
<ZSection z="8510*mm" rMin="1361*mm" rMax="7020*mm"/>
</Polycone>
<Tubs name="ME3Ring" rMin="1360*mm" rMax="7.02*m " dz="32.75*cm " startPhi="0*deg" deltaPhi="360*deg"/>
<Tubs name="ME4Ring" rMin="1530*mm" rMax="7.02*m " dz="33.675*cm " startPhi="0*deg" deltaPhi="360*deg"/>
<Tubs name="RR2X" rMin="3.3015*m " rMax="6.99*m " dz="4.5*cm " startPhi="0*deg" deltaPhi="360*deg"/>
</SolidSection>

<LogicalPartSection label="mf.xml">
<LogicalPart name="MEP" category="unspecified">
<rSolid name="ME"/>
<rMaterial name="materials:M_F_Air"/>
</LogicalPart>
<LogicalPart name="MEN" category="unspecified">
<rSolid name="ME"/>
<rMaterial name="materials:M_F_Air"/>
</LogicalPart>
<LogicalPart name="GE0RingP" category="unspecified">
<rSolid name="GE0Ring"/>
<rMaterial name="materials:M_F_Air"/>
</LogicalPart>
<LogicalPart name="GE0RingN" category="unspecified">
<rSolid name="GE0Ring"/>
<rMaterial name="materials:M_F_Air"/>
</LogicalPart>
<LogicalPart name="ME1RingP" category="unspecified">
<rSolid name="ME1Ring"/>
<rMaterial name="materials:M_F_Air"/>
</LogicalPart>
<LogicalPart name="ME1RingN" category="unspecified">
<rSolid name="ME1Ring"/>
<rMaterial name="materials:M_F_Air"/>
</LogicalPart>
<LogicalPart name="ME12RingP" category="unspecified">
<rSolid name="ME12Ring"/>
<rMaterial name="materials:M_F_Air"/>
</LogicalPart>
<LogicalPart name="ME12RingN" category="unspecified">
<rSolid name="ME12Ring"/>
<rMaterial name="materials:M_F_Air"/>
</LogicalPart>
<LogicalPart name="ME13RingP" category="unspecified">
<rSolid name="ME13Ring"/>
<rMaterial name="materials:M_F_Air"/>
</LogicalPart>
<LogicalPart name="ME13RingN" category="unspecified">
<rSolid name="ME13Ring"/>
<rMaterial name="materials:M_F_Air"/>
</LogicalPart>
<LogicalPart name="ME2RingP" category="unspecified">
<rSolid name="ME2Ring"/>
<rMaterial name="materials:M_F_Air"/>
</LogicalPart>
<LogicalPart name="ME2RingN" category="unspecified">
<rSolid name="ME2Ring"/>
<rMaterial name="materials:M_F_Air"/>
</LogicalPart>
<LogicalPart name="ME3RingP" category="unspecified">
<rSolid name="ME3Ring"/>
<rMaterial name="materials:M_F_Air"/>
</LogicalPart>
<LogicalPart name="ME3RingN" category="unspecified">
<rSolid name="ME3Ring"/>
<rMaterial name="materials:M_F_Air"/>
</LogicalPart>
<LogicalPart name="ME4RingP" category="unspecified">
<rSolid name="ME4Ring"/>
<rMaterial name="materials:M_F_Air"/>
</LogicalPart>
<LogicalPart name="ME4RingN" category="unspecified">
<rSolid name="ME4Ring"/>
<rMaterial name="materials:M_F_Air"/>
</LogicalPart>
<LogicalPart name="RR2X" category="unspecified">
<rSolid name="RR2X"/>
<rMaterial name="materials:ME_free_space"/>
</LogicalPart>
</LogicalPartSection>

<PosPartSection label="mf.xml">
<PosPart copyNumber="1">
<rParent name="muonBase:MUON"/>
<rChild name="mf:MEP"/>
<rRotation name="rotations:000D"/>
</PosPart>
<PosPart copyNumber="2">
<rParent name="muonBase:MUON"/>
<rChild name="mf:MEN"/>
<rRotation name="rotations:180D"/>
</PosPart>
<PosPart copyNumber="1">
<rParent name="mf:MEP"/>
<rChild name="mf:GE0RingP"/>
</PosPart>
<PosPart copyNumber="1">
<rParent name="mf:MEN"/>
<rChild name="mf:GE0RingN"/>
</PosPart>
<PosPart copyNumber="1">
<rParent name="mf:MEP"/>
<rChild name="mf:ME1RingP"/>
</PosPart>
<PosPart copyNumber="1">
<rParent name="mf:MEN"/>
<rChild name="mf:ME1RingN"/>
</PosPart>

<PosPart copyNumber="1">
<rParent name="mf:MEP"/>
<rChild name="mf:ME12RingP"/>
<Translation x="0*fm " y="0*fm " z="6953.1125*mm"/>
</PosPart>
<PosPart copyNumber="1">
<rParent name="mf:MEN"/>
<rChild name="mf:ME12RingN"/>
<Translation x="0*fm " y="0*fm " z="6953.1125*mm"/>
</PosPart>

<PosPart copyNumber="1">
<rParent name="mf:MEP"/>
<rChild name="mf:ME13RingP"/>
</PosPart>
<PosPart copyNumber="1">
<rParent name="mf:MEN"/>
<rChild name="mf:ME13RingN"/>
</PosPart>

<PosPart copyNumber="1">
<rParent name="mf:MEP"/>
<rChild name="mf:ME2RingP"/>
<!-- <Translation x="0*fm " y="0*fm " z="8.1925*m " /> -->
</PosPart>
<PosPart copyNumber="1">
<rParent name="mf:MEN"/>
<rChild name="mf:ME2RingN"/>
<!-- <Translation x="0*fm " y="0*fm " z="8.1925*m " /> -->
</PosPart>

<PosPart copyNumber="1">
<rParent name="mf:MEP"/>
<rChild name="mf:ME3RingP"/>
<Translation x="0*fm " y="0*fm " z="9.4475*m "/>
</PosPart>
<PosPart copyNumber="1">
<rParent name="mf:MEN"/>
<rChild name="mf:ME3RingN"/>
<Translation x="0*fm " y="0*fm " z="9.4475*m "/>
</PosPart>

<PosPart copyNumber="1">
<rParent name="mf:MEP"/>
<rChild name="mf:ME4RingP"/>
<Translation x="0*fm " y="0*fm " z="10.3432*m + 0.46*cm "/>
</PosPart>
<PosPart copyNumber="1">
<rParent name="mf:MEN"/>
<rChild name="mf:ME4RingN"/>
<Translation x="0*fm " y="0*fm " z="10.3432*m + 0.46*cm "/>
</PosPart>

<PosPart copyNumber="1">
<rParent name="mf:ME2RingP"/>
<rChild name="mf:RR2X"/>
<rRotation name="rotations:R005"/>
<Translation x="0*fm " y="0*fm " z="-28.25*cm+8.1925*m "/>
</PosPart>
<PosPart copyNumber="1">
<rParent name="mf:ME2RingN"/>
<rChild name="mf:RR2X"/>
<rRotation name="rotations:R005"/>
<Translation x="0*fm " y="0*fm " z="-28.25*cm+8.1925*m "/>
</PosPart>
</PosPartSection>

</DDDefinition>
Loading

0 comments on commit 5b573a1

Please sign in to comment.