Skip to content

Commit

Permalink
Merge pull request #36653 from bsunanda/Run3-gex111
Browse files Browse the repository at this point in the history 
Run3-gex111  Modify xml's to enable the dd4hep version to work in Geometry/ForwardCommonData and Geometry/MuonCommonData
  • Loading branch information
@cmsbuild
cmsbuild committed Jan 9, 2022
2 parents 3120bf4 + ea3be3a commit 5967106
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 23 deletions.
14 changes: 7 additions & 7 deletions Geometry/ForwardCommonData/data/bcm1f/2021/v1/bcm1f.xml
View file
Expand Up @@ -57,15 +57,15 @@
<!-- Planes -->
<PosPart copyNumber="1">
<rParent name="pltbcm:PLTBCM"/>
<rChild name="BCM1F"/>
<rChild name="bcm1f:BCM1F"/>
<rRotation name="rotations:000D"/>
<Translation x="0*fm" y="0*fm" z="[Bcm1fZ]-[pltbcm:PltBcmZ]"/>
</PosPart>

<!-- Diamonds -->
<Algorithm name="global:DDAngular">
<rParent name="BCM1F"/>
<String name="ChildName" value="BCM1FDiamond"/>
<rParent name="bcm1f:BCM1F"/>
<String name="ChildName" value="bcm1f:BCM1FDiamond"/>
<Numeric name="StartCopyNo" value="1"/>
<Numeric name="IncrCopyNo" value="1"/>
<Numeric name="N" value="12"/>
Expand All @@ -82,14 +82,14 @@

<!-- Sensors -->
<PosPart copyNumber="1">
<rParent name="BCM1FDiamond"/>
<rChild name="BCM1FSensor"/>
<rParent name="bcm1f:BCM1FDiamond"/>
<rChild name="bcm1f:BCM1FSensor"/>
<rRotation name="rotations:000D"/>
<Translation x="0*fm" y="-[SensorShift]" z="0*fm"/>
</PosPart>
<PosPart copyNumber="2">
<rParent name="BCM1FDiamond"/>
<rChild name="BCM1FSensor"/>
<rParent name="bcm1f:BCM1FDiamond"/>
<rChild name="bcm1f:BCM1FSensor"/>
<rRotation name="rotations:000D"/>
<Translation x="0*fm" y="[SensorShift]" z="0*fm"/>
</PosPart>
Expand Down
26 changes: 13 additions & 13 deletions Geometry/ForwardCommonData/data/plt/2021/v1/plt.xml
View file
Expand Up @@ -82,8 +82,8 @@
<PosPartSection label="plt">
<!-- Copy the pixels into a row to form the columns -->
<Algorithm name="global:DDLinear">
<rParent name="PLTSensorRow"/>
<String name="ChildName" value="PLTPixel"/>
<rParent name="plt:PLTSensorRow"/>
<String name="ChildName" value="plt:PLTPixel"/>
<Numeric name="StartCopyNo" value="0"/>
<Numeric name="IncrCopyNo" value="1"/>
<Numeric name="N" value="[NumberOfColumns]"/>
Expand All @@ -94,8 +94,8 @@
</Algorithm>
<!-- Copy the rows to form the sensor plane! -->
<Algorithm name="global:DDLinear">
<rParent name="PLTSensorPlane"/>
<String name="ChildName" value="PLTSensorRow"/>
<rParent name="plt:PLTSensorPlane"/>
<String name="ChildName" value="plt:PLTSensorRow"/>
<Numeric name="StartCopyNo" value="0"/>
<Numeric name="IncrCopyNo" value="1"/>
<Numeric name="N" value="[NumberOfRows]"/>
Expand All @@ -106,30 +106,30 @@
</Algorithm>
<!-- Copy the three sensor planes into the telescope-->
<PosPart copyNumber="0">
<rParent name="Telescope"/>
<rChild name="PLTSensorPlane"/>
<rParent name="plt:Telescope"/>
<rChild name="plt:PLTSensorPlane"/>
<Translation x="0.*mm" y="-[TelWidthY]/2.+[ROCWidthY]/2." z="-[TelWidthZ]/2.+[SiThkZ]/2." />
<rRotation name="rotations:000D" />
</PosPart>

<PosPart copyNumber="1">
<rParent name="Telescope"/>
<rChild name="PLTSensorPlane"/>
<rParent name="plt:Telescope"/>
<rChild name="plt:PLTSensorPlane"/>
<Translation x="0.*mm" y="-[TelWidthY]/2.+[ROCWidthY]/2.+1.1*mm" z="0.*mm" />
<rRotation name="rotations:000D" />
</PosPart>

<PosPart copyNumber="2">
<rParent name="Telescope"/>
<rChild name="PLTSensorPlane"/>
<rParent name="plt:Telescope"/>
<rChild name="plt:PLTSensorPlane"/>
<Translation x="0.*mm" y="-[TelWidthY]/2.+[ROCWidthY]/2.+2.2*mm" z="[TelWidthZ]/2.-[SiThkZ]/2" />
<rRotation name="rotations:000D" />
</PosPart>
<!-- Copy the PLT into the PLTBCM volume -->
<!-- NOTE: The 2mm shift is due to the new tracker volume to make the plt planes positioned in |z| correctly.-->
<PosPart copyNumber="1">
<rParent name="pltbcm:PLTBCM"/>
<rChild name="PLT"/>
<rChild name="plt:PLT"/>
<Translation x="0.*mm" y="0.*mm" z="[SiPlane1ZtoCenter]-[pltbcm:PltBcmZ]-2.*mm" />
<rRotation name="rotations:000D"/>
</PosPart>
Expand All @@ -151,8 +151,8 @@
</PosPart> -->
<!-- Copy the telescopes into the PLT volume starting with phi=112.5 degrees. RotateSolid vector gives correct orientation of the planes-->
<Algorithm name="global:DDAngular">
<rParent name="PLT"/>
<String name="ChildName" value="Telescope"/>
<rParent name="plt:PLT"/>
<String name="ChildName" value="plt:Telescope"/>
<Numeric name="StartCopyNo" value="0"/>
<Numeric name="IncrCopyNo" value="1"/>
<Numeric name="N" value="8"/>
Expand Down
4 changes: 2 additions & 2 deletions Geometry/ForwardCommonData/data/pltbcm/2021/v1/pltbcm.xml
View file
Expand Up @@ -28,13 +28,13 @@
<!-- Volumes in -Z and +Z -->
<PosPart copyNumber="1">
<rParent name="pixfwd:PixelForwardZplus"/>
<rChild name="PLTBCM"/>
<rChild name="pltbcm:PLTBCM"/>
<rRotation name="rotations:000D"/>
<Translation x="0*fm" y="0*fm" z="([PltBcmZ]-[pixfwd:ZPixelForward])"/>
</PosPart>
<PosPart copyNumber="2">
<rParent name="pixfwd:PixelForwardZminus"/>
<rChild name="PLTBCM"/>
<rChild name="pltbcm:PLTBCM"/>
<rRotation name="pixfwdCommon:Y180"/>
<Translation x="0*fm" y="0*fm" z="-([PltBcmZ]-[pixfwd:ZPixelForward])"/>
</PosPart>
Expand Down
2 changes: 2 additions & 0 deletions Geometry/MuonCommonData/data/muonNumbering/2021/v5/muonNumbering.xml
View file
Expand Up @@ -281,6 +281,8 @@
<PartSelector path="//RT1C"/>
<PartSelector path="//RTXU"/>
<PartSelector path="//RTXUR"/>
<PartSelector path="//RT3G"/>
<PartSelector path="//RT4H"/>
<Parameter name="CopyNoTag" value="[mr_esector]"/>
</SpecPar>
<SpecPar name="MuonRpcEndcapChamberB1">
Expand Down
2 changes: 1 addition & 1 deletion Geometry/MuonCommonData/data/rpcf/2021/v1/rpcf.xml
View file
Expand Up @@ -541,7 +541,7 @@
<rParent name="rpcf:RR3XXP"/>
<String name="ChildName" value="RT3G"/>
<String name="RotNameSpace" value="rotations"/>
<Numeric name="n" value="9"/>
<Numeric name="n" value="1"/>
<Numeric name="startCopyNo" value="16"/>
<Numeric name="incrCopyNo" value="2"/>
<Numeric name="stepAngle" value="40*deg"/>
Expand Down

0 comments on commit 5967106

Please sign in to comment.