Skip to content

Commit

Permalink
Merge pull request #35380 from CTPPS/geoFix121ib
Browse files Browse the repository at this point in the history
Fixes for PPS geometry on Pixel sensors and materials
  • Loading branch information
cmsbuild committed Sep 23, 2021
2 parents 1a6b75d + 34bedae commit 9798671
Show file tree
Hide file tree
Showing 11 changed files with 1,060 additions and 10 deletions.
99 changes: 99 additions & 0 deletions Configuration/Geometry/python/dict2021Geometry.py
Expand Up @@ -2584,6 +2584,105 @@
],
"reco" :[

],
},
"P7" : {
2 : [
'Geometry/VeryForwardData/data/RP_Box.xml',
'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_000.xml',
'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_001.xml',
'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_002.xml',
'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_003.xml',
'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_004.xml',
'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_005.xml',
'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_020.xml',
'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_021.xml',
'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_022.xml',
'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_023.xml',
'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_024.xml',
'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_025.xml',
'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_100.xml',
'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_101.xml',
'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_102.xml',
'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_103.xml',
'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_104.xml',
'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_105.xml',
'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_120.xml',
'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_121.xml',
'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_122.xml',
'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_123.xml',
'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_124.xml',
'Geometry/VeryForwardData/data/RP_Box/v3/RP_Box_125.xml',
'Geometry/VeryForwardData/data/RP_Hybrid/v2/RP_Hybrid.xml',
'Geometry/VeryForwardData/data/RP_Materials/v4/RP_Materials.xml',
'Geometry/VeryForwardData/data/RP_Transformations.xml',
'Geometry/VeryForwardData/data/RP_Detectors_Assembly.xml',
'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_000.xml',
'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_001.xml',
'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_002.xml',
'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_004.xml',
'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_005.xml',
'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_020.xml',
'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_021.xml',
'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_024.xml',
'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_025.xml',
'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_100.xml',
'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_101.xml',
'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_102.xml',
'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_104.xml',
'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_105.xml',
'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_120.xml',
'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_121.xml',
'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_124.xml',
'Geometry/VeryForwardData/data/RP_Detectors_Assembly/RP_Detectors_Assembly_125.xml',
'Geometry/VeryForwardData/data/RP_Device/v1/RP_Device.xml',
'Geometry/VeryForwardData/data/RP_Vertical_Device/2021/Simu/v2/RP_Vertical_Device.xml',
'Geometry/VeryForwardData/data/RP_Horizontal_Device/2021/Simu/v2/RP_Horizontal_Device.xml',
'Geometry/VeryForwardData/data/CTPPS_2021/Stations/Simu/v3/CTPPS_220_Right_Station.xml',
'Geometry/VeryForwardData/data/CTPPS_2021/Stations/Simu/v3/CTPPS_220_Left_Station.xml',
'Geometry/VeryForwardData/data/CTPPS_2021/Stations/Simu/v3/CTPPS_210_Right_Station.xml',
'Geometry/VeryForwardData/data/CTPPS_2021/Stations/Simu/v3/CTPPS_210_Left_Station.xml',
'Geometry/VeryForwardData/data/CTPPS_2021/Stations/Simu/v3/CTPPS_Stations_Assembly.xml',
'Geometry/VeryForwardData/data/CTPPS_2021/Cuts_Per_Region/Simu/v1/CTPPS_Cuts_Per_Region.xml',
'Geometry/VeryForwardData/data/RP_Sensitive_Dets.xml',
'Geometry/VeryForwardData/data/CTPPS_Diamond_Transformations.xml',
'Geometry/VeryForwardData/data/CTPPS_Diamond_Parameters.xml',
'Geometry/VeryForwardData/data/CTPPS_Timing_Station_Parameters.xml',
'Geometry/VeryForwardData/data/CTPPS_Timing_Horizontal_Pot/v2/CTPPS_Timing_Horizontal_Pot.xml',
'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern1_Segment1.xml',
'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern2_Segment1.xml',
'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern2_Segment2.xml',
'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern3_Segment1.xml',
'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern3_Segment2.xml',
'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern3_Segment3.xml',
'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern3_Segment4.xml',
'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern4_Segment1.xml',
'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern4_Segment2.xml',
'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern4_Segment3.xml',
'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern4_Segment4.xml',
'Geometry/VeryForwardData/data/CTPPS_Diamond_Segments/CTPPS_Diamond_Pattern4_Segment5.xml',
'Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane1.xml',
'Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane2.xml',
'Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane3.xml',
'Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane4.xml',
'Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Detector_Assembly/v1/CTPPS_Diamond_Detector_Assembly.xml',
'Geometry/VeryForwardData/data/CTPPS_Diamond_2021/Simu/v1/CTPPS_Detectors_Assembly_022.xml',
'Geometry/VeryForwardData/data/CTPPS_Diamond_2021/Simu/v1/CTPPS_Detectors_Assembly_122.xml',
'Geometry/VeryForwardData/data/CTPPS_Diamond_Sensitive_Dets_TimingHits.xml',
'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Modules/v2/ppstrackerMaterials.xml',
'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Modules/v3/PPS_Pixel_Module_2x2_Run3.xml',
'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Modules/v2/PPS_Pixel_Sens.xml',
'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_003.xml',
'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_023.xml',
'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_103.xml',
'Geometry/VeryForwardData/data/CTPPS_Pixel_2021/Assembly/v2/CTPPS_Pixel_Assembly_Box_Real_123.xml',
'Geometry/VeryForwardData/data/CTPPS_2021/RP_Dist_Beam_Cent/Simu/v1/RP_Dist_Beam_Cent.xml',
],
"sim" : [

],
"reco" :[

],
},
}
Expand Down
@@ -0,0 +1,104 @@
<?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 ../../DDLSchema/DDLSchema.xsd">
<ConstantsSection label="CTPPS_Pixel_Assembly_Box_Real_003.xml">
<Constant name="RotAngle" value="20.0*deg"/> <!-- was 18.4 degrees -->

<Constant name="FullModuleThickness" value="[PPS_Pixel_Module_2x2_Run3:EnvelopT]+[PPS_Pixel_Module_2x2_Run3:ROChipT]+[PPS_Pixel_Module_2x2_Run3:WaferT]" />


<Constant name="Offset_wrt_RP_bottom" value="0.25*mm"/>
<Constant name="Planes_spacing_different_support" value="4.044*mm" /> <!-- TBC -->
<Constant name="Planes_spacing_OFFSET" value="0.0*mm" />

<!-- module Y offset = 0 if all modules oriented in the same direction -->

<Constant name="ModuleOffset" value="0.00*mm" />
<!-- offset to align the sensors: www.ge.infn.it/~ferro/CMS/CTPPS_offset_piani.pdf -->
</ConstantsSection>


<RotationSection label="CTPPS_Pixel_Assembly_Box_Real_003.xml">
<Rotation name="ModuleROTATION" thetaX="90*deg" phiX="0*deg"
thetaY="90*deg-[RotAngle]" phiY="90*deg"
thetaZ="-[RotAngle]" phiZ="90*deg"/> <!-- rotation of RotAngle around x axis -->


<Rotation name="ModuleROTATIONmirror" thetaX="90*deg" phiX="180*deg"
thetaY="90*deg-[RotAngle]" phiY="90*deg"
thetaZ="180*deg-[RotAngle]" phiZ="90*deg"/>

<Rotation name="ModuleROTATIONmirror2" thetaX="90*deg" phiX="180*deg"
thetaY="90*deg+[RotAngle]" phiY="90*deg"
thetaZ="180*deg+[RotAngle]" phiZ="90*deg"/>

</RotationSection>



<PosPartSection label="CTPPS_Pixel_Assembly_Box_Real_003.xml">


<PosPart copyNumber="1">

<rParent name="RP_Box_003:RP_box_secondary_vacuum"/>
<rChild name="PPS_Pixel_Module_2x2_Run3:Envelop"/>
<!-- <Translation x="-0.4*mm" y="-[RP_Box:RP_Box_Secondary_Vacuum_Height]/2+[RP_Box:RP_Box_Bottom_Wall_Thickness]/2+[PPS_Pixel_Module_2x2_Run3:EnvelopL]*cos([RotAngle])+[Offset_wrt_RP_bottom]-15*mm" z="-(1.5*[Planes_spacing_different_support]) + [Planes_spacing_OFFSET]"/>
-->
<Translation x="-0.4*mm" y="-[RP_Box:RP_Box_Secondary_Vacuum_Height]/2.+[PPS_Pixel_Module_2x2_Run3:EnvelopL]/2.*cos([RotAngle])+[Offset_wrt_RP_bottom]" z="-(1.5*[Planes_spacing_different_support]) + [Planes_spacing_OFFSET]"/>
<rRotation name="ModuleROTATIONmirror2"/>

</PosPart>

<PosPart copyNumber="2">

<rParent name="RP_Box_003:RP_box_secondary_vacuum"/>
<rChild name="PPS_Pixel_Module_2x2_Run3:Envelop"/>
<Translation x="-0.4*mm" y="-[RP_Box:RP_Box_Secondary_Vacuum_Height]/2.+[PPS_Pixel_Module_2x2_Run3:EnvelopL]/2.*cos([RotAngle])+[Offset_wrt_RP_bottom]" z="-0.5*[Planes_spacing_different_support] + [Planes_spacing_OFFSET]"/>
<rRotation name="ModuleROTATIONmirror2"/>

</PosPart>

<PosPart copyNumber="3">

<rParent name="RP_Box_003:RP_box_secondary_vacuum"/>
<rChild name="PPS_Pixel_Module_2x2_Run3:Envelop"/>
<Translation x="-0.4*mm" y="-[RP_Box:RP_Box_Secondary_Vacuum_Height]/2.+[PPS_Pixel_Module_2x2_Run3:EnvelopL]/2.*cos([RotAngle])+[Offset_wrt_RP_bottom]" z="0.5*[Planes_spacing_different_support] + [Planes_spacing_OFFSET]"/>
<rRotation name="ModuleROTATIONmirror2"/>

</PosPart>

<PosPart copyNumber="4">

<rParent name="RP_Box_003:RP_box_secondary_vacuum"/>
<rChild name="PPS_Pixel_Module_2x2_Run3:Envelop"/>
<Translation x="-0.4*mm" y="-[RP_Box:RP_Box_Secondary_Vacuum_Height]/2.+[PPS_Pixel_Module_2x2_Run3:EnvelopL]/2.*cos([RotAngle])+[Offset_wrt_RP_bottom]" z="1.5*[Planes_spacing_different_support] + [Planes_spacing_OFFSET]"/>
<rRotation name="ModuleROTATIONmirror2"/>

</PosPart>

<PosPart copyNumber="5">

<rParent name="RP_Box_003:RP_box_secondary_vacuum"/>
<rChild name="PPS_Pixel_Module_2x2_Run3:Envelop"/>
<Translation x="-0.4*mm" y="-[RP_Box:RP_Box_Secondary_Vacuum_Height]/2.+[PPS_Pixel_Module_2x2_Run3:EnvelopL]/2.*cos([RotAngle])+[Offset_wrt_RP_bottom]" z="2.5*[Planes_spacing_different_support] + [Planes_spacing_OFFSET]"/>
<rRotation name="ModuleROTATIONmirror2"/>

</PosPart>

<PosPart copyNumber="6">

<rParent name="RP_Box_003:RP_box_secondary_vacuum"/>
<rChild name="PPS_Pixel_Module_2x2_Run3:Envelop"/>
<Translation x="-0.4*mm" y="-[RP_Box:RP_Box_Secondary_Vacuum_Height]/2.+[PPS_Pixel_Module_2x2_Run3:EnvelopL]/2.*cos([RotAngle])+[Offset_wrt_RP_bottom]" z="3.5*[Planes_spacing_different_support] + [Planes_spacing_OFFSET]"/>
<rRotation name="ModuleROTATIONmirror2"/>

</PosPart>





</PosPartSection>
</DDDefinition>
@@ -0,0 +1,104 @@
<?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 ../../DDLSchema/DDLSchema.xsd">
<ConstantsSection label="CTPPS_Pixel_Assembly_Box_Real_023.xml">
<Constant name="RotAngle" value="20.0*deg"/> <!-- was 18.4 degrees -->

<Constant name="FullModuleThickness" value="[PPS_Pixel_Module_2x2_Run3:EnvelopT]+[PPS_Pixel_Module_2x2_Run3:ROChipT]+[PPS_Pixel_Module_2x2_Run3:WaferT]" />


<Constant name="Offset_wrt_RP_bottom" value="0.25*mm"/>
<Constant name="Planes_spacing_different_support" value="4.044*mm" /> <!-- TBC -->
<Constant name="Planes_spacing_OFFSET" value="0.0*mm" />

<!-- module Y offset = 0 if all modules oriented in the same direction -->

<Constant name="ModuleOffset" value="0.00*mm" />
<!-- offset to align the sensors: www.ge.infn.it/~ferro/CMS/CTPPS_offset_piani.pdf -->
</ConstantsSection>


<RotationSection label="CTPPS_Pixel_Assembly_Box_Real_023.xml">
<Rotation name="ModuleROTATION" thetaX="90*deg" phiX="0*deg"
thetaY="90*deg-[RotAngle]" phiY="90*deg"
thetaZ="-[RotAngle]" phiZ="90*deg"/> <!-- rotation of RotAngle around x axis -->


<Rotation name="ModuleROTATIONmirror" thetaX="90*deg" phiX="180*deg"
thetaY="90*deg-[RotAngle]" phiY="90*deg"
thetaZ="180*deg-[RotAngle]" phiZ="90*deg"/>

<Rotation name="ModuleROTATIONmirror2" thetaX="90*deg" phiX="180*deg"
thetaY="90*deg+[RotAngle]" phiY="90*deg"
thetaZ="180*deg+[RotAngle]" phiZ="90*deg"/>

</RotationSection>



<PosPartSection label="CTPPS_Pixel_Assembly_Box_Real_023.xml">


<PosPart copyNumber="1">

<rParent name="RP_Box_023:RP_box_secondary_vacuum"/>
<rChild name="PPS_Pixel_Module_2x2_Run3:Envelop"/>
<!-- <Translation x="-0.4*mm" y="-[RP_Box:RP_Box_Secondary_Vacuum_Height]/2+[RP_Box:RP_Box_Bottom_Wall_Thickness]/2+[PPS_Pixel_Module_2x2_Run3:EnvelopL]*cos([RotAngle])+[Offset_wrt_RP_bottom]-15*mm" z="-(1.5*[Planes_spacing_different_support]) + [Planes_spacing_OFFSET]"/>
-->
<Translation x="-0.4*mm" y="-[RP_Box:RP_Box_Secondary_Vacuum_Height]/2.+[PPS_Pixel_Module_2x2_Run3:EnvelopL]/2.*cos([RotAngle])+[Offset_wrt_RP_bottom]" z="-(1.5*[Planes_spacing_different_support]) + [Planes_spacing_OFFSET]"/>
<rRotation name="ModuleROTATIONmirror2"/>

</PosPart>

<PosPart copyNumber="2">

<rParent name="RP_Box_023:RP_box_secondary_vacuum"/>
<rChild name="PPS_Pixel_Module_2x2_Run3:Envelop"/>
<Translation x="-0.4*mm" y="-[RP_Box:RP_Box_Secondary_Vacuum_Height]/2.+[PPS_Pixel_Module_2x2_Run3:EnvelopL]/2.*cos([RotAngle])+[Offset_wrt_RP_bottom]" z="-0.5*[Planes_spacing_different_support] + [Planes_spacing_OFFSET]"/>
<rRotation name="ModuleROTATIONmirror2"/>

</PosPart>

<PosPart copyNumber="3">

<rParent name="RP_Box_023:RP_box_secondary_vacuum"/>
<rChild name="PPS_Pixel_Module_2x2_Run3:Envelop"/>
<Translation x="-0.4*mm" y="-[RP_Box:RP_Box_Secondary_Vacuum_Height]/2.+[PPS_Pixel_Module_2x2_Run3:EnvelopL]/2.*cos([RotAngle])+[Offset_wrt_RP_bottom]" z="0.5*[Planes_spacing_different_support] + [Planes_spacing_OFFSET]"/>
<rRotation name="ModuleROTATIONmirror2"/>

</PosPart>

<PosPart copyNumber="4">

<rParent name="RP_Box_023:RP_box_secondary_vacuum"/>
<rChild name="PPS_Pixel_Module_2x2_Run3:Envelop"/>
<Translation x="-0.4*mm" y="-[RP_Box:RP_Box_Secondary_Vacuum_Height]/2.+[PPS_Pixel_Module_2x2_Run3:EnvelopL]/2.*cos([RotAngle])+[Offset_wrt_RP_bottom]" z="1.5*[Planes_spacing_different_support] + [Planes_spacing_OFFSET]"/>
<rRotation name="ModuleROTATIONmirror2"/>

</PosPart>

<PosPart copyNumber="5">

<rParent name="RP_Box_023:RP_box_secondary_vacuum"/>
<rChild name="PPS_Pixel_Module_2x2_Run3:Envelop"/>
<Translation x="-0.4*mm" y="-[RP_Box:RP_Box_Secondary_Vacuum_Height]/2.+[PPS_Pixel_Module_2x2_Run3:EnvelopL]/2.*cos([RotAngle])+[Offset_wrt_RP_bottom]" z="2.5*[Planes_spacing_different_support] + [Planes_spacing_OFFSET]"/>
<rRotation name="ModuleROTATIONmirror2"/>

</PosPart>

<PosPart copyNumber="6">

<rParent name="RP_Box_023:RP_box_secondary_vacuum"/>
<rChild name="PPS_Pixel_Module_2x2_Run3:Envelop"/>
<Translation x="-0.4*mm" y="-[RP_Box:RP_Box_Secondary_Vacuum_Height]/2.+[PPS_Pixel_Module_2x2_Run3:EnvelopL]/2.*cos([RotAngle])+[Offset_wrt_RP_bottom]" z="3.5*[Planes_spacing_different_support] + [Planes_spacing_OFFSET]"/>
<rRotation name="ModuleROTATIONmirror2"/>

</PosPart>





</PosPartSection>
</DDDefinition>

0 comments on commit 9798671

Please sign in to comment.