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

Phase2 tracker (BE5D) + extendedPixel up to eta=4 #2236

Merged
merged 12 commits into from Feb 4, 2014
Merged

Phase2 tracker (BE5D) + extendedPixel up to eta=4 #2236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
bb59e6c
Phase2 Be5D + ExtendedPixel
boudoul Jan 30, 2014
9d0b761
Phase2 Be5D + ExtendedPixel
boudoul Jan 30, 2014
5746e19
Phase2 Be5D + ExtendedPixel
boudoul Jan 30, 2014
508f95e
Phase2 Be5D + ExtendedPixel
boudoul Jan 30, 2014
b7573d4
Phase2 Be5D + ExtendedPixel
boudoul Jan 30, 2014
ff75ef5
Phase2 Be5D + ExtendedPixel
boudoul Jan 30, 2014
6f24c58
Phase2 Be5D + ExtendedPixel
boudoul Jan 30, 2014
783397e
Phase2 Be5D + ExtendedPixel
boudoul Jan 30, 2014
4194181
Phase2 Be5D + ExtendedPixel
boudoul Jan 30, 2014
36d0654
Phase2 Be5D + ExtendedPixel
boudoul Jan 30, 2014
dd82f18
Merged pixel10D from repository boudoul
boudoul Jan 30, 2014
ab5314e
Phase2 Be5D + ExtendedPixel
boudoul Jan 30, 2014
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
33 changes: 33 additions & 0 deletions Configuration/Geometry/python/GeometryExtendedPhase2TkBE5DPixel10DReco_cff.py
View file
Open in desktop
@@ -0,0 +1,33 @@
import FWCore.ParameterSet.Config as cms

# Ideal geometry, needed for transient ECAL alignement
from Configuration.Geometry.GeometryExtendedPhase2TkBE5DPixel10D_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 *

8 changes: 8 additions & 0 deletions Configuration/Geometry/python/GeometryExtendedPhase2TkBE5DPixel10D_cff.py
View file
Open in desktop
@@ -0,0 +1,8 @@
import FWCore.ParameterSet.Config as cms

#
# Geometry master configuration
#
# Ideal geometry, needed for simulation
from Geometry.CMSCommonData.cmsExtendedGeometryPhase2TkBE5DPixel10DXML_cfi import *
from Geometry.TrackerNumberingBuilder.trackerNumberingSLHCGeometry_cfi import *
1 change: 1 addition & 0 deletions Configuration/StandardSequences/python/GeometryConf.py
View file
Open in desktop
Expand Up @@ -18,6 +18,7 @@
'Extended2023' : 'Extended2023,Extended2023Reco',
'ExtendedPhase2TkBE' : 'ExtendedPhase2TkBE,ExtendedPhase2TkBEReco',
'ExtendedPhase2TkBE5D' : 'ExtendedPhase2TkBE5D,ExtendedPhase2TkBE5DReco',
'ExtendedPhase2TkBE5DPixel10D' : 'ExtendedPhase2TkBE5DPixel10D,ExtendedPhase2TkBE5DPixel10DReco',
'ExtendedPhase2TkLB_6PS' : 'ExtendedPhase2TkLB6PS,ExtendedPhase2TkLB6PSReco',
'ExtendedPhase2TkLB_4LPS_2L2S' : 'ExtendedPhase2TkLB4LPS_2L2S,ExtendedPhase2TkLB4LPS_2L2SReco',
'ExtendedGFlash' : 'ExtendedGFlash,ExtendedGFlashReco',
Expand Down
317 changes: 317 additions & 0 deletions Geometry/CMSCommonData/python/cmsExtendedGeometryPhase2TkBE5DPixel10DXML_cfi.py
View file
Open in desktop

Large diffs are not rendered by default.

162 changes: 162 additions & 0 deletions Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwd.xml
View file
Open in desktop
@@ -0,0 +1,162 @@
<?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]+89.0*mm"/>
<Constant name="Disk3Z" value="[Disk2Z]+113.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="99.00*cm" rMin="[cms:TrackBeamR1]" rMax="[RootRadius]"/>
<ZSection z="99.00*cm" rMin="[cms:TrackBeamR1]" rMax="110.0*cm"/>
<ZSection z="[RootMidZ1]" rMin="[cms:TrackBeamR1]" rMax="110.0*cm"/>
<ZSection z="[RootMidZ1]" rMin="[cms:TrackLumiR1]" rMax="110.0*cm"/>
<ZSection z="[RootMidZ2]" rMin="[cms:TrackLumiR1]" rMax="110.0*cm"/>
<ZSection z="[RootMidZ2]" rMin="[cms:TrackBeamR1]" rMax="110.0*cm"/>
<ZSection z="[RootMidZ3]" rMin="[cms:TrackBeamR1]" rMax="110.0*cm"/>
<ZSection z="[RootEndZ]" rMin="[cms:TrackBeamR2]" rMax="110.0*cm"/>
</Polycone>
</SolidSection>

<!--
<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>