Merge pull request cms-sw#2700 from ianna/overlap-fixes-in-totem

Overlap fixes in Totem
jshlee · Mar 3, 2014 · c13fd33 · c13fd33
2 parents cf401b2 + 0238295
commit c13fd33
Show file tree

Hide file tree

Showing 44 changed files with 7,052 additions and 268 deletions.
diff --git a/Configuration/Geometry/python/GeometryExtendedPhase1Pixel10DReco_cff.py b/Configuration/Geometry/python/GeometryExtendedPhase1Pixel10DReco_cff.py
@@ -0,0 +1,33 @@
+import FWCore.ParameterSet.Config as cms
+
+# Ideal geometry, needed for transient ECAL alignement
+from Configuration.Geometry.GeometryExtendedPhase1Pixel10D_cff import *
+
+
+
+# Reconstruction geometry services
+#  Tracking Geometry
+#bah - well, this is not a cfi!
+from Geometry.CommonDetUnit.globalTrackingSLHCGeometry_cfi import *
+
+#Tracker
+from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import *
+from Geometry.TrackerNumberingBuilder.trackerTopologyConstants_cfi import *
+
+#Muon
+from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *
+from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *
+
+#  Alignment
+from Geometry.TrackerGeometryBuilder.idealForDigiTrackerSLHCGeometry_cff import *
+from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import *
+from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *
+trackerSLHCGeometry.applyAlignment = cms.bool(False)
+
+#  Calorimeters
+from Geometry.CaloEventSetup.CaloTopology_cfi import *
+from Geometry.CaloEventSetup.CaloGeometry_cff import *
+from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import *
+from Geometry.EcalMapping.EcalMapping_cfi import *
+from Geometry.EcalMapping.EcalMappingRecord_cfi import *
+from Geometry.HcalCommonData.hcalRecNumberingInitialization_cfi import *
diff --git a/Configuration/Geometry/python/GeometryExtendedPhase1Pixel10D_cff.py b/Configuration/Geometry/python/GeometryExtendedPhase1Pixel10D_cff.py
@@ -0,0 +1,9 @@
+import FWCore.ParameterSet.Config as cms
+
+#
+# Geometry master configuration
+#
+# Ideal geometry, needed for simulation
+from Geometry.CMSCommonData.cmsExtendedGeometryPhase1Pixel10DXML_cfi import *
+from Geometry.TrackerNumberingBuilder.trackerNumberingSLHCGeometry_cfi import *
+from Geometry.HcalCommonData.hcalSimNumberingInitialization_cfi import *
diff --git a/Configuration/StandardSequences/python/GeometryConf.py b/Configuration/StandardSequences/python/GeometryConf.py
@@ -26,6 +26,7 @@
     'Extended2023CFCal'   : 'Extended2023CFCal,Extended2023CFCalReco',
     'Extended2023CFCal4Eta'   : 'Extended2023CFCal4Eta,Extended2023CFCal4EtaReco',
     'Extended2023RPCUpscope'   : 'Extended2023RPCUpscope,Extended2023RPCUpscopeReco',
+    'ExtendedPhase1Pixel10D'   : 'ExtendedPhase1Pixel10D,ExtendedPhase1Pixel10DReco',
     'ExtendedPhase2TkBE'   : 'ExtendedPhase2TkBE,ExtendedPhase2TkBEReco',
     'ExtendedPhase2TkBE5D'   : 'ExtendedPhase2TkBE5D,ExtendedPhase2TkBE5DReco',
     'ExtendedPhase2TkBE5DPixel10D'   : 'ExtendedPhase2TkBE5DPixel10D,ExtendedPhase2TkBE5DPixel10DReco',

diff --git a/Geometry/CMSCommonData/data/PhaseI/cms.xml b/Geometry/CMSCommonData/data/PhaseI/cms.xml
@@ -39,7 +39,7 @@
  <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.64*cm"/>
+ <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"/>

diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometryPhase1Pixel10DXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometryPhase1Pixel10DXML_cfi.py
diff --git a/Geometry/TrackerCommonData/data/PhaseI/Pixel10D/pixbar.xml b/Geometry/TrackerCommonData/data/PhaseI/Pixel10D/pixbar.xml
diff --git a/Geometry/TrackerCommonData/data/PhaseI/Pixel10D/pixfwd.xml b/Geometry/TrackerCommonData/data/PhaseI/Pixel10D/pixfwd.xml
@@ -0,0 +1,148 @@
+<?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="pixfwd.xml" eval="true">
+ <Constant name="RootRadius"     value="[pixfwdCylinder:CylindersOuterRmax]"/>
+ <Constant name="RootHalfLength" value="[pixfwdCylinder:CylindersOuterLength]/2.+ [pixfwdCylinder:CylindersEndFlangeLength]/2.+[Zextension]/2."/>
+
+ <Constant name="AnchorZ"        value="0.*mm"/>
+ <Constant name="ZPixelForward"  value="291.*mm"/>
+ <Constant name="RootStartZ"     value="-4*mm"/> <!-- -2*mm-->
+ <Constant name="RootMidZ1"      value="[cms:TrackLumiZ1]-[ZPixelForward]"/>
+ <Constant name="RootMidZ2"      value="[cms:TrackLumiZ2]-[ZPixelForward]"/>
+ <Constant name="RootMidZ3"      value="[cms:TrackBeamZ1]-[ZPixelForward]"/>
+ <Constant name="RootEndZ"       value="2*[RootHalfLength]"/>
+ <Constant name="Zextension"      value="273.11*mm"/>
+
+ <Constant name="Disk1Z"         value="[pixfwdDisks:DiskHalfWidth]+[RootStartZ]"/> <!-- 35.75*mm-->
+ <Constant name="Disk2Z"         value="[Disk1Z]+75.0*mm"/>
+ <Constant name="Disk3Z"         value="[Disk2Z]+95.0*mm"/>
+ <Constant name="Disk4Z"         value="[Disk3Z]+147.0*mm"/>
+ <Constant name="Disk5Z"         value="[Disk4Z]+188.0*mm"/> 
+ <Constant name="Disk6Z"         value="[Disk5Z]+242.0*mm"/> 
+ <Constant name="Disk7Z"         value="[Disk6Z]+311.0*mm"/> 
+ <Constant name="Disk8Z"         value="[Disk7Z]+600.0*mm"/> 
+ <Constant name="Disk9Z"         value="[Disk8Z]+302.0*mm"/>
+ <Constant name="Disk10Z"         value="[Disk9Z]+348.0*mm"/>
+ <!--
+ <Constant name="Disk11Z"         value="[Disk10Z]+391.0*mm"/> 
+ <Constant name="Disk12Z"         value="[Disk11Z]+477.0*mm"/>
+-->
+ <Constant name="ZCylinder"      value="[AnchorZ]"/>
+
+</ConstantsSection>
+
+<SolidSection label="pixfwd.xml">
+ <Polycone name="PixelForward" startPhi="0*deg" deltaPhi="360*deg" >
+ <ZSection z="[RootStartZ]"  rMin="[cms:TrackBeamR1]" rMax="[RootRadius]"/>
+ <ZSection z="[RootMidZ1]"   rMin="[cms:TrackBeamR1]" rMax="[RootRadius]"/>
+ <ZSection z="[RootMidZ1]"   rMin="[cms:TrackLumiR1]" rMax="[RootRadius]"/>
+ <ZSection z="[RootMidZ2]"   rMin="[cms:TrackLumiR1]" rMax="[RootRadius]"/>
+ <ZSection z="[RootMidZ2]"   rMin="[cms:TrackBeamR1]" rMax="[RootRadius]"/>
+ <ZSection z="[RootMidZ3]"   rMin="[cms:TrackBeamR1]" rMax="[RootRadius]"/>
+ <ZSection z="[RootEndZ]"    rMin="[cms:TrackBeamR2]" rMax="[RootRadius]"/>
+ </Polycone>
+</SolidSection>
+
+<LogicalPartSection label="pixfwd.xml">
+ <LogicalPart name="PixelForward" category="envelope">
+  <rSolid name="PixelForward"/>
+  <rMaterial name="materials:Air"/>
+ </LogicalPart>
+</LogicalPartSection>
+
+
+<!-- Position disks inside root -->
+
+<PosPartSection label="pixfwd.xml">
+  <PosPart copyNumber="1">
+    <rParent name="pixfwd:PixelForward"/>
+    <rChild name="pixfwdDisks:PixelForwardDisk1"/>
+    <Translation x="0." y="0." z="[AnchorZ]+[Disk1Z]"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="pixfwd:PixelForward"/>
+    <rChild name="pixfwdDisks:PixelForwardDisk2"/>
+    <Translation x="0." y="0." z="[AnchorZ]+[Disk2Z]"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="pixfwd:PixelForward"/>
+    <rChild name="pixfwdDisks:PixelForwardDisk3"/>
+    <Translation x="0." y="0." z="[AnchorZ]+ [Disk3Z]" />
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="pixfwd:PixelForward"/>
+    <rChild name="pixfwdDisks:PixelForwardDisk4"/>
+    <Translation x="0." y="0." z="[AnchorZ]+ [Disk4Z]" />
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="pixfwd:PixelForward"/>
+    <rChild name="pixfwdDisks:PixelForwardDisk5"/>
+    <Translation x="0." y="0." z="[AnchorZ]+ [Disk5Z]" />
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="pixfwd:PixelForward"/>
+    <rChild name="pixfwdDisks:PixelForwardDisk6"/>
+    <Translation x="0." y="0." z="[AnchorZ]+ [Disk6Z]" />
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="pixfwd:PixelForward"/>
+    <rChild name="pixfwdDisks:PixelForwardDisk7"/>
+    <Translation x="0." y="0." z="[AnchorZ]+ [Disk7Z]" />
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="pixfwd:PixelForward"/>
+    <rChild name="pixfwdDisks:PixelForwardDisk8"/>
+    <Translation x="0." y="0." z="[AnchorZ]+ [Disk8Z]" />
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="pixfwd:PixelForward"/>
+    <rChild name="pixfwdDisks:PixelForwardDisk9"/>
+    <Translation x="0." y="0." z="[AnchorZ]+ [Disk9Z]" />
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="pixfwd:PixelForward"/>
+    <rChild name="pixfwdDisks:PixelForwardDisk10"/>
+    <Translation x="0." y="0." z="[AnchorZ]+ [Disk10Z]" />
+  </PosPart>
+<!--
+  <PosPart copyNumber="1">
+    <rParent name="pixfwd:PixelForward"/>
+    <rChild name="pixfwdDisks:PixelForwardDisk11"/>
+    <Translation x="0." y="0." z="[AnchorZ]+ [Disk11Z]" />
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="pixfwd:PixelForward"/>
+    <rChild name="pixfwdDisks:PixelForwardDisk12"/>
+    <Translation x="0." y="0." z="[AnchorZ]+ [Disk12Z]" />
+  </PosPart>
+-->
+  <PosPart copyNumber="1">
+    <rParent name="pixfwd:PixelForward"/>
+    <rChild name="pixfwdCylinder:PixelForwardServiceCylinder"/>
+    <Translation x="0." y="0." z="0."/>
+  </PosPart>
+  <PosPart copyNumber="1">
+
+  <rParent name="pixfwd:PixelForward"/>
+    <rChild name="pixfwdCylinder:PixelForwardCylinderEndFlange"/>
+    <Translation x="0." y="0." z="[pixfwd:ZCylinder]+[pixfwdCylinder:CylindersOuterLength]+[pixfwdCylinder:CylindersEndFlangeLength]/2."/>
+    <rRotation name="pixfwdCylinder:EndFlangeRot1"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="pixfwd:PixelForward"/>
+    <rChild name="pixfwdCylinder:PixelForwardCylinderEndFlange"/>
+    <Translation x="0." y="0." z="[pixfwd:ZCylinder]+[pixfwdCylinder:CylindersOuterLength]+[pixfwdCylinder:CylindersEndFlangeLength]/2."/>
+    <rRotation name="pixfwdCylinder:EndFlangeRot2"/>  <!-- xt rRotation name="pixfwdCommon:Z180" / xt-->
+  </PosPart>
+
+  <!-- xt PosPart copyNumber="1">
+    <rParent name="pixfwd:PixelForward"/>
+    <rChild name="pixfwdCylinder:PixelForwardCylinderBackCyl"/>
+    <Translation x="0." y="0." z="[pixfwd:ZCylinder]+[pixfwdCylinder:CylindersFrontLength]+[pixfwdCylinder:CylinderBackLength]/2." />
+  </PosPart xt -->
+
+</PosPartSection>
+
+</DDDefinition>