Skip to content

Commit

Permalink
Merge pull request #8995 from pietverwilligen/IdealGeometry2015Muon
Browse files Browse the repository at this point in the history 
Ideal geometry2015 muon
  • Loading branch information
@davidlange6
davidlange6 committed May 29, 2015
2 parents 9dfb003 + a461e51 commit c3a6214
Show file tree
Hide file tree
Showing 14 changed files with 896 additions and 12 deletions.
9 changes: 9 additions & 0 deletions Configuration/Geometry/python/GeometryExtended2015MuonGEMDevReco_cff.py
View file
@@ -0,0 +1,9 @@
import FWCore.ParameterSet.Config as cms

# Ideal geometry, needed for transient ECAL alignement
from Configuration.Geometry.GeometryExtended2015MuonGEMDev_cff import *
from Configuration.Geometry.GeometryReco_cff import *

from Geometry.GEMGeometryBuilder.gemGeometry_cfi import *
from Geometry.GEMGeometryBuilder.me0Geometry_cfi import *
from Geometry.RPCGeometryBuilder.rpcGeometry_cfi import *
9 changes: 9 additions & 0 deletions Configuration/Geometry/python/GeometryExtended2015MuonGEMDev_cff.py
View file
@@ -0,0 +1,9 @@
import FWCore.ParameterSet.Config as cms

#
# Geometry master configuration
#
# Ideal geometry, needed for simulation
from Geometry.CMSCommonData.cmsExtendedGeometry2015MuonGEMDevXML_cfi import *
from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *

7 changes: 6 additions & 1 deletion Fireworks/Geometry/python/dumpRecoGeometry_cfg.py
View file
Expand Up @@ -71,7 +71,12 @@ def recoGeoLoad(score):
# Automatic addition of the customisation function from SLHCUpgradeSimulations.Configuration.combinedCustoms
#from SLHCUpgradeSimulations.Configuration.combinedCustoms import cust_2023Muon
#call to customisation function cust_2023Muon imported from SLHCUpgradeSimulations.Configuration.combinedCustoms
# process = cust_2023Muon(process)
#process = cust_2023Muon(process)

elif score == "GEMDev":
from Configuration.AlCa.autoCond import autoCond
process.GlobalTag.globaltag = autoCond['mc']
process.load('Configuration.Geometry.GeometryExtended2015MuonGEMDevReco_cff')

elif score == "SLHCDB": # orig dumpFWRecoSLHCGeometry_cfg.py
process.GlobalTag.globaltag = 'DESIGN42_V17::All'
Expand Down
117 changes: 117 additions & 0 deletions Geometry/CMSCommonData/data/PhaseII/cms.xml
View file
@@ -0,0 +1,117 @@
<?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="cms.xml" eval="true">
<Constant name="Rmin" value="[cmsextent:Rmin]"/>
<Constant name="Zmin" value="[cmsextent:Zmin]"/>
<Constant name="HallZ" value="[cmsextent:HallZ]"/>
<Constant name="HallR" value="[cmsextent:HallR]"/>
<Constant name="HallRMax" value="[cmsextent:HallRMax]"/>
<Constant name="CMSR1" value="[cmsextent:CMSR1]"/>
<Constant name="CMSR2" value="[cmsextent:CMSR2]"/>
<Constant name="CMSZ1" value="[cmsextent:CMSZ1]"/>
<Constant name="CMSZ2" value="[cmsextent:CMSZ2]"/>
<Constant name="TrackCalorR" value="1.233*m"/>
<Constant name="CalorMuonR" value="2.950*m"/>
<Constant name="CalorMuonR2" value="2.810*m"/> <!-- added for Muon Phase-2; only diff wrt /data/cms.xml -->
<Constant name="TrackBeamZ1" value="1.948*m"/>
<Constant name="TrackBeamZ2" value="2.935*m"/>
<Constant name="TrackBeamR1" value="3.15*cm"/>
<Constant name="TrackBeamR2" value="7.40*cm"/>
<Constant name="TrackLumiR1" value="7.70*cm"/>
<Constant name="CalorBeamZ1" value="3.180*m"/>
<Constant name="CalorBeamZ2" value="5.541*m"/>
<Constant name="CalorBeamZ3" value="5.245*m"/> <!-- added for Muon Phase-2; only diff wrt /data/cms.xml -->
<Constant name="CalorBeamR1" value="8.00*cm"/>
<Constant name="CalorBeamR2" value="8.93*cm"/>
<Constant name="MuonBeamZ0" value="6.50*m"/>
<Constant name="MuonBeamZ1" value="7.499*m"/>
<Constant name="MuonBeamZ2" value="10.86*m"/>
<Constant name="MuonBeamR0" value="10.50*cm"/>
<Constant name="MuonBeamR1" value="11.785*cm"/>
<Constant name="MuonBeamR2" value="76.80*cm"/>
<Constant name="TotemMuonZ1" value="10.165*m"/>
<Constant name="TotemMuonZ2" value="10.50*m"/>
<Constant name="TotemMuonR1" value="1.0411*m"/>
<Constant name="TotemMuonR2" value="1.1300*m"/>
<Constant name="TotemBeamZ1" value="7.9500*m"/>
<Constant name="TotemBeamZ2" value="13.381*m"/>
<Constant name="TotemBeamZ3" value="13.439*m"/>
<Constant name="TotemBeamZ4" value="13.465*m"/>
<Constant name="TotemBeamR1" value="11.785*cm"/>
<Constant name="TotemBeamR2" value="12.15*cm"/>
<Constant name="TotemBeamR3" value="12.20*cm"/>
<Constant name="TotemBeamR4" value="3.675*cm"/>
<Constant name="TotemBeamR5" value="3.575*cm"/>
<Constant name="ForwdBeamZ1" value="10.539*m"/>
<Constant name="ForwdBeamZ2" value="13.109*m"/>
<Constant name="ForwdBeamZ3" value="13.290*m"/>
<Constant name="ForwdBeamZ4" value="16.0305*m"/>
<Constant name="ForwdBeamZ5" value="16.424*m"/>
<Constant name="ForwdBeamZ6" value="17.058*m"/>
<Constant name="ForwdBeamZ7" value="17.920*m"/>
<Constant name="ForwdBeamZ8" value="18.562*m"/>
<Constant name="ForwdBeamZ9" value="18.905*m"/>
<Constant name="ForwdBeamR0" value="15.95*cm"/>
<Constant name="ForwdBeamR1" value="12.495*cm"/>
<Constant name="ForwdBeamR2" value="12.50*cm"/>
<Constant name="ForwdBeamR3" value="25.0*cm"/>
<Constant name="ForwdBeamR4" value="2.85*cm"/>
<Constant name="ForwdBeamR5" value="7.50*cm"/>
<Constant name="ForwdBeamR6" value="20.5*cm"/>
<Constant name="ForwdBeamR7" value="4.00*cm"/>
<Constant name="ForwdBeamR8" value="2.15*cm"/>
<Constant name="ForwdVcalZ1" value="11.1495*m"/>
<Constant name="ForwdVcalZ2" value="12.8005*m"/>
<Constant name="ForwdVcalR1" value="1.595*m"/>
<Constant name="ForwdDetsZ1" value="16.0065*m"/>
<Constant name="ForwdDetsR1" value="33.00*cm"/>
<Constant name="MBarRmin" value="3.80*m"/>
<Constant name="MBarRmax" value="8.05*m"/>
<Constant name="MBarZ" value="6.61*m"/>
<Constant name="MBRingZ" value="1.268*m"/>
<Constant name="MBRing1Zpos" value="2.686*m"/>
<Constant name="MBRing2Zpos" value="5.342*m"/>
<Constant name="MEndcapZ0" value="6.59*m"/>
<Constant name="MEndcapZ1" value="6.835*m"/>
<Constant name="MERmin0" value="66.569*cm"/>
<Constant name="MERmin1" value="67.50*cm"/>
<Constant name="MERmin2" value="70.00*cm"/>
<Constant name="MERmin3" value="108.60*cm"/>
</ConstantsSection>
<SolidSection label="cms.xml">
<Polycone name="OCMS" startPhi="0*deg" deltaPhi="360*deg">
<ZSection z="-[CMSZ1]" rMin="[Rmin]" rMax="[CMSR2]"/>
<ZSection z="-[HallZ]" rMin="[Rmin]" rMax="[CMSR2]"/>
<ZSection z="-[HallZ]" rMin="[Rmin]" rMax="[HallRMax]"/>
<ZSection z="[HallZ]" rMin="[Rmin]" rMax="[HallRMax]"/>
<ZSection z="[HallZ]" rMin="[Rmin]" rMax="[CMSR2]"/>
<ZSection z="[CMSZ1]" rMin="[Rmin]" rMax="[CMSR2]"/>
</Polycone>
<Polycone name="CMSE" startPhi="0*deg" deltaPhi="360*deg">
<ZSection z="-[CMSZ1]" rMin="[Rmin]" rMax="[CMSR2]"/>
<ZSection z="-[CMSZ2]" rMin="[Rmin]" rMax="[CMSR2]"/>
<ZSection z="-[CMSZ2]" rMin="[Rmin]" rMax="[CMSR1]"/>
<ZSection z="[CMSZ2]" rMin="[Rmin]" rMax="[CMSR1]"/>
<ZSection z="[CMSZ2]" rMin="[Rmin]" rMax="[CMSR2]"/>
<ZSection z="[CMSZ1]" rMin="[Rmin]" rMax="[CMSR2]"/>
</Polycone>
</SolidSection>
<LogicalPartSection label="cms.xml">
<LogicalPart name="World" category="unspecified">
<rSolid name="OCMS"/>
<rMaterial name="materials:Air"/>
</LogicalPart>
<LogicalPart name="OCMS" category="unspecified">
<rSolid name="OCMS"/>
<rMaterial name="materials:Air"/>
</LogicalPart>
<LogicalPart name="MCMS" category="unspecified">
<rSolid name="OCMS"/>
<rMaterial name="materials:Air"/>
</LogicalPart>
<LogicalPart name="CMSE" category="unspecified">
<rSolid name="CMSE"/>
<rMaterial name="materials:Air"/>
</LogicalPart>
</LogicalPartSection>
</DDDefinition>
79 changes: 79 additions & 0 deletions Geometry/CMSCommonData/data/PhaseII/muonBase.xml
View file
@@ -0,0 +1,79 @@
<?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="muonBase.xml">
<Tubs name="MUON1" rMin="[cms:CalorMuonR]" rMax="[cms:CMSR1]" dz="[cms:MuonBeamZ2]" startPhi="0*deg" deltaPhi="360*deg"/>
<Polycone name="MUON2" startPhi="0*deg" deltaPhi="360*deg">
<ZSection z="-[cms:MuonBeamZ2]" rMin="[cms:MERmin3]" rMax="[cms:CalorMuonR]"/>
<ZSection z="-[cms:TotemMuonZ2]" rMin="[cms:MERmin3]" rMax="[cms:CalorMuonR]"/>
<ZSection z="-[cms:TotemMuonZ2]" rMin="[cms:TotemMuonR2]" rMax="[cms:CalorMuonR]"/>
<ZSection z="-[cms:TotemMuonZ1]" rMin="[cms:TotemMuonR2]" rMax="[cms:CalorMuonR]"/>
<ZSection z="-[cms:TotemMuonZ1]" rMin="[cms:TotemMuonR1]" rMax="[cms:CalorMuonR]"/>
<ZSection z="-[cms:MEndcapZ1]" rMin="[cms:MERmin2]" rMax="[cms:CalorMuonR]"/>
<ZSection z="-[cms:MBarZ]" rMin="[cms:MERmin1]" rMax="[cms:CalorMuonR]"/>
<ZSection z="-[cms:MEndcapZ0]" rMin="[cms:MERmin1]" rMax="[cms:CalorMuonR]"/>
<ZSection z="-[cms:MuonBeamZ0]" rMin="[cms:MuonBeamR0]" rMax="[cms:CalorMuonR]"/>
<ZSection z="-[cms:CalorBeamZ2]" rMin="[cms:CalorBeamR2]" rMax="[cms:CalorMuonR]"/>
<ZSection z="-[cms:CalorBeamZ2]" rMin="[cms:CalorBeamR2]" rMax="[cms:CalorMuonR2]"/>
<ZSection z="-[cms:CalorBeamZ3]" rMin="[cms:CalorBeamR2]" rMax="[cms:CalorMuonR2]"/>
</Polycone>
<Polycone name="MUON3" startPhi="0*deg" deltaPhi="360*deg">
<ZSection z="[cms:CalorBeamZ3]" rMin="[cms:CalorBeamR2]" rMax="[cms:CalorMuonR2]"/>
<ZSection z="[cms:CalorBeamZ2]" rMin="[cms:CalorBeamR2]" rMax="[cms:CalorMuonR2]"/>
<ZSection z="[cms:CalorBeamZ2]" rMin="[cms:CalorBeamR2]" rMax="[cms:CalorMuonR]"/>
<ZSection z="[cms:MuonBeamZ0]" rMin="[cms:MuonBeamR0]" rMax="[cms:CalorMuonR]"/>
<ZSection z="[cms:MEndcapZ0]" rMin="[cms:MERmin1]" rMax="[cms:CalorMuonR]"/>
<ZSection z="[cms:MBarZ]" rMin="[cms:MERmin1]" rMax="[cms:CalorMuonR]"/>
<ZSection z="[cms:MEndcapZ1]" rMin="[cms:MERmin2]" rMax="[cms:CalorMuonR]"/>
<ZSection z="[cms:TotemMuonZ1]" rMin="[cms:TotemMuonR1]" rMax="[cms:CalorMuonR]"/>
<ZSection z="[cms:TotemMuonZ1]" rMin="[cms:TotemMuonR2]" rMax="[cms:CalorMuonR]"/>
<ZSection z="[cms:TotemMuonZ2]" rMin="[cms:TotemMuonR2]" rMax="[cms:CalorMuonR]"/>
<ZSection z="[cms:TotemMuonZ2]" rMin="[cms:MERmin3]" rMax="[cms:CalorMuonR]"/>
<ZSection z="[cms:MuonBeamZ2]" rMin="[cms:MERmin3]" rMax="[cms:CalorMuonR]"/>
</Polycone>
<UnionSolid name="MUON0">
<rSolid name="MUON1"/>
<rSolid name="MUON2"/>
<Translation x="0.0*fm" y="0.0*fm" z="0.0*fm"/>
</UnionSolid>
<UnionSolid name="MUON">
<rSolid name="MUON0"/>
<rSolid name="MUON3"/>
<Translation x="0.0*fm" y="0.0*fm" z="0.0*fm"/>
</UnionSolid>
<Tubs name="MB" rMin="[cms:MBarRmin]" rMax="[cms:CMSR1]" dz="[cms:MBarZ]" startPhi="0*deg" deltaPhi="360*deg"/>
<Tubs name="MBWheel" rMin="[cms:MBarRmin]" rMax="[cms:MBarRmax]" dz="[cms:MBRingZ]" startPhi="0*deg" deltaPhi="360*deg"/>
</SolidSection>

<LogicalPartSection label="muonBase.xml">
<LogicalPart name="MUON" category="unspecified">
<rSolid name="MUON"/>
<rMaterial name="materials:Air"/>
</LogicalPart>
<LogicalPart name="MB" category="unspecified">
<rSolid name="MB"/>
<rMaterial name="materials:M_B_Air"/>
</LogicalPart>
<LogicalPart name="MBWheel_0" category="unspecified">
<rSolid name="MBWheel"/>
<rMaterial name="materials:M_B_Air"/>
</LogicalPart>
<LogicalPart name="MBWheel_1P" category="unspecified">
<rSolid name="MBWheel"/>
<rMaterial name="materials:M_B_Air"/>
</LogicalPart>
<LogicalPart name="MBWheel_2P" category="unspecified">
<rSolid name="MBWheel"/>
<rMaterial name="materials:M_B_Air"/>
</LogicalPart>
<LogicalPart name="MBWheel_1N" category="unspecified">
<rSolid name="MBWheel"/>
<rMaterial name="materials:M_B_Air"/>
</LogicalPart>
<LogicalPart name="MBWheel_2N" category="unspecified">
<rSolid name="MBWheel"/>
<rMaterial name="materials:M_B_Air"/>
</LogicalPart>
</LogicalPartSection>

</DDDefinition>

0 comments on commit c3a6214

Please sign in to comment.