Skip to content

Commit cabe5cd

Browse files
nclopezonclopezo
committed
Merge pull request cms-sw#2646 from robervalwalsh/my-710pre3-bril-geometry
 Geometry -- 710pre3 tracker-lumi geometry
2 parents 58da440 + 281184a commit cabe5cd

File tree

9 files changed

+662
-164
lines changed

9 files changed

+662
-164
lines changed

‎Geometry/CMSCommonData/data/materials.xml

+5
Original file line numberDiff line numberDiff line change
@@ -4459,5 +4459,10 @@
44594459
<rMaterial name="materials:Oxygen"/>
44604460
</MaterialFraction>
44614461
</CompositeMaterial>
4462+
<CompositeMaterial name="Diamond" density="3.52*g/cm3" symbol=" " method="mixture by weight">
4463+
<MaterialFraction fraction="1.00">
4464+
<rMaterial name="materials:Carbon"/>
4465+
</MaterialFraction>
4466+
</CompositeMaterial>
44624467
</MaterialSection>
44634468
</DDDefinition>

‎Geometry/CMSCommonData/python/cmsExtendedGeometryTest2014XML_cfi.py

+6-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
geomXMLFiles = cms.vstring('Geometry/CMSCommonData/data/materials.xml',
55
'Geometry/CMSCommonData/data/rotations.xml',
66
'Geometry/CMSCommonData/data/extend/cmsextent.xml',
7-
'Geometry/CMSCommonData/data/cms.xml',
7+
'Geometry/TrackerCommonData/data/test2014/cms.xml',
88
'Geometry/CMSCommonData/data/cmsMother.xml',
99
'Geometry/CMSCommonData/data/cmsTracker.xml',
1010
'Geometry/CMSCommonData/data/caloBase.xml',
@@ -31,7 +31,7 @@
3131
'Geometry/TrackerCommonData/data/pixfwdNipple.xml',
3232
'Geometry/TrackerCommonData/data/pixfwdDisk.xml',
3333
'Geometry/TrackerCommonData/data/pixfwdCylinder.xml',
34-
'Geometry/TrackerCommonData/data/pixfwd.xml',
34+
'Geometry/TrackerCommonData/data/test2014/pixfwd.xml',
3535
'Geometry/TrackerCommonData/data/test2014/pixbarmaterial.xml',
3636
'Geometry/TrackerCommonData/data/pixbarladder.xml',
3737
'Geometry/TrackerCommonData/data/pixbarladderfull.xml',
@@ -185,7 +185,7 @@
185185
'Geometry/TrackerCommonData/data/tecbackplate.xml',
186186
'Geometry/TrackerCommonData/data/tec.xml',
187187
'Geometry/TrackerCommonData/data/test2014/trackermaterial.xml',
188-
'Geometry/TrackerCommonData/data/tracker.xml',
188+
'Geometry/TrackerCommonData/data/test2014/tracker.xml',
189189
'Geometry/TrackerCommonData/data/trackerpixbar.xml',
190190
'Geometry/TrackerCommonData/data/trackerpixfwd.xml',
191191
'Geometry/TrackerCommonData/data/trackertibtidservices.xml',
@@ -238,6 +238,9 @@
238238
'Geometry/ForwardCommonData/data/zdc.xml',
239239
'Geometry/ForwardCommonData/data/zdclumi.xml',
240240
'Geometry/ForwardCommonData/data/cmszdc.xml')+cms.vstring(
241+
'Geometry/ForwardCommonData/data/pltbcm.xml',
242+
'Geometry/ForwardCommonData/data/bcm1f.xml',
243+
'Geometry/ForwardCommonData/data/plt.xml',
241244
'Geometry/MuonCommonData/data/muonNumbering.xml',
242245
'Geometry/TrackerCommonData/data/trackerStructureTopology.xml',
243246
'Geometry/TrackerSimData/data/trackersens.xml',

‎Geometry/ForwardCommonData/data/bcm1f.xml

+98
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
<?xml version="1.0"?>
2+
<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">
3+
<ConstantsSection label="bcm1f">
4+
<!-- dimensions of the bcm1f volume -->
5+
<Constant name="Bcm1Z1" value="1.800*m"/>
6+
<Constant name="Bcm1Z2" value="1.900*m"/>
7+
<Constant name="Bcm1fZ" value="([Bcm1Z2]+[Bcm1Z1])/2"/> <!-- z position of the centre of bcm1f volume wrt to CMS -->
8+
<Constant name="Bcm1fThickness" value="([Bcm1Z2]-[Bcm1Z1])"/>
9+
<Constant name="Bcm1fInnerRadius" value="[cms:TrackBeamR1]"/>
10+
<Constant name="Bcm1fOuterRadius" value="[cms:TrackLumiR1]"/>
11+
<!-- dimensions of the diamonds -->
12+
<Constant name="DiamondLX" value="5.0*mm"/>
13+
<Constant name="DiamondLY" value="5.0*mm"/>
14+
<Constant name="DiamondLZ" value="0.5*mm"/>
15+
<Constant name="DiamondZ" value="1814*mm"/> <!-- z position of the centre of the diamond wrt CMS -->
16+
<!-- dimensions of the effective (metallised) sensitive area -->
17+
<Constant name="SensorLX" value="[DiamondLX]*0.95"/>
18+
<Constant name="SensorLY" value="[DiamondLY]*0.95/2"/>
19+
<Constant name="SensorLZ" value="[DiamondLZ]"/>
20+
<Constant name="SensorGap" value="0.01*mm"/>
21+
<Constant name="SensorShift" value="[SensorLY]/2+[SensorGap]/2"/>
22+
<!-- location of the sensors in rho-z with respect to CMS (0,0,0) -->
23+
<Constant name="SensorRho" value="70.5*mm"/>
24+
<Constant name="SensorZ" value="[DiamondZ]"/>
25+
</ConstantsSection>
26+
27+
<!-- Create geometrical shapes -->
28+
<SolidSection label="bcm1f">
29+
<Tubs name="BCM1F" rMin="[Bcm1fInnerRadius]" rMax="[Bcm1fOuterRadius]" dz="[Bcm1fThickness]/2" startPhi="0*deg" deltaPhi="360*deg"/>
30+
<Box name="BCM1FDiamond" dx="[DiamondLX]/2" dy="[DiamondLY]/2" dz="[DiamondLZ]/2"/>
31+
<Box name="BCM1FSensor" dx="[SensorLX]/2" dy="[SensorLY]/2" dz="[SensorLZ]/2"/>
32+
</SolidSection>
33+
34+
<!-- Define the materials of the geometrical shapes -->
35+
<LogicalPartSection label="bcm1f">
36+
37+
<LogicalPart name="BCM1F" category="unspecified">
38+
<rSolid name="BCM1F"/>
39+
<rMaterial name="materials:Air"/>
40+
</LogicalPart>
41+
42+
<LogicalPart name="BCM1FDiamond" category="unspecified">
43+
<rSolid name="BCM1FDiamond"/>
44+
<rMaterial name="materials:Diamond"/>
45+
</LogicalPart>
46+
47+
<LogicalPart name="BCM1FSensor" category="unspecified">
48+
<rSolid name="BCM1FSensor"/>
49+
<rMaterial name="materials:Diamond"/>
50+
</LogicalPart>
51+
52+
</LogicalPartSection>
53+
54+
<!-- Position -->
55+
<PosPartSection label="bcm1f">
56+
57+
<!-- Planes -->
58+
<PosPart copyNumber="1">
59+
<rParent name="pltbcm:PLTBCM"/>
60+
<rChild name="BCM1F"/>
61+
<rRotation name="rotations:000D"/>
62+
<Translation x="0*fm" y="0*fm" z="[Bcm1fZ]-[pltbcm:PltBcmZ]"/>
63+
</PosPart>
64+
65+
<!-- Diamonds -->
66+
<Algorithm name="global:DDAngular">
67+
<rParent name="BCM1F"/>
68+
<String name="ChildName" value="BCM1FDiamond"/>
69+
<Numeric name="StartCopyNo" value="1"/>
70+
<Numeric name="IncrCopyNo" value="1"/>
71+
<Numeric name="N" value="12"/>
72+
<Numeric name="Radius" value="[SensorRho]"/>
73+
<Numeric name="StartAngle" value="120*deg"/>
74+
<Numeric name="RangeAngle" value="360*deg"/>
75+
<Vector name="Center" type="numeric" nEntries="3"> 0, 0, ([DiamondZ]-[Bcm1fZ]) </Vector>
76+
<Vector name="RotateSolid" type="numeric" nEntries="36">
77+
0.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg,
78+
0.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg,
79+
0.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg, 0.*deg
80+
</Vector>
81+
</Algorithm>
82+
83+
<!-- Sensors -->
84+
<PosPart copyNumber="1">
85+
<rParent name="BCM1FDiamond"/>
86+
<rChild name="BCM1FSensor"/>
87+
<rRotation name="rotations:000D"/>
88+
<Translation x="0*fm" y="-[SensorShift]" z="0*fm"/>
89+
</PosPart>
90+
<PosPart copyNumber="2">
91+
<rParent name="BCM1FDiamond"/>
92+
<rChild name="BCM1FSensor"/>
93+
<rRotation name="rotations:000D"/>
94+
<Translation x="0*fm" y="[SensorShift]" z="0*fm"/>
95+
</PosPart>
96+
</PosPartSection>
97+
98+
</DDDefinition>

‎Geometry/ForwardCommonData/data/forward.xml

-19
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
<Constant name="CastorL1" value="1.6165*m"/>
1010
<Constant name="CastorL2" value="1.334*m"/>
1111
<Constant name="CastorZ1" value="[cms:ForwdDetsZ1]-[CastorL1]"/>
12-
<Constant name="PLTdZ" value="([cms:TrackLumiZ2]-[cms:TrackLumiZ1])/2"/>
13-
<Constant name="PLTZ" value="([cms:TrackLumiZ2]+[cms:TrackLumiZ1])/2"/>
1412
</ConstantsSection>
1513
<SolidSection label="forward.xml">
1614
<Polycone name="TotemT1" startPhi="0*deg" deltaPhi="360*deg">
@@ -33,7 +31,6 @@
3331
<ZSection z="[CastorL2]" rMin="[cms:ForwdBeamR4]" rMax="[cms:ForwdDetsR1]"/>
3432
<ZSection z="[CastorL1]" rMin="[cms:ForwdDetsR1]" rMax="[cms:ForwdDetsR1]"/>
3533
</Polycone>
36-
<Tubs name="PLT" rMin="[cms:TrackBeamR1]" rMax="[cms:TrackLumiR1]" dz="[PLTdZ]" startPhi="0*deg" deltaPhi="360*deg"/>
3734
</SolidSection>
3835
<LogicalPartSection label="forward.xml">
3936
<LogicalPart name="TotemT1" category="unspecified">
@@ -52,10 +49,6 @@
5249
<rSolid name="Castor"/>
5350
<rMaterial name="materials:Air"/>
5451
</LogicalPart>
55-
<LogicalPart name="PLT" category="unspecified">
56-
<rSolid name="PLT"/>
57-
<rMaterial name="materials:Air"/>
58-
</LogicalPart>
5952
</LogicalPartSection>
6053
<PosPartSection label="forward.xml">
6154
<PosPart copyNumber="1">
@@ -90,17 +83,5 @@
9083
<rRotation name="rotations:180D"/>
9184
<Translation x="0*fm" y="0*fm" z="-[CastorZ1]"/>
9285
</PosPart>
93-
<PosPart copyNumber="1">
94-
<rParent name="cms:CMSE"/>
95-
<rChild name="forward:PLT"/>
96-
<rRotation name="rotations:000D"/>
97-
<Translation x="0*fm" y="0*fm" z="[PLTZ]"/>
98-
</PosPart>
99-
<PosPart copyNumber="2">
100-
<rParent name="cms:CMSE"/>
101-
<rChild name="forward:PLT"/>
102-
<rRotation name="rotations:180D"/>
103-
<Translation x="0*fm" y="0*fm" z="-[PLTZ]"/>
104-
</PosPart>
10586
</PosPartSection>
10687
</DDDefinition>

0 commit comments

Comments
 (0)