Skip to content

Commit a5b80a1

Browse files
cvuosalocvuosalo
committed
Remove files with only name changes
1 parent d2b14d5 commit a5b80a1

File tree

5 files changed

+16
-18
lines changed

5 files changed

+16
-18
lines changed

‎Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdInnerDiskZminus.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<!-- support ring solids - refer to outer disk comments -->
1212
<Algorithm name="track:DDCutTubsFromPoints">
1313
<rParent name="pixfwdDisks:PixelForwardDiskZminus"/>
14-
<String name="SolidName" value="PixelForwardInnerDiskOuterRingZminus"/>
14+
<String name="SolidName" value="PixelForwardInnerDiskOuterRing"/>
1515
<String name="Material" value="pixfwdMaterials:C_C_InnerOuterRing"/>
1616
<Numeric name="zPos" value="[OuterRingZ]"/>
1717
<Numeric name="rMin" value="[pixfwdSupportRingParameters:InnerDiskOuterRingRMin]"/>
@@ -22,7 +22,7 @@
2222
</Algorithm>
2323
<Algorithm name="track:DDCutTubsFromPoints">
2424
<rParent name="pixfwdDisks:PixelForwardDiskZminus"/>
25-
<String name="SolidName" value="PixelForwardInnerDiskCFOuterRingZminus"/>
25+
<String name="SolidName" value="PixelForwardInnerDiskCFOuterRing"/>
2626
<String name="Material" value="pixfwdMaterials:FPix_CFSkin_InnerOuterRing"/>
2727
<Numeric name="zPos" value="[OuterRingZ]"/>
2828
<Numeric name="rMin" value="[pixfwdSupportRingParameters:InnerDiskOuterRingCFRMin]"/>
@@ -33,7 +33,7 @@
3333
</Algorithm>
3434
<Algorithm name="track:DDCutTubsFromPoints">
3535
<rParent name="pixfwdDisks:PixelForwardDiskZminus"/>
36-
<String name="SolidName" value="PixelForwardInnerDiskInnerRingZminus"/>
36+
<String name="SolidName" value="PixelForwardInnerDiskInnerRing"/>
3737
<String name="Material" value="pixfwdMaterials:C_C_InnerInnerRing"/>
3838
<Numeric name="zPos" value="[InnerRingZ]"/>
3939
<Numeric name="rMin" value="[pixfwdSupportRingParameters:InnerDiskInnerRingRMin]"/>
@@ -44,7 +44,7 @@
4444
</Algorithm>
4545
<Algorithm name="track:DDCutTubsFromPoints">
4646
<rParent name="pixfwdDisks:PixelForwardDiskZminus"/>
47-
<String name="SolidName" value="PixelForwardInnerDiskCFInnerRingZminus"/>
47+
<String name="SolidName" value="PixelForwardInnerDiskCFInnerRing"/>
4848
<String name="Material" value="pixfwdMaterials:FPix_CFSkin_InnerInnerRing"/>
4949
<Numeric name="zPos" value="[InnerRingZ]"/>
5050
<Numeric name="rMin" value="[pixfwdSupportRingParameters:InnerDiskInnerRingCFRMin]"/>

‎Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdInnerDiskZplus.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<!-- support ring solids - refer to outer disk comments -->
1212
<Algorithm name="track:DDCutTubsFromPoints">
1313
<rParent name="pixfwdDisks:PixelForwardDiskZplus"/>
14-
<String name="SolidName" value="PixelForwardInnerDiskOuterRingZplus"/>
14+
<String name="SolidName" value="PixelForwardInnerDiskOuterRing"/>
1515
<String name="Material" value="pixfwdMaterials:C_C_InnerOuterRing"/>
1616
<Numeric name="zPos" value="[OuterRingZ]"/>
1717
<Numeric name="rMin" value="[pixfwdSupportRingParameters:InnerDiskOuterRingRMin]"/>
@@ -22,7 +22,7 @@
2222
</Algorithm>
2323
<Algorithm name="track:DDCutTubsFromPoints">
2424
<rParent name="pixfwdDisks:PixelForwardDiskZplus"/>
25-
<String name="SolidName" value="PixelForwardInnerDiskCFOuterRingZplus"/>
25+
<String name="SolidName" value="PixelForwardInnerDiskCFOuterRing"/>
2626
<String name="Material" value="pixfwdMaterials:FPix_CFSkin_InnerOuterRing"/>
2727
<Numeric name="zPos" value="[OuterRingZ]"/>
2828
<Numeric name="rMin" value="[pixfwdSupportRingParameters:InnerDiskOuterRingCFRMin]"/>
@@ -33,7 +33,7 @@
3333
</Algorithm>
3434
<Algorithm name="track:DDCutTubsFromPoints">
3535
<rParent name="pixfwdDisks:PixelForwardDiskZplus"/>
36-
<String name="SolidName" value="PixelForwardInnerDiskInnerRingZplus"/>
36+
<String name="SolidName" value="PixelForwardInnerDiskInnerRing"/>
3737
<String name="Material" value="pixfwdMaterials:C_C_InnerInnerRing"/>
3838
<Numeric name="zPos" value="[InnerRingZ]"/>
3939
<Numeric name="rMin" value="[pixfwdSupportRingParameters:InnerDiskInnerRingRMin]"/>
@@ -44,7 +44,7 @@
4444
</Algorithm>
4545
<Algorithm name="track:DDCutTubsFromPoints">
4646
<rParent name="pixfwdDisks:PixelForwardDiskZplus"/>
47-
<String name="SolidName" value="PixelForwardInnerDiskCFInnerRingZplus"/>
47+
<String name="SolidName" value="PixelForwardInnerDiskCFInnerRing"/>
4848
<String name="Material" value="pixfwdMaterials:FPix_CFSkin_InnerInnerRing"/>
4949
<Numeric name="zPos" value="[InnerRingZ]"/>
5050
<Numeric name="rMin" value="[pixfwdSupportRingParameters:InnerDiskInnerRingCFRMin]"/>

‎Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdOuterDiskZminus.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
-->
2121
<Algorithm name="track:DDCutTubsFromPoints">
2222
<rParent name="pixfwdDisks:PixelForwardDiskZminus"/>
23-
<String name="SolidName" value="PixelForwardOuterDiskOuterRingZminus"/>
23+
<String name="SolidName" value="PixelForwardOuterDiskOuterRing"/>
2424
<String name="Material" value="pixfwdMaterials:C_C_OuterOuterRing"/>
2525
<Numeric name="zPos" value="[OuterRingZ]"/>
2626
<Numeric name="rMin" value="[pixfwdSupportRingParameters:OuterDiskOuterRingRMin]"/>
@@ -31,7 +31,7 @@
3131
</Algorithm>
3232
<Algorithm name="track:DDCutTubsFromPoints">
3333
<rParent name="pixfwdDisks:PixelForwardDiskZminus"/>
34-
<String name="SolidName" value="PixelForwardOuterDiskCFOuterRingZminus"/>
34+
<String name="SolidName" value="PixelForwardOuterDiskCFOuterRing"/>
3535
<String name="Material" value="pixfwdMaterials:FPix_CFSkin_OuterOuterRing"/>
3636
<Numeric name="zPos" value="[OuterRingZ]"/>
3737
<Numeric name="rMin" value="[pixfwdSupportRingParameters:OuterDiskOuterRingCFRMin]"/>
@@ -42,7 +42,7 @@
4242
</Algorithm>
4343
<Algorithm name="track:DDCutTubsFromPoints">
4444
<rParent name="pixfwdDisks:PixelForwardDiskZminus"/>
45-
<String name="SolidName" value="PixelForwardOuterDiskInnerRingZminus"/>
45+
<String name="SolidName" value="PixelForwardOuterDiskInnerRing"/>
4646
<String name="Material" value="pixfwdMaterials:C_C_OuterInnerRing"/>
4747
<Numeric name="zPos" value="[InnerRingZ]"/>
4848
<Numeric name="rMin" value="[pixfwdSupportRingParameters:OuterDiskInnerRingRMin]"/>
@@ -53,7 +53,7 @@
5353
</Algorithm>
5454
<Algorithm name="track:DDCutTubsFromPoints">
5555
<rParent name="pixfwdDisks:PixelForwardDiskZminus"/>
56-
<String name="SolidName" value="PixelForwardOuterDiskCFInnerRingZminus"/>
56+
<String name="SolidName" value="PixelForwardOuterDiskCFInnerRing"/>
5757
<String name="Material" value="pixfwdMaterials:FPix_CFSkin_OuterInnerRing"/>
5858
<Numeric name="zPos" value="[InnerRingZ]"/>
5959
<Numeric name="rMin" value="[pixfwdSupportRingParameters:OuterDiskInnerRingCFRMin]"/>

‎Geometry/TrackerCommonData/data/PhaseI/v2/pixfwdOuterDiskZplus.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
-->
2121
<Algorithm name="track:DDCutTubsFromPoints">
2222
<rParent name="pixfwdDisks:PixelForwardDiskZplus"/>
23-
<String name="SolidName" value="PixelForwardOuterDiskOuterRingZplus"/>
23+
<String name="SolidName" value="PixelForwardOuterDiskOuterRing"/>
2424
<String name="Material" value="pixfwdMaterials:C_C_OuterOuterRing"/>
2525
<Numeric name="zPos" value="[OuterRingZ]"/>
2626
<Numeric name="rMin" value="[pixfwdSupportRingParameters:OuterDiskOuterRingRMin]"/>
@@ -31,7 +31,7 @@
3131
</Algorithm>
3232
<Algorithm name="track:DDCutTubsFromPoints">
3333
<rParent name="pixfwdDisks:PixelForwardDiskZplus"/>
34-
<String name="SolidName" value="PixelForwardOuterDiskCFOuterRingZplus"/>
34+
<String name="SolidName" value="PixelForwardOuterDiskCFOuterRing"/>
3535
<String name="Material" value="pixfwdMaterials:FPix_CFSkin_OuterOuterRing"/>
3636
<Numeric name="zPos" value="[OuterRingZ]"/>
3737
<Numeric name="rMin" value="[pixfwdSupportRingParameters:OuterDiskOuterRingCFRMin]"/>
@@ -42,7 +42,7 @@
4242
</Algorithm>
4343
<Algorithm name="track:DDCutTubsFromPoints">
4444
<rParent name="pixfwdDisks:PixelForwardDiskZplus"/>
45-
<String name="SolidName" value="PixelForwardOuterDiskInnerRingZplus"/>
45+
<String name="SolidName" value="PixelForwardOuterDiskInnerRing"/>
4646
<String name="Material" value="pixfwdMaterials:C_C_OuterInnerRing"/>
4747
<Numeric name="zPos" value="[InnerRingZ]"/>
4848
<Numeric name="rMin" value="[pixfwdSupportRingParameters:OuterDiskInnerRingRMin]"/>
@@ -53,7 +53,7 @@
5353
</Algorithm>
5454
<Algorithm name="track:DDCutTubsFromPoints">
5555
<rParent name="pixfwdDisks:PixelForwardDiskZplus"/>
56-
<String name="SolidName" value="PixelForwardOuterDiskCFInnerRingZplus"/>
56+
<String name="SolidName" value="PixelForwardOuterDiskCFInnerRing"/>
5757
<String name="Material" value="pixfwdMaterials:FPix_CFSkin_OuterInnerRing"/>
5858
<Numeric name="zPos" value="[InnerRingZ]"/>
5959
<Numeric name="rMin" value="[pixfwdSupportRingParameters:OuterDiskInnerRingCFRMin]"/>

‎Geometry/TrackerCommonData/plugins/dd4hep/DDTECModuleAlgo.cc‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,6 @@ static long algorithm(Detector& /* description */, cms::DDParsingContext& ctxt,
409409
dy = 0.5 * pitchThick;
410410
dz = 0.5 * pitchHeight;
411411
solid = Box(dx, dy, dz);
412-
name += "Box";
413412
ns.addSolidNS(name, solid);
414413
edm::LogVerbatim("TECGeom") << "Solid:\t" << name << " " << solid.name() << " Box made of " << pitchMat
415414
<< " of dimensions " << dx << ", " << dy << ", " << dz;
@@ -420,7 +419,6 @@ static long algorithm(Detector& /* description */, cms::DDParsingContext& ctxt,
420419
bl2 = 0.5 * pitchHeight - 0.5 * dz * sin(detTilt);
421420
thet = atan((bl1 - bl2) / (2. * dz));
422421
solid = Trap(dz, thet, 0, h1, bl1, bl1, 0, h1, bl2, bl2, 0);
423-
name += "Trap";
424422
ns.addSolidNS(name, solid);
425423
edm::LogVerbatim("TECGeom") << "Solid:\t" << name << " " << solid.name() << " Trap made of " << pitchMat
426424
<< " of dimensions " << dz << ", " << convertRadToDeg(thet) << ", 0, " << h1 << ", "

0 commit comments

Comments
 (0)