Skip to content

Commit

Permalink
Remove old FPIX; make New FPIX default.
Browse files Browse the repository at this point in the history
Some _cfg.py might be still broken. Some conflicts needed to be fixed. 2017NewFPix left in place, identical to 2017 up to conflicts.
  • Loading branch information
schneiml committed Oct 15, 2016
1 parent 9ee2311 commit f26c4c0
Show file tree
Hide file tree
Showing 39 changed files with 269 additions and 4,266 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -21,20 +21,20 @@
'Geometry/CMSCommonData/data/muonMagnet.xml',
'Geometry/CMSCommonData/data/cavern.xml',
'Geometry/TrackerCommonData/data/PhaseI/trackerParameters.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwd/pixfwdMaterials.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwdMaterials.xml',
'Geometry/TrackerCommonData/data/pixfwdCommon.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwd/pixfwdCylinder.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwd/pixfwd.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwd/pixfwdDisks.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwd/pixfwdSupportRingParameters.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwd/pixfwdInnerDiskZplus.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwd/pixfwdInnerDiskZminus.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwd/pixfwdOuterDiskZplus.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwd/pixfwdOuterDiskZminus.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwd/pixfwdbladeInnerZplus.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwd/pixfwdbladeInnerZminus.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwd/pixfwdbladeOuterZplus.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwd/pixfwdbladeOuterZminus.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwdCylinder.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwd.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwdDisks.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwdSupportRingParameters.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwdInnerDiskZplus.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwdInnerDiskZminus.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwdOuterDiskZplus.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwdOuterDiskZminus.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwdbladeInnerZplus.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwdbladeInnerZminus.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwdbladeOuterZplus.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwdbladeOuterZminus.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixbarmaterial.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixbarladder.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixbarladderfull0.xml',
Expand Down Expand Up @@ -195,7 +195,7 @@
'Geometry/TrackerCommonData/data/Run2/trackermaterial.xml',
'Geometry/TrackerCommonData/data/Run2/tracker.xml',
'Geometry/TrackerCommonData/data/trackerpixbar.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwd/trackerpixfwd.xml',
'Geometry/TrackerCommonData/data/PhaseI/trackerpixfwd.xml',
'Geometry/TrackerCommonData/data/trackertibtidservices.xml',
'Geometry/TrackerCommonData/data/trackertib.xml',
'Geometry/TrackerCommonData/data/trackertid.xml',
Expand Down Expand Up @@ -253,9 +253,9 @@
'Geometry/ForwardCommonData/data/zdclumi.xml',
'Geometry/ForwardCommonData/data/cmszdc.xml')+cms.vstring(
'Geometry/MuonCommonData/data/v2/muonNumbering.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwd/trackerStructureTopology.xml',
'Geometry/TrackerSimData/data/PhaseI/pixfwd/trackersens.xml',
'Geometry/TrackerRecoData/data/PhaseI/pixfwd/trackerRecoMaterial.xml',
'Geometry/TrackerCommonData/data/PhaseI/trackerStructureTopology.xml',
'Geometry/TrackerSimData/data/PhaseI/trackersens.xml',
'Geometry/TrackerRecoData/data/PhaseI/trackerRecoMaterial.xml',
'Geometry/EcalSimData/data/ecalsens.xml',
'Geometry/HcalCommonData/data/Phase0/hcalsenspmf.xml',
'Geometry/HcalSimData/data/hf.xml',
Expand All @@ -273,7 +273,7 @@
'Geometry/HcalSimData/data/HcalProdCuts.xml',
'Geometry/EcalSimData/data/EcalProdCuts.xml',
'Geometry/EcalSimData/data/ESProdCuts.xml',
'Geometry/TrackerSimData/data/PhaseI/pixfwd/trackerProdCuts.xml',
'Geometry/TrackerSimData/data/PhaseI/trackerProdCuts.xml',
'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
'Geometry/MuonSimData/data/muonProdCuts.xml',
'Geometry/ForwardSimData/data/CastorProdCuts.xml',
Expand Down
18 changes: 9 additions & 9 deletions Geometry/CMSCommonData/python/cmsExtendedGeometry2017XML_cfi.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@
'Geometry/TrackerCommonData/data/PhaseI/pixfwdCylinder.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwd.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwdDisks.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwdInnerDisk1.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwdInnerDisk2.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwdInnerDisk3.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwdOuterDisk1.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwdOuterDisk2.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwdOuterDisk3.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwdblade1.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwdblade2.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwdblade3.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwdSupportRingParameters.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwdInnerDiskZplus.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwdInnerDiskZminus.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwdOuterDiskZplus.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwdOuterDiskZminus.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwdbladeInnerZplus.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwdbladeInnerZminus.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwdbladeOuterZplus.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwdbladeOuterZminus.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixbarmaterial.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixbarladder.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixbarladderfull0.xml',
Expand Down
36 changes: 18 additions & 18 deletions Geometry/CMSCommonData/python/cmsExtendedGeometry2017newXML_cfi.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,20 +21,20 @@
'Geometry/CMSCommonData/data/muonMagnet.xml',
'Geometry/CMSCommonData/data/cavern.xml',
'Geometry/TrackerCommonData/data/PhaseI/trackerParameters.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwd/pixfwdMaterials.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwdMaterials.xml',
'Geometry/TrackerCommonData/data/pixfwdCommon.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwd/pixfwdCylinder.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwd/pixfwd.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwd/pixfwdDisks.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwd/pixfwdSupportRingParameters.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwd/pixfwdInnerDiskZplus.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwd/pixfwdInnerDiskZminus.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwd/pixfwdOuterDiskZplus.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwd/pixfwdOuterDiskZminus.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwd/pixfwdbladeInnerZplus.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwd/pixfwdbladeInnerZminus.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwd/pixfwdbladeOuterZplus.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwd/pixfwdbladeOuterZminus.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwdCylinder.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwd.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwdDisks.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwdSupportRingParameters.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwdInnerDiskZplus.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwdInnerDiskZminus.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwdOuterDiskZplus.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwdOuterDiskZminus.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwdbladeInnerZplus.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwdbladeInnerZminus.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwdbladeOuterZplus.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwdbladeOuterZminus.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixbarmaterial.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixbarladder.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixbarladderfull0.xml',
Expand Down Expand Up @@ -195,7 +195,7 @@
'Geometry/TrackerCommonData/data/Run2/trackermaterial.xml',
'Geometry/TrackerCommonData/data/Run2/tracker.xml',
'Geometry/TrackerCommonData/data/trackerpixbar.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwd/trackerpixfwd.xml',
'Geometry/TrackerCommonData/data/PhaseI/trackerpixfwd.xml',
'Geometry/TrackerCommonData/data/trackertibtidservices.xml',
'Geometry/TrackerCommonData/data/trackertib.xml',
'Geometry/TrackerCommonData/data/trackertid.xml',
Expand Down Expand Up @@ -254,9 +254,9 @@
'Geometry/ForwardCommonData/data/zdclumi.xml',
'Geometry/ForwardCommonData/data/cmszdc.xml')+cms.vstring(
'Geometry/MuonCommonData/data/v2/muonNumbering.xml',
'Geometry/TrackerCommonData/data/PhaseI/pixfwd/trackerStructureTopology.xml',
'Geometry/TrackerSimData/data/PhaseI/pixfwd/trackersens.xml',
'Geometry/TrackerRecoData/data/PhaseI/pixfwd/trackerRecoMaterial.xml',
'Geometry/TrackerCommonData/data/PhaseI/trackerStructureTopology.xml',
'Geometry/TrackerSimData/data/PhaseI/trackersens.xml',
'Geometry/TrackerRecoData/data/PhaseI/trackerRecoMaterial.xml',
'Geometry/EcalSimData/data/ecalsens.xml',
'Geometry/HcalCommonData/data/Phase0/hcalsenspmf.xml',
'Geometry/HcalSimData/data/hf.xml',
Expand All @@ -274,7 +274,7 @@
'Geometry/HcalSimData/data/HcalProdCuts.xml',
'Geometry/EcalSimData/data/EcalProdCuts.xml',
'Geometry/EcalSimData/data/ESProdCuts.xml',
'Geometry/TrackerSimData/data/PhaseI/pixfwd/trackerProdCuts.xml',
'Geometry/TrackerSimData/data/PhaseI/trackerProdCuts.xml',
'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
'Geometry/MuonSimData/data/muonProdCuts.xml',
'Geometry/ForwardSimData/data/CastorProdCuts.xml',
Expand Down
102 changes: 73 additions & 29 deletions Geometry/TrackerCommonData/data/PhaseI/pixfwd.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,83 +8,127 @@

<Constant name="AnchorZ" value="0.*mm"/>
<Constant name="ZPixelForward" value="291.*mm"/>
<Constant name="RootStartZ" value="-4*mm"/> <!-- -2*mm-->
<Constant name="RootStartZ" value="-4*mm"/> <!-- makes FPix and BPix envelopes touch each other. If you change this, check also the PixelBarrel volume -->
<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="Disk1Z" value="[pixfwdDisks:DiskHalfWidth]+[RootStartZ]"/> <!-- 35.75*mm-->
<Constant name="Disk2Z" value="[Disk1Z]+75.0*mm"/> <!-- +72.5*mm--> <!-- +105.0*mm -->
<Constant name="Disk3Z" value="[Disk2Z]+95.0*mm"/> <!-- +120.0*mm-->
<Constant name="Disk1Z" value="[pixfwdDisks:DiskHalfWidth]"/>
<Constant name="Disk2Z" value="[Disk1Z]+75.0*mm"/>
<Constant name="Disk3Z" value="[Disk2Z]+95.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]"/>
<Polycone name="PixelForwardZplus" startPhi="0*deg" deltaPhi="360*deg" >
<ZSection z="[RootStartZ]" rMin="[cms:TrackBeamR1]" rMax="[RootRadius]"/>
<ZSection z="[RootMidZ1]" rMin="[cms:TrackBeamR11]" rMax="[RootRadius]"/>
<ZSection z="[RootMidZ1]" rMin="[cms:TrackLumiR1]" rMax="[RootRadius]"/>
<ZSection z="[RootMidZ2]" rMin="[cms:TrackLumiR1]" rMax="[RootRadius]"/>
<ZSection z="[RootMidZ1]" rMin="[cms:TrackLumiR1]" rMax="[RootRadius]"/>
<ZSection z="[RootMidZ2]" rMin="[cms:TrackLumiR1]" rMax="[RootRadius]"/>
<ZSection z="[RootMidZ2]" rMin="[cms:TrackBeamR11]" rMax="[RootRadius]"/>
<ZSection z="[RootMidZ3]" rMin="[cms:TrackBeamR12]" rMax="[RootRadius]"/>
<ZSection z="[RootEndZ]" rMin="[cms:TrackBeamR2]" rMax="[RootRadius]"/>
<ZSection z="[RootEndZ]" rMin="[cms:TrackBeamR2]" rMax="[RootRadius]"/>
</Polycone>
<Polycone name="PixelForwardZminus" startPhi="0*deg" deltaPhi="360*deg" >
<ZSection z="-[RootEndZ]" rMin="[cms:TrackBeamR2]" rMax="[RootRadius]"/>
<ZSection z="-[RootMidZ3]" rMin="[cms:TrackBeamR12]" rMax="[RootRadius]"/>
<ZSection z="-[RootMidZ2]" rMin="[cms:TrackBeamR11]" rMax="[RootRadius]"/>
<ZSection z="-[RootMidZ2]" rMin="[cms:TrackLumiR1]" rMax="[RootRadius]"/>
<ZSection z="-[RootMidZ1]" rMin="[cms:TrackLumiR1]" rMax="[RootRadius]"/>
<ZSection z="-[RootMidZ1]" rMin="[cms:TrackBeamR11]" rMax="[RootRadius]"/>
<ZSection z="-[RootStartZ]" rMin="[cms:TrackBeamR1]" rMax="[RootRadius]"/>
</Polycone>
</SolidSection>

<LogicalPartSection label="pixfwd.xml">
<LogicalPart name="PixelForward" category="envelope">
<rSolid name="PixelForward"/>
<LogicalPart name="PixelForwardZplus" category="envelope">
<rSolid name="PixelForwardZplus"/>
<rMaterial name="materials:Air"/>
</LogicalPart>
<LogicalPart name="PixelForwardZminus" category="envelope">
<rSolid name="PixelForwardZminus"/>
<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"/>
<rParent name="pixfwd:PixelForwardZplus"/>
<rChild name="pixfwdDisks:PixelForwardDiskZplus"/>
<Translation x="0." y="0." z="[AnchorZ]+[Disk1Z]"/>
</PosPart>
<PosPart copyNumber="1">
<rParent name="pixfwd:PixelForward"/>
<rChild name="pixfwdDisks:PixelForwardDisk2"/>
<rParent name="pixfwd:PixelForwardZminus"/>
<rChild name="pixfwdDisks:PixelForwardDiskZminus"/>
<Translation x="0." y="0." z="-[AnchorZ]-[Disk1Z]"/>
</PosPart>

<PosPart copyNumber="2">
<rParent name="pixfwd:PixelForwardZplus"/>
<rChild name="pixfwdDisks:PixelForwardDiskZplus"/>
<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 copyNumber="2">
<rParent name="pixfwd:PixelForwardZminus"/>
<rChild name="pixfwdDisks:PixelForwardDiskZminus"/>
<Translation x="0." y="0." z="-[AnchorZ]-[Disk2Z]"/>
</PosPart>

<PosPart copyNumber="3">
<rParent name="pixfwd:PixelForwardZplus"/>
<rChild name="pixfwdDisks:PixelForwardDiskZplus"/>
<Translation x="0." y="0." z="[AnchorZ]+[Disk3Z]" />
</PosPart>
<PosPart copyNumber="3">
<rParent name="pixfwd:PixelForwardZminus"/>
<rChild name="pixfwdDisks:PixelForwardDiskZminus"/>
<Translation x="0." y="0." z="-[AnchorZ]-[Disk3Z]" />
</PosPart>


<PosPart copyNumber="1">
<rParent name="pixfwd:PixelForward"/>
<rParent name="pixfwd:PixelForwardZplus"/>
<rChild name="pixfwdCylinder:PixelForwardServiceCylinder"/>
<Translation x="0." y="0." z="0."/>
</PosPart>
<PosPart copyNumber="1">
<rParent name="pixfwd:PixelForwardZminus"/>
<rChild name="pixfwdCylinder:PixelForwardServiceCylinder"/>
<Translation x="0." y="0." z="0."/>
<rRotation name="pixfwdCommon:Y180" />
</PosPart>

<rParent name="pixfwd:PixelForward"/>
<PosPart copyNumber="1">
<rParent name="pixfwd:PixelForwardZplus"/>
<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"/>
<rParent name="pixfwd:PixelForwardZplus"/>
<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-->
<rRotation name="pixfwdCylinder:EndFlangeRot2"/>
</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 -->
<PosPart copyNumber="1">
<rParent name="pixfwd:PixelForwardZminus"/>
<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:PixelForwardZminus"/>
<rChild name="pixfwdCylinder:PixelForwardCylinderEndFlange"/>
<Translation x="0." y="0." z="-[pixfwd:ZCylinder]-[pixfwdCylinder:CylindersOuterLength]-[pixfwdCylinder:CylindersEndFlangeLength]/2."/>
<rRotation name="pixfwdCylinder:EndFlangeRot2"/>
</PosPart>

</PosPartSection>

Expand Down

0 comments on commit f26c4c0

Please sign in to comment.