From cafca1f6f14eeff86a3524b39819e55046dc9422 Mon Sep 17 00:00:00 2001
From: Jacek Kusnierz <jacek.andrzej.kusnierz@cern.ch>
Date: Tue, 6 Aug 2019 13:30:33 +0200
Subject: [PATCH 1/9] add new geometry

---
 .../python/geometryRPFromDD_2021_cfi.py       | 152 ++++++++++++++++++
 1 file changed, 152 insertions(+)
 create mode 100644 Geometry/VeryForwardGeometry/python/geometryRPFromDD_2021_cfi.py

diff --git a/Geometry/VeryForwardGeometry/python/geometryRPFromDD_2021_cfi.py b/Geometry/VeryForwardGeometry/python/geometryRPFromDD_2021_cfi.py
new file mode 100644
index 0000000000000..1c8c84e19abb2
--- /dev/null
+++ b/Geometry/VeryForwardGeometry/python/geometryRPFromDD_2021_cfi.py
@@ -0,0 +1,152 @@
+import FWCore.ParameterSet.Config as cms
+
+# common and strip files
+totemGeomXMLFiles = cms.vstring(
+    'Geometry/CMSCommonData/data/materials.xml',
+    'Geometry/CMSCommonData/data/rotations.xml',
+    'Geometry/CMSCommonData/data/extend/cmsextent.xml',
+    'Geometry/CMSCommonData/data/cms/2017/v1/cms.xml',
+    'Geometry/CMSCommonData/data/beampipe/2017/v1/beampipe.xml',
+    'Geometry/CMSCommonData/data/cmsBeam.xml',
+    'Geometry/CMSCommonData/data/cmsMother.xml',
+    'Geometry/CMSCommonData/data/mgnt.xml',
+    'Geometry/ForwardCommonData/data/forward.xml',
+    'Geometry/ForwardCommonData/data/totemRotations.xml',
+    'Geometry/ForwardCommonData/data/totemMaterials.xml',
+    'Geometry/ForwardCommonData/data/totemt1.xml',
+    'Geometry/ForwardCommonData/data/totemt2.xml',
+    'Geometry/ForwardCommonData/data/ionpump.xml',
+    'Geometry/VeryForwardData/data/RP_Box.xml',
+    'Geometry/VeryForwardData/data/RP_Box/RP_Box_000.xml',
+    'Geometry/VeryForwardData/data/RP_Box/RP_Box_001.xml',
+    'Geometry/VeryForwardData/data/RP_Box/RP_Box_002.xml',
+    'Geometry/VeryForwardData/data/RP_Box/RP_Box_003.xml',
+    'Geometry/VeryForwardData/data/RP_Box/RP_Box_004.xml',
+    'Geometry/VeryForwardData/data/RP_Box/RP_Box_005.xml',
+    'Geometry/VeryForwardData/data/RP_Box/RP_Box_020.xml',
+    'Geometry/VeryForwardData/data/RP_Box/RP_Box_021.xml',
+    'Geometry/VeryForwardData/data/RP_Box/RP_Box_022.xml',
+    'Geometry/VeryForwardData/data/RP_Box/RP_Box_023.xml',
+    'Geometry/VeryForwardData/data/RP_Box/RP_Box_024.xml',
+    'Geometry/VeryForwardData/data/RP_Box/RP_Box_025.xml',
+    'Geometry/VeryForwardData/data/RP_Box/RP_Box_100.xml',
+    'Geometry/VeryForwardData/data/RP_Box/RP_Box_101.xml',
+    'Geometry/VeryForwardData/data/RP_Box/RP_Box_102.xml',
+    'Geometry/VeryForwardData/data/RP_Box/2018/RP_Box_103.xml',
+    'Geometry/VeryForwardData/data/RP_Box/RP_Box_104.xml',
+    'Geometry/VeryForwardData/data/RP_Box/RP_Box_105.xml',
+    'Geometry/VeryForwardData/data/RP_Box/RP_Box_120.xml',
+    'Geometry/VeryForwardData/data/RP_Box/RP_Box_121.xml',
+    'Geometry/VeryForwardData/data/RP_Box/RP_Box_122.xml',
+    'Geometry/VeryForwardData/data/RP_Box/RP_Box_123.xml',
+    'Geometry/VeryForwardData/data/RP_Box/RP_Box_124.xml',
+    'Geometry/VeryForwardData/data/RP_Box/RP_Box_125.xml',
+    'Geometry/VeryForwardData/data/RP_Hybrid.xml',
+    'Geometry/VeryForwardData/data/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_022.xml',
+#    'Geometry/VeryForwardData/data/RP_Detectors_Assembly/CTPPS_Diamond_Detector_Assembly_022.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_122.xml',
+#    'Geometry/VeryForwardData/data/RP_Detectors_Assembly/CTPPS_Diamond_Detector_Assembly_122.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.xml',
+    'Geometry/VeryForwardData/data/RP_Vertical_Device.xml',
+    'Geometry/VeryForwardData/data/RP_Horizontal_Device.xml',
+    'Geometry/VeryForwardData/data/RP_220_Right_Station.xml',
+    'Geometry/VeryForwardData/data/RP_220_Left_Station.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Pixel_2018/RP_147_Right_Station.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Pixel_2018/RP_147_Left_Station.xml',
+    'Geometry/VeryForwardData/data/RP_Stations_Assembly.xml',
+    'Geometry/VeryForwardData/data/RP_Sensitive_Dets.xml',
+    'Geometry/VeryForwardData/data/RP_Cuts_Per_Region.xml',
+    'Geometry/VeryForwardData/data/RP_Param_Beam_Region.xml'
+    )
+
+# diamond files
+ctppsDiamondGeomXMLFiles = cms.vstring(
+    'Geometry/VeryForwardData/data/CTPPS_Diamond_Materials.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Diamond_Transformations.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Diamond_X_Distance.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Diamond_Parameters.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Timing_Station_Parameters.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Timing_Horizontal_Pot.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Timing_Positive_Station.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Timing_Negative_Station.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Timing_Stations_Assembly.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_2018/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane1.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Diamond_2018/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane2.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Diamond_2018/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane3.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Diamond_2018/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane4.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Diamond_2018/CTPPS_Diamond_Detector_Assembly.xml'
+    )
+
+# UFSD files
+ctppsUFSDGeomXMLFiles = cms.vstring(
+    # UFSDetectors
+    'Geometry/VeryForwardData/data/CTPPS_UFSD_Segments/CTPPS_UFSD_Pattern1.xml',
+    'Geometry/VeryForwardData/data/CTPPS_UFSD_Segments/CTPPS_UFSD_Pattern2_SegmentA.xml',
+    'Geometry/VeryForwardData/data/CTPPS_UFSD_Segments/CTPPS_UFSD_Pattern2_SegmentB.xml',
+    'Geometry/VeryForwardData/data/CTPPS_UFSD_Planes/CTPPS_UFSD_Plane4.xml',
+    'Geometry/VeryForwardData/data/CTPPS_UFSD_Parameters.xml',
+    )
+
+# Totem Timing files
+totemTimingGeomXMLFiles = cms.vstring(
+    # UFSDetectors
+    'Geometry/VeryForwardData/data/TotemTiming/TotemTiming_Dist_Beam_Cent.xml',
+    'Geometry/VeryForwardData/data/TotemTiming/TotemTiming_DetectorAssembly.xml',
+    'Geometry/VeryForwardData/data/TotemTiming/TotemTiming_Parameters.xml',
+    'Geometry/VeryForwardData/data/TotemTiming/TotemTiming_Plane.xml',
+    'Geometry/VeryForwardData/data/TotemTiming/TotemTiming_Station.xml',
+    )
+
+# pixel files
+ctppsPixelGeomXMLFiles = cms.vstring(
+    'Geometry/VeryForwardData/data/ppstrackerMaterials.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Pixel_Module.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Pixel_Module_2x2.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Pixel_2018/CTPPS_Pixel_Assembly_Box_Real_023.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Pixel_2018/CTPPS_Pixel_Assembly_Box_Real_123.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Pixel_2018/CTPPS_Pixel_Assembly_Box_Real_003.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Pixel_2018/CTPPS_Pixel_Assembly_Box_Real_103.xml',
+    'Geometry/VeryForwardData/data/CTPPS_Pixel_Sens.xml'
+    )
+
+XMLIdealGeometryESSource_CTPPS = cms.ESSource("XMLIdealGeometryESSource",
+                                              geomXMLFiles = totemGeomXMLFiles + ctppsDiamondGeomXMLFiles + ctppsUFSDGeomXMLFiles + totemTimingGeomXMLFiles + ctppsPixelGeomXMLFiles,
+                                              rootNodeName = cms.string('cms:CMSE')
+                                              )
+
+# position of RPs
+XMLIdealGeometryESSource_CTPPS.geomXMLFiles.append("Geometry/VeryForwardData/data/2016_ctpps_15sigma_margin0/RP_Dist_Beam_Cent.xml")
+
+ctppsGeometryESModule = cms.ESProducer("CTPPSGeometryESModule",
+                                       verbosity = cms.untracked.uint32(1),
+                                       compactViewTag = cms.string('XMLIdealGeometryESSource_CTPPS')
+                                       )

From 4935ae8d65db04c3a33fe23958719d82c141d33f Mon Sep 17 00:00:00 2001
From: Jacek Kusnierz <jacek.andrzej.kusnierz@cern.ch>
Date: Wed, 11 Sep 2019 12:09:35 +0200
Subject: [PATCH 2/9] Add New Geometry XML

---
 .../data/CTPPS_2021/RP_Dist_Beam_Cent.xml     |  49 ++++
 .../CTPPS_Diamond_Detector_Assembly.xml       |  86 ++++++
 .../CTPPS_Diamond_Plane1.xml                  | 266 +++++++++++++++++
 .../CTPPS_Diamond_Plane1_new.xml              | 268 ++++++++++++++++++
 .../CTPPS_Diamond_Plane2.xml                  | 266 +++++++++++++++++
 .../CTPPS_Diamond_Plane2_new.xml              | 268 ++++++++++++++++++
 .../CTPPS_Diamond_Plane3.xml                  | 268 ++++++++++++++++++
 .../CTPPS_Diamond_Plane4.xml                  | 268 ++++++++++++++++++
 8 files changed, 1739 insertions(+)
 create mode 100644 Geometry/VeryForwardData/data/CTPPS_2021/RP_Dist_Beam_Cent.xml
 create mode 100644 Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Detector_Assembly.xml
 create mode 100644 Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane1.xml
 create mode 100644 Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane1_new.xml
 create mode 100644 Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane2.xml
 create mode 100644 Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane2_new.xml
 create mode 100644 Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane3.xml
 create mode 100644 Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane4.xml

diff --git a/Geometry/VeryForwardData/data/CTPPS_2021/RP_Dist_Beam_Cent.xml b/Geometry/VeryForwardData/data/CTPPS_2021/RP_Dist_Beam_Cent.xml
new file mode 100644
index 0000000000000..b29d521e03b3a
--- /dev/null
+++ b/Geometry/VeryForwardData/data/CTPPS_2021/RP_Dist_Beam_Cent.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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">
+<!-- Generated by makeOfflineGeometry on 07 Jun 2016 12:43:13
+	time: 1464650000
+	offset file: /afs/cern.ch/exp/totem/scratch/data/RP/tools/measurement_offsets/zero_offsets
+	sensor type: RESOLVER
+-->
+	<ConstantsSection label="RP_Dist_Beam_Cent.xml">
+		<!-- sector 45, 210m station -->
+		<Constant name="RP_147_Left_Det_Dist_0" value=" +9.129*mm"/> <!-- RESOLVER:  +9.129, offset:  +0.000 -->
+		<Constant name="RP_147_Left_Det_Dist_1" value=" +8.885*mm"/> <!-- RESOLVER:  +8.885, offset:  +0.000 -->
+		<Constant name="RP_147_Left_Det_Dist_2" value=" +6.480*mm"/> <!-- RESOLVER:  +6.480, offset:  +0.000 -->
+		<Constant name="RP_147_Left_Det_Dist_3" value=" +6.181*mm"/> <!-- RESOLVER:  +6.181, offset:  +0.000 -->
+		<Constant name="RP_147_Left_Det_Dist_4" value=" +7.000*mm"/>
+		<Constant name="RP_147_Left_Det_Dist_5" value=" +7.000*mm"/>
+
+		<!-- sector 45, 220m station -->
+		<Constant name="RP_220_Left_Det_Dist_0" value="+43.391*mm"/> <!-- RESOLVER: +43.391, offset:  +0.000 -->
+		<Constant name="RP_220_Left_Det_Dist_1" value="+42.712*mm"/> <!-- RESOLVER: +42.712, offset:  +0.000 -->
+		<!--<Constant name="RP_220_Left_Det_Dist_2" value="+41.915*mm"/>  RESOLVER: +41.915, offset:  +0.000 -->
+		<Constant name="RP_220_Left_Det_Dist_2" value="+3.0*mm"/> <!-- RESOLVER: +41.915, offset:  +0.000 -->
+		<Constant name="RP_220_Left_Det_Dist_3" value="+43.162*mm"/> <!-- RESOLVER: +43.162, offset:  +0.000 -->
+		<Constant name="RP_220_Left_Det_Dist_4" value=" +7.000*mm"/>
+		<Constant name="RP_220_Left_Det_Dist_5" value=" +7.000*mm"/>
+
+		<!-- sector 56, 210m station -->
+		<Constant name="RP_147_Right_Det_Dist_0" value=" +9.052*mm"/> <!-- RESOLVER:  +9.052, offset:  +0.000 -->
+		<Constant name="RP_147_Right_Det_Dist_1" value=" +8.017*mm"/> <!-- RESOLVER:  +8.017, offset:  +0.000 -->
+		<Constant name="RP_147_Right_Det_Dist_2" value=" +6.605*mm"/> <!-- RESOLVER:  +6.605, offset:  +0.000 -->
+		<Constant name="RP_147_Right_Det_Dist_3" value=" +5.319*mm"/> <!-- RESOLVER:  +5.319, offset:  +0.000 -->
+		<Constant name="RP_147_Right_Det_Dist_4" value=" +7.000*mm"/>
+		<Constant name="RP_147_Right_Det_Dist_5" value=" +7.000*mm"/>
+
+		<!-- sector 56, 220m station -->
+		<Constant name="RP_220_Right_Det_Dist_0" value="+42.318*mm"/> <!-- RESOLVER: +42.318, offset:  +0.000 -->
+		<Constant name="RP_220_Right_Det_Dist_1" value="+42.266*mm"/> <!-- RESOLVER: +42.266, offset:  +0.000 -->
+		<!--<Constant name="RP_220_Right_Det_Dist_2" value="+44.364*mm"/>  RESOLVER: +44.364, offset:  +0.000 -->
+		<Constant name="RP_220_Right_Det_Dist_2" value="+3.0*mm"/> <!-- RESOLVER: +44.364, offset:  +0.000 -->
+		<Constant name="RP_220_Right_Det_Dist_3" value="+43.396*mm"/> <!-- RESOLVER: +43.396, offset:  +0.000 -->
+		<Constant name="RP_220_Right_Det_Dist_4" value=" +7.000*mm"/>
+		<Constant name="RP_220_Right_Det_Dist_5" value=" +7.000*mm"/>
+
+    <!-- sector 45, diamond station -->
+    <Constant name="CTPPS_45_Det_Dist" value="3.0*mm"/>
+
+    <!-- sector 56, diamond station -->
+    <Constant name="CTPPS_56_Det_Dist" value="3.0*mm"/>
+	</ConstantsSection>
+</DDDefinition>
diff --git a/Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Detector_Assembly.xml b/Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Detector_Assembly.xml
new file mode 100644
index 0000000000000..8e40c62ad56e4
--- /dev/null
+++ b/Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Detector_Assembly.xml
@@ -0,0 +1,86 @@
+<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">
+
+  <ConstantsSection label="CTPPS_Diamond_Detector_Assembly.xml" eval="true">
+    <Constant name="Shift_dx" value="[CTPPS_Diamond_Parameters:Plane_dx]/2-([CTPPS_Timing_Horizontal_Pot:plane_length]+[CTPPS_Timing_Horizontal_Pot:bottom_wall_thickness])/2-[CTPPS_Timing_Horizontal_Pot:cut_depth]"/>
+    <Constant name="box_dz" value="([CTPPS_Diamond_Parameters:Metalized_thick]*2+[CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:PCB_thick])*4+[CTPPS_Diamond_Parameters:Plane_gap]*3"/>
+  </ConstantsSection>
+
+  <SolidSection label="CTPPS_Diamond_Detector_Assembly.xml">
+    <!-- Detector Main Box and Planes -->
+    <Box name="Main_Box_main" dx="[CTPPS_Diamond_Parameters:PCB_dx]/2-[CTPPS_Diamond_Parameters:PCB_extend_dx]+[CTPPS_Timing_Horizontal_Pot:cut_depth]" dy="[CTPPS_Diamond_Parameters:PCB_dy]/2" dz="[box_dz]/2"/>
+    <Trd1 name="Main_Box_extra" dz="[CTPPS_Diamond_Parameters:PCB_extend_dx]/2" dy1="[CTPPS_Diamond_Parameters:PCB_extend_dy1]/2" dy2="[CTPPS_Diamond_Parameters:PCB_extend_dy2]/2" dx1="[box_dz]/2" dx2="[box_dz]/2"/>
+    <UnionSolid name="CTPPS_Diamond_Main_Box">
+      <rSolid name="Main_Box_main"/>
+      <rSolid name="Main_Box_extra"/>
+      <rRotation name="rotations:90YX"/>
+      <Translation x="-[CTPPS_Diamond_Parameters:PCB_dx]/2-[CTPPS_Diamond_Parameters:PCB_extend_dx]/2" y="0*mm" z="0*mm"/>
+    </UnionSolid>
+    <Box name="PCB_main" dx="[CTPPS_Diamond_Parameters:PCB_dx]/2" dy="[CTPPS_Diamond_Parameters:PCB_dy]/2" dz="[CTPPS_Diamond_Parameters:PCB_thick]/2"/>
+    <Trd1 name="PCB_extra" dz="[CTPPS_Diamond_Parameters:PCB_extend_dx]/2" dy1="[CTPPS_Diamond_Parameters:PCB_extend_dy1]/2" dy2="[CTPPS_Diamond_Parameters:PCB_extend_dy2]/2" dx1="[CTPPS_Diamond_Parameters:PCB_thick]/2" dx2="[CTPPS_Diamond_Parameters:PCB_thick]/2"/>
+    <UnionSolid name="PCB">
+      <rSolid name="PCB_main"/>
+      <rSolid name="PCB_extra"/>
+      <rRotation name="rotations:90YX"/>
+      <Translation x="-[CTPPS_Diamond_Parameters:PCB_dx]/2-[CTPPS_Diamond_Parameters:PCB_extend_dx]/2" y="0*mm" z="0*mm"/>
+    </UnionSolid>
+  </SolidSection>
+
+  <LogicalPartSection label="CTPPS_Diamond_Detector_Assembly.xml">
+    <!-- ****** Detector Box and Downstream Plane ****** -->
+    <LogicalPart name="CTPPS_Diamond_Main_Box" category="envelope">
+      <rSolid name="CTPPS_Diamond_Main_Box"/>
+      <rMaterial name="materials:Vacuum"/>
+    </LogicalPart>
+    <LogicalPart name="PCB" category="support">
+      <rSolid name="PCB"/>
+      <rMaterial name="RP_Materials:PCB"/> <!--should be equivalent to actual RO4350B-->
+    </LogicalPart>
+  </LogicalPartSection>
+
+  <PosPartSection label="CTPPS_Diamond_Detector_Assembly.xml">
+    <PosPart copyNumber="1">
+      <rParent name="CTPPS_Timing_Horizontal_Pot:Primary_Vacuum"/>
+      <rChild name="CTPPS_Diamond_Main_Box"/>
+      <rRotation name="CTPPS_Diamond_Transformations:planes_box_rotation"/>
+      <Translation x="0*cm" y="0*cm" z="-[CTPPS_Timing_Horizontal_Pot:bottom_wall_thickness]/2+[CTPPS_Diamond_Parameters:PCB_extend_dx]"/>
+    </PosPart>
+    <PosPart copyNumber="122">
+      <rParent name="RP_Box_122:RP_box_primary_vacuum"/>
+      <rChild name="CTPPS_Diamond_Main_Box"/>
+      <rRotation name="RP_Transformations:RP_90_z_rot"/>
+      <Translation x="0*cm" y="[RP_Box:RP_Box_Bottom_Wall_Thickness]" z="-[CTPPS_Timing_Horizontal_Pot:bottom_wall_thickness]/2+[CTPPS_Diamond_Parameters:PCB_extend_dx]"/>
+    </PosPart>
+    <PosPart copyNumber="22">
+      <rParent name="RP_Box_022:RP_box_primary_vacuum"/>
+      <rChild name="CTPPS_Diamond_Main_Box"/>
+      <rRotation name="RP_Transformations:RP_90_z_rot"/>
+<!--      <rRotation name="CTPPS_Diamond_Transformations:planes_box_rotation"/>-->
+      <Translation x="0*cm" y="[RP_Box:RP_Box_Bottom_Wall_Thickness]" z="-[CTPPS_Timing_Horizontal_Pot:bottom_wall_thickness]/2+[CTPPS_Diamond_Parameters:PCB_extend_dx]"/>
+    </PosPart>
+
+
+    <PosPart copyNumber="1">
+      <rParent name="CTPPS_Diamond_Main_Box"/>
+      <rChild name="CTPPS_Diamond_Plane1_new:CTPPS_Diamond_Plane"/>
+      <Translation y="0*cm" x="[Shift_dx]" z="-([CTPPS_Diamond_Parameters:Plane_dz]+[CTPPS_Diamond_Parameters:Plane_gap])*3/2"/>
+    </PosPart>
+    <PosPart copyNumber="2">
+      <rParent name="CTPPS_Diamond_Main_Box"/>
+      <rChild name="CTPPS_Diamond_Plane2_new:CTPPS_Diamond_Plane"/>
+      <Translation y="0*cm" x="[Shift_dx]" z="-([CTPPS_Diamond_Parameters:Plane_dz]+[CTPPS_Diamond_Parameters:Plane_gap])/2"/>
+    </PosPart>
+    <PosPart copyNumber="3">
+      <rParent name="CTPPS_Diamond_Main_Box"/>
+      <rChild name="CTPPS_Diamond_Plane3:CTPPS_Diamond_Plane"/>
+      <Translation y="0*cm" x="[Shift_dx]" z="([CTPPS_Diamond_Parameters:Plane_dz]+[CTPPS_Diamond_Parameters:Plane_gap])/2"/>
+      <rRotation name="CTPPS_Diamond_Transformations:planes_x_rotation"/>
+    </PosPart>
+    <PosPart copyNumber="4">
+      <rParent name="CTPPS_Diamond_Main_Box"/>
+      <rChild name="CTPPS_Diamond_Plane4:CTPPS_Diamond_Plane"/>
+      <Translation y="0*cm" x="[Shift_dx]" z="([CTPPS_Diamond_Parameters:Plane_dz]+[CTPPS_Diamond_Parameters:Plane_gap])*3/2"/>
+    </PosPart>
+  </PosPartSection>
+
+</DDDefinition>
+
diff --git a/Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane1.xml b/Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane1.xml
new file mode 100644
index 0000000000000..d81c0dcffb7d0
--- /dev/null
+++ b/Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane1.xml
@@ -0,0 +1,266 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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">
+
+  <ConstantsSection label="CTPPS_Diamond_Plane1.xml" eval="true">
+    <Constant name="Str1_dx" value="-[CTPPS_Diamond_Parameters:Diamond_dx]*2+[CTPPS_Diamond_Parameters:UnMet_Edge]+[CTPPS_Diamond_Parameters:Pat4_Str5_dx]/2"/>
+    <Constant name="Str2_dx" value="-[CTPPS_Diamond_Parameters:Diamond_dx]*2+[CTPPS_Diamond_Parameters:UnMet_Edge]+[CTPPS_Diamond_Parameters:Pat4_Str5_dx]+[CTPPS_Diamond_Parameters:Pat4_Str4_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]"/>
+    <Constant name="Str3_dx" value="-[CTPPS_Diamond_Parameters:Diamond_dx]*2+[CTPPS_Diamond_Parameters:UnMet_Edge]+[CTPPS_Diamond_Parameters:Pat4_Str5_dx]+[CTPPS_Diamond_Parameters:Pat4_Str4_dx]+[CTPPS_Diamond_Parameters:Pat4_Str3_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]*2"/>
+    <Constant name="Str4_dx" value="-[CTPPS_Diamond_Parameters:Diamond_dx]*2+[CTPPS_Diamond_Parameters:UnMet_Edge]+[CTPPS_Diamond_Parameters:Pat4_Str5_dx]+[CTPPS_Diamond_Parameters:Pat4_Str4_dx]+[CTPPS_Diamond_Parameters:Pat4_Str3_dx]+[CTPPS_Diamond_Parameters:Pat4_Str2_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]*3"/>
+    <Constant name="Str5_dx" value="-[CTPPS_Diamond_Parameters:Diamond_dx]*2+[CTPPS_Diamond_Parameters:UnMet_Edge]+[CTPPS_Diamond_Parameters:Pat4_Str5_dx]+[CTPPS_Diamond_Parameters:Pat4_Str4_dx]+[CTPPS_Diamond_Parameters:Pat4_Str3_dx]+[CTPPS_Diamond_Parameters:Pat4_Str2_dx]+[CTPPS_Diamond_Parameters:Pat4_Str1_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]*4"/>
+    <Constant name="Str6_dx" value="-[CTPPS_Diamond_Parameters:Diamond_dx]+[CTPPS_Diamond_Parameters:UnMet_Edge]+[CTPPS_Diamond_Parameters:Pat3_Str4_dx]/2"/>
+    <Constant name="Str7_dx" value="-[CTPPS_Diamond_Parameters:Diamond_dx]+[CTPPS_Diamond_Parameters:UnMet_Edge]+[CTPPS_Diamond_Parameters:Pat3_Str4_dx]+[CTPPS_Diamond_Parameters:Pat3_Str3_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]"/>
+    <Constant name="Str8_dx" value="-[CTPPS_Diamond_Parameters:Diamond_dx]+[CTPPS_Diamond_Parameters:UnMet_Edge]+[CTPPS_Diamond_Parameters:Pat3_Str4_dx]+[CTPPS_Diamond_Parameters:Pat3_Str3_dx]+[CTPPS_Diamond_Parameters:Pat3_Str2_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]*2"/>
+    <Constant name="Str9_dx" value="-[CTPPS_Diamond_Parameters:Diamond_dx]+[CTPPS_Diamond_Parameters:UnMet_Edge]+[CTPPS_Diamond_Parameters:Pat3_Str4_dx]+[CTPPS_Diamond_Parameters:Pat3_Str3_dx]+[CTPPS_Diamond_Parameters:Pat3_Str2_dx]+[CTPPS_Diamond_Parameters:Pat3_Str1_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]*3"/>
+    <Constant name="Str10_dx" value="[CTPPS_Diamond_Parameters:UnMet_Edge]+[CTPPS_Diamond_Parameters:Pat2_Str2_dx]/2"/>
+    <Constant name="Str11_dx" value="[CTPPS_Diamond_Parameters:UnMet_Edge]+[CTPPS_Diamond_Parameters:Pat2_Str2_dx]+[CTPPS_Diamond_Parameters:Pat2_Str1_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]"/>
+    <Constant name="Str12_dx" value="[CTPPS_Diamond_Parameters:Diamond_dx]+[CTPPS_Diamond_Parameters:UnMet_Edge]+[CTPPS_Diamond_Parameters:Pat1_Str1_dx]/2"/>
+  </ConstantsSection>
+
+  <SolidSection label="CTPPS_Diamond_Plane1.xml">
+    <Box name="Plane" dx="[CTPPS_Diamond_Parameters:Plane_dx]/2" dy="[CTPPS_Diamond_Parameters:Plane_dy]/2" dz="[CTPPS_Diamond_Parameters:Plane_dz]/2"/>
+  </SolidSection>
+
+  <LogicalPartSection label="CTPPS_Diamond_Plane1.xml">
+    <LogicalPart name="CTPPS_Diamond_Plane" category="unspecified">
+      <rSolid name="Plane"/>
+      <rMaterial name="materials:Air"/>
+    </LogicalPart>
+  </LogicalPartSection>
+
+  <PosPartSection label="CTPPS_Diamond_Plane1.xml">
+
+    <!-- ******** Pattern 4 ********* -->
+    <PosPart copyNumber="000">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern4_Segment5:CTPPS_Diamond_Segment"/>
+      <Translation x="[Str1_dx]" y="0*mm" z="0*mm"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="0001">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern4_Segment5:Metalized_Layer"/>
+      <Translation x="[Str1_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="0002">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern4_Segment5:Metalized_Layer"/>
+      <Translation x="[Str1_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+
+    <PosPart copyNumber="011">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern4_Segment4:CTPPS_Diamond_Segment"/>
+      <Translation x="[Str2_dx]" y="0*mm" z="0*mm"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="0111">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern4_Segment4:Metalized_Layer"/>
+      <Translation x="[Str2_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="0112">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern4_Segment4:Metalized_Layer"/>
+      <Translation x="[Str2_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+
+    <PosPart copyNumber="001">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern4_Segment3:CTPPS_Diamond_Segment"/>
+      <Translation x="[Str3_dx]" y="0*mm" z="0*mm"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="0011">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern4_Segment3:Metalized_Layer"/>
+      <Translation x="[Str3_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="0012">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern4_Segment3:Metalized_Layer"/>
+      <Translation x="[Str3_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+
+    <PosPart copyNumber="010">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern4_Segment2:CTPPS_Diamond_Segment"/>
+      <Translation x="[Str4_dx]" y="0*mm" z="0*mm"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="0101">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern4_Segment2:Metalized_Layer"/>
+      <Translation x="[Str4_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="0102">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern4_Segment3:Metalized_Layer"/>
+      <Translation x="[Str4_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+
+    <PosPart copyNumber="002">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern4_Segment1:CTPPS_Diamond_Segment"/>
+      <Translation x="[Str5_dx]" y="0*mm" z="0*mm"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="0021">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern4_Segment1:Metalized_Layer"/>
+      <Translation x="[Str5_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="0022">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern4_Segment1:Metalized_Layer"/>
+      <Translation x="[Str5_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+
+    <!-- ******** Pattern 3 ********* -->
+    <PosPart copyNumber="009">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment4:CTPPS_Diamond_Segment"/>
+      <Translation x="[Str6_dx]" y="0*mm" z="0*mm"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="0091">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment4:Metalized_Layer"/>
+      <Translation x="[Str6_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="0092">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment4:Metalized_Layer"/>
+      <Translation x="[Str6_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+
+    <PosPart copyNumber="003">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment3:CTPPS_Diamond_Segment"/>
+      <Translation x="[Str7_dx]" y="0*mm" z="0*mm"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="0031">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment3:Metalized_Layer"/>
+      <Translation x="[Str7_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="0032">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment3:Metalized_Layer"/>
+      <Translation x="[Str7_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+
+    <PosPart copyNumber="008">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment2:CTPPS_Diamond_Segment"/>
+      <Translation x="[Str8_dx]" y="0*mm" z="0*mm"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="0081">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment2:Metalized_Layer"/>
+      <Translation x="[Str8_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="0082">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment2:Metalized_Layer"/>
+      <Translation x="[Str8_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+
+    <PosPart copyNumber="004">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment1:CTPPS_Diamond_Segment"/>
+      <Translation x="[Str9_dx]" y="0*mm" z="0*mm"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="0041">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment1:Metalized_Layer"/>
+      <Translation x="[Str9_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="0042">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment1:Metalized_Layer"/>
+      <Translation x="[Str9_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+
+    <!-- ******** Pattern 2 ********* -->
+    <PosPart copyNumber="007">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern2_Segment2:CTPPS_Diamond_Segment"/>
+      <Translation x="[Str10_dx]" y="0*mm" z="0*mm"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="0071">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern2_Segment2:Metalized_Layer"/>
+      <Translation x="[Str10_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="0072">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern2_Segment2:Metalized_Layer"/>
+      <Translation x="[Str10_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+
+    <PosPart copyNumber="005">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern2_Segment1:CTPPS_Diamond_Segment"/>
+      <Translation x="[Str11_dx]" y="0*mm" z="0*mm"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="0051">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern2_Segment1:Metalized_Layer"/>
+      <Translation x="[Str11_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="0052">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern2_Segment1:Metalized_Layer"/>
+      <Translation x="[Str11_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+
+    <!-- ******** Pattern 1 ********* -->
+    <PosPart copyNumber="006">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern1_Segment1:CTPPS_Diamond_Segment"/>
+      <Translation x="[Str12_dx]" y="0*mm" z="0*mm"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="0061">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern1_Segment1:Metalized_Layer"/>
+      <Translation x="[Str12_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="0062">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern1_Segment1:Metalized_Layer"/>
+      <Translation x="[Str12_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+
+  </PosPartSection>
+
+</DDDefinition>
diff --git a/Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane1_new.xml b/Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane1_new.xml
new file mode 100644
index 0000000000000..6f1ee0c8f245c
--- /dev/null
+++ b/Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane1_new.xml
@@ -0,0 +1,268 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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">
+
+  <ConstantsSection label="CTPPS_Diamond_Plane1_new.xml" eval="true">
+    <Constant name="Str1_dx" value="-[CTPPS_Diamond_Parameters:Diamond_dx]*2+[CTPPS_Diamond_Parameters:UnMet_Edge]+[CTPPS_Diamond_Parameters:Pat3_Str4_dx]/2"/>
+    <Constant name="Str2_dx" value="[Str1_dx] + [CTPPS_Diamond_Parameters:Pat3_Str4_dx]/2+[CTPPS_Diamond_Parameters:Pat3_Str3_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]"/>
+    <Constant name="Str3_dx" value="[Str2_dx] + [CTPPS_Diamond_Parameters:Pat3_Str3_dx]/2+[CTPPS_Diamond_Parameters:Pat3_Str2_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]"/>
+    <Constant name="Str4_dx" value="[Str3_dx] + [CTPPS_Diamond_Parameters:Pat3_Str2_dx]/2+[CTPPS_Diamond_Parameters:Pat3_Str1_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]"/>
+    <Constant name="Str5_dx" value="[Str4_dx] + [CTPPS_Diamond_Parameters:Pat3_Str1_dx]/2+2*[CTPPS_Diamond_Parameters:UnMet_Edge] + [CTPPS_Diamond_Parameters:Pat3_Str4_dx]/2"/>
+    <Constant name="Str6_dx" value="[Str5_dx] + [CTPPS_Diamond_Parameters:Pat3_Str4_dx]/2+[CTPPS_Diamond_Parameters:Pat3_Str3_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]"/>
+    <Constant name="Str7_dx" value="[Str6_dx] + [CTPPS_Diamond_Parameters:Pat3_Str3_dx]/2+[CTPPS_Diamond_Parameters:Pat3_Str2_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]"/>
+    <Constant name="Str8_dx" value="[Str7_dx] + [CTPPS_Diamond_Parameters:Pat3_Str2_dx]/2+[CTPPS_Diamond_Parameters:Pat3_Str1_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]"/>
+    <Constant name="Str9_dx" value="[Str8_dx] + [CTPPS_Diamond_Parameters:Pat3_Str1_dx]/2+2*[CTPPS_Diamond_Parameters:UnMet_Edge] + [CTPPS_Diamond_Parameters:Pat2_Str2_dx]/2"/>
+    <Constant name="Str10_dx" value="[Str9_dx] + [CTPPS_Diamond_Parameters:Pat2_Str2_dx]/2+[CTPPS_Diamond_Parameters:Pat2_Str1_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]"/>
+    <Constant name="Str11_dx" value="[Str10_dx] + [CTPPS_Diamond_Parameters:Pat2_Str1_dx]/2+2*[CTPPS_Diamond_Parameters:UnMet_Edge] + [CTPPS_Diamond_Parameters:Pat2_Str2_dx]/2"/>
+    <Constant name="Str12_dx" value="[Str11_dx] + [CTPPS_Diamond_Parameters:Pat2_Str2_dx]/2+[CTPPS_Diamond_Parameters:Pat2_Str1_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]"/>
+  </ConstantsSection>
+
+  <SolidSection label="CTPPS_Diamond_Plane1_new.xml">
+    <Box name="Plane" dx="[CTPPS_Diamond_Parameters:Plane_dx]/2" dy="[CTPPS_Diamond_Parameters:Plane_dy]/2" dz="[CTPPS_Diamond_Parameters:Plane_dz]/2"/>
+  </SolidSection>
+
+  <LogicalPartSection label="CTPPS_Diamond_Plane1_new.xml">
+    <LogicalPart name="CTPPS_Diamond_Plane" category="unspecified">
+      <rSolid name="Plane"/>
+      <rMaterial name="materials:Air"/>
+    </LogicalPart>
+  </LogicalPartSection>
+
+  <PosPartSection label="CTPPS_Diamond_Plane1_new.xml">
+
+    <!-- ******** Pattern 3 ********* -->
+    <PosPart copyNumber="000">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment4:CTPPS_Diamond_Segment"/>
+      <Translation x="[Str1_dx]" y="0*mm" z="0*mm"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="0001">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment4:Metalized_Layer"/>
+      <Translation x="[Str1_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="0002">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment4:Metalized_Layer"/>
+      <Translation x="[Str1_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+
+    <PosPart copyNumber="011">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment3:CTPPS_Diamond_Segment"/>
+      <Translation x="[Str2_dx]" y="0*mm" z="0*mm"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="0111">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment3:Metalized_Layer"/>
+      <Translation x="[Str2_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="0112">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment3:Metalized_Layer"/>
+      <Translation x="[Str2_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+
+    <PosPart copyNumber="001">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment2:CTPPS_Diamond_Segment"/>
+      <Translation x="[Str3_dx]" y="0*mm" z="0*mm"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="0011">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment2:Metalized_Layer"/>
+      <Translation x="[Str3_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="0012">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment2:Metalized_Layer"/>
+      <Translation x="[Str3_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+
+    <PosPart copyNumber="010">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment1:CTPPS_Diamond_Segment"/>
+      <Translation x="[Str4_dx]" y="0*mm" z="0*mm"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="0101">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment1:Metalized_Layer"/>
+      <Translation x="[Str4_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="0102">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment1:Metalized_Layer"/>
+      <Translation x="[Str4_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+
+
+    <!-- ******** Pattern 3 ********* -->
+    <PosPart copyNumber="002">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment4:CTPPS_Diamond_Segment"/>
+      <Translation x="[Str5_dx]" y="0*mm" z="0*mm"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="0021">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment4:Metalized_Layer"/>
+      <Translation x="[Str5_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="0022">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment4:Metalized_Layer"/>
+      <Translation x="[Str5_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+
+    <PosPart copyNumber="009">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment3:CTPPS_Diamond_Segment"/>
+      <Translation x="[Str6_dx]" y="0*mm" z="0*mm"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="0091">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment3:Metalized_Layer"/>
+      <Translation x="[Str6_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="0092">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment3:Metalized_Layer"/>
+      <Translation x="[Str6_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+
+    <PosPart copyNumber="003">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment2:CTPPS_Diamond_Segment"/>
+      <Translation x="[Str7_dx]" y="0*mm" z="0*mm"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="0031">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment2:Metalized_Layer"/>
+      <Translation x="[Str7_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="0032">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment2:Metalized_Layer"/>
+      <Translation x="[Str7_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+
+    <PosPart copyNumber="008">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment1:CTPPS_Diamond_Segment"/>
+      <Translation x="[Str8_dx]" y="0*mm" z="0*mm"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="0081">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment1:Metalized_Layer"/>
+      <Translation x="[Str8_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="0082">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment1:Metalized_Layer"/>
+      <Translation x="[Str8_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+
+    <!-- ******** Pattern 2 ********* -->
+    <PosPart copyNumber="004">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern2_Segment2:CTPPS_Diamond_Segment"/>
+      <Translation x="[Str9_dx]" y="0*mm" z="0*mm"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="0041">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern2_Segment2:Metalized_Layer"/>
+      <Translation x="[Str9_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="0042">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern2_Segment2:Metalized_Layer"/>
+      <Translation x="[Str9_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+
+    <PosPart copyNumber="007">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern2_Segment1:CTPPS_Diamond_Segment"/>
+      <Translation x="[Str10_dx]" y="0*mm" z="0*mm"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="0071">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern2_Segment1:Metalized_Layer"/>
+      <Translation x="[Str10_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="0072">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern2_Segment1:Metalized_Layer"/>
+      <Translation x="[Str10_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+
+    <!-- ******** Pattern 2 ********* -->
+    
+    <PosPart copyNumber="005">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern2_Segment2:CTPPS_Diamond_Segment"/>
+      <Translation x="[Str11_dx]" y="0*mm" z="0*mm"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="0051">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern2_Segment2:Metalized_Layer"/>
+      <Translation x="[Str11_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="0052">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern2_Segment2:Metalized_Layer"/>
+      <Translation x="[Str11_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+
+    <PosPart copyNumber="006">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern2_Segment1:CTPPS_Diamond_Segment"/>
+      <Translation x="[Str12_dx]" y="0*mm" z="0*mm"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="0061">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern2_Segment1:Metalized_Layer"/>
+      <Translation x="[Str12_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="0062">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern2_Segment1:Metalized_Layer"/>
+      <Translation x="[Str12_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+
+  </PosPartSection>
+
+</DDDefinition>
diff --git a/Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane2.xml b/Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane2.xml
new file mode 100644
index 0000000000000..c227fbeea9aeb
--- /dev/null
+++ b/Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane2.xml
@@ -0,0 +1,266 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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">
+
+  <ConstantsSection label="CTPPS_Diamond_Plane2.xml">
+    <Constant name="Str1_dx" value="-[CTPPS_Diamond_Parameters:Diamond_dx]*2+[CTPPS_Diamond_Parameters:UnMet_Edge]+[CTPPS_Diamond_Parameters:Pat3_Str1_dx]/2"/>
+    <Constant name="Str2_dx" value="-[CTPPS_Diamond_Parameters:Diamond_dx]*2+[CTPPS_Diamond_Parameters:UnMet_Edge]+[CTPPS_Diamond_Parameters:Pat3_Str1_dx]+[CTPPS_Diamond_Parameters:Pat3_Str2_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]"/>
+    <Constant name="Str3_dx" value="-[CTPPS_Diamond_Parameters:Diamond_dx]*2+[CTPPS_Diamond_Parameters:UnMet_Edge]+[CTPPS_Diamond_Parameters:Pat3_Str1_dx]+[CTPPS_Diamond_Parameters:Pat3_Str2_dx]+[CTPPS_Diamond_Parameters:Pat3_Str3_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]*2"/>
+    <Constant name="Str4_dx" value="-[CTPPS_Diamond_Parameters:Diamond_dx]*2+[CTPPS_Diamond_Parameters:UnMet_Edge]+[CTPPS_Diamond_Parameters:Pat3_Str1_dx]+[CTPPS_Diamond_Parameters:Pat3_Str2_dx]+[CTPPS_Diamond_Parameters:Pat3_Str3_dx]+[CTPPS_Diamond_Parameters:Pat3_Str4_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]*3"/>
+    <Constant name="Str5_dx" value="-[CTPPS_Diamond_Parameters:Diamond_dx]+[CTPPS_Diamond_Parameters:UnMet_Edge]+[CTPPS_Diamond_Parameters:Pat4_Str1_dx]/2"/>
+    <Constant name="Str6_dx" value="-[CTPPS_Diamond_Parameters:Diamond_dx]+[CTPPS_Diamond_Parameters:UnMet_Edge]+[CTPPS_Diamond_Parameters:Pat4_Str1_dx]+[CTPPS_Diamond_Parameters:Pat4_Str2_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]"/>
+    <Constant name="Str7_dx" value="-[CTPPS_Diamond_Parameters:Diamond_dx]+[CTPPS_Diamond_Parameters:UnMet_Edge]+[CTPPS_Diamond_Parameters:Pat4_Str1_dx]+[CTPPS_Diamond_Parameters:Pat4_Str2_dx]+[CTPPS_Diamond_Parameters:Pat4_Str3_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]*2"/>
+    <Constant name="Str8_dx" value="-[CTPPS_Diamond_Parameters:Diamond_dx]+[CTPPS_Diamond_Parameters:UnMet_Edge]+[CTPPS_Diamond_Parameters:Pat4_Str1_dx]+[CTPPS_Diamond_Parameters:Pat4_Str2_dx]+[CTPPS_Diamond_Parameters:Pat4_Str3_dx]+[CTPPS_Diamond_Parameters:Pat4_Str4_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]*3"/>
+    <Constant name="Str9_dx" value="-[CTPPS_Diamond_Parameters:Diamond_dx]+[CTPPS_Diamond_Parameters:UnMet_Edge]+[CTPPS_Diamond_Parameters:Pat4_Str1_dx]+[CTPPS_Diamond_Parameters:Pat4_Str2_dx]+[CTPPS_Diamond_Parameters:Pat4_Str3_dx]+[CTPPS_Diamond_Parameters:Pat4_Str4_dx]+[CTPPS_Diamond_Parameters:Pat4_Str5_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]*4"/>
+    <Constant name="Str10_dx" value="[CTPPS_Diamond_Parameters:UnMet_Edge]+[CTPPS_Diamond_Parameters:Pat1_Str1_dx]/2"/>
+    <Constant name="Str11_dx" value="[CTPPS_Diamond_Parameters:Diamond_dx]+[CTPPS_Diamond_Parameters:UnMet_Edge]+[CTPPS_Diamond_Parameters:Pat2_Str1_dx]/2"/>
+    <Constant name="Str12_dx" value="[CTPPS_Diamond_Parameters:Diamond_dx]+[CTPPS_Diamond_Parameters:UnMet_Edge]+[CTPPS_Diamond_Parameters:Pat2_Str1_dx]+[CTPPS_Diamond_Parameters:Pat2_Str2_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]"/>
+  </ConstantsSection>
+
+  <SolidSection label="CTPPS_Diamond_Plane2.xml">
+    <Box name="Plane" dx="[CTPPS_Diamond_Parameters:Plane_dx]/2" dy="[CTPPS_Diamond_Parameters:Plane_dy]/2" dz="[CTPPS_Diamond_Parameters:Plane_dz]/2"/>
+  </SolidSection>
+
+  <LogicalPartSection label="CTPPS_Diamond_Plane2.xml">
+    <LogicalPart name="CTPPS_Diamond_Plane" category="unspecified">
+      <rSolid name="Plane"/>
+      <rMaterial name="materials:Air"/>
+    </LogicalPart>
+  </LogicalPartSection>
+
+  <PosPartSection label="CTPPS_Diamond_Plane2.xml">
+
+    <!-- ******** Pattern 3 ********* -->
+    <PosPart copyNumber="100">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment1:CTPPS_Diamond_Segment"/>
+      <Translation x="[Str1_dx]" y="0*mm" z="0*mm"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="1001">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment1:Metalized_Layer"/>
+      <Translation x="[Str1_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="1002">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment1:Metalized_Layer"/>
+      <Translation x="[Str1_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+
+    <PosPart copyNumber="111">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment2:CTPPS_Diamond_Segment"/>
+      <Translation x="[Str2_dx]" y="0*mm" z="0*mm"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="1111">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment2:Metalized_Layer"/>
+      <Translation x="[Str2_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="1112">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment2:Metalized_Layer"/>
+      <Translation x="[Str2_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+
+    <PosPart copyNumber="101">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment3:CTPPS_Diamond_Segment"/>
+      <Translation x="[Str3_dx]" y="0*mm" z="0*mm"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="1011">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment3:Metalized_Layer"/>
+      <Translation x="[Str3_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="1012">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment3:Metalized_Layer"/>
+      <Translation x="[Str3_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+
+    <PosPart copyNumber="110">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment4:CTPPS_Diamond_Segment"/>
+      <Translation x="[Str4_dx]" y="0*mm" z="0*mm"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="1101">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment4:Metalized_Layer"/>
+      <Translation x="[Str4_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="1102">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment4:Metalized_Layer"/>
+      <Translation x="[Str4_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+
+    <!-- ******** Pattern 4 ********* -->
+    <PosPart copyNumber="102">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern4_Segment1:CTPPS_Diamond_Segment"/>
+      <Translation x="[Str5_dx]" y="0*mm" z="0*mm"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="1021">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern4_Segment1:Metalized_Layer"/>
+      <Translation x="[Str5_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="1022">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern4_Segment1:Metalized_Layer"/>
+      <Translation x="[Str5_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+
+    <PosPart copyNumber="109">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern4_Segment2:CTPPS_Diamond_Segment"/>
+      <Translation x="[Str6_dx]" y="0*mm" z="0*mm"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="1091">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern4_Segment2:Metalized_Layer"/>
+      <Translation x="[Str6_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="1092">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern4_Segment2:Metalized_Layer"/>
+      <Translation x="[Str6_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+
+    <PosPart copyNumber="103">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern4_Segment3:CTPPS_Diamond_Segment"/>
+      <Translation x="[Str7_dx]" y="0*mm" z="0*mm"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="1031">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern4_Segment3:Metalized_Layer"/>
+      <Translation x="[Str7_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="1032">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern4_Segment3:Metalized_Layer"/>
+      <Translation x="[Str7_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+
+    <PosPart copyNumber="108">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern4_Segment4:CTPPS_Diamond_Segment"/>
+      <Translation x="[Str8_dx]" y="0*mm" z="0*mm"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="1081">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern4_Segment4:Metalized_Layer"/>
+      <Translation x="[Str8_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="1082">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern4_Segment4:Metalized_Layer"/>
+      <Translation x="[Str8_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+
+    <PosPart copyNumber="104">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern4_Segment5:CTPPS_Diamond_Segment"/>
+      <Translation x="[Str9_dx]" y="0*mm" z="0*mm"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="1041">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern4_Segment5:Metalized_Layer"/>
+      <Translation x="[Str9_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="1042">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern4_Segment5:Metalized_Layer"/>
+      <Translation x="[Str9_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+
+    <!-- ******** Pattern 1 ********* -->
+    <PosPart copyNumber="107">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern1_Segment1:CTPPS_Diamond_Segment"/>
+      <Translation x="[Str10_dx]" y="0*mm" z="0*mm"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="1071">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern1_Segment1:Metalized_Layer"/>
+      <Translation x="[Str10_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="1072">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern1_Segment1:Metalized_Layer"/>
+      <Translation x="[Str10_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+
+    <!-- ******** Pattern 2 ********* -->
+    <PosPart copyNumber="105">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern2_Segment1:CTPPS_Diamond_Segment"/>
+      <Translation x="[Str11_dx]" y="0*mm" z="0*mm"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="1051">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern2_Segment1:Metalized_Layer"/>
+      <Translation x="[Str11_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="1052">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern2_Segment1:Metalized_Layer"/>
+      <Translation x="[Str11_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+
+    <PosPart copyNumber="106">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern2_Segment2:CTPPS_Diamond_Segment"/>
+      <Translation x="[Str12_dx]" y="0*mm" z="0*mm"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="1061">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern2_Segment2:Metalized_Layer"/>
+      <Translation x="[Str12_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="1062">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern2_Segment2:Metalized_Layer"/>
+      <Translation x="[Str12_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+
+  </PosPartSection>
+
+</DDDefinition>
diff --git a/Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane2_new.xml b/Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane2_new.xml
new file mode 100644
index 0000000000000..a2e0008743ab6
--- /dev/null
+++ b/Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane2_new.xml
@@ -0,0 +1,268 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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">
+
+  <ConstantsSection label="CTPPS_Diamond_Plane2_new.xml" eval="true">
+    <Constant name="Str1_dx" value="-[CTPPS_Diamond_Parameters:Diamond_dx]*2+[CTPPS_Diamond_Parameters:UnMet_Edge]+[CTPPS_Diamond_Parameters:Pat3_Str4_dx]/2"/>
+    <Constant name="Str2_dx" value="[Str1_dx] + [CTPPS_Diamond_Parameters:Pat3_Str4_dx]/2+[CTPPS_Diamond_Parameters:Pat3_Str3_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]"/>
+    <Constant name="Str3_dx" value="[Str2_dx] + [CTPPS_Diamond_Parameters:Pat3_Str3_dx]/2+[CTPPS_Diamond_Parameters:Pat3_Str2_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]"/>
+    <Constant name="Str4_dx" value="[Str3_dx] + [CTPPS_Diamond_Parameters:Pat3_Str2_dx]/2+[CTPPS_Diamond_Parameters:Pat3_Str1_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]"/>
+    <Constant name="Str5_dx" value="[Str4_dx] + [CTPPS_Diamond_Parameters:Pat3_Str1_dx]/2+2*[CTPPS_Diamond_Parameters:UnMet_Edge] + [CTPPS_Diamond_Parameters:Pat3_Str4_dx]/2"/>
+    <Constant name="Str6_dx" value="[Str5_dx] + [CTPPS_Diamond_Parameters:Pat3_Str4_dx]/2+[CTPPS_Diamond_Parameters:Pat3_Str3_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]"/>
+    <Constant name="Str7_dx" value="[Str6_dx] + [CTPPS_Diamond_Parameters:Pat3_Str3_dx]/2+[CTPPS_Diamond_Parameters:Pat3_Str2_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]"/>
+    <Constant name="Str8_dx" value="[Str7_dx] + [CTPPS_Diamond_Parameters:Pat3_Str2_dx]/2+[CTPPS_Diamond_Parameters:Pat3_Str1_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]"/>
+    <Constant name="Str9_dx" value="[Str8_dx] + [CTPPS_Diamond_Parameters:Pat3_Str1_dx]/2+2*[CTPPS_Diamond_Parameters:UnMet_Edge] + [CTPPS_Diamond_Parameters:Pat2_Str2_dx]/2"/>
+    <Constant name="Str10_dx" value="[Str9_dx] + [CTPPS_Diamond_Parameters:Pat2_Str2_dx]/2+[CTPPS_Diamond_Parameters:Pat2_Str1_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]"/>
+    <Constant name="Str11_dx" value="[Str10_dx] + [CTPPS_Diamond_Parameters:Pat2_Str1_dx]/2+2*[CTPPS_Diamond_Parameters:UnMet_Edge] + [CTPPS_Diamond_Parameters:Pat2_Str2_dx]/2"/>
+    <Constant name="Str12_dx" value="[Str11_dx] + [CTPPS_Diamond_Parameters:Pat2_Str2_dx]/2+[CTPPS_Diamond_Parameters:Pat2_Str1_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]"/>
+  </ConstantsSection>
+
+  <SolidSection label="CTPPS_Diamond_Plane2_new.xml">
+    <Box name="Plane" dx="[CTPPS_Diamond_Parameters:Plane_dx]/2" dy="[CTPPS_Diamond_Parameters:Plane_dy]/2" dz="[CTPPS_Diamond_Parameters:Plane_dz]/2"/>
+  </SolidSection>
+
+  <LogicalPartSection label="CTPPS_Diamond_Plane2_new.xml">
+    <LogicalPart name="CTPPS_Diamond_Plane" category="unspecified">
+      <rSolid name="Plane"/>
+      <rMaterial name="materials:Air"/>
+    </LogicalPart>
+  </LogicalPartSection>
+
+  <PosPartSection label="CTPPS_Diamond_Plane2_new.xml">
+
+    <!-- ******** Pattern 3 ********* -->
+    <PosPart copyNumber="100">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment4:CTPPS_Diamond_Segment"/>
+      <Translation x="[Str1_dx]" y="0*mm" z="0*mm"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="1001">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment4:Metalized_Layer"/>
+      <Translation x="[Str1_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="1002">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment4:Metalized_Layer"/>
+      <Translation x="[Str1_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+
+    <PosPart copyNumber="111">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment3:CTPPS_Diamond_Segment"/>
+      <Translation x="[Str2_dx]" y="0*mm" z="0*mm"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="1111">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment3:Metalized_Layer"/>
+      <Translation x="[Str2_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="1112">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment3:Metalized_Layer"/>
+      <Translation x="[Str2_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+
+    <PosPart copyNumber="101">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment2:CTPPS_Diamond_Segment"/>
+      <Translation x="[Str3_dx]" y="0*mm" z="0*mm"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="1011">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment2:Metalized_Layer"/>
+      <Translation x="[Str3_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="1012">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment2:Metalized_Layer"/>
+      <Translation x="[Str3_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+
+    <PosPart copyNumber="110">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment1:CTPPS_Diamond_Segment"/>
+      <Translation x="[Str4_dx]" y="0*mm" z="0*mm"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="1101">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment1:Metalized_Layer"/>
+      <Translation x="[Str4_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="1102">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment1:Metalized_Layer"/>
+      <Translation x="[Str4_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+
+
+    <!-- ******** Pattern 3 ********* -->
+    <PosPart copyNumber="102">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment4:CTPPS_Diamond_Segment"/>
+      <Translation x="[Str5_dx]" y="0*mm" z="0*mm"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="1021">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment4:Metalized_Layer"/>
+      <Translation x="[Str5_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="1022">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment4:Metalized_Layer"/>
+      <Translation x="[Str5_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+
+    <PosPart copyNumber="109">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment3:CTPPS_Diamond_Segment"/>
+      <Translation x="[Str6_dx]" y="0*mm" z="0*mm"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="1091">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment3:Metalized_Layer"/>
+      <Translation x="[Str6_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="1092">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment3:Metalized_Layer"/>
+      <Translation x="[Str6_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+
+    <PosPart copyNumber="103">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment2:CTPPS_Diamond_Segment"/>
+      <Translation x="[Str7_dx]" y="0*mm" z="0*mm"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="1031">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment2:Metalized_Layer"/>
+      <Translation x="[Str7_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="1032">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment2:Metalized_Layer"/>
+      <Translation x="[Str7_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+
+    <PosPart copyNumber="108">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment1:CTPPS_Diamond_Segment"/>
+      <Translation x="[Str8_dx]" y="0*mm" z="0*mm"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="1081">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment1:Metalized_Layer"/>
+      <Translation x="[Str8_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="1082">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment1:Metalized_Layer"/>
+      <Translation x="[Str8_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+
+    <!-- ******** Pattern 2 ********* -->
+    <PosPart copyNumber="104">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern2_Segment2:CTPPS_Diamond_Segment"/>
+      <Translation x="[Str9_dx]" y="0*mm" z="0*mm"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="1041">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern2_Segment2:Metalized_Layer"/>
+      <Translation x="[Str9_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="1042">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern2_Segment2:Metalized_Layer"/>
+      <Translation x="[Str9_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+
+    <PosPart copyNumber="107">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern2_Segment1:CTPPS_Diamond_Segment"/>
+      <Translation x="[Str10_dx]" y="0*mm" z="0*mm"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="1071">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern2_Segment1:Metalized_Layer"/>
+      <Translation x="[Str10_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="1072">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern2_Segment1:Metalized_Layer"/>
+      <Translation x="[Str10_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+
+    <!-- ******** Pattern 2 ********* -->
+    
+    <PosPart copyNumber="105">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern2_Segment2:CTPPS_Diamond_Segment"/>
+      <Translation x="[Str11_dx]" y="0*mm" z="0*mm"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="1051">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern2_Segment2:Metalized_Layer"/>
+      <Translation x="[Str11_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="1052">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern2_Segment2:Metalized_Layer"/>
+      <Translation x="[Str11_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+
+    <PosPart copyNumber="106">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern2_Segment1:CTPPS_Diamond_Segment"/>
+      <Translation x="[Str12_dx]" y="0*mm" z="0*mm"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="1061">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern2_Segment1:Metalized_Layer"/>
+      <Translation x="[Str12_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="1062">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern2_Segment1:Metalized_Layer"/>
+      <Translation x="[Str12_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+
+  </PosPartSection>
+
+</DDDefinition>
diff --git a/Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane3.xml b/Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane3.xml
new file mode 100644
index 0000000000000..c4a1f4333f13c
--- /dev/null
+++ b/Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane3.xml
@@ -0,0 +1,268 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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">
+
+  <ConstantsSection label="CTPPS_Diamond_Plane3.xml" eval="true">
+    <Constant name="Str1_dx" value="-[CTPPS_Diamond_Parameters:Diamond_dx]*2+[CTPPS_Diamond_Parameters:UnMet_Edge]+[CTPPS_Diamond_Parameters:Pat3_Str4_dx]/2"/>
+    <Constant name="Str2_dx" value="[Str1_dx] + [CTPPS_Diamond_Parameters:Pat3_Str4_dx]/2+[CTPPS_Diamond_Parameters:Pat3_Str3_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]"/>
+    <Constant name="Str3_dx" value="[Str2_dx] + [CTPPS_Diamond_Parameters:Pat3_Str3_dx]/2+[CTPPS_Diamond_Parameters:Pat3_Str2_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]"/>
+    <Constant name="Str4_dx" value="[Str3_dx] + [CTPPS_Diamond_Parameters:Pat3_Str2_dx]/2+[CTPPS_Diamond_Parameters:Pat3_Str1_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]"/>
+    <Constant name="Str5_dx" value="[Str4_dx] + [CTPPS_Diamond_Parameters:Pat3_Str1_dx]/2+2*[CTPPS_Diamond_Parameters:UnMet_Edge] + [CTPPS_Diamond_Parameters:Pat3_Str4_dx]/2"/>
+    <Constant name="Str6_dx" value="[Str5_dx] + [CTPPS_Diamond_Parameters:Pat3_Str4_dx]/2+[CTPPS_Diamond_Parameters:Pat3_Str3_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]"/>
+    <Constant name="Str7_dx" value="[Str6_dx] + [CTPPS_Diamond_Parameters:Pat3_Str3_dx]/2+[CTPPS_Diamond_Parameters:Pat3_Str2_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]"/>
+    <Constant name="Str8_dx" value="[Str7_dx] + [CTPPS_Diamond_Parameters:Pat3_Str2_dx]/2+[CTPPS_Diamond_Parameters:Pat3_Str1_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]"/>
+    <Constant name="Str9_dx" value="[Str8_dx] + [CTPPS_Diamond_Parameters:Pat3_Str1_dx]/2+2*[CTPPS_Diamond_Parameters:UnMet_Edge] + [CTPPS_Diamond_Parameters:Pat2_Str2_dx]/2"/>
+    <Constant name="Str10_dx" value="[Str9_dx] + [CTPPS_Diamond_Parameters:Pat2_Str2_dx]/2+[CTPPS_Diamond_Parameters:Pat2_Str1_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]"/>
+    <Constant name="Str11_dx" value="[Str10_dx] + [CTPPS_Diamond_Parameters:Pat2_Str1_dx]/2+2*[CTPPS_Diamond_Parameters:UnMet_Edge] + [CTPPS_Diamond_Parameters:Pat2_Str2_dx]/2"/>
+    <Constant name="Str12_dx" value="[Str11_dx] + [CTPPS_Diamond_Parameters:Pat2_Str2_dx]/2+[CTPPS_Diamond_Parameters:Pat2_Str1_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]"/>
+  </ConstantsSection>
+
+  <SolidSection label="CTPPS_Diamond_Plane3.xml">
+    <Box name="Plane" dx="[CTPPS_Diamond_Parameters:Plane_dx]/2" dy="[CTPPS_Diamond_Parameters:Plane_dy]/2" dz="[CTPPS_Diamond_Parameters:Plane_dz]/2"/>
+  </SolidSection>
+
+  <LogicalPartSection label="CTPPS_Diamond_Plane3.xml">
+    <LogicalPart name="CTPPS_Diamond_Plane" category="unspecified">
+      <rSolid name="Plane"/>
+      <rMaterial name="materials:Air"/>
+    </LogicalPart>
+  </LogicalPartSection>
+
+  <PosPartSection label="CTPPS_Diamond_Plane3.xml">
+
+    <!-- ******** Pattern 3 ********* -->
+    <PosPart copyNumber="200">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment4:CTPPS_Diamond_Segment"/>
+      <Translation x="[Str1_dx]" y="0*mm" z="0*mm"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="2001">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment4:Metalized_Layer"/>
+      <Translation x="[Str1_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="2002">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment4:Metalized_Layer"/>
+      <Translation x="[Str1_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+
+    <PosPart copyNumber="211">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment3:CTPPS_Diamond_Segment"/>
+      <Translation x="[Str2_dx]" y="0*mm" z="0*mm"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="2111">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment3:Metalized_Layer"/>
+      <Translation x="[Str2_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="2112">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment3:Metalized_Layer"/>
+      <Translation x="[Str2_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+
+    <PosPart copyNumber="201">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment2:CTPPS_Diamond_Segment"/>
+      <Translation x="[Str3_dx]" y="0*mm" z="0*mm"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="2011">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment2:Metalized_Layer"/>
+      <Translation x="[Str3_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="2012">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment2:Metalized_Layer"/>
+      <Translation x="[Str3_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+
+    <PosPart copyNumber="210">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment1:CTPPS_Diamond_Segment"/>
+      <Translation x="[Str4_dx]" y="0*mm" z="0*mm"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="2101">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment1:Metalized_Layer"/>
+      <Translation x="[Str4_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="2102">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment1:Metalized_Layer"/>
+      <Translation x="[Str4_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+
+
+    <!-- ******** Pattern 3 ********* -->
+    <PosPart copyNumber="202">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment4:CTPPS_Diamond_Segment"/>
+      <Translation x="[Str5_dx]" y="0*mm" z="0*mm"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="2021">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment4:Metalized_Layer"/>
+      <Translation x="[Str5_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="2022">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment4:Metalized_Layer"/>
+      <Translation x="[Str5_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+
+    <PosPart copyNumber="209">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment3:CTPPS_Diamond_Segment"/>
+      <Translation x="[Str6_dx]" y="0*mm" z="0*mm"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="2091">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment3:Metalized_Layer"/>
+      <Translation x="[Str6_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="2092">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment3:Metalized_Layer"/>
+      <Translation x="[Str6_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+
+    <PosPart copyNumber="203">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment2:CTPPS_Diamond_Segment"/>
+      <Translation x="[Str7_dx]" y="0*mm" z="0*mm"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="2031">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment2:Metalized_Layer"/>
+      <Translation x="[Str7_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="2032">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment2:Metalized_Layer"/>
+      <Translation x="[Str7_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+
+    <PosPart copyNumber="208">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment1:CTPPS_Diamond_Segment"/>
+      <Translation x="[Str8_dx]" y="0*mm" z="0*mm"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="2081">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment1:Metalized_Layer"/>
+      <Translation x="[Str8_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="2082">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment1:Metalized_Layer"/>
+      <Translation x="[Str8_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+
+    <!-- ******** Pattern 2 ********* -->
+    <PosPart copyNumber="204">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern2_Segment2:CTPPS_Diamond_Segment"/>
+      <Translation x="[Str9_dx]" y="0*mm" z="0*mm"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="2041">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern2_Segment2:Metalized_Layer"/>
+      <Translation x="[Str9_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="2042">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern2_Segment2:Metalized_Layer"/>
+      <Translation x="[Str9_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+
+    <PosPart copyNumber="207">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern2_Segment1:CTPPS_Diamond_Segment"/>
+      <Translation x="[Str10_dx]" y="0*mm" z="0*mm"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="2071">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern2_Segment1:Metalized_Layer"/>
+      <Translation x="[Str10_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="2072">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern2_Segment1:Metalized_Layer"/>
+      <Translation x="[Str10_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+
+    <!-- ******** Pattern 2 ********* -->
+    
+    <PosPart copyNumber="205">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern2_Segment2:CTPPS_Diamond_Segment"/>
+      <Translation x="[Str11_dx]" y="0*mm" z="0*mm"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="2051">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern2_Segment2:Metalized_Layer"/>
+      <Translation x="[Str11_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="2052">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern2_Segment2:Metalized_Layer"/>
+      <Translation x="[Str11_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+
+    <PosPart copyNumber="206">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern2_Segment1:CTPPS_Diamond_Segment"/>
+      <Translation x="[Str12_dx]" y="0*mm" z="0*mm"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="2061">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern2_Segment1:Metalized_Layer"/>
+      <Translation x="[Str12_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="2062">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern2_Segment1:Metalized_Layer"/>
+      <Translation x="[Str12_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+
+  </PosPartSection>
+
+</DDDefinition>
diff --git a/Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane4.xml b/Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane4.xml
new file mode 100644
index 0000000000000..df4c25791ecbf
--- /dev/null
+++ b/Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane4.xml
@@ -0,0 +1,268 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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">
+
+  <ConstantsSection label="CTPPS_Diamond_Plane4.xml" eval="true">
+    <Constant name="Str1_dx" value="-[CTPPS_Diamond_Parameters:Diamond_dx]*2+[CTPPS_Diamond_Parameters:UnMet_Edge]+[CTPPS_Diamond_Parameters:Pat3_Str4_dx]/2"/>
+    <Constant name="Str2_dx" value="[Str1_dx] + [CTPPS_Diamond_Parameters:Pat3_Str4_dx]/2+[CTPPS_Diamond_Parameters:Pat3_Str3_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]"/>
+    <Constant name="Str3_dx" value="[Str2_dx] + [CTPPS_Diamond_Parameters:Pat3_Str3_dx]/2+[CTPPS_Diamond_Parameters:Pat3_Str2_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]"/>
+    <Constant name="Str4_dx" value="[Str3_dx] + [CTPPS_Diamond_Parameters:Pat3_Str2_dx]/2+[CTPPS_Diamond_Parameters:Pat3_Str1_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]"/>
+    <Constant name="Str5_dx" value="[Str4_dx] + [CTPPS_Diamond_Parameters:Pat3_Str1_dx]/2+2*[CTPPS_Diamond_Parameters:UnMet_Edge] + [CTPPS_Diamond_Parameters:Pat3_Str4_dx]/2"/>
+    <Constant name="Str6_dx" value="[Str5_dx] + [CTPPS_Diamond_Parameters:Pat3_Str4_dx]/2+[CTPPS_Diamond_Parameters:Pat3_Str3_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]"/>
+    <Constant name="Str7_dx" value="[Str6_dx] + [CTPPS_Diamond_Parameters:Pat3_Str3_dx]/2+[CTPPS_Diamond_Parameters:Pat3_Str2_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]"/>
+    <Constant name="Str8_dx" value="[Str7_dx] + [CTPPS_Diamond_Parameters:Pat3_Str2_dx]/2+[CTPPS_Diamond_Parameters:Pat3_Str1_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]"/>
+    <Constant name="Str9_dx" value="[Str8_dx] + [CTPPS_Diamond_Parameters:Pat3_Str1_dx]/2+2*[CTPPS_Diamond_Parameters:UnMet_Edge] + [CTPPS_Diamond_Parameters:Pat2_Str2_dx]/2"/>
+    <Constant name="Str10_dx" value="[Str9_dx] + [CTPPS_Diamond_Parameters:Pat2_Str2_dx]/2+[CTPPS_Diamond_Parameters:Pat2_Str1_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]"/>
+    <Constant name="Str11_dx" value="[Str10_dx] + [CTPPS_Diamond_Parameters:Pat2_Str1_dx]/2+2*[CTPPS_Diamond_Parameters:UnMet_Edge] + [CTPPS_Diamond_Parameters:Pat2_Str2_dx]/2"/>
+    <Constant name="Str12_dx" value="[Str11_dx] + [CTPPS_Diamond_Parameters:Pat2_Str2_dx]/2+[CTPPS_Diamond_Parameters:Pat2_Str1_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]"/>
+  </ConstantsSection>
+
+  <SolidSection label="CTPPS_Diamond_Plane4.xml">
+    <Box name="Plane" dx="[CTPPS_Diamond_Parameters:Plane_dx]/2" dy="[CTPPS_Diamond_Parameters:Plane_dy]/2" dz="[CTPPS_Diamond_Parameters:Plane_dz]/2"/>
+  </SolidSection>
+
+  <LogicalPartSection label="CTPPS_Diamond_Plane4.xml">
+    <LogicalPart name="CTPPS_Diamond_Plane" category="unspecified">
+      <rSolid name="Plane"/>
+      <rMaterial name="materials:Air"/>
+    </LogicalPart>
+  </LogicalPartSection>
+
+  <PosPartSection label="CTPPS_Diamond_Plane4.xml">
+
+    <!-- ******** Pattern 3 ********* -->
+    <PosPart copyNumber="300">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment4:CTPPS_Diamond_Segment"/>
+      <Translation x="[Str1_dx]" y="0*mm" z="0*mm"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="3001">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment4:Metalized_Layer"/>
+      <Translation x="[Str1_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="3002">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment4:Metalized_Layer"/>
+      <Translation x="[Str1_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+
+    <PosPart copyNumber="311">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment3:CTPPS_Diamond_Segment"/>
+      <Translation x="[Str2_dx]" y="0*mm" z="0*mm"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="3111">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment3:Metalized_Layer"/>
+      <Translation x="[Str2_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="3112">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment3:Metalized_Layer"/>
+      <Translation x="[Str2_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+
+    <PosPart copyNumber="301">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment2:CTPPS_Diamond_Segment"/>
+      <Translation x="[Str3_dx]" y="0*mm" z="0*mm"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="3011">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment2:Metalized_Layer"/>
+      <Translation x="[Str3_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="3012">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment2:Metalized_Layer"/>
+      <Translation x="[Str3_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+
+    <PosPart copyNumber="310">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment1:CTPPS_Diamond_Segment"/>
+      <Translation x="[Str4_dx]" y="0*mm" z="0*mm"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="3101">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment1:Metalized_Layer"/>
+      <Translation x="[Str4_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="3102">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment1:Metalized_Layer"/>
+      <Translation x="[Str4_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+
+
+    <!-- ******** Pattern 3 ********* -->
+    <PosPart copyNumber="302">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment4:CTPPS_Diamond_Segment"/>
+      <Translation x="[Str5_dx]" y="0*mm" z="0*mm"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="3021">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment4:Metalized_Layer"/>
+      <Translation x="[Str5_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="3022">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment4:Metalized_Layer"/>
+      <Translation x="[Str5_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+
+    <PosPart copyNumber="309">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment3:CTPPS_Diamond_Segment"/>
+      <Translation x="[Str6_dx]" y="0*mm" z="0*mm"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="3091">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment3:Metalized_Layer"/>
+      <Translation x="[Str6_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="3092">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment3:Metalized_Layer"/>
+      <Translation x="[Str6_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+
+    <PosPart copyNumber="303">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment2:CTPPS_Diamond_Segment"/>
+      <Translation x="[Str7_dx]" y="0*mm" z="0*mm"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="3031">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment2:Metalized_Layer"/>
+      <Translation x="[Str7_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="3032">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment2:Metalized_Layer"/>
+      <Translation x="[Str7_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+
+    <PosPart copyNumber="308">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment1:CTPPS_Diamond_Segment"/>
+      <Translation x="[Str8_dx]" y="0*mm" z="0*mm"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="3081">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment1:Metalized_Layer"/>
+      <Translation x="[Str8_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="3082">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment1:Metalized_Layer"/>
+      <Translation x="[Str8_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+
+    <!-- ******** Pattern 2 ********* -->
+    <PosPart copyNumber="304">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern2_Segment2:CTPPS_Diamond_Segment"/>
+      <Translation x="[Str9_dx]" y="0*mm" z="0*mm"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="3041">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern2_Segment2:Metalized_Layer"/>
+      <Translation x="[Str9_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="3042">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern2_Segment2:Metalized_Layer"/>
+      <Translation x="[Str9_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+
+    <PosPart copyNumber="307">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern2_Segment1:CTPPS_Diamond_Segment"/>
+      <Translation x="[Str10_dx]" y="0*mm" z="0*mm"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="3071">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern2_Segment1:Metalized_Layer"/>
+      <Translation x="[Str10_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="3072">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern2_Segment1:Metalized_Layer"/>
+      <Translation x="[Str10_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+
+    <!-- ******** Pattern 2 ********* -->
+    
+    <PosPart copyNumber="305">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern2_Segment2:CTPPS_Diamond_Segment"/>
+      <Translation x="[Str11_dx]" y="0*mm" z="0*mm"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="3051">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern2_Segment2:Metalized_Layer"/>
+      <Translation x="[Str11_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="3052">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern2_Segment2:Metalized_Layer"/>
+      <Translation x="[Str11_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+
+    <PosPart copyNumber="306">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern2_Segment1:CTPPS_Diamond_Segment"/>
+      <Translation x="[Str12_dx]" y="0*mm" z="0*mm"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="3061">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern2_Segment1:Metalized_Layer"/>
+      <Translation x="[Str12_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+    <PosPart copyNumber="3062">
+      <rParent name="CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Pattern2_Segment1:Metalized_Layer"/>
+      <Translation x="[Str12_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
+      <rRotation name="rotations:000D"/>
+    </PosPart>
+
+  </PosPartSection>
+
+</DDDefinition>

From 1fbb63610f61c2839b6b456ac67f8b97bf4fa9e1 Mon Sep 17 00:00:00 2001
From: Jacek Kusnierz <jacek.andrzej.kusnierz@cern.ch>
Date: Wed, 11 Sep 2019 12:10:36 +0200
Subject: [PATCH 3/9] Add new geometry python file

---
 .../python/geometryRPFromDD_2021_cfi.py        | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/Geometry/VeryForwardGeometry/python/geometryRPFromDD_2021_cfi.py b/Geometry/VeryForwardGeometry/python/geometryRPFromDD_2021_cfi.py
index 1c8c84e19abb2..176fa8fb11595 100644
--- a/Geometry/VeryForwardGeometry/python/geometryRPFromDD_2021_cfi.py
+++ b/Geometry/VeryForwardGeometry/python/geometryRPFromDD_2021_cfi.py
@@ -50,8 +50,6 @@
     '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_022.xml',
-#    'Geometry/VeryForwardData/data/RP_Detectors_Assembly/CTPPS_Diamond_Detector_Assembly_022.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',
@@ -59,8 +57,6 @@
     '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_122.xml',
-#    'Geometry/VeryForwardData/data/RP_Detectors_Assembly/CTPPS_Diamond_Detector_Assembly_122.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.xml',
@@ -99,11 +95,13 @@
     '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_2018/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane1.xml',
-    'Geometry/VeryForwardData/data/CTPPS_Diamond_2018/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane2.xml',
-    'Geometry/VeryForwardData/data/CTPPS_Diamond_2018/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane3.xml',
-    'Geometry/VeryForwardData/data/CTPPS_Diamond_2018/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane4.xml',
-    'Geometry/VeryForwardData/data/CTPPS_Diamond_2018/CTPPS_Diamond_Detector_Assembly.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_Plane1_new.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_Plane2_new.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.xml'
     )
 
 # UFSD files
@@ -144,7 +142,7 @@
                                               )
 
 # position of RPs
-XMLIdealGeometryESSource_CTPPS.geomXMLFiles.append("Geometry/VeryForwardData/data/2016_ctpps_15sigma_margin0/RP_Dist_Beam_Cent.xml")
+XMLIdealGeometryESSource_CTPPS.geomXMLFiles.append("Geometry/VeryForwardData/data/CTPPS_2021/RP_Dist_Beam_Cent.xml")
 
 ctppsGeometryESModule = cms.ESProducer("CTPPSGeometryESModule",
                                        verbosity = cms.untracked.uint32(1),

From 5eb0fb31ee0216506c244214ea950695741e1696 Mon Sep 17 00:00:00 2001
From: Jacek Kusnierz <jacek.andrzej.kusnierz@cern.ch>
Date: Wed, 11 Sep 2019 12:17:02 +0200
Subject: [PATCH 4/9] Generify RECO Diamond ID

---
 .../plugins/CTPPSGeometryESModule.cc          | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/Geometry/VeryForwardGeometryBuilder/plugins/CTPPSGeometryESModule.cc b/Geometry/VeryForwardGeometryBuilder/plugins/CTPPSGeometryESModule.cc
index c37ec2391d3da..6cf481f32f966 100644
--- a/Geometry/VeryForwardGeometryBuilder/plugins/CTPPSGeometryESModule.cc
+++ b/Geometry/VeryForwardGeometryBuilder/plugins/CTPPSGeometryESModule.cc
@@ -261,11 +261,12 @@ void CTPPSGeometryESModule::buildDetGeomDesc(DDFilteredView* fv, DetGeomDesc* gd
     else if (name == DDD_CTPPS_DIAMONDS_SEGMENT_NAME || name == DDD_CTPPS_UFSD_SEGMENT_NAME) {
       const std::vector<int>& copy_num = fv->copyNumbers();
 
-      const unsigned int id = copy_num[copy_num.size() - 1];
-      const unsigned int arm = copy_num[1] - 1;
-      const unsigned int station = 1;
-      const unsigned int rp = 6;
-      const unsigned int plane = (id / 100);
+      const unsigned int id = copy_num[copy_num.size()-1];
+      const unsigned int decRPId= copy_num[copy_num.size()-4];
+      const unsigned int arm = decRPId%1000/100;
+      const unsigned int station = decRPId%100/10;
+      const unsigned int rp = decRPId%10;
+      const unsigned int plane = ( id / 100 );
       const unsigned int channel = id % 100;
 
       newGD->setGeographicalID(CTPPSDiamondDetId(arm, station, rp, plane, channel));
@@ -279,10 +280,10 @@ void CTPPSGeometryESModule::buildDetGeomDesc(DDFilteredView* fv, DetGeomDesc* gd
       if (copy_num.size() < 2)
         throw cms::Exception("DDDTotemRPContruction")
             << "size of copyNumbers for diamond RP is " << copy_num.size() << ". It must be >= 2.";
-
-      const unsigned int arm = copy_num[1] - 1;
-      const unsigned int station = 1;
-      const unsigned int rp = 6;
+      const unsigned int decRPId= copy_num[copy_num.size()-2];
+      const unsigned int arm = decRPId%1000/100;
+      const unsigned int station = decRPId%100/10;
+      const unsigned int rp = decRPId%10;
 
       newGD->setGeographicalID(CTPPSDiamondDetId(arm, station, rp));
     }
@@ -381,3 +382,4 @@ std::unique_ptr<CTPPSGeometry> CTPPSGeometryESModule::produceMisalignedTG(
 }
 
 DEFINE_FWK_EVENTSETUP_MODULE(CTPPSGeometryESModule);
+

From 59e93eec290ba0e2585c3eaf1d7041aa6e6679f8 Mon Sep 17 00:00:00 2001
From: Jacek Kusnierz <jacek.andrzej.kusnierz@cern.ch>
Date: Thu, 12 Sep 2019 09:30:40 +0200
Subject: [PATCH 5/9] Remove commented values, update layout

---
 .../data/CTPPS_2021/RP_Dist_Beam_Cent.xml     | 27 +++++++++----------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/Geometry/VeryForwardData/data/CTPPS_2021/RP_Dist_Beam_Cent.xml b/Geometry/VeryForwardData/data/CTPPS_2021/RP_Dist_Beam_Cent.xml
index b29d521e03b3a..5f203a1f27ce8 100644
--- a/Geometry/VeryForwardData/data/CTPPS_2021/RP_Dist_Beam_Cent.xml
+++ b/Geometry/VeryForwardData/data/CTPPS_2021/RP_Dist_Beam_Cent.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
 <!-- Generated by makeOfflineGeometry on 07 Jun 2016 12:43:13
-	time: 1464650000
-	offset file: /afs/cern.ch/exp/totem/scratch/data/RP/tools/measurement_offsets/zero_offsets
-	sensor type: RESOLVER
+time: 1464650000
+offset file: /afs/cern.ch/exp/totem/scratch/data/RP/tools/measurement_offsets/zero_offsets
+sensor type: RESOLVER
 -->
 	<ConstantsSection label="RP_Dist_Beam_Cent.xml">
 		<!-- sector 45, 210m station -->
@@ -14,14 +14,17 @@
 		<Constant name="RP_147_Left_Det_Dist_4" value=" +7.000*mm"/>
 		<Constant name="RP_147_Left_Det_Dist_5" value=" +7.000*mm"/>
 
+		<!-- sector 45, 215m diamond station -->
+		<Constant name="CTPPS_45_Det_Dist" value="3.0*mm"/>
+		
 		<!-- sector 45, 220m station -->
 		<Constant name="RP_220_Left_Det_Dist_0" value="+43.391*mm"/> <!-- RESOLVER: +43.391, offset:  +0.000 -->
 		<Constant name="RP_220_Left_Det_Dist_1" value="+42.712*mm"/> <!-- RESOLVER: +42.712, offset:  +0.000 -->
-		<!--<Constant name="RP_220_Left_Det_Dist_2" value="+41.915*mm"/>  RESOLVER: +41.915, offset:  +0.000 -->
-		<Constant name="RP_220_Left_Det_Dist_2" value="+3.0*mm"/> <!-- RESOLVER: +41.915, offset:  +0.000 -->
+		<Constant name="RP_220_Left_Det_Dist_2" value="+3.0*mm"/> 
 		<Constant name="RP_220_Left_Det_Dist_3" value="+43.162*mm"/> <!-- RESOLVER: +43.162, offset:  +0.000 -->
 		<Constant name="RP_220_Left_Det_Dist_4" value=" +7.000*mm"/>
 		<Constant name="RP_220_Left_Det_Dist_5" value=" +7.000*mm"/>
+		
 
 		<!-- sector 56, 210m station -->
 		<Constant name="RP_147_Right_Det_Dist_0" value=" +9.052*mm"/> <!-- RESOLVER:  +9.052, offset:  +0.000 -->
@@ -31,19 +34,15 @@
 		<Constant name="RP_147_Right_Det_Dist_4" value=" +7.000*mm"/>
 		<Constant name="RP_147_Right_Det_Dist_5" value=" +7.000*mm"/>
 
+		<!-- sector 56, 215m diamond station -->
+		<Constant name="CTPPS_56_Det_Dist" value="3.0*mm"/>
+		
 		<!-- sector 56, 220m station -->
 		<Constant name="RP_220_Right_Det_Dist_0" value="+42.318*mm"/> <!-- RESOLVER: +42.318, offset:  +0.000 -->
 		<Constant name="RP_220_Right_Det_Dist_1" value="+42.266*mm"/> <!-- RESOLVER: +42.266, offset:  +0.000 -->
-		<!--<Constant name="RP_220_Right_Det_Dist_2" value="+44.364*mm"/>  RESOLVER: +44.364, offset:  +0.000 -->
-		<Constant name="RP_220_Right_Det_Dist_2" value="+3.0*mm"/> <!-- RESOLVER: +44.364, offset:  +0.000 -->
+		<Constant name="RP_220_Right_Det_Dist_2" value="+3.0*mm"/> 
 		<Constant name="RP_220_Right_Det_Dist_3" value="+43.396*mm"/> <!-- RESOLVER: +43.396, offset:  +0.000 -->
 		<Constant name="RP_220_Right_Det_Dist_4" value=" +7.000*mm"/>
-		<Constant name="RP_220_Right_Det_Dist_5" value=" +7.000*mm"/>
-
-    <!-- sector 45, diamond station -->
-    <Constant name="CTPPS_45_Det_Dist" value="3.0*mm"/>
-
-    <!-- sector 56, diamond station -->
-    <Constant name="CTPPS_56_Det_Dist" value="3.0*mm"/>
+		<Constant name="RP_220_Right_Det_Dist_5" value=" +7.000*mm"/>	
 	</ConstantsSection>
 </DDDefinition>

From 60795cfd48e54a2cd5ffc9dd0cbe7d681f1a4454 Mon Sep 17 00:00:00 2001
From: Jacek Kusnierz <jacek.andrzej.kusnierz@cern.ch>
Date: Thu, 12 Sep 2019 14:32:29 +0200
Subject: [PATCH 6/9] Added comments for diamond detector dist

---
 .../VeryForwardData/data/CTPPS_2021/RP_Dist_Beam_Cent.xml     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Geometry/VeryForwardData/data/CTPPS_2021/RP_Dist_Beam_Cent.xml b/Geometry/VeryForwardData/data/CTPPS_2021/RP_Dist_Beam_Cent.xml
index 5f203a1f27ce8..1d935a9fbffab 100644
--- a/Geometry/VeryForwardData/data/CTPPS_2021/RP_Dist_Beam_Cent.xml
+++ b/Geometry/VeryForwardData/data/CTPPS_2021/RP_Dist_Beam_Cent.xml
@@ -20,7 +20,7 @@ sensor type: RESOLVER
 		<!-- sector 45, 220m station -->
 		<Constant name="RP_220_Left_Det_Dist_0" value="+43.391*mm"/> <!-- RESOLVER: +43.391, offset:  +0.000 -->
 		<Constant name="RP_220_Left_Det_Dist_1" value="+42.712*mm"/> <!-- RESOLVER: +42.712, offset:  +0.000 -->
-		<Constant name="RP_220_Left_Det_Dist_2" value="+3.0*mm"/> 
+		<Constant name="RP_220_Left_Det_Dist_2" value="+3.0*mm"/> <!-- diamond detector --> 
 		<Constant name="RP_220_Left_Det_Dist_3" value="+43.162*mm"/> <!-- RESOLVER: +43.162, offset:  +0.000 -->
 		<Constant name="RP_220_Left_Det_Dist_4" value=" +7.000*mm"/>
 		<Constant name="RP_220_Left_Det_Dist_5" value=" +7.000*mm"/>
@@ -40,7 +40,7 @@ sensor type: RESOLVER
 		<!-- sector 56, 220m station -->
 		<Constant name="RP_220_Right_Det_Dist_0" value="+42.318*mm"/> <!-- RESOLVER: +42.318, offset:  +0.000 -->
 		<Constant name="RP_220_Right_Det_Dist_1" value="+42.266*mm"/> <!-- RESOLVER: +42.266, offset:  +0.000 -->
-		<Constant name="RP_220_Right_Det_Dist_2" value="+3.0*mm"/> 
+		<Constant name="RP_220_Right_Det_Dist_2" value="+3.0*mm"/> <!-- diamond detector -->
 		<Constant name="RP_220_Right_Det_Dist_3" value="+43.396*mm"/> <!-- RESOLVER: +43.396, offset:  +0.000 -->
 		<Constant name="RP_220_Right_Det_Dist_4" value=" +7.000*mm"/>
 		<Constant name="RP_220_Right_Det_Dist_5" value=" +7.000*mm"/>	

From 43a021f45a6d5e2c8ca3aa7ad40f928088f8b24d Mon Sep 17 00:00:00 2001
From: Jacek Kusnierz <jacek.andrzej.kusnierz@cern.ch>
Date: Thu, 12 Sep 2019 14:38:46 +0200
Subject: [PATCH 7/9] Cleanup

---
 .../CTPPS_Diamond_Detector_Assembly.xml       |   4 +-
 .../CTPPS_Diamond_Plane1.xml                  | 114 ++++----
 .../CTPPS_Diamond_Plane1_new.xml              | 268 ------------------
 .../CTPPS_Diamond_Plane2.xml                  | 110 +++----
 .../CTPPS_Diamond_Plane2_new.xml              | 268 ------------------
 .../python/geometryRPFromDD_2021_cfi.py       |   2 -
 6 files changed, 116 insertions(+), 650 deletions(-)
 delete mode 100644 Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane1_new.xml
 delete mode 100644 Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane2_new.xml

diff --git a/Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Detector_Assembly.xml b/Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Detector_Assembly.xml
index 8e40c62ad56e4..843c7b064e70a 100644
--- a/Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Detector_Assembly.xml
+++ b/Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Detector_Assembly.xml
@@ -61,12 +61,12 @@
 
     <PosPart copyNumber="1">
       <rParent name="CTPPS_Diamond_Main_Box"/>
-      <rChild name="CTPPS_Diamond_Plane1_new:CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Plane1:CTPPS_Diamond_Plane"/>
       <Translation y="0*cm" x="[Shift_dx]" z="-([CTPPS_Diamond_Parameters:Plane_dz]+[CTPPS_Diamond_Parameters:Plane_gap])*3/2"/>
     </PosPart>
     <PosPart copyNumber="2">
       <rParent name="CTPPS_Diamond_Main_Box"/>
-      <rChild name="CTPPS_Diamond_Plane2_new:CTPPS_Diamond_Plane"/>
+      <rChild name="CTPPS_Diamond_Plane2:CTPPS_Diamond_Plane"/>
       <Translation y="0*cm" x="[Shift_dx]" z="-([CTPPS_Diamond_Parameters:Plane_dz]+[CTPPS_Diamond_Parameters:Plane_gap])/2"/>
     </PosPart>
     <PosPart copyNumber="3">
diff --git a/Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane1.xml b/Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane1.xml
index d81c0dcffb7d0..6f1ee0c8f245c 100644
--- a/Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane1.xml
+++ b/Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane1.xml
@@ -1,262 +1,264 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
 
-  <ConstantsSection label="CTPPS_Diamond_Plane1.xml" eval="true">
-    <Constant name="Str1_dx" value="-[CTPPS_Diamond_Parameters:Diamond_dx]*2+[CTPPS_Diamond_Parameters:UnMet_Edge]+[CTPPS_Diamond_Parameters:Pat4_Str5_dx]/2"/>
-    <Constant name="Str2_dx" value="-[CTPPS_Diamond_Parameters:Diamond_dx]*2+[CTPPS_Diamond_Parameters:UnMet_Edge]+[CTPPS_Diamond_Parameters:Pat4_Str5_dx]+[CTPPS_Diamond_Parameters:Pat4_Str4_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]"/>
-    <Constant name="Str3_dx" value="-[CTPPS_Diamond_Parameters:Diamond_dx]*2+[CTPPS_Diamond_Parameters:UnMet_Edge]+[CTPPS_Diamond_Parameters:Pat4_Str5_dx]+[CTPPS_Diamond_Parameters:Pat4_Str4_dx]+[CTPPS_Diamond_Parameters:Pat4_Str3_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]*2"/>
-    <Constant name="Str4_dx" value="-[CTPPS_Diamond_Parameters:Diamond_dx]*2+[CTPPS_Diamond_Parameters:UnMet_Edge]+[CTPPS_Diamond_Parameters:Pat4_Str5_dx]+[CTPPS_Diamond_Parameters:Pat4_Str4_dx]+[CTPPS_Diamond_Parameters:Pat4_Str3_dx]+[CTPPS_Diamond_Parameters:Pat4_Str2_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]*3"/>
-    <Constant name="Str5_dx" value="-[CTPPS_Diamond_Parameters:Diamond_dx]*2+[CTPPS_Diamond_Parameters:UnMet_Edge]+[CTPPS_Diamond_Parameters:Pat4_Str5_dx]+[CTPPS_Diamond_Parameters:Pat4_Str4_dx]+[CTPPS_Diamond_Parameters:Pat4_Str3_dx]+[CTPPS_Diamond_Parameters:Pat4_Str2_dx]+[CTPPS_Diamond_Parameters:Pat4_Str1_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]*4"/>
-    <Constant name="Str6_dx" value="-[CTPPS_Diamond_Parameters:Diamond_dx]+[CTPPS_Diamond_Parameters:UnMet_Edge]+[CTPPS_Diamond_Parameters:Pat3_Str4_dx]/2"/>
-    <Constant name="Str7_dx" value="-[CTPPS_Diamond_Parameters:Diamond_dx]+[CTPPS_Diamond_Parameters:UnMet_Edge]+[CTPPS_Diamond_Parameters:Pat3_Str4_dx]+[CTPPS_Diamond_Parameters:Pat3_Str3_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]"/>
-    <Constant name="Str8_dx" value="-[CTPPS_Diamond_Parameters:Diamond_dx]+[CTPPS_Diamond_Parameters:UnMet_Edge]+[CTPPS_Diamond_Parameters:Pat3_Str4_dx]+[CTPPS_Diamond_Parameters:Pat3_Str3_dx]+[CTPPS_Diamond_Parameters:Pat3_Str2_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]*2"/>
-    <Constant name="Str9_dx" value="-[CTPPS_Diamond_Parameters:Diamond_dx]+[CTPPS_Diamond_Parameters:UnMet_Edge]+[CTPPS_Diamond_Parameters:Pat3_Str4_dx]+[CTPPS_Diamond_Parameters:Pat3_Str3_dx]+[CTPPS_Diamond_Parameters:Pat3_Str2_dx]+[CTPPS_Diamond_Parameters:Pat3_Str1_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]*3"/>
-    <Constant name="Str10_dx" value="[CTPPS_Diamond_Parameters:UnMet_Edge]+[CTPPS_Diamond_Parameters:Pat2_Str2_dx]/2"/>
-    <Constant name="Str11_dx" value="[CTPPS_Diamond_Parameters:UnMet_Edge]+[CTPPS_Diamond_Parameters:Pat2_Str2_dx]+[CTPPS_Diamond_Parameters:Pat2_Str1_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]"/>
-    <Constant name="Str12_dx" value="[CTPPS_Diamond_Parameters:Diamond_dx]+[CTPPS_Diamond_Parameters:UnMet_Edge]+[CTPPS_Diamond_Parameters:Pat1_Str1_dx]/2"/>
+  <ConstantsSection label="CTPPS_Diamond_Plane1_new.xml" eval="true">
+    <Constant name="Str1_dx" value="-[CTPPS_Diamond_Parameters:Diamond_dx]*2+[CTPPS_Diamond_Parameters:UnMet_Edge]+[CTPPS_Diamond_Parameters:Pat3_Str4_dx]/2"/>
+    <Constant name="Str2_dx" value="[Str1_dx] + [CTPPS_Diamond_Parameters:Pat3_Str4_dx]/2+[CTPPS_Diamond_Parameters:Pat3_Str3_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]"/>
+    <Constant name="Str3_dx" value="[Str2_dx] + [CTPPS_Diamond_Parameters:Pat3_Str3_dx]/2+[CTPPS_Diamond_Parameters:Pat3_Str2_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]"/>
+    <Constant name="Str4_dx" value="[Str3_dx] + [CTPPS_Diamond_Parameters:Pat3_Str2_dx]/2+[CTPPS_Diamond_Parameters:Pat3_Str1_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]"/>
+    <Constant name="Str5_dx" value="[Str4_dx] + [CTPPS_Diamond_Parameters:Pat3_Str1_dx]/2+2*[CTPPS_Diamond_Parameters:UnMet_Edge] + [CTPPS_Diamond_Parameters:Pat3_Str4_dx]/2"/>
+    <Constant name="Str6_dx" value="[Str5_dx] + [CTPPS_Diamond_Parameters:Pat3_Str4_dx]/2+[CTPPS_Diamond_Parameters:Pat3_Str3_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]"/>
+    <Constant name="Str7_dx" value="[Str6_dx] + [CTPPS_Diamond_Parameters:Pat3_Str3_dx]/2+[CTPPS_Diamond_Parameters:Pat3_Str2_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]"/>
+    <Constant name="Str8_dx" value="[Str7_dx] + [CTPPS_Diamond_Parameters:Pat3_Str2_dx]/2+[CTPPS_Diamond_Parameters:Pat3_Str1_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]"/>
+    <Constant name="Str9_dx" value="[Str8_dx] + [CTPPS_Diamond_Parameters:Pat3_Str1_dx]/2+2*[CTPPS_Diamond_Parameters:UnMet_Edge] + [CTPPS_Diamond_Parameters:Pat2_Str2_dx]/2"/>
+    <Constant name="Str10_dx" value="[Str9_dx] + [CTPPS_Diamond_Parameters:Pat2_Str2_dx]/2+[CTPPS_Diamond_Parameters:Pat2_Str1_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]"/>
+    <Constant name="Str11_dx" value="[Str10_dx] + [CTPPS_Diamond_Parameters:Pat2_Str1_dx]/2+2*[CTPPS_Diamond_Parameters:UnMet_Edge] + [CTPPS_Diamond_Parameters:Pat2_Str2_dx]/2"/>
+    <Constant name="Str12_dx" value="[Str11_dx] + [CTPPS_Diamond_Parameters:Pat2_Str2_dx]/2+[CTPPS_Diamond_Parameters:Pat2_Str1_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]"/>
   </ConstantsSection>
 
-  <SolidSection label="CTPPS_Diamond_Plane1.xml">
+  <SolidSection label="CTPPS_Diamond_Plane1_new.xml">
     <Box name="Plane" dx="[CTPPS_Diamond_Parameters:Plane_dx]/2" dy="[CTPPS_Diamond_Parameters:Plane_dy]/2" dz="[CTPPS_Diamond_Parameters:Plane_dz]/2"/>
   </SolidSection>
 
-  <LogicalPartSection label="CTPPS_Diamond_Plane1.xml">
+  <LogicalPartSection label="CTPPS_Diamond_Plane1_new.xml">
     <LogicalPart name="CTPPS_Diamond_Plane" category="unspecified">
       <rSolid name="Plane"/>
       <rMaterial name="materials:Air"/>
     </LogicalPart>
   </LogicalPartSection>
 
-  <PosPartSection label="CTPPS_Diamond_Plane1.xml">
+  <PosPartSection label="CTPPS_Diamond_Plane1_new.xml">
 
-    <!-- ******** Pattern 4 ********* -->
+    <!-- ******** Pattern 3 ********* -->
     <PosPart copyNumber="000">
       <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern4_Segment5:CTPPS_Diamond_Segment"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment4:CTPPS_Diamond_Segment"/>
       <Translation x="[Str1_dx]" y="0*mm" z="0*mm"/>
       <rRotation name="rotations:000D"/>
     </PosPart>
     <PosPart copyNumber="0001">
       <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern4_Segment5:Metalized_Layer"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment4:Metalized_Layer"/>
       <Translation x="[Str1_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
       <rRotation name="rotations:000D"/>
     </PosPart>
     <PosPart copyNumber="0002">
       <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern4_Segment5:Metalized_Layer"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment4:Metalized_Layer"/>
       <Translation x="[Str1_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
       <rRotation name="rotations:000D"/>
     </PosPart>
 
     <PosPart copyNumber="011">
       <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern4_Segment4:CTPPS_Diamond_Segment"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment3:CTPPS_Diamond_Segment"/>
       <Translation x="[Str2_dx]" y="0*mm" z="0*mm"/>
       <rRotation name="rotations:000D"/>
     </PosPart>
     <PosPart copyNumber="0111">
       <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern4_Segment4:Metalized_Layer"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment3:Metalized_Layer"/>
       <Translation x="[Str2_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
       <rRotation name="rotations:000D"/>
     </PosPart>
     <PosPart copyNumber="0112">
       <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern4_Segment4:Metalized_Layer"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment3:Metalized_Layer"/>
       <Translation x="[Str2_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
       <rRotation name="rotations:000D"/>
     </PosPart>
 
     <PosPart copyNumber="001">
       <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern4_Segment3:CTPPS_Diamond_Segment"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment2:CTPPS_Diamond_Segment"/>
       <Translation x="[Str3_dx]" y="0*mm" z="0*mm"/>
       <rRotation name="rotations:000D"/>
     </PosPart>
     <PosPart copyNumber="0011">
       <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern4_Segment3:Metalized_Layer"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment2:Metalized_Layer"/>
       <Translation x="[Str3_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
       <rRotation name="rotations:000D"/>
     </PosPart>
     <PosPart copyNumber="0012">
       <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern4_Segment3:Metalized_Layer"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment2:Metalized_Layer"/>
       <Translation x="[Str3_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
       <rRotation name="rotations:000D"/>
     </PosPart>
 
     <PosPart copyNumber="010">
       <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern4_Segment2:CTPPS_Diamond_Segment"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment1:CTPPS_Diamond_Segment"/>
       <Translation x="[Str4_dx]" y="0*mm" z="0*mm"/>
       <rRotation name="rotations:000D"/>
     </PosPart>
     <PosPart copyNumber="0101">
       <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern4_Segment2:Metalized_Layer"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment1:Metalized_Layer"/>
       <Translation x="[Str4_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
       <rRotation name="rotations:000D"/>
     </PosPart>
     <PosPart copyNumber="0102">
       <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern4_Segment3:Metalized_Layer"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment1:Metalized_Layer"/>
       <Translation x="[Str4_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
       <rRotation name="rotations:000D"/>
     </PosPart>
 
+
+    <!-- ******** Pattern 3 ********* -->
     <PosPart copyNumber="002">
       <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern4_Segment1:CTPPS_Diamond_Segment"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment4:CTPPS_Diamond_Segment"/>
       <Translation x="[Str5_dx]" y="0*mm" z="0*mm"/>
       <rRotation name="rotations:000D"/>
     </PosPart>
     <PosPart copyNumber="0021">
       <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern4_Segment1:Metalized_Layer"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment4:Metalized_Layer"/>
       <Translation x="[Str5_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
       <rRotation name="rotations:000D"/>
     </PosPart>
     <PosPart copyNumber="0022">
       <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern4_Segment1:Metalized_Layer"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment4:Metalized_Layer"/>
       <Translation x="[Str5_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
       <rRotation name="rotations:000D"/>
     </PosPart>
 
-    <!-- ******** Pattern 3 ********* -->
     <PosPart copyNumber="009">
       <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern3_Segment4:CTPPS_Diamond_Segment"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment3:CTPPS_Diamond_Segment"/>
       <Translation x="[Str6_dx]" y="0*mm" z="0*mm"/>
       <rRotation name="rotations:000D"/>
     </PosPart>
     <PosPart copyNumber="0091">
       <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern3_Segment4:Metalized_Layer"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment3:Metalized_Layer"/>
       <Translation x="[Str6_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
       <rRotation name="rotations:000D"/>
     </PosPart>
     <PosPart copyNumber="0092">
       <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern3_Segment4:Metalized_Layer"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment3:Metalized_Layer"/>
       <Translation x="[Str6_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
       <rRotation name="rotations:000D"/>
     </PosPart>
 
     <PosPart copyNumber="003">
       <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern3_Segment3:CTPPS_Diamond_Segment"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment2:CTPPS_Diamond_Segment"/>
       <Translation x="[Str7_dx]" y="0*mm" z="0*mm"/>
       <rRotation name="rotations:000D"/>
     </PosPart>
     <PosPart copyNumber="0031">
       <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern3_Segment3:Metalized_Layer"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment2:Metalized_Layer"/>
       <Translation x="[Str7_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
       <rRotation name="rotations:000D"/>
     </PosPart>
     <PosPart copyNumber="0032">
       <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern3_Segment3:Metalized_Layer"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment2:Metalized_Layer"/>
       <Translation x="[Str7_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
       <rRotation name="rotations:000D"/>
     </PosPart>
 
     <PosPart copyNumber="008">
       <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern3_Segment2:CTPPS_Diamond_Segment"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment1:CTPPS_Diamond_Segment"/>
       <Translation x="[Str8_dx]" y="0*mm" z="0*mm"/>
       <rRotation name="rotations:000D"/>
     </PosPart>
     <PosPart copyNumber="0081">
       <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern3_Segment2:Metalized_Layer"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment1:Metalized_Layer"/>
       <Translation x="[Str8_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
       <rRotation name="rotations:000D"/>
     </PosPart>
     <PosPart copyNumber="0082">
       <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern3_Segment2:Metalized_Layer"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment1:Metalized_Layer"/>
       <Translation x="[Str8_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
       <rRotation name="rotations:000D"/>
     </PosPart>
 
+    <!-- ******** Pattern 2 ********* -->
     <PosPart copyNumber="004">
       <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern3_Segment1:CTPPS_Diamond_Segment"/>
+      <rChild name="CTPPS_Diamond_Pattern2_Segment2:CTPPS_Diamond_Segment"/>
       <Translation x="[Str9_dx]" y="0*mm" z="0*mm"/>
       <rRotation name="rotations:000D"/>
     </PosPart>
     <PosPart copyNumber="0041">
       <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern3_Segment1:Metalized_Layer"/>
+      <rChild name="CTPPS_Diamond_Pattern2_Segment2:Metalized_Layer"/>
       <Translation x="[Str9_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
       <rRotation name="rotations:000D"/>
     </PosPart>
     <PosPart copyNumber="0042">
       <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern3_Segment1:Metalized_Layer"/>
+      <rChild name="CTPPS_Diamond_Pattern2_Segment2:Metalized_Layer"/>
       <Translation x="[Str9_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
       <rRotation name="rotations:000D"/>
     </PosPart>
 
-    <!-- ******** Pattern 2 ********* -->
     <PosPart copyNumber="007">
       <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern2_Segment2:CTPPS_Diamond_Segment"/>
+      <rChild name="CTPPS_Diamond_Pattern2_Segment1:CTPPS_Diamond_Segment"/>
       <Translation x="[Str10_dx]" y="0*mm" z="0*mm"/>
       <rRotation name="rotations:000D"/>
     </PosPart>
     <PosPart copyNumber="0071">
       <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern2_Segment2:Metalized_Layer"/>
+      <rChild name="CTPPS_Diamond_Pattern2_Segment1:Metalized_Layer"/>
       <Translation x="[Str10_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
       <rRotation name="rotations:000D"/>
     </PosPart>
     <PosPart copyNumber="0072">
       <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern2_Segment2:Metalized_Layer"/>
+      <rChild name="CTPPS_Diamond_Pattern2_Segment1:Metalized_Layer"/>
       <Translation x="[Str10_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
       <rRotation name="rotations:000D"/>
     </PosPart>
 
+    <!-- ******** Pattern 2 ********* -->
+    
     <PosPart copyNumber="005">
       <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern2_Segment1:CTPPS_Diamond_Segment"/>
+      <rChild name="CTPPS_Diamond_Pattern2_Segment2:CTPPS_Diamond_Segment"/>
       <Translation x="[Str11_dx]" y="0*mm" z="0*mm"/>
       <rRotation name="rotations:000D"/>
     </PosPart>
     <PosPart copyNumber="0051">
       <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern2_Segment1:Metalized_Layer"/>
+      <rChild name="CTPPS_Diamond_Pattern2_Segment2:Metalized_Layer"/>
       <Translation x="[Str11_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
       <rRotation name="rotations:000D"/>
     </PosPart>
     <PosPart copyNumber="0052">
       <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern2_Segment1:Metalized_Layer"/>
+      <rChild name="CTPPS_Diamond_Pattern2_Segment2:Metalized_Layer"/>
       <Translation x="[Str11_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
       <rRotation name="rotations:000D"/>
     </PosPart>
 
-    <!-- ******** Pattern 1 ********* -->
     <PosPart copyNumber="006">
       <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern1_Segment1:CTPPS_Diamond_Segment"/>
+      <rChild name="CTPPS_Diamond_Pattern2_Segment1:CTPPS_Diamond_Segment"/>
       <Translation x="[Str12_dx]" y="0*mm" z="0*mm"/>
       <rRotation name="rotations:000D"/>
     </PosPart>
     <PosPart copyNumber="0061">
       <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern1_Segment1:Metalized_Layer"/>
+      <rChild name="CTPPS_Diamond_Pattern2_Segment1:Metalized_Layer"/>
       <Translation x="[Str12_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
       <rRotation name="rotations:000D"/>
     </PosPart>
     <PosPart copyNumber="0062">
       <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern1_Segment1:Metalized_Layer"/>
+      <rChild name="CTPPS_Diamond_Pattern2_Segment1:Metalized_Layer"/>
       <Translation x="[Str12_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
       <rRotation name="rotations:000D"/>
     </PosPart>
diff --git a/Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane1_new.xml b/Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane1_new.xml
deleted file mode 100644
index 6f1ee0c8f245c..0000000000000
--- a/Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane1_new.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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">
-
-  <ConstantsSection label="CTPPS_Diamond_Plane1_new.xml" eval="true">
-    <Constant name="Str1_dx" value="-[CTPPS_Diamond_Parameters:Diamond_dx]*2+[CTPPS_Diamond_Parameters:UnMet_Edge]+[CTPPS_Diamond_Parameters:Pat3_Str4_dx]/2"/>
-    <Constant name="Str2_dx" value="[Str1_dx] + [CTPPS_Diamond_Parameters:Pat3_Str4_dx]/2+[CTPPS_Diamond_Parameters:Pat3_Str3_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]"/>
-    <Constant name="Str3_dx" value="[Str2_dx] + [CTPPS_Diamond_Parameters:Pat3_Str3_dx]/2+[CTPPS_Diamond_Parameters:Pat3_Str2_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]"/>
-    <Constant name="Str4_dx" value="[Str3_dx] + [CTPPS_Diamond_Parameters:Pat3_Str2_dx]/2+[CTPPS_Diamond_Parameters:Pat3_Str1_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]"/>
-    <Constant name="Str5_dx" value="[Str4_dx] + [CTPPS_Diamond_Parameters:Pat3_Str1_dx]/2+2*[CTPPS_Diamond_Parameters:UnMet_Edge] + [CTPPS_Diamond_Parameters:Pat3_Str4_dx]/2"/>
-    <Constant name="Str6_dx" value="[Str5_dx] + [CTPPS_Diamond_Parameters:Pat3_Str4_dx]/2+[CTPPS_Diamond_Parameters:Pat3_Str3_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]"/>
-    <Constant name="Str7_dx" value="[Str6_dx] + [CTPPS_Diamond_Parameters:Pat3_Str3_dx]/2+[CTPPS_Diamond_Parameters:Pat3_Str2_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]"/>
-    <Constant name="Str8_dx" value="[Str7_dx] + [CTPPS_Diamond_Parameters:Pat3_Str2_dx]/2+[CTPPS_Diamond_Parameters:Pat3_Str1_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]"/>
-    <Constant name="Str9_dx" value="[Str8_dx] + [CTPPS_Diamond_Parameters:Pat3_Str1_dx]/2+2*[CTPPS_Diamond_Parameters:UnMet_Edge] + [CTPPS_Diamond_Parameters:Pat2_Str2_dx]/2"/>
-    <Constant name="Str10_dx" value="[Str9_dx] + [CTPPS_Diamond_Parameters:Pat2_Str2_dx]/2+[CTPPS_Diamond_Parameters:Pat2_Str1_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]"/>
-    <Constant name="Str11_dx" value="[Str10_dx] + [CTPPS_Diamond_Parameters:Pat2_Str1_dx]/2+2*[CTPPS_Diamond_Parameters:UnMet_Edge] + [CTPPS_Diamond_Parameters:Pat2_Str2_dx]/2"/>
-    <Constant name="Str12_dx" value="[Str11_dx] + [CTPPS_Diamond_Parameters:Pat2_Str2_dx]/2+[CTPPS_Diamond_Parameters:Pat2_Str1_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]"/>
-  </ConstantsSection>
-
-  <SolidSection label="CTPPS_Diamond_Plane1_new.xml">
-    <Box name="Plane" dx="[CTPPS_Diamond_Parameters:Plane_dx]/2" dy="[CTPPS_Diamond_Parameters:Plane_dy]/2" dz="[CTPPS_Diamond_Parameters:Plane_dz]/2"/>
-  </SolidSection>
-
-  <LogicalPartSection label="CTPPS_Diamond_Plane1_new.xml">
-    <LogicalPart name="CTPPS_Diamond_Plane" category="unspecified">
-      <rSolid name="Plane"/>
-      <rMaterial name="materials:Air"/>
-    </LogicalPart>
-  </LogicalPartSection>
-
-  <PosPartSection label="CTPPS_Diamond_Plane1_new.xml">
-
-    <!-- ******** Pattern 3 ********* -->
-    <PosPart copyNumber="000">
-      <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern3_Segment4:CTPPS_Diamond_Segment"/>
-      <Translation x="[Str1_dx]" y="0*mm" z="0*mm"/>
-      <rRotation name="rotations:000D"/>
-    </PosPart>
-    <PosPart copyNumber="0001">
-      <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern3_Segment4:Metalized_Layer"/>
-      <Translation x="[Str1_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
-      <rRotation name="rotations:000D"/>
-    </PosPart>
-    <PosPart copyNumber="0002">
-      <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern3_Segment4:Metalized_Layer"/>
-      <Translation x="[Str1_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
-      <rRotation name="rotations:000D"/>
-    </PosPart>
-
-    <PosPart copyNumber="011">
-      <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern3_Segment3:CTPPS_Diamond_Segment"/>
-      <Translation x="[Str2_dx]" y="0*mm" z="0*mm"/>
-      <rRotation name="rotations:000D"/>
-    </PosPart>
-    <PosPart copyNumber="0111">
-      <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern3_Segment3:Metalized_Layer"/>
-      <Translation x="[Str2_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
-      <rRotation name="rotations:000D"/>
-    </PosPart>
-    <PosPart copyNumber="0112">
-      <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern3_Segment3:Metalized_Layer"/>
-      <Translation x="[Str2_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
-      <rRotation name="rotations:000D"/>
-    </PosPart>
-
-    <PosPart copyNumber="001">
-      <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern3_Segment2:CTPPS_Diamond_Segment"/>
-      <Translation x="[Str3_dx]" y="0*mm" z="0*mm"/>
-      <rRotation name="rotations:000D"/>
-    </PosPart>
-    <PosPart copyNumber="0011">
-      <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern3_Segment2:Metalized_Layer"/>
-      <Translation x="[Str3_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
-      <rRotation name="rotations:000D"/>
-    </PosPart>
-    <PosPart copyNumber="0012">
-      <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern3_Segment2:Metalized_Layer"/>
-      <Translation x="[Str3_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
-      <rRotation name="rotations:000D"/>
-    </PosPart>
-
-    <PosPart copyNumber="010">
-      <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern3_Segment1:CTPPS_Diamond_Segment"/>
-      <Translation x="[Str4_dx]" y="0*mm" z="0*mm"/>
-      <rRotation name="rotations:000D"/>
-    </PosPart>
-    <PosPart copyNumber="0101">
-      <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern3_Segment1:Metalized_Layer"/>
-      <Translation x="[Str4_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
-      <rRotation name="rotations:000D"/>
-    </PosPart>
-    <PosPart copyNumber="0102">
-      <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern3_Segment1:Metalized_Layer"/>
-      <Translation x="[Str4_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
-      <rRotation name="rotations:000D"/>
-    </PosPart>
-
-
-    <!-- ******** Pattern 3 ********* -->
-    <PosPart copyNumber="002">
-      <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern3_Segment4:CTPPS_Diamond_Segment"/>
-      <Translation x="[Str5_dx]" y="0*mm" z="0*mm"/>
-      <rRotation name="rotations:000D"/>
-    </PosPart>
-    <PosPart copyNumber="0021">
-      <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern3_Segment4:Metalized_Layer"/>
-      <Translation x="[Str5_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
-      <rRotation name="rotations:000D"/>
-    </PosPart>
-    <PosPart copyNumber="0022">
-      <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern3_Segment4:Metalized_Layer"/>
-      <Translation x="[Str5_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
-      <rRotation name="rotations:000D"/>
-    </PosPart>
-
-    <PosPart copyNumber="009">
-      <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern3_Segment3:CTPPS_Diamond_Segment"/>
-      <Translation x="[Str6_dx]" y="0*mm" z="0*mm"/>
-      <rRotation name="rotations:000D"/>
-    </PosPart>
-    <PosPart copyNumber="0091">
-      <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern3_Segment3:Metalized_Layer"/>
-      <Translation x="[Str6_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
-      <rRotation name="rotations:000D"/>
-    </PosPart>
-    <PosPart copyNumber="0092">
-      <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern3_Segment3:Metalized_Layer"/>
-      <Translation x="[Str6_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
-      <rRotation name="rotations:000D"/>
-    </PosPart>
-
-    <PosPart copyNumber="003">
-      <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern3_Segment2:CTPPS_Diamond_Segment"/>
-      <Translation x="[Str7_dx]" y="0*mm" z="0*mm"/>
-      <rRotation name="rotations:000D"/>
-    </PosPart>
-    <PosPart copyNumber="0031">
-      <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern3_Segment2:Metalized_Layer"/>
-      <Translation x="[Str7_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
-      <rRotation name="rotations:000D"/>
-    </PosPart>
-    <PosPart copyNumber="0032">
-      <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern3_Segment2:Metalized_Layer"/>
-      <Translation x="[Str7_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
-      <rRotation name="rotations:000D"/>
-    </PosPart>
-
-    <PosPart copyNumber="008">
-      <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern3_Segment1:CTPPS_Diamond_Segment"/>
-      <Translation x="[Str8_dx]" y="0*mm" z="0*mm"/>
-      <rRotation name="rotations:000D"/>
-    </PosPart>
-    <PosPart copyNumber="0081">
-      <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern3_Segment1:Metalized_Layer"/>
-      <Translation x="[Str8_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
-      <rRotation name="rotations:000D"/>
-    </PosPart>
-    <PosPart copyNumber="0082">
-      <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern3_Segment1:Metalized_Layer"/>
-      <Translation x="[Str8_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
-      <rRotation name="rotations:000D"/>
-    </PosPart>
-
-    <!-- ******** Pattern 2 ********* -->
-    <PosPart copyNumber="004">
-      <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern2_Segment2:CTPPS_Diamond_Segment"/>
-      <Translation x="[Str9_dx]" y="0*mm" z="0*mm"/>
-      <rRotation name="rotations:000D"/>
-    </PosPart>
-    <PosPart copyNumber="0041">
-      <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern2_Segment2:Metalized_Layer"/>
-      <Translation x="[Str9_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
-      <rRotation name="rotations:000D"/>
-    </PosPart>
-    <PosPart copyNumber="0042">
-      <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern2_Segment2:Metalized_Layer"/>
-      <Translation x="[Str9_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
-      <rRotation name="rotations:000D"/>
-    </PosPart>
-
-    <PosPart copyNumber="007">
-      <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern2_Segment1:CTPPS_Diamond_Segment"/>
-      <Translation x="[Str10_dx]" y="0*mm" z="0*mm"/>
-      <rRotation name="rotations:000D"/>
-    </PosPart>
-    <PosPart copyNumber="0071">
-      <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern2_Segment1:Metalized_Layer"/>
-      <Translation x="[Str10_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
-      <rRotation name="rotations:000D"/>
-    </PosPart>
-    <PosPart copyNumber="0072">
-      <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern2_Segment1:Metalized_Layer"/>
-      <Translation x="[Str10_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
-      <rRotation name="rotations:000D"/>
-    </PosPart>
-
-    <!-- ******** Pattern 2 ********* -->
-    
-    <PosPart copyNumber="005">
-      <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern2_Segment2:CTPPS_Diamond_Segment"/>
-      <Translation x="[Str11_dx]" y="0*mm" z="0*mm"/>
-      <rRotation name="rotations:000D"/>
-    </PosPart>
-    <PosPart copyNumber="0051">
-      <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern2_Segment2:Metalized_Layer"/>
-      <Translation x="[Str11_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
-      <rRotation name="rotations:000D"/>
-    </PosPart>
-    <PosPart copyNumber="0052">
-      <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern2_Segment2:Metalized_Layer"/>
-      <Translation x="[Str11_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
-      <rRotation name="rotations:000D"/>
-    </PosPart>
-
-    <PosPart copyNumber="006">
-      <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern2_Segment1:CTPPS_Diamond_Segment"/>
-      <Translation x="[Str12_dx]" y="0*mm" z="0*mm"/>
-      <rRotation name="rotations:000D"/>
-    </PosPart>
-    <PosPart copyNumber="0061">
-      <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern2_Segment1:Metalized_Layer"/>
-      <Translation x="[Str12_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
-      <rRotation name="rotations:000D"/>
-    </PosPart>
-    <PosPart copyNumber="0062">
-      <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern2_Segment1:Metalized_Layer"/>
-      <Translation x="[Str12_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
-      <rRotation name="rotations:000D"/>
-    </PosPart>
-
-  </PosPartSection>
-
-</DDDefinition>
diff --git a/Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane2.xml b/Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane2.xml
index c227fbeea9aeb..a2e0008743ab6 100644
--- a/Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane2.xml
+++ b/Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane2.xml
@@ -1,262 +1,264 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
 
-  <ConstantsSection label="CTPPS_Diamond_Plane2.xml">
-    <Constant name="Str1_dx" value="-[CTPPS_Diamond_Parameters:Diamond_dx]*2+[CTPPS_Diamond_Parameters:UnMet_Edge]+[CTPPS_Diamond_Parameters:Pat3_Str1_dx]/2"/>
-    <Constant name="Str2_dx" value="-[CTPPS_Diamond_Parameters:Diamond_dx]*2+[CTPPS_Diamond_Parameters:UnMet_Edge]+[CTPPS_Diamond_Parameters:Pat3_Str1_dx]+[CTPPS_Diamond_Parameters:Pat3_Str2_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]"/>
-    <Constant name="Str3_dx" value="-[CTPPS_Diamond_Parameters:Diamond_dx]*2+[CTPPS_Diamond_Parameters:UnMet_Edge]+[CTPPS_Diamond_Parameters:Pat3_Str1_dx]+[CTPPS_Diamond_Parameters:Pat3_Str2_dx]+[CTPPS_Diamond_Parameters:Pat3_Str3_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]*2"/>
-    <Constant name="Str4_dx" value="-[CTPPS_Diamond_Parameters:Diamond_dx]*2+[CTPPS_Diamond_Parameters:UnMet_Edge]+[CTPPS_Diamond_Parameters:Pat3_Str1_dx]+[CTPPS_Diamond_Parameters:Pat3_Str2_dx]+[CTPPS_Diamond_Parameters:Pat3_Str3_dx]+[CTPPS_Diamond_Parameters:Pat3_Str4_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]*3"/>
-    <Constant name="Str5_dx" value="-[CTPPS_Diamond_Parameters:Diamond_dx]+[CTPPS_Diamond_Parameters:UnMet_Edge]+[CTPPS_Diamond_Parameters:Pat4_Str1_dx]/2"/>
-    <Constant name="Str6_dx" value="-[CTPPS_Diamond_Parameters:Diamond_dx]+[CTPPS_Diamond_Parameters:UnMet_Edge]+[CTPPS_Diamond_Parameters:Pat4_Str1_dx]+[CTPPS_Diamond_Parameters:Pat4_Str2_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]"/>
-    <Constant name="Str7_dx" value="-[CTPPS_Diamond_Parameters:Diamond_dx]+[CTPPS_Diamond_Parameters:UnMet_Edge]+[CTPPS_Diamond_Parameters:Pat4_Str1_dx]+[CTPPS_Diamond_Parameters:Pat4_Str2_dx]+[CTPPS_Diamond_Parameters:Pat4_Str3_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]*2"/>
-    <Constant name="Str8_dx" value="-[CTPPS_Diamond_Parameters:Diamond_dx]+[CTPPS_Diamond_Parameters:UnMet_Edge]+[CTPPS_Diamond_Parameters:Pat4_Str1_dx]+[CTPPS_Diamond_Parameters:Pat4_Str2_dx]+[CTPPS_Diamond_Parameters:Pat4_Str3_dx]+[CTPPS_Diamond_Parameters:Pat4_Str4_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]*3"/>
-    <Constant name="Str9_dx" value="-[CTPPS_Diamond_Parameters:Diamond_dx]+[CTPPS_Diamond_Parameters:UnMet_Edge]+[CTPPS_Diamond_Parameters:Pat4_Str1_dx]+[CTPPS_Diamond_Parameters:Pat4_Str2_dx]+[CTPPS_Diamond_Parameters:Pat4_Str3_dx]+[CTPPS_Diamond_Parameters:Pat4_Str4_dx]+[CTPPS_Diamond_Parameters:Pat4_Str5_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]*4"/>
-    <Constant name="Str10_dx" value="[CTPPS_Diamond_Parameters:UnMet_Edge]+[CTPPS_Diamond_Parameters:Pat1_Str1_dx]/2"/>
-    <Constant name="Str11_dx" value="[CTPPS_Diamond_Parameters:Diamond_dx]+[CTPPS_Diamond_Parameters:UnMet_Edge]+[CTPPS_Diamond_Parameters:Pat2_Str1_dx]/2"/>
-    <Constant name="Str12_dx" value="[CTPPS_Diamond_Parameters:Diamond_dx]+[CTPPS_Diamond_Parameters:UnMet_Edge]+[CTPPS_Diamond_Parameters:Pat2_Str1_dx]+[CTPPS_Diamond_Parameters:Pat2_Str2_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]"/>
+  <ConstantsSection label="CTPPS_Diamond_Plane2_new.xml" eval="true">
+    <Constant name="Str1_dx" value="-[CTPPS_Diamond_Parameters:Diamond_dx]*2+[CTPPS_Diamond_Parameters:UnMet_Edge]+[CTPPS_Diamond_Parameters:Pat3_Str4_dx]/2"/>
+    <Constant name="Str2_dx" value="[Str1_dx] + [CTPPS_Diamond_Parameters:Pat3_Str4_dx]/2+[CTPPS_Diamond_Parameters:Pat3_Str3_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]"/>
+    <Constant name="Str3_dx" value="[Str2_dx] + [CTPPS_Diamond_Parameters:Pat3_Str3_dx]/2+[CTPPS_Diamond_Parameters:Pat3_Str2_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]"/>
+    <Constant name="Str4_dx" value="[Str3_dx] + [CTPPS_Diamond_Parameters:Pat3_Str2_dx]/2+[CTPPS_Diamond_Parameters:Pat3_Str1_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]"/>
+    <Constant name="Str5_dx" value="[Str4_dx] + [CTPPS_Diamond_Parameters:Pat3_Str1_dx]/2+2*[CTPPS_Diamond_Parameters:UnMet_Edge] + [CTPPS_Diamond_Parameters:Pat3_Str4_dx]/2"/>
+    <Constant name="Str6_dx" value="[Str5_dx] + [CTPPS_Diamond_Parameters:Pat3_Str4_dx]/2+[CTPPS_Diamond_Parameters:Pat3_Str3_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]"/>
+    <Constant name="Str7_dx" value="[Str6_dx] + [CTPPS_Diamond_Parameters:Pat3_Str3_dx]/2+[CTPPS_Diamond_Parameters:Pat3_Str2_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]"/>
+    <Constant name="Str8_dx" value="[Str7_dx] + [CTPPS_Diamond_Parameters:Pat3_Str2_dx]/2+[CTPPS_Diamond_Parameters:Pat3_Str1_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]"/>
+    <Constant name="Str9_dx" value="[Str8_dx] + [CTPPS_Diamond_Parameters:Pat3_Str1_dx]/2+2*[CTPPS_Diamond_Parameters:UnMet_Edge] + [CTPPS_Diamond_Parameters:Pat2_Str2_dx]/2"/>
+    <Constant name="Str10_dx" value="[Str9_dx] + [CTPPS_Diamond_Parameters:Pat2_Str2_dx]/2+[CTPPS_Diamond_Parameters:Pat2_Str1_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]"/>
+    <Constant name="Str11_dx" value="[Str10_dx] + [CTPPS_Diamond_Parameters:Pat2_Str1_dx]/2+2*[CTPPS_Diamond_Parameters:UnMet_Edge] + [CTPPS_Diamond_Parameters:Pat2_Str2_dx]/2"/>
+    <Constant name="Str12_dx" value="[Str11_dx] + [CTPPS_Diamond_Parameters:Pat2_Str2_dx]/2+[CTPPS_Diamond_Parameters:Pat2_Str1_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]"/>
   </ConstantsSection>
 
-  <SolidSection label="CTPPS_Diamond_Plane2.xml">
+  <SolidSection label="CTPPS_Diamond_Plane2_new.xml">
     <Box name="Plane" dx="[CTPPS_Diamond_Parameters:Plane_dx]/2" dy="[CTPPS_Diamond_Parameters:Plane_dy]/2" dz="[CTPPS_Diamond_Parameters:Plane_dz]/2"/>
   </SolidSection>
 
-  <LogicalPartSection label="CTPPS_Diamond_Plane2.xml">
+  <LogicalPartSection label="CTPPS_Diamond_Plane2_new.xml">
     <LogicalPart name="CTPPS_Diamond_Plane" category="unspecified">
       <rSolid name="Plane"/>
       <rMaterial name="materials:Air"/>
     </LogicalPart>
   </LogicalPartSection>
 
-  <PosPartSection label="CTPPS_Diamond_Plane2.xml">
+  <PosPartSection label="CTPPS_Diamond_Plane2_new.xml">
 
     <!-- ******** Pattern 3 ********* -->
     <PosPart copyNumber="100">
       <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern3_Segment1:CTPPS_Diamond_Segment"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment4:CTPPS_Diamond_Segment"/>
       <Translation x="[Str1_dx]" y="0*mm" z="0*mm"/>
       <rRotation name="rotations:000D"/>
     </PosPart>
     <PosPart copyNumber="1001">
       <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern3_Segment1:Metalized_Layer"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment4:Metalized_Layer"/>
       <Translation x="[Str1_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
       <rRotation name="rotations:000D"/>
     </PosPart>
     <PosPart copyNumber="1002">
       <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern3_Segment1:Metalized_Layer"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment4:Metalized_Layer"/>
       <Translation x="[Str1_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
       <rRotation name="rotations:000D"/>
     </PosPart>
 
     <PosPart copyNumber="111">
       <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern3_Segment2:CTPPS_Diamond_Segment"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment3:CTPPS_Diamond_Segment"/>
       <Translation x="[Str2_dx]" y="0*mm" z="0*mm"/>
       <rRotation name="rotations:000D"/>
     </PosPart>
     <PosPart copyNumber="1111">
       <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern3_Segment2:Metalized_Layer"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment3:Metalized_Layer"/>
       <Translation x="[Str2_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
       <rRotation name="rotations:000D"/>
     </PosPart>
     <PosPart copyNumber="1112">
       <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern3_Segment2:Metalized_Layer"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment3:Metalized_Layer"/>
       <Translation x="[Str2_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
       <rRotation name="rotations:000D"/>
     </PosPart>
 
     <PosPart copyNumber="101">
       <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern3_Segment3:CTPPS_Diamond_Segment"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment2:CTPPS_Diamond_Segment"/>
       <Translation x="[Str3_dx]" y="0*mm" z="0*mm"/>
       <rRotation name="rotations:000D"/>
     </PosPart>
     <PosPart copyNumber="1011">
       <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern3_Segment3:Metalized_Layer"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment2:Metalized_Layer"/>
       <Translation x="[Str3_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
       <rRotation name="rotations:000D"/>
     </PosPart>
     <PosPart copyNumber="1012">
       <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern3_Segment3:Metalized_Layer"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment2:Metalized_Layer"/>
       <Translation x="[Str3_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
       <rRotation name="rotations:000D"/>
     </PosPart>
 
     <PosPart copyNumber="110">
       <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern3_Segment4:CTPPS_Diamond_Segment"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment1:CTPPS_Diamond_Segment"/>
       <Translation x="[Str4_dx]" y="0*mm" z="0*mm"/>
       <rRotation name="rotations:000D"/>
     </PosPart>
     <PosPart copyNumber="1101">
       <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern3_Segment4:Metalized_Layer"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment1:Metalized_Layer"/>
       <Translation x="[Str4_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
       <rRotation name="rotations:000D"/>
     </PosPart>
     <PosPart copyNumber="1102">
       <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern3_Segment4:Metalized_Layer"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment1:Metalized_Layer"/>
       <Translation x="[Str4_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
       <rRotation name="rotations:000D"/>
     </PosPart>
 
-    <!-- ******** Pattern 4 ********* -->
+
+    <!-- ******** Pattern 3 ********* -->
     <PosPart copyNumber="102">
       <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern4_Segment1:CTPPS_Diamond_Segment"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment4:CTPPS_Diamond_Segment"/>
       <Translation x="[Str5_dx]" y="0*mm" z="0*mm"/>
       <rRotation name="rotations:000D"/>
     </PosPart>
     <PosPart copyNumber="1021">
       <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern4_Segment1:Metalized_Layer"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment4:Metalized_Layer"/>
       <Translation x="[Str5_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
       <rRotation name="rotations:000D"/>
     </PosPart>
     <PosPart copyNumber="1022">
       <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern4_Segment1:Metalized_Layer"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment4:Metalized_Layer"/>
       <Translation x="[Str5_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
       <rRotation name="rotations:000D"/>
     </PosPart>
 
     <PosPart copyNumber="109">
       <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern4_Segment2:CTPPS_Diamond_Segment"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment3:CTPPS_Diamond_Segment"/>
       <Translation x="[Str6_dx]" y="0*mm" z="0*mm"/>
       <rRotation name="rotations:000D"/>
     </PosPart>
     <PosPart copyNumber="1091">
       <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern4_Segment2:Metalized_Layer"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment3:Metalized_Layer"/>
       <Translation x="[Str6_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
       <rRotation name="rotations:000D"/>
     </PosPart>
     <PosPart copyNumber="1092">
       <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern4_Segment2:Metalized_Layer"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment3:Metalized_Layer"/>
       <Translation x="[Str6_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
       <rRotation name="rotations:000D"/>
     </PosPart>
 
     <PosPart copyNumber="103">
       <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern4_Segment3:CTPPS_Diamond_Segment"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment2:CTPPS_Diamond_Segment"/>
       <Translation x="[Str7_dx]" y="0*mm" z="0*mm"/>
       <rRotation name="rotations:000D"/>
     </PosPart>
     <PosPart copyNumber="1031">
       <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern4_Segment3:Metalized_Layer"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment2:Metalized_Layer"/>
       <Translation x="[Str7_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
       <rRotation name="rotations:000D"/>
     </PosPart>
     <PosPart copyNumber="1032">
       <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern4_Segment3:Metalized_Layer"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment2:Metalized_Layer"/>
       <Translation x="[Str7_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
       <rRotation name="rotations:000D"/>
     </PosPart>
 
     <PosPart copyNumber="108">
       <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern4_Segment4:CTPPS_Diamond_Segment"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment1:CTPPS_Diamond_Segment"/>
       <Translation x="[Str8_dx]" y="0*mm" z="0*mm"/>
       <rRotation name="rotations:000D"/>
     </PosPart>
     <PosPart copyNumber="1081">
       <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern4_Segment4:Metalized_Layer"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment1:Metalized_Layer"/>
       <Translation x="[Str8_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
       <rRotation name="rotations:000D"/>
     </PosPart>
     <PosPart copyNumber="1082">
       <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern4_Segment4:Metalized_Layer"/>
+      <rChild name="CTPPS_Diamond_Pattern3_Segment1:Metalized_Layer"/>
       <Translation x="[Str8_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
       <rRotation name="rotations:000D"/>
     </PosPart>
 
+    <!-- ******** Pattern 2 ********* -->
     <PosPart copyNumber="104">
       <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern4_Segment5:CTPPS_Diamond_Segment"/>
+      <rChild name="CTPPS_Diamond_Pattern2_Segment2:CTPPS_Diamond_Segment"/>
       <Translation x="[Str9_dx]" y="0*mm" z="0*mm"/>
       <rRotation name="rotations:000D"/>
     </PosPart>
     <PosPart copyNumber="1041">
       <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern4_Segment5:Metalized_Layer"/>
+      <rChild name="CTPPS_Diamond_Pattern2_Segment2:Metalized_Layer"/>
       <Translation x="[Str9_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
       <rRotation name="rotations:000D"/>
     </PosPart>
     <PosPart copyNumber="1042">
       <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern4_Segment5:Metalized_Layer"/>
+      <rChild name="CTPPS_Diamond_Pattern2_Segment2:Metalized_Layer"/>
       <Translation x="[Str9_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
       <rRotation name="rotations:000D"/>
     </PosPart>
 
-    <!-- ******** Pattern 1 ********* -->
     <PosPart copyNumber="107">
       <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern1_Segment1:CTPPS_Diamond_Segment"/>
+      <rChild name="CTPPS_Diamond_Pattern2_Segment1:CTPPS_Diamond_Segment"/>
       <Translation x="[Str10_dx]" y="0*mm" z="0*mm"/>
       <rRotation name="rotations:000D"/>
     </PosPart>
     <PosPart copyNumber="1071">
       <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern1_Segment1:Metalized_Layer"/>
+      <rChild name="CTPPS_Diamond_Pattern2_Segment1:Metalized_Layer"/>
       <Translation x="[Str10_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
       <rRotation name="rotations:000D"/>
     </PosPart>
     <PosPart copyNumber="1072">
       <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern1_Segment1:Metalized_Layer"/>
+      <rChild name="CTPPS_Diamond_Pattern2_Segment1:Metalized_Layer"/>
       <Translation x="[Str10_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
       <rRotation name="rotations:000D"/>
     </PosPart>
 
     <!-- ******** Pattern 2 ********* -->
+    
     <PosPart copyNumber="105">
       <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern2_Segment1:CTPPS_Diamond_Segment"/>
+      <rChild name="CTPPS_Diamond_Pattern2_Segment2:CTPPS_Diamond_Segment"/>
       <Translation x="[Str11_dx]" y="0*mm" z="0*mm"/>
       <rRotation name="rotations:000D"/>
     </PosPart>
     <PosPart copyNumber="1051">
       <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern2_Segment1:Metalized_Layer"/>
+      <rChild name="CTPPS_Diamond_Pattern2_Segment2:Metalized_Layer"/>
       <Translation x="[Str11_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
       <rRotation name="rotations:000D"/>
     </PosPart>
     <PosPart copyNumber="1052">
       <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern2_Segment1:Metalized_Layer"/>
+      <rChild name="CTPPS_Diamond_Pattern2_Segment2:Metalized_Layer"/>
       <Translation x="[Str11_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
       <rRotation name="rotations:000D"/>
     </PosPart>
 
     <PosPart copyNumber="106">
       <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern2_Segment2:CTPPS_Diamond_Segment"/>
+      <rChild name="CTPPS_Diamond_Pattern2_Segment1:CTPPS_Diamond_Segment"/>
       <Translation x="[Str12_dx]" y="0*mm" z="0*mm"/>
       <rRotation name="rotations:000D"/>
     </PosPart>
     <PosPart copyNumber="1061">
       <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern2_Segment2:Metalized_Layer"/>
+      <rChild name="CTPPS_Diamond_Pattern2_Segment1:Metalized_Layer"/>
       <Translation x="[Str12_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
       <rRotation name="rotations:000D"/>
     </PosPart>
     <PosPart copyNumber="1062">
       <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern2_Segment2:Metalized_Layer"/>
+      <rChild name="CTPPS_Diamond_Pattern2_Segment1:Metalized_Layer"/>
       <Translation x="[Str12_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
       <rRotation name="rotations:000D"/>
     </PosPart>
diff --git a/Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane2_new.xml b/Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane2_new.xml
deleted file mode 100644
index a2e0008743ab6..0000000000000
--- a/Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane2_new.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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">
-
-  <ConstantsSection label="CTPPS_Diamond_Plane2_new.xml" eval="true">
-    <Constant name="Str1_dx" value="-[CTPPS_Diamond_Parameters:Diamond_dx]*2+[CTPPS_Diamond_Parameters:UnMet_Edge]+[CTPPS_Diamond_Parameters:Pat3_Str4_dx]/2"/>
-    <Constant name="Str2_dx" value="[Str1_dx] + [CTPPS_Diamond_Parameters:Pat3_Str4_dx]/2+[CTPPS_Diamond_Parameters:Pat3_Str3_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]"/>
-    <Constant name="Str3_dx" value="[Str2_dx] + [CTPPS_Diamond_Parameters:Pat3_Str3_dx]/2+[CTPPS_Diamond_Parameters:Pat3_Str2_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]"/>
-    <Constant name="Str4_dx" value="[Str3_dx] + [CTPPS_Diamond_Parameters:Pat3_Str2_dx]/2+[CTPPS_Diamond_Parameters:Pat3_Str1_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]"/>
-    <Constant name="Str5_dx" value="[Str4_dx] + [CTPPS_Diamond_Parameters:Pat3_Str1_dx]/2+2*[CTPPS_Diamond_Parameters:UnMet_Edge] + [CTPPS_Diamond_Parameters:Pat3_Str4_dx]/2"/>
-    <Constant name="Str6_dx" value="[Str5_dx] + [CTPPS_Diamond_Parameters:Pat3_Str4_dx]/2+[CTPPS_Diamond_Parameters:Pat3_Str3_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]"/>
-    <Constant name="Str7_dx" value="[Str6_dx] + [CTPPS_Diamond_Parameters:Pat3_Str3_dx]/2+[CTPPS_Diamond_Parameters:Pat3_Str2_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]"/>
-    <Constant name="Str8_dx" value="[Str7_dx] + [CTPPS_Diamond_Parameters:Pat3_Str2_dx]/2+[CTPPS_Diamond_Parameters:Pat3_Str1_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]"/>
-    <Constant name="Str9_dx" value="[Str8_dx] + [CTPPS_Diamond_Parameters:Pat3_Str1_dx]/2+2*[CTPPS_Diamond_Parameters:UnMet_Edge] + [CTPPS_Diamond_Parameters:Pat2_Str2_dx]/2"/>
-    <Constant name="Str10_dx" value="[Str9_dx] + [CTPPS_Diamond_Parameters:Pat2_Str2_dx]/2+[CTPPS_Diamond_Parameters:Pat2_Str1_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]"/>
-    <Constant name="Str11_dx" value="[Str10_dx] + [CTPPS_Diamond_Parameters:Pat2_Str1_dx]/2+2*[CTPPS_Diamond_Parameters:UnMet_Edge] + [CTPPS_Diamond_Parameters:Pat2_Str2_dx]/2"/>
-    <Constant name="Str12_dx" value="[Str11_dx] + [CTPPS_Diamond_Parameters:Pat2_Str2_dx]/2+[CTPPS_Diamond_Parameters:Pat2_Str1_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]"/>
-  </ConstantsSection>
-
-  <SolidSection label="CTPPS_Diamond_Plane2_new.xml">
-    <Box name="Plane" dx="[CTPPS_Diamond_Parameters:Plane_dx]/2" dy="[CTPPS_Diamond_Parameters:Plane_dy]/2" dz="[CTPPS_Diamond_Parameters:Plane_dz]/2"/>
-  </SolidSection>
-
-  <LogicalPartSection label="CTPPS_Diamond_Plane2_new.xml">
-    <LogicalPart name="CTPPS_Diamond_Plane" category="unspecified">
-      <rSolid name="Plane"/>
-      <rMaterial name="materials:Air"/>
-    </LogicalPart>
-  </LogicalPartSection>
-
-  <PosPartSection label="CTPPS_Diamond_Plane2_new.xml">
-
-    <!-- ******** Pattern 3 ********* -->
-    <PosPart copyNumber="100">
-      <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern3_Segment4:CTPPS_Diamond_Segment"/>
-      <Translation x="[Str1_dx]" y="0*mm" z="0*mm"/>
-      <rRotation name="rotations:000D"/>
-    </PosPart>
-    <PosPart copyNumber="1001">
-      <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern3_Segment4:Metalized_Layer"/>
-      <Translation x="[Str1_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
-      <rRotation name="rotations:000D"/>
-    </PosPart>
-    <PosPart copyNumber="1002">
-      <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern3_Segment4:Metalized_Layer"/>
-      <Translation x="[Str1_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
-      <rRotation name="rotations:000D"/>
-    </PosPart>
-
-    <PosPart copyNumber="111">
-      <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern3_Segment3:CTPPS_Diamond_Segment"/>
-      <Translation x="[Str2_dx]" y="0*mm" z="0*mm"/>
-      <rRotation name="rotations:000D"/>
-    </PosPart>
-    <PosPart copyNumber="1111">
-      <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern3_Segment3:Metalized_Layer"/>
-      <Translation x="[Str2_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
-      <rRotation name="rotations:000D"/>
-    </PosPart>
-    <PosPart copyNumber="1112">
-      <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern3_Segment3:Metalized_Layer"/>
-      <Translation x="[Str2_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
-      <rRotation name="rotations:000D"/>
-    </PosPart>
-
-    <PosPart copyNumber="101">
-      <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern3_Segment2:CTPPS_Diamond_Segment"/>
-      <Translation x="[Str3_dx]" y="0*mm" z="0*mm"/>
-      <rRotation name="rotations:000D"/>
-    </PosPart>
-    <PosPart copyNumber="1011">
-      <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern3_Segment2:Metalized_Layer"/>
-      <Translation x="[Str3_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
-      <rRotation name="rotations:000D"/>
-    </PosPart>
-    <PosPart copyNumber="1012">
-      <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern3_Segment2:Metalized_Layer"/>
-      <Translation x="[Str3_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
-      <rRotation name="rotations:000D"/>
-    </PosPart>
-
-    <PosPart copyNumber="110">
-      <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern3_Segment1:CTPPS_Diamond_Segment"/>
-      <Translation x="[Str4_dx]" y="0*mm" z="0*mm"/>
-      <rRotation name="rotations:000D"/>
-    </PosPart>
-    <PosPart copyNumber="1101">
-      <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern3_Segment1:Metalized_Layer"/>
-      <Translation x="[Str4_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
-      <rRotation name="rotations:000D"/>
-    </PosPart>
-    <PosPart copyNumber="1102">
-      <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern3_Segment1:Metalized_Layer"/>
-      <Translation x="[Str4_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
-      <rRotation name="rotations:000D"/>
-    </PosPart>
-
-
-    <!-- ******** Pattern 3 ********* -->
-    <PosPart copyNumber="102">
-      <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern3_Segment4:CTPPS_Diamond_Segment"/>
-      <Translation x="[Str5_dx]" y="0*mm" z="0*mm"/>
-      <rRotation name="rotations:000D"/>
-    </PosPart>
-    <PosPart copyNumber="1021">
-      <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern3_Segment4:Metalized_Layer"/>
-      <Translation x="[Str5_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
-      <rRotation name="rotations:000D"/>
-    </PosPart>
-    <PosPart copyNumber="1022">
-      <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern3_Segment4:Metalized_Layer"/>
-      <Translation x="[Str5_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
-      <rRotation name="rotations:000D"/>
-    </PosPart>
-
-    <PosPart copyNumber="109">
-      <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern3_Segment3:CTPPS_Diamond_Segment"/>
-      <Translation x="[Str6_dx]" y="0*mm" z="0*mm"/>
-      <rRotation name="rotations:000D"/>
-    </PosPart>
-    <PosPart copyNumber="1091">
-      <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern3_Segment3:Metalized_Layer"/>
-      <Translation x="[Str6_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
-      <rRotation name="rotations:000D"/>
-    </PosPart>
-    <PosPart copyNumber="1092">
-      <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern3_Segment3:Metalized_Layer"/>
-      <Translation x="[Str6_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
-      <rRotation name="rotations:000D"/>
-    </PosPart>
-
-    <PosPart copyNumber="103">
-      <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern3_Segment2:CTPPS_Diamond_Segment"/>
-      <Translation x="[Str7_dx]" y="0*mm" z="0*mm"/>
-      <rRotation name="rotations:000D"/>
-    </PosPart>
-    <PosPart copyNumber="1031">
-      <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern3_Segment2:Metalized_Layer"/>
-      <Translation x="[Str7_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
-      <rRotation name="rotations:000D"/>
-    </PosPart>
-    <PosPart copyNumber="1032">
-      <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern3_Segment2:Metalized_Layer"/>
-      <Translation x="[Str7_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
-      <rRotation name="rotations:000D"/>
-    </PosPart>
-
-    <PosPart copyNumber="108">
-      <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern3_Segment1:CTPPS_Diamond_Segment"/>
-      <Translation x="[Str8_dx]" y="0*mm" z="0*mm"/>
-      <rRotation name="rotations:000D"/>
-    </PosPart>
-    <PosPart copyNumber="1081">
-      <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern3_Segment1:Metalized_Layer"/>
-      <Translation x="[Str8_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
-      <rRotation name="rotations:000D"/>
-    </PosPart>
-    <PosPart copyNumber="1082">
-      <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern3_Segment1:Metalized_Layer"/>
-      <Translation x="[Str8_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
-      <rRotation name="rotations:000D"/>
-    </PosPart>
-
-    <!-- ******** Pattern 2 ********* -->
-    <PosPart copyNumber="104">
-      <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern2_Segment2:CTPPS_Diamond_Segment"/>
-      <Translation x="[Str9_dx]" y="0*mm" z="0*mm"/>
-      <rRotation name="rotations:000D"/>
-    </PosPart>
-    <PosPart copyNumber="1041">
-      <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern2_Segment2:Metalized_Layer"/>
-      <Translation x="[Str9_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
-      <rRotation name="rotations:000D"/>
-    </PosPart>
-    <PosPart copyNumber="1042">
-      <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern2_Segment2:Metalized_Layer"/>
-      <Translation x="[Str9_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
-      <rRotation name="rotations:000D"/>
-    </PosPart>
-
-    <PosPart copyNumber="107">
-      <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern2_Segment1:CTPPS_Diamond_Segment"/>
-      <Translation x="[Str10_dx]" y="0*mm" z="0*mm"/>
-      <rRotation name="rotations:000D"/>
-    </PosPart>
-    <PosPart copyNumber="1071">
-      <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern2_Segment1:Metalized_Layer"/>
-      <Translation x="[Str10_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
-      <rRotation name="rotations:000D"/>
-    </PosPart>
-    <PosPart copyNumber="1072">
-      <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern2_Segment1:Metalized_Layer"/>
-      <Translation x="[Str10_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
-      <rRotation name="rotations:000D"/>
-    </PosPart>
-
-    <!-- ******** Pattern 2 ********* -->
-    
-    <PosPart copyNumber="105">
-      <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern2_Segment2:CTPPS_Diamond_Segment"/>
-      <Translation x="[Str11_dx]" y="0*mm" z="0*mm"/>
-      <rRotation name="rotations:000D"/>
-    </PosPart>
-    <PosPart copyNumber="1051">
-      <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern2_Segment2:Metalized_Layer"/>
-      <Translation x="[Str11_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
-      <rRotation name="rotations:000D"/>
-    </PosPart>
-    <PosPart copyNumber="1052">
-      <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern2_Segment2:Metalized_Layer"/>
-      <Translation x="[Str11_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
-      <rRotation name="rotations:000D"/>
-    </PosPart>
-
-    <PosPart copyNumber="106">
-      <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern2_Segment1:CTPPS_Diamond_Segment"/>
-      <Translation x="[Str12_dx]" y="0*mm" z="0*mm"/>
-      <rRotation name="rotations:000D"/>
-    </PosPart>
-    <PosPart copyNumber="1061">
-      <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern2_Segment1:Metalized_Layer"/>
-      <Translation x="[Str12_dx]" y="0*mm" z="-([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
-      <rRotation name="rotations:000D"/>
-    </PosPart>
-    <PosPart copyNumber="1062">
-      <rParent name="CTPPS_Diamond_Plane"/>
-      <rChild name="CTPPS_Diamond_Pattern2_Segment1:Metalized_Layer"/>
-      <Translation x="[Str12_dx]" y="0*mm" z="([CTPPS_Diamond_Parameters:Diamond_dz]+[CTPPS_Diamond_Parameters:Metalized_thick])/2"/>
-      <rRotation name="rotations:000D"/>
-    </PosPart>
-
-  </PosPartSection>
-
-</DDDefinition>
diff --git a/Geometry/VeryForwardGeometry/python/geometryRPFromDD_2021_cfi.py b/Geometry/VeryForwardGeometry/python/geometryRPFromDD_2021_cfi.py
index 176fa8fb11595..96e7f74f473b6 100644
--- a/Geometry/VeryForwardGeometry/python/geometryRPFromDD_2021_cfi.py
+++ b/Geometry/VeryForwardGeometry/python/geometryRPFromDD_2021_cfi.py
@@ -96,9 +96,7 @@
     '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_Plane1_new.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_Plane2_new.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.xml'

From 99f65b461183e1952beb5dd0749bc7a1ce5c5b4a Mon Sep 17 00:00:00 2001
From: Jacek Kusnierz <jacek.andrzej.kusnierz@cern.ch>
Date: Thu, 12 Sep 2019 14:43:27 +0200
Subject: [PATCH 8/9] Correct mistake with naming

---
 .../CTPPS_Diamond_Planes/CTPPS_Diamond_Plane1.xml         | 8 ++++----
 .../CTPPS_Diamond_Planes/CTPPS_Diamond_Plane2.xml         | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane1.xml b/Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane1.xml
index 6f1ee0c8f245c..400943ccbd05d 100644
--- a/Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane1.xml
+++ b/Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane1.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
 
-  <ConstantsSection label="CTPPS_Diamond_Plane1_new.xml" eval="true">
+  <ConstantsSection label="CTPPS_Diamond_Plane1.xml" eval="true">
     <Constant name="Str1_dx" value="-[CTPPS_Diamond_Parameters:Diamond_dx]*2+[CTPPS_Diamond_Parameters:UnMet_Edge]+[CTPPS_Diamond_Parameters:Pat3_Str4_dx]/2"/>
     <Constant name="Str2_dx" value="[Str1_dx] + [CTPPS_Diamond_Parameters:Pat3_Str4_dx]/2+[CTPPS_Diamond_Parameters:Pat3_Str3_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]"/>
     <Constant name="Str3_dx" value="[Str2_dx] + [CTPPS_Diamond_Parameters:Pat3_Str3_dx]/2+[CTPPS_Diamond_Parameters:Pat3_Str2_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]"/>
@@ -16,18 +16,18 @@
     <Constant name="Str12_dx" value="[Str11_dx] + [CTPPS_Diamond_Parameters:Pat2_Str2_dx]/2+[CTPPS_Diamond_Parameters:Pat2_Str1_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]"/>
   </ConstantsSection>
 
-  <SolidSection label="CTPPS_Diamond_Plane1_new.xml">
+  <SolidSection label="CTPPS_Diamond_Plane1.xml">
     <Box name="Plane" dx="[CTPPS_Diamond_Parameters:Plane_dx]/2" dy="[CTPPS_Diamond_Parameters:Plane_dy]/2" dz="[CTPPS_Diamond_Parameters:Plane_dz]/2"/>
   </SolidSection>
 
-  <LogicalPartSection label="CTPPS_Diamond_Plane1_new.xml">
+  <LogicalPartSection label="CTPPS_Diamond_Plane1.xml">
     <LogicalPart name="CTPPS_Diamond_Plane" category="unspecified">
       <rSolid name="Plane"/>
       <rMaterial name="materials:Air"/>
     </LogicalPart>
   </LogicalPartSection>
 
-  <PosPartSection label="CTPPS_Diamond_Plane1_new.xml">
+  <PosPartSection label="CTPPS_Diamond_Plane1.xml">
 
     <!-- ******** Pattern 3 ********* -->
     <PosPart copyNumber="000">
diff --git a/Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane2.xml b/Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane2.xml
index a2e0008743ab6..87eca99023acd 100644
--- a/Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane2.xml
+++ b/Geometry/VeryForwardData/data/CTPPS_Diamond_2021/CTPPS_Diamond_Planes/CTPPS_Diamond_Plane2.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
 
-  <ConstantsSection label="CTPPS_Diamond_Plane2_new.xml" eval="true">
+  <ConstantsSection label="CTPPS_Diamond_Plane2.xml" eval="true">
     <Constant name="Str1_dx" value="-[CTPPS_Diamond_Parameters:Diamond_dx]*2+[CTPPS_Diamond_Parameters:UnMet_Edge]+[CTPPS_Diamond_Parameters:Pat3_Str4_dx]/2"/>
     <Constant name="Str2_dx" value="[Str1_dx] + [CTPPS_Diamond_Parameters:Pat3_Str4_dx]/2+[CTPPS_Diamond_Parameters:Pat3_Str3_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]"/>
     <Constant name="Str3_dx" value="[Str2_dx] + [CTPPS_Diamond_Parameters:Pat3_Str3_dx]/2+[CTPPS_Diamond_Parameters:Pat3_Str2_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]"/>
@@ -16,18 +16,18 @@
     <Constant name="Str12_dx" value="[Str11_dx] + [CTPPS_Diamond_Parameters:Pat2_Str2_dx]/2+[CTPPS_Diamond_Parameters:Pat2_Str1_dx]/2+[CTPPS_Diamond_Parameters:UnMet_gap]"/>
   </ConstantsSection>
 
-  <SolidSection label="CTPPS_Diamond_Plane2_new.xml">
+  <SolidSection label="CTPPS_Diamond_Plane2.xml">
     <Box name="Plane" dx="[CTPPS_Diamond_Parameters:Plane_dx]/2" dy="[CTPPS_Diamond_Parameters:Plane_dy]/2" dz="[CTPPS_Diamond_Parameters:Plane_dz]/2"/>
   </SolidSection>
 
-  <LogicalPartSection label="CTPPS_Diamond_Plane2_new.xml">
+  <LogicalPartSection label="CTPPS_Diamond_Plane2.xml">
     <LogicalPart name="CTPPS_Diamond_Plane" category="unspecified">
       <rSolid name="Plane"/>
       <rMaterial name="materials:Air"/>
     </LogicalPart>
   </LogicalPartSection>
 
-  <PosPartSection label="CTPPS_Diamond_Plane2_new.xml">
+  <PosPartSection label="CTPPS_Diamond_Plane2.xml">
 
     <!-- ******** Pattern 3 ********* -->
     <PosPart copyNumber="100">

From 34a426e029ba80767ed0cbdca196b6dd0db8d3ed Mon Sep 17 00:00:00 2001
From: Jacek Kusnierz <jacek.andrzej.kusnierz@cern.ch>
Date: Fri, 13 Sep 2019 16:01:33 +0200
Subject: [PATCH 9/9] Code format

---
 .../plugins/CTPPSGeometryESModule.cc          | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/Geometry/VeryForwardGeometryBuilder/plugins/CTPPSGeometryESModule.cc b/Geometry/VeryForwardGeometryBuilder/plugins/CTPPSGeometryESModule.cc
index 6cf481f32f966..3eeb864c41606 100644
--- a/Geometry/VeryForwardGeometryBuilder/plugins/CTPPSGeometryESModule.cc
+++ b/Geometry/VeryForwardGeometryBuilder/plugins/CTPPSGeometryESModule.cc
@@ -261,12 +261,12 @@ void CTPPSGeometryESModule::buildDetGeomDesc(DDFilteredView* fv, DetGeomDesc* gd
     else if (name == DDD_CTPPS_DIAMONDS_SEGMENT_NAME || name == DDD_CTPPS_UFSD_SEGMENT_NAME) {
       const std::vector<int>& copy_num = fv->copyNumbers();
 
-      const unsigned int id = copy_num[copy_num.size()-1];
-      const unsigned int decRPId= copy_num[copy_num.size()-4];
-      const unsigned int arm = decRPId%1000/100;
-      const unsigned int station = decRPId%100/10;
-      const unsigned int rp = decRPId%10;
-      const unsigned int plane = ( id / 100 );
+      const unsigned int id = copy_num[copy_num.size() - 1];
+      const unsigned int decRPId = copy_num[copy_num.size() - 4];
+      const unsigned int arm = decRPId % 1000 / 100;
+      const unsigned int station = decRPId % 100 / 10;
+      const unsigned int rp = decRPId % 10;
+      const unsigned int plane = (id / 100);
       const unsigned int channel = id % 100;
 
       newGD->setGeographicalID(CTPPSDiamondDetId(arm, station, rp, plane, channel));
@@ -280,10 +280,10 @@ void CTPPSGeometryESModule::buildDetGeomDesc(DDFilteredView* fv, DetGeomDesc* gd
       if (copy_num.size() < 2)
         throw cms::Exception("DDDTotemRPContruction")
             << "size of copyNumbers for diamond RP is " << copy_num.size() << ". It must be >= 2.";
-      const unsigned int decRPId= copy_num[copy_num.size()-2];
-      const unsigned int arm = decRPId%1000/100;
-      const unsigned int station = decRPId%100/10;
-      const unsigned int rp = decRPId%10;
+      const unsigned int decRPId = copy_num[copy_num.size() - 2];
+      const unsigned int arm = decRPId % 1000 / 100;
+      const unsigned int station = decRPId % 100 / 10;
+      const unsigned int rp = decRPId % 10;
 
       newGD->setGeographicalID(CTPPSDiamondDetId(arm, station, rp));
     }
@@ -382,4 +382,3 @@ std::unique_ptr<CTPPSGeometry> CTPPSGeometryESModule::produceMisalignedTG(
 }
 
 DEFINE_FWK_EVENTSETUP_MODULE(CTPPSGeometryESModule);
-