From 558dce77905901e2e9fed72e8c23280a225924e5 Mon Sep 17 00:00:00 2001
From: Fabio Cossutti <fabio.cossutti@ts.infn.it>
Date: Mon, 25 Nov 2019 16:15:38 +0100
Subject: [PATCH 01/15] Add scenario D51, move materials out of etl.xml

---
 Configuration/Geometry/README.md              |    2 +
 .../Geometry/python/dict2026Geometry.py       |   29 +
 Geometry/MTDCommonData/data/etl/v4/etl.xml    | 2839 +++++++++++++++++
 .../data/mtdMaterial/v2/mtdMaterial.xml       |  187 ++
 4 files changed, 3057 insertions(+)
 create mode 100644 Geometry/MTDCommonData/data/etl/v4/etl.xml
 create mode 100644 Geometry/MTDCommonData/data/mtdMaterial/v2/mtdMaterial.xml

diff --git a/Configuration/Geometry/README.md b/Configuration/Geometry/README.md
index d8c4a70fe1a53..1285d15242412 100644
--- a/Configuration/Geometry/README.md
+++ b/Configuration/Geometry/README.md
@@ -29,6 +29,7 @@ Fast Timing system:
 * I9: Same as I7 but with ETL in the position defined in O3
 * I10: Same as I9 w/ material adjustments
 * I11: Same as I10, xml reorganized, comparison base for new ETL and DD4hep migration
+* I12: Starting from I11, new ETL layout from MTD TDR
 
 The script also handles the common and forward elements of the geometry:
 * O2: detailed cavern description
@@ -50,5 +51,6 @@ Several detector combinations have been generated:
 * D50 = T15+C9+M4+I11+O4+F2
 * D51 = T17+C9+M4+I10+O4+F2
 * D52 = T18+C9+M4+I10+O4+F2
+* D53 = T15+C9+M4+I12+O4+F2
 
 D35 is the MTD TDR baseline, D41 is the L1T TDR baseline, and D49 is the HLT TDR baseline.
diff --git a/Configuration/Geometry/python/dict2026Geometry.py b/Configuration/Geometry/python/dict2026Geometry.py
index 5944c209d23de..a4448d7b9f3fc 100644
--- a/Configuration/Geometry/python/dict2026Geometry.py
+++ b/Configuration/Geometry/python/dict2026Geometry.py
@@ -1072,6 +1072,34 @@
         ],
         "era" : "phase2_timing, phase2_timing_layer",
     },
+    "I12" : {
+        1 : [
+            'Geometry/MTDCommonData/data/mtdMaterial/v2/mtdMaterial.xml',
+            'Geometry/MTDCommonData/data/btl/v1/btl.xml',
+            'Geometry/MTDCommonData/data/btl/v1/btlStructureTopology.xml',
+            'Geometry/MTDCommonData/data/etl/v4/etl.xml',
+            'Geometry/MTDCommonData/data/mtdParameters/v1/mtdParameters.xml',
+            ],
+        3 : [
+            'Geometry/MTDSimData/data/v1/mtdsens.xml'
+            ],
+        4 : [
+            'Geometry/MTDSimData/data/v1/mtdProdCuts.xml'
+            ],
+        "sim" : [
+            'from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cfi import *',
+        ],
+        "reco" :[
+            'from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import *',
+            'from Geometry.MTDGeometryBuilder.mtdParameters_cfi import *',
+            'from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cfi import *',
+            'from Geometry.MTDNumberingBuilder.mtdTopology_cfi import *',
+            'from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import *',
+            'from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import *',
+            'mtdGeometry.applyAlignment = cms.bool(False)'
+        ],
+        "era" : "phase2_timing, phase2_timing_layer",
+    },
 }
 
 allDicts = [ commonDict, trackerDict, caloDict, muonDict, forwardDict, timingDict ]
@@ -1089,6 +1117,7 @@
     ("O4","T15","C9","M4","F2","I11") : "D50",
     ("O4","T17","C9","M4","F2","I10") : "D51",
     ("O4","T18","C9","M4","F2","I10") : "D52",
+    ("O4","T15","C9","M4","F2","I12") : "D53",
  }
 
 deprecatedDets = set([ "D1", "D2", "D3", "D5", "D6" , "D7", "D4", "D8" , "D9", "D12", "D13", "D15", "D10", "D11", "D14", "D16", "D17", "D18", "D19", "D20", "D21", "D22", "D23", "D24", "D25", "D26", "D27", "D28", "D29", "D30", "D31", "D32", "D33", "D34", "D36", "D37", "D38", "D39", "D40", "D42" ])
diff --git a/Geometry/MTDCommonData/data/etl/v4/etl.xml b/Geometry/MTDCommonData/data/etl/v4/etl.xml
new file mode 100644
index 0000000000000..8bee89fd20119
--- /dev/null
+++ b/Geometry/MTDCommonData/data/etl/v4/etl.xml
@@ -0,0 +1,2839 @@
+<?xml version="1.0"?>
+<DDDefinition xmlns="http://www.cern.ch/cms/DDL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.cern.ch/cms/DDL ../../../../DetectorDescription/Schema/DDLSchema.xsd">
+
+  <ConstantsSection label="etl.xml" eval="true/false">
+	<Constant name="ETLrmin" value="[caloBase:Rmin100]"/>   <!-- 2.63cm -->
+	<Constant name="ETLrmax" value="[caloBase:Rmax100]"/>   <!--  -->
+	<Constant name="ETLzmin" value="-0.5*([caloBase:Zpos110]-[caloBase:Zpos100])"/>  <!-- zmax-zmin = 77mm -->
+	<Constant name="ETLzmax" value="0.5*([caloBase:Zpos110]-[caloBase:Zpos100])"/>
+
+	<Constant name="Disk_thickness" value="1.894"/>  <!-- thickness of one disk comprising modules, service hybrids on both faces, mounted on the Al and MIC6-Al rings. Fig 3.73 TDR and line 354 Ulascan ETLDetectorDimensions.cc -->
+	<Constant name="DiskQuarter_thickness" value="0.585"/> <!-- thickness of the volume where the LGAD modules + service hybrid will be positioned. Basically, this is the service hybrid height according to table 3.9 -->
+	<!-- LGAD and ETROC values taken from Ulascan code (line 103 on in ETLDetectorDimensions.cc), same values in the TDR -->
+	<Constant name="LGADdx" value="2.12"/>
+	<Constant name="LGADdy" value="4.2"/>
+	<Constant name="LGAD_ActiveThickness" value="0.005"/> 
+	<Constant name="LGAD_Substrate" value="0.025"/>
+	<Constant name="LGADdz" value="0.03"/>
+	<Constant name="lgadSep_X" value="0.025"/>  <!-- x-offset between lgad in a 2SensorModule, line 232 ETLDetectorDimensions.cc -->
+	<Constant name="lgadSep_Y" value="0.05"/> <!-- y-offset between SensorModules and service hybrids, line 414 ETLDetectorDimensions.cc -->
+	<Constant name="ETROCdx" value="2.23"/>
+	<Constant name="ETROCdy" value="2.08"/>
+	<Constant name="ETROCdz" value="0.025"/>
+	<Constant name="etrocSep_X" value="0.03"/>  <!-- line 202 Ulascan ETLDetectorDimensions.cc -->
+	<Constant name="etrocSep_Y" value="0.01"/>
+
+	<Constant name="ServiceHybrid_X" value="3.4"/>  <!-- line 294 Ulascan ETLDetectorDimensions.cc -->
+	<Constant name="ServiceHybrid_Y" value="26.11"/> <!-- ORANGE 6x SensorModule_dy + 5x lgadSep_Y -->
+	<Constant name="ServiceHybrid_Y_short" value="13.055"/> <!-- RED 3x SensorModule_dy + 2x lgadSep_Y -->
+	<Constant name="ServiceHybrid_Z" value="0.585"/>
+	<Constant name="SensorModuledx" value="2.825"/>  <!-- Half of a 2-Sensor-Module line 181 Ulascan ETLDetectorDimensions.cc -->
+	<Constant name="SensorModuledy" value="4.31"/>
+	<Constant name="SensorModuledz" value="0.229"/>
+	<Constant name="DeltaX_ServiceModule" value="3.1125"/>
+	<Constant name="DeltaY" value="0.05"/>
+	<Constant name="DeltaY_ServiceLong_ServiceShort" value="19.5825"/>
+  </ConstantsSection>
+
+
+  <SolidSection label="etl.xml">
+	<Polycone name="EndcapTimingLayer" startPhi="0*deg" deltaPhi="360*deg">
+	  <ZSection z="[ETLzmin]"         rMin="[ETLrmin]"          rMax="[ETLrmax]" />
+	  <ZSection z="[ETLzmax]"         rMin="[ETLrmin]"          rMax="[ETLrmax]" />
+	</Polycone>
+	<!-- Aluminium rings: dimensions as defined by ulascan (line 345 ETLDetectorDimensions.cc). Note: epoxy not considered as single element but included in "Aluminium_Disk" (0.081 + 0.008 cm) -->
+	<Tubs name="Disk" rMin="31*cm" rMax="127*cm" dz="0.5*[Disk_thickness]*cm" startPhi="0*deg" deltaPhi="360*deg"/>
+	<Tubs name="Aluminium_Disk" rMin="31*cm" rMax="127*cm" dz="0.5*(0.089)*cm" startPhi="0*deg" deltaPhi="360*deg"/>  
+	<Tubs name="MIC6_Aluminium_Disk" rMin="31*cm" rMax="127*cm" dz="0.5*(0.635)*cm" startPhi="0*deg" deltaPhi="360*deg"/>
+	<!-- Front is the face touching the Al ring, while Back touches the MIC6-Al ring" -->
+	<Tubs name="DiskQuarterFront" rMin="31*cm" rMax="127*cm" dz="0.5*[DiskQuarter_thickness]*cm" startPhi="0*deg" deltaPhi="90*deg"/>
+	<Tubs name="DiskQuarterBack" rMin="31*cm" rMax="127*cm" dz="0.5*[DiskQuarter_thickness]*cm" startPhi="0*deg" deltaPhi="90*deg"/>
+
+	<!-- QUANDO POSIZIONI IL SensorModule con l'algoritmo ricordati degli offset in y!!!! (mentre in x non ci sono) -->
+	<Box name="SensorModule" dx="0.5*[SensorModuledx]*cm" dy="0.5*[SensorModuledy]*cm" dz="0.5*[SensorModuledz]*cm"/>
+	<Box name="ServiceHybrid" dx="0.5*[ServiceHybrid_X]*cm" dy="0.5*[ServiceHybrid_Y]*cm" dz="0.5*[ServiceHybrid_Z]*cm"/>
+	<Box name="ServiceHybrid_short" dx="0.5*[ServiceHybrid_X]*cm" dy="0.5*[ServiceHybrid_Y_short]*cm" dz="0.5*[ServiceHybrid_Z]*cm"/>
+
+	<!-- box for the back-quarters --> 
+	<Box name="SensorModule_back" dx="0.5*[SensorModuledy]*cm" dy="0.5*[SensorModuledx]*cm" dz="0.5*[SensorModuledz]*cm"/>
+	<Box name="ServiceHybrid_back" dx="0.5*[ServiceHybrid_Y]*cm" dy="0.5*[ServiceHybrid_X]*cm" dz="0.5*[ServiceHybrid_Z]*cm"/>
+	<Box name="ServiceHybrid_short_back" dx="0.5*[ServiceHybrid_Y_short]*cm" dy="0.5*[ServiceHybrid_X]*cm" dz="0.5*[ServiceHybrid_Z]*cm"/>
+
+	<Box name="ThermalPad" dx="0.5*[SensorModuledx]*cm" dy="0.5*[SensorModuledy]*cm" dz="0.5*(0.025)*cm"/>
+	<Box name="AlN_Carrier" dx="0.5*[SensorModuledx]*cm" dy="0.5*[SensorModuledy]*cm" dz="0.5*(0.079)*cm"/>
+	<Box name="LairdFilm" dx="0.5*([ETROCdx]+0.5*[etrocSep_X])*cm" dy="0.5*([ETROCdy]*2+[etrocSep_Y])*cm" dz="0.5*(0.008)*cm"/> <!-- Line 220 ETLDetectorDimensions.cc -->
+	<Box name="ETROC" dx="0.5*[ETROCdx]*cm" dy="0.5*[ETROCdy]*cm" dz="0.5*(0.028)*cm"/>  <!-- solder bumps not considered, their thickness is included in that of the ETROC --> 
+	<Box name="LGAD" dx="0.5*[LGADdx]*cm" dy="0.5*[LGADdy]*cm" dz="0.5*[LGADdz]*cm"/>
+	<Box name="LGAD_ActiveThickness" dx="0.5*[LGADdx]*cm" dy="0.5*[LGADdy]*cm" dz="0.5*[LGAD_ActiveThickness]*cm"/>
+	<Box name="LGAD_Substrate" dx="0.5*[LGADdx]*cm" dy="0.5*[LGADdy]*cm" dz="0.5*[LGAD_Substrate]*cm"/>
+	<Box name="AlN_Cover" dx="0.5*[LGADdx]*cm" dy="0.5*[LGADdy]*cm" dz="0.5*(0.059)*cm"/>  <!-- epoxy included in the thickness of the AlN cover -->
+
+
+	<Box name="ThermalPad_back" dx="0.5*[SensorModuledy]*cm" dy="0.5*[SensorModuledx]*cm" dz="0.5*(0.025)*cm"/>
+	<Box name="AlN_Carrier_back" dx="0.5*[SensorModuledy]*cm" dy="0.5*[SensorModuledx]*cm" dz="0.5*(0.079)*cm"/>
+	<Box name="LairdFilm_back" dx="0.5*([ETROCdy]*2+[etrocSep_Y])*cm" dy="0.5*([ETROCdx]+0.5*[etrocSep_X])*cm" dz="0.5*(0.008)*cm"/> <!-- Line 220 ETLDetectorDimensions.cc -->
+	<Box name="ETROC_back" dx="0.5*[ETROCdy]*cm" dy="0.5*[ETROCdx]*cm" dz="0.5*(0.028)*cm"/>  <!-- solder bumps not considered, their thickness is included in that of the ETROC --> 
+	<Box name="LGAD_back" dx="0.5*[LGADdy]*cm" dy="0.5*[LGADdx]*cm" dz="0.5*[LGADdz]*cm"/>
+	<Box name="LGAD_ActiveThickness_back" dx="0.5*[LGADdy]*cm" dy="0.5*[LGADdx]*cm" dz="0.5*[LGAD_ActiveThickness]*cm"/>
+	<Box name="LGAD_Substrate_back" dx="0.5*[LGADdy]*cm" dy="0.5*[LGADdx]*cm" dz="0.5*[LGAD_Substrate]*cm"/>
+	<Box name="AlN_Cover_back" dx="0.5*[LGADdy]*cm" dy="0.5*[LGADdx]*cm" dz="0.5*(0.059)*cm"/>  <!-- epoxy included in the thickness of the AlN cover -->
+  </SolidSection>
+
+
+  <RotationSection label="etl.xml">
+    <Rotation name="0" thetaX="90*deg" phiX="0*deg" thetaY="90*deg" phiY="90*deg" thetaZ="0*deg" phiZ="0*deg"/>
+	<Rotation name="270" thetaX="90*deg" phiX="270*deg" thetaY="90*deg" phiY="0*deg" thetaZ="0*deg" phiZ="0*deg"/>
+	<Rotation name="180" thetaX="90*deg" phiX="180*deg" thetaY="90*deg" phiY="270*deg" thetaZ="0*deg" phiZ="0*deg"/>
+	<Rotation name="90" thetaX="90*deg" phiX="90*deg" thetaY="90*deg" phiY="180*deg" thetaZ="0*deg" phiZ="0*deg"/>
+  </RotationSection>
+
+
+  <LogicalPartSection label="etl.xml">                                 
+	<LogicalPart name="EndcapTimingLayer" category="unspecified">      
+	  <rSolid name="etl:EndcapTimingLayer"/>                               
+	  <rMaterial name="materials:Air"/>                                
+	</LogicalPart>
+	<LogicalPart name="Disk1" category="unspecified">      
+	  <rSolid name="etl:Disk"/>                               
+	  <rMaterial name="materials:Air"/>                                
+	</LogicalPart>
+    <LogicalPart name="Disk2" category="unspecified">      
+      <rSolid name="etl:Disk"/>                               
+      <rMaterial name="materials:Air"/>                                
+    </LogicalPart>  
+	<LogicalPart name="Aluminium_Disk" category="unspecified">
+      <rSolid name="etl:Aluminium_Disk"/>
+      <rMaterial name="materials:Aluminium"/>
+    </LogicalPart>
+    <LogicalPart name="MIC6_Aluminium_Disk" category="unspecified">
+      <rSolid name="etl:MIC6_Aluminium_Disk"/>
+      <rMaterial name="materials:Aluminium"/>     <!-- MIC6 Al to be defined -->
+    </LogicalPart>
+    <LogicalPart name="DiskQuarterFront" category="unspecified">
+      <rSolid name="etl:DiskQuarterFront"/>
+      <rMaterial name="materials:Air"/>     
+    </LogicalPart> 
+    <LogicalPart name="DiskQuarterBack" category="unspecified">
+      <rSolid name="etl:DiskQuarterBack"/>
+      <rMaterial name="materials:Air"/>     
+    </LogicalPart>
+    <LogicalPart name="DiskQuarterFront_2" category="unspecified">
+      <rSolid name="etl:DiskQuarterFront"/>
+      <rMaterial name="materials:Air"/>     
+    </LogicalPart> 
+    <LogicalPart name="DiskQuarterBack_2" category="unspecified">
+      <rSolid name="etl:DiskQuarterBack"/>
+      <rMaterial name="materials:Air"/>     
+    </LogicalPart> 
+    <LogicalPart name="SensorModule" category="unspecified">  
+      <rSolid name="etl:SensorModule"/>
+      <rMaterial name="materials:Air"/>     
+    </LogicalPart>
+    <LogicalPart name="SensorModule_r" category="unspecified">  
+      <rSolid name="etl:SensorModule"/>
+      <rMaterial name="materials:Air"/>     
+    </LogicalPart>
+    <LogicalPart name="ServiceHybrid" category="unspecified">  
+      <rSolid name="etl:ServiceHybrid"/>
+      <rMaterial name="mtdMaterial:ServiceHybrid_PCB"/>     
+    </LogicalPart>
+    <LogicalPart name="ServiceHybrid_short" category="unspecified">  
+      <rSolid name="etl:ServiceHybrid_short"/>
+      <rMaterial name="mtdMaterial:ServiceHybrid_PCB"/>     
+    </LogicalPart>
+    <LogicalPart name="SensorModule_back" category="unspecified">  
+      <rSolid name="etl:SensorModule_back"/>
+      <rMaterial name="materials:Air"/>     
+    </LogicalPart>
+    <LogicalPart name="SensorModule_back_r" category="unspecified">  
+      <rSolid name="etl:SensorModule_back"/>
+      <rMaterial name="materials:Air"/>     
+    </LogicalPart>
+    <LogicalPart name="ServiceHybrid_back" category="unspecified">  
+      <rSolid name="etl:ServiceHybrid_back"/>
+      <rMaterial name="mtdMaterial:ServiceHybrid_PCB"/>     
+    </LogicalPart>
+    <LogicalPart name="ServiceHybrid_short_back" category="unspecified">  
+      <rSolid name="etl:ServiceHybrid_short_back"/>
+      <rMaterial name="mtdMaterial:ServiceHybrid_PCB"/>     
+    </LogicalPart>
+    <LogicalPart name="ThermalPad" category="unspecified">  
+      <rSolid name="etl:ThermalPad"/>
+      <rMaterial name="materials:Epoxy"/>  <!-- epoxy is defined in materials.xml, is it the correct one? -->   
+    </LogicalPart>
+    <LogicalPart name="AlN_Carrier" category="unspecified">  
+      <rSolid name="etl:AlN_Carrier"/>
+      <rMaterial name="mtdMaterial:Aluminium_Nitride"/>     
+    </LogicalPart> 
+    <LogicalPart name="LairdFilm" category="unspecified">  
+      <rSolid name="etl:LairdFilm"/>
+      <rMaterial name="mtdMaterial:Laird"/>     
+    </LogicalPart> 
+    <LogicalPart name="ETROC" category="unspecified">  
+      <rSolid name="etl:ETROC"/>
+      <rMaterial name="materials:Silicon"/>     
+    </LogicalPart> 
+    <LogicalPart name="LGAD" category="unspecified">  
+      <rSolid name="etl:LGAD"/>
+      <rMaterial name="materials:Air"/>     
+    </LogicalPart>
+    <LogicalPart name="LGAD_r" category="unspecified">  
+      <rSolid name="etl:LGAD"/>
+      <rMaterial name="materials:Air"/>     
+    </LogicalPart> 
+    <LogicalPart name="LGAD_ActiveThickness" category="unspecified">  
+      <rSolid name="etl:LGAD_ActiveThickness"/>
+      <rMaterial name="materials:Silicon"/>     
+    </LogicalPart>
+    <LogicalPart name="LGAD_Substrate" category="unspecified">  
+      <rSolid name="etl:LGAD_Substrate"/>
+      <rMaterial name="materials:Silicon"/>     
+    </LogicalPart>
+    <LogicalPart name="AlN_Cover" category="unspecified">  
+      <rSolid name="etl:AlN_Cover"/>
+      <rMaterial name="mtdMaterial:Aluminium_Nitride"/>     
+    </LogicalPart>
+    <LogicalPart name="ThermalPad_back" category="unspecified">  
+      <rSolid name="etl:ThermalPad_back"/>
+      <rMaterial name="materials:Epoxy"/>  <!-- epoxy is defined in materials.xml, is it the correct one? -->   
+    </LogicalPart>
+    <LogicalPart name="AlN_Carrier_back" category="unspecified">  
+      <rSolid name="etl:AlN_Carrier_back"/>
+      <rMaterial name="mtdMaterial:Aluminium_Nitride"/>     
+    </LogicalPart> 
+    <LogicalPart name="LairdFilm_back" category="unspecified">  
+      <rSolid name="etl:LairdFilm_back"/>
+      <rMaterial name="mtdMaterial:Laird"/>     
+    </LogicalPart> 
+    <LogicalPart name="ETROC_back" category="unspecified">  
+      <rSolid name="etl:ETROC_back"/>
+      <rMaterial name="materials:Silicon"/>     
+    </LogicalPart> 
+    <LogicalPart name="LGAD_back" category="unspecified">  
+      <rSolid name="etl:LGAD_back"/>
+      <rMaterial name="materials:Air"/>     
+    </LogicalPart>
+    <LogicalPart name="LGAD_back_r" category="unspecified">  
+      <rSolid name="etl:LGAD_back"/>
+      <rMaterial name="materials:Air"/>     
+    </LogicalPart> 
+    <LogicalPart name="LGAD_ActiveThickness_back" category="unspecified">  
+      <rSolid name="etl:LGAD_ActiveThickness_back"/>
+      <rMaterial name="materials:Silicon"/>     
+    </LogicalPart>
+    <LogicalPart name="LGAD_Substrate_back" category="unspecified">  
+      <rSolid name="etl:LGAD_Substrate_back"/>
+      <rMaterial name="materials:Silicon"/>     
+    </LogicalPart>
+    <LogicalPart name="AlN_Cover_back" category="unspecified">  
+      <rSolid name="etl:AlN_Cover_back"/>
+      <rMaterial name="mtdMaterial:Aluminium_Nitride"/>     
+    </LogicalPart>                                                   
+  </LogicalPartSection> 
+
+  <!-- ServiceHybrid (short/long) and SensorModule to be positioned with algorithm -->
+  <PosPartSection label="etl.xml">                                     
+	<PosPart copyNumber="1">                                           
+	  <rParent name="caloBase:CALOECFront"/>                         
+	  <rChild name="etl:EndcapTimingLayer"/>  
+	  <Translation x="0." y="0." z="0.5*([caloBase:Zpos110]+[caloBase:Zpos100])" />
+	</PosPart>
+	<!-- where is the definition of the second endcap????? 
+	     <PosPart copyNumber="1">                                           
+	     <rParent name="caloBase:CALOECRear"/>                         
+	     <rChild name="etl:EndcapTimingLayer"/>  
+	     <Translation x="0." y="0." z="0.5*([caloBase:Zpos110]+[caloBase:Zpos100])" />  
+	     </PosPart> -->
+
+
+	<!-- Disks positioned in order to have them at +10mm and -10 mm of the centre of the endcap volume. Those z-position have to be translated when including other systems like the thermal screens --> 
+	<PosPart copyNumber="1">                                           
+	  <rParent name="etl:EndcapTimingLayer"/>                         
+	  <rChild name="etl:Disk1"/>  
+	  <Translation x="0." y="0." z="-1.*cm" />
+	</PosPart> 
+	<PosPart copyNumber="2">                                           
+	  <rParent name="etl:EndcapTimingLayer"/>                         
+	  <rChild name="etl:Disk2"/>  
+	  <Translation x="0." y="0." z="1.*cm" />
+	</PosPart> 
+	<PosPart copyNumber="1">                                           
+	  <rParent name="etl:Disk1"/>                         
+	  <rChild name="etl:Aluminium_Disk"/>  
+	  <Translation x="0." y="0." z="0.3175*cm" />
+	</PosPart> 
+	<PosPart copyNumber="1">                                           
+	  <rParent name="etl:Disk1"/>                         
+	  <rChild name="etl:MIC6_Aluminium_Disk"/>  
+	  <Translation x="0." y="0." z="-0.0445*cm" />
+	</PosPart>
+	<PosPart copyNumber="1">                                           
+	  <rParent name="etl:Disk1"/>                         
+	  <rChild name="etl:DiskQuarterFront"/>  
+	  <rRotation name="etl:0"/>
+	  <Translation x="0*cm" y="0*cm" z="0.6545*cm" />   <!--  -55.86*cm" y="55.86*cm" z="0.6545*cm/x,y coordinate of the centre of the disk = 79*cos(45°) -->
+	</PosPart>
+	<PosPart copyNumber="2">                                           
+	  <rParent name="etl:Disk1"/>                         
+	  <rChild name="etl:DiskQuarterFront"/>
+	  <rRotation name="etl:270"/>  
+	  <Translation x="0*cm" y="0*cm" z="0.6545*cm" />
+	</PosPart> 
+	<PosPart copyNumber="3">                                           
+	  <rParent name="etl:Disk1"/>                         
+	  <rChild name="etl:DiskQuarterFront"/>
+	  <rRotation name="etl:180"/>  
+	  <Translation x="0*cm" y="0*cm" z="0.6545*cm" />
+	</PosPart> 
+	<PosPart copyNumber="4">                                           
+	  <rParent name="etl:Disk1"/>                         
+	  <rChild name="etl:DiskQuarterFront"/> 
+	  <rRotation name="etl:90"/> 
+	  <Translation x="0*cm" y="0*cm" z="0.6545*cm" />
+	</PosPart> 
+	<PosPart copyNumber="1">                                           
+	  <rParent name="etl:Disk1"/>                         
+	  <rChild name="etl:DiskQuarterBack"/> 
+	  <rRotation name="etl:0"/> 
+	  <Translation x="0*cm" y="0*cm" z="-0.6545*cm" />
+	</PosPart> 
+	<PosPart copyNumber="2">                                           
+	  <rParent name="etl:Disk1"/>                         
+	  <rChild name="etl:DiskQuarterBack"/>  
+	  <rRotation name="etl:270"/>
+	  <Translation x="0*cm" y="0*cm" z="-0.6545*cm" />
+	</PosPart> 
+	<PosPart copyNumber="3">                                           
+	  <rParent name="etl:Disk1"/>                         
+	  <rChild name="etl:DiskQuarterBack"/>
+	  <rRotation name="etl:180"/>  
+	  <Translation x="0*cm" y="0*cm" z="-0.6545*cm" />
+	</PosPart> 
+	<PosPart copyNumber="4">                                           
+	  <rParent name="etl:Disk1"/>                         
+	  <rChild name="etl:DiskQuarterBack"/> 
+	  <rRotation name="etl:90"/> 
+	  <Translation x="0*cm" y="0*cm" z="-0.6545*cm" />
+	</PosPart>
+    <PosPart copyNumber="1">                                           
+      <rParent name="etl:Disk2"/>                         
+      <rChild name="etl:Aluminium_Disk"/>  
+      <Translation x="0." y="0." z="0.3175*cm" />
+    </PosPart> 
+    <PosPart copyNumber="1">                                           
+      <rParent name="etl:Disk2"/>                         
+      <rChild name="etl:MIC6_Aluminium_Disk"/>  
+      <Translation x="0." y="0." z="-0.0445*cm" />
+    </PosPart>
+    <PosPart copyNumber="1">                                           
+      <rParent name="etl:Disk2"/>                         
+      <rChild name="etl:DiskQuarterFront_2"/>  
+      <rRotation name="etl:0"/>
+      <Translation x="0*cm" y="0*cm" z="0.6545*cm" />   <!--  -55.86*cm" y="55.86*cm" z="0.6545*cm/x,y coordinate of the centre of the disk = 79*cos(45°) -->
+    </PosPart>
+    <PosPart copyNumber="2">                                           
+      <rParent name="etl:Disk2"/>                         
+      <rChild name="etl:DiskQuarterFront_2"/>
+      <rRotation name="etl:270"/>  
+      <Translation x="0*cm" y="0*cm" z="0.6545*cm" />
+    </PosPart> 
+    <PosPart copyNumber="3">                                           
+      <rParent name="etl:Disk2"/>                         
+      <rChild name="etl:DiskQuarterFront_2"/>
+      <rRotation name="etl:180"/>  
+      <Translation x="0*cm" y="0*cm" z="0.6545*cm" />
+    </PosPart> 
+    <PosPart copyNumber="4">                                           
+      <rParent name="etl:Disk2"/>                         
+      <rChild name="etl:DiskQuarterFront_2"/> 
+      <rRotation name="etl:90"/> 
+      <Translation x="0*cm" y="0*cm" z="0.6545*cm" />
+    </PosPart> 
+    <PosPart copyNumber="1">                                           
+      <rParent name="etl:Disk2"/>                         
+      <rChild name="etl:DiskQuarterBack_2"/> 
+      <rRotation name="etl:0"/> 
+      <Translation x="0*cm" y="0*cm" z="-0.6545*cm" />
+    </PosPart> 
+    <PosPart copyNumber="2">                                           
+      <rParent name="etl:Disk2"/>                         
+      <rChild name="etl:DiskQuarterBack_2"/>  
+      <rRotation name="etl:270"/>
+      <Translation x="0*cm" y="0*cm" z="-0.6545*cm" />
+    </PosPart> 
+    <PosPart copyNumber="3">                                           
+      <rParent name="etl:Disk2"/>                         
+      <rChild name="etl:DiskQuarterBack_2"/>
+      <rRotation name="etl:180"/>  
+      <Translation x="0*cm" y="0*cm" z="-0.6545*cm" />
+    </PosPart> 
+    <PosPart copyNumber="4">                                           
+      <rParent name="etl:Disk2"/>                         
+      <rChild name="etl:DiskQuarterBack_2"/> 
+      <rRotation name="etl:90"/> 
+      <Translation x="0*cm" y="0*cm" z="-0.6545*cm" />
+    </PosPart>
+	<PosPart copyNumber="1">                                           
+	  <rParent name="etl:SensorModule"/>                         
+	  <rChild name="etl:ThermalPad"/>  
+	  <Translation x="0." y="0." z="0.102*cm" />
+	</PosPart>
+	<PosPart copyNumber="1">                                           
+	  <rParent name="etl:SensorModule"/>                         
+	  <rChild name="etl:AlN_Carrier"/>  
+	  <Translation x="0." y="0." z="0.05*cm" />
+	</PosPart>
+	<PosPart copyNumber="1">                                           
+	  <rParent name="etl:SensorModule"/>                         
+	  <rChild name="etl:LairdFilm"/>  
+	  <Translation x="0." y="0." z="0.0065*cm" />
+	</PosPart>
+	<PosPart copyNumber="1">                                           
+	  <rParent name="etl:SensorModule"/>                         
+	  <rChild name="etl:ETROC"/>  
+	  <Translation x="0.2825*cm" y="1.045*cm" z="-0.0115*cm" />
+	</PosPart>
+	<PosPart copyNumber="2">                                           
+	  <rParent name="etl:SensorModule"/>                         
+	  <rChild name="etl:ETROC"/>  
+	  <Translation x="0.2825*cm" y="-1.045*cm" z="-0.0115*cm" />
+	</PosPart> 
+	<PosPart copyNumber="1">                                           
+	  <rParent name="etl:SensorModule"/>                         
+	  <rChild name="etl:LGAD"/>  
+	  <Translation x="0.34*cm" y="0." z="-0.0405*cm" />
+	</PosPart>
+
+	<!-- definition of LGAD active/substrate volumes -->
+	<PosPart copyNumber="1">                                           
+	  <rParent name="etl:LGAD"/>                         
+	  <rChild name="etl:LGAD_ActiveThickness"/>  
+	  <Translation x="0.*cm" y="0.*cm" z="-0.0125*cm" />
+	</PosPart>
+	<PosPart copyNumber="1">                                           
+	  <rParent name="etl:LGAD"/>                         
+	  <rChild name="etl:LGAD_Substrate"/>  
+	  <Translation x="0.*cm" y="0.*cm" z="0.0025*cm" />
+	</PosPart>  
+
+
+	<PosPart copyNumber="1">                                           
+	  <rParent name="etl:SensorModule"/>                         
+	  <rChild name="etl:AlN_Cover"/>  
+	  <Translation x="0.34*cm" y="0." z="-0.085*cm" /> <!-- not correct: AlN Cover should be a bit longer in x and separation in x is different than that of the LGAD -->
+	</PosPart> 
+
+    <PosPart copyNumber="1">                                           
+      <rParent name="etl:SensorModule_r"/>                         
+      <rChild name="etl:ThermalPad"/>  
+      <Translation x="0." y="0." z="-0.102*cm" />
+    </PosPart>
+    <PosPart copyNumber="1">                                           
+      <rParent name="etl:SensorModule_r"/>                         
+      <rChild name="etl:AlN_Carrier"/>  
+      <Translation x="0." y="0." z="-0.05*cm" />
+    </PosPart>
+    <PosPart copyNumber="1">                                           
+      <rParent name="etl:SensorModule_r"/>                         
+      <rChild name="etl:LairdFilm"/>  
+      <Translation x="0." y="0." z="-0.0065*cm" />
+    </PosPart>
+    <PosPart copyNumber="1">                                           
+      <rParent name="etl:SensorModule_r"/>                         
+      <rChild name="etl:ETROC"/>  
+      <Translation x="0.2825*cm" y="1.045*cm" z="0.0115*cm" />
+    </PosPart>
+    <PosPart copyNumber="2">                                           
+      <rParent name="etl:SensorModule_r"/>                         
+      <rChild name="etl:ETROC"/>  
+      <Translation x="0.2825*cm" y="-1.045*cm" z="0.0115*cm" />
+    </PosPart> 
+    <PosPart copyNumber="1">                                           
+      <rParent name="etl:SensorModule_r"/>                         
+      <rChild name="etl:LGAD_r"/>  
+      <Translation x="0.34*cm" y="0." z="0.0405*cm" />
+    </PosPart>
+
+    <!-- definition of LGAD active/substrate volumes -->
+    <PosPart copyNumber="1">                                           
+      <rParent name="etl:LGAD_r"/>                         
+      <rChild name="etl:LGAD_ActiveThickness"/>  
+      <Translation x="0.*cm" y="0.*cm" z="0.0125*cm" />
+    </PosPart>
+    <PosPart copyNumber="1">                                           
+      <rParent name="etl:LGAD_r"/>                         
+      <rChild name="etl:LGAD_Substrate"/>  
+      <Translation x="0.*cm" y="0.*cm" z="-0.0025*cm" />
+    </PosPart>  
+
+
+    <PosPart copyNumber="1">                                           
+      <rParent name="etl:SensorModule_r"/>                         
+      <rChild name="etl:AlN_Cover"/>  
+      <Translation x="0.34*cm" y="0." z="0.085*cm" /> <!-- not correct: AlN Cover should be a bit longer in x and separation in x is different than that of the LGAD -->
+    </PosPart> 
+
+
+
+
+
+
+
+	<PosPart copyNumber="1">                                           
+	  <rParent name="etl:SensorModule_back"/>                         
+	  <rChild name="etl:ThermalPad_back"/>  
+	  <Translation x="0." y="0." z="0.102*cm" />
+	</PosPart>
+	<PosPart copyNumber="1">                                           
+	  <rParent name="etl:SensorModule_back"/>                         
+	  <rChild name="etl:AlN_Carrier_back"/>  
+	  <Translation x="0." y="0." z="0.05*cm" />
+	</PosPart>
+	<PosPart copyNumber="1">                                           
+	  <rParent name="etl:SensorModule_back"/>                         
+	  <rChild name="etl:LairdFilm_back"/>    
+	  <Translation x="0." y="0." z="0.0065*cm" />
+	</PosPart>
+	<PosPart copyNumber="1">                                           
+	  <rParent name="etl:SensorModule_back"/>                         
+	  <rChild name="etl:ETROC_back"/>  
+	  <Translation x="1.045*cm" y="0.2825*cm" z="-0.0115*cm" />
+	</PosPart>
+	<PosPart copyNumber="2">                                           
+	  <rParent name="etl:SensorModule_back"/>                         
+	  <rChild name="etl:ETROC_back"/>  
+	  <Translation x="-1.045*cm" y="0.2825*cm" z="-0.0115*cm" />
+	</PosPart> 
+	<PosPart copyNumber="1">                                           
+	  <rParent name="etl:SensorModule_back"/>                         
+	  <rChild name="etl:LGAD_back"/>  
+	  <Translation x="0.*cm" y="0.34" z="-0.0405*cm" />
+	</PosPart>
+
+	<!-- definition of LGAD_back active/substrate volumes -->
+	<PosPart copyNumber="1">                                           
+	  <rParent name="etl:LGAD_back"/>                         
+	  <rChild name="etl:LGAD_ActiveThickness_back"/>  
+	  <Translation x="0.*cm" y="0.*cm" z="-0.0125*cm" />
+	</PosPart>
+	<PosPart copyNumber="1">                                           
+	  <rParent name="etl:LGAD_back"/>                         
+	  <rChild name="etl:LGAD_Substrate_back"/>  
+	  <Translation x="0.*cm" y="0.*cm" z="0.0025*cm" />
+	</PosPart>  
+
+
+	<PosPart copyNumber="1">                                           
+	  <rParent name="etl:SensorModule_back"/>                         
+	  <rChild name="etl:AlN_Cover_back"/>  
+	  <Translation x="0.*cm" y="0.34" z="-0.085*cm" /> <!-- not correct: AlN Cover should be a bit longer in x and separation in x is different than that of the LGAD -->
+	</PosPart>                                            
+
+    <PosPart copyNumber="1">                                           
+      <rParent name="etl:SensorModule_back_r"/>                         
+      <rChild name="etl:ThermalPad_back"/>  
+      <Translation x="0." y="0." z="-0.102*cm" />
+    </PosPart>
+    <PosPart copyNumber="1">                                           
+      <rParent name="etl:SensorModule_back_r"/>                         
+      <rChild name="etl:AlN_Carrier_back"/>  
+      <Translation x="0." y="0." z="-0.05*cm" />
+    </PosPart>
+    <PosPart copyNumber="1">                                           
+      <rParent name="etl:SensorModule_back_r"/>                         
+      <rChild name="etl:LairdFilm_back"/>    
+      <Translation x="0." y="0." z="-0.0065*cm" />
+    </PosPart>
+    <PosPart copyNumber="1">                                           
+      <rParent name="etl:SensorModule_back_r"/>                         
+      <rChild name="etl:ETROC_back"/>  
+      <Translation x="1.045*cm" y="0.2825*cm" z="0.0115*cm" />
+    </PosPart>
+    <PosPart copyNumber="2">                                           
+      <rParent name="etl:SensorModule_back_r"/>                         
+      <rChild name="etl:ETROC_back"/>  
+      <Translation x="-1.045*cm" y="0.2825*cm" z="0.0115*cm" />
+    </PosPart> 
+    <PosPart copyNumber="1">                                           
+      <rParent name="etl:SensorModule_back_r"/>                         
+      <rChild name="etl:LGAD_back"/>  
+      <Translation x="0.*cm" y="0.34" z="0.0405*cm" />
+    </PosPart>
+
+    <!-- definition of LGAD_back active/substrate volumes -->
+    <PosPart copyNumber="1">                                           
+      <rParent name="etl:LGAD_back_r"/>                         
+      <rChild name="etl:LGAD_ActiveThickness_back"/>  
+      <Translation x="0.*cm" y="0.*cm" z="0.0125*cm" />
+    </PosPart>
+    <PosPart copyNumber="1">                                           
+      <rParent name="etl:LGAD_back_r"/>                         
+      <rChild name="etl:LGAD_Substrate_back"/>  
+      <Translation x="0.*cm" y="0.*cm" z="-0.0025*cm" />
+    </PosPart>  
+
+
+    <PosPart copyNumber="1">                                           
+      <rParent name="etl:SensorModule_back_r"/>                         
+      <rChild name="etl:AlN_Cover_back"/>  
+      <Translation x="0.*cm" y="0.34" z="0.085*cm" /> <!-- not correct: AlN Cover should be a bit longer in x and separation in x is different than that of the LGAD -->
+    </PosPart>                                            
+  </PosPartSection> 
+
+
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront"/>
+    <String name="ChildName" value="etl:ServiceHybrid"/>
+    <Numeric name="N" value="1"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> -122.7*cm, 13.055*cm, 0.*cm </Vector> <!-- x,y,z alway wrt center of the volume / x-value = 1st x position in which you can place the center of the hybrid without going out of the disk. y = 55.86-0.5*26.11 -->
+    <Numeric name="Theta" value="90.*deg"/> <!-- translation along y -->
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront"/>
+    <String name="ChildName" value="etl:SensorModule_r"/>
+    <Numeric name="N" value="6"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+[DeltaX_ServiceModule])*cm, 2.155*cm, -0.178*cm </Vector> <!-- y = 55.86-0.5*4.31 / 55.86=79*cos45° -->
+    <Numeric name="Theta" value="90.*deg"/> <!-- translation along y -->
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront"/>
+    <String name="ChildName" value="etl:SensorModule_r"/>
+    <Numeric name="N" value="10"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+[DeltaX_ServiceModule]+[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront"/>
+    <String name="ChildName" value="etl:ServiceHybrid"/>
+    <Numeric name="N" value="2"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+2*[DeltaX_ServiceModule]+[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront"/>
+    <String name="ChildName" value="etl:SensorModule_r"/>
+    <Numeric name="N" value="12"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+3*[DeltaX_ServiceModule]+[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront"/>
+    <String name="ChildName" value="etl:SensorModule_r"/>
+    <Numeric name="N" value="14"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+3*[DeltaX_ServiceModule]+2*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront"/>
+    <String name="ChildName" value="etl:ServiceHybrid"/>
+    <Numeric name="N" value="2"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+4*[DeltaX_ServiceModule]+2*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">  <!-- 1st placement of a short service hybrid -->
+    <rParent name="etl:DiskQuarterFront"/>
+    <String name="ChildName" value="etl:ServiceHybrid_short"/>
+    <Numeric name="N" value="1"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+4*[DeltaX_ServiceModule]+2*[SensorModuledx])*cm, (13.055+[ServiceHybrid_Y]+2*[DeltaY]+[DeltaY_ServiceLong_ServiceShort])*cm, 0.*cm </Vector>
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront"/>
+    <String name="ChildName" value="etl:SensorModule_r"/>
+    <Numeric name="N" value="15"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+5*[DeltaX_ServiceModule]+2*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront"/>
+    <String name="ChildName" value="etl:SensorModule_r"/>
+    <Numeric name="N" value="17"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+5*[DeltaX_ServiceModule]+3*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront"/>
+    <String name="ChildName" value="etl:ServiceHybrid"/>
+    <Numeric name="N" value="3"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+6*[DeltaX_ServiceModule]+3*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront"/>
+    <String name="ChildName" value="etl:SensorModule_r"/>
+    <Numeric name="N" value="18"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+7*[DeltaX_ServiceModule]+3*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront"/>
+    <String name="ChildName" value="etl:SensorModule_r"/>
+    <Numeric name="N" value="18"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+7*[DeltaX_ServiceModule]+4*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront"/>
+    <String name="ChildName" value="etl:ServiceHybrid"/>
+    <Numeric name="N" value="3"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+8*[DeltaX_ServiceModule]+4*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront"/>
+    <String name="ChildName" value="etl:SensorModule_r"/>
+    <Numeric name="N" value="18"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+9*[DeltaX_ServiceModule]+4*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront"/>
+    <String name="ChildName" value="etl:SensorModule_r"/>
+    <Numeric name="N" value="21"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+9*[DeltaX_ServiceModule]+5*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront"/>
+    <String name="ChildName" value="etl:ServiceHybrid"/>
+    <Numeric name="N" value="3"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+10*[DeltaX_ServiceModule]+5*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront"/>
+    <String name="ChildName" value="etl:ServiceHybrid_short"/>
+    <Numeric name="N" value="1"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+10*[DeltaX_ServiceModule]+5*[SensorModuledx])*cm, (13.055+2*[ServiceHybrid_Y]+3*[DeltaY]+[DeltaY_ServiceLong_ServiceShort])*cm, 0.*cm </Vector>
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront"/>
+    <String name="ChildName" value="etl:SensorModule_r"/>
+    <Numeric name="N" value="21"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+11*[DeltaX_ServiceModule]+5*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront"/>
+    <String name="ChildName" value="etl:SensorModule_r"/>
+    <Numeric name="N" value="23"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+11*[DeltaX_ServiceModule]+6*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront"/>
+    <String name="ChildName" value="etl:ServiceHybrid"/>
+    <Numeric name="N" value="4"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+12*[DeltaX_ServiceModule]+6*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront"/>
+    <String name="ChildName" value="etl:SensorModule_r"/>
+    <Numeric name="N" value="24"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+13*[DeltaX_ServiceModule]+6*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront"/>
+    <String name="ChildName" value="etl:SensorModule_r"/>
+    <Numeric name="N" value="24"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+13*[DeltaX_ServiceModule]+7*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront"/>
+    <String name="ChildName" value="etl:ServiceHybrid"/>
+    <Numeric name="N" value="4"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+14*[DeltaX_ServiceModule]+7*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront"/>
+    <String name="ChildName" value="etl:SensorModule_r"/>
+    <Numeric name="N" value="24"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+15*[DeltaX_ServiceModule]+7*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront"/>
+    <String name="ChildName" value="etl:SensorModule_r"/>
+    <Numeric name="N" value="24"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+15*[DeltaX_ServiceModule]+8*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront"/>
+    <String name="ChildName" value="etl:ServiceHybrid"/>
+    <Numeric name="N" value="4"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+16*[DeltaX_ServiceModule]+8*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront"/>
+    <String name="ChildName" value="etl:SensorModule_r"/>
+    <Numeric name="N" value="24"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+17*[DeltaX_ServiceModule]+8*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront"/>
+    <String name="ChildName" value="etl:SensorModule_r"/>
+    <Numeric name="N" value="27"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+17*[DeltaX_ServiceModule]+9*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront"/>
+    <String name="ChildName" value="etl:ServiceHybrid_short"/>
+    <Numeric name="N" value="1"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+18*[DeltaX_ServiceModule]+9*[SensorModuledx])*cm, 6.5275*cm, 0.*cm </Vector>
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront"/>
+    <String name="ChildName" value="etl:ServiceHybrid"/>
+    <Numeric name="N" value="4"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+18*[DeltaX_ServiceModule]+9*[SensorModuledx])*cm, (6.5275+[DeltaY_ServiceLong_ServiceShort]+[DeltaY])*cm, 0.*cm </Vector>
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront"/>
+    <String name="ChildName" value="etl:SensorModule_r"/>
+    <Numeric name="N" value="27"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+19*[DeltaX_ServiceModule]+9*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront"/>
+    <String name="ChildName" value="etl:SensorModule_r"/>
+    <Numeric name="N" value="27"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+19*[DeltaX_ServiceModule]+10*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront"/>
+    <String name="ChildName" value="etl:ServiceHybrid_short"/>
+    <Numeric name="N" value="3"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+20*[DeltaX_ServiceModule]+10*[SensorModuledx])*cm, 6.5275*cm, 0.*cm </Vector>
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront"/>
+    <String name="ChildName" value="etl:ServiceHybrid"/>
+    <Numeric name="N" value="3"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+20*[DeltaX_ServiceModule]+10*[SensorModuledx])*cm, (6.5275+2*[ServiceHybrid_Y_short]+[DeltaY_ServiceLong_ServiceShort]+3*[DeltaY])*cm, 0.*cm </Vector>
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront"/>
+    <String name="ChildName" value="etl:SensorModule_r"/>
+    <Numeric name="N" value="27"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+21*[DeltaX_ServiceModule]+10*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront"/>
+    <String name="ChildName" value="etl:SensorModule_r"/>
+    <Numeric name="N" value="24"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+21*[DeltaX_ServiceModule]+11*[SensorModuledx])*cm, (2.155+4*[SensorModuledy]+4*[DeltaY])*cm, -0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront"/>
+    <String name="ChildName" value="etl:ServiceHybrid_short"/>
+    <Numeric name="N" value="2"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+22*[DeltaX_ServiceModule]+11*[SensorModuledx])*cm, (2.155+5*[SensorModuledy]+5*[DeltaY])*cm, 0.*cm </Vector>
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront"/>
+    <String name="ChildName" value="etl:ServiceHybrid"/>
+    <Numeric name="N" value="3"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+22*[DeltaX_ServiceModule]+11*[SensorModuledx])*cm, (2.155+5*[SensorModuledy]+5*[DeltaY]+[ServiceHybrid_Y_short]+[DeltaY_ServiceLong_ServiceShort]+2*[DeltaY])*cm, 0.*cm </Vector>
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront"/>
+    <String name="ChildName" value="etl:SensorModule_r"/>
+    <Numeric name="N" value="23"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+23*[DeltaX_ServiceModule]+11*[SensorModuledx])*cm, (2.155+5*[SensorModuledy]+5*[DeltaY])*cm, -0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront"/>
+    <String name="ChildName" value="etl:SensorModule_r"/>
+    <Numeric name="N" value="21"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+23*[DeltaX_ServiceModule]+12*[SensorModuledx])*cm, (2.155+6*[SensorModuledy]+6*[DeltaY])*cm, -0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront"/>
+    <String name="ChildName" value="etl:ServiceHybrid_short"/>
+    <Numeric name="N" value="1"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+24*[DeltaX_ServiceModule]+12*[SensorModuledx])*cm, (2.155+7*[SensorModuledy]+7*[DeltaY])*cm, 0.*cm </Vector>
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront"/>
+    <String name="ChildName" value="etl:ServiceHybrid"/>
+    <Numeric name="N" value="3"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+24*[DeltaX_ServiceModule]+12*[SensorModuledx])*cm, (2.155+7*[SensorModuledy]+7*[DeltaY]+[DeltaY_ServiceLong_ServiceShort]+[DeltaY])*cm, 0.*cm </Vector>
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront"/>
+    <String name="ChildName" value="etl:SensorModule_r"/>
+    <Numeric name="N" value="20"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+25*[DeltaX_ServiceModule]+12*[SensorModuledx])*cm, (2.155+7*[SensorModuledy]+7*[DeltaY])*cm, -0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront"/>
+    <String name="ChildName" value="etl:SensorModule_r"/>
+    <Numeric name="N" value="21"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+25*[DeltaX_ServiceModule]+13*[SensorModuledx])*cm, (2.155+7*[SensorModuledy]+7*[DeltaY])*cm, -0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront"/>
+    <String name="ChildName" value="etl:ServiceHybrid_short"/>
+    <Numeric name="N" value="1"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+26*[DeltaX_ServiceModule]+13*[SensorModuledx])*cm, (2.155+8*[SensorModuledy]+8*[DeltaY])*cm, 0*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront"/>
+    <String name="ChildName" value="etl:ServiceHybrid"/>
+    <Numeric name="N" value="3"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+26*[DeltaX_ServiceModule]+13*[SensorModuledx])*cm, (2.155+8*[SensorModuledy]+8*[DeltaY]+[DeltaY_ServiceLong_ServiceShort]+[DeltaY])*cm, 0.*cm </Vector>
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront"/>
+    <String name="ChildName" value="etl:SensorModule_r"/>
+    <Numeric name="N" value="20"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+27*[DeltaX_ServiceModule]+13*[SensorModuledx])*cm, (2.155+8*[SensorModuledy]+8*[DeltaY])*cm, -0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront"/>
+    <String name="ChildName" value="etl:SensorModule_r"/>
+    <Numeric name="N" value="21"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+27*[DeltaX_ServiceModule]+14*[SensorModuledx])*cm, (2.155+8*[SensorModuledy]+8*[DeltaY])*cm, -0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront"/>
+    <String name="ChildName" value="etl:ServiceHybrid_short"/>
+    <Numeric name="N" value="1"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+28*[DeltaX_ServiceModule]+14*[SensorModuledx])*cm, (2.155+9*[SensorModuledy]+9*[DeltaY])*cm, 0*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront"/>
+    <String name="ChildName" value="etl:ServiceHybrid"/>
+    <Numeric name="N" value="3"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+28*[DeltaX_ServiceModule]+14*[SensorModuledx])*cm, (2.155+9*[SensorModuledy]+9*[DeltaY]+[DeltaY_ServiceLong_ServiceShort]+[DeltaY])*cm, 0*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+
+
+  <!-- Quarter on back face of Disk1 -->
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack"/>
+    <String name="ChildName" value="etl:SensorModule"/>
+    <Numeric name="N" value="7"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> -122*cm, 2.155*cm, 0.178*cm </Vector> <!-- 55.86=79*cos45° -->
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack"/>
+    <String name="ChildName" value="etl:ServiceHybrid"/>
+    <Numeric name="N" value="1"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122+[DeltaX_ServiceModule])*cm, 13.055*cm, 0.*cm </Vector> <!-- x,y,z alway wrt center of the volume / x-value = 1st x position in which you can place the center of the hybrid without going out of the disk. y = 55.86-0.5*26.11 -->
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack"/>
+    <String name="ChildName" value="etl:ServiceHybrid_short"/>
+    <Numeric name="N" value="1"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122+[DeltaX_ServiceModule])*cm, (13.055+[DeltaY_ServiceLong_ServiceShort]+[DeltaY])*cm, 0*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack"/>
+    <String name="ChildName" value="etl:SensorModule"/>
+    <Numeric name="N" value="9"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3">  (-122+2*[DeltaX_ServiceModule])*cm, 2.155*cm, 0.178*cm </Vector> <!-- 55.86=79*cos45° -->
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack"/>
+    <String name="ChildName" value="etl:SensorModule"/>
+    <Numeric name="N" value="12"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3">  (-122+2*[DeltaX_ServiceModule]+[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> <!-- 55.86=79*cos45° -->
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack"/>
+    <String name="ChildName" value="etl:ServiceHybrid"/>
+    <Numeric name="N" value="2"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+3*[DeltaX_ServiceModule]+[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack"/>
+    <String name="ChildName" value="etl:SensorModule"/>
+    <Numeric name="N" value="12"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3">  (-122+4*[DeltaX_ServiceModule]+[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack"/>
+    <String name="ChildName" value="etl:SensorModule"/>
+    <Numeric name="N" value="15"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3">  (-122+4*[DeltaX_ServiceModule]+2*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack"/>
+    <String name="ChildName" value="etl:ServiceHybrid"/>
+    <Numeric name="N" value="2"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122+5*[DeltaX_ServiceModule]+2*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack"/>
+    <String name="ChildName" value="etl:ServiceHybrid_short"/>
+    <Numeric name="N" value="1"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122+5*[DeltaX_ServiceModule]+2*[SensorModuledx])*cm, (13.055+[ServiceHybrid_Y]+[DeltaY_ServiceLong_ServiceShort]+2*[DeltaY])*cm, 0*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack"/>
+    <String name="ChildName" value="etl:SensorModule"/>
+    <Numeric name="N" value="15"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3">  (-122+6*[DeltaX_ServiceModule]+2*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack"/>
+    <String name="ChildName" value="etl:SensorModule"/>
+    <Numeric name="N" value="18"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3">  (-122+6*[DeltaX_ServiceModule]+3*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack"/>
+    <String name="ChildName" value="etl:ServiceHybrid"/>
+    <Numeric name="N" value="3"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122+7*[DeltaX_ServiceModule]+3*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack"/>
+    <String name="ChildName" value="etl:SensorModule"/>
+    <Numeric name="N" value="18"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3">  (-122+8*[DeltaX_ServiceModule]+3*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack"/>
+    <String name="ChildName" value="etl:SensorModule"/>
+    <Numeric name="N" value="21"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3">  (-122+8*[DeltaX_ServiceModule]+4*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack"/>
+    <String name="ChildName" value="etl:ServiceHybrid"/>
+    <Numeric name="N" value="3"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122+9*[DeltaX_ServiceModule]+4*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack"/>
+    <String name="ChildName" value="etl:ServiceHybrid_short"/>
+    <Numeric name="N" value="1"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122+9*[DeltaX_ServiceModule]+4*[SensorModuledx])*cm, (13.055+2*[ServiceHybrid_Y]+[DeltaY_ServiceLong_ServiceShort]+3*[DeltaY])*cm, 0*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack"/>
+    <String name="ChildName" value="etl:SensorModule"/>
+    <Numeric name="N" value="21"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3">  (-122+10*[DeltaX_ServiceModule]+4*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack"/>
+    <String name="ChildName" value="etl:SensorModule"/>
+    <Numeric name="N" value="21"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3">  (-122+10*[DeltaX_ServiceModule]+5*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack"/>
+    <String name="ChildName" value="etl:ServiceHybrid"/>
+    <Numeric name="N" value="3"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122+11*[DeltaX_ServiceModule]+5*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack"/>
+    <String name="ChildName" value="etl:ServiceHybrid_short"/>
+    <Numeric name="N" value="1"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122+11*[DeltaX_ServiceModule]+5*[SensorModuledx])*cm, (13.055+2*[ServiceHybrid_Y]+[DeltaY_ServiceLong_ServiceShort]+3*[DeltaY])*cm, 0*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack"/>
+    <String name="ChildName" value="etl:SensorModule"/>
+    <Numeric name="N" value="21"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3">  (-122+12*[DeltaX_ServiceModule]+5*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack"/>
+    <String name="ChildName" value="etl:SensorModule"/>
+    <Numeric name="N" value="24"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3">  (-122+12*[DeltaX_ServiceModule]+6*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack"/>
+    <String name="ChildName" value="etl:ServiceHybrid"/>
+    <Numeric name="N" value="4"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122+13*[DeltaX_ServiceModule]+6*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack"/>
+    <String name="ChildName" value="etl:SensorModule"/>
+    <Numeric name="N" value="24"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3">  (-122+14*[DeltaX_ServiceModule]+6*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack"/>
+    <String name="ChildName" value="etl:SensorModule"/>
+    <Numeric name="N" value="24"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3">  (-122+14*[DeltaX_ServiceModule]+7*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack"/>
+    <String name="ChildName" value="etl:ServiceHybrid"/>
+    <Numeric name="N" value="4"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122+15*[DeltaX_ServiceModule]+7*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack"/>
+    <String name="ChildName" value="etl:SensorModule"/>
+    <Numeric name="N" value="24"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3">  (-122+16*[DeltaX_ServiceModule]+7*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack"/>
+    <String name="ChildName" value="etl:SensorModule"/>
+    <Numeric name="N" value="24"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3">  (-122+16*[DeltaX_ServiceModule]+8*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack"/>
+    <String name="ChildName" value="etl:ServiceHybrid"/>
+    <Numeric name="N" value="4"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122+17*[DeltaX_ServiceModule]+8*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack"/>
+    <String name="ChildName" value="etl:SensorModule"/>
+    <Numeric name="N" value="24"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3">  (-122+18*[DeltaX_ServiceModule]+8*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack"/>
+    <String name="ChildName" value="etl:SensorModule"/>
+    <Numeric name="N" value="27"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3">  (-122+18*[DeltaX_ServiceModule]+9*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack"/>
+    <String name="ChildName" value="etl:ServiceHybrid_short"/>
+    <Numeric name="N" value="1"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122+19*[DeltaX_ServiceModule]+9*[SensorModuledx])*cm, 6.5275*cm, 0*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack"/>
+    <String name="ChildName" value="etl:ServiceHybrid"/>
+    <Numeric name="N" value="4"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122+19*[DeltaX_ServiceModule]+9*[SensorModuledx])*cm, (6.5275+[DeltaY_ServiceLong_ServiceShort]+[DeltaY])*cm, 0.*cm </Vector>
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack"/>
+    <String name="ChildName" value="etl:SensorModule"/>
+    <Numeric name="N" value="27"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3">  (-122+20*[DeltaX_ServiceModule]+9*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack"/>
+    <String name="ChildName" value="etl:SensorModule"/>
+    <Numeric name="N" value="27"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3">  (-122+20*[DeltaX_ServiceModule]+10*[SensorModuledx])*cm, (2.155+[SensorModuledy]+[DeltaY])*cm, 0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack"/>
+    <String name="ChildName" value="etl:ServiceHybrid_short"/>
+    <Numeric name="N" value="3"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122+21*[DeltaX_ServiceModule]+10*[SensorModuledx])*cm, (2.155+2*[SensorModuledy]+2*[DeltaY])*cm, 0*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack"/>
+    <String name="ChildName" value="etl:ServiceHybrid"/>
+    <Numeric name="N" value="3"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122+21*[DeltaX_ServiceModule]+10*[SensorModuledx])*cm, (2.155+2*[SensorModuledy]+2*[DeltaY]+2*[ServiceHybrid_Y_short]+[DeltaY_ServiceLong_ServiceShort]+3*[DeltaY])*cm, 0.*cm </Vector>
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack"/>
+    <String name="ChildName" value="etl:SensorModule"/>
+    <Numeric name="N" value="24"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3">  (-122+22*[DeltaX_ServiceModule]+10*[SensorModuledx])*cm, ( 2.155+4*[SensorModuledy]+4*[DeltaY])*cm, 0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack"/>
+    <String name="ChildName" value="etl:SensorModule"/>
+    <Numeric name="N" value="21"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3">  (-122+22*[DeltaX_ServiceModule]+11*[SensorModuledx])*cm, ( 2.155+6*[SensorModuledy]+6*[DeltaY])*cm, 0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack"/>
+    <String name="ChildName" value="etl:ServiceHybrid_short"/>
+    <Numeric name="N" value="1"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122+23*[DeltaX_ServiceModule]+11*[SensorModuledx])*cm, (2.155+7*[SensorModuledy]+7*[DeltaY])*cm, 0*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack"/>
+    <String name="ChildName" value="etl:ServiceHybrid"/>
+    <Numeric name="N" value="3"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122+23*[DeltaX_ServiceModule]+11*[SensorModuledx])*cm, (2.155+7*[SensorModuledy]+8*[DeltaY]+[DeltaY_ServiceLong_ServiceShort])*cm, 0.*cm </Vector>
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack"/>
+    <String name="ChildName" value="etl:SensorModule"/>
+    <Numeric name="N" value="21"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3">  (-122+24*[DeltaX_ServiceModule]+11*[SensorModuledx])*cm, ( 2.155+6*[SensorModuledy]+6*[DeltaY])*cm, 0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack"/>
+    <String name="ChildName" value="etl:SensorModule"/>
+    <Numeric name="N" value="21"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3">  (-122+24*[DeltaX_ServiceModule]+12*[SensorModuledx])*cm, ( 2.155+7*[SensorModuledy]+7*[DeltaY])*cm, 0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack"/>
+    <String name="ChildName" value="etl:ServiceHybrid_short"/>
+    <Numeric name="N" value="1"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122+25*[DeltaX_ServiceModule]+12*[SensorModuledx])*cm, (2.155+8*[SensorModuledy]+8*[DeltaY])*cm, 0*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack"/>
+    <String name="ChildName" value="etl:ServiceHybrid"/>
+    <Numeric name="N" value="3"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122+25*[DeltaX_ServiceModule]+12*[SensorModuledx])*cm, (2.155+8*[SensorModuledy]+9*[DeltaY]+[DeltaY_ServiceLong_ServiceShort])*cm, 0.*cm </Vector>
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack"/>
+    <String name="ChildName" value="etl:SensorModule"/>
+    <Numeric name="N" value="21"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3">  (-122+26*[DeltaX_ServiceModule]+12*[SensorModuledx])*cm, ( 2.155+7*[SensorModuledy]+7*[DeltaY])*cm, 0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack"/>
+    <String name="ChildName" value="etl:SensorModule"/>
+    <Numeric name="N" value="21"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3">  (-122+26*[DeltaX_ServiceModule]+13*[SensorModuledx])*cm, ( 2.155+8*[SensorModuledy]+8*[DeltaY])*cm, 0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack"/>
+    <String name="ChildName" value="etl:ServiceHybrid_short"/>
+    <Numeric name="N" value="1"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122+27*[DeltaX_ServiceModule]+13*[SensorModuledx])*cm, (2.155+9*[SensorModuledy]+9*[DeltaY])*cm, 0*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack"/>
+    <String name="ChildName" value="etl:ServiceHybrid"/>
+    <Numeric name="N" value="3"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122+27*[DeltaX_ServiceModule]+13*[SensorModuledx])*cm, (2.155+9*[SensorModuledy]+10*[DeltaY]+[DeltaY_ServiceLong_ServiceShort])*cm, 0.*cm </Vector>
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack"/>
+    <String name="ChildName" value="etl:SensorModule"/>
+    <Numeric name="N" value="21"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3">  (-122+28*[DeltaX_ServiceModule]+13*[SensorModuledx])*cm, ( 2.155+8*[SensorModuledy]+8*[DeltaY])*cm, 0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+  </Algorithm>
+
+
+  <!-- Disk 2 -->
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid_back"/>
+    <Numeric name="N" value="1"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> -13.055*cm, 122.7*cm, 0.*cm </Vector> <!-- x,y,z alway wrt center of the volume / x-value = 1st x position in which you can place the center of the hybrid without going out of the disk. y = 55.86-0.5*26.11 -->
+    <Numeric name="Theta" value="90.*deg"/> <!-- translation along y -->
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront_2"/>
+    <String name="ChildName" value="etl:SensorModule_back_r"/>
+    <Numeric name="N" value="6"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> -2.155*cm, (122.7-[DeltaX_ServiceModule])*cm, -0.178*cm </Vector> <!-- y = 55.86-0.5*4.31 / 55.86=79*cos45° -->
+    <Numeric name="Theta" value="90.*deg"/> <!-- translation along y -->
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront_2"/>
+    <String name="ChildName" value="etl:SensorModule_back_r"/>
+    <Numeric name="N" value="10"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> -2.155*cm, (122.7-[DeltaX_ServiceModule]-[SensorModuledx])*cm, -0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid_back"/>
+    <Numeric name="N" value="2"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> -13.055*cm, (122.7-2*[DeltaX_ServiceModule]-[SensorModuledx])*cm, 0.*cm </Vector>
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront_2"/>
+    <String name="ChildName" value="etl:SensorModule_back_r"/>
+    <Numeric name="N" value="12"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> -2.155*cm, (122.7-3*[DeltaX_ServiceModule]-[SensorModuledx])*cm, -0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront_2"/>
+    <String name="ChildName" value="etl:SensorModule_back_r"/>
+    <Numeric name="N" value="14"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> -2.155*cm, (122.7-3*[DeltaX_ServiceModule]-2*[SensorModuledx])*cm, -0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid_back"/>
+    <Numeric name="N" value="2"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> -13.055*cm, (122.7-4*[DeltaX_ServiceModule]-2*[SensorModuledx])*cm, 0.*cm </Vector>
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">  <!-- 1st placement of a short service hybrid -->
+    <rParent name="etl:DiskQuarterFront_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid_short_back"/>
+    <Numeric name="N" value="1"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> -(13.055+[ServiceHybrid_Y]+2*[DeltaY]+[DeltaY_ServiceLong_ServiceShort])*cm, (122.7-4*[DeltaX_ServiceModule]-2*[SensorModuledx])*cm, 0.*cm </Vector>
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront_2"/>
+    <String name="ChildName" value="etl:SensorModule_back_r"/>
+    <Numeric name="N" value="15"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> -2.155*cm, (122.7-5*[DeltaX_ServiceModule]-2*[SensorModuledx])*cm, -0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront_2"/>
+    <String name="ChildName" value="etl:SensorModule_back_r"/>
+    <Numeric name="N" value="17"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> -2.155*cm, (122.7-5*[DeltaX_ServiceModule]-3*[SensorModuledx])*cm, -0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid_back"/>
+    <Numeric name="N" value="3"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> -13.055*cm, (122.7-6*[DeltaX_ServiceModule]-3*[SensorModuledx])*cm, 0.*cm </Vector>
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront_2"/>
+    <String name="ChildName" value="etl:SensorModule_back_r"/>
+    <Numeric name="N" value="18"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> -2.155*cm, (122.7-7*[DeltaX_ServiceModule]-3*[SensorModuledx])*cm, -0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront_2"/>
+    <String name="ChildName" value="etl:SensorModule_back_r"/>
+    <Numeric name="N" value="18"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> -2.155*cm, (122.7-7*[DeltaX_ServiceModule]-4*[SensorModuledx])*cm, -0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid_back"/>
+    <Numeric name="N" value="3"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> -13.055*cm, (122.7-8*[DeltaX_ServiceModule]-4*[SensorModuledx])*cm, 0.*cm </Vector>
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront_2"/>
+    <String name="ChildName" value="etl:SensorModule_back_r"/>
+    <Numeric name="N" value="18"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> -2.155*cm, (122.7-9*[DeltaX_ServiceModule]-4*[SensorModuledx])*cm, -0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront_2"/>
+    <String name="ChildName" value="etl:SensorModule_back_r"/>
+    <Numeric name="N" value="21"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> -2.155*cm, (122.7-9*[DeltaX_ServiceModule]-5*[SensorModuledx])*cm, -0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid_back"/>
+    <Numeric name="N" value="3"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> -13.055*cm, (122.7-10*[DeltaX_ServiceModule]-5*[SensorModuledx])*cm, 0.*cm </Vector>
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid_short_back"/>
+    <Numeric name="N" value="1"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> -(13.055+2*[ServiceHybrid_Y]+3*[DeltaY]+[DeltaY_ServiceLong_ServiceShort])*cm, (122.7-10*[DeltaX_ServiceModule]-5*[SensorModuledx])*cm, 0.*cm </Vector>
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront_2"/>
+    <String name="ChildName" value="etl:SensorModule_back_r"/>
+    <Numeric name="N" value="21"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> -2.155*cm, (122.7-11*[DeltaX_ServiceModule]-5*[SensorModuledx])*cm, -0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront_2"/>
+    <String name="ChildName" value="etl:SensorModule_back_r"/>
+    <Numeric name="N" value="23"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> -2.155*cm, (122.7-11*[DeltaX_ServiceModule]-6*[SensorModuledx])*cm, -0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid_back"/>
+    <Numeric name="N" value="4"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> -13.055*cm, (122.7-12*[DeltaX_ServiceModule]-6*[SensorModuledx])*cm, 0.*cm </Vector>
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront_2"/>
+    <String name="ChildName" value="etl:SensorModule_back_r"/>
+    <Numeric name="N" value="24"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> -2.155*cm, (122.7-13*[DeltaX_ServiceModule]-6*[SensorModuledx])*cm, -0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront_2"/>
+    <String name="ChildName" value="etl:SensorModule_back_r"/>
+    <Numeric name="N" value="24"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> -2.155*cm, (122.7-13*[DeltaX_ServiceModule]-7*[SensorModuledx])*cm, -0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid_back"/>
+    <Numeric name="N" value="4"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> -13.055*cm, (122.7-14*[DeltaX_ServiceModule]-7*[SensorModuledx])*cm, 0.*cm </Vector>
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront_2"/>
+    <String name="ChildName" value="etl:SensorModule_back_r"/>
+    <Numeric name="N" value="24"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> -2.155*cm, (122.7-15*[DeltaX_ServiceModule]-7*[SensorModuledx])*cm, -0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront_2"/>
+    <String name="ChildName" value="etl:SensorModule_back_r"/>
+    <Numeric name="N" value="24"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> -2.155*cm, (122.7-15*[DeltaX_ServiceModule]-8*[SensorModuledx])*cm, -0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid_back"/>
+    <Numeric name="N" value="4"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> -13.055*cm, (122.7-16*[DeltaX_ServiceModule]-8*[SensorModuledx])*cm, 0.*cm </Vector>
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront_2"/>
+    <String name="ChildName" value="etl:SensorModule_back_r"/>
+    <Numeric name="N" value="24"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> -2.155*cm, (122.7-17*[DeltaX_ServiceModule]-8*[SensorModuledx])*cm, -0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront_2"/>
+    <String name="ChildName" value="etl:SensorModule_back_r"/>
+    <Numeric name="N" value="27"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> -2.155*cm, (122.7-17*[DeltaX_ServiceModule]-9*[SensorModuledx])*cm, -0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid_short_back"/>
+    <Numeric name="N" value="1"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> -6.5275*cm, (122.7-18*[DeltaX_ServiceModule]-9*[SensorModuledx])*cm, 0.*cm </Vector>
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid_back"/>
+    <Numeric name="N" value="4"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> -(6.5275+[DeltaY_ServiceLong_ServiceShort]+[DeltaY])*cm, (122.7-18*[DeltaX_ServiceModule]-9*[SensorModuledx])*cm, 0.*cm </Vector>
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront_2"/>
+    <String name="ChildName" value="etl:SensorModule_back_r"/>
+    <Numeric name="N" value="27"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> -2.155*cm, (122.7-19*[DeltaX_ServiceModule]-9*[SensorModuledx])*cm, -0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront_2"/>
+    <String name="ChildName" value="etl:SensorModule_back_r"/>
+    <Numeric name="N" value="27"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> -2.155*cm, (122.7-19*[DeltaX_ServiceModule]-10*[SensorModuledx])*cm, -0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid_short_back"/>
+    <Numeric name="N" value="3"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> -6.5275*cm, (122.7-20*[DeltaX_ServiceModule]-10*[SensorModuledx])*cm, 0.*cm </Vector>
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid_back"/>
+    <Numeric name="N" value="3"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> -(6.5275+2*[ServiceHybrid_Y_short]+[DeltaY_ServiceLong_ServiceShort]+3*[DeltaY])*cm, (122.7-20*[DeltaX_ServiceModule]-10*[SensorModuledx])*cm, 0.*cm </Vector>
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront_2"/>
+    <String name="ChildName" value="etl:SensorModule_back_r"/>
+    <Numeric name="N" value="27"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> -2.155*cm, (122.7-21*[DeltaX_ServiceModule]-10*[SensorModuledx])*cm, -0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront_2"/>
+    <String name="ChildName" value="etl:SensorModule_back_r"/>
+    <Numeric name="N" value="24"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> -(2.155+4*[SensorModuledy]+4*[DeltaY])*cm, (122.7-21*[DeltaX_ServiceModule]-11*[SensorModuledx])*cm, -0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid_short_back"/>
+    <Numeric name="N" value="2"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> -(2.155+5*[SensorModuledy]+5*[DeltaY])*cm, (122.7-22*[DeltaX_ServiceModule]-11*[SensorModuledx])*cm, 0.*cm </Vector>
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid_back"/>
+    <Numeric name="N" value="3"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> -(2.155+5*[SensorModuledy]+5*[DeltaY]+[ServiceHybrid_Y_short]+[DeltaY_ServiceLong_ServiceShort]+2*[DeltaY])*cm, (122.7-22*[DeltaX_ServiceModule]-11*[SensorModuledx])*cm, 0.*cm </Vector>
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront_2"/>
+    <String name="ChildName" value="etl:SensorModule_back_r"/>
+    <Numeric name="N" value="23"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> -(2.155+5*[SensorModuledy]+5*[DeltaY])*cm, (122.7-23*[DeltaX_ServiceModule]-11*[SensorModuledx])*cm, -0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront_2"/>
+    <String name="ChildName" value="etl:SensorModule_back_r"/>
+    <Numeric name="N" value="21"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> -(2.155+6*[SensorModuledy]+6*[DeltaY])*cm, (122.7-23*[DeltaX_ServiceModule]-12*[SensorModuledx])*cm, -0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid_short_back"/>
+    <Numeric name="N" value="1"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> -(2.155+7*[SensorModuledy]+7*[DeltaY])*cm, (122.7-24*[DeltaX_ServiceModule]-12*[SensorModuledx])*cm, 0.*cm </Vector>
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid_back"/>
+    <Numeric name="N" value="3"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> -(2.155+7*[SensorModuledy]+7*[DeltaY]+[DeltaY_ServiceLong_ServiceShort]+[DeltaY])*cm, (122.7-24*[DeltaX_ServiceModule]-12*[SensorModuledx])*cm, 0.*cm </Vector>
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront_2"/>
+    <String name="ChildName" value="etl:SensorModule_back_r"/>
+    <Numeric name="N" value="20"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> -(2.155+7*[SensorModuledy]+7*[DeltaY])*cm, (122.7-25*[DeltaX_ServiceModule]-12*[SensorModuledx])*cm, -0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront_2"/>
+    <String name="ChildName" value="etl:SensorModule_back_r"/>
+    <Numeric name="N" value="21"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> -(2.155+7*[SensorModuledy]+7*[DeltaY])*cm, (122.7-25*[DeltaX_ServiceModule]-13*[SensorModuledx])*cm, -0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid_short_back"/>
+    <Numeric name="N" value="1"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> -(2.155+8*[SensorModuledy]+8*[DeltaY])*cm, (122.7-26*[DeltaX_ServiceModule]-13*[SensorModuledx])*cm, 0*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid_back"/>
+    <Numeric name="N" value="3"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> -(2.155+8*[SensorModuledy]+8*[DeltaY]+[DeltaY_ServiceLong_ServiceShort]+[DeltaY])*cm, (122.7-26*[DeltaX_ServiceModule]-13*[SensorModuledx])*cm, 0.*cm </Vector>
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront_2"/>
+    <String name="ChildName" value="etl:SensorModule_back_r"/>
+    <Numeric name="N" value="20"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> -(2.155+8*[SensorModuledy]+8*[DeltaY])*cm, (122.7-27*[DeltaX_ServiceModule]-13*[SensorModuledx])*cm, -0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront_2"/>
+    <String name="ChildName" value="etl:SensorModule_back_r"/>
+    <Numeric name="N" value="21"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> -(2.155+8*[SensorModuledy]+8*[DeltaY])*cm, (122.7-27*[DeltaX_ServiceModule]-14*[SensorModuledx])*cm, -0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid_short_back"/>
+    <Numeric name="N" value="1"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> -(2.155+9*[SensorModuledy]+9*[DeltaY])*cm, (122.7-28*[DeltaX_ServiceModule]-14*[SensorModuledx])*cm, 0*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterFront_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid_back"/>
+    <Numeric name="N" value="3"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> -(2.155+9*[SensorModuledy]+9*[DeltaY]+[DeltaY_ServiceLong_ServiceShort]+[DeltaY])*cm, (122.7-28*[DeltaX_ServiceModule]-14*[SensorModuledx])*cm, 0*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+
+
+
+  <!-- Quarter on back face -->
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack_2"/>
+    <String name="ChildName" value="etl:SensorModule_back"/>
+    <Numeric name="N" value="7"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3">  -2.155*cm, 122*cm, 0.178*cm </Vector> <!-- 55.86=79*cos45° -->
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid_back"/>
+    <Numeric name="N" value="1"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3">  -13.055*cm, (122-[DeltaX_ServiceModule])*cm, 0.*cm </Vector> <!-- x,y,z alway wrt center of the volume / x-value = 1st x position in which you can place the center of the hybrid without going out of the disk. y = 55.86-0.5*26.11 -->
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid_short_back"/>
+    <Numeric name="N" value="1"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3">  -(13.055+[DeltaY_ServiceLong_ServiceShort]+[DeltaY])*cm, (122-[DeltaX_ServiceModule])*cm, 0*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack_2"/>
+    <String name="ChildName" value="etl:SensorModule_back"/>
+    <Numeric name="N" value="9"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3">   -2.155*cm, (122-2*[DeltaX_ServiceModule])*cm, 0.178*cm </Vector> <!-- 55.86=79*cos45° -->
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack_2"/>
+    <String name="ChildName" value="etl:SensorModule_back"/>
+    <Numeric name="N" value="12"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3">   -2.155*cm, (122-2*[DeltaX_ServiceModule]-[SensorModuledx])*cm, 0.178*cm </Vector> <!-- 55.86=79*cos45° -->
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid_back"/>
+    <Numeric name="N" value="2"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3">  -13.055*cm, (122-3*[DeltaX_ServiceModule]-[SensorModuledx])*cm, 0.*cm </Vector>
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack_2"/>
+    <String name="ChildName" value="etl:SensorModule_back"/>
+    <Numeric name="N" value="12"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3">  -2.155*cm, (122-4*[DeltaX_ServiceModule]-[SensorModuledx])*cm, 0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack_2"/>
+    <String name="ChildName" value="etl:SensorModule_back"/>
+    <Numeric name="N" value="15"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3">  -2.155*cm, (122-4*[DeltaX_ServiceModule]-2*[SensorModuledx])*cm, 0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid_back"/>
+    <Numeric name="N" value="2"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> -13.055*cm, (122-5*[DeltaX_ServiceModule]-2*[SensorModuledx])*cm, 0.*cm </Vector>
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid_short_back"/>
+    <Numeric name="N" value="1"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> -(13.055+[ServiceHybrid_Y]+[DeltaY_ServiceLong_ServiceShort]+2*[DeltaY])*cm, (122-5*[DeltaX_ServiceModule]-2*[SensorModuledx])*cm, 0*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack_2"/>
+    <String name="ChildName" value="etl:SensorModule_back"/>
+    <Numeric name="N" value="15"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3">  -2.155*cm, (122-6*[DeltaX_ServiceModule]-2*[SensorModuledx])*cm, 0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack_2"/>
+    <String name="ChildName" value="etl:SensorModule_back"/>
+    <Numeric name="N" value="18"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3">  -2.155*cm, (122-6*[DeltaX_ServiceModule]-3*[SensorModuledx])*cm, 0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid_back"/>
+    <Numeric name="N" value="3"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> -13.055*cm, (122-7*[DeltaX_ServiceModule]-3*[SensorModuledx])*cm, 0.*cm </Vector>
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack_2"/>
+    <String name="ChildName" value="etl:SensorModule_back"/>
+    <Numeric name="N" value="18"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> -2.155*cm, (122-8*[DeltaX_ServiceModule]-3*[SensorModuledx])*cm, 0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack_2"/>
+    <String name="ChildName" value="etl:SensorModule_back"/>
+    <Numeric name="N" value="21"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> -2.155*cm, (122-8*[DeltaX_ServiceModule]-4*[SensorModuledx])*cm, 0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid_back"/>
+    <Numeric name="N" value="3"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> -13.055*cm, (122-9*[DeltaX_ServiceModule]-4*[SensorModuledx])*cm, 0.*cm </Vector>
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid_short_back"/>
+    <Numeric name="N" value="1"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> -(13.055+2*[ServiceHybrid_Y]+[DeltaY_ServiceLong_ServiceShort]+3*[DeltaY])*cm, (122-9*[DeltaX_ServiceModule]-4*[SensorModuledx])*cm, 0*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack_2"/>
+    <String name="ChildName" value="etl:SensorModule_back"/>
+    <Numeric name="N" value="21"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3">  -2.155*cm, (122-10*[DeltaX_ServiceModule]-4*[SensorModuledx])*cm, 0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack_2"/>
+    <String name="ChildName" value="etl:SensorModule_back"/>
+    <Numeric name="N" value="21"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3">  -2.155*cm, (122-10*[DeltaX_ServiceModule]-5*[SensorModuledx])*cm, 0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid_back"/>
+    <Numeric name="N" value="3"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> -13.055*cm, (122-11*[DeltaX_ServiceModule]-5*[SensorModuledx])*cm, 0.*cm </Vector>
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid_short_back"/>
+    <Numeric name="N" value="1"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> -(13.055+2*[ServiceHybrid_Y]+[DeltaY_ServiceLong_ServiceShort]+3*[DeltaY])*cm, (122-11*[DeltaX_ServiceModule]-5*[SensorModuledx])*cm, 0*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack_2"/>
+    <String name="ChildName" value="etl:SensorModule_back"/>
+    <Numeric name="N" value="21"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3">  -2.155*cm, (122-12*[DeltaX_ServiceModule]-5*[SensorModuledx])*cm, 0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack_2"/>
+    <String name="ChildName" value="etl:SensorModule_back"/>
+    <Numeric name="N" value="24"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3">  -2.155*cm, (122-12*[DeltaX_ServiceModule]-6*[SensorModuledx])*cm, 0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid_back"/>
+    <Numeric name="N" value="4"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> -13.055*cm, (122-13*[DeltaX_ServiceModule]-6*[SensorModuledx])*cm, 0.*cm </Vector>
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack_2"/>
+    <String name="ChildName" value="etl:SensorModule_back"/>
+    <Numeric name="N" value="24"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3">  -2.155*cm, (122-14*[DeltaX_ServiceModule]-6*[SensorModuledx])*cm, 0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack_2"/>
+    <String name="ChildName" value="etl:SensorModule_back"/>
+    <Numeric name="N" value="24"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3">  -2.155*cm, (122-14*[DeltaX_ServiceModule]-7*[SensorModuledx])*cm, 0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid_back"/>
+    <Numeric name="N" value="4"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> -13.055*cm, (122-15*[DeltaX_ServiceModule]-7*[SensorModuledx])*cm, 0.*cm </Vector>
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack_2"/>
+    <String name="ChildName" value="etl:SensorModule_back"/>
+    <Numeric name="N" value="24"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3">  -2.155*cm, (122-16*[DeltaX_ServiceModule]-7*[SensorModuledx])*cm, 0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack_2"/>
+    <String name="ChildName" value="etl:SensorModule_back"/>
+    <Numeric name="N" value="24"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3">  -2.155*cm, (122-16*[DeltaX_ServiceModule]-8*[SensorModuledx])*cm, 0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid_back"/>
+    <Numeric name="N" value="4"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> -13.055*cm, (122-17*[DeltaX_ServiceModule]-8*[SensorModuledx])*cm, 0.*cm </Vector>
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack_2"/>
+    <String name="ChildName" value="etl:SensorModule_back"/>
+    <Numeric name="N" value="24"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3">  -2.155*cm, (122-18*[DeltaX_ServiceModule]-8*[SensorModuledx])*cm, 0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack_2"/>
+    <String name="ChildName" value="etl:SensorModule_back"/>
+    <Numeric name="N" value="27"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> -2.155*cm, (122-18*[DeltaX_ServiceModule]-9*[SensorModuledx])*cm, 0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid_short_back"/>
+    <Numeric name="N" value="1"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> -6.5275*cm, (122-19*[DeltaX_ServiceModule]-9*[SensorModuledx])*cm, 0*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid_back"/>
+    <Numeric name="N" value="4"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> -(6.5275+[DeltaY_ServiceLong_ServiceShort]+[DeltaY])*cm, (122-19*[DeltaX_ServiceModule]-9*[SensorModuledx])*cm, 0.*cm </Vector>
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack_2"/>
+    <String name="ChildName" value="etl:SensorModule_back"/>
+    <Numeric name="N" value="27"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3">  -2.155*cm, (122-20*[DeltaX_ServiceModule]-9*[SensorModuledx])*cm, 0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack_2"/>
+    <String name="ChildName" value="etl:SensorModule_back"/>
+    <Numeric name="N" value="27"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3">  -(2.155+[SensorModuledy]+[DeltaY])*cm, (122-20*[DeltaX_ServiceModule]-10*[SensorModuledx])*cm, 0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid_short_back"/>
+    <Numeric name="N" value="3"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> -(2.155+2*[SensorModuledy]+2*[DeltaY])*cm, (122-21*[DeltaX_ServiceModule]-10*[SensorModuledx])*cm, 0*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid_back"/>
+    <Numeric name="N" value="3"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3">-(2.155+2*[SensorModuledy]+2*[DeltaY]+2*[ServiceHybrid_Y_short]+[DeltaY_ServiceLong_ServiceShort]+3*[DeltaY])*cm, (122-21*[DeltaX_ServiceModule]-10*[SensorModuledx])*cm, 0.*cm </Vector>
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack_2"/>
+    <String name="ChildName" value="etl:SensorModule_back"/>
+    <Numeric name="N" value="24"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3">  -(2.155+4*[SensorModuledy]+4*[DeltaY])*cm, (122-22*[DeltaX_ServiceModule]-10*[SensorModuledx])*cm, 0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack_2"/>
+    <String name="ChildName" value="etl:SensorModule_back"/>
+    <Numeric name="N" value="21"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3">  -(2.155+6*[SensorModuledy]+6*[DeltaY])*cm, (122-22*[DeltaX_ServiceModule]-11*[SensorModuledx])*cm, 0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid_short_back"/>
+    <Numeric name="N" value="1"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> -(2.155+7*[SensorModuledy]+7*[DeltaY])*cm, (122-23*[DeltaX_ServiceModule]-11*[SensorModuledx])*cm, 0*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid_back"/>
+    <Numeric name="N" value="3"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> -(2.155+7*[SensorModuledy]+8*[DeltaY]+[DeltaY_ServiceLong_ServiceShort])*cm, (122-23*[DeltaX_ServiceModule]-11*[SensorModuledx])*cm, 0.*cm </Vector>
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack_2"/>
+    <String name="ChildName" value="etl:SensorModule_back"/>
+    <Numeric name="N" value="21"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3">  -(2.155+6*[SensorModuledy]+6*[DeltaY])*cm, (122-24*[DeltaX_ServiceModule]-11*[SensorModuledx])*cm, 0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack_2"/>
+    <String name="ChildName" value="etl:SensorModule_back"/>
+    <Numeric name="N" value="21"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3">  -(2.155+7*[SensorModuledy]+7*[DeltaY])*cm, (122-24*[DeltaX_ServiceModule]-12*[SensorModuledx])*cm, 0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid_short_back"/>
+    <Numeric name="N" value="1"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> -(2.155+8*[SensorModuledy]+8*[DeltaY])*cm, (122-25*[DeltaX_ServiceModule]-12*[SensorModuledx])*cm, 0*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid_back"/>
+    <Numeric name="N" value="3"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> -(2.155+8*[SensorModuledy]+9*[DeltaY]+[DeltaY_ServiceLong_ServiceShort])*cm, (122-25*[DeltaX_ServiceModule]-12*[SensorModuledx])*cm, 0.*cm </Vector>
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack_2"/>
+    <String name="ChildName" value="etl:SensorModule_back"/>
+    <Numeric name="N" value="21"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3">  -(2.155+7*[SensorModuledy]+7*[DeltaY])*cm, (122-26*[DeltaX_ServiceModule]-12*[SensorModuledx])*cm, 0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack_2"/>
+    <String name="ChildName" value="etl:SensorModule_back"/>
+    <Numeric name="N" value="21"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3">  -(2.155+8*[SensorModuledy]+8*[DeltaY])*cm, (122-26*[DeltaX_ServiceModule]-13*[SensorModuledx])*cm, 0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid_short_back"/>
+    <Numeric name="N" value="1"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> -(2.155+9*[SensorModuledy]+9*[DeltaY])*cm, (122-27*[DeltaX_ServiceModule]-13*[SensorModuledx])*cm, 0*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid_back"/>
+    <Numeric name="N" value="3"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> -(2.155+9*[SensorModuledy]+10*[DeltaY]+[DeltaY_ServiceLong_ServiceShort])*cm, (122-27*[DeltaX_ServiceModule]-13*[SensorModuledx])*cm, 0.*cm </Vector>
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDLinear">
+    <rParent name="etl:DiskQuarterBack_2"/>
+    <String name="ChildName" value="etl:SensorModule_back"/>
+    <Numeric name="N" value="21"/>
+    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3">  -(2.155+8*[SensorModuledy]+8*[DeltaY])*cm, (122-28*[DeltaX_ServiceModule]-13*[SensorModuledx])*cm, 0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="180.*deg"/>
+  </Algorithm>
+
+</DDDefinition>
diff --git a/Geometry/MTDCommonData/data/mtdMaterial/v2/mtdMaterial.xml b/Geometry/MTDCommonData/data/mtdMaterial/v2/mtdMaterial.xml
new file mode 100644
index 0000000000000..b55f1026ee871
--- /dev/null
+++ b/Geometry/MTDCommonData/data/mtdMaterial/v2/mtdMaterial.xml
@@ -0,0 +1,187 @@
+<?xml version="1.0"?>
+<DDDefinition xmlns="http://www.cern.ch/cms/DDL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.cern.ch/cms/DDL ../../../../DetectorDescription/Schema/DDLSchema.xsd">
+
+  <MaterialSection label="mtdMaterial.xml">
+    <ElementaryMaterial name="mtdtkLayout_Li" symbol="Li" atomicNumber="3" atomicWeight="6.8678*g/mole" density="0.534*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Be" symbol="Be" atomicNumber="4" atomicWeight="9.06332*g/mole" density="1.85*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_B" symbol="B" atomicNumber="5" atomicWeight="11.0826*g/mole" density="2.37*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_C" symbol="C" atomicNumber="6" atomicWeight="12.3025*g/mole" density="2*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Na" symbol="Na" atomicNumber="11" atomicWeight="23.2593*g/mole" density="0.971*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Mg" symbol="Mg" atomicNumber="12" atomicWeight="24.5327*g/mole" density="1.74*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Al" symbol="Al" atomicNumber="13" atomicWeight="27.1837*g/mole" density="2.7*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Al_MV" symbol="Al_MV" atomicNumber="13" atomicWeight="27.1837*g/mole" density="2.7*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Al_HV" symbol="Al_HV" atomicNumber="13" atomicWeight="27.1837*g/mole" density="2.7*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Al_twp" symbol="Al_twp" atomicNumber="13" atomicWeight="27.1837*g/mole" density="2.7*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_SenSi" symbol="SenSi" atomicNumber="14" atomicWeight="28.2688*g/mole" density="2.33*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Si" symbol="Si" atomicNumber="14" atomicWeight="28.2688*g/mole" density="2.33*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_P" symbol="P" atomicNumber="15" atomicWeight="31.1175*g/mole" density="2.2*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_S" symbol="S" atomicNumber="16" atomicWeight="32.1629*g/mole" density="2*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_K" symbol="K" atomicNumber="19" atomicWeight="39.1139*g/mole" density="0.862*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Ca" symbol="Ca" atomicNumber="20" atomicWeight="40.0474*g/mole" density="1.55*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Sc" symbol="Sc" atomicNumber="21" atomicWeight="44.8867*g/mole" density="2.99*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Ti" symbol="Ti" atomicNumber="22" atomicWeight="47.747*g/mole" density="4.54*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Ti_L1" symbol="Ti_L1" atomicNumber="22" atomicWeight="47.747*g/mole" density="4.54*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Ti_L2" symbol="Ti_L2" atomicNumber="22" atomicWeight="47.747*g/mole" density="4.54*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Ti_L3" symbol="Ti_L3" atomicNumber="22" atomicWeight="47.747*g/mole" density="4.54*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Ti_L4" symbol="Ti_L4" atomicNumber="22" atomicWeight="47.747*g/mole" density="4.54*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_V" symbol="V" atomicNumber="23" atomicWeight="50.771*g/mole" density="6.11*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Cr" symbol="Cr" atomicNumber="24" atomicWeight="51.8161*g/mole" density="7.18*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Mn" symbol="Mn" atomicNumber="25" atomicWeight="54.7227*g/mole" density="7.44*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Fe" symbol="Fe" atomicNumber="26" atomicWeight="55.6502*g/mole" density="7.87*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Co" symbol="Co" atomicNumber="27" atomicWeight="58.6913*g/mole" density="8.9*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Ni" symbol="Ni" atomicNumber="28" atomicWeight="58.4818*g/mole" density="8.9*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Cu" symbol="Cu" atomicNumber="29" atomicWeight="63.2581*g/mole" density="8.96*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Cu_TWP_1+1_LS" symbol="Cu_TWP_1+1_LS" atomicNumber="29" atomicWeight="63.2581*g/mole" density="8.96*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Cu_TWP_1+1_LS_div4" symbol="Cu_TWP_1+1_LS_div4" atomicNumber="29" atomicWeight="63.2581*g/mole" density="8.96*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Cu_TWP_1+1_HS" symbol="Cu_TWP_1+1_HS" atomicNumber="29" atomicWeight="63.2581*g/mole" density="8.96*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Cu_TWP_1+1_HS_div4" symbol="Cu_TWP_1+1_HS_div4" atomicNumber="29" atomicWeight="63.2581*g/mole" density="8.96*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Cu_TWP_2+1_HS" symbol="Cu_TWP_2+1_HS" atomicNumber="29" atomicWeight="63.2581*g/mole" density="8.96*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Cu_TWP_3+1_HS" symbol="Cu_TWP_3+1_HS" atomicNumber="29" atomicWeight="63.2581*g/mole" density="8.96*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Cu_TWP_6+1_HS" symbol="Cu_TWP_6+1_HS" atomicNumber="29" atomicWeight="63.2581*g/mole" density="8.96*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Cu_HV" symbol="Cu_HV" atomicNumber="29" atomicWeight="63.2581*g/mole" density="8.96*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Cu_MV" symbol="Cu_MV" atomicNumber="29" atomicWeight="63.2581*g/mole" density="8.96*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Cu_twp" symbol="Cu_twp" atomicNumber="29" atomicWeight="63.2581*g/mole" density="8.96*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Zn" symbol="Zn" atomicNumber="30" atomicWeight="65.0982*g/mole" density="7.13*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Ga" symbol="Ga" atomicNumber="31" atomicWeight="69.3766*g/mole" density="5.9*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Ge" symbol="Ge" atomicNumber="32" atomicWeight="72.2862*g/mole" density="5.32*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_As" symbol="As" atomicNumber="33" atomicWeight="74.5952*g/mole" density="5.73*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Se" symbol="Se" atomicNumber="34" atomicWeight="78.5982*g/mole" density="4.5*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Rb" symbol="Rb" atomicNumber="37" atomicWeight="85.0738*g/mole" density="1.53*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Sr" symbol="Sr" atomicNumber="38" atomicWeight="87.215*g/mole" density="2.54*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Y" symbol="Y" atomicNumber="39" atomicWeight="88.5185*g/mole" density="4.47*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Zr" symbol="Zr" atomicNumber="40" atomicWeight="90.8471*g/mole" density="6.51*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Nb" symbol="Nb" atomicNumber="41" atomicWeight="92.5*g/mole" density="8.57*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Mo" symbol="Mo" atomicNumber="42" atomicWeight="95.5581*g/mole" density="10.2*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Tc" symbol="Tc" atomicNumber="43" atomicWeight="97.4763*g/mole" density="11.5*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Ru" symbol="Ru" atomicNumber="44" atomicWeight="100.651*g/mole" density="12.4*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Rh" symbol="Rh" atomicNumber="45" atomicWeight="102.542*g/mole" density="12.4*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Pd" symbol="Pd" atomicNumber="46" atomicWeight="106.002*g/mole" density="12*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Ag" symbol="Ag" atomicNumber="47" atomicWeight="107.496*g/mole" density="10.5*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Cd" symbol="Cd" atomicNumber="48" atomicWeight="112.076*g/mole" density="8.65*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_In" symbol="In" atomicNumber="49" atomicWeight="114.461*g/mole" density="7.31*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Sn" symbol="Sn" atomicNumber="50" atomicWeight="118.411*g/mole" density="7.31*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Sb" symbol="Sb" atomicNumber="51" atomicWeight="121.471*g/mole" density="6.69*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_I" symbol="I" atomicNumber="53" atomicWeight="126.652*g/mole" density="4.93*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Te" symbol="Te" atomicNumber="52" atomicWeight="127.391*g/mole" density="6.24*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Cs" symbol="Cs" atomicNumber="55" atomicWeight="132.724*g/mole" density="1.87*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Ba" symbol="Ba" atomicNumber="56" atomicWeight="137.15*g/mole" density="3.5*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_La" symbol="La" atomicNumber="57" atomicWeight="138.777*g/mole" density="6.15*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Ce" symbol="Ce" atomicNumber="58" atomicWeight="139.951*g/mole" density="6.66*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Pr" symbol="Pr" atomicNumber="59" atomicWeight="140.79*g/mole" density="6.71*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Nd" symbol="Nd" atomicNumber="60" atomicWeight="144.165*g/mole" density="6.9*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Pm" symbol="Pm" atomicNumber="61" atomicWeight="144.751*g/mole" density="7.22*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Sm" symbol="Sm" atomicNumber="62" atomicWeight="150.251*g/mole" density="7.46*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Eu" symbol="Eu" atomicNumber="63" atomicWeight="151.927*g/mole" density="5.24*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Gd" symbol="Gd" atomicNumber="64" atomicWeight="157.198*g/mole" density="7.9*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Tb" symbol="Tb" atomicNumber="65" atomicWeight="158.963*g/mole" density="8.23*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Dy" symbol="Dy" atomicNumber="66" atomicWeight="162.601*g/mole" density="8.55*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Ho" symbol="Ho" atomicNumber="67" atomicWeight="165.022*g/mole" density="8.8*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Er" symbol="Er" atomicNumber="68" atomicWeight="167.312*g/mole" density="9.07*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Tm" symbol="Tm" atomicNumber="69" atomicWeight="169.05*g/mole" density="9.32*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Yb" symbol="Yb" atomicNumber="70" atomicWeight="173.254*g/mole" density="6.73*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Lu" symbol="Lu" atomicNumber="71" atomicWeight="175.189*g/mole" density="9.84*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Hf" symbol="Hf" atomicNumber="72" atomicWeight="178.783*g/mole" density="13.3*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Ta" symbol="Ta" atomicNumber="73" atomicWeight="181.381*g/mole" density="16.7*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_W" symbol="W" atomicNumber="74" atomicWeight="184.135*g/mole" density="19.3*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Re" symbol="Re" atomicNumber="75" atomicWeight="186.687*g/mole" density="21*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Os" symbol="Os" atomicNumber="76" atomicWeight="190.771*g/mole" density="22.6*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Ir" symbol="Ir" atomicNumber="77" atomicWeight="192.697*g/mole" density="22.4*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Pt" symbol="Pt" atomicNumber="78" atomicWeight="195.583*g/mole" density="21.5*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Au" symbol="Au" atomicNumber="79" atomicWeight="197.524*g/mole" density="19.3*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Hg" symbol="Hg" atomicNumber="81" atomicWeight="204.241*g/mole" density="13.5*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Tl" symbol="Tl" atomicNumber="82" atomicWeight="208.071*g/mole" density="11.7*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Pb" symbol="Pb" atomicNumber="83" atomicWeight="210.921*g/mole" density="11.4*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Bi" symbol="Bi" atomicNumber="84" atomicWeight="212.741*g/mole" density="9.75*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Po" symbol="Po" atomicNumber="84" atomicWeight="209.8*g/mole" density="9.32*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_C6F14" symbol="C6F14" atomicNumber="8" atomicWeight="15.9086*g/mole" density="1.88*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_CF" symbol="CF" atomicNumber="5" atomicWeight="8.68516*g/mole" density="1.69*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Pyroid" symbol="Pyroid" atomicNumber="5" atomicWeight="8.68516*g/mole" density="2.22*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_PGS" symbol="PGS" atomicNumber="5" atomicWeight="8.68516*g/mole" density="0.85*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_CO2" symbol="CO2" atomicNumber="8" atomicWeight="16.2692*g/mole" density="1*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_CO2_L1" symbol="CO2_L1" atomicNumber="8" atomicWeight="16.2692*g/mole" density="1*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_CO2_L2" symbol="CO2_L2" atomicNumber="8" atomicWeight="16.2692*g/mole" density="1*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_CO2_L3" symbol="CO2_L3" atomicNumber="8" atomicWeight="16.2692*g/mole" density="1*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_CO2_L4" symbol="CO2_L4" atomicNumber="8" atomicWeight="16.2692*g/mole" density="1*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_G10" symbol="G10" atomicNumber="8" atomicWeight="16.7615*g/mole" density="1.9*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Gten" symbol="Gten" atomicNumber="8" atomicWeight="16.7615*g/mole" density="1.9*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_PE" symbol="PE" atomicNumber="4" atomicWeight="5.979*g/mole" density="0.95*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_PE_twp" symbol="PE_twp" atomicNumber="4" atomicWeight="5.979*g/mole" density="0.95*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Steel" symbol="Steel" atomicNumber="28" atomicWeight="58.335*g/mole" density="7.8*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Silicone" symbol="Silicone" atomicNumber="8" atomicWeight="14.4647*g/mole" density="74.15*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Al2O3" symbol="Al2O3" atomicNumber="10" atomicWeight="19.8836*g/mole" density="3.965*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_BGA" symbol="BGA" atomicNumber="63" atomicWeight="158.433*g/mole" density="8.82*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_ConCon" symbol="ConCon" atomicNumber="18" atomicWeight="33.9466*g/mole" density="5.89*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Kapton" symbol="Kapton" atomicNumber="6" atomicWeight="11.8879*g/mole" density="1.42*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_2S-FEH-mix" symbol="2S-FEH-mix" atomicNumber="12" atomicWeight="20.4403*g/mole" density="1.83*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_WB-enc" symbol="WB-enc" atomicNumber="7" atomicWeight="13.5157*g/mole" density="1.5*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Epoxy" symbol="Epoxy" atomicNumber="7" atomicWeight="13.9368*g/mole" density="1.16*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Siliconeglue" symbol="Siliconeglue" atomicNumber="7" atomicWeight="13.5157*g/mole" density="1.5*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_CFRP" symbol="CFRP" atomicNumber="6" atomicWeight="12.1475*g/mole" density="1.84*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Parylene" symbol="Parylene" atomicNumber="6" atomicWeight="11.8184*g/mole" density="1.3*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_2S-SEH-mix" symbol="2S-SEH-mix" atomicNumber="7" atomicWeight="12.6353*g/mole" density="1.22*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Al-CF" symbol="Al-CF" atomicNumber="9" atomicWeight="18.1096*g/mole" density="2.4*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_PS-FEH-mix" symbol="PS-FEH-mix" atomicNumber="9" atomicWeight="16.0276*g/mole" density="1.61*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_PS-ROH-mix" symbol="PS-ROH-mix" atomicNumber="8" atomicWeight="15.1128*g/mole" density="1.54*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_PS-POH-mix" symbol="PS-POH-mix" atomicNumber="6" atomicWeight="10.3891*g/mole" density="0.99*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_SenLYSO" symbol="SenLYSO" atomicNumber="44" atomicWeight="89.6738*g/mole" density="7.4*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Sn95Ag5" symbol="Sn95Ag5" atomicNumber="50" atomicWeight="118.302*g/mole" density="7.5*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_TEDD_Steel" symbol="TEDD_Steel" atomicNumber="28" atomicWeight="58.335*g/mole" density="7.8*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_TEDD_Al" symbol="TEDD_Al" atomicNumber="13" atomicWeight="27.1837*g/mole" density="2.7*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_TEDD_CO2" symbol="TEDD_CO2" atomicNumber="8" atomicWeight="16.2692*g/mole" density="1*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_TEDD_Cu" symbol="TEDD_Cu" atomicNumber="29" atomicWeight="63.2581*g/mole" density="8.96*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_TEDD_PE" symbol="TEDD_PE" atomicNumber="4" atomicWeight="5.979*g/mole" density="0.95*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_FPIX_Steel" symbol="FPIX_Steel" atomicNumber="28" atomicWeight="58.335*g/mole" density="7.8*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_FPIX_Ti" symbol="FPIX_Ti" atomicNumber="22" atomicWeight="47.747*g/mole" density="4.54*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_FPIX_CO2" symbol="FPIX_CO2" atomicNumber="8" atomicWeight="16.2692*g/mole" density="1*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_FPIX_Al" symbol="FPIX_Al" atomicNumber="13" atomicWeight="27.1837*g/mole" density="2.7*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_FPIX_Al_HV" symbol="FPIX_Al_HV" atomicNumber="13" atomicWeight="27.1837*g/mole" density="2.7*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_FPIX_PE" symbol="FPIX_PE" atomicNumber="4" atomicWeight="5.979*g/mole" density="0.95*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_FPIX_Cu" symbol="FPIX_Cu" atomicNumber="29" atomicWeight="63.2581*g/mole" density="8.96*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Brass" symbol="Brass" atomicNumber="29" atomicWeight="62.9057*g/mole" density="8.7*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Acrylate" symbol="Acrylate" atomicNumber="6" atomicWeight="11.3976*g/mole" density="1.16*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Glass" symbol="Glass" atomicNumber="14" atomicWeight="28.2688*g/mole" density="2.33*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Airex" symbol="Airex" atomicNumber="6" atomicWeight="11.8147*g/mole" density="0.06*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Pix_Bumps" symbol="Pix_Bumps" atomicNumber="64" atomicWeight="155.311*g/mole" density="8.92*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Pix_Caps" symbol="Pix_Caps" atomicNumber="13" atomicWeight="25.164*g/mole" density="6.02*g/cm3"/>
+    <ElementaryMaterial name="mtdtkLayout_Kevlar" symbol="Kevlar" atomicNumber="6" atomicWeight="11.8879*g/mole" density="1.42*g/cm3"/>
+    <CompositeMaterial name="mtdhybridcompositeBModule1Layer1PositiveZFSide" density="4.60957*g/cm3" method="mixture by weight">
+      <MaterialFraction fraction="0.0408204">
+        <rMaterial name="mtdMaterial:mtdtkLayout_CFRP"/>
+      </MaterialFraction>
+      <MaterialFraction fraction="0.412896">
+        <rMaterial name="materials:Copper"/>
+      </MaterialFraction>
+      <MaterialFraction fraction="0.0167572">
+        <rMaterial name="mtdMaterial:mtdtkLayout_Epoxy"/>
+      </MaterialFraction>
+      <MaterialFraction fraction="0.529526">
+        <rMaterial name="mtdMaterial:mtdtkLayout_PS-ROH-mix"/>
+      </MaterialFraction>
+    </CompositeMaterial>
+    <CompositeMaterial name="Aluminium_Nitride" density="3.26*g/cm3" symbol="AIN" method="mixture by weight">
+      <MaterialFraction fraction="0.5">
+        <rMaterial name="materials:Aluminium"/>
+      </MaterialFraction>
+      <MaterialFraction fraction="0.5">
+        <rMaterial name="materials:Nitrogen"/>
+      </MaterialFraction>
+    </CompositeMaterial>
+    <CompositeMaterial name="Laird" density="1*g/cm3" symbol="Laird" method="mixture by weight"> <!-- density approximate. Definition line 167 Ulascan DetectorConstruction.cc -->
+      <MaterialFraction fraction="0.5">
+        <rMaterial name="materials:Carbon"/>
+      </MaterialFraction>
+      <MaterialFraction fraction="0.5">
+        <rMaterial name="materials:Hydrogen"/>
+      </MaterialFraction>
+    </CompositeMaterial>
+    <CompositeMaterial name="ServiceHybrid_PCB" density="1.85*g/cm3" symbol="PCB" method="mixture by weight">   <!-- density approximate -->
+      <MaterialFraction fraction="0.5">
+        <rMaterial name="materials:Carbon"/>
+      </MaterialFraction>
+      <MaterialFraction fraction="0.5">
+        <rMaterial name="materials:Hydrogen"/>
+      </MaterialFraction>
+    </CompositeMaterial>
+  </MaterialSection>
+
+</DDDefinition>

From cd637073a22177259f956c8d66828ca7038a18f6 Mon Sep 17 00:00:00 2001
From: Fabio Cossutti <fabio.cossutti@ts.infn.it>
Date: Tue, 10 Dec 2019 15:02:38 +0100
Subject: [PATCH 02/15] TDR ETL design with DDMTDLinear algorithm (by F.
 Siviero), first test implementation, add corresponding sensitive volumes

---
 .../Geometry/python/dict2026Geometry.py       |    4 +-
 Geometry/MTDCommonData/data/etl/v4/etl.xml    | 2453 ++++++++---------
 .../data/mtdMaterial/v2/mtdMaterial.xml       |   23 +
 Geometry/MTDCommonData/plugins/BuildFile.xml  |   15 +
 Geometry/MTDCommonData/plugins/DDMTDLinear.cc |  111 +
 Geometry/MTDSimData/data/v2/mtdProdCuts.xml   |   28 +
 Geometry/MTDSimData/data/v2/mtdsens.xml       |   22 +
 7 files changed, 1395 insertions(+), 1261 deletions(-)
 create mode 100644 Geometry/MTDCommonData/plugins/BuildFile.xml
 create mode 100644 Geometry/MTDCommonData/plugins/DDMTDLinear.cc
 create mode 100644 Geometry/MTDSimData/data/v2/mtdProdCuts.xml
 create mode 100644 Geometry/MTDSimData/data/v2/mtdsens.xml

diff --git a/Configuration/Geometry/python/dict2026Geometry.py b/Configuration/Geometry/python/dict2026Geometry.py
index a4448d7b9f3fc..1a41905995cff 100644
--- a/Configuration/Geometry/python/dict2026Geometry.py
+++ b/Configuration/Geometry/python/dict2026Geometry.py
@@ -1081,10 +1081,10 @@
             'Geometry/MTDCommonData/data/mtdParameters/v1/mtdParameters.xml',
             ],
         3 : [
-            'Geometry/MTDSimData/data/v1/mtdsens.xml'
+            'Geometry/MTDSimData/data/v2/mtdsens.xml'
             ],
         4 : [
-            'Geometry/MTDSimData/data/v1/mtdProdCuts.xml'
+            'Geometry/MTDSimData/data/v2/mtdProdCuts.xml'
             ],
         "sim" : [
             'from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cfi import *',
diff --git a/Geometry/MTDCommonData/data/etl/v4/etl.xml b/Geometry/MTDCommonData/data/etl/v4/etl.xml
index 8bee89fd20119..1ce33076b063c 100644
--- a/Geometry/MTDCommonData/data/etl/v4/etl.xml
+++ b/Geometry/MTDCommonData/data/etl/v4/etl.xml
@@ -4,8 +4,8 @@
   <ConstantsSection label="etl.xml" eval="true/false">
 	<Constant name="ETLrmin" value="[caloBase:Rmin100]"/>   <!-- 2.63cm -->
 	<Constant name="ETLrmax" value="[caloBase:Rmax100]"/>   <!--  -->
-	<Constant name="ETLzmin" value="-0.5*([caloBase:Zpos110]-[caloBase:Zpos100])"/>  <!-- zmax-zmin = 77mm -->
-	<Constant name="ETLzmax" value="0.5*([caloBase:Zpos110]-[caloBase:Zpos100])"/>
+	<Constant name="ETLzmin" value="-0.5*([caloBase:Zpos110]-[caloBase:Zpos10])"/>  <!-- zmax-zmin = 3063mm-2966mm = 97mm -->
+	<Constant name="ETLzmax" value="0.5*([caloBase:Zpos110]-[caloBase:Zpos10])"/>
 
 	<Constant name="Disk_thickness" value="1.894"/>  <!-- thickness of one disk comprising modules, service hybrids on both faces, mounted on the Al and MIC6-Al rings. Fig 3.73 TDR and line 354 Ulascan ETLDetectorDimensions.cc -->
 	<Constant name="DiskQuarter_thickness" value="0.585"/> <!-- thickness of the volume where the LGAD modules + service hybrid will be positioned. Basically, this is the service hybrid height according to table 3.9 -->
@@ -27,10 +27,10 @@
 	<Constant name="ServiceHybrid_Y" value="26.11"/> <!-- ORANGE 6x SensorModule_dy + 5x lgadSep_Y -->
 	<Constant name="ServiceHybrid_Y_short" value="13.055"/> <!-- RED 3x SensorModule_dy + 2x lgadSep_Y -->
 	<Constant name="ServiceHybrid_Z" value="0.585"/>
-	<Constant name="SensorModuledx" value="2.825"/>  <!-- Half of a 2-Sensor-Module line 181 Ulascan ETLDetectorDimensions.cc -->
+	<Constant name="SensorModuledx" value="2.585"/>  <!-- Half of a 2-Sensor-Module line 181 Ulascan ETLDetectorDimensions.cc -->
 	<Constant name="SensorModuledy" value="4.31"/>
 	<Constant name="SensorModuledz" value="0.229"/>
-	<Constant name="DeltaX_ServiceModule" value="3.1125"/>
+	<Constant name="DeltaX_ServiceModule" value="2.9925"/>
 	<Constant name="DeltaY" value="0.05"/>
 	<Constant name="DeltaY_ServiceLong_ServiceShort" value="19.5825"/>
   </ConstantsSection>
@@ -42,23 +42,20 @@
 	  <ZSection z="[ETLzmax]"         rMin="[ETLrmin]"          rMax="[ETLrmax]" />
 	</Polycone>
 	<!-- Aluminium rings: dimensions as defined by ulascan (line 345 ETLDetectorDimensions.cc). Note: epoxy not considered as single element but included in "Aluminium_Disk" (0.081 + 0.008 cm) -->
+	<Tubs name="ThermalScreen" rMin="31*cm" rMax="127*cm" dz="0.5*(2)*cm" startPhi="0*deg" deltaPhi="360*deg"/>
 	<Tubs name="Disk" rMin="31*cm" rMax="127*cm" dz="0.5*[Disk_thickness]*cm" startPhi="0*deg" deltaPhi="360*deg"/>
 	<Tubs name="Aluminium_Disk" rMin="31*cm" rMax="127*cm" dz="0.5*(0.089)*cm" startPhi="0*deg" deltaPhi="360*deg"/>  
 	<Tubs name="MIC6_Aluminium_Disk" rMin="31*cm" rMax="127*cm" dz="0.5*(0.635)*cm" startPhi="0*deg" deltaPhi="360*deg"/>
-	<!-- Front is the face touching the Al ring, while Back touches the MIC6-Al ring" -->
-	<Tubs name="DiskQuarterFront" rMin="31*cm" rMax="127*cm" dz="0.5*[DiskQuarter_thickness]*cm" startPhi="0*deg" deltaPhi="90*deg"/>
-	<Tubs name="DiskQuarterBack" rMin="31*cm" rMax="127*cm" dz="0.5*[DiskQuarter_thickness]*cm" startPhi="0*deg" deltaPhi="90*deg"/>
 
-	<!-- QUANDO POSIZIONI IL SensorModule con l'algoritmo ricordati degli offset in y!!!! (mentre in x non ci sono) -->
+	<!-- FRONT: face closest to IP, BACK: furthest from IP -->
+	<Tubs name="DiskQuarter_Back" rMin="31*cm" rMax="127*cm" dz="0.5*[DiskQuarter_thickness]*cm" startPhi="90*deg" deltaPhi="90*deg"/>
+	<Tubs name="DiskQuarter_Front" rMin="31*cm" rMax="127*cm" dz="0.5*[DiskQuarter_thickness]*cm" startPhi="90*deg" deltaPhi="90*deg"/>
+	<Tubs name="DiskQuarter_Back_2" rMin="31*cm" rMax="127*cm" dz="0.5*[DiskQuarter_thickness]*cm" startPhi="0*deg" deltaPhi="90*deg"/>
+	<Tubs name="DiskQuarter_Front_2" rMin="31*cm" rMax="127*cm" dz="0.5*[DiskQuarter_thickness]*cm" startPhi="0*deg" deltaPhi="90*deg"/>
 	<Box name="SensorModule" dx="0.5*[SensorModuledx]*cm" dy="0.5*[SensorModuledy]*cm" dz="0.5*[SensorModuledz]*cm"/>
 	<Box name="ServiceHybrid" dx="0.5*[ServiceHybrid_X]*cm" dy="0.5*[ServiceHybrid_Y]*cm" dz="0.5*[ServiceHybrid_Z]*cm"/>
 	<Box name="ServiceHybrid_short" dx="0.5*[ServiceHybrid_X]*cm" dy="0.5*[ServiceHybrid_Y_short]*cm" dz="0.5*[ServiceHybrid_Z]*cm"/>
 
-	<!-- box for the back-quarters --> 
-	<Box name="SensorModule_back" dx="0.5*[SensorModuledy]*cm" dy="0.5*[SensorModuledx]*cm" dz="0.5*[SensorModuledz]*cm"/>
-	<Box name="ServiceHybrid_back" dx="0.5*[ServiceHybrid_Y]*cm" dy="0.5*[ServiceHybrid_X]*cm" dz="0.5*[ServiceHybrid_Z]*cm"/>
-	<Box name="ServiceHybrid_short_back" dx="0.5*[ServiceHybrid_Y_short]*cm" dy="0.5*[ServiceHybrid_X]*cm" dz="0.5*[ServiceHybrid_Z]*cm"/>
-
 	<Box name="ThermalPad" dx="0.5*[SensorModuledx]*cm" dy="0.5*[SensorModuledy]*cm" dz="0.5*(0.025)*cm"/>
 	<Box name="AlN_Carrier" dx="0.5*[SensorModuledx]*cm" dy="0.5*[SensorModuledy]*cm" dz="0.5*(0.079)*cm"/>
 	<Box name="LairdFilm" dx="0.5*([ETROCdx]+0.5*[etrocSep_X])*cm" dy="0.5*([ETROCdy]*2+[etrocSep_Y])*cm" dz="0.5*(0.008)*cm"/> <!-- Line 220 ETLDetectorDimensions.cc -->
@@ -67,19 +64,8 @@
 	<Box name="LGAD_ActiveThickness" dx="0.5*[LGADdx]*cm" dy="0.5*[LGADdy]*cm" dz="0.5*[LGAD_ActiveThickness]*cm"/>
 	<Box name="LGAD_Substrate" dx="0.5*[LGADdx]*cm" dy="0.5*[LGADdy]*cm" dz="0.5*[LGAD_Substrate]*cm"/>
 	<Box name="AlN_Cover" dx="0.5*[LGADdx]*cm" dy="0.5*[LGADdy]*cm" dz="0.5*(0.059)*cm"/>  <!-- epoxy included in the thickness of the AlN cover -->
-
-
-	<Box name="ThermalPad_back" dx="0.5*[SensorModuledy]*cm" dy="0.5*[SensorModuledx]*cm" dz="0.5*(0.025)*cm"/>
-	<Box name="AlN_Carrier_back" dx="0.5*[SensorModuledy]*cm" dy="0.5*[SensorModuledx]*cm" dz="0.5*(0.079)*cm"/>
-	<Box name="LairdFilm_back" dx="0.5*([ETROCdy]*2+[etrocSep_Y])*cm" dy="0.5*([ETROCdx]+0.5*[etrocSep_X])*cm" dz="0.5*(0.008)*cm"/> <!-- Line 220 ETLDetectorDimensions.cc -->
-	<Box name="ETROC_back" dx="0.5*[ETROCdy]*cm" dy="0.5*[ETROCdx]*cm" dz="0.5*(0.028)*cm"/>  <!-- solder bumps not considered, their thickness is included in that of the ETROC --> 
-	<Box name="LGAD_back" dx="0.5*[LGADdy]*cm" dy="0.5*[LGADdx]*cm" dz="0.5*[LGADdz]*cm"/>
-	<Box name="LGAD_ActiveThickness_back" dx="0.5*[LGADdy]*cm" dy="0.5*[LGADdx]*cm" dz="0.5*[LGAD_ActiveThickness]*cm"/>
-	<Box name="LGAD_Substrate_back" dx="0.5*[LGADdy]*cm" dy="0.5*[LGADdx]*cm" dz="0.5*[LGAD_Substrate]*cm"/>
-	<Box name="AlN_Cover_back" dx="0.5*[LGADdy]*cm" dy="0.5*[LGADdx]*cm" dz="0.5*(0.059)*cm"/>  <!-- epoxy included in the thickness of the AlN cover -->
   </SolidSection>
 
-
   <RotationSection label="etl.xml">
     <Rotation name="0" thetaX="90*deg" phiX="0*deg" thetaY="90*deg" phiY="90*deg" thetaZ="0*deg" phiZ="0*deg"/>
 	<Rotation name="270" thetaX="90*deg" phiX="270*deg" thetaY="90*deg" phiY="0*deg" thetaZ="0*deg" phiZ="0*deg"/>
@@ -93,6 +79,10 @@
 	  <rSolid name="etl:EndcapTimingLayer"/>                               
 	  <rMaterial name="materials:Air"/>                                
 	</LogicalPart>
+	<LogicalPart name="ThermalScreen" category="unspecified">      
+	  <rSolid name="etl:ThermalScreen"/>                               
+	  <rMaterial name="mtdMaterial:ThermalScreenComposite"/>                                  
+	</LogicalPart>
 	<LogicalPart name="Disk1" category="unspecified">      
 	  <rSolid name="etl:Disk"/>                               
 	  <rMaterial name="materials:Air"/>                                
@@ -107,32 +97,44 @@
     </LogicalPart>
     <LogicalPart name="MIC6_Aluminium_Disk" category="unspecified">
       <rSolid name="etl:MIC6_Aluminium_Disk"/>
-      <rMaterial name="materials:Aluminium"/>     <!-- MIC6 Al to be defined -->
+      <rMaterial name="materials:Aluminium"/>     
     </LogicalPart>
-    <LogicalPart name="DiskQuarterFront" category="unspecified">
-      <rSolid name="etl:DiskQuarterFront"/>
+    <!-- Quarters on Disk1 -->
+    <LogicalPart name="DiskQuarter_Back" category="unspecified">
+      <rSolid name="etl:DiskQuarter_Back"/>
       <rMaterial name="materials:Air"/>     
     </LogicalPart> 
-    <LogicalPart name="DiskQuarterBack" category="unspecified">
-      <rSolid name="etl:DiskQuarterBack"/>
+    <LogicalPart name="DiskQuarter_Front" category="unspecified">
+      <rSolid name="etl:DiskQuarter_Front"/>
       <rMaterial name="materials:Air"/>     
     </LogicalPart>
-    <LogicalPart name="DiskQuarterFront_2" category="unspecified">
-      <rSolid name="etl:DiskQuarterFront"/>
+    <!-- Quarters on Disk2 -->
+    <LogicalPart name="DiskQuarter_Back_2" category="unspecified">
+      <rSolid name="etl:DiskQuarter_Back_2"/>
       <rMaterial name="materials:Air"/>     
     </LogicalPart> 
-    <LogicalPart name="DiskQuarterBack_2" category="unspecified">
-      <rSolid name="etl:DiskQuarterBack"/>
+    <LogicalPart name="DiskQuarter_Front_2" category="unspecified">
+      <rSolid name="etl:DiskQuarter_Front_2"/>
       <rMaterial name="materials:Air"/>     
     </LogicalPart> 
+    <!-- Sensor module on front face  -->
     <LogicalPart name="SensorModule" category="unspecified">  
       <rSolid name="etl:SensorModule"/>
       <rMaterial name="materials:Air"/>     
     </LogicalPart>
+    <LogicalPart name="SensorModule_2" category="unspecified">  
+      <rSolid name="etl:SensorModule"/>
+      <rMaterial name="materials:Air"/>     
+    </LogicalPart>
+    <!-- Sensor module on back face  -->
     <LogicalPart name="SensorModule_r" category="unspecified">  
       <rSolid name="etl:SensorModule"/>
       <rMaterial name="materials:Air"/>     
     </LogicalPart>
+    <LogicalPart name="SensorModule_r_2" category="unspecified">  
+      <rSolid name="etl:SensorModule"/>
+      <rMaterial name="materials:Air"/>     
+    </LogicalPart>
     <LogicalPart name="ServiceHybrid" category="unspecified">  
       <rSolid name="etl:ServiceHybrid"/>
       <rMaterial name="mtdMaterial:ServiceHybrid_PCB"/>     
@@ -141,25 +143,11 @@
       <rSolid name="etl:ServiceHybrid_short"/>
       <rMaterial name="mtdMaterial:ServiceHybrid_PCB"/>     
     </LogicalPart>
-    <LogicalPart name="SensorModule_back" category="unspecified">  
-      <rSolid name="etl:SensorModule_back"/>
-      <rMaterial name="materials:Air"/>     
-    </LogicalPart>
-    <LogicalPart name="SensorModule_back_r" category="unspecified">  
-      <rSolid name="etl:SensorModule_back"/>
-      <rMaterial name="materials:Air"/>     
-    </LogicalPart>
-    <LogicalPart name="ServiceHybrid_back" category="unspecified">  
-      <rSolid name="etl:ServiceHybrid_back"/>
-      <rMaterial name="mtdMaterial:ServiceHybrid_PCB"/>     
-    </LogicalPart>
-    <LogicalPart name="ServiceHybrid_short_back" category="unspecified">  
-      <rSolid name="etl:ServiceHybrid_short_back"/>
-      <rMaterial name="mtdMaterial:ServiceHybrid_PCB"/>     
-    </LogicalPart>
+    
+    <!-- Elements composing the sensor module -->
     <LogicalPart name="ThermalPad" category="unspecified">  
       <rSolid name="etl:ThermalPad"/>
-      <rMaterial name="materials:Epoxy"/>  <!-- epoxy is defined in materials.xml, is it the correct one? -->   
+      <rMaterial name="materials:Epoxy"/>  
     </LogicalPart>
     <LogicalPart name="AlN_Carrier" category="unspecified">  
       <rSolid name="etl:AlN_Carrier"/>
@@ -193,69 +181,31 @@
       <rSolid name="etl:AlN_Cover"/>
       <rMaterial name="mtdMaterial:Aluminium_Nitride"/>     
     </LogicalPart>
-    <LogicalPart name="ThermalPad_back" category="unspecified">  
-      <rSolid name="etl:ThermalPad_back"/>
-      <rMaterial name="materials:Epoxy"/>  <!-- epoxy is defined in materials.xml, is it the correct one? -->   
-    </LogicalPart>
-    <LogicalPart name="AlN_Carrier_back" category="unspecified">  
-      <rSolid name="etl:AlN_Carrier_back"/>
-      <rMaterial name="mtdMaterial:Aluminium_Nitride"/>     
-    </LogicalPart> 
-    <LogicalPart name="LairdFilm_back" category="unspecified">  
-      <rSolid name="etl:LairdFilm_back"/>
-      <rMaterial name="mtdMaterial:Laird"/>     
-    </LogicalPart> 
-    <LogicalPart name="ETROC_back" category="unspecified">  
-      <rSolid name="etl:ETROC_back"/>
-      <rMaterial name="materials:Silicon"/>     
-    </LogicalPart> 
-    <LogicalPart name="LGAD_back" category="unspecified">  
-      <rSolid name="etl:LGAD_back"/>
-      <rMaterial name="materials:Air"/>     
-    </LogicalPart>
-    <LogicalPart name="LGAD_back_r" category="unspecified">  
-      <rSolid name="etl:LGAD_back"/>
-      <rMaterial name="materials:Air"/>     
-    </LogicalPart> 
-    <LogicalPart name="LGAD_ActiveThickness_back" category="unspecified">  
-      <rSolid name="etl:LGAD_ActiveThickness_back"/>
-      <rMaterial name="materials:Silicon"/>     
-    </LogicalPart>
-    <LogicalPart name="LGAD_Substrate_back" category="unspecified">  
-      <rSolid name="etl:LGAD_Substrate_back"/>
-      <rMaterial name="materials:Silicon"/>     
-    </LogicalPart>
-    <LogicalPart name="AlN_Cover_back" category="unspecified">  
-      <rSolid name="etl:AlN_Cover_back"/>
-      <rMaterial name="mtdMaterial:Aluminium_Nitride"/>     
-    </LogicalPart>                                                   
   </LogicalPartSection> 
 
-  <!-- ServiceHybrid (short/long) and SensorModule to be positioned with algorithm -->
+  
   <PosPartSection label="etl.xml">                                     
 	<PosPart copyNumber="1">                                           
 	  <rParent name="caloBase:CALOECFront"/>                         
 	  <rChild name="etl:EndcapTimingLayer"/>  
-	  <Translation x="0." y="0." z="0.5*([caloBase:Zpos110]+[caloBase:Zpos100])" />
+	  <Translation x="0." y="0." z="0.5*([caloBase:Zpos110]+[caloBase:Zpos10])" />
+	</PosPart>
+	
+	<!-- Positions wrt IP: endcap: 2966mm -> 3063mm  / Disk1 2996.62mm / Disk2 3017.62mm / Center of endcap 3014.5mm / Center of thermal screen 2976mm -->
+	<PosPart copyNumber="1">                                           
+	  <rParent name="etl:EndcapTimingLayer"/>                         
+	  <rChild name="etl:ThermalScreen"/>  
+	  <Translation x="0." y="0." z="-3.85*cm" />
 	</PosPart>
-	<!-- where is the definition of the second endcap????? 
-	     <PosPart copyNumber="1">                                           
-	     <rParent name="caloBase:CALOECRear"/>                         
-	     <rChild name="etl:EndcapTimingLayer"/>  
-	     <Translation x="0." y="0." z="0.5*([caloBase:Zpos110]+[caloBase:Zpos100])" />  
-	     </PosPart> -->
-
-
-	<!-- Disks positioned in order to have them at +10mm and -10 mm of the centre of the endcap volume. Those z-position have to be translated when including other systems like the thermal screens --> 
 	<PosPart copyNumber="1">                                           
 	  <rParent name="etl:EndcapTimingLayer"/>                         
 	  <rChild name="etl:Disk1"/>  
-	  <Translation x="0." y="0." z="-1.*cm" />
+	  <Translation x="0." y="0." z="-1.788*cm" />
 	</PosPart> 
 	<PosPart copyNumber="2">                                           
 	  <rParent name="etl:EndcapTimingLayer"/>                         
 	  <rChild name="etl:Disk2"/>  
-	  <Translation x="0." y="0." z="1.*cm" />
+	  <Translation x="0." y="0." z="0.312*cm" />
 	</PosPart> 
 	<PosPart copyNumber="1">                                           
 	  <rParent name="etl:Disk1"/>                         
@@ -269,49 +219,49 @@
 	</PosPart>
 	<PosPart copyNumber="1">                                           
 	  <rParent name="etl:Disk1"/>                         
-	  <rChild name="etl:DiskQuarterFront"/>  
+	  <rChild name="etl:DiskQuarter_Back"/>  
 	  <rRotation name="etl:0"/>
-	  <Translation x="0*cm" y="0*cm" z="0.6545*cm" />   <!--  -55.86*cm" y="55.86*cm" z="0.6545*cm/x,y coordinate of the centre of the disk = 79*cos(45°) -->
+	  <Translation x="0*cm" y="0*cm" z="0.6545*cm" />  
 	</PosPart>
 	<PosPart copyNumber="2">                                           
 	  <rParent name="etl:Disk1"/>                         
-	  <rChild name="etl:DiskQuarterFront"/>
+	  <rChild name="etl:DiskQuarter_Back"/>
 	  <rRotation name="etl:270"/>  
 	  <Translation x="0*cm" y="0*cm" z="0.6545*cm" />
 	</PosPart> 
 	<PosPart copyNumber="3">                                           
 	  <rParent name="etl:Disk1"/>                         
-	  <rChild name="etl:DiskQuarterFront"/>
+	  <rChild name="etl:DiskQuarter_Back"/>
 	  <rRotation name="etl:180"/>  
 	  <Translation x="0*cm" y="0*cm" z="0.6545*cm" />
 	</PosPart> 
 	<PosPart copyNumber="4">                                           
 	  <rParent name="etl:Disk1"/>                         
-	  <rChild name="etl:DiskQuarterFront"/> 
+	  <rChild name="etl:DiskQuarter_Back"/> 
 	  <rRotation name="etl:90"/> 
 	  <Translation x="0*cm" y="0*cm" z="0.6545*cm" />
 	</PosPart> 
 	<PosPart copyNumber="1">                                           
 	  <rParent name="etl:Disk1"/>                         
-	  <rChild name="etl:DiskQuarterBack"/> 
+	  <rChild name="etl:DiskQuarter_Front"/> 
 	  <rRotation name="etl:0"/> 
 	  <Translation x="0*cm" y="0*cm" z="-0.6545*cm" />
 	</PosPart> 
 	<PosPart copyNumber="2">                                           
 	  <rParent name="etl:Disk1"/>                         
-	  <rChild name="etl:DiskQuarterBack"/>  
+	  <rChild name="etl:DiskQuarter_Front"/>  
 	  <rRotation name="etl:270"/>
 	  <Translation x="0*cm" y="0*cm" z="-0.6545*cm" />
 	</PosPart> 
 	<PosPart copyNumber="3">                                           
 	  <rParent name="etl:Disk1"/>                         
-	  <rChild name="etl:DiskQuarterBack"/>
+	  <rChild name="etl:DiskQuarter_Front"/>
 	  <rRotation name="etl:180"/>  
 	  <Translation x="0*cm" y="0*cm" z="-0.6545*cm" />
 	</PosPart> 
 	<PosPart copyNumber="4">                                           
 	  <rParent name="etl:Disk1"/>                         
-	  <rChild name="etl:DiskQuarterBack"/> 
+	  <rChild name="etl:DiskQuarter_Front"/> 
 	  <rRotation name="etl:90"/> 
 	  <Translation x="0*cm" y="0*cm" z="-0.6545*cm" />
 	</PosPart>
@@ -327,49 +277,49 @@
     </PosPart>
     <PosPart copyNumber="1">                                           
       <rParent name="etl:Disk2"/>                         
-      <rChild name="etl:DiskQuarterFront_2"/>  
+      <rChild name="etl:DiskQuarter_Back_2"/>  
       <rRotation name="etl:0"/>
-      <Translation x="0*cm" y="0*cm" z="0.6545*cm" />   <!--  -55.86*cm" y="55.86*cm" z="0.6545*cm/x,y coordinate of the centre of the disk = 79*cos(45°) -->
+      <Translation x="0*cm" y="0*cm" z="0.6545*cm" />   
     </PosPart>
     <PosPart copyNumber="2">                                           
       <rParent name="etl:Disk2"/>                         
-      <rChild name="etl:DiskQuarterFront_2"/>
+      <rChild name="etl:DiskQuarter_Back_2"/>
       <rRotation name="etl:270"/>  
       <Translation x="0*cm" y="0*cm" z="0.6545*cm" />
     </PosPart> 
     <PosPart copyNumber="3">                                           
       <rParent name="etl:Disk2"/>                         
-      <rChild name="etl:DiskQuarterFront_2"/>
+      <rChild name="etl:DiskQuarter_Back_2"/>
       <rRotation name="etl:180"/>  
       <Translation x="0*cm" y="0*cm" z="0.6545*cm" />
     </PosPart> 
     <PosPart copyNumber="4">                                           
       <rParent name="etl:Disk2"/>                         
-      <rChild name="etl:DiskQuarterFront_2"/> 
+      <rChild name="etl:DiskQuarter_Back_2"/> 
       <rRotation name="etl:90"/> 
       <Translation x="0*cm" y="0*cm" z="0.6545*cm" />
     </PosPart> 
     <PosPart copyNumber="1">                                           
       <rParent name="etl:Disk2"/>                         
-      <rChild name="etl:DiskQuarterBack_2"/> 
+      <rChild name="etl:DiskQuarter_Front_2"/> 
       <rRotation name="etl:0"/> 
       <Translation x="0*cm" y="0*cm" z="-0.6545*cm" />
     </PosPart> 
     <PosPart copyNumber="2">                                           
       <rParent name="etl:Disk2"/>                         
-      <rChild name="etl:DiskQuarterBack_2"/>  
+      <rChild name="etl:DiskQuarter_Front_2"/>  
       <rRotation name="etl:270"/>
       <Translation x="0*cm" y="0*cm" z="-0.6545*cm" />
     </PosPart> 
     <PosPart copyNumber="3">                                           
       <rParent name="etl:Disk2"/>                         
-      <rChild name="etl:DiskQuarterBack_2"/>
+      <rChild name="etl:DiskQuarter_Front_2"/>
       <rRotation name="etl:180"/>  
       <Translation x="0*cm" y="0*cm" z="-0.6545*cm" />
     </PosPart> 
     <PosPart copyNumber="4">                                           
       <rParent name="etl:Disk2"/>                         
-      <rChild name="etl:DiskQuarterBack_2"/> 
+      <rChild name="etl:DiskQuarter_Front_2"/> 
       <rRotation name="etl:90"/> 
       <Translation x="0*cm" y="0*cm" z="-0.6545*cm" />
     </PosPart>
@@ -386,24 +336,23 @@
 	<PosPart copyNumber="1">                                           
 	  <rParent name="etl:SensorModule"/>                         
 	  <rChild name="etl:LairdFilm"/>  
-	  <Translation x="0." y="0." z="0.0065*cm" />
+	  <Translation x="0.17" y="0." z="0.0065*cm" />
 	</PosPart>
 	<PosPart copyNumber="1">                                           
 	  <rParent name="etl:SensorModule"/>                         
 	  <rChild name="etl:ETROC"/>  
-	  <Translation x="0.2825*cm" y="1.045*cm" z="-0.0115*cm" />
+	  <Translation x="0.1625*cm" y="1.045*cm" z="-0.0115*cm" />
 	</PosPart>
 	<PosPart copyNumber="2">                                           
 	  <rParent name="etl:SensorModule"/>                         
 	  <rChild name="etl:ETROC"/>  
-	  <Translation x="0.2825*cm" y="-1.045*cm" z="-0.0115*cm" />
+	  <Translation x="0.1625*cm" y="-1.045*cm" z="-0.0115*cm" />
 	</PosPart> 
 	<PosPart copyNumber="1">                                           
 	  <rParent name="etl:SensorModule"/>                         
 	  <rChild name="etl:LGAD"/>  
-	  <Translation x="0.34*cm" y="0." z="-0.0405*cm" />
+	  <Translation x="0.22*cm" y="0." z="-0.0405*cm" />
 	</PosPart>
-
 	<!-- definition of LGAD active/substrate volumes -->
 	<PosPart copyNumber="1">                                           
 	  <rParent name="etl:LGAD"/>                         
@@ -414,15 +363,58 @@
 	  <rParent name="etl:LGAD"/>                         
 	  <rChild name="etl:LGAD_Substrate"/>  
 	  <Translation x="0.*cm" y="0.*cm" z="0.0025*cm" />
-	</PosPart>  
-
-
+	</PosPart> 
 	<PosPart copyNumber="1">                                           
 	  <rParent name="etl:SensorModule"/>                         
 	  <rChild name="etl:AlN_Cover"/>  
-	  <Translation x="0.34*cm" y="0." z="-0.085*cm" /> <!-- not correct: AlN Cover should be a bit longer in x and separation in x is different than that of the LGAD -->
+	  <Translation x="0.22*cm" y="0." z="-0.085*cm" /> <!-- not correct: AlN Cover should be a bit longer in x and separation in x is different than that of the LGAD -->
 	</PosPart> 
-
+	<PosPart copyNumber="1">                                           
+	  <rParent name="etl:SensorModule_2"/>                         
+	  <rChild name="etl:ThermalPad"/>  
+	  <Translation x="0." y="0." z="0.102*cm" />
+	</PosPart>
+	<PosPart copyNumber="1">                                           
+	  <rParent name="etl:SensorModule_2"/>                         
+	  <rChild name="etl:AlN_Carrier"/>  
+	  <Translation x="0." y="0." z="0.05*cm" />
+	</PosPart>
+	<PosPart copyNumber="1">                                           
+	  <rParent name="etl:SensorModule_2"/>                         
+	  <rChild name="etl:LairdFilm"/>  
+	  <Translation x="-0.17" y="0." z="0.0065*cm" />
+	</PosPart>
+	<PosPart copyNumber="1">                                           
+	  <rParent name="etl:SensorModule_2"/>                         
+	  <rChild name="etl:ETROC"/>  
+	  <Translation x="-0.1625*cm" y="1.045*cm" z="-0.0115*cm" />
+	</PosPart>
+	<PosPart copyNumber="2">                                           
+	  <rParent name="etl:SensorModule_2"/>                         
+	  <rChild name="etl:ETROC"/>  
+	  <Translation x="-0.1625*cm" y="-1.045*cm" z="-0.0115*cm" />
+	</PosPart> 
+	<PosPart copyNumber="1">                                           
+	  <rParent name="etl:SensorModule_2"/>                         
+	  <rChild name="etl:LGAD"/>  
+	  <Translation x="-0.22*cm" y="0." z="-0.0405*cm" />
+	</PosPart>
+	<!-- definition of LGAD active/substrate volumes -->
+	<PosPart copyNumber="1">                                           
+	  <rParent name="etl:LGAD"/>                         
+	  <rChild name="etl:LGAD_ActiveThickness"/>  
+	  <Translation x="0.*cm" y="0.*cm" z="-0.0125*cm" />
+	</PosPart>
+	<PosPart copyNumber="1">                                           
+	  <rParent name="etl:LGAD"/>                         
+	  <rChild name="etl:LGAD_Substrate"/>  
+	  <Translation x="0.*cm" y="0.*cm" z="0.0025*cm" />
+	</PosPart>  
+	<PosPart copyNumber="1">                                           
+	  <rParent name="etl:SensorModule_2"/>                         
+	  <rChild name="etl:AlN_Cover"/>  
+	  <Translation x="-0.22*cm" y="0." z="-0.085*cm" /> <!-- not correct: AlN Cover should be a bit longer in x and separation in x is different than that of the LGAD -->
+	</PosPart>
     <PosPart copyNumber="1">                                           
       <rParent name="etl:SensorModule_r"/>                         
       <rChild name="etl:ThermalPad"/>  
@@ -436,24 +428,23 @@
     <PosPart copyNumber="1">                                           
       <rParent name="etl:SensorModule_r"/>                         
       <rChild name="etl:LairdFilm"/>  
-      <Translation x="0." y="0." z="-0.0065*cm" />
+      <Translation x="0.17" y="0." z="-0.0065*cm" />
     </PosPart>
     <PosPart copyNumber="1">                                           
       <rParent name="etl:SensorModule_r"/>                         
       <rChild name="etl:ETROC"/>  
-      <Translation x="0.2825*cm" y="1.045*cm" z="0.0115*cm" />
+      <Translation x="0.1625*cm" y="1.045*cm" z="0.0115*cm" />
     </PosPart>
     <PosPart copyNumber="2">                                           
       <rParent name="etl:SensorModule_r"/>                         
       <rChild name="etl:ETROC"/>  
-      <Translation x="0.2825*cm" y="-1.045*cm" z="0.0115*cm" />
+      <Translation x="0.1625*cm" y="-1.045*cm" z="0.0115*cm" />
     </PosPart> 
     <PosPart copyNumber="1">                                           
       <rParent name="etl:SensorModule_r"/>                         
       <rChild name="etl:LGAD_r"/>  
-      <Translation x="0.34*cm" y="0." z="0.0405*cm" />
+      <Translation x="0.22*cm" y="0." z="0.0405*cm" />
     </PosPart>
-
     <!-- definition of LGAD active/substrate volumes -->
     <PosPart copyNumber="1">                                           
       <rParent name="etl:LGAD_r"/>                         
@@ -465,2375 +456,2319 @@
       <rChild name="etl:LGAD_Substrate"/>  
       <Translation x="0.*cm" y="0.*cm" z="-0.0025*cm" />
     </PosPart>  
-
-
     <PosPart copyNumber="1">                                           
       <rParent name="etl:SensorModule_r"/>                         
       <rChild name="etl:AlN_Cover"/>  
-      <Translation x="0.34*cm" y="0." z="0.085*cm" /> <!-- not correct: AlN Cover should be a bit longer in x and separation in x is different than that of the LGAD -->
-    </PosPart> 
-
-
-
-
-
-
-
-	<PosPart copyNumber="1">                                           
-	  <rParent name="etl:SensorModule_back"/>                         
-	  <rChild name="etl:ThermalPad_back"/>  
-	  <Translation x="0." y="0." z="0.102*cm" />
-	</PosPart>
-	<PosPart copyNumber="1">                                           
-	  <rParent name="etl:SensorModule_back"/>                         
-	  <rChild name="etl:AlN_Carrier_back"/>  
-	  <Translation x="0." y="0." z="0.05*cm" />
-	</PosPart>
-	<PosPart copyNumber="1">                                           
-	  <rParent name="etl:SensorModule_back"/>                         
-	  <rChild name="etl:LairdFilm_back"/>    
-	  <Translation x="0." y="0." z="0.0065*cm" />
-	</PosPart>
-	<PosPart copyNumber="1">                                           
-	  <rParent name="etl:SensorModule_back"/>                         
-	  <rChild name="etl:ETROC_back"/>  
-	  <Translation x="1.045*cm" y="0.2825*cm" z="-0.0115*cm" />
-	</PosPart>
-	<PosPart copyNumber="2">                                           
-	  <rParent name="etl:SensorModule_back"/>                         
-	  <rChild name="etl:ETROC_back"/>  
-	  <Translation x="-1.045*cm" y="0.2825*cm" z="-0.0115*cm" />
-	</PosPart> 
-	<PosPart copyNumber="1">                                           
-	  <rParent name="etl:SensorModule_back"/>                         
-	  <rChild name="etl:LGAD_back"/>  
-	  <Translation x="0.*cm" y="0.34" z="-0.0405*cm" />
-	</PosPart>
-
-	<!-- definition of LGAD_back active/substrate volumes -->
-	<PosPart copyNumber="1">                                           
-	  <rParent name="etl:LGAD_back"/>                         
-	  <rChild name="etl:LGAD_ActiveThickness_back"/>  
-	  <Translation x="0.*cm" y="0.*cm" z="-0.0125*cm" />
-	</PosPart>
-	<PosPart copyNumber="1">                                           
-	  <rParent name="etl:LGAD_back"/>                         
-	  <rChild name="etl:LGAD_Substrate_back"/>  
-	  <Translation x="0.*cm" y="0.*cm" z="0.0025*cm" />
-	</PosPart>  
-
-
-	<PosPart copyNumber="1">                                           
-	  <rParent name="etl:SensorModule_back"/>                         
-	  <rChild name="etl:AlN_Cover_back"/>  
-	  <Translation x="0.*cm" y="0.34" z="-0.085*cm" /> <!-- not correct: AlN Cover should be a bit longer in x and separation in x is different than that of the LGAD -->
-	</PosPart>                                            
-
+      <Translation x="0.22*cm" y="0." z="0.085*cm" /> <!-- not correct: AlN Cover should be a bit longer in x and separation in x is different than that of the LGAD -->
+    </PosPart>
     <PosPart copyNumber="1">                                           
-      <rParent name="etl:SensorModule_back_r"/>                         
-      <rChild name="etl:ThermalPad_back"/>  
+      <rParent name="etl:SensorModule_r_2"/>                         
+      <rChild name="etl:ThermalPad"/>  
       <Translation x="0." y="0." z="-0.102*cm" />
     </PosPart>
     <PosPart copyNumber="1">                                           
-      <rParent name="etl:SensorModule_back_r"/>                         
-      <rChild name="etl:AlN_Carrier_back"/>  
+      <rParent name="etl:SensorModule_r_2"/>                         
+      <rChild name="etl:AlN_Carrier"/>  
       <Translation x="0." y="0." z="-0.05*cm" />
     </PosPart>
     <PosPart copyNumber="1">                                           
-      <rParent name="etl:SensorModule_back_r"/>                         
-      <rChild name="etl:LairdFilm_back"/>    
-      <Translation x="0." y="0." z="-0.0065*cm" />
+      <rParent name="etl:SensorModule_r_2"/>                         
+      <rChild name="etl:LairdFilm"/>  
+      <Translation x="-0.17" y="0." z="-0.0065*cm" />
     </PosPart>
     <PosPart copyNumber="1">                                           
-      <rParent name="etl:SensorModule_back_r"/>                         
-      <rChild name="etl:ETROC_back"/>  
-      <Translation x="1.045*cm" y="0.2825*cm" z="0.0115*cm" />
+      <rParent name="etl:SensorModule_r_2"/>                         
+      <rChild name="etl:ETROC"/>  
+      <Translation x="-0.1625*cm" y="1.045*cm" z="0.0115*cm" />
     </PosPart>
     <PosPart copyNumber="2">                                           
-      <rParent name="etl:SensorModule_back_r"/>                         
-      <rChild name="etl:ETROC_back"/>  
-      <Translation x="-1.045*cm" y="0.2825*cm" z="0.0115*cm" />
+      <rParent name="etl:SensorModule_r_2"/>                         
+      <rChild name="etl:ETROC"/>  
+      <Translation x="-0.1625*cm" y="-1.045*cm" z="0.0115*cm" />
     </PosPart> 
     <PosPart copyNumber="1">                                           
-      <rParent name="etl:SensorModule_back_r"/>                         
-      <rChild name="etl:LGAD_back"/>  
-      <Translation x="0.*cm" y="0.34" z="0.0405*cm" />
+      <rParent name="etl:SensorModule_r_2"/>                         
+      <rChild name="etl:LGAD_r"/>  
+      <Translation x="-0.22*cm" y="0." z="0.0405*cm" />
     </PosPart>
-
-    <!-- definition of LGAD_back active/substrate volumes -->
+    <!-- definition of LGAD active/substrate volumes -->
     <PosPart copyNumber="1">                                           
-      <rParent name="etl:LGAD_back_r"/>                         
-      <rChild name="etl:LGAD_ActiveThickness_back"/>  
+      <rParent name="etl:LGAD_r"/>                         
+      <rChild name="etl:LGAD_ActiveThickness"/>  
       <Translation x="0.*cm" y="0.*cm" z="0.0125*cm" />
     </PosPart>
     <PosPart copyNumber="1">                                           
-      <rParent name="etl:LGAD_back_r"/>                         
-      <rChild name="etl:LGAD_Substrate_back"/>  
+      <rParent name="etl:LGAD_r"/>                         
+      <rChild name="etl:LGAD_Substrate"/>  
       <Translation x="0.*cm" y="0.*cm" z="-0.0025*cm" />
     </PosPart>  
-
-
     <PosPart copyNumber="1">                                           
-      <rParent name="etl:SensorModule_back_r"/>                         
-      <rChild name="etl:AlN_Cover_back"/>  
-      <Translation x="0.*cm" y="0.34" z="0.085*cm" /> <!-- not correct: AlN Cover should be a bit longer in x and separation in x is different than that of the LGAD -->
-    </PosPart>                                            
+      <rParent name="etl:SensorModule_r_2"/>                         
+      <rChild name="etl:AlN_Cover"/>  
+      <Translation x="-0.22*cm" y="0." z="0.085*cm" /> <!-- not correct: AlN Cover should be a bit longer in x and separation in x is different than that of the LGAD -->
+    </PosPart> 
+
+    
   </PosPartSection> 
 
 
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront"/>
+
+
+
+  <!-- Algorithm Section begins -->
+  <!-- Disk1 -->
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="1"/>
     <Numeric name="StartCopyNo" value="0"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> -122.7*cm, 13.055*cm, 0.*cm </Vector> <!-- x,y,z alway wrt center of the volume / x-value = 1st x position in which you can place the center of the hybrid without going out of the disk. y = 55.86-0.5*26.11 -->
+    <Vector  name="Base" type="numeric" nEntries="3"> -122.0875*cm, 13.055*cm, 0.*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> <!-- translation along y -->
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back"/>
     <String name="ChildName" value="etl:SensorModule_r"/>
     <Numeric name="N" value="6"/>
     <Numeric name="StartCopyNo" value="0"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+[DeltaX_ServiceModule])*cm, 2.155*cm, -0.178*cm </Vector> <!-- y = 55.86-0.5*4.31 / 55.86=79*cos45° -->
-    <Numeric name="Theta" value="90.*deg"/> <!-- translation along y -->
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+[DeltaX_ServiceModule])*cm, 2.155*cm, -0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront"/>
-    <String name="ChildName" value="etl:SensorModule_r"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back"/>
+    <String name="ChildName" value="etl:SensorModule_r_2"/>
     <Numeric name="N" value="10"/>
     <Numeric name="StartCopyNo" value="0"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+[DeltaX_ServiceModule]+[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+[DeltaX_ServiceModule]+[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="2"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="1"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+2*[DeltaX_ServiceModule]+[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+2*[DeltaX_ServiceModule]+[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back"/>
     <String name="ChildName" value="etl:SensorModule_r"/>
     <Numeric name="N" value="12"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="6"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+3*[DeltaX_ServiceModule]+[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+3*[DeltaX_ServiceModule]+[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront"/>
-    <String name="ChildName" value="etl:SensorModule_r"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back"/>
+    <String name="ChildName" value="etl:SensorModule_r_2"/>
     <Numeric name="N" value="14"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="10"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+3*[DeltaX_ServiceModule]+2*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+3*[DeltaX_ServiceModule]+2*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="2"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="3"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+4*[DeltaX_ServiceModule]+2*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+4*[DeltaX_ServiceModule]+2*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">  <!-- 1st placement of a short service hybrid -->
-    <rParent name="etl:DiskQuarterFront"/>
+  <Algorithm name="global:DDMTDLinear">  <!-- 1st placement of a short service hybrid -->
+    <rParent name="etl:DiskQuarter_Back"/>
     <String name="ChildName" value="etl:ServiceHybrid_short"/>
     <Numeric name="N" value="1"/>
     <Numeric name="StartCopyNo" value="0"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+4*[DeltaX_ServiceModule]+2*[SensorModuledx])*cm, (13.055+[ServiceHybrid_Y]+2*[DeltaY]+[DeltaY_ServiceLong_ServiceShort])*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+4*[DeltaX_ServiceModule]+2*[SensorModuledx])*cm, (13.055+[ServiceHybrid_Y]+2*[DeltaY]+[DeltaY_ServiceLong_ServiceShort])*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back"/>
     <String name="ChildName" value="etl:SensorModule_r"/>
     <Numeric name="N" value="15"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="18"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+5*[DeltaX_ServiceModule]+2*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+5*[DeltaX_ServiceModule]+2*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront"/>
-    <String name="ChildName" value="etl:SensorModule_r"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back"/>
+    <String name="ChildName" value="etl:SensorModule_r_2"/>
     <Numeric name="N" value="17"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="24"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+5*[DeltaX_ServiceModule]+3*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+5*[DeltaX_ServiceModule]+3*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="5"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+6*[DeltaX_ServiceModule]+3*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+6*[DeltaX_ServiceModule]+3*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back"/>
     <String name="ChildName" value="etl:SensorModule_r"/>
     <Numeric name="N" value="18"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="33"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+7*[DeltaX_ServiceModule]+3*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+7*[DeltaX_ServiceModule]+3*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront"/>
-    <String name="ChildName" value="etl:SensorModule_r"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back"/>
+    <String name="ChildName" value="etl:SensorModule_r_2"/>
     <Numeric name="N" value="18"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="41"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+7*[DeltaX_ServiceModule]+4*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+7*[DeltaX_ServiceModule]+4*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="8"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+8*[DeltaX_ServiceModule]+4*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+8*[DeltaX_ServiceModule]+4*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back"/>
     <String name="ChildName" value="etl:SensorModule_r"/>
     <Numeric name="N" value="18"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="51"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+9*[DeltaX_ServiceModule]+4*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+9*[DeltaX_ServiceModule]+4*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront"/>
-    <String name="ChildName" value="etl:SensorModule_r"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back"/>
+    <String name="ChildName" value="etl:SensorModule_r_2"/>
     <Numeric name="N" value="21"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="59"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+9*[DeltaX_ServiceModule]+5*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+9*[DeltaX_ServiceModule]+5*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="11"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+10*[DeltaX_ServiceModule]+5*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+10*[DeltaX_ServiceModule]+5*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back"/>
     <String name="ChildName" value="etl:ServiceHybrid_short"/>
     <Numeric name="N" value="1"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="1"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+10*[DeltaX_ServiceModule]+5*[SensorModuledx])*cm, (13.055+2*[ServiceHybrid_Y]+3*[DeltaY]+[DeltaY_ServiceLong_ServiceShort])*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+10*[DeltaX_ServiceModule]+5*[SensorModuledx])*cm, (13.055+2*[ServiceHybrid_Y]+3*[DeltaY]+[DeltaY_ServiceLong_ServiceShort])*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back"/>
     <String name="ChildName" value="etl:SensorModule_r"/>
     <Numeric name="N" value="21"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="69"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+11*[DeltaX_ServiceModule]+5*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+11*[DeltaX_ServiceModule]+5*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront"/>
-    <String name="ChildName" value="etl:SensorModule_r"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back"/>
+    <String name="ChildName" value="etl:SensorModule_r_2"/>
     <Numeric name="N" value="23"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="80"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+11*[DeltaX_ServiceModule]+6*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+11*[DeltaX_ServiceModule]+6*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="4"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="14"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+12*[DeltaX_ServiceModule]+6*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+12*[DeltaX_ServiceModule]+6*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back"/>
     <String name="ChildName" value="etl:SensorModule_r"/>
     <Numeric name="N" value="24"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="90"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+13*[DeltaX_ServiceModule]+6*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+13*[DeltaX_ServiceModule]+6*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront"/>
-    <String name="ChildName" value="etl:SensorModule_r"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back"/>
+    <String name="ChildName" value="etl:SensorModule_r_2"/>
     <Numeric name="N" value="24"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="103"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+13*[DeltaX_ServiceModule]+7*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+13*[DeltaX_ServiceModule]+7*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="4"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="18"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+14*[DeltaX_ServiceModule]+7*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+14*[DeltaX_ServiceModule]+7*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back"/>
     <String name="ChildName" value="etl:SensorModule_r"/>
     <Numeric name="N" value="24"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="114"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+15*[DeltaX_ServiceModule]+7*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+15*[DeltaX_ServiceModule]+7*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront"/>
-    <String name="ChildName" value="etl:SensorModule_r"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back"/>
+    <String name="ChildName" value="etl:SensorModule_r_2"/>
     <Numeric name="N" value="24"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="127"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+15*[DeltaX_ServiceModule]+8*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+15*[DeltaX_ServiceModule]+8*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="4"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="22"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+16*[DeltaX_ServiceModule]+8*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+16*[DeltaX_ServiceModule]+8*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back"/>
     <String name="ChildName" value="etl:SensorModule_r"/>
     <Numeric name="N" value="24"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="138"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+17*[DeltaX_ServiceModule]+8*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+17*[DeltaX_ServiceModule]+8*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront"/>
-    <String name="ChildName" value="etl:SensorModule_r"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back"/>
+    <String name="ChildName" value="etl:SensorModule_r_2"/>
     <Numeric name="N" value="27"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="151"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+17*[DeltaX_ServiceModule]+9*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+17*[DeltaX_ServiceModule]+9*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back"/>
     <String name="ChildName" value="etl:ServiceHybrid_short"/>
     <Numeric name="N" value="1"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="2"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+18*[DeltaX_ServiceModule]+9*[SensorModuledx])*cm, 6.5275*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+18*[DeltaX_ServiceModule]+9*[SensorModuledx])*cm, 6.5275*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="4"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="26"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+18*[DeltaX_ServiceModule]+9*[SensorModuledx])*cm, (6.5275+[DeltaY_ServiceLong_ServiceShort]+[DeltaY])*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+18*[DeltaX_ServiceModule]+9*[SensorModuledx])*cm, (6.5275+[DeltaY_ServiceLong_ServiceShort]+[DeltaY])*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back"/>
     <String name="ChildName" value="etl:SensorModule_r"/>
     <Numeric name="N" value="27"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="162"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+19*[DeltaX_ServiceModule]+9*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+19*[DeltaX_ServiceModule]+9*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront"/>
-    <String name="ChildName" value="etl:SensorModule_r"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back"/>
+    <String name="ChildName" value="etl:SensorModule_r_2"/>
     <Numeric name="N" value="27"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="178"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+19*[DeltaX_ServiceModule]+10*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+19*[DeltaX_ServiceModule]+10*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back"/>
     <String name="ChildName" value="etl:ServiceHybrid_short"/>
     <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="3"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+20*[DeltaX_ServiceModule]+10*[SensorModuledx])*cm, 6.5275*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+20*[DeltaX_ServiceModule]+10*[SensorModuledx])*cm, 6.5275*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="30"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+20*[DeltaX_ServiceModule]+10*[SensorModuledx])*cm, (6.5275+2*[ServiceHybrid_Y_short]+[DeltaY_ServiceLong_ServiceShort]+3*[DeltaY])*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+20*[DeltaX_ServiceModule]+10*[SensorModuledx])*cm, (6.5275+2*[ServiceHybrid_Y_short]+[DeltaY_ServiceLong_ServiceShort]+3*[DeltaY])*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back"/>
     <String name="ChildName" value="etl:SensorModule_r"/>
     <Numeric name="N" value="27"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="189"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+21*[DeltaX_ServiceModule]+10*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+21*[DeltaX_ServiceModule]+10*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront"/>
-    <String name="ChildName" value="etl:SensorModule_r"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back"/>
+    <String name="ChildName" value="etl:SensorModule_r_2"/>
     <Numeric name="N" value="24"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="205"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+21*[DeltaX_ServiceModule]+11*[SensorModuledx])*cm, (2.155+4*[SensorModuledy]+4*[DeltaY])*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+21*[DeltaX_ServiceModule]+11*[SensorModuledx])*cm, (2.155+4*[SensorModuledy]+4*[DeltaY])*cm, -0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back"/>
     <String name="ChildName" value="etl:ServiceHybrid_short"/>
     <Numeric name="N" value="2"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="6"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+22*[DeltaX_ServiceModule]+11*[SensorModuledx])*cm, (2.155+5*[SensorModuledy]+5*[DeltaY])*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+22*[DeltaX_ServiceModule]+11*[SensorModuledx])*cm, (2.155+5*[SensorModuledy]+5*[DeltaY])*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="33"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+22*[DeltaX_ServiceModule]+11*[SensorModuledx])*cm, (2.155+5*[SensorModuledy]+5*[DeltaY]+[ServiceHybrid_Y_short]+[DeltaY_ServiceLong_ServiceShort]+2*[DeltaY])*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+22*[DeltaX_ServiceModule]+11*[SensorModuledx])*cm, (2.155+5*[SensorModuledy]+5*[DeltaY]+[ServiceHybrid_Y_short]+[DeltaY_ServiceLong_ServiceShort]+2*[DeltaY])*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back"/>
     <String name="ChildName" value="etl:SensorModule_r"/>
     <Numeric name="N" value="23"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="216"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+23*[DeltaX_ServiceModule]+11*[SensorModuledx])*cm, (2.155+5*[SensorModuledy]+5*[DeltaY])*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+23*[DeltaX_ServiceModule]+11*[SensorModuledx])*cm, (2.155+5*[SensorModuledy]+5*[DeltaY])*cm, -0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront"/>
-    <String name="ChildName" value="etl:SensorModule_r"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back"/>
+    <String name="ChildName" value="etl:SensorModule_r_2"/>
     <Numeric name="N" value="21"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="229"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+23*[DeltaX_ServiceModule]+12*[SensorModuledx])*cm, (2.155+6*[SensorModuledy]+6*[DeltaY])*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+23*[DeltaX_ServiceModule]+12*[SensorModuledx])*cm, (2.155+6*[SensorModuledy]+6*[DeltaY])*cm, -0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back"/>
     <String name="ChildName" value="etl:ServiceHybrid_short"/>
     <Numeric name="N" value="1"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="8"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+24*[DeltaX_ServiceModule]+12*[SensorModuledx])*cm, (2.155+7*[SensorModuledy]+7*[DeltaY])*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+24*[DeltaX_ServiceModule]+12*[SensorModuledx])*cm, (2.155+7*[SensorModuledy]+7*[DeltaY])*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="36"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+24*[DeltaX_ServiceModule]+12*[SensorModuledx])*cm, (2.155+7*[SensorModuledy]+7*[DeltaY]+[DeltaY_ServiceLong_ServiceShort]+[DeltaY])*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+24*[DeltaX_ServiceModule]+12*[SensorModuledx])*cm, (2.155+7*[SensorModuledy]+7*[DeltaY]+[DeltaY_ServiceLong_ServiceShort]+[DeltaY])*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back"/>
     <String name="ChildName" value="etl:SensorModule_r"/>
     <Numeric name="N" value="20"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="239"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+25*[DeltaX_ServiceModule]+12*[SensorModuledx])*cm, (2.155+7*[SensorModuledy]+7*[DeltaY])*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+25*[DeltaX_ServiceModule]+12*[SensorModuledx])*cm, (2.155+7*[SensorModuledy]+7*[DeltaY])*cm, -0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront"/>
-    <String name="ChildName" value="etl:SensorModule_r"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back"/>
+    <String name="ChildName" value="etl:SensorModule_r_2"/>
     <Numeric name="N" value="21"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="250"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+25*[DeltaX_ServiceModule]+13*[SensorModuledx])*cm, (2.155+7*[SensorModuledy]+7*[DeltaY])*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+25*[DeltaX_ServiceModule]+13*[SensorModuledx])*cm, (2.155+7*[SensorModuledy]+7*[DeltaY])*cm, -0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back"/>
     <String name="ChildName" value="etl:ServiceHybrid_short"/>
     <Numeric name="N" value="1"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="9"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+26*[DeltaX_ServiceModule]+13*[SensorModuledx])*cm, (2.155+8*[SensorModuledy]+8*[DeltaY])*cm, 0*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+26*[DeltaX_ServiceModule]+13*[SensorModuledx])*cm, (2.155+8*[SensorModuledy]+8*[DeltaY])*cm, 0*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="39"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+26*[DeltaX_ServiceModule]+13*[SensorModuledx])*cm, (2.155+8*[SensorModuledy]+8*[DeltaY]+[DeltaY_ServiceLong_ServiceShort]+[DeltaY])*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+26*[DeltaX_ServiceModule]+13*[SensorModuledx])*cm, (2.155+8*[SensorModuledy]+8*[DeltaY]+[DeltaY_ServiceLong_ServiceShort]+[DeltaY])*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back"/>
     <String name="ChildName" value="etl:SensorModule_r"/>
     <Numeric name="N" value="20"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="259"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+27*[DeltaX_ServiceModule]+13*[SensorModuledx])*cm, (2.155+8*[SensorModuledy]+8*[DeltaY])*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+27*[DeltaX_ServiceModule]+13*[SensorModuledx])*cm, (2.155+8*[SensorModuledy]+8*[DeltaY])*cm, -0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront"/>
-    <String name="ChildName" value="etl:SensorModule_r"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back"/>
+    <String name="ChildName" value="etl:SensorModule_r_2"/>
     <Numeric name="N" value="21"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="271"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+27*[DeltaX_ServiceModule]+14*[SensorModuledx])*cm, (2.155+8*[SensorModuledy]+8*[DeltaY])*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+27*[DeltaX_ServiceModule]+14*[SensorModuledx])*cm, (2.155+8*[SensorModuledy]+8*[DeltaY])*cm, -0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back"/>
     <String name="ChildName" value="etl:ServiceHybrid_short"/>
     <Numeric name="N" value="1"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="10"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+28*[DeltaX_ServiceModule]+14*[SensorModuledx])*cm, (2.155+9*[SensorModuledy]+9*[DeltaY])*cm, 0*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+28*[DeltaX_ServiceModule]+14*[SensorModuledx])*cm, (2.155+9*[SensorModuledy]+9*[DeltaY])*cm, 0*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="42"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+28*[DeltaX_ServiceModule]+14*[SensorModuledx])*cm, (2.155+9*[SensorModuledy]+9*[DeltaY]+[DeltaY_ServiceLong_ServiceShort]+[DeltaY])*cm, 0*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+28*[DeltaX_ServiceModule]+14*[SensorModuledx])*cm, (2.155+9*[SensorModuledy]+9*[DeltaY]+[DeltaY_ServiceLong_ServiceShort]+[DeltaY])*cm, 0*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
 
 
-  <!-- Quarter on back face of Disk1 -->
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack"/>
-    <String name="ChildName" value="etl:SensorModule"/>
+  <!-- Disk1 Front face -->
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front"/>
+    <String name="ChildName" value="etl:SensorModule_2"/>
     <Numeric name="N" value="7"/>
     <Numeric name="StartCopyNo" value="0"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> -122*cm, 2.155*cm, 0.178*cm </Vector> <!-- 55.86=79*cos45° -->
+    <Vector  name="Base" type="numeric" nEntries="3"> -122.12*cm, 2.155*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="1"/>
     <Numeric name="StartCopyNo" value="0"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122+[DeltaX_ServiceModule])*cm, 13.055*cm, 0.*cm </Vector> <!-- x,y,z alway wrt center of the volume / x-value = 1st x position in which you can place the center of the hybrid without going out of the disk. y = 55.86-0.5*26.11 -->
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.12+[DeltaX_ServiceModule])*cm, 13.055*cm, 0.*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:ServiceHybrid_short"/>
     <Numeric name="N" value="1"/>
     <Numeric name="StartCopyNo" value="0"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122+[DeltaX_ServiceModule])*cm, (13.055+[DeltaY_ServiceLong_ServiceShort]+[DeltaY])*cm, 0*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.12+[DeltaX_ServiceModule])*cm, (13.055+[DeltaY_ServiceLong_ServiceShort]+[DeltaY])*cm, 0*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="9"/>
     <Numeric name="StartCopyNo" value="0"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (-122+2*[DeltaX_ServiceModule])*cm, 2.155*cm, 0.178*cm </Vector> <!-- 55.86=79*cos45° -->
+    <Vector  name="Base" type="numeric" nEntries="3">  (-122.12+2*[DeltaX_ServiceModule])*cm, 2.155*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack"/>
-    <String name="ChildName" value="etl:SensorModule"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front"/>
+    <String name="ChildName" value="etl:SensorModule_2"/>
     <Numeric name="N" value="12"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="7"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (-122+2*[DeltaX_ServiceModule]+[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> <!-- 55.86=79*cos45° -->
+    <Vector  name="Base" type="numeric" nEntries="3">  (-122.12+2*[DeltaX_ServiceModule]+[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="2"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="1"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.7+3*[DeltaX_ServiceModule]+[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.12+3*[DeltaX_ServiceModule]+[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="12"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="9"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (-122+4*[DeltaX_ServiceModule]+[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (-122.12+4*[DeltaX_ServiceModule]+[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack"/>
-    <String name="ChildName" value="etl:SensorModule"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front"/>
+    <String name="ChildName" value="etl:SensorModule_2"/>
     <Numeric name="N" value="15"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="19"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (-122+4*[DeltaX_ServiceModule]+2*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (-122.12+4*[DeltaX_ServiceModule]+2*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="2"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="3"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122+5*[DeltaX_ServiceModule]+2*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.12+5*[DeltaX_ServiceModule]+2*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:ServiceHybrid_short"/>
     <Numeric name="N" value="1"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="1"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122+5*[DeltaX_ServiceModule]+2*[SensorModuledx])*cm, (13.055+[ServiceHybrid_Y]+[DeltaY_ServiceLong_ServiceShort]+2*[DeltaY])*cm, 0*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.12+5*[DeltaX_ServiceModule]+2*[SensorModuledx])*cm, (13.055+[ServiceHybrid_Y]+[DeltaY_ServiceLong_ServiceShort]+2*[DeltaY])*cm, 0*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="15"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="21"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (-122+6*[DeltaX_ServiceModule]+2*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (-122.12+6*[DeltaX_ServiceModule]+2*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack"/>
-    <String name="ChildName" value="etl:SensorModule"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front"/>
+    <String name="ChildName" value="etl:SensorModule_2"/>
     <Numeric name="N" value="18"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="34"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (-122+6*[DeltaX_ServiceModule]+3*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (-122.12+6*[DeltaX_ServiceModule]+3*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="5"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122+7*[DeltaX_ServiceModule]+3*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.12+7*[DeltaX_ServiceModule]+3*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="18"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="36"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (-122+8*[DeltaX_ServiceModule]+3*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (-122.12+8*[DeltaX_ServiceModule]+3*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack"/>
-    <String name="ChildName" value="etl:SensorModule"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front"/>
+    <String name="ChildName" value="etl:SensorModule_2"/>
     <Numeric name="N" value="21"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="52"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (-122+8*[DeltaX_ServiceModule]+4*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (-122.12+8*[DeltaX_ServiceModule]+4*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="8"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122+9*[DeltaX_ServiceModule]+4*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.12+9*[DeltaX_ServiceModule]+4*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:ServiceHybrid_short"/>
     <Numeric name="N" value="1"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="2"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122+9*[DeltaX_ServiceModule]+4*[SensorModuledx])*cm, (13.055+2*[ServiceHybrid_Y]+[DeltaY_ServiceLong_ServiceShort]+3*[DeltaY])*cm, 0*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.12+9*[DeltaX_ServiceModule]+4*[SensorModuledx])*cm, (13.055+2*[ServiceHybrid_Y]+[DeltaY_ServiceLong_ServiceShort]+3*[DeltaY])*cm, 0*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="21"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="54"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (-122+10*[DeltaX_ServiceModule]+4*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (-122.12+10*[DeltaX_ServiceModule]+4*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack"/>
-    <String name="ChildName" value="etl:SensorModule"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front"/>
+    <String name="ChildName" value="etl:SensorModule_2"/>
     <Numeric name="N" value="21"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="73"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (-122+10*[DeltaX_ServiceModule]+5*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (-122.12+10*[DeltaX_ServiceModule]+5*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="11"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122+11*[DeltaX_ServiceModule]+5*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.12+11*[DeltaX_ServiceModule]+5*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:ServiceHybrid_short"/>
     <Numeric name="N" value="1"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="3"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122+11*[DeltaX_ServiceModule]+5*[SensorModuledx])*cm, (13.055+2*[ServiceHybrid_Y]+[DeltaY_ServiceLong_ServiceShort]+3*[DeltaY])*cm, 0*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.12+11*[DeltaX_ServiceModule]+5*[SensorModuledx])*cm, (13.055+2*[ServiceHybrid_Y]+[DeltaY_ServiceLong_ServiceShort]+3*[DeltaY])*cm, 0*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="21"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="75"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (-122+12*[DeltaX_ServiceModule]+5*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (-122.12+12*[DeltaX_ServiceModule]+5*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack"/>
-    <String name="ChildName" value="etl:SensorModule"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front"/>
+    <String name="ChildName" value="etl:SensorModule_2"/>
     <Numeric name="N" value="24"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="94"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (-122+12*[DeltaX_ServiceModule]+6*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (-122.12+12*[DeltaX_ServiceModule]+6*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="4"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="14"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122+13*[DeltaX_ServiceModule]+6*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.12+13*[DeltaX_ServiceModule]+6*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="24"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="96"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (-122+14*[DeltaX_ServiceModule]+6*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (-122.12+14*[DeltaX_ServiceModule]+6*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack"/>
-    <String name="ChildName" value="etl:SensorModule"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front"/>
+    <String name="ChildName" value="etl:SensorModule_2"/>
     <Numeric name="N" value="24"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="118"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (-122+14*[DeltaX_ServiceModule]+7*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (-122.12+14*[DeltaX_ServiceModule]+7*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="4"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="18"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122+15*[DeltaX_ServiceModule]+7*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.12+15*[DeltaX_ServiceModule]+7*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="24"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="120"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (-122+16*[DeltaX_ServiceModule]+7*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (-122.12+16*[DeltaX_ServiceModule]+7*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack"/>
-    <String name="ChildName" value="etl:SensorModule"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front"/>
+    <String name="ChildName" value="etl:SensorModule_2"/>
     <Numeric name="N" value="24"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="142"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (-122+16*[DeltaX_ServiceModule]+8*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (-122.12+16*[DeltaX_ServiceModule]+8*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="4"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="22"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122+17*[DeltaX_ServiceModule]+8*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.12+17*[DeltaX_ServiceModule]+8*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="24"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="144"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (-122+18*[DeltaX_ServiceModule]+8*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (-122.12+18*[DeltaX_ServiceModule]+8*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack"/>
-    <String name="ChildName" value="etl:SensorModule"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front"/>
+    <String name="ChildName" value="etl:SensorModule_2"/>
     <Numeric name="N" value="27"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="166"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (-122+18*[DeltaX_ServiceModule]+9*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (-122.12+18*[DeltaX_ServiceModule]+9*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:ServiceHybrid_short"/>
     <Numeric name="N" value="1"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="4"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122+19*[DeltaX_ServiceModule]+9*[SensorModuledx])*cm, 6.5275*cm, 0*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.12+19*[DeltaX_ServiceModule]+9*[SensorModuledx])*cm, 6.5275*cm, 0*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="4"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="26"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122+19*[DeltaX_ServiceModule]+9*[SensorModuledx])*cm, (6.5275+[DeltaY_ServiceLong_ServiceShort]+[DeltaY])*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.12+19*[DeltaX_ServiceModule]+9*[SensorModuledx])*cm, (6.5275+[DeltaY_ServiceLong_ServiceShort]+[DeltaY])*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="27"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="168"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (-122+20*[DeltaX_ServiceModule]+9*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (-122.12+20*[DeltaX_ServiceModule]+9*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack"/>
-    <String name="ChildName" value="etl:SensorModule"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front"/>
+    <String name="ChildName" value="etl:SensorModule_2"/>
     <Numeric name="N" value="27"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="193"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (-122+20*[DeltaX_ServiceModule]+10*[SensorModuledx])*cm, (2.155+[SensorModuledy]+[DeltaY])*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (-122.12+20*[DeltaX_ServiceModule]+10*[SensorModuledx])*cm, (2.155+[SensorModuledy]+[DeltaY])*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:ServiceHybrid_short"/>
     <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="5"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122+21*[DeltaX_ServiceModule]+10*[SensorModuledx])*cm, (2.155+2*[SensorModuledy]+2*[DeltaY])*cm, 0*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.12+21*[DeltaX_ServiceModule]+10*[SensorModuledx])*cm, (2.155+2*[SensorModuledy]+2*[DeltaY])*cm, 0*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="30"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122+21*[DeltaX_ServiceModule]+10*[SensorModuledx])*cm, (2.155+2*[SensorModuledy]+2*[DeltaY]+2*[ServiceHybrid_Y_short]+[DeltaY_ServiceLong_ServiceShort]+3*[DeltaY])*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.12+21*[DeltaX_ServiceModule]+10*[SensorModuledx])*cm, (2.155+2*[SensorModuledy]+2*[DeltaY]+2*[ServiceHybrid_Y_short]+[DeltaY_ServiceLong_ServiceShort]+3*[DeltaY])*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="24"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="195"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (-122+22*[DeltaX_ServiceModule]+10*[SensorModuledx])*cm, ( 2.155+4*[SensorModuledy]+4*[DeltaY])*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (-122.12+22*[DeltaX_ServiceModule]+10*[SensorModuledx])*cm, ( 2.155+4*[SensorModuledy]+4*[DeltaY])*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack"/>
-    <String name="ChildName" value="etl:SensorModule"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front"/>
+    <String name="ChildName" value="etl:SensorModule_2"/>
     <Numeric name="N" value="21"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="220"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (-122+22*[DeltaX_ServiceModule]+11*[SensorModuledx])*cm, ( 2.155+6*[SensorModuledy]+6*[DeltaY])*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (-122.12+22*[DeltaX_ServiceModule]+11*[SensorModuledx])*cm, ( 2.155+6*[SensorModuledy]+6*[DeltaY])*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:ServiceHybrid_short"/>
     <Numeric name="N" value="1"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="8"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122+23*[DeltaX_ServiceModule]+11*[SensorModuledx])*cm, (2.155+7*[SensorModuledy]+7*[DeltaY])*cm, 0*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.12+23*[DeltaX_ServiceModule]+11*[SensorModuledx])*cm, (2.155+7*[SensorModuledy]+7*[DeltaY])*cm, 0*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="33"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122+23*[DeltaX_ServiceModule]+11*[SensorModuledx])*cm, (2.155+7*[SensorModuledy]+8*[DeltaY]+[DeltaY_ServiceLong_ServiceShort])*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.12+23*[DeltaX_ServiceModule]+11*[SensorModuledx])*cm, (2.155+7*[SensorModuledy]+8*[DeltaY]+[DeltaY_ServiceLong_ServiceShort])*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="21"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="219"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (-122+24*[DeltaX_ServiceModule]+11*[SensorModuledx])*cm, ( 2.155+6*[SensorModuledy]+6*[DeltaY])*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (-122.12+24*[DeltaX_ServiceModule]+11*[SensorModuledx])*cm, ( 2.155+6*[SensorModuledy]+6*[DeltaY])*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack"/>
-    <String name="ChildName" value="etl:SensorModule"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front"/>
+    <String name="ChildName" value="etl:SensorModule_2"/>
     <Numeric name="N" value="21"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="241"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (-122+24*[DeltaX_ServiceModule]+12*[SensorModuledx])*cm, ( 2.155+7*[SensorModuledy]+7*[DeltaY])*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (-122.12+24*[DeltaX_ServiceModule]+12*[SensorModuledx])*cm, ( 2.155+7*[SensorModuledy]+7*[DeltaY])*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:ServiceHybrid_short"/>
     <Numeric name="N" value="1"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="9"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122+25*[DeltaX_ServiceModule]+12*[SensorModuledx])*cm, (2.155+8*[SensorModuledy]+8*[DeltaY])*cm, 0*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.12+25*[DeltaX_ServiceModule]+12*[SensorModuledx])*cm, (2.155+8*[SensorModuledy]+8*[DeltaY])*cm, 0*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="36"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122+25*[DeltaX_ServiceModule]+12*[SensorModuledx])*cm, (2.155+8*[SensorModuledy]+9*[DeltaY]+[DeltaY_ServiceLong_ServiceShort])*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.12+25*[DeltaX_ServiceModule]+12*[SensorModuledx])*cm, (2.155+8*[SensorModuledy]+9*[DeltaY]+[DeltaY_ServiceLong_ServiceShort])*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="21"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="240"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (-122+26*[DeltaX_ServiceModule]+12*[SensorModuledx])*cm, ( 2.155+7*[SensorModuledy]+7*[DeltaY])*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (-122.12+26*[DeltaX_ServiceModule]+12*[SensorModuledx])*cm, ( 2.155+7*[SensorModuledy]+7*[DeltaY])*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack"/>
-    <String name="ChildName" value="etl:SensorModule"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front"/>
+    <String name="ChildName" value="etl:SensorModule_2"/>
     <Numeric name="N" value="21"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="241"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (-122+26*[DeltaX_ServiceModule]+13*[SensorModuledx])*cm, ( 2.155+8*[SensorModuledy]+8*[DeltaY])*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (-122.12+26*[DeltaX_ServiceModule]+13*[SensorModuledx])*cm, ( 2.155+8*[SensorModuledy]+8*[DeltaY])*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:ServiceHybrid_short"/>
     <Numeric name="N" value="1"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="10"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122+27*[DeltaX_ServiceModule]+13*[SensorModuledx])*cm, (2.155+9*[SensorModuledy]+9*[DeltaY])*cm, 0*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.12+27*[DeltaX_ServiceModule]+13*[SensorModuledx])*cm, (2.155+9*[SensorModuledy]+9*[DeltaY])*cm, 0*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="39"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122+27*[DeltaX_ServiceModule]+13*[SensorModuledx])*cm, (2.155+9*[SensorModuledy]+10*[DeltaY]+[DeltaY_ServiceLong_ServiceShort])*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-122.12+27*[DeltaX_ServiceModule]+13*[SensorModuledx])*cm, (2.155+9*[SensorModuledy]+10*[DeltaY]+[DeltaY_ServiceLong_ServiceShort])*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="21"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="261"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (-122+28*[DeltaX_ServiceModule]+13*[SensorModuledx])*cm, ( 2.155+8*[SensorModuledy]+8*[DeltaY])*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (-122.12+28*[DeltaX_ServiceModule]+13*[SensorModuledx])*cm, ( 2.155+8*[SensorModuledy]+8*[DeltaY])*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
 
 
-  <!-- Disk 2 -->
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid_back"/>
+  <!-- Disk2 -->
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="1"/>
     <Numeric name="StartCopyNo" value="0"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> -13.055*cm, 122.7*cm, 0.*cm </Vector> <!-- x,y,z alway wrt center of the volume / x-value = 1st x position in which you can place the center of the hybrid without going out of the disk. y = 55.86-0.5*26.11 -->
+    <Vector  name="Base" type="numeric" nEntries="3"> 122.0875*cm, 13.055*cm, 0.*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> <!-- translation along y -->
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront_2"/>
-    <String name="ChildName" value="etl:SensorModule_back_r"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back_2"/>
+    <String name="ChildName" value="etl:SensorModule_r_2"/>
     <Numeric name="N" value="6"/>
     <Numeric name="StartCopyNo" value="0"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> -2.155*cm, (122.7-[DeltaX_ServiceModule])*cm, -0.178*cm </Vector> <!-- y = 55.86-0.5*4.31 / 55.86=79*cos45° -->
-    <Numeric name="Theta" value="90.*deg"/> <!-- translation along y -->
-    <Numeric name="Phi" value="180.*deg"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-[DeltaX_ServiceModule])*cm, 2.155*cm, -0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront_2"/>
-    <String name="ChildName" value="etl:SensorModule_back_r"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back_2"/>
+    <String name="ChildName" value="etl:SensorModule_r"/>
     <Numeric name="N" value="10"/>
     <Numeric name="StartCopyNo" value="0"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> -2.155*cm, (122.7-[DeltaX_ServiceModule]-[SensorModuledx])*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-[DeltaX_ServiceModule]-[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid_back"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="2"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="1"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> -13.055*cm, (122.7-2*[DeltaX_ServiceModule]-[SensorModuledx])*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-2*[DeltaX_ServiceModule]-[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront_2"/>
-    <String name="ChildName" value="etl:SensorModule_back_r"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back_2"/>
+    <String name="ChildName" value="etl:SensorModule_r_2"/>
     <Numeric name="N" value="12"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="6"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> -2.155*cm, (122.7-3*[DeltaX_ServiceModule]-[SensorModuledx])*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-3*[DeltaX_ServiceModule]-[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront_2"/>
-    <String name="ChildName" value="etl:SensorModule_back_r"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back_2"/>
+    <String name="ChildName" value="etl:SensorModule_r"/>
     <Numeric name="N" value="14"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="10"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> -2.155*cm, (122.7-3*[DeltaX_ServiceModule]-2*[SensorModuledx])*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-3*[DeltaX_ServiceModule]-2*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid_back"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="2"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="3"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> -13.055*cm, (122.7-4*[DeltaX_ServiceModule]-2*[SensorModuledx])*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-4*[DeltaX_ServiceModule]-2*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">  <!-- 1st placement of a short service hybrid -->
-    <rParent name="etl:DiskQuarterFront_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid_short_back"/>
+  <Algorithm name="global:DDMTDLinear">  <!-- 1st placement of a short service hybrid -->
+    <rParent name="etl:DiskQuarter_Back_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid_short"/>
     <Numeric name="N" value="1"/>
     <Numeric name="StartCopyNo" value="0"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> -(13.055+[ServiceHybrid_Y]+2*[DeltaY]+[DeltaY_ServiceLong_ServiceShort])*cm, (122.7-4*[DeltaX_ServiceModule]-2*[SensorModuledx])*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-4*[DeltaX_ServiceModule]-2*[SensorModuledx])*cm, (13.055+[ServiceHybrid_Y]+2*[DeltaY]+[DeltaY_ServiceLong_ServiceShort])*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront_2"/>
-    <String name="ChildName" value="etl:SensorModule_back_r"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back_2"/>
+    <String name="ChildName" value="etl:SensorModule_r_2"/>
     <Numeric name="N" value="15"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="18"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> -2.155*cm, (122.7-5*[DeltaX_ServiceModule]-2*[SensorModuledx])*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-5*[DeltaX_ServiceModule]-2*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront_2"/>
-    <String name="ChildName" value="etl:SensorModule_back_r"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back_2"/>
+    <String name="ChildName" value="etl:SensorModule_r"/>
     <Numeric name="N" value="17"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="24"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> -2.155*cm, (122.7-5*[DeltaX_ServiceModule]-3*[SensorModuledx])*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-5*[DeltaX_ServiceModule]-3*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid_back"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="5"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> -13.055*cm, (122.7-6*[DeltaX_ServiceModule]-3*[SensorModuledx])*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-6*[DeltaX_ServiceModule]-3*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront_2"/>
-    <String name="ChildName" value="etl:SensorModule_back_r"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back_2"/>
+    <String name="ChildName" value="etl:SensorModule_r_2"/>
     <Numeric name="N" value="18"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="33"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> -2.155*cm, (122.7-7*[DeltaX_ServiceModule]-3*[SensorModuledx])*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-7*[DeltaX_ServiceModule]-3*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront_2"/>
-    <String name="ChildName" value="etl:SensorModule_back_r"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back_2"/>
+    <String name="ChildName" value="etl:SensorModule_r"/>
     <Numeric name="N" value="18"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="41"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> -2.155*cm, (122.7-7*[DeltaX_ServiceModule]-4*[SensorModuledx])*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-7*[DeltaX_ServiceModule]-4*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid_back"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="8"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> -13.055*cm, (122.7-8*[DeltaX_ServiceModule]-4*[SensorModuledx])*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-8*[DeltaX_ServiceModule]-4*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront_2"/>
-    <String name="ChildName" value="etl:SensorModule_back_r"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back_2"/>
+    <String name="ChildName" value="etl:SensorModule_r_2"/>
     <Numeric name="N" value="18"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="51"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> -2.155*cm, (122.7-9*[DeltaX_ServiceModule]-4*[SensorModuledx])*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-9*[DeltaX_ServiceModule]-4*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront_2"/>
-    <String name="ChildName" value="etl:SensorModule_back_r"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back_2"/>
+    <String name="ChildName" value="etl:SensorModule_r"/>
     <Numeric name="N" value="21"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="59"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> -2.155*cm, (122.7-9*[DeltaX_ServiceModule]-5*[SensorModuledx])*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-9*[DeltaX_ServiceModule]-5*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid_back"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="11"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> -13.055*cm, (122.7-10*[DeltaX_ServiceModule]-5*[SensorModuledx])*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-10*[DeltaX_ServiceModule]-5*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid_short_back"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid_short"/>
     <Numeric name="N" value="1"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="1"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> -(13.055+2*[ServiceHybrid_Y]+3*[DeltaY]+[DeltaY_ServiceLong_ServiceShort])*cm, (122.7-10*[DeltaX_ServiceModule]-5*[SensorModuledx])*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-10*[DeltaX_ServiceModule]-5*[SensorModuledx])*cm, (13.055+2*[ServiceHybrid_Y]+3*[DeltaY]+[DeltaY_ServiceLong_ServiceShort])*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront_2"/>
-    <String name="ChildName" value="etl:SensorModule_back_r"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back_2"/>
+    <String name="ChildName" value="etl:SensorModule_r_2"/>
     <Numeric name="N" value="21"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="69"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> -2.155*cm, (122.7-11*[DeltaX_ServiceModule]-5*[SensorModuledx])*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-11*[DeltaX_ServiceModule]-5*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront_2"/>
-    <String name="ChildName" value="etl:SensorModule_back_r"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back_2"/>
+    <String name="ChildName" value="etl:SensorModule_r"/>
     <Numeric name="N" value="23"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="80"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> -2.155*cm, (122.7-11*[DeltaX_ServiceModule]-6*[SensorModuledx])*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-11*[DeltaX_ServiceModule]-6*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid_back"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="4"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="14"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> -13.055*cm, (122.7-12*[DeltaX_ServiceModule]-6*[SensorModuledx])*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-12*[DeltaX_ServiceModule]-6*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront_2"/>
-    <String name="ChildName" value="etl:SensorModule_back_r"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back_2"/>
+    <String name="ChildName" value="etl:SensorModule_r_2"/>
     <Numeric name="N" value="24"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="90"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> -2.155*cm, (122.7-13*[DeltaX_ServiceModule]-6*[SensorModuledx])*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-13*[DeltaX_ServiceModule]-6*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront_2"/>
-    <String name="ChildName" value="etl:SensorModule_back_r"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back_2"/>
+    <String name="ChildName" value="etl:SensorModule_r"/>
     <Numeric name="N" value="24"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="103"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> -2.155*cm, (122.7-13*[DeltaX_ServiceModule]-7*[SensorModuledx])*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-13*[DeltaX_ServiceModule]-7*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid_back"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="4"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="18"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> -13.055*cm, (122.7-14*[DeltaX_ServiceModule]-7*[SensorModuledx])*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-14*[DeltaX_ServiceModule]-7*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront_2"/>
-    <String name="ChildName" value="etl:SensorModule_back_r"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back_2"/>
+    <String name="ChildName" value="etl:SensorModule_r_2"/>
     <Numeric name="N" value="24"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="114"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> -2.155*cm, (122.7-15*[DeltaX_ServiceModule]-7*[SensorModuledx])*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-15*[DeltaX_ServiceModule]-7*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront_2"/>
-    <String name="ChildName" value="etl:SensorModule_back_r"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back_2"/>
+    <String name="ChildName" value="etl:SensorModule_r"/>
     <Numeric name="N" value="24"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="127"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> -2.155*cm, (122.7-15*[DeltaX_ServiceModule]-8*[SensorModuledx])*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-15*[DeltaX_ServiceModule]-8*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid_back"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="4"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="22"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> -13.055*cm, (122.7-16*[DeltaX_ServiceModule]-8*[SensorModuledx])*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-16*[DeltaX_ServiceModule]-8*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront_2"/>
-    <String name="ChildName" value="etl:SensorModule_back_r"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back_2"/>
+    <String name="ChildName" value="etl:SensorModule_r_2"/>
     <Numeric name="N" value="24"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="138"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> -2.155*cm, (122.7-17*[DeltaX_ServiceModule]-8*[SensorModuledx])*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-17*[DeltaX_ServiceModule]-8*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront_2"/>
-    <String name="ChildName" value="etl:SensorModule_back_r"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back_2"/>
+    <String name="ChildName" value="etl:SensorModule_r"/>
     <Numeric name="N" value="27"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="151"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> -2.155*cm, (122.7-17*[DeltaX_ServiceModule]-9*[SensorModuledx])*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-17*[DeltaX_ServiceModule]-9*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid_short_back"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid_short"/>
     <Numeric name="N" value="1"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="2"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> -6.5275*cm, (122.7-18*[DeltaX_ServiceModule]-9*[SensorModuledx])*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-18*[DeltaX_ServiceModule]-9*[SensorModuledx])*cm, 6.5275*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid_back"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="4"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="26"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> -(6.5275+[DeltaY_ServiceLong_ServiceShort]+[DeltaY])*cm, (122.7-18*[DeltaX_ServiceModule]-9*[SensorModuledx])*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-18*[DeltaX_ServiceModule]-9*[SensorModuledx])*cm, (6.5275+[DeltaY_ServiceLong_ServiceShort]+[DeltaY])*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront_2"/>
-    <String name="ChildName" value="etl:SensorModule_back_r"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back_2"/>
+    <String name="ChildName" value="etl:SensorModule_r_2"/>
     <Numeric name="N" value="27"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="162"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> -2.155*cm, (122.7-19*[DeltaX_ServiceModule]-9*[SensorModuledx])*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-19*[DeltaX_ServiceModule]-9*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront_2"/>
-    <String name="ChildName" value="etl:SensorModule_back_r"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back_2"/>
+    <String name="ChildName" value="etl:SensorModule_r"/>
     <Numeric name="N" value="27"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="178"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> -2.155*cm, (122.7-19*[DeltaX_ServiceModule]-10*[SensorModuledx])*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-19*[DeltaX_ServiceModule]-10*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid_short_back"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid_short"/>
     <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="3"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> -6.5275*cm, (122.7-20*[DeltaX_ServiceModule]-10*[SensorModuledx])*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-20*[DeltaX_ServiceModule]-10*[SensorModuledx])*cm, 6.5275*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid_back"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="30"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> -(6.5275+2*[ServiceHybrid_Y_short]+[DeltaY_ServiceLong_ServiceShort]+3*[DeltaY])*cm, (122.7-20*[DeltaX_ServiceModule]-10*[SensorModuledx])*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-20*[DeltaX_ServiceModule]-10*[SensorModuledx])*cm, (6.5275+2*[ServiceHybrid_Y_short]+[DeltaY_ServiceLong_ServiceShort]+3*[DeltaY])*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront_2"/>
-    <String name="ChildName" value="etl:SensorModule_back_r"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back_2"/>
+    <String name="ChildName" value="etl:SensorModule_r_2"/>
     <Numeric name="N" value="27"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="189"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> -2.155*cm, (122.7-21*[DeltaX_ServiceModule]-10*[SensorModuledx])*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-21*[DeltaX_ServiceModule]-10*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront_2"/>
-    <String name="ChildName" value="etl:SensorModule_back_r"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back_2"/>
+    <String name="ChildName" value="etl:SensorModule_r"/>
     <Numeric name="N" value="24"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="205"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> -(2.155+4*[SensorModuledy]+4*[DeltaY])*cm, (122.7-21*[DeltaX_ServiceModule]-11*[SensorModuledx])*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-21*[DeltaX_ServiceModule]-11*[SensorModuledx])*cm, (2.155+4*[SensorModuledy]+4*[DeltaY])*cm, -0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid_short_back"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid_short"/>
     <Numeric name="N" value="2"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="6"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> -(2.155+5*[SensorModuledy]+5*[DeltaY])*cm, (122.7-22*[DeltaX_ServiceModule]-11*[SensorModuledx])*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-22*[DeltaX_ServiceModule]-11*[SensorModuledx])*cm, (2.155+5*[SensorModuledy]+5*[DeltaY])*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid_back"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="33"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> -(2.155+5*[SensorModuledy]+5*[DeltaY]+[ServiceHybrid_Y_short]+[DeltaY_ServiceLong_ServiceShort]+2*[DeltaY])*cm, (122.7-22*[DeltaX_ServiceModule]-11*[SensorModuledx])*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-22*[DeltaX_ServiceModule]-11*[SensorModuledx])*cm, (2.155+5*[SensorModuledy]+5*[DeltaY]+[ServiceHybrid_Y_short]+[DeltaY_ServiceLong_ServiceShort]+2*[DeltaY])*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront_2"/>
-    <String name="ChildName" value="etl:SensorModule_back_r"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back_2"/>
+    <String name="ChildName" value="etl:SensorModule_r_2"/>
     <Numeric name="N" value="23"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="216"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> -(2.155+5*[SensorModuledy]+5*[DeltaY])*cm, (122.7-23*[DeltaX_ServiceModule]-11*[SensorModuledx])*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-23*[DeltaX_ServiceModule]-11*[SensorModuledx])*cm, (2.155+5*[SensorModuledy]+5*[DeltaY])*cm, -0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront_2"/>
-    <String name="ChildName" value="etl:SensorModule_back_r"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back_2"/>
+    <String name="ChildName" value="etl:SensorModule_r"/>
     <Numeric name="N" value="21"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="229"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> -(2.155+6*[SensorModuledy]+6*[DeltaY])*cm, (122.7-23*[DeltaX_ServiceModule]-12*[SensorModuledx])*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-23*[DeltaX_ServiceModule]-12*[SensorModuledx])*cm, (2.155+6*[SensorModuledy]+6*[DeltaY])*cm, -0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid_short_back"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid_short"/>
     <Numeric name="N" value="1"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="8"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> -(2.155+7*[SensorModuledy]+7*[DeltaY])*cm, (122.7-24*[DeltaX_ServiceModule]-12*[SensorModuledx])*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-24*[DeltaX_ServiceModule]-12*[SensorModuledx])*cm, (2.155+7*[SensorModuledy]+7*[DeltaY])*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid_back"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="36"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> -(2.155+7*[SensorModuledy]+7*[DeltaY]+[DeltaY_ServiceLong_ServiceShort]+[DeltaY])*cm, (122.7-24*[DeltaX_ServiceModule]-12*[SensorModuledx])*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-24*[DeltaX_ServiceModule]-12*[SensorModuledx])*cm, (2.155+7*[SensorModuledy]+7*[DeltaY]+[DeltaY_ServiceLong_ServiceShort]+[DeltaY])*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront_2"/>
-    <String name="ChildName" value="etl:SensorModule_back_r"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back_2"/>
+    <String name="ChildName" value="etl:SensorModule_r_2"/>
     <Numeric name="N" value="20"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="239"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> -(2.155+7*[SensorModuledy]+7*[DeltaY])*cm, (122.7-25*[DeltaX_ServiceModule]-12*[SensorModuledx])*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-25*[DeltaX_ServiceModule]-12*[SensorModuledx])*cm, (2.155+7*[SensorModuledy]+7*[DeltaY])*cm, -0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront_2"/>
-    <String name="ChildName" value="etl:SensorModule_back_r"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back_2"/>
+    <String name="ChildName" value="etl:SensorModule_r"/>
     <Numeric name="N" value="21"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="250"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> -(2.155+7*[SensorModuledy]+7*[DeltaY])*cm, (122.7-25*[DeltaX_ServiceModule]-13*[SensorModuledx])*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-25*[DeltaX_ServiceModule]-13*[SensorModuledx])*cm, (2.155+7*[SensorModuledy]+7*[DeltaY])*cm, -0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid_short_back"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid_short"/>
     <Numeric name="N" value="1"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="9"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> -(2.155+8*[SensorModuledy]+8*[DeltaY])*cm, (122.7-26*[DeltaX_ServiceModule]-13*[SensorModuledx])*cm, 0*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-26*[DeltaX_ServiceModule]-13*[SensorModuledx])*cm, (2.155+8*[SensorModuledy]+8*[DeltaY])*cm, 0*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid_back"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="39"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> -(2.155+8*[SensorModuledy]+8*[DeltaY]+[DeltaY_ServiceLong_ServiceShort]+[DeltaY])*cm, (122.7-26*[DeltaX_ServiceModule]-13*[SensorModuledx])*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-26*[DeltaX_ServiceModule]-13*[SensorModuledx])*cm, (2.155+8*[SensorModuledy]+8*[DeltaY]+[DeltaY_ServiceLong_ServiceShort]+[DeltaY])*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront_2"/>
-    <String name="ChildName" value="etl:SensorModule_back_r"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back_2"/>
+    <String name="ChildName" value="etl:SensorModule_r_2"/>
     <Numeric name="N" value="20"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="259"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> -(2.155+8*[SensorModuledy]+8*[DeltaY])*cm, (122.7-27*[DeltaX_ServiceModule]-13*[SensorModuledx])*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-27*[DeltaX_ServiceModule]-13*[SensorModuledx])*cm, (2.155+8*[SensorModuledy]+8*[DeltaY])*cm, -0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront_2"/>
-    <String name="ChildName" value="etl:SensorModule_back_r"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back_2"/>
+    <String name="ChildName" value="etl:SensorModule_r"/>
     <Numeric name="N" value="21"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="271"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> -(2.155+8*[SensorModuledy]+8*[DeltaY])*cm, (122.7-27*[DeltaX_ServiceModule]-14*[SensorModuledx])*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-27*[DeltaX_ServiceModule]-14*[SensorModuledx])*cm, (2.155+8*[SensorModuledy]+8*[DeltaY])*cm, -0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid_short_back"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid_short"/>
     <Numeric name="N" value="1"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="10"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> -(2.155+9*[SensorModuledy]+9*[DeltaY])*cm, (122.7-28*[DeltaX_ServiceModule]-14*[SensorModuledx])*cm, 0*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-28*[DeltaX_ServiceModule]-14*[SensorModuledx])*cm, (2.155+9*[SensorModuledy]+9*[DeltaY])*cm, 0*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterFront_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid_back"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Back_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="42"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> -(2.155+9*[SensorModuledy]+9*[DeltaY]+[DeltaY_ServiceLong_ServiceShort]+[DeltaY])*cm, (122.7-28*[DeltaX_ServiceModule]-14*[SensorModuledx])*cm, 0*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-28*[DeltaX_ServiceModule]-14*[SensorModuledx])*cm, (2.155+9*[SensorModuledy]+9*[DeltaY]+[DeltaY_ServiceLong_ServiceShort]+[DeltaY])*cm, 0*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
 
 
-
-  <!-- Quarter on back face -->
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack_2"/>
-    <String name="ChildName" value="etl:SensorModule_back"/>
+  <!-- Disk2 Front face -->
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front_2"/>
+    <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="7"/>
     <Numeric name="StartCopyNo" value="0"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  -2.155*cm, 122*cm, 0.178*cm </Vector> <!-- 55.86=79*cos45° -->
+    <Vector  name="Base" type="numeric" nEntries="3"> 122.12*cm, 2.155*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid_back"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="1"/>
     <Numeric name="StartCopyNo" value="0"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  -13.055*cm, (122-[DeltaX_ServiceModule])*cm, 0.*cm </Vector> <!-- x,y,z alway wrt center of the volume / x-value = 1st x position in which you can place the center of the hybrid without going out of the disk. y = 55.86-0.5*26.11 -->
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.12-[DeltaX_ServiceModule])*cm, 13.055*cm, 0.*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid_short_back"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid_short"/>
     <Numeric name="N" value="1"/>
     <Numeric name="StartCopyNo" value="0"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  -(13.055+[DeltaY_ServiceLong_ServiceShort]+[DeltaY])*cm, (122-[DeltaX_ServiceModule])*cm, 0*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.12-[DeltaX_ServiceModule])*cm, (13.055+[DeltaY_ServiceLong_ServiceShort]+[DeltaY])*cm, 0*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack_2"/>
-    <String name="ChildName" value="etl:SensorModule_back"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front_2"/>
+    <String name="ChildName" value="etl:SensorModule_2"/>
     <Numeric name="N" value="9"/>
     <Numeric name="StartCopyNo" value="0"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">   -2.155*cm, (122-2*[DeltaX_ServiceModule])*cm, 0.178*cm </Vector> <!-- 55.86=79*cos45° -->
+    <Vector  name="Base" type="numeric" nEntries="3">  (122.12-2*[DeltaX_ServiceModule])*cm, 2.155*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack_2"/>
-    <String name="ChildName" value="etl:SensorModule_back"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front_2"/>
+    <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="12"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="7"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">   -2.155*cm, (122-2*[DeltaX_ServiceModule]-[SensorModuledx])*cm, 0.178*cm </Vector> <!-- 55.86=79*cos45° -->
+    <Vector  name="Base" type="numeric" nEntries="3">  (122.12-2*[DeltaX_ServiceModule]-[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid_back"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="2"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="1"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  -13.055*cm, (122-3*[DeltaX_ServiceModule]-[SensorModuledx])*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.12-3*[DeltaX_ServiceModule]-[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack_2"/>
-    <String name="ChildName" value="etl:SensorModule_back"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front_2"/>
+    <String name="ChildName" value="etl:SensorModule_2"/>
     <Numeric name="N" value="12"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="9"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  -2.155*cm, (122-4*[DeltaX_ServiceModule]-[SensorModuledx])*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (122.12-4*[DeltaX_ServiceModule]-[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack_2"/>
-    <String name="ChildName" value="etl:SensorModule_back"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front_2"/>
+    <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="15"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="19"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  -2.155*cm, (122-4*[DeltaX_ServiceModule]-2*[SensorModuledx])*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (122.12-4*[DeltaX_ServiceModule]-2*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid_back"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="2"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="3"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> -13.055*cm, (122-5*[DeltaX_ServiceModule]-2*[SensorModuledx])*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.12-5*[DeltaX_ServiceModule]-2*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid_short_back"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid_short"/>
     <Numeric name="N" value="1"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="1"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> -(13.055+[ServiceHybrid_Y]+[DeltaY_ServiceLong_ServiceShort]+2*[DeltaY])*cm, (122-5*[DeltaX_ServiceModule]-2*[SensorModuledx])*cm, 0*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.12-5*[DeltaX_ServiceModule]-2*[SensorModuledx])*cm, (13.055+[ServiceHybrid_Y]+[DeltaY_ServiceLong_ServiceShort]+2*[DeltaY])*cm, 0*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack_2"/>
-    <String name="ChildName" value="etl:SensorModule_back"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front_2"/>
+    <String name="ChildName" value="etl:SensorModule_2"/>
     <Numeric name="N" value="15"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="21"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  -2.155*cm, (122-6*[DeltaX_ServiceModule]-2*[SensorModuledx])*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (122.12-6*[DeltaX_ServiceModule]-2*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack_2"/>
-    <String name="ChildName" value="etl:SensorModule_back"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front_2"/>
+    <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="18"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="34"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  -2.155*cm, (122-6*[DeltaX_ServiceModule]-3*[SensorModuledx])*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (122.12-6*[DeltaX_ServiceModule]-3*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid_back"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="5"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> -13.055*cm, (122-7*[DeltaX_ServiceModule]-3*[SensorModuledx])*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.12-7*[DeltaX_ServiceModule]-3*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack_2"/>
-    <String name="ChildName" value="etl:SensorModule_back"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front_2"/>
+    <String name="ChildName" value="etl:SensorModule_2"/>
     <Numeric name="N" value="18"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="36"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> -2.155*cm, (122-8*[DeltaX_ServiceModule]-3*[SensorModuledx])*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (122.12-8*[DeltaX_ServiceModule]-3*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack_2"/>
-    <String name="ChildName" value="etl:SensorModule_back"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front_2"/>
+    <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="21"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="52"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> -2.155*cm, (122-8*[DeltaX_ServiceModule]-4*[SensorModuledx])*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (122.12-8*[DeltaX_ServiceModule]-4*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid_back"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="8"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> -13.055*cm, (122-9*[DeltaX_ServiceModule]-4*[SensorModuledx])*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.12-9*[DeltaX_ServiceModule]-4*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid_short_back"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid_short"/>
     <Numeric name="N" value="1"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="2"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> -(13.055+2*[ServiceHybrid_Y]+[DeltaY_ServiceLong_ServiceShort]+3*[DeltaY])*cm, (122-9*[DeltaX_ServiceModule]-4*[SensorModuledx])*cm, 0*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.12-9*[DeltaX_ServiceModule]-4*[SensorModuledx])*cm, (13.055+2*[ServiceHybrid_Y]+[DeltaY_ServiceLong_ServiceShort]+3*[DeltaY])*cm, 0*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack_2"/>
-    <String name="ChildName" value="etl:SensorModule_back"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front_2"/>
+    <String name="ChildName" value="etl:SensorModule_2"/>
     <Numeric name="N" value="21"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="54"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  -2.155*cm, (122-10*[DeltaX_ServiceModule]-4*[SensorModuledx])*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (122.12-10*[DeltaX_ServiceModule]-4*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack_2"/>
-    <String name="ChildName" value="etl:SensorModule_back"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front_2"/>
+    <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="21"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="73"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  -2.155*cm, (122-10*[DeltaX_ServiceModule]-5*[SensorModuledx])*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (122.12-10*[DeltaX_ServiceModule]-5*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid_back"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="11"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> -13.055*cm, (122-11*[DeltaX_ServiceModule]-5*[SensorModuledx])*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.12-11*[DeltaX_ServiceModule]-5*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid_short_back"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid_short"/>
     <Numeric name="N" value="1"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="3"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> -(13.055+2*[ServiceHybrid_Y]+[DeltaY_ServiceLong_ServiceShort]+3*[DeltaY])*cm, (122-11*[DeltaX_ServiceModule]-5*[SensorModuledx])*cm, 0*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.12-11*[DeltaX_ServiceModule]-5*[SensorModuledx])*cm, (13.055+2*[ServiceHybrid_Y]+[DeltaY_ServiceLong_ServiceShort]+3*[DeltaY])*cm, 0*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack_2"/>
-    <String name="ChildName" value="etl:SensorModule_back"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front_2"/>
+    <String name="ChildName" value="etl:SensorModule_2"/>
     <Numeric name="N" value="21"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="75"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  -2.155*cm, (122-12*[DeltaX_ServiceModule]-5*[SensorModuledx])*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (122.12-12*[DeltaX_ServiceModule]-5*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack_2"/>
-    <String name="ChildName" value="etl:SensorModule_back"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front_2"/>
+    <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="24"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="94"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  -2.155*cm, (122-12*[DeltaX_ServiceModule]-6*[SensorModuledx])*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (122.12-12*[DeltaX_ServiceModule]-6*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid_back"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="4"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="14"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> -13.055*cm, (122-13*[DeltaX_ServiceModule]-6*[SensorModuledx])*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.12-13*[DeltaX_ServiceModule]-6*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack_2"/>
-    <String name="ChildName" value="etl:SensorModule_back"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front_2"/>
+    <String name="ChildName" value="etl:SensorModule_2"/>
     <Numeric name="N" value="24"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="96"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  -2.155*cm, (122-14*[DeltaX_ServiceModule]-6*[SensorModuledx])*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (122.12-14*[DeltaX_ServiceModule]-6*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack_2"/>
-    <String name="ChildName" value="etl:SensorModule_back"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front_2"/>
+    <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="24"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="118"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  -2.155*cm, (122-14*[DeltaX_ServiceModule]-7*[SensorModuledx])*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (122.12-14*[DeltaX_ServiceModule]-7*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid_back"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="4"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="18"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> -13.055*cm, (122-15*[DeltaX_ServiceModule]-7*[SensorModuledx])*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.12-15*[DeltaX_ServiceModule]-7*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack_2"/>
-    <String name="ChildName" value="etl:SensorModule_back"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front_2"/>
+    <String name="ChildName" value="etl:SensorModule_2"/>
     <Numeric name="N" value="24"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="120"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  -2.155*cm, (122-16*[DeltaX_ServiceModule]-7*[SensorModuledx])*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (122.12-16*[DeltaX_ServiceModule]-7*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack_2"/>
-    <String name="ChildName" value="etl:SensorModule_back"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front_2"/>
+    <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="24"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="142"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  -2.155*cm, (122-16*[DeltaX_ServiceModule]-8*[SensorModuledx])*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (122.12-16*[DeltaX_ServiceModule]-8*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid_back"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="4"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="22"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> -13.055*cm, (122-17*[DeltaX_ServiceModule]-8*[SensorModuledx])*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.12-17*[DeltaX_ServiceModule]-8*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack_2"/>
-    <String name="ChildName" value="etl:SensorModule_back"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front_2"/>
+    <String name="ChildName" value="etl:SensorModule_2"/>
     <Numeric name="N" value="24"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="144"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  -2.155*cm, (122-18*[DeltaX_ServiceModule]-8*[SensorModuledx])*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (122.12-18*[DeltaX_ServiceModule]-8*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack_2"/>
-    <String name="ChildName" value="etl:SensorModule_back"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front_2"/>
+    <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="27"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="166"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> -2.155*cm, (122-18*[DeltaX_ServiceModule]-9*[SensorModuledx])*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (122.12-18*[DeltaX_ServiceModule]-9*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid_short_back"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid_short"/>
     <Numeric name="N" value="1"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="4"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> -6.5275*cm, (122-19*[DeltaX_ServiceModule]-9*[SensorModuledx])*cm, 0*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.12-19*[DeltaX_ServiceModule]-9*[SensorModuledx])*cm, 6.5275*cm, 0*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid_back"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="4"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="26"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> -(6.5275+[DeltaY_ServiceLong_ServiceShort]+[DeltaY])*cm, (122-19*[DeltaX_ServiceModule]-9*[SensorModuledx])*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.12-19*[DeltaX_ServiceModule]-9*[SensorModuledx])*cm, (6.5275+[DeltaY_ServiceLong_ServiceShort]+[DeltaY])*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack_2"/>
-    <String name="ChildName" value="etl:SensorModule_back"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front_2"/>
+    <String name="ChildName" value="etl:SensorModule_2"/>
     <Numeric name="N" value="27"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="168"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  -2.155*cm, (122-20*[DeltaX_ServiceModule]-9*[SensorModuledx])*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (122.12-20*[DeltaX_ServiceModule]-9*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack_2"/>
-    <String name="ChildName" value="etl:SensorModule_back"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front_2"/>
+    <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="27"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="193"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  -(2.155+[SensorModuledy]+[DeltaY])*cm, (122-20*[DeltaX_ServiceModule]-10*[SensorModuledx])*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (122.12-20*[DeltaX_ServiceModule]-10*[SensorModuledx])*cm, (2.155+[SensorModuledy]+[DeltaY])*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid_short_back"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid_short"/>
     <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="5"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> -(2.155+2*[SensorModuledy]+2*[DeltaY])*cm, (122-21*[DeltaX_ServiceModule]-10*[SensorModuledx])*cm, 0*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.12-21*[DeltaX_ServiceModule]-10*[SensorModuledx])*cm, (2.155+2*[SensorModuledy]+2*[DeltaY])*cm, 0*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid_back"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="30"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">-(2.155+2*[SensorModuledy]+2*[DeltaY]+2*[ServiceHybrid_Y_short]+[DeltaY_ServiceLong_ServiceShort]+3*[DeltaY])*cm, (122-21*[DeltaX_ServiceModule]-10*[SensorModuledx])*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.12-21*[DeltaX_ServiceModule]-10*[SensorModuledx])*cm, (2.155+2*[SensorModuledy]+2*[DeltaY]+2*[ServiceHybrid_Y_short]+[DeltaY_ServiceLong_ServiceShort]+3*[DeltaY])*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack_2"/>
-    <String name="ChildName" value="etl:SensorModule_back"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front_2"/>
+    <String name="ChildName" value="etl:SensorModule_2"/>
     <Numeric name="N" value="24"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="195"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  -(2.155+4*[SensorModuledy]+4*[DeltaY])*cm, (122-22*[DeltaX_ServiceModule]-10*[SensorModuledx])*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (122.12-22*[DeltaX_ServiceModule]-10*[SensorModuledx])*cm, ( 2.155+4*[SensorModuledy]+4*[DeltaY])*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack_2"/>
-    <String name="ChildName" value="etl:SensorModule_back"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front_2"/>
+    <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="21"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="220"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  -(2.155+6*[SensorModuledy]+6*[DeltaY])*cm, (122-22*[DeltaX_ServiceModule]-11*[SensorModuledx])*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (122.12-22*[DeltaX_ServiceModule]-11*[SensorModuledx])*cm, ( 2.155+6*[SensorModuledy]+6*[DeltaY])*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid_short_back"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid_short"/>
     <Numeric name="N" value="1"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="8"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> -(2.155+7*[SensorModuledy]+7*[DeltaY])*cm, (122-23*[DeltaX_ServiceModule]-11*[SensorModuledx])*cm, 0*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.12-23*[DeltaX_ServiceModule]-11*[SensorModuledx])*cm, (2.155+7*[SensorModuledy]+7*[DeltaY])*cm, 0*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid_back"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="33"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> -(2.155+7*[SensorModuledy]+8*[DeltaY]+[DeltaY_ServiceLong_ServiceShort])*cm, (122-23*[DeltaX_ServiceModule]-11*[SensorModuledx])*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.12-23*[DeltaX_ServiceModule]-11*[SensorModuledx])*cm, (2.155+7*[SensorModuledy]+8*[DeltaY]+[DeltaY_ServiceLong_ServiceShort])*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack_2"/>
-    <String name="ChildName" value="etl:SensorModule_back"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front_2"/>
+    <String name="ChildName" value="etl:SensorModule_2"/>
     <Numeric name="N" value="21"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="219"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  -(2.155+6*[SensorModuledy]+6*[DeltaY])*cm, (122-24*[DeltaX_ServiceModule]-11*[SensorModuledx])*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (122.12-24*[DeltaX_ServiceModule]-11*[SensorModuledx])*cm, ( 2.155+6*[SensorModuledy]+6*[DeltaY])*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack_2"/>
-    <String name="ChildName" value="etl:SensorModule_back"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front_2"/>
+    <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="21"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="241"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  -(2.155+7*[SensorModuledy]+7*[DeltaY])*cm, (122-24*[DeltaX_ServiceModule]-12*[SensorModuledx])*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (122.12-24*[DeltaX_ServiceModule]-12*[SensorModuledx])*cm, ( 2.155+7*[SensorModuledy]+7*[DeltaY])*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid_short_back"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid_short"/>
     <Numeric name="N" value="1"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="9"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> -(2.155+8*[SensorModuledy]+8*[DeltaY])*cm, (122-25*[DeltaX_ServiceModule]-12*[SensorModuledx])*cm, 0*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.12-25*[DeltaX_ServiceModule]-12*[SensorModuledx])*cm, (2.155+8*[SensorModuledy]+8*[DeltaY])*cm, 0*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid_back"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="36"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> -(2.155+8*[SensorModuledy]+9*[DeltaY]+[DeltaY_ServiceLong_ServiceShort])*cm, (122-25*[DeltaX_ServiceModule]-12*[SensorModuledx])*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.12-25*[DeltaX_ServiceModule]-12*[SensorModuledx])*cm, (2.155+8*[SensorModuledy]+9*[DeltaY]+[DeltaY_ServiceLong_ServiceShort])*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack_2"/>
-    <String name="ChildName" value="etl:SensorModule_back"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front_2"/>
+    <String name="ChildName" value="etl:SensorModule_2"/>
     <Numeric name="N" value="21"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="240"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  -(2.155+7*[SensorModuledy]+7*[DeltaY])*cm, (122-26*[DeltaX_ServiceModule]-12*[SensorModuledx])*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (122.12-26*[DeltaX_ServiceModule]-12*[SensorModuledx])*cm, ( 2.155+7*[SensorModuledy]+7*[DeltaY])*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack_2"/>
-    <String name="ChildName" value="etl:SensorModule_back"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front_2"/>
+    <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="21"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="241"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  -(2.155+8*[SensorModuledy]+8*[DeltaY])*cm, (122-26*[DeltaX_ServiceModule]-13*[SensorModuledx])*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (122.12-26*[DeltaX_ServiceModule]-13*[SensorModuledx])*cm, ( 2.155+8*[SensorModuledy]+8*[DeltaY])*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid_short_back"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid_short"/>
     <Numeric name="N" value="1"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="10"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> -(2.155+9*[SensorModuledy]+9*[DeltaY])*cm, (122-27*[DeltaX_ServiceModule]-13*[SensorModuledx])*cm, 0*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.12-27*[DeltaX_ServiceModule]-13*[SensorModuledx])*cm, (2.155+9*[SensorModuledy]+9*[DeltaY])*cm, 0*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid_back"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front_2"/>
+    <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="39"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> -(2.155+9*[SensorModuledy]+10*[DeltaY]+[DeltaY_ServiceLong_ServiceShort])*cm, (122-27*[DeltaX_ServiceModule]-13*[SensorModuledx])*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.12-27*[DeltaX_ServiceModule]-13*[SensorModuledx])*cm, (2.155+9*[SensorModuledy]+10*[DeltaY]+[DeltaY_ServiceLong_ServiceShort])*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDLinear">
-    <rParent name="etl:DiskQuarterBack_2"/>
-    <String name="ChildName" value="etl:SensorModule_back"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front_2"/>
+    <String name="ChildName" value="etl:SensorModule_2"/>
     <Numeric name="N" value="21"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="261"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  -(2.155+8*[SensorModuledy]+8*[DeltaY])*cm, (122-28*[DeltaX_ServiceModule]-13*[SensorModuledx])*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (122.12-28*[DeltaX_ServiceModule]-13*[SensorModuledx])*cm, ( 2.155+8*[SensorModuledy]+8*[DeltaY])*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="180.*deg"/>
+    <Numeric name="Phi" value="90.*deg"/>
   </Algorithm>
 
 </DDDefinition>
diff --git a/Geometry/MTDCommonData/data/mtdMaterial/v2/mtdMaterial.xml b/Geometry/MTDCommonData/data/mtdMaterial/v2/mtdMaterial.xml
index b55f1026ee871..a1d9959960f5f 100644
--- a/Geometry/MTDCommonData/data/mtdMaterial/v2/mtdMaterial.xml
+++ b/Geometry/MTDCommonData/data/mtdMaterial/v2/mtdMaterial.xml
@@ -182,6 +182,29 @@
         <rMaterial name="materials:Hydrogen"/>
       </MaterialFraction>
     </CompositeMaterial>
+    <!-- Definition of thermal screen material (approx.) -->
+    <CompositeMaterial name="CryogelZ" density="0.16*g/cm3" symbol="CryogelZ" method="mixture by weight">   
+      <MaterialFraction fraction="0.27">
+        <rMaterial name="materials:Silicon"/>
+      </MaterialFraction>
+      <MaterialFraction fraction="0.53">
+        <rMaterial name="materials:Oxygen"/>
+      </MaterialFraction>
+      <MaterialFraction fraction="0.2">
+        <rMaterial name="materials:Polyethylene"/>
+      </MaterialFraction>
+    </CompositeMaterial>
+    <CompositeMaterial name="ThermalScreenComposite" density="0.2*g/cm3" symbol="ThermalScreen" method="mixture by weight">  <!-- density wrong -->
+      <MaterialFraction fraction="0.8">
+        <rMaterial name="mtdMaterial:CryogelZ"/>
+      </MaterialFraction>
+      <MaterialFraction fraction="0.1">
+        <rMaterial name="materials:Aluminium"/>
+      </MaterialFraction>
+      <MaterialFraction fraction="0.1">
+        <rMaterial name="materials:Carbon fib.str."/>   
+      </MaterialFraction>
+    </CompositeMaterial> 
   </MaterialSection>
 
 </DDDefinition>
diff --git a/Geometry/MTDCommonData/plugins/BuildFile.xml b/Geometry/MTDCommonData/plugins/BuildFile.xml
new file mode 100644
index 0000000000000..cb9e5f6b4f370
--- /dev/null
+++ b/Geometry/MTDCommonData/plugins/BuildFile.xml
@@ -0,0 +1,15 @@
+<use   name="FWCore/Framework"/>
+<use   name="Geometry/Records"/>
+<use   name="Geometry/MTDCommonData"/>
+<use   name="DetectorDescription/DDCMS"/>
+<use   name="FWCore/PluginManager"/>
+<use   name="FWCore/MessageLogger"/>
+<use   name="DataFormats/Math"/>
+
+
+<library  file="DDMTDLinear.cc">
+
+  <use   name="DetectorDescription/Core"/>
+  <use   name="DetectorDescription/Parser"/>
+  <flags   EDM_PLUGIN="1"/>
+</library>
diff --git a/Geometry/MTDCommonData/plugins/DDMTDLinear.cc b/Geometry/MTDCommonData/plugins/DDMTDLinear.cc
new file mode 100644
index 0000000000000..cd382ed44824c
--- /dev/null
+++ b/Geometry/MTDCommonData/plugins/DDMTDLinear.cc
@@ -0,0 +1,111 @@
+#include "DetectorDescription/Core/interface/DDAlgorithm.h"
+#include "DetectorDescription/Core/interface/DDAlgorithmFactory.h"
+#include "DetectorDescription/Core/interface/DDCompactView.h"
+#include "DetectorDescription/Core/interface/DDCurrentNamespace.h"
+#include "DetectorDescription/Core/interface/DDLogicalPart.h"
+#include "DetectorDescription/Core/interface/DDName.h"
+#include "DetectorDescription/Core/interface/DDRotationMatrix.h"
+#include "DetectorDescription/Core/interface/DDSplit.h"
+#include "DetectorDescription/Core/interface/DDTransform.h"
+#include "DetectorDescription/Core/interface/DDTranslation.h"
+#include "DetectorDescription/Core/interface/DDTypes.h"
+#include "DataFormats/Math/interface/GeantUnits.h"
+#include "FWCore/MessageLogger/interface/MessageLogger.h"
+#include "FWCore/PluginManager/interface/PluginFactory.h"
+
+#include <cmath>
+#include <memory>
+
+using namespace geant_units::operators;
+
+class DDMTDLinear : public DDAlgorithm {
+public:
+  DDMTDLinear() : m_n(1), m_startCopyNo(1), m_incrCopyNo(1), m_theta(0.), m_phi(0.), m_delta(0.) {}
+
+  void initialize(const DDNumericArguments& nArgs,
+                  const DDVectorArguments& vArgs,
+                  const DDMapArguments& mArgs,
+                  const DDStringArguments& sArgs,
+                  const DDStringVectorArguments& vsArgs) override;
+
+  void execute(DDCompactView& cpv) override;
+
+private:
+  int m_n;                     //Number of copies
+  int m_startCopyNo;           //Start Copy number
+  int m_incrCopyNo;            //Increment in Copy number
+  double m_theta;              //Theta
+  double m_phi;                //Phi dir[Theta,Phi] ... unit-std::vector in direction Theta, Phi
+  double m_delta;              //Delta - distance between two subsequent positions along dir[Theta,Phi]
+  std::vector<double> m_base;  //Base values - a 3d-point where the offset is calculated from
+                               //base is optional, if omitted base=(0,0,0)
+  std::pair<std::string, std::string> m_childNmNs;  //Child name
+                                                    //Namespace of the child
+};
+
+void DDMTDLinear::initialize(const DDNumericArguments& nArgs,
+                          const DDVectorArguments& vArgs,
+                          const DDMapArguments&,
+                          const DDStringArguments& sArgs,
+                          const DDStringVectorArguments&) {
+  m_n = int(nArgs["N"]);
+  m_startCopyNo = int(nArgs["StartCopyNo"]);
+  m_incrCopyNo = int(nArgs["IncrCopyNo"]);
+  m_theta = nArgs["Theta"];
+  m_phi = nArgs["Phi"];
+  m_delta = nArgs["Delta"];
+  m_base = vArgs["Base"];
+
+  LogDebug("DDAlgorithm") << "DDMTDLinear: Parameters for position"
+                          << "ing:: n " << m_n << " Direction Theta, Phi, Offset, Delta " << convertRadToDeg(m_theta)
+                          << " " << convertRadToDeg(m_phi) << " "
+                          << " " << convertRadToDeg(m_delta) << " Base " << m_base[0] << ", " << m_base[1] << ", "
+                          << m_base[2];
+
+  m_childNmNs = DDSplit(sArgs["ChildName"]);
+  if (m_childNmNs.second.empty())
+    m_childNmNs.second = DDCurrentNamespace::ns();
+
+  DDName parentName = parent().name();
+  LogDebug("DDAlgorithm") << "DDMTDLinear: Parent " << parentName << "\tChild " << m_childNmNs.first << " NameSpace "
+                          << m_childNmNs.second;
+}
+
+void DDMTDLinear::execute(DDCompactView& cpv) {
+  DDName mother = parent().name();
+  DDName ddname(m_childNmNs.first, m_childNmNs.second);
+  int copy = m_startCopyNo;
+
+  DDTranslation direction(sin(m_theta) * cos(m_phi), sin(m_theta) * sin(m_phi), cos(m_theta));
+
+  DDTranslation basetr(m_base[0], m_base[1], m_base[2]);
+
+  double thetaZ=0; //rotation is in xy plane
+  double phiZ=0;  //m_phi;  //double phiZ=0; 
+  double thetaX=1.57;
+  double thetaY=1.57;
+  double phiX=0;     //m_phi;
+  double phiY=0+1.57;  //m_phi+1.57; //phi+TMath::Pi()/2   Rad o Deg?????????????????????
+
+  //std::make_unique<DDRotationMatrix> rotationMatrix=DDcreateRotationMatrix(thetaX, phiX, thetaY, phiY, thetaZ, phiZ);
+  //DDRotation rotation = DDRotation("IdentityRotation");
+  DDRotation rotation = DDRotation("Rotation");
+
+
+  if (!rotation) {
+    LogDebug("DDAlgorithm") << "DDMTDLinear: Creating a new "
+                            << "rotation: IdentityRotation for " << ddname;
+
+    rotation = DDrot( "Rotation", DDcreateRotationMatrix(thetaX, phiX, thetaY, phiY, thetaZ, phiZ)); //rotation = DDrot("IdentityRotation", std::make_unique<DDRotationMatrix>());
+  }
+
+  for (int i = 0; i < m_n; ++i) {
+    DDTranslation tran = basetr + (i * m_delta) * direction;   //basetr + (double(copy) * m_delta) * direction; 
+    cpv.position(ddname, mother, copy, tran, rotation);  //cpv.position(ddname, mother, copy, tran, rotation);
+    LogDebug("DDAlgorithm") << "DDMTDLinear: " << m_childNmNs.second << ":" << m_childNmNs.first << " number " << copy
+                            << " positioned in " << mother << " at " << tran << " with " << rotation;
+    copy += m_incrCopyNo;
+  }
+}
+
+DEFINE_EDM_PLUGIN(DDAlgorithmFactory, DDMTDLinear, "global:DDMTDLinear");
diff --git a/Geometry/MTDSimData/data/v2/mtdProdCuts.xml b/Geometry/MTDSimData/data/v2/mtdProdCuts.xml
new file mode 100644
index 0000000000000..2f81b2c6da5d3
--- /dev/null
+++ b/Geometry/MTDSimData/data/v2/mtdProdCuts.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+
+<DDDefinition xmlns="http://www.cern.ch/cms/DDL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.cern.ch/cms/DDL ../../../DetectorDescription/Schema/DDLSchema.xsd">
+
+  <SpecParSection label="regions.xml" eval="true">
+    <SpecPar name="fasttime">                                                  
+      <PartSelector path="//BarrelTimingLayer"/>                          
+      <PartSelector path="//EndcapTimingLayer"/>                          
+      <Parameter name="CMSCutsRegion" value="FastTimerRegion" eval="false"/>   
+      <Parameter name="ProdCutsForElectrons" value="0.1*mm"/>                  
+      <Parameter name="ProdCutsForPositrons" value="0.1*mm"/>                  
+      <Parameter name="ProdCutsForGamma" value="0.1*mm"/>                      
+    </SpecPar>                                                                                  
+    <SpecPar name="fasttime-sens">
+      <PartSelector path="//BModule1Layer1Timingactive"/>
+      <PartSelector path="//BModule17Layer1Timingactive"/>
+      <PartSelector path="//BModule33Layer1Timingactive"/>
+      <PartSelector path="//LGAD_ActiveThickness"/>
+      <Parameter name="CMSCutsRegion" value="FastTimerRegion" eval="false"/>   
+      <Parameter name="ProdCutsForElectrons" value="0.1*mm"/>                  
+      <Parameter name="ProdCutsForPositrons" value="0.1*mm"/>                  
+      <Parameter name="ProdCutsForGamma" value="0.1*mm"/>                      
+    </SpecPar>
+
+  </SpecParSection>
+
+</DDDefinition>
+
diff --git a/Geometry/MTDSimData/data/v2/mtdsens.xml b/Geometry/MTDSimData/data/v2/mtdsens.xml
new file mode 100644
index 0000000000000..3cb2a2f8291c9
--- /dev/null
+++ b/Geometry/MTDSimData/data/v2/mtdsens.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+
+<DDDefinition xmlns="http://www.cern.ch/cms/DDL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.cern.ch/cms/DDL ../../../DetectorDescription/Schema/DDLSchema.xsd">
+
+  <SpecParSection label="fasttimesens.xml" eval="true">
+    <SpecPar name="fasttimesenseBarrel">
+      <PartSelector path="//BModule1Layer1Timingactive"/>
+      <PartSelector path="//BModule17Layer1Timingactive"/>
+      <PartSelector path="//BModule33Layer1Timingactive"/>
+      <Parameter name="SensitiveDetector" value="MtdSensitiveDetector" eval="false"/>
+      <Parameter name="ReadOutName" value="FastTimerHitsBarrel" eval="false"/>
+      <Parameter name="Type"        value="1"/>
+    </SpecPar>
+    <SpecPar name="fasttimesenseEndcap">
+      <PartSelector path="//LGAD_ActiveThickness"/>
+      <Parameter name="SensitiveDetector" value="MtdSensitiveDetector" eval="false"/>
+      <Parameter name="ReadOutName" value="FastTimerHitsEndcap" eval="false"/>
+      <Parameter name="Type"        value="2"/>
+    </SpecPar>
+  </SpecParSection>
+
+</DDDefinition>

From 5b15a306ad83bbd6ff2ed1801115bf9fd1354b35 Mon Sep 17 00:00:00 2001
From: Fabio Cossutti <fabio.cossutti@ts.infn.it>
Date: Fri, 13 Dec 2019 10:35:52 +0100
Subject: [PATCH 03/15] Update DDMTDLinear, adapt xmsl, update of numbering
 scheme based on hierarchy

---
 Geometry/MTDCommonData/data/etl/v4/etl.xml    | 2690 ++++++++++-------
 Geometry/MTDCommonData/plugins/DDMTDLinear.cc |   32 +-
 .../MTDCommonData/src/ETLNumberingScheme.cc   |   31 +-
 3 files changed, 1604 insertions(+), 1149 deletions(-)

diff --git a/Geometry/MTDCommonData/data/etl/v4/etl.xml b/Geometry/MTDCommonData/data/etl/v4/etl.xml
index 1ce33076b063c..75b5fc18172ee 100644
--- a/Geometry/MTDCommonData/data/etl/v4/etl.xml
+++ b/Geometry/MTDCommonData/data/etl/v4/etl.xml
@@ -2,13 +2,13 @@
 <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="etl.xml" eval="true/false">
-	<Constant name="ETLrmin" value="[caloBase:Rmin100]"/>   <!-- 2.63cm -->
-	<Constant name="ETLrmax" value="[caloBase:Rmax100]"/>   <!--  -->
-	<Constant name="ETLzmin" value="-0.5*([caloBase:Zpos110]-[caloBase:Zpos10])"/>  <!-- zmax-zmin = 3063mm-2966mm = 97mm -->
+	<Constant name="ETLrmin" value="[caloBase:Rmin100]"/>   
+	<Constant name="ETLrmax" value="[caloBase:Rmax100]"/>   
+	<Constant name="ETLzmin" value="-0.5*([caloBase:Zpos110]-[caloBase:Zpos10])"/>  
 	<Constant name="ETLzmax" value="0.5*([caloBase:Zpos110]-[caloBase:Zpos10])"/>
 
 	<Constant name="Disk_thickness" value="1.894"/>  <!-- thickness of one disk comprising modules, service hybrids on both faces, mounted on the Al and MIC6-Al rings. Fig 3.73 TDR and line 354 Ulascan ETLDetectorDimensions.cc -->
-	<Constant name="DiskQuarter_thickness" value="0.585"/> <!-- thickness of the volume where the LGAD modules + service hybrid will be positioned. Basically, this is the service hybrid height according to table 3.9 -->
+	<Constant name="DiskQuarter_thickness" value="0.585"/> <!-- this is the service hybrid height according to TDR table 3.9 -->
 	<!-- LGAD and ETROC values taken from Ulascan code (line 103 on in ETLDetectorDimensions.cc), same values in the TDR -->
 	<Constant name="LGADdx" value="2.12"/>
 	<Constant name="LGADdy" value="4.2"/>
@@ -100,23 +100,23 @@
       <rMaterial name="materials:Aluminium"/>     
     </LogicalPart>
     <!-- Quarters on Disk1 -->
-    <LogicalPart name="DiskQuarter_Back" category="unspecified">
-      <rSolid name="etl:DiskQuarter_Back"/>
-      <rMaterial name="materials:Air"/>     
-    </LogicalPart> 
     <LogicalPart name="DiskQuarter_Front" category="unspecified">
       <rSolid name="etl:DiskQuarter_Front"/>
       <rMaterial name="materials:Air"/>     
     </LogicalPart>
-    <!-- Quarters on Disk2 -->
-    <LogicalPart name="DiskQuarter_Back_2" category="unspecified">
-      <rSolid name="etl:DiskQuarter_Back_2"/>
+    <LogicalPart name="DiskQuarter_Back" category="unspecified">
+      <rSolid name="etl:DiskQuarter_Back"/>
       <rMaterial name="materials:Air"/>     
     </LogicalPart> 
+    <!-- Quarters on Disk2 -->
     <LogicalPart name="DiskQuarter_Front_2" category="unspecified">
       <rSolid name="etl:DiskQuarter_Front_2"/>
       <rMaterial name="materials:Air"/>     
-    </LogicalPart> 
+    </LogicalPart>
+    <LogicalPart name="DiskQuarter_Back_2" category="unspecified">
+      <rSolid name="etl:DiskQuarter_Back_2"/>
+      <rMaterial name="materials:Air"/>     
+    </LogicalPart>
     <!-- Sensor module on front face  -->
     <LogicalPart name="SensorModule" category="unspecified">  
       <rSolid name="etl:SensorModule"/>
@@ -135,6 +135,7 @@
       <rSolid name="etl:SensorModule"/>
       <rMaterial name="materials:Air"/>     
     </LogicalPart>
+    <!-- Service Hybrids -->
     <LogicalPart name="ServiceHybrid" category="unspecified">  
       <rSolid name="etl:ServiceHybrid"/>
       <rMaterial name="mtdMaterial:ServiceHybrid_PCB"/>     
@@ -165,9 +166,17 @@
       <rSolid name="etl:LGAD"/>
       <rMaterial name="materials:Air"/>     
     </LogicalPart>
+    <LogicalPart name="LGAD_2" category="unspecified">  
+      <rSolid name="etl:LGAD"/>
+      <rMaterial name="materials:Air"/>     
+    </LogicalPart>
     <LogicalPart name="LGAD_r" category="unspecified">  
       <rSolid name="etl:LGAD"/>
       <rMaterial name="materials:Air"/>     
+    </LogicalPart>
+    <LogicalPart name="LGAD_r_2" category="unspecified">  
+      <rSolid name="etl:LGAD"/>
+      <rMaterial name="materials:Air"/>     
     </LogicalPart> 
     <LogicalPart name="LGAD_ActiveThickness" category="unspecified">  
       <rSolid name="etl:LGAD_ActiveThickness"/>
@@ -202,7 +211,7 @@
 	  <rChild name="etl:Disk1"/>  
 	  <Translation x="0." y="0." z="-1.788*cm" />
 	</PosPart> 
-	<PosPart copyNumber="2">                                           
+	<PosPart copyNumber="1">                                           
 	  <rParent name="etl:EndcapTimingLayer"/>                         
 	  <rChild name="etl:Disk2"/>  
 	  <Translation x="0." y="0." z="0.312*cm" />
@@ -217,30 +226,7 @@
 	  <rChild name="etl:MIC6_Aluminium_Disk"/>  
 	  <Translation x="0." y="0." z="-0.0445*cm" />
 	</PosPart>
-	<PosPart copyNumber="1">                                           
-	  <rParent name="etl:Disk1"/>                         
-	  <rChild name="etl:DiskQuarter_Back"/>  
-	  <rRotation name="etl:0"/>
-	  <Translation x="0*cm" y="0*cm" z="0.6545*cm" />  
-	</PosPart>
-	<PosPart copyNumber="2">                                           
-	  <rParent name="etl:Disk1"/>                         
-	  <rChild name="etl:DiskQuarter_Back"/>
-	  <rRotation name="etl:270"/>  
-	  <Translation x="0*cm" y="0*cm" z="0.6545*cm" />
-	</PosPart> 
-	<PosPart copyNumber="3">                                           
-	  <rParent name="etl:Disk1"/>                         
-	  <rChild name="etl:DiskQuarter_Back"/>
-	  <rRotation name="etl:180"/>  
-	  <Translation x="0*cm" y="0*cm" z="0.6545*cm" />
-	</PosPart> 
-	<PosPart copyNumber="4">                                           
-	  <rParent name="etl:Disk1"/>                         
-	  <rChild name="etl:DiskQuarter_Back"/> 
-	  <rRotation name="etl:90"/> 
-	  <Translation x="0*cm" y="0*cm" z="0.6545*cm" />
-	</PosPart> 
+	<!-- Quarters in both Disk1 and Disk2 (Front/Back faces) are placed anti-clockwise (Quarter 1 is on top right, Quarter 2 top left...) -->
 	<PosPart copyNumber="1">                                           
 	  <rParent name="etl:Disk1"/>                         
 	  <rChild name="etl:DiskQuarter_Front"/> 
@@ -265,6 +251,30 @@
 	  <rRotation name="etl:90"/> 
 	  <Translation x="0*cm" y="0*cm" z="-0.6545*cm" />
 	</PosPart>
+	<PosPart copyNumber="1">                                           
+	  <rParent name="etl:Disk1"/>                         
+	  <rChild name="etl:DiskQuarter_Back"/>  
+	  <rRotation name="etl:0"/>
+	  <Translation x="0*cm" y="0*cm" z="0.6545*cm" />  
+	</PosPart>
+	<PosPart copyNumber="2">                                           
+	  <rParent name="etl:Disk1"/>                         
+	  <rChild name="etl:DiskQuarter_Back"/>
+	  <rRotation name="etl:270"/>  
+	  <Translation x="0*cm" y="0*cm" z="0.6545*cm" />
+	</PosPart> 
+	<PosPart copyNumber="3">                                           
+	  <rParent name="etl:Disk1"/>                         
+	  <rChild name="etl:DiskQuarter_Back"/>
+	  <rRotation name="etl:180"/>  
+	  <Translation x="0*cm" y="0*cm" z="0.6545*cm" />
+	</PosPart> 
+	<PosPart copyNumber="4">                                           
+	  <rParent name="etl:Disk1"/>                         
+	  <rChild name="etl:DiskQuarter_Back"/> 
+	  <rRotation name="etl:90"/> 
+	  <Translation x="0*cm" y="0*cm" z="0.6545*cm" />
+	</PosPart> 
     <PosPart copyNumber="1">                                           
       <rParent name="etl:Disk2"/>                         
       <rChild name="etl:Aluminium_Disk"/>  
@@ -274,6 +284,30 @@
       <rParent name="etl:Disk2"/>                         
       <rChild name="etl:MIC6_Aluminium_Disk"/>  
       <Translation x="0." y="0." z="-0.0445*cm" />
+    </PosPart>
+     <PosPart copyNumber="1">                                           
+      <rParent name="etl:Disk2"/>                         
+      <rChild name="etl:DiskQuarter_Front_2"/> 
+      <rRotation name="etl:0"/> 
+      <Translation x="0*cm" y="0*cm" z="-0.6545*cm" />
+    </PosPart> 
+    <PosPart copyNumber="2">                                           
+      <rParent name="etl:Disk2"/>                         
+      <rChild name="etl:DiskQuarter_Front_2"/>  
+      <rRotation name="etl:270"/>
+      <Translation x="0*cm" y="0*cm" z="-0.6545*cm" />
+    </PosPart> 
+    <PosPart copyNumber="3">                                           
+      <rParent name="etl:Disk2"/>                         
+      <rChild name="etl:DiskQuarter_Front_2"/>
+      <rRotation name="etl:180"/>  
+      <Translation x="0*cm" y="0*cm" z="-0.6545*cm" />
+    </PosPart> 
+    <PosPart copyNumber="4">                                           
+      <rParent name="etl:Disk2"/>                         
+      <rChild name="etl:DiskQuarter_Front_2"/> 
+      <rRotation name="etl:90"/> 
+      <Translation x="0*cm" y="0*cm" z="-0.6545*cm" />
     </PosPart>
     <PosPart copyNumber="1">                                           
       <rParent name="etl:Disk2"/>                         
@@ -299,30 +333,6 @@
       <rRotation name="etl:90"/> 
       <Translation x="0*cm" y="0*cm" z="0.6545*cm" />
     </PosPart> 
-    <PosPart copyNumber="1">                                           
-      <rParent name="etl:Disk2"/>                         
-      <rChild name="etl:DiskQuarter_Front_2"/> 
-      <rRotation name="etl:0"/> 
-      <Translation x="0*cm" y="0*cm" z="-0.6545*cm" />
-    </PosPart> 
-    <PosPart copyNumber="2">                                           
-      <rParent name="etl:Disk2"/>                         
-      <rChild name="etl:DiskQuarter_Front_2"/>  
-      <rRotation name="etl:270"/>
-      <Translation x="0*cm" y="0*cm" z="-0.6545*cm" />
-    </PosPart> 
-    <PosPart copyNumber="3">                                           
-      <rParent name="etl:Disk2"/>                         
-      <rChild name="etl:DiskQuarter_Front_2"/>
-      <rRotation name="etl:180"/>  
-      <Translation x="0*cm" y="0*cm" z="-0.6545*cm" />
-    </PosPart> 
-    <PosPart copyNumber="4">                                           
-      <rParent name="etl:Disk2"/>                         
-      <rChild name="etl:DiskQuarter_Front_2"/> 
-      <rRotation name="etl:90"/> 
-      <Translation x="0*cm" y="0*cm" z="-0.6545*cm" />
-    </PosPart>
 	<PosPart copyNumber="1">                                           
 	  <rParent name="etl:SensorModule"/>                         
 	  <rChild name="etl:ThermalPad"/>  
@@ -396,17 +406,17 @@
 	</PosPart> 
 	<PosPart copyNumber="1">                                           
 	  <rParent name="etl:SensorModule_2"/>                         
-	  <rChild name="etl:LGAD"/>  
+	  <rChild name="etl:LGAD_2"/>  
 	  <Translation x="-0.22*cm" y="0." z="-0.0405*cm" />
 	</PosPart>
 	<!-- definition of LGAD active/substrate volumes -->
 	<PosPart copyNumber="1">                                           
-	  <rParent name="etl:LGAD"/>                         
+	  <rParent name="etl:LGAD_2"/>                         
 	  <rChild name="etl:LGAD_ActiveThickness"/>  
 	  <Translation x="0.*cm" y="0.*cm" z="-0.0125*cm" />
 	</PosPart>
 	<PosPart copyNumber="1">                                           
-	  <rParent name="etl:LGAD"/>                         
+	  <rParent name="etl:LGAD_2"/>                         
 	  <rChild name="etl:LGAD_Substrate"/>  
 	  <Translation x="0.*cm" y="0.*cm" z="0.0025*cm" />
 	</PosPart>  
@@ -493,12 +503,12 @@
     </PosPart>
     <!-- definition of LGAD active/substrate volumes -->
     <PosPart copyNumber="1">                                           
-      <rParent name="etl:LGAD_r"/>                         
+      <rParent name="etl:LGAD_r_2"/>                         
       <rChild name="etl:LGAD_ActiveThickness"/>  
       <Translation x="0.*cm" y="0.*cm" z="0.0125*cm" />
     </PosPart>
     <PosPart copyNumber="1">                                           
-      <rParent name="etl:LGAD_r"/>                         
+      <rParent name="etl:LGAD_r_2"/>                         
       <rChild name="etl:LGAD_Substrate"/>  
       <Translation x="0.*cm" y="0.*cm" z="-0.0025*cm" />
     </PosPart>  
@@ -516,2259 +526,2679 @@
 
 
   <!-- Algorithm Section begins -->
-  <!-- Disk1 -->
+    <!-- Disk1 Front face -->
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back"/>
+	<rParent name="etl:DiskQuarter_Front"/>
+	<String name="ChildName" value="etl:SensorModule_2"/>
+	<Numeric name="N" value="7"/>
+	<Numeric name="StartCopyNo" value="1"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> -120.325*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="1"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="1"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> -122.0875*cm, 13.055*cm, 0.*cm </Vector> 
-    <Numeric name="Theta" value="90.*deg"/> <!-- translation along y -->
+    <Vector  name="Base" type="numeric" nEntries="3"> (-120.325+[DeltaX_ServiceModule])*cm, 13.055*cm, 0.*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back"/>
-    <String name="ChildName" value="etl:SensorModule_r"/>
-    <Numeric name="N" value="6"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <rParent name="etl:DiskQuarter_Front"/>
+    <String name="ChildName" value="etl:ServiceHybrid_short"/>
+    <Numeric name="N" value="1"/>
+    <Numeric name="StartCopyNo" value="1"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-120.325+[DeltaX_ServiceModule])*cm, (13.055+[DeltaY_ServiceLong_ServiceShort]+[DeltaY])*cm, 0*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front"/>
+    <String name="ChildName" value="etl:SensorModule"/>
+    <Numeric name="N" value="9"/>
+    <Numeric name="StartCopyNo" value="1"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+[DeltaX_ServiceModule])*cm, 2.155*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (-120.325+2*[DeltaX_ServiceModule])*cm, 2.155*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back"/>
-    <String name="ChildName" value="etl:SensorModule_r_2"/>
-    <Numeric name="N" value="10"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <rParent name="etl:DiskQuarter_Front"/>
+    <String name="ChildName" value="etl:SensorModule_2"/>
+    <Numeric name="N" value="12"/>
+    <Numeric name="StartCopyNo" value="8"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+[DeltaX_ServiceModule]+[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (-120.325+2*[DeltaX_ServiceModule]+[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back"/>
+    <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="2"/>
-    <Numeric name="StartCopyNo" value="1"/>
+    <Numeric name="StartCopyNo" value="2"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+2*[DeltaX_ServiceModule]+[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-120.325+3*[DeltaX_ServiceModule]+[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back"/>
-    <String name="ChildName" value="etl:SensorModule_r"/>
+    <rParent name="etl:DiskQuarter_Front"/>
+    <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="12"/>
-    <Numeric name="StartCopyNo" value="6"/>
+    <Numeric name="StartCopyNo" value="10"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+3*[DeltaX_ServiceModule]+[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (-120.325+4*[DeltaX_ServiceModule]+[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back"/>
-    <String name="ChildName" value="etl:SensorModule_r_2"/>
-    <Numeric name="N" value="14"/>
-    <Numeric name="StartCopyNo" value="10"/>
+    <rParent name="etl:DiskQuarter_Front"/>
+    <String name="ChildName" value="etl:SensorModule_2"/>
+    <Numeric name="N" value="15"/>
+    <Numeric name="StartCopyNo" value="20"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+3*[DeltaX_ServiceModule]+2*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (-120.325+4*[DeltaX_ServiceModule]+2*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back"/>
+    <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="2"/>
-    <Numeric name="StartCopyNo" value="3"/>
+    <Numeric name="StartCopyNo" value="4"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+4*[DeltaX_ServiceModule]+2*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-120.325+5*[DeltaX_ServiceModule]+2*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">  <!-- 1st placement of a short service hybrid -->
-    <rParent name="etl:DiskQuarter_Back"/>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:ServiceHybrid_short"/>
     <Numeric name="N" value="1"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="2"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+4*[DeltaX_ServiceModule]+2*[SensorModuledx])*cm, (13.055+[ServiceHybrid_Y]+2*[DeltaY]+[DeltaY_ServiceLong_ServiceShort])*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-120.325+5*[DeltaX_ServiceModule]+2*[SensorModuledx])*cm, (13.055+[ServiceHybrid_Y]+[DeltaY_ServiceLong_ServiceShort]+2*[DeltaY])*cm, 0*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back"/>
-    <String name="ChildName" value="etl:SensorModule_r"/>
+    <rParent name="etl:DiskQuarter_Front"/>
+    <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="15"/>
-    <Numeric name="StartCopyNo" value="18"/>
+    <Numeric name="StartCopyNo" value="22"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+5*[DeltaX_ServiceModule]+2*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (-120.325+6*[DeltaX_ServiceModule]+2*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back"/>
-    <String name="ChildName" value="etl:SensorModule_r_2"/>
-    <Numeric name="N" value="17"/>
-    <Numeric name="StartCopyNo" value="24"/>
+    <rParent name="etl:DiskQuarter_Front"/>
+    <String name="ChildName" value="etl:SensorModule_2"/>
+    <Numeric name="N" value="18"/>
+    <Numeric name="StartCopyNo" value="35"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+5*[DeltaX_ServiceModule]+3*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (-120.325+6*[DeltaX_ServiceModule]+3*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back"/>
+    <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="5"/>
+    <Numeric name="StartCopyNo" value="6"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+6*[DeltaX_ServiceModule]+3*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-120.325+7*[DeltaX_ServiceModule]+3*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back"/>
-    <String name="ChildName" value="etl:SensorModule_r"/>
+    <rParent name="etl:DiskQuarter_Front"/>
+    <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="18"/>
-    <Numeric name="StartCopyNo" value="33"/>
+    <Numeric name="StartCopyNo" value="37"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+7*[DeltaX_ServiceModule]+3*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (-120.325+8*[DeltaX_ServiceModule]+3*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back"/>
-    <String name="ChildName" value="etl:SensorModule_r_2"/>
-    <Numeric name="N" value="18"/>
-    <Numeric name="StartCopyNo" value="41"/>
+    <rParent name="etl:DiskQuarter_Front"/>
+    <String name="ChildName" value="etl:SensorModule_2"/>
+    <Numeric name="N" value="21"/>
+    <Numeric name="StartCopyNo" value="53"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+7*[DeltaX_ServiceModule]+4*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (-120.325+8*[DeltaX_ServiceModule]+4*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back"/>
+    <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="8"/>
+    <Numeric name="StartCopyNo" value="9"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+8*[DeltaX_ServiceModule]+4*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-120.325+9*[DeltaX_ServiceModule]+4*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back"/>
-    <String name="ChildName" value="etl:SensorModule_r"/>
-    <Numeric name="N" value="18"/>
-    <Numeric name="StartCopyNo" value="51"/>
+    <rParent name="etl:DiskQuarter_Front"/>
+    <String name="ChildName" value="etl:ServiceHybrid_short"/>
+    <Numeric name="N" value="1"/>
+    <Numeric name="StartCopyNo" value="3"/>
+    <Numeric name="IncrCopyNo" value="1"/>
+    <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-120.325+9*[DeltaX_ServiceModule]+4*[SensorModuledx])*cm, (13.055+2*[ServiceHybrid_Y]+[DeltaY_ServiceLong_ServiceShort]+3*[DeltaY])*cm, 0*cm </Vector> 
+    <Numeric name="Theta" value="90.*deg"/> 
+    <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDMTDLinear">
+    <rParent name="etl:DiskQuarter_Front"/>
+    <String name="ChildName" value="etl:SensorModule"/>
+    <Numeric name="N" value="21"/>
+    <Numeric name="StartCopyNo" value="55"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+9*[DeltaX_ServiceModule]+4*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (-120.325+10*[DeltaX_ServiceModule]+4*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back"/>
-    <String name="ChildName" value="etl:SensorModule_r_2"/>
+    <rParent name="etl:DiskQuarter_Front"/>
+    <String name="ChildName" value="etl:SensorModule_2"/>
     <Numeric name="N" value="21"/>
-    <Numeric name="StartCopyNo" value="59"/>
+    <Numeric name="StartCopyNo" value="74"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+9*[DeltaX_ServiceModule]+5*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (-120.325+10*[DeltaX_ServiceModule]+5*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back"/>
+    <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="11"/>
+    <Numeric name="StartCopyNo" value="12"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+10*[DeltaX_ServiceModule]+5*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-120.325+11*[DeltaX_ServiceModule]+5*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back"/>
+    <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:ServiceHybrid_short"/>
     <Numeric name="N" value="1"/>
-    <Numeric name="StartCopyNo" value="1"/>
+    <Numeric name="StartCopyNo" value="4"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+10*[DeltaX_ServiceModule]+5*[SensorModuledx])*cm, (13.055+2*[ServiceHybrid_Y]+3*[DeltaY]+[DeltaY_ServiceLong_ServiceShort])*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-120.325+11*[DeltaX_ServiceModule]+5*[SensorModuledx])*cm, (13.055+2*[ServiceHybrid_Y]+[DeltaY_ServiceLong_ServiceShort]+3*[DeltaY])*cm, 0*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back"/>
-    <String name="ChildName" value="etl:SensorModule_r"/>
+    <rParent name="etl:DiskQuarter_Front"/>
+    <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="21"/>
-    <Numeric name="StartCopyNo" value="69"/>
+    <Numeric name="StartCopyNo" value="76"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+11*[DeltaX_ServiceModule]+5*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (-120.325+12*[DeltaX_ServiceModule]+5*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back"/>
-    <String name="ChildName" value="etl:SensorModule_r_2"/>
-    <Numeric name="N" value="23"/>
-    <Numeric name="StartCopyNo" value="80"/>
+    <rParent name="etl:DiskQuarter_Front"/>
+    <String name="ChildName" value="etl:SensorModule_2"/>
+    <Numeric name="N" value="24"/>
+    <Numeric name="StartCopyNo" value="95"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+11*[DeltaX_ServiceModule]+6*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (-120.325+12*[DeltaX_ServiceModule]+6*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back"/>
+    <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="4"/>
-    <Numeric name="StartCopyNo" value="14"/>
+    <Numeric name="StartCopyNo" value="15"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+12*[DeltaX_ServiceModule]+6*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-120.325+13*[DeltaX_ServiceModule]+6*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back"/>
-    <String name="ChildName" value="etl:SensorModule_r"/>
-    <Numeric name="N" value="24"/>
-    <Numeric name="StartCopyNo" value="90"/>
+    <rParent name="etl:DiskQuarter_Front"/>
+    <String name="ChildName" value="etl:SensorModule"/>
+    <Numeric name="N" value="24"/>
+    <Numeric name="StartCopyNo" value="97"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+13*[DeltaX_ServiceModule]+6*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (-120.325+14*[DeltaX_ServiceModule]+6*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back"/>
-    <String name="ChildName" value="etl:SensorModule_r_2"/>
+    <rParent name="etl:DiskQuarter_Front"/>
+    <String name="ChildName" value="etl:SensorModule_2"/>
     <Numeric name="N" value="24"/>
-    <Numeric name="StartCopyNo" value="103"/>
+    <Numeric name="StartCopyNo" value="119"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+13*[DeltaX_ServiceModule]+7*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (-120.325+14*[DeltaX_ServiceModule]+7*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back"/>
+    <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="4"/>
-    <Numeric name="StartCopyNo" value="18"/>
+    <Numeric name="StartCopyNo" value="19"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+14*[DeltaX_ServiceModule]+7*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-120.325+15*[DeltaX_ServiceModule]+7*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back"/>
-    <String name="ChildName" value="etl:SensorModule_r"/>
+    <rParent name="etl:DiskQuarter_Front"/>
+    <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="24"/>
-    <Numeric name="StartCopyNo" value="114"/>
+    <Numeric name="StartCopyNo" value="121"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+15*[DeltaX_ServiceModule]+7*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (-120.325+16*[DeltaX_ServiceModule]+7*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back"/>
-    <String name="ChildName" value="etl:SensorModule_r_2"/>
+    <rParent name="etl:DiskQuarter_Front"/>
+    <String name="ChildName" value="etl:SensorModule_2"/>
     <Numeric name="N" value="24"/>
-    <Numeric name="StartCopyNo" value="127"/>
+    <Numeric name="StartCopyNo" value="143"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+15*[DeltaX_ServiceModule]+8*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (-120.325+16*[DeltaX_ServiceModule]+8*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back"/>
+    <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="4"/>
-    <Numeric name="StartCopyNo" value="22"/>
+    <Numeric name="StartCopyNo" value="23"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+16*[DeltaX_ServiceModule]+8*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-120.325+17*[DeltaX_ServiceModule]+8*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back"/>
-    <String name="ChildName" value="etl:SensorModule_r"/>
+    <rParent name="etl:DiskQuarter_Front"/>
+    <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="24"/>
-    <Numeric name="StartCopyNo" value="138"/>
+    <Numeric name="StartCopyNo" value="145"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+17*[DeltaX_ServiceModule]+8*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (-120.325+18*[DeltaX_ServiceModule]+8*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back"/>
-    <String name="ChildName" value="etl:SensorModule_r_2"/>
+    <rParent name="etl:DiskQuarter_Front"/>
+    <String name="ChildName" value="etl:SensorModule_2"/>
     <Numeric name="N" value="27"/>
-    <Numeric name="StartCopyNo" value="151"/>
+    <Numeric name="StartCopyNo" value="167"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+17*[DeltaX_ServiceModule]+9*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (-120.325+18*[DeltaX_ServiceModule]+9*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back"/>
+    <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:ServiceHybrid_short"/>
     <Numeric name="N" value="1"/>
-    <Numeric name="StartCopyNo" value="2"/>
+    <Numeric name="StartCopyNo" value="5"/>
     <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+18*[DeltaX_ServiceModule]+9*[SensorModuledx])*cm, 6.5275*cm, 0.*cm </Vector>
+    <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-120.325+19*[DeltaX_ServiceModule]+9*[SensorModuledx])*cm, 6.5275*cm, 0*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back"/>
+    <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="4"/>
-    <Numeric name="StartCopyNo" value="26"/>
+    <Numeric name="StartCopyNo" value="27"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+18*[DeltaX_ServiceModule]+9*[SensorModuledx])*cm, (6.5275+[DeltaY_ServiceLong_ServiceShort]+[DeltaY])*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-120.325+19*[DeltaX_ServiceModule]+9*[SensorModuledx])*cm, (6.5275+[DeltaY_ServiceLong_ServiceShort]+[DeltaY])*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back"/>
-    <String name="ChildName" value="etl:SensorModule_r"/>
+    <rParent name="etl:DiskQuarter_Front"/>
+    <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="27"/>
-    <Numeric name="StartCopyNo" value="162"/>
+    <Numeric name="StartCopyNo" value="169"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+19*[DeltaX_ServiceModule]+9*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (-120.325+20*[DeltaX_ServiceModule]+9*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back"/>
-    <String name="ChildName" value="etl:SensorModule_r_2"/>
+    <rParent name="etl:DiskQuarter_Front"/>
+    <String name="ChildName" value="etl:SensorModule_2"/>
     <Numeric name="N" value="27"/>
-    <Numeric name="StartCopyNo" value="178"/>
+    <Numeric name="StartCopyNo" value="194"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+19*[DeltaX_ServiceModule]+10*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (-120.325+20*[DeltaX_ServiceModule]+10*[SensorModuledx])*cm, (2.155+[SensorModuledy]+[DeltaY])*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back"/>
+    <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:ServiceHybrid_short"/>
     <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="3"/>
+    <Numeric name="StartCopyNo" value="6"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+20*[DeltaX_ServiceModule]+10*[SensorModuledx])*cm, 6.5275*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-120.325+21*[DeltaX_ServiceModule]+10*[SensorModuledx])*cm, (2.155+2*[SensorModuledy]+2*[DeltaY])*cm, 0*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back"/>
+    <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="30"/>
+    <Numeric name="StartCopyNo" value="31"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+20*[DeltaX_ServiceModule]+10*[SensorModuledx])*cm, (6.5275+2*[ServiceHybrid_Y_short]+[DeltaY_ServiceLong_ServiceShort]+3*[DeltaY])*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-120.325+21*[DeltaX_ServiceModule]+10*[SensorModuledx])*cm, (2.155+2*[SensorModuledy]+2*[DeltaY]+2*[ServiceHybrid_Y_short]+[DeltaY_ServiceLong_ServiceShort]+3*[DeltaY])*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back"/>
-    <String name="ChildName" value="etl:SensorModule_r"/>
-    <Numeric name="N" value="27"/>
-    <Numeric name="StartCopyNo" value="189"/>
+    <rParent name="etl:DiskQuarter_Front"/>
+    <String name="ChildName" value="etl:SensorModule"/>
+    <Numeric name="N" value="24"/>
+    <Numeric name="StartCopyNo" value="196"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+21*[DeltaX_ServiceModule]+10*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (-120.325+22*[DeltaX_ServiceModule]+10*[SensorModuledx])*cm, ( 2.155+4*[SensorModuledy]+4*[DeltaY])*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back"/>
-    <String name="ChildName" value="etl:SensorModule_r_2"/>
-    <Numeric name="N" value="24"/>
-    <Numeric name="StartCopyNo" value="205"/>
+    <rParent name="etl:DiskQuarter_Front"/>
+    <String name="ChildName" value="etl:SensorModule_2"/>
+    <Numeric name="N" value="21"/>
+    <Numeric name="StartCopyNo" value="221"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+21*[DeltaX_ServiceModule]+11*[SensorModuledx])*cm, (2.155+4*[SensorModuledy]+4*[DeltaY])*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (-120.325+22*[DeltaX_ServiceModule]+11*[SensorModuledx])*cm, ( 2.155+6*[SensorModuledy]+6*[DeltaY])*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back"/>
+    <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:ServiceHybrid_short"/>
-    <Numeric name="N" value="2"/>
-    <Numeric name="StartCopyNo" value="6"/>
+    <Numeric name="N" value="1"/>
+    <Numeric name="StartCopyNo" value="9"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+22*[DeltaX_ServiceModule]+11*[SensorModuledx])*cm, (2.155+5*[SensorModuledy]+5*[DeltaY])*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-120.325+23*[DeltaX_ServiceModule]+11*[SensorModuledx])*cm, (2.155+7*[SensorModuledy]+7*[DeltaY])*cm, 0*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back"/>
+    <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="33"/>
+    <Numeric name="StartCopyNo" value="34"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+22*[DeltaX_ServiceModule]+11*[SensorModuledx])*cm, (2.155+5*[SensorModuledy]+5*[DeltaY]+[ServiceHybrid_Y_short]+[DeltaY_ServiceLong_ServiceShort]+2*[DeltaY])*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-120.325+23*[DeltaX_ServiceModule]+11*[SensorModuledx])*cm, (2.155+7*[SensorModuledy]+8*[DeltaY]+[DeltaY_ServiceLong_ServiceShort])*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back"/>
-    <String name="ChildName" value="etl:SensorModule_r"/>
-    <Numeric name="N" value="23"/>
-    <Numeric name="StartCopyNo" value="216"/>
+    <rParent name="etl:DiskQuarter_Front"/>
+    <String name="ChildName" value="etl:SensorModule"/>
+    <Numeric name="N" value="21"/>
+    <Numeric name="StartCopyNo" value="220"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+23*[DeltaX_ServiceModule]+11*[SensorModuledx])*cm, (2.155+5*[SensorModuledy]+5*[DeltaY])*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (-120.325+24*[DeltaX_ServiceModule]+11*[SensorModuledx])*cm, ( 2.155+6*[SensorModuledy]+6*[DeltaY])*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back"/>
-    <String name="ChildName" value="etl:SensorModule_r_2"/>
+    <rParent name="etl:DiskQuarter_Front"/>
+    <String name="ChildName" value="etl:SensorModule_2"/>
     <Numeric name="N" value="21"/>
-    <Numeric name="StartCopyNo" value="229"/>
+    <Numeric name="StartCopyNo" value="242"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+23*[DeltaX_ServiceModule]+12*[SensorModuledx])*cm, (2.155+6*[SensorModuledy]+6*[DeltaY])*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (-120.325+24*[DeltaX_ServiceModule]+12*[SensorModuledx])*cm, ( 2.155+7*[SensorModuledy]+7*[DeltaY])*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back"/>
+    <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:ServiceHybrid_short"/>
     <Numeric name="N" value="1"/>
-    <Numeric name="StartCopyNo" value="8"/>
+    <Numeric name="StartCopyNo" value="10"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+24*[DeltaX_ServiceModule]+12*[SensorModuledx])*cm, (2.155+7*[SensorModuledy]+7*[DeltaY])*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-120.325+25*[DeltaX_ServiceModule]+12*[SensorModuledx])*cm, (2.155+8*[SensorModuledy]+8*[DeltaY])*cm, 0*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back"/>
+    <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="36"/>
+    <Numeric name="StartCopyNo" value="37"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+24*[DeltaX_ServiceModule]+12*[SensorModuledx])*cm, (2.155+7*[SensorModuledy]+7*[DeltaY]+[DeltaY_ServiceLong_ServiceShort]+[DeltaY])*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-120.325+25*[DeltaX_ServiceModule]+12*[SensorModuledx])*cm, (2.155+8*[SensorModuledy]+9*[DeltaY]+[DeltaY_ServiceLong_ServiceShort])*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back"/>
-    <String name="ChildName" value="etl:SensorModule_r"/>
-    <Numeric name="N" value="20"/>
-    <Numeric name="StartCopyNo" value="239"/>
+    <rParent name="etl:DiskQuarter_Front"/>
+    <String name="ChildName" value="etl:SensorModule"/>
+    <Numeric name="N" value="21"/>
+    <Numeric name="StartCopyNo" value="241"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+25*[DeltaX_ServiceModule]+12*[SensorModuledx])*cm, (2.155+7*[SensorModuledy]+7*[DeltaY])*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (-120.325+26*[DeltaX_ServiceModule]+12*[SensorModuledx])*cm, ( 2.155+7*[SensorModuledy]+7*[DeltaY])*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back"/>
-    <String name="ChildName" value="etl:SensorModule_r_2"/>
+    <rParent name="etl:DiskQuarter_Front"/>
+    <String name="ChildName" value="etl:SensorModule_2"/>
     <Numeric name="N" value="21"/>
-    <Numeric name="StartCopyNo" value="250"/>
+    <Numeric name="StartCopyNo" value="242"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+25*[DeltaX_ServiceModule]+13*[SensorModuledx])*cm, (2.155+7*[SensorModuledy]+7*[DeltaY])*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (-120.325+26*[DeltaX_ServiceModule]+13*[SensorModuledx])*cm, ( 2.155+8*[SensorModuledy]+8*[DeltaY])*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back"/>
+    <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:ServiceHybrid_short"/>
     <Numeric name="N" value="1"/>
-    <Numeric name="StartCopyNo" value="9"/>
+    <Numeric name="StartCopyNo" value="11"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+26*[DeltaX_ServiceModule]+13*[SensorModuledx])*cm, (2.155+8*[SensorModuledy]+8*[DeltaY])*cm, 0*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (-120.325+27*[DeltaX_ServiceModule]+13*[SensorModuledx])*cm, (2.155+9*[SensorModuledy]+9*[DeltaY])*cm, 0*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back"/>
+    <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="39"/>
+    <Numeric name="StartCopyNo" value="40"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+26*[DeltaX_ServiceModule]+13*[SensorModuledx])*cm, (2.155+8*[SensorModuledy]+8*[DeltaY]+[DeltaY_ServiceLong_ServiceShort]+[DeltaY])*cm, 0.*cm </Vector>
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-  </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back"/>
-    <String name="ChildName" value="etl:SensorModule_r"/>
-    <Numeric name="N" value="20"/>
-    <Numeric name="StartCopyNo" value="259"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+27*[DeltaX_ServiceModule]+13*[SensorModuledx])*cm, (2.155+8*[SensorModuledy]+8*[DeltaY])*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (-120.325+27*[DeltaX_ServiceModule]+13*[SensorModuledx])*cm, (2.155+9*[SensorModuledy]+10*[DeltaY]+[DeltaY_ServiceLong_ServiceShort])*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back"/>
-    <String name="ChildName" value="etl:SensorModule_r_2"/>
+    <rParent name="etl:DiskQuarter_Front"/>
+    <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="21"/>
-    <Numeric name="StartCopyNo" value="271"/>
+    <Numeric name="StartCopyNo" value="262"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+27*[DeltaX_ServiceModule]+14*[SensorModuledx])*cm, (2.155+8*[SensorModuledy]+8*[DeltaY])*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (-120.325+28*[DeltaX_ServiceModule]+13*[SensorModuledx])*cm, ( 2.155+8*[SensorModuledy]+8*[DeltaY])*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back"/>
-    <String name="ChildName" value="etl:ServiceHybrid_short"/>
-    <Numeric name="N" value="1"/>
-    <Numeric name="StartCopyNo" value="10"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+28*[DeltaX_ServiceModule]+14*[SensorModuledx])*cm, (2.155+9*[SensorModuledy]+9*[DeltaY])*cm, 0*cm </Vector> 
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
+
+
+
+
+
+    <!-- Disk1 Back face -->
+  <Algorithm name="global:DDMTDLinear">
+	<rParent name="etl:DiskQuarter_Back"/>
+	<String name="ChildName" value="etl:ServiceHybrid"/>
+	<Numeric name="N" value="1"/>
+	<Numeric name="StartCopyNo" value="1"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> -122.0*cm, 13.055*cm, 0.*cm </Vector> 
+	<Numeric name="Theta" value="90.*deg"/> <!-- translation along y -->
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDMTDLinear">
+	<rParent name="etl:DiskQuarter_Back"/>
+	<String name="ChildName" value="etl:SensorModule_r"/>
+	<Numeric name="N" value="6"/>
+	<Numeric name="StartCopyNo" value="1"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+[DeltaX_ServiceModule])*cm, 2.155*cm, -0.178*cm </Vector> 
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDMTDLinear">
+	<rParent name="etl:DiskQuarter_Back"/>
+	<String name="ChildName" value="etl:SensorModule_r_2"/>
+	<Numeric name="N" value="10"/>
+	<Numeric name="StartCopyNo" value="1"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+[DeltaX_ServiceModule]+[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDMTDLinear">
+	<rParent name="etl:DiskQuarter_Back"/>
+	<String name="ChildName" value="etl:ServiceHybrid"/>
+	<Numeric name="N" value="2"/>
+	<Numeric name="StartCopyNo" value="2"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+2*[DeltaX_ServiceModule]+[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDMTDLinear">
+	<rParent name="etl:DiskQuarter_Back"/>
+	<String name="ChildName" value="etl:SensorModule_r"/>
+	<Numeric name="N" value="12"/>
+	<Numeric name="StartCopyNo" value="7"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+3*[DeltaX_ServiceModule]+[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDMTDLinear">
+	<rParent name="etl:DiskQuarter_Back"/>
+	<String name="ChildName" value="etl:SensorModule_r_2"/>
+	<Numeric name="N" value="14"/>
+	<Numeric name="StartCopyNo" value="11"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+3*[DeltaX_ServiceModule]+2*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDMTDLinear">
+	<rParent name="etl:DiskQuarter_Back"/>
+	<String name="ChildName" value="etl:ServiceHybrid"/>
+	<Numeric name="N" value="2"/>
+	<Numeric name="StartCopyNo" value="4"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+4*[DeltaX_ServiceModule]+2*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDMTDLinear">  <!-- 1st placement of a short service hybrid -->
+	<rParent name="etl:DiskQuarter_Back"/>
+	<String name="ChildName" value="etl:ServiceHybrid_short"/>
+	<Numeric name="N" value="1"/>
+	<Numeric name="StartCopyNo" value="1"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+4*[DeltaX_ServiceModule]+2*[SensorModuledx])*cm, (13.055+[ServiceHybrid_Y]+2*[DeltaY]+[DeltaY_ServiceLong_ServiceShort])*cm, 0.*cm </Vector>
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDMTDLinear">
+	<rParent name="etl:DiskQuarter_Back"/>
+	<String name="ChildName" value="etl:SensorModule_r"/>
+	<Numeric name="N" value="15"/>
+	<Numeric name="StartCopyNo" value="19"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+5*[DeltaX_ServiceModule]+2*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDMTDLinear">
+	<rParent name="etl:DiskQuarter_Back"/>
+	<String name="ChildName" value="etl:SensorModule_r_2"/>
+	<Numeric name="N" value="17"/>
+	<Numeric name="StartCopyNo" value="25"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+5*[DeltaX_ServiceModule]+3*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Back"/>
-    <String name="ChildName" value="etl:ServiceHybrid"/>
-    <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="42"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.0875+28*[DeltaX_ServiceModule]+14*[SensorModuledx])*cm, (2.155+9*[SensorModuledy]+9*[DeltaY]+[DeltaY_ServiceLong_ServiceShort]+[DeltaY])*cm, 0*cm </Vector> 
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
+	<String name="ChildName" value="etl:ServiceHybrid"/>
+	<Numeric name="N" value="3"/>
+	<Numeric name="StartCopyNo" value="6"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+6*[DeltaX_ServiceModule]+3*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDMTDLinear">
+	<rParent name="etl:DiskQuarter_Back"/>
+	<String name="ChildName" value="etl:SensorModule_r"/>
+	<Numeric name="N" value="18"/>
+	<Numeric name="StartCopyNo" value="34"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+7*[DeltaX_ServiceModule]+3*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDMTDLinear">
+	<rParent name="etl:DiskQuarter_Back"/>
+	<String name="ChildName" value="etl:SensorModule_r_2"/>
+	<Numeric name="N" value="18"/>
+	<Numeric name="StartCopyNo" value="42"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+7*[DeltaX_ServiceModule]+4*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDMTDLinear">
+	<rParent name="etl:DiskQuarter_Back"/>
+	<String name="ChildName" value="etl:ServiceHybrid"/>
+	<Numeric name="N" value="3"/>
+	<Numeric name="StartCopyNo" value="9"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+8*[DeltaX_ServiceModule]+4*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDMTDLinear">
+	<rParent name="etl:DiskQuarter_Back"/>
+	<String name="ChildName" value="etl:SensorModule_r"/>
+	<Numeric name="N" value="18"/>
+	<Numeric name="StartCopyNo" value="52"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+9*[DeltaX_ServiceModule]+4*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDMTDLinear">
+	<rParent name="etl:DiskQuarter_Back"/>
+	<String name="ChildName" value="etl:SensorModule_r_2"/>
+	<Numeric name="N" value="21"/>
+	<Numeric name="StartCopyNo" value="60"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+9*[DeltaX_ServiceModule]+5*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDMTDLinear">
+	<rParent name="etl:DiskQuarter_Back"/>
+	<String name="ChildName" value="etl:ServiceHybrid"/>
+	<Numeric name="N" value="3"/>
+	<Numeric name="StartCopyNo" value="12"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+10*[DeltaX_ServiceModule]+5*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDMTDLinear">
+	<rParent name="etl:DiskQuarter_Back"/>
+	<String name="ChildName" value="etl:ServiceHybrid_short"/>
+	<Numeric name="N" value="1"/>
+	<Numeric name="StartCopyNo" value="2"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+10*[DeltaX_ServiceModule]+5*[SensorModuledx])*cm, (13.055+2*[ServiceHybrid_Y]+3*[DeltaY]+[DeltaY_ServiceLong_ServiceShort])*cm, 0.*cm </Vector>
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDMTDLinear">
+	<rParent name="etl:DiskQuarter_Back"/>
+	<String name="ChildName" value="etl:SensorModule_r"/>
+	<Numeric name="N" value="21"/>
+	<Numeric name="StartCopyNo" value="70"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+11*[DeltaX_ServiceModule]+5*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDMTDLinear">
+	<rParent name="etl:DiskQuarter_Back"/>
+	<String name="ChildName" value="etl:SensorModule_r_2"/>
+	<Numeric name="N" value="23"/>
+	<Numeric name="StartCopyNo" value="81"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+11*[DeltaX_ServiceModule]+6*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDMTDLinear">
+	<rParent name="etl:DiskQuarter_Back"/>
+	<String name="ChildName" value="etl:ServiceHybrid"/>
+	<Numeric name="N" value="4"/>
+	<Numeric name="StartCopyNo" value="15"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+12*[DeltaX_ServiceModule]+6*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDMTDLinear">
+	<rParent name="etl:DiskQuarter_Back"/>
+	<String name="ChildName" value="etl:SensorModule_r"/>
+	<Numeric name="N" value="24"/>
+	<Numeric name="StartCopyNo" value="91"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+13*[DeltaX_ServiceModule]+6*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDMTDLinear">
+	<rParent name="etl:DiskQuarter_Back"/>
+	<String name="ChildName" value="etl:SensorModule_r_2"/>
+	<Numeric name="N" value="24"/>
+	<Numeric name="StartCopyNo" value="104"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+13*[DeltaX_ServiceModule]+7*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDMTDLinear">
+	<rParent name="etl:DiskQuarter_Back"/>
+	<String name="ChildName" value="etl:ServiceHybrid"/>
+	<Numeric name="N" value="4"/>
+	<Numeric name="StartCopyNo" value="19"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+14*[DeltaX_ServiceModule]+7*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDMTDLinear">
+	<rParent name="etl:DiskQuarter_Back"/>
+	<String name="ChildName" value="etl:SensorModule_r"/>
+	<Numeric name="N" value="24"/>
+	<Numeric name="StartCopyNo" value="115"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+15*[DeltaX_ServiceModule]+7*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDMTDLinear">
+	<rParent name="etl:DiskQuarter_Back"/>
+	<String name="ChildName" value="etl:SensorModule_r_2"/>
+	<Numeric name="N" value="24"/>
+	<Numeric name="StartCopyNo" value="128"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+15*[DeltaX_ServiceModule]+8*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDMTDLinear">
+	<rParent name="etl:DiskQuarter_Back"/>
+	<String name="ChildName" value="etl:ServiceHybrid"/>
+	<Numeric name="N" value="4"/>
+	<Numeric name="StartCopyNo" value="23"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+16*[DeltaX_ServiceModule]+8*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDMTDLinear">
+	<rParent name="etl:DiskQuarter_Back"/>
+	<String name="ChildName" value="etl:SensorModule_r"/>
+	<Numeric name="N" value="24"/>
+	<Numeric name="StartCopyNo" value="139"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+17*[DeltaX_ServiceModule]+8*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDMTDLinear">
+	<rParent name="etl:DiskQuarter_Back"/>
+	<String name="ChildName" value="etl:SensorModule_r_2"/>
+	<Numeric name="N" value="27"/>
+	<Numeric name="StartCopyNo" value="152"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+17*[DeltaX_ServiceModule]+9*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDMTDLinear">
+	<rParent name="etl:DiskQuarter_Back"/>
+	<String name="ChildName" value="etl:ServiceHybrid_short"/>
+	<Numeric name="N" value="1"/>
+	<Numeric name="StartCopyNo" value="3"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+18*[DeltaX_ServiceModule]+9*[SensorModuledx])*cm, 6.5275*cm, 0.*cm </Vector>
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDMTDLinear">
+	<rParent name="etl:DiskQuarter_Back"/>
+	<String name="ChildName" value="etl:ServiceHybrid"/>
+	<Numeric name="N" value="4"/>
+	<Numeric name="StartCopyNo" value="27"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+18*[DeltaX_ServiceModule]+9*[SensorModuledx])*cm, (6.5275+[DeltaY_ServiceLong_ServiceShort]+[DeltaY])*cm, 0.*cm </Vector>
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDMTDLinear">
+	<rParent name="etl:DiskQuarter_Back"/>
+	<String name="ChildName" value="etl:SensorModule_r"/>
+	<Numeric name="N" value="27"/>
+	<Numeric name="StartCopyNo" value="163"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+19*[DeltaX_ServiceModule]+9*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDMTDLinear">
+	<rParent name="etl:DiskQuarter_Back"/>
+	<String name="ChildName" value="etl:SensorModule_r_2"/>
+	<Numeric name="N" value="27"/>
+	<Numeric name="StartCopyNo" value="179"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+19*[DeltaX_ServiceModule]+10*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDMTDLinear">
+	<rParent name="etl:DiskQuarter_Back"/>
+	<String name="ChildName" value="etl:ServiceHybrid_short"/>
+	<Numeric name="N" value="3"/>
+	<Numeric name="StartCopyNo" value="4"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+20*[DeltaX_ServiceModule]+10*[SensorModuledx])*cm, 6.5275*cm, 0.*cm </Vector>
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDMTDLinear">
+	<rParent name="etl:DiskQuarter_Back"/>
+	<String name="ChildName" value="etl:ServiceHybrid"/>
+	<Numeric name="N" value="3"/>
+	<Numeric name="StartCopyNo" value="31"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+20*[DeltaX_ServiceModule]+10*[SensorModuledx])*cm, (6.5275+2*[ServiceHybrid_Y_short]+[DeltaY_ServiceLong_ServiceShort]+3*[DeltaY])*cm, 0.*cm </Vector>
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDMTDLinear">
+	<rParent name="etl:DiskQuarter_Back"/>
+	<String name="ChildName" value="etl:SensorModule_r"/>
+	<Numeric name="N" value="27"/>
+	<Numeric name="StartCopyNo" value="190"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+21*[DeltaX_ServiceModule]+10*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDMTDLinear">
+	<rParent name="etl:DiskQuarter_Back"/>
+	<String name="ChildName" value="etl:SensorModule_r_2"/>
+	<Numeric name="N" value="24"/>
+	<Numeric name="StartCopyNo" value="206"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+21*[DeltaX_ServiceModule]+11*[SensorModuledx])*cm, (2.155+4*[SensorModuledy]+4*[DeltaY])*cm, -0.178*cm </Vector> 
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDMTDLinear">
+	<rParent name="etl:DiskQuarter_Back"/>
+	<String name="ChildName" value="etl:ServiceHybrid_short"/>
+	<Numeric name="N" value="2"/>
+	<Numeric name="StartCopyNo" value="7"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+22*[DeltaX_ServiceModule]+11*[SensorModuledx])*cm, (2.155+5*[SensorModuledy]+5*[DeltaY])*cm, 0.*cm </Vector>
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDMTDLinear">
+	<rParent name="etl:DiskQuarter_Back"/>
+	<String name="ChildName" value="etl:ServiceHybrid"/>
+	<Numeric name="N" value="3"/>
+	<Numeric name="StartCopyNo" value="34"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+22*[DeltaX_ServiceModule]+11*[SensorModuledx])*cm, (2.155+5*[SensorModuledy]+5*[DeltaY]+[ServiceHybrid_Y_short]+[DeltaY_ServiceLong_ServiceShort]+2*[DeltaY])*cm, 0.*cm </Vector>
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDMTDLinear">
+	<rParent name="etl:DiskQuarter_Back"/>
+	<String name="ChildName" value="etl:SensorModule_r"/>
+	<Numeric name="N" value="23"/>
+	<Numeric name="StartCopyNo" value="217"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+23*[DeltaX_ServiceModule]+11*[SensorModuledx])*cm, (2.155+5*[SensorModuledy]+5*[DeltaY])*cm, -0.178*cm </Vector> 
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDMTDLinear">
+	<rParent name="etl:DiskQuarter_Back"/>
+	<String name="ChildName" value="etl:SensorModule_r_2"/>
+	<Numeric name="N" value="21"/>
+	<Numeric name="StartCopyNo" value="230"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+23*[DeltaX_ServiceModule]+12*[SensorModuledx])*cm, (2.155+6*[SensorModuledy]+6*[DeltaY])*cm, -0.178*cm </Vector> 
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDMTDLinear">
+	<rParent name="etl:DiskQuarter_Back"/>
+	<String name="ChildName" value="etl:ServiceHybrid_short"/>
+	<Numeric name="N" value="1"/>
+	<Numeric name="StartCopyNo" value="9"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+24*[DeltaX_ServiceModule]+12*[SensorModuledx])*cm, (2.155+7*[SensorModuledy]+7*[DeltaY])*cm, 0.*cm </Vector>
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDMTDLinear">
+	<rParent name="etl:DiskQuarter_Back"/>
+	<String name="ChildName" value="etl:ServiceHybrid"/>
+	<Numeric name="N" value="3"/>
+	<Numeric name="StartCopyNo" value="37"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+24*[DeltaX_ServiceModule]+12*[SensorModuledx])*cm, (2.155+7*[SensorModuledy]+7*[DeltaY]+[DeltaY_ServiceLong_ServiceShort]+[DeltaY])*cm, 0.*cm </Vector>
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDMTDLinear">
+	<rParent name="etl:DiskQuarter_Back"/>
+	<String name="ChildName" value="etl:SensorModule_r"/>
+	<Numeric name="N" value="20"/>
+	<Numeric name="StartCopyNo" value="240"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+25*[DeltaX_ServiceModule]+12*[SensorModuledx])*cm, (2.155+7*[SensorModuledy]+7*[DeltaY])*cm, -0.178*cm </Vector> 
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDMTDLinear">
+	<rParent name="etl:DiskQuarter_Back"/>
+	<String name="ChildName" value="etl:SensorModule_r_2"/>
+	<Numeric name="N" value="21"/>
+	<Numeric name="StartCopyNo" value="251"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+25*[DeltaX_ServiceModule]+13*[SensorModuledx])*cm, (2.155+7*[SensorModuledy]+7*[DeltaY])*cm, -0.178*cm </Vector> 
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDMTDLinear">
+	<rParent name="etl:DiskQuarter_Back"/>
+	<String name="ChildName" value="etl:ServiceHybrid_short"/>
+	<Numeric name="N" value="1"/>
+	<Numeric name="StartCopyNo" value="10"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+26*[DeltaX_ServiceModule]+13*[SensorModuledx])*cm, (2.155+8*[SensorModuledy]+8*[DeltaY])*cm, 0*cm </Vector> 
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDMTDLinear">
+	<rParent name="etl:DiskQuarter_Back"/>
+	<String name="ChildName" value="etl:ServiceHybrid"/>
+	<Numeric name="N" value="3"/>
+	<Numeric name="StartCopyNo" value="40"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+26*[DeltaX_ServiceModule]+13*[SensorModuledx])*cm, (2.155+8*[SensorModuledy]+8*[DeltaY]+[DeltaY_ServiceLong_ServiceShort]+[DeltaY])*cm, 0.*cm </Vector>
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDMTDLinear">
+	<rParent name="etl:DiskQuarter_Back"/>
+	<String name="ChildName" value="etl:SensorModule_r"/>
+	<Numeric name="N" value="20"/>
+	<Numeric name="StartCopyNo" value="260"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+27*[DeltaX_ServiceModule]+13*[SensorModuledx])*cm, (2.155+8*[SensorModuledy]+8*[DeltaY])*cm, -0.178*cm </Vector> 
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDMTDLinear">
+	<rParent name="etl:DiskQuarter_Back"/>
+	<String name="ChildName" value="etl:SensorModule_r_2"/>
+	<Numeric name="N" value="21"/>
+	<Numeric name="StartCopyNo" value="272"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+27*[DeltaX_ServiceModule]+14*[SensorModuledx])*cm, (2.155+8*[SensorModuledy]+8*[DeltaY])*cm, -0.178*cm </Vector> 
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDMTDLinear">
+	<rParent name="etl:DiskQuarter_Back"/>
+	<String name="ChildName" value="etl:ServiceHybrid_short"/>
+	<Numeric name="N" value="1"/>
+	<Numeric name="StartCopyNo" value="11"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+28*[DeltaX_ServiceModule]+14*[SensorModuledx])*cm, (2.155+9*[SensorModuledy]+9*[DeltaY])*cm, 0*cm </Vector> 
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDMTDLinear">
+	<rParent name="etl:DiskQuarter_Back"/>
+	<String name="ChildName" value="etl:ServiceHybrid"/>
+	<Numeric name="N" value="3"/>
+	<Numeric name="StartCopyNo" value="43"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+28*[DeltaX_ServiceModule]+14*[SensorModuledx])*cm, (2.155+9*[SensorModuledy]+9*[DeltaY]+[DeltaY_ServiceLong_ServiceShort]+[DeltaY])*cm, 0*cm </Vector> 
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
 
 
-  <!-- Disk1 Front face -->
+	
+
+
+  	<!-- Disk2 Front face -->
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front"/>
-    <String name="ChildName" value="etl:SensorModule_2"/>
+    <rParent name="etl:DiskQuarter_Front_2"/>
+    <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="7"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="1"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> -122.12*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> 120.325*cm, 2.155*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front"/>
+    <rParent name="etl:DiskQuarter_Front_2"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="1"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="1"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.12+[DeltaX_ServiceModule])*cm, 13.055*cm, 0.*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (120.325-[DeltaX_ServiceModule])*cm, 13.055*cm, 0.*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front"/>
+    <rParent name="etl:DiskQuarter_Front_2"/>
     <String name="ChildName" value="etl:ServiceHybrid_short"/>
     <Numeric name="N" value="1"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="1"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.12+[DeltaX_ServiceModule])*cm, (13.055+[DeltaY_ServiceLong_ServiceShort]+[DeltaY])*cm, 0*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (120.325-[DeltaX_ServiceModule])*cm, (13.055+[DeltaY_ServiceLong_ServiceShort]+[DeltaY])*cm, 0*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front"/>
-    <String name="ChildName" value="etl:SensorModule"/>
+    <rParent name="etl:DiskQuarter_Front_2"/>
+    <String name="ChildName" value="etl:SensorModule_2"/>
     <Numeric name="N" value="9"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="1"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (-122.12+2*[DeltaX_ServiceModule])*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (120.325-2*[DeltaX_ServiceModule])*cm, 2.155*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front"/>
-    <String name="ChildName" value="etl:SensorModule_2"/>
+    <rParent name="etl:DiskQuarter_Front_2"/>
+    <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="12"/>
-    <Numeric name="StartCopyNo" value="7"/>
+    <Numeric name="StartCopyNo" value="8"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (-122.12+2*[DeltaX_ServiceModule]+[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (120.325-2*[DeltaX_ServiceModule]-[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front"/>
+    <rParent name="etl:DiskQuarter_Front_2"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="2"/>
-    <Numeric name="StartCopyNo" value="1"/>
+    <Numeric name="StartCopyNo" value="2"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.12+3*[DeltaX_ServiceModule]+[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (120.325-3*[DeltaX_ServiceModule]-[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front"/>
-    <String name="ChildName" value="etl:SensorModule"/>
+    <rParent name="etl:DiskQuarter_Front_2"/>
+    <String name="ChildName" value="etl:SensorModule_2"/>
     <Numeric name="N" value="12"/>
-    <Numeric name="StartCopyNo" value="9"/>
+    <Numeric name="StartCopyNo" value="10"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (-122.12+4*[DeltaX_ServiceModule]+[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (120.325-4*[DeltaX_ServiceModule]-[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front"/>
-    <String name="ChildName" value="etl:SensorModule_2"/>
+    <rParent name="etl:DiskQuarter_Front_2"/>
+    <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="15"/>
-    <Numeric name="StartCopyNo" value="19"/>
+    <Numeric name="StartCopyNo" value="20"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (-122.12+4*[DeltaX_ServiceModule]+2*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (120.325-4*[DeltaX_ServiceModule]-2*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front"/>
+    <rParent name="etl:DiskQuarter_Front_2"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="2"/>
-    <Numeric name="StartCopyNo" value="3"/>
+    <Numeric name="StartCopyNo" value="4"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.12+5*[DeltaX_ServiceModule]+2*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (120.325-5*[DeltaX_ServiceModule]-2*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front"/>
+    <rParent name="etl:DiskQuarter_Front_2"/>
     <String name="ChildName" value="etl:ServiceHybrid_short"/>
     <Numeric name="N" value="1"/>
-    <Numeric name="StartCopyNo" value="1"/>
+    <Numeric name="StartCopyNo" value="2"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.12+5*[DeltaX_ServiceModule]+2*[SensorModuledx])*cm, (13.055+[ServiceHybrid_Y]+[DeltaY_ServiceLong_ServiceShort]+2*[DeltaY])*cm, 0*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (120.325-5*[DeltaX_ServiceModule]-2*[SensorModuledx])*cm, (13.055+[ServiceHybrid_Y]+[DeltaY_ServiceLong_ServiceShort]+2*[DeltaY])*cm, 0*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front"/>
-    <String name="ChildName" value="etl:SensorModule"/>
+    <rParent name="etl:DiskQuarter_Front_2"/>
+    <String name="ChildName" value="etl:SensorModule_2"/>
     <Numeric name="N" value="15"/>
-    <Numeric name="StartCopyNo" value="21"/>
+    <Numeric name="StartCopyNo" value="22"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (-122.12+6*[DeltaX_ServiceModule]+2*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (120.325-6*[DeltaX_ServiceModule]-2*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front"/>
-    <String name="ChildName" value="etl:SensorModule_2"/>
+    <rParent name="etl:DiskQuarter_Front_2"/>
+    <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="18"/>
-    <Numeric name="StartCopyNo" value="34"/>
+    <Numeric name="StartCopyNo" value="35"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (-122.12+6*[DeltaX_ServiceModule]+3*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (120.325-6*[DeltaX_ServiceModule]-3*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front"/>
+    <rParent name="etl:DiskQuarter_Front_2"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="5"/>
+    <Numeric name="StartCopyNo" value="6"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.12+7*[DeltaX_ServiceModule]+3*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (120.325-7*[DeltaX_ServiceModule]-3*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front"/>
-    <String name="ChildName" value="etl:SensorModule"/>
+    <rParent name="etl:DiskQuarter_Front_2"/>
+    <String name="ChildName" value="etl:SensorModule_2"/>
     <Numeric name="N" value="18"/>
-    <Numeric name="StartCopyNo" value="36"/>
+    <Numeric name="StartCopyNo" value="37"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (-122.12+8*[DeltaX_ServiceModule]+3*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (120.325-8*[DeltaX_ServiceModule]-3*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front"/>
-    <String name="ChildName" value="etl:SensorModule_2"/>
+    <rParent name="etl:DiskQuarter_Front_2"/>
+    <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="21"/>
-    <Numeric name="StartCopyNo" value="52"/>
+    <Numeric name="StartCopyNo" value="53"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (-122.12+8*[DeltaX_ServiceModule]+4*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (120.325-8*[DeltaX_ServiceModule]-4*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front"/>
+    <rParent name="etl:DiskQuarter_Front_2"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="8"/>
+    <Numeric name="StartCopyNo" value="9"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.12+9*[DeltaX_ServiceModule]+4*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (120.325-9*[DeltaX_ServiceModule]-4*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front"/>
+    <rParent name="etl:DiskQuarter_Front_2"/>
     <String name="ChildName" value="etl:ServiceHybrid_short"/>
     <Numeric name="N" value="1"/>
-    <Numeric name="StartCopyNo" value="2"/>
+    <Numeric name="StartCopyNo" value="3"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.12+9*[DeltaX_ServiceModule]+4*[SensorModuledx])*cm, (13.055+2*[ServiceHybrid_Y]+[DeltaY_ServiceLong_ServiceShort]+3*[DeltaY])*cm, 0*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (120.325-9*[DeltaX_ServiceModule]-4*[SensorModuledx])*cm, (13.055+2*[ServiceHybrid_Y]+[DeltaY_ServiceLong_ServiceShort]+3*[DeltaY])*cm, 0*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front"/>
-    <String name="ChildName" value="etl:SensorModule"/>
+    <rParent name="etl:DiskQuarter_Front_2"/>
+    <String name="ChildName" value="etl:SensorModule_2"/>
     <Numeric name="N" value="21"/>
-    <Numeric name="StartCopyNo" value="54"/>
+    <Numeric name="StartCopyNo" value="55"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (-122.12+10*[DeltaX_ServiceModule]+4*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (120.325-10*[DeltaX_ServiceModule]-4*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front"/>
-    <String name="ChildName" value="etl:SensorModule_2"/>
+    <rParent name="etl:DiskQuarter_Front_2"/>
+    <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="21"/>
-    <Numeric name="StartCopyNo" value="73"/>
+    <Numeric name="StartCopyNo" value="74"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (-122.12+10*[DeltaX_ServiceModule]+5*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (120.325-10*[DeltaX_ServiceModule]-5*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front"/>
+    <rParent name="etl:DiskQuarter_Front_2"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="11"/>
+    <Numeric name="StartCopyNo" value="12"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.12+11*[DeltaX_ServiceModule]+5*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (120.325-11*[DeltaX_ServiceModule]-5*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front"/>
+    <rParent name="etl:DiskQuarter_Front_2"/>
     <String name="ChildName" value="etl:ServiceHybrid_short"/>
     <Numeric name="N" value="1"/>
-    <Numeric name="StartCopyNo" value="3"/>
+    <Numeric name="StartCopyNo" value="4"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.12+11*[DeltaX_ServiceModule]+5*[SensorModuledx])*cm, (13.055+2*[ServiceHybrid_Y]+[DeltaY_ServiceLong_ServiceShort]+3*[DeltaY])*cm, 0*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (120.325-11*[DeltaX_ServiceModule]-5*[SensorModuledx])*cm, (13.055+2*[ServiceHybrid_Y]+[DeltaY_ServiceLong_ServiceShort]+3*[DeltaY])*cm, 0*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front"/>
-    <String name="ChildName" value="etl:SensorModule"/>
+    <rParent name="etl:DiskQuarter_Front_2"/>
+    <String name="ChildName" value="etl:SensorModule_2"/>
     <Numeric name="N" value="21"/>
-    <Numeric name="StartCopyNo" value="75"/>
+    <Numeric name="StartCopyNo" value="76"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (-122.12+12*[DeltaX_ServiceModule]+5*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (120.325-12*[DeltaX_ServiceModule]-5*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front"/>
-    <String name="ChildName" value="etl:SensorModule_2"/>
+    <rParent name="etl:DiskQuarter_Front_2"/>
+    <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="24"/>
-    <Numeric name="StartCopyNo" value="94"/>
+    <Numeric name="StartCopyNo" value="95"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (-122.12+12*[DeltaX_ServiceModule]+6*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (120.325-12*[DeltaX_ServiceModule]-6*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front"/>
+    <rParent name="etl:DiskQuarter_Front_2"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="4"/>
-    <Numeric name="StartCopyNo" value="14"/>
+    <Numeric name="StartCopyNo" value="15"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.12+13*[DeltaX_ServiceModule]+6*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (120.325-13*[DeltaX_ServiceModule]-6*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front"/>
-    <String name="ChildName" value="etl:SensorModule"/>
+    <rParent name="etl:DiskQuarter_Front_2"/>
+    <String name="ChildName" value="etl:SensorModule_2"/>
     <Numeric name="N" value="24"/>
-    <Numeric name="StartCopyNo" value="96"/>
+    <Numeric name="StartCopyNo" value="97"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (-122.12+14*[DeltaX_ServiceModule]+6*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (120.325-14*[DeltaX_ServiceModule]-6*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front"/>
-    <String name="ChildName" value="etl:SensorModule_2"/>
+    <rParent name="etl:DiskQuarter_Front_2"/>
+    <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="24"/>
-    <Numeric name="StartCopyNo" value="118"/>
+    <Numeric name="StartCopyNo" value="119"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (-122.12+14*[DeltaX_ServiceModule]+7*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (120.325-14*[DeltaX_ServiceModule]-7*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front"/>
+    <rParent name="etl:DiskQuarter_Front_2"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="4"/>
-    <Numeric name="StartCopyNo" value="18"/>
+    <Numeric name="StartCopyNo" value="19"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.12+15*[DeltaX_ServiceModule]+7*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (120.325-15*[DeltaX_ServiceModule]-7*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front"/>
-    <String name="ChildName" value="etl:SensorModule"/>
+    <rParent name="etl:DiskQuarter_Front_2"/>
+    <String name="ChildName" value="etl:SensorModule_2"/>
     <Numeric name="N" value="24"/>
-    <Numeric name="StartCopyNo" value="120"/>
+    <Numeric name="StartCopyNo" value="121"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (-122.12+16*[DeltaX_ServiceModule]+7*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (120.325-16*[DeltaX_ServiceModule]-7*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front"/>
-    <String name="ChildName" value="etl:SensorModule_2"/>
+    <rParent name="etl:DiskQuarter_Front_2"/>
+    <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="24"/>
-    <Numeric name="StartCopyNo" value="142"/>
+    <Numeric name="StartCopyNo" value="143"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (-122.12+16*[DeltaX_ServiceModule]+8*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (120.325-16*[DeltaX_ServiceModule]-8*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front"/>
+    <rParent name="etl:DiskQuarter_Front_2"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="4"/>
-    <Numeric name="StartCopyNo" value="22"/>
+    <Numeric name="StartCopyNo" value="23"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.12+17*[DeltaX_ServiceModule]+8*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (120.325-17*[DeltaX_ServiceModule]-8*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front"/>
-    <String name="ChildName" value="etl:SensorModule"/>
+    <rParent name="etl:DiskQuarter_Front_2"/>
+    <String name="ChildName" value="etl:SensorModule_2"/>
     <Numeric name="N" value="24"/>
-    <Numeric name="StartCopyNo" value="144"/>
+    <Numeric name="StartCopyNo" value="145"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (-122.12+18*[DeltaX_ServiceModule]+8*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (120.325-18*[DeltaX_ServiceModule]-8*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front"/>
-    <String name="ChildName" value="etl:SensorModule_2"/>
+    <rParent name="etl:DiskQuarter_Front_2"/>
+    <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="27"/>
-    <Numeric name="StartCopyNo" value="166"/>
+    <Numeric name="StartCopyNo" value="167"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (-122.12+18*[DeltaX_ServiceModule]+9*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (120.325-18*[DeltaX_ServiceModule]-9*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+    	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front"/>
+    <rParent name="etl:DiskQuarter_Front_2"/>
     <String name="ChildName" value="etl:ServiceHybrid_short"/>
     <Numeric name="N" value="1"/>
-    <Numeric name="StartCopyNo" value="4"/>
+    <Numeric name="StartCopyNo" value="5"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.12+19*[DeltaX_ServiceModule]+9*[SensorModuledx])*cm, 6.5275*cm, 0*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (120.325-19*[DeltaX_ServiceModule]-9*[SensorModuledx])*cm, 6.5275*cm, 0*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front"/>
+    <rParent name="etl:DiskQuarter_Front_2"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="4"/>
-    <Numeric name="StartCopyNo" value="26"/>
+    <Numeric name="StartCopyNo" value="27"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.12+19*[DeltaX_ServiceModule]+9*[SensorModuledx])*cm, (6.5275+[DeltaY_ServiceLong_ServiceShort]+[DeltaY])*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (120.325-19*[DeltaX_ServiceModule]-9*[SensorModuledx])*cm, (6.5275+[DeltaY_ServiceLong_ServiceShort]+[DeltaY])*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front"/>
-    <String name="ChildName" value="etl:SensorModule"/>
+    <rParent name="etl:DiskQuarter_Front_2"/>
+    <String name="ChildName" value="etl:SensorModule_2"/>
     <Numeric name="N" value="27"/>
-    <Numeric name="StartCopyNo" value="168"/>
+    <Numeric name="StartCopyNo" value="169"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (-122.12+20*[DeltaX_ServiceModule]+9*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (120.325-20*[DeltaX_ServiceModule]-9*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front"/>
-    <String name="ChildName" value="etl:SensorModule_2"/>
+    <rParent name="etl:DiskQuarter_Front_2"/>
+    <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="27"/>
-    <Numeric name="StartCopyNo" value="193"/>
+    <Numeric name="StartCopyNo" value="194"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (-122.12+20*[DeltaX_ServiceModule]+10*[SensorModuledx])*cm, (2.155+[SensorModuledy]+[DeltaY])*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (120.325-20*[DeltaX_ServiceModule]-10*[SensorModuledx])*cm, (2.155+[SensorModuledy]+[DeltaY])*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front"/>
+    <rParent name="etl:DiskQuarter_Front_2"/>
     <String name="ChildName" value="etl:ServiceHybrid_short"/>
     <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="5"/>
+    <Numeric name="StartCopyNo" value="6"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.12+21*[DeltaX_ServiceModule]+10*[SensorModuledx])*cm, (2.155+2*[SensorModuledy]+2*[DeltaY])*cm, 0*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (120.325-21*[DeltaX_ServiceModule]-10*[SensorModuledx])*cm, (2.155+2*[SensorModuledy]+2*[DeltaY])*cm, 0*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front"/>
+    <rParent name="etl:DiskQuarter_Front_2"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="30"/>
+    <Numeric name="StartCopyNo" value="31"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.12+21*[DeltaX_ServiceModule]+10*[SensorModuledx])*cm, (2.155+2*[SensorModuledy]+2*[DeltaY]+2*[ServiceHybrid_Y_short]+[DeltaY_ServiceLong_ServiceShort]+3*[DeltaY])*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (120.325-21*[DeltaX_ServiceModule]-10*[SensorModuledx])*cm, (2.155+2*[SensorModuledy]+2*[DeltaY]+2*[ServiceHybrid_Y_short]+[DeltaY_ServiceLong_ServiceShort]+3*[DeltaY])*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front"/>
-    <String name="ChildName" value="etl:SensorModule"/>
+    <rParent name="etl:DiskQuarter_Front_2"/>
+    <String name="ChildName" value="etl:SensorModule_2"/>
     <Numeric name="N" value="24"/>
-    <Numeric name="StartCopyNo" value="195"/>
+    <Numeric name="StartCopyNo" value="196"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (-122.12+22*[DeltaX_ServiceModule]+10*[SensorModuledx])*cm, ( 2.155+4*[SensorModuledy]+4*[DeltaY])*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (120.325-22*[DeltaX_ServiceModule]-10*[SensorModuledx])*cm, ( 2.155+4*[SensorModuledy]+4*[DeltaY])*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front"/>
-    <String name="ChildName" value="etl:SensorModule_2"/>
+    <rParent name="etl:DiskQuarter_Front_2"/>
+    <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="21"/>
-    <Numeric name="StartCopyNo" value="220"/>
+    <Numeric name="StartCopyNo" value="221"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (-122.12+22*[DeltaX_ServiceModule]+11*[SensorModuledx])*cm, ( 2.155+6*[SensorModuledy]+6*[DeltaY])*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (120.325-22*[DeltaX_ServiceModule]-11*[SensorModuledx])*cm, ( 2.155+6*[SensorModuledy]+6*[DeltaY])*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front"/>
+    <rParent name="etl:DiskQuarter_Front_2"/>
     <String name="ChildName" value="etl:ServiceHybrid_short"/>
     <Numeric name="N" value="1"/>
-    <Numeric name="StartCopyNo" value="8"/>
+    <Numeric name="StartCopyNo" value="9"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.12+23*[DeltaX_ServiceModule]+11*[SensorModuledx])*cm, (2.155+7*[SensorModuledy]+7*[DeltaY])*cm, 0*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (120.325-23*[DeltaX_ServiceModule]-11*[SensorModuledx])*cm, (2.155+7*[SensorModuledy]+7*[DeltaY])*cm, 0*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front"/>
+    <rParent name="etl:DiskQuarter_Front_2"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="33"/>
+    <Numeric name="StartCopyNo" value="34"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.12+23*[DeltaX_ServiceModule]+11*[SensorModuledx])*cm, (2.155+7*[SensorModuledy]+8*[DeltaY]+[DeltaY_ServiceLong_ServiceShort])*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (120.325-23*[DeltaX_ServiceModule]-11*[SensorModuledx])*cm, (2.155+7*[SensorModuledy]+8*[DeltaY]+[DeltaY_ServiceLong_ServiceShort])*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front"/>
-    <String name="ChildName" value="etl:SensorModule"/>
+    <rParent name="etl:DiskQuarter_Front_2"/>
+    <String name="ChildName" value="etl:SensorModule_2"/>
     <Numeric name="N" value="21"/>
-    <Numeric name="StartCopyNo" value="219"/>
+    <Numeric name="StartCopyNo" value="220"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (-122.12+24*[DeltaX_ServiceModule]+11*[SensorModuledx])*cm, ( 2.155+6*[SensorModuledy]+6*[DeltaY])*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (120.325-24*[DeltaX_ServiceModule]-11*[SensorModuledx])*cm, ( 2.155+6*[SensorModuledy]+6*[DeltaY])*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front"/>
-    <String name="ChildName" value="etl:SensorModule_2"/>
+    <rParent name="etl:DiskQuarter_Front_2"/>
+    <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="21"/>
-    <Numeric name="StartCopyNo" value="241"/>
+    <Numeric name="StartCopyNo" value="242"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (-122.12+24*[DeltaX_ServiceModule]+12*[SensorModuledx])*cm, ( 2.155+7*[SensorModuledy]+7*[DeltaY])*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (120.325-24*[DeltaX_ServiceModule]-12*[SensorModuledx])*cm, ( 2.155+7*[SensorModuledy]+7*[DeltaY])*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front"/>
+    <rParent name="etl:DiskQuarter_Front_2"/>
     <String name="ChildName" value="etl:ServiceHybrid_short"/>
     <Numeric name="N" value="1"/>
-    <Numeric name="StartCopyNo" value="9"/>
+    <Numeric name="StartCopyNo" value="10"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.12+25*[DeltaX_ServiceModule]+12*[SensorModuledx])*cm, (2.155+8*[SensorModuledy]+8*[DeltaY])*cm, 0*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (120.325-25*[DeltaX_ServiceModule]-12*[SensorModuledx])*cm, (2.155+8*[SensorModuledy]+8*[DeltaY])*cm, 0*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front"/>
+    <rParent name="etl:DiskQuarter_Front_2"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="36"/>
+    <Numeric name="StartCopyNo" value="37"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.12+25*[DeltaX_ServiceModule]+12*[SensorModuledx])*cm, (2.155+8*[SensorModuledy]+9*[DeltaY]+[DeltaY_ServiceLong_ServiceShort])*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (120.325-25*[DeltaX_ServiceModule]-12*[SensorModuledx])*cm, (2.155+8*[SensorModuledy]+9*[DeltaY]+[DeltaY_ServiceLong_ServiceShort])*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front"/>
-    <String name="ChildName" value="etl:SensorModule"/>
+    <rParent name="etl:DiskQuarter_Front_2"/>
+    <String name="ChildName" value="etl:SensorModule_2"/>
     <Numeric name="N" value="21"/>
-    <Numeric name="StartCopyNo" value="240"/>
+    <Numeric name="StartCopyNo" value="241"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (-122.12+26*[DeltaX_ServiceModule]+12*[SensorModuledx])*cm, ( 2.155+7*[SensorModuledy]+7*[DeltaY])*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (120.325-26*[DeltaX_ServiceModule]-12*[SensorModuledx])*cm, ( 2.155+7*[SensorModuledy]+7*[DeltaY])*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front"/>
-    <String name="ChildName" value="etl:SensorModule_2"/>
+    <rParent name="etl:DiskQuarter_Front_2"/>
+    <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="21"/>
-    <Numeric name="StartCopyNo" value="241"/>
+    <Numeric name="StartCopyNo" value="242"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (-122.12+26*[DeltaX_ServiceModule]+13*[SensorModuledx])*cm, ( 2.155+8*[SensorModuledy]+8*[DeltaY])*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (120.325-26*[DeltaX_ServiceModule]-13*[SensorModuledx])*cm, ( 2.155+8*[SensorModuledy]+8*[DeltaY])*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front"/>
+    <rParent name="etl:DiskQuarter_Front_2"/>
     <String name="ChildName" value="etl:ServiceHybrid_short"/>
     <Numeric name="N" value="1"/>
-    <Numeric name="StartCopyNo" value="10"/>
+    <Numeric name="StartCopyNo" value="11"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.12+27*[DeltaX_ServiceModule]+13*[SensorModuledx])*cm, (2.155+9*[SensorModuledy]+9*[DeltaY])*cm, 0*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (120.325-27*[DeltaX_ServiceModule]-13*[SensorModuledx])*cm, (2.155+9*[SensorModuledy]+9*[DeltaY])*cm, 0*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front"/>
+    <rParent name="etl:DiskQuarter_Front_2"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="39"/>
+    <Numeric name="StartCopyNo" value="40"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-122.12+27*[DeltaX_ServiceModule]+13*[SensorModuledx])*cm, (2.155+9*[SensorModuledy]+10*[DeltaY]+[DeltaY_ServiceLong_ServiceShort])*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (120.325-27*[DeltaX_ServiceModule]-13*[SensorModuledx])*cm, (2.155+9*[SensorModuledy]+10*[DeltaY]+[DeltaY_ServiceLong_ServiceShort])*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front"/>
-    <String name="ChildName" value="etl:SensorModule"/>
+    <rParent name="etl:DiskQuarter_Front_2"/>
+    <String name="ChildName" value="etl:SensorModule_2"/>
     <Numeric name="N" value="21"/>
-    <Numeric name="StartCopyNo" value="261"/>
+    <Numeric name="StartCopyNo" value="262"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (-122.12+28*[DeltaX_ServiceModule]+13*[SensorModuledx])*cm, ( 2.155+8*[SensorModuledy]+8*[DeltaY])*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (120.325-28*[DeltaX_ServiceModule]-13*[SensorModuledx])*cm, ( 2.155+8*[SensorModuledy]+8*[DeltaY])*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
 
 
-  <!-- Disk2 -->
+
+
+
+    <!-- Disk2 Back face -->
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Back_2"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="1"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="1"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> 122.0875*cm, 13.055*cm, 0.*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> 122.0*cm, 13.055*cm, 0.*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> <!-- translation along y -->
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Back_2"/>
     <String name="ChildName" value="etl:SensorModule_r_2"/>
     <Numeric name="N" value="6"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="1"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-[DeltaX_ServiceModule])*cm, 2.155*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-[DeltaX_ServiceModule])*cm, 2.155*cm, -0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Back_2"/>
     <String name="ChildName" value="etl:SensorModule_r"/>
     <Numeric name="N" value="10"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="1"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-[DeltaX_ServiceModule]-[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-[DeltaX_ServiceModule]-[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Back_2"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="2"/>
-    <Numeric name="StartCopyNo" value="1"/>
+    <Numeric name="StartCopyNo" value="2"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-2*[DeltaX_ServiceModule]-[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-2*[DeltaX_ServiceModule]-[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Back_2"/>
     <String name="ChildName" value="etl:SensorModule_r_2"/>
     <Numeric name="N" value="12"/>
-    <Numeric name="StartCopyNo" value="6"/>
+    <Numeric name="StartCopyNo" value="7"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-3*[DeltaX_ServiceModule]-[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-3*[DeltaX_ServiceModule]-[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Back_2"/>
     <String name="ChildName" value="etl:SensorModule_r"/>
     <Numeric name="N" value="14"/>
-    <Numeric name="StartCopyNo" value="10"/>
+    <Numeric name="StartCopyNo" value="11"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-3*[DeltaX_ServiceModule]-2*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-3*[DeltaX_ServiceModule]-2*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Back_2"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="2"/>
-    <Numeric name="StartCopyNo" value="3"/>
+    <Numeric name="StartCopyNo" value="4"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-4*[DeltaX_ServiceModule]-2*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-4*[DeltaX_ServiceModule]-2*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">  <!-- 1st placement of a short service hybrid -->
     <rParent name="etl:DiskQuarter_Back_2"/>
     <String name="ChildName" value="etl:ServiceHybrid_short"/>
     <Numeric name="N" value="1"/>
-    <Numeric name="StartCopyNo" value="0"/>
+    <Numeric name="StartCopyNo" value="1"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-4*[DeltaX_ServiceModule]-2*[SensorModuledx])*cm, (13.055+[ServiceHybrid_Y]+2*[DeltaY]+[DeltaY_ServiceLong_ServiceShort])*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-4*[DeltaX_ServiceModule]-2*[SensorModuledx])*cm, (13.055+[ServiceHybrid_Y]+2*[DeltaY]+[DeltaY_ServiceLong_ServiceShort])*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Back_2"/>
     <String name="ChildName" value="etl:SensorModule_r_2"/>
     <Numeric name="N" value="15"/>
-    <Numeric name="StartCopyNo" value="18"/>
+    <Numeric name="StartCopyNo" value="19"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-5*[DeltaX_ServiceModule]-2*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-5*[DeltaX_ServiceModule]-2*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Back_2"/>
     <String name="ChildName" value="etl:SensorModule_r"/>
     <Numeric name="N" value="17"/>
-    <Numeric name="StartCopyNo" value="24"/>
+    <Numeric name="StartCopyNo" value="25"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-5*[DeltaX_ServiceModule]-3*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-5*[DeltaX_ServiceModule]-3*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Back_2"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="5"/>
+    <Numeric name="StartCopyNo" value="6"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-6*[DeltaX_ServiceModule]-3*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-6*[DeltaX_ServiceModule]-3*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Back_2"/>
     <String name="ChildName" value="etl:SensorModule_r_2"/>
     <Numeric name="N" value="18"/>
-    <Numeric name="StartCopyNo" value="33"/>
+    <Numeric name="StartCopyNo" value="34"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-7*[DeltaX_ServiceModule]-3*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-7*[DeltaX_ServiceModule]-3*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Back_2"/>
     <String name="ChildName" value="etl:SensorModule_r"/>
     <Numeric name="N" value="18"/>
-    <Numeric name="StartCopyNo" value="41"/>
+    <Numeric name="StartCopyNo" value="42"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-7*[DeltaX_ServiceModule]-4*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-7*[DeltaX_ServiceModule]-4*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Back_2"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="8"/>
+    <Numeric name="StartCopyNo" value="9"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-8*[DeltaX_ServiceModule]-4*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-8*[DeltaX_ServiceModule]-4*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Back_2"/>
     <String name="ChildName" value="etl:SensorModule_r_2"/>
     <Numeric name="N" value="18"/>
-    <Numeric name="StartCopyNo" value="51"/>
+    <Numeric name="StartCopyNo" value="52"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-9*[DeltaX_ServiceModule]-4*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-9*[DeltaX_ServiceModule]-4*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Back_2"/>
     <String name="ChildName" value="etl:SensorModule_r"/>
     <Numeric name="N" value="21"/>
-    <Numeric name="StartCopyNo" value="59"/>
+    <Numeric name="StartCopyNo" value="60"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-9*[DeltaX_ServiceModule]-5*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-9*[DeltaX_ServiceModule]-5*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Back_2"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="11"/>
+    <Numeric name="StartCopyNo" value="12"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-10*[DeltaX_ServiceModule]-5*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-10*[DeltaX_ServiceModule]-5*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Back_2"/>
     <String name="ChildName" value="etl:ServiceHybrid_short"/>
     <Numeric name="N" value="1"/>
-    <Numeric name="StartCopyNo" value="1"/>
+    <Numeric name="StartCopyNo" value="2"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-10*[DeltaX_ServiceModule]-5*[SensorModuledx])*cm, (13.055+2*[ServiceHybrid_Y]+3*[DeltaY]+[DeltaY_ServiceLong_ServiceShort])*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-10*[DeltaX_ServiceModule]-5*[SensorModuledx])*cm, (13.055+2*[ServiceHybrid_Y]+3*[DeltaY]+[DeltaY_ServiceLong_ServiceShort])*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Back_2"/>
     <String name="ChildName" value="etl:SensorModule_r_2"/>
     <Numeric name="N" value="21"/>
-    <Numeric name="StartCopyNo" value="69"/>
+    <Numeric name="StartCopyNo" value="70"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-11*[DeltaX_ServiceModule]-5*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-11*[DeltaX_ServiceModule]-5*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Back_2"/>
     <String name="ChildName" value="etl:SensorModule_r"/>
     <Numeric name="N" value="23"/>
-    <Numeric name="StartCopyNo" value="80"/>
+    <Numeric name="StartCopyNo" value="81"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-11*[DeltaX_ServiceModule]-6*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-11*[DeltaX_ServiceModule]-6*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Back_2"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="4"/>
-    <Numeric name="StartCopyNo" value="14"/>
+    <Numeric name="StartCopyNo" value="15"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-12*[DeltaX_ServiceModule]-6*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-12*[DeltaX_ServiceModule]-6*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Back_2"/>
     <String name="ChildName" value="etl:SensorModule_r_2"/>
     <Numeric name="N" value="24"/>
-    <Numeric name="StartCopyNo" value="90"/>
+    <Numeric name="StartCopyNo" value="91"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-13*[DeltaX_ServiceModule]-6*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-13*[DeltaX_ServiceModule]-6*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Back_2"/>
     <String name="ChildName" value="etl:SensorModule_r"/>
     <Numeric name="N" value="24"/>
-    <Numeric name="StartCopyNo" value="103"/>
+    <Numeric name="StartCopyNo" value="104"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-13*[DeltaX_ServiceModule]-7*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-13*[DeltaX_ServiceModule]-7*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Back_2"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="4"/>
-    <Numeric name="StartCopyNo" value="18"/>
+    <Numeric name="StartCopyNo" value="19"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-14*[DeltaX_ServiceModule]-7*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-14*[DeltaX_ServiceModule]-7*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Back_2"/>
     <String name="ChildName" value="etl:SensorModule_r_2"/>
     <Numeric name="N" value="24"/>
-    <Numeric name="StartCopyNo" value="114"/>
+    <Numeric name="StartCopyNo" value="115"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-15*[DeltaX_ServiceModule]-7*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-15*[DeltaX_ServiceModule]-7*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Back_2"/>
     <String name="ChildName" value="etl:SensorModule_r"/>
     <Numeric name="N" value="24"/>
-    <Numeric name="StartCopyNo" value="127"/>
+    <Numeric name="StartCopyNo" value="128"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-15*[DeltaX_ServiceModule]-8*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-15*[DeltaX_ServiceModule]-8*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Back_2"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="4"/>
-    <Numeric name="StartCopyNo" value="22"/>
+    <Numeric name="StartCopyNo" value="23"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-16*[DeltaX_ServiceModule]-8*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-16*[DeltaX_ServiceModule]-8*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Back_2"/>
     <String name="ChildName" value="etl:SensorModule_r_2"/>
     <Numeric name="N" value="24"/>
-    <Numeric name="StartCopyNo" value="138"/>
+    <Numeric name="StartCopyNo" value="139"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-17*[DeltaX_ServiceModule]-8*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-17*[DeltaX_ServiceModule]-8*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Back_2"/>
     <String name="ChildName" value="etl:SensorModule_r"/>
     <Numeric name="N" value="27"/>
-    <Numeric name="StartCopyNo" value="151"/>
+    <Numeric name="StartCopyNo" value="152"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-17*[DeltaX_ServiceModule]-9*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-17*[DeltaX_ServiceModule]-9*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Back_2"/>
     <String name="ChildName" value="etl:ServiceHybrid_short"/>
     <Numeric name="N" value="1"/>
-    <Numeric name="StartCopyNo" value="2"/>
+    <Numeric name="StartCopyNo" value="3"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-18*[DeltaX_ServiceModule]-9*[SensorModuledx])*cm, 6.5275*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-18*[DeltaX_ServiceModule]-9*[SensorModuledx])*cm, 6.5275*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Back_2"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="4"/>
-    <Numeric name="StartCopyNo" value="26"/>
+    <Numeric name="StartCopyNo" value="27"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-18*[DeltaX_ServiceModule]-9*[SensorModuledx])*cm, (6.5275+[DeltaY_ServiceLong_ServiceShort]+[DeltaY])*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-18*[DeltaX_ServiceModule]-9*[SensorModuledx])*cm, (6.5275+[DeltaY_ServiceLong_ServiceShort]+[DeltaY])*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Back_2"/>
     <String name="ChildName" value="etl:SensorModule_r_2"/>
     <Numeric name="N" value="27"/>
-    <Numeric name="StartCopyNo" value="162"/>
+    <Numeric name="StartCopyNo" value="163"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-19*[DeltaX_ServiceModule]-9*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-19*[DeltaX_ServiceModule]-9*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Back_2"/>
     <String name="ChildName" value="etl:SensorModule_r"/>
     <Numeric name="N" value="27"/>
-    <Numeric name="StartCopyNo" value="178"/>
+    <Numeric name="StartCopyNo" value="179"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-19*[DeltaX_ServiceModule]-10*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-19*[DeltaX_ServiceModule]-10*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Back_2"/>
     <String name="ChildName" value="etl:ServiceHybrid_short"/>
     <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="3"/>
+    <Numeric name="StartCopyNo" value="4"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-20*[DeltaX_ServiceModule]-10*[SensorModuledx])*cm, 6.5275*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-20*[DeltaX_ServiceModule]-10*[SensorModuledx])*cm, 6.5275*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Back_2"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="30"/>
+    <Numeric name="StartCopyNo" value="31"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-20*[DeltaX_ServiceModule]-10*[SensorModuledx])*cm, (6.5275+2*[ServiceHybrid_Y_short]+[DeltaY_ServiceLong_ServiceShort]+3*[DeltaY])*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-20*[DeltaX_ServiceModule]-10*[SensorModuledx])*cm, (6.5275+2*[ServiceHybrid_Y_short]+[DeltaY_ServiceLong_ServiceShort]+3*[DeltaY])*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Back_2"/>
     <String name="ChildName" value="etl:SensorModule_r_2"/>
     <Numeric name="N" value="27"/>
-    <Numeric name="StartCopyNo" value="189"/>
+    <Numeric name="StartCopyNo" value="190"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-21*[DeltaX_ServiceModule]-10*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-21*[DeltaX_ServiceModule]-10*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Back_2"/>
     <String name="ChildName" value="etl:SensorModule_r"/>
     <Numeric name="N" value="24"/>
-    <Numeric name="StartCopyNo" value="205"/>
+    <Numeric name="StartCopyNo" value="206"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-21*[DeltaX_ServiceModule]-11*[SensorModuledx])*cm, (2.155+4*[SensorModuledy]+4*[DeltaY])*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-21*[DeltaX_ServiceModule]-11*[SensorModuledx])*cm, (2.155+4*[SensorModuledy]+4*[DeltaY])*cm, -0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Back_2"/>
     <String name="ChildName" value="etl:ServiceHybrid_short"/>
     <Numeric name="N" value="2"/>
-    <Numeric name="StartCopyNo" value="6"/>
+    <Numeric name="StartCopyNo" value="7"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-22*[DeltaX_ServiceModule]-11*[SensorModuledx])*cm, (2.155+5*[SensorModuledy]+5*[DeltaY])*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-22*[DeltaX_ServiceModule]-11*[SensorModuledx])*cm, (2.155+5*[SensorModuledy]+5*[DeltaY])*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Back_2"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="33"/>
+    <Numeric name="StartCopyNo" value="34"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-22*[DeltaX_ServiceModule]-11*[SensorModuledx])*cm, (2.155+5*[SensorModuledy]+5*[DeltaY]+[ServiceHybrid_Y_short]+[DeltaY_ServiceLong_ServiceShort]+2*[DeltaY])*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-22*[DeltaX_ServiceModule]-11*[SensorModuledx])*cm, (2.155+5*[SensorModuledy]+5*[DeltaY]+[ServiceHybrid_Y_short]+[DeltaY_ServiceLong_ServiceShort]+2*[DeltaY])*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Back_2"/>
     <String name="ChildName" value="etl:SensorModule_r_2"/>
     <Numeric name="N" value="23"/>
-    <Numeric name="StartCopyNo" value="216"/>
+    <Numeric name="StartCopyNo" value="217"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-23*[DeltaX_ServiceModule]-11*[SensorModuledx])*cm, (2.155+5*[SensorModuledy]+5*[DeltaY])*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-23*[DeltaX_ServiceModule]-11*[SensorModuledx])*cm, (2.155+5*[SensorModuledy]+5*[DeltaY])*cm, -0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Back_2"/>
     <String name="ChildName" value="etl:SensorModule_r"/>
     <Numeric name="N" value="21"/>
-    <Numeric name="StartCopyNo" value="229"/>
+    <Numeric name="StartCopyNo" value="230"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-23*[DeltaX_ServiceModule]-12*[SensorModuledx])*cm, (2.155+6*[SensorModuledy]+6*[DeltaY])*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-23*[DeltaX_ServiceModule]-12*[SensorModuledx])*cm, (2.155+6*[SensorModuledy]+6*[DeltaY])*cm, -0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Back_2"/>
     <String name="ChildName" value="etl:ServiceHybrid_short"/>
     <Numeric name="N" value="1"/>
-    <Numeric name="StartCopyNo" value="8"/>
+    <Numeric name="StartCopyNo" value="9"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-24*[DeltaX_ServiceModule]-12*[SensorModuledx])*cm, (2.155+7*[SensorModuledy]+7*[DeltaY])*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-24*[DeltaX_ServiceModule]-12*[SensorModuledx])*cm, (2.155+7*[SensorModuledy]+7*[DeltaY])*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Back_2"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="36"/>
+    <Numeric name="StartCopyNo" value="37"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-24*[DeltaX_ServiceModule]-12*[SensorModuledx])*cm, (2.155+7*[SensorModuledy]+7*[DeltaY]+[DeltaY_ServiceLong_ServiceShort]+[DeltaY])*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-24*[DeltaX_ServiceModule]-12*[SensorModuledx])*cm, (2.155+7*[SensorModuledy]+7*[DeltaY]+[DeltaY_ServiceLong_ServiceShort]+[DeltaY])*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Back_2"/>
     <String name="ChildName" value="etl:SensorModule_r_2"/>
     <Numeric name="N" value="20"/>
-    <Numeric name="StartCopyNo" value="239"/>
+    <Numeric name="StartCopyNo" value="240"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-25*[DeltaX_ServiceModule]-12*[SensorModuledx])*cm, (2.155+7*[SensorModuledy]+7*[DeltaY])*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-25*[DeltaX_ServiceModule]-12*[SensorModuledx])*cm, (2.155+7*[SensorModuledy]+7*[DeltaY])*cm, -0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Back_2"/>
     <String name="ChildName" value="etl:SensorModule_r"/>
     <Numeric name="N" value="21"/>
-    <Numeric name="StartCopyNo" value="250"/>
+    <Numeric name="StartCopyNo" value="251"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-25*[DeltaX_ServiceModule]-13*[SensorModuledx])*cm, (2.155+7*[SensorModuledy]+7*[DeltaY])*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-25*[DeltaX_ServiceModule]-13*[SensorModuledx])*cm, (2.155+7*[SensorModuledy]+7*[DeltaY])*cm, -0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Back_2"/>
     <String name="ChildName" value="etl:ServiceHybrid_short"/>
     <Numeric name="N" value="1"/>
-    <Numeric name="StartCopyNo" value="9"/>
+    <Numeric name="StartCopyNo" value="10"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-26*[DeltaX_ServiceModule]-13*[SensorModuledx])*cm, (2.155+8*[SensorModuledy]+8*[DeltaY])*cm, 0*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-26*[DeltaX_ServiceModule]-13*[SensorModuledx])*cm, (2.155+8*[SensorModuledy]+8*[DeltaY])*cm, 0*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Back_2"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="39"/>
+    <Numeric name="StartCopyNo" value="40"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-26*[DeltaX_ServiceModule]-13*[SensorModuledx])*cm, (2.155+8*[SensorModuledy]+8*[DeltaY]+[DeltaY_ServiceLong_ServiceShort]+[DeltaY])*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-26*[DeltaX_ServiceModule]-13*[SensorModuledx])*cm, (2.155+8*[SensorModuledy]+8*[DeltaY]+[DeltaY_ServiceLong_ServiceShort]+[DeltaY])*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Back_2"/>
     <String name="ChildName" value="etl:SensorModule_r_2"/>
     <Numeric name="N" value="20"/>
-    <Numeric name="StartCopyNo" value="259"/>
+    <Numeric name="StartCopyNo" value="260"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-27*[DeltaX_ServiceModule]-13*[SensorModuledx])*cm, (2.155+8*[SensorModuledy]+8*[DeltaY])*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-27*[DeltaX_ServiceModule]-13*[SensorModuledx])*cm, (2.155+8*[SensorModuledy]+8*[DeltaY])*cm, -0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Back_2"/>
     <String name="ChildName" value="etl:SensorModule_r"/>
     <Numeric name="N" value="21"/>
-    <Numeric name="StartCopyNo" value="271"/>
+    <Numeric name="StartCopyNo" value="272"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-27*[DeltaX_ServiceModule]-14*[SensorModuledx])*cm, (2.155+8*[SensorModuledy]+8*[DeltaY])*cm, -0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-27*[DeltaX_ServiceModule]-14*[SensorModuledx])*cm, (2.155+8*[SensorModuledy]+8*[DeltaY])*cm, -0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Back_2"/>
     <String name="ChildName" value="etl:ServiceHybrid_short"/>
     <Numeric name="N" value="1"/>
-    <Numeric name="StartCopyNo" value="10"/>
+    <Numeric name="StartCopyNo" value="11"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-28*[DeltaX_ServiceModule]-14*[SensorModuledx])*cm, (2.155+9*[SensorModuledy]+9*[DeltaY])*cm, 0*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-28*[DeltaX_ServiceModule]-14*[SensorModuledx])*cm, (2.155+9*[SensorModuledy]+9*[DeltaY])*cm, 0*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Back_2"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="42"/>
+    <Numeric name="StartCopyNo" value="43"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0875-28*[DeltaX_ServiceModule]-14*[SensorModuledx])*cm, (2.155+9*[SensorModuledy]+9*[DeltaY]+[DeltaY_ServiceLong_ServiceShort]+[DeltaY])*cm, 0*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-28*[DeltaX_ServiceModule]-14*[SensorModuledx])*cm, (2.155+9*[SensorModuledy]+9*[DeltaY]+[DeltaY_ServiceLong_ServiceShort]+[DeltaY])*cm, 0*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
+    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
 
 
-  <!-- Disk2 Front face -->
-  <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front_2"/>
-    <String name="ChildName" value="etl:SensorModule"/>
-    <Numeric name="N" value="7"/>
-    <Numeric name="StartCopyNo" value="0"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> 122.12*cm, 2.155*cm, 0.178*cm </Vector> 
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-  </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid"/>
-    <Numeric name="N" value="1"/>
-    <Numeric name="StartCopyNo" value="0"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.12-[DeltaX_ServiceModule])*cm, 13.055*cm, 0.*cm </Vector> 
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-  </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid_short"/>
-    <Numeric name="N" value="1"/>
-    <Numeric name="StartCopyNo" value="0"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.12-[DeltaX_ServiceModule])*cm, (13.055+[DeltaY_ServiceLong_ServiceShort]+[DeltaY])*cm, 0*cm </Vector> 
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-  </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front_2"/>
-    <String name="ChildName" value="etl:SensorModule_2"/>
-    <Numeric name="N" value="9"/>
-    <Numeric name="StartCopyNo" value="0"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (122.12-2*[DeltaX_ServiceModule])*cm, 2.155*cm, 0.178*cm </Vector> 
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-  </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front_2"/>
-    <String name="ChildName" value="etl:SensorModule"/>
-    <Numeric name="N" value="12"/>
-    <Numeric name="StartCopyNo" value="7"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (122.12-2*[DeltaX_ServiceModule]-[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-  </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid"/>
-    <Numeric name="N" value="2"/>
-    <Numeric name="StartCopyNo" value="1"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.12-3*[DeltaX_ServiceModule]-[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-  </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front_2"/>
-    <String name="ChildName" value="etl:SensorModule_2"/>
-    <Numeric name="N" value="12"/>
-    <Numeric name="StartCopyNo" value="9"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (122.12-4*[DeltaX_ServiceModule]-[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-  </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front_2"/>
-    <String name="ChildName" value="etl:SensorModule"/>
-    <Numeric name="N" value="15"/>
-    <Numeric name="StartCopyNo" value="19"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (122.12-4*[DeltaX_ServiceModule]-2*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-  </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid"/>
-    <Numeric name="N" value="2"/>
-    <Numeric name="StartCopyNo" value="3"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.12-5*[DeltaX_ServiceModule]-2*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-  </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid_short"/>
-    <Numeric name="N" value="1"/>
-    <Numeric name="StartCopyNo" value="1"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.12-5*[DeltaX_ServiceModule]-2*[SensorModuledx])*cm, (13.055+[ServiceHybrid_Y]+[DeltaY_ServiceLong_ServiceShort]+2*[DeltaY])*cm, 0*cm </Vector> 
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-  </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front_2"/>
-    <String name="ChildName" value="etl:SensorModule_2"/>
-    <Numeric name="N" value="15"/>
-    <Numeric name="StartCopyNo" value="21"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (122.12-6*[DeltaX_ServiceModule]-2*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-  </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front_2"/>
-    <String name="ChildName" value="etl:SensorModule"/>
-    <Numeric name="N" value="18"/>
-    <Numeric name="StartCopyNo" value="34"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (122.12-6*[DeltaX_ServiceModule]-3*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-  </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid"/>
-    <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="5"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.12-7*[DeltaX_ServiceModule]-3*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-  </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front_2"/>
-    <String name="ChildName" value="etl:SensorModule_2"/>
-    <Numeric name="N" value="18"/>
-    <Numeric name="StartCopyNo" value="36"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (122.12-8*[DeltaX_ServiceModule]-3*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-  </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front_2"/>
-    <String name="ChildName" value="etl:SensorModule"/>
-    <Numeric name="N" value="21"/>
-    <Numeric name="StartCopyNo" value="52"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (122.12-8*[DeltaX_ServiceModule]-4*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-  </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid"/>
-    <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="8"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.12-9*[DeltaX_ServiceModule]-4*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-  </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid_short"/>
-    <Numeric name="N" value="1"/>
-    <Numeric name="StartCopyNo" value="2"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.12-9*[DeltaX_ServiceModule]-4*[SensorModuledx])*cm, (13.055+2*[ServiceHybrid_Y]+[DeltaY_ServiceLong_ServiceShort]+3*[DeltaY])*cm, 0*cm </Vector> 
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-  </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front_2"/>
-    <String name="ChildName" value="etl:SensorModule_2"/>
-    <Numeric name="N" value="21"/>
-    <Numeric name="StartCopyNo" value="54"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (122.12-10*[DeltaX_ServiceModule]-4*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-  </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front_2"/>
-    <String name="ChildName" value="etl:SensorModule"/>
-    <Numeric name="N" value="21"/>
-    <Numeric name="StartCopyNo" value="73"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (122.12-10*[DeltaX_ServiceModule]-5*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-  </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid"/>
-    <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="11"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.12-11*[DeltaX_ServiceModule]-5*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-  </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid_short"/>
-    <Numeric name="N" value="1"/>
-    <Numeric name="StartCopyNo" value="3"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.12-11*[DeltaX_ServiceModule]-5*[SensorModuledx])*cm, (13.055+2*[ServiceHybrid_Y]+[DeltaY_ServiceLong_ServiceShort]+3*[DeltaY])*cm, 0*cm </Vector> 
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-  </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front_2"/>
-    <String name="ChildName" value="etl:SensorModule_2"/>
-    <Numeric name="N" value="21"/>
-    <Numeric name="StartCopyNo" value="75"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (122.12-12*[DeltaX_ServiceModule]-5*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-  </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front_2"/>
-    <String name="ChildName" value="etl:SensorModule"/>
-    <Numeric name="N" value="24"/>
-    <Numeric name="StartCopyNo" value="94"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (122.12-12*[DeltaX_ServiceModule]-6*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-  </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid"/>
-    <Numeric name="N" value="4"/>
-    <Numeric name="StartCopyNo" value="14"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.12-13*[DeltaX_ServiceModule]-6*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-  </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front_2"/>
-    <String name="ChildName" value="etl:SensorModule_2"/>
-    <Numeric name="N" value="24"/>
-    <Numeric name="StartCopyNo" value="96"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (122.12-14*[DeltaX_ServiceModule]-6*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-  </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front_2"/>
-    <String name="ChildName" value="etl:SensorModule"/>
-    <Numeric name="N" value="24"/>
-    <Numeric name="StartCopyNo" value="118"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (122.12-14*[DeltaX_ServiceModule]-7*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-  </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid"/>
-    <Numeric name="N" value="4"/>
-    <Numeric name="StartCopyNo" value="18"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.12-15*[DeltaX_ServiceModule]-7*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-  </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front_2"/>
-    <String name="ChildName" value="etl:SensorModule_2"/>
-    <Numeric name="N" value="24"/>
-    <Numeric name="StartCopyNo" value="120"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (122.12-16*[DeltaX_ServiceModule]-7*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-  </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front_2"/>
-    <String name="ChildName" value="etl:SensorModule"/>
-    <Numeric name="N" value="24"/>
-    <Numeric name="StartCopyNo" value="142"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (122.12-16*[DeltaX_ServiceModule]-8*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-  </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid"/>
-    <Numeric name="N" value="4"/>
-    <Numeric name="StartCopyNo" value="22"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.12-17*[DeltaX_ServiceModule]-8*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-  </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front_2"/>
-    <String name="ChildName" value="etl:SensorModule_2"/>
-    <Numeric name="N" value="24"/>
-    <Numeric name="StartCopyNo" value="144"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (122.12-18*[DeltaX_ServiceModule]-8*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-  </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front_2"/>
-    <String name="ChildName" value="etl:SensorModule"/>
-    <Numeric name="N" value="27"/>
-    <Numeric name="StartCopyNo" value="166"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (122.12-18*[DeltaX_ServiceModule]-9*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-  </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid_short"/>
-    <Numeric name="N" value="1"/>
-    <Numeric name="StartCopyNo" value="4"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.12-19*[DeltaX_ServiceModule]-9*[SensorModuledx])*cm, 6.5275*cm, 0*cm </Vector> 
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-  </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid"/>
-    <Numeric name="N" value="4"/>
-    <Numeric name="StartCopyNo" value="26"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.12-19*[DeltaX_ServiceModule]-9*[SensorModuledx])*cm, (6.5275+[DeltaY_ServiceLong_ServiceShort]+[DeltaY])*cm, 0.*cm </Vector>
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-  </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front_2"/>
-    <String name="ChildName" value="etl:SensorModule_2"/>
-    <Numeric name="N" value="27"/>
-    <Numeric name="StartCopyNo" value="168"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (122.12-20*[DeltaX_ServiceModule]-9*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-  </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front_2"/>
-    <String name="ChildName" value="etl:SensorModule"/>
-    <Numeric name="N" value="27"/>
-    <Numeric name="StartCopyNo" value="193"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (122.12-20*[DeltaX_ServiceModule]-10*[SensorModuledx])*cm, (2.155+[SensorModuledy]+[DeltaY])*cm, 0.178*cm </Vector> 
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-  </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid_short"/>
-    <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="5"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.12-21*[DeltaX_ServiceModule]-10*[SensorModuledx])*cm, (2.155+2*[SensorModuledy]+2*[DeltaY])*cm, 0*cm </Vector> 
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-  </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid"/>
-    <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="30"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.12-21*[DeltaX_ServiceModule]-10*[SensorModuledx])*cm, (2.155+2*[SensorModuledy]+2*[DeltaY]+2*[ServiceHybrid_Y_short]+[DeltaY_ServiceLong_ServiceShort]+3*[DeltaY])*cm, 0.*cm </Vector>
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-  </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front_2"/>
-    <String name="ChildName" value="etl:SensorModule_2"/>
-    <Numeric name="N" value="24"/>
-    <Numeric name="StartCopyNo" value="195"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (122.12-22*[DeltaX_ServiceModule]-10*[SensorModuledx])*cm, ( 2.155+4*[SensorModuledy]+4*[DeltaY])*cm, 0.178*cm </Vector> 
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-  </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front_2"/>
-    <String name="ChildName" value="etl:SensorModule"/>
-    <Numeric name="N" value="21"/>
-    <Numeric name="StartCopyNo" value="220"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (122.12-22*[DeltaX_ServiceModule]-11*[SensorModuledx])*cm, ( 2.155+6*[SensorModuledy]+6*[DeltaY])*cm, 0.178*cm </Vector> 
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-  </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid_short"/>
-    <Numeric name="N" value="1"/>
-    <Numeric name="StartCopyNo" value="8"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.12-23*[DeltaX_ServiceModule]-11*[SensorModuledx])*cm, (2.155+7*[SensorModuledy]+7*[DeltaY])*cm, 0*cm </Vector> 
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-  </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid"/>
-    <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="33"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.12-23*[DeltaX_ServiceModule]-11*[SensorModuledx])*cm, (2.155+7*[SensorModuledy]+8*[DeltaY]+[DeltaY_ServiceLong_ServiceShort])*cm, 0.*cm </Vector>
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-  </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front_2"/>
-    <String name="ChildName" value="etl:SensorModule_2"/>
-    <Numeric name="N" value="21"/>
-    <Numeric name="StartCopyNo" value="219"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (122.12-24*[DeltaX_ServiceModule]-11*[SensorModuledx])*cm, ( 2.155+6*[SensorModuledy]+6*[DeltaY])*cm, 0.178*cm </Vector> 
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-  </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front_2"/>
-    <String name="ChildName" value="etl:SensorModule"/>
-    <Numeric name="N" value="21"/>
-    <Numeric name="StartCopyNo" value="241"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (122.12-24*[DeltaX_ServiceModule]-12*[SensorModuledx])*cm, ( 2.155+7*[SensorModuledy]+7*[DeltaY])*cm, 0.178*cm </Vector> 
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-  </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid_short"/>
-    <Numeric name="N" value="1"/>
-    <Numeric name="StartCopyNo" value="9"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.12-25*[DeltaX_ServiceModule]-12*[SensorModuledx])*cm, (2.155+8*[SensorModuledy]+8*[DeltaY])*cm, 0*cm </Vector> 
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-  </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid"/>
-    <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="36"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.12-25*[DeltaX_ServiceModule]-12*[SensorModuledx])*cm, (2.155+8*[SensorModuledy]+9*[DeltaY]+[DeltaY_ServiceLong_ServiceShort])*cm, 0.*cm </Vector>
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-  </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front_2"/>
-    <String name="ChildName" value="etl:SensorModule_2"/>
-    <Numeric name="N" value="21"/>
-    <Numeric name="StartCopyNo" value="240"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (122.12-26*[DeltaX_ServiceModule]-12*[SensorModuledx])*cm, ( 2.155+7*[SensorModuledy]+7*[DeltaY])*cm, 0.178*cm </Vector> 
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-  </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front_2"/>
-    <String name="ChildName" value="etl:SensorModule"/>
-    <Numeric name="N" value="21"/>
-    <Numeric name="StartCopyNo" value="241"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (122.12-26*[DeltaX_ServiceModule]-13*[SensorModuledx])*cm, ( 2.155+8*[SensorModuledy]+8*[DeltaY])*cm, 0.178*cm </Vector> 
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-  </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid_short"/>
-    <Numeric name="N" value="1"/>
-    <Numeric name="StartCopyNo" value="10"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.12-27*[DeltaX_ServiceModule]-13*[SensorModuledx])*cm, (2.155+9*[SensorModuledy]+9*[DeltaY])*cm, 0*cm </Vector> 
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-  </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid"/>
-    <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="39"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.12-27*[DeltaX_ServiceModule]-13*[SensorModuledx])*cm, (2.155+9*[SensorModuledy]+10*[DeltaY]+[DeltaY_ServiceLong_ServiceShort])*cm, 0.*cm </Vector>
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-  </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front_2"/>
-    <String name="ChildName" value="etl:SensorModule_2"/>
-    <Numeric name="N" value="21"/>
-    <Numeric name="StartCopyNo" value="261"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (122.12-28*[DeltaX_ServiceModule]-13*[SensorModuledx])*cm, ( 2.155+8*[SensorModuledy]+8*[DeltaY])*cm, 0.178*cm </Vector> 
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-  </Algorithm>
+    
 
 </DDDefinition>
diff --git a/Geometry/MTDCommonData/plugins/DDMTDLinear.cc b/Geometry/MTDCommonData/plugins/DDMTDLinear.cc
index cd382ed44824c..2e4c1d3b45de9 100644
--- a/Geometry/MTDCommonData/plugins/DDMTDLinear.cc
+++ b/Geometry/MTDCommonData/plugins/DDMTDLinear.cc
@@ -10,6 +10,7 @@
 #include "DetectorDescription/Core/interface/DDTranslation.h"
 #include "DetectorDescription/Core/interface/DDTypes.h"
 #include "DataFormats/Math/interface/GeantUnits.h"
+#include "DataFormats/Math/interface/angle_units.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/PluginManager/interface/PluginFactory.h"
 
@@ -17,10 +18,11 @@
 #include <memory>
 
 using namespace geant_units::operators;
+using namespace angle_units::operators;
 
 class DDMTDLinear : public DDAlgorithm {
 public:
-  DDMTDLinear() : m_n(1), m_startCopyNo(1), m_incrCopyNo(1), m_theta(0.), m_phi(0.), m_delta(0.) {}
+  DDMTDLinear() : m_n(1), m_startCopyNo(1), m_incrCopyNo(1), m_theta(0.), m_phi(0.), m_delta(0.), m_phi_obj(0.), m_theta_obj(0.) {}
 
   void initialize(const DDNumericArguments& nArgs,
                   const DDVectorArguments& vArgs,
@@ -37,6 +39,8 @@ class DDMTDLinear : public DDAlgorithm {
   double m_theta;              //Theta
   double m_phi;                //Phi dir[Theta,Phi] ... unit-std::vector in direction Theta, Phi
   double m_delta;              //Delta - distance between two subsequent positions along dir[Theta,Phi]
+  double m_phi_obj;            //Phi angle to rotate volumes (indipendent from m_phi traslation direction)
+  double m_theta_obj;          //Theta angle to rotate volumes
   std::vector<double> m_base;  //Base values - a 3d-point where the offset is calculated from
                                //base is optional, if omitted base=(0,0,0)
   std::pair<std::string, std::string> m_childNmNs;  //Child name
@@ -55,12 +59,15 @@ void DDMTDLinear::initialize(const DDNumericArguments& nArgs,
   m_phi = nArgs["Phi"];
   m_delta = nArgs["Delta"];
   m_base = vArgs["Base"];
+  m_phi_obj = nArgs["Phi_obj"];
+  m_theta_obj = nArgs["Theta_obj"];
 
   LogDebug("DDAlgorithm") << "DDMTDLinear: Parameters for position"
                           << "ing:: n " << m_n << " Direction Theta, Phi, Offset, Delta " << convertRadToDeg(m_theta)
                           << " " << convertRadToDeg(m_phi) << " "
                           << " " << convertRadToDeg(m_delta) << " Base " << m_base[0] << ", " << m_base[1] << ", "
-                          << m_base[2];
+                          << m_base[2] << "Objects placement Phi_obj, Theta_obj " << convertRadToDeg(m_phi_obj) 
+                          << " " << convertRadToDeg(m_theta_obj);
 
   m_childNmNs = DDSplit(sArgs["ChildName"]);
   if (m_childNmNs.second.empty())
@@ -80,15 +87,16 @@ void DDMTDLinear::execute(DDCompactView& cpv) {
 
   DDTranslation basetr(m_base[0], m_base[1], m_base[2]);
 
-  double thetaZ=0; //rotation is in xy plane
-  double phiZ=0;  //m_phi;  //double phiZ=0; 
-  double thetaX=1.57;
-  double thetaY=1.57;
-  double phiX=0;     //m_phi;
-  double phiY=0+1.57;  //m_phi+1.57; //phi+TMath::Pi()/2   Rad o Deg?????????????????????
+  //rotation is in xy plane
+  long double x_phi = 0.5;
+  double thetaZ = m_theta_obj - angle_units::operators::operator""_pi(x_phi);
+  double phiZ = m_phi_obj;  
+  double thetaX = m_theta_obj;  
+  double thetaY = m_theta_obj;  
+  double phiX = m_phi_obj;     
+  double phiY = m_phi_obj + angle_units::operators::operator""_pi(x_phi);  
 
-  //std::make_unique<DDRotationMatrix> rotationMatrix=DDcreateRotationMatrix(thetaX, phiX, thetaY, phiY, thetaZ, phiZ);
-  //DDRotation rotation = DDRotation("IdentityRotation");
+  //DDRotation rotation = DDRotation("IdentityRotation");  this is the default rotation matrix in DDLinear
   DDRotation rotation = DDRotation("Rotation");
 
 
@@ -100,8 +108,8 @@ void DDMTDLinear::execute(DDCompactView& cpv) {
   }
 
   for (int i = 0; i < m_n; ++i) {
-    DDTranslation tran = basetr + (i * m_delta) * direction;   //basetr + (double(copy) * m_delta) * direction; 
-    cpv.position(ddname, mother, copy, tran, rotation);  //cpv.position(ddname, mother, copy, tran, rotation);
+    DDTranslation tran = basetr + (double(i) * m_delta) * direction;   
+    cpv.position(ddname, mother, copy, tran, rotation);  
     LogDebug("DDAlgorithm") << "DDMTDLinear: " << m_childNmNs.second << ":" << m_childNmNs.first << " number " << copy
                             << " positioned in " << mother << " at " << tran << " with " << rotation;
     copy += m_incrCopyNo;
diff --git a/Geometry/MTDCommonData/src/ETLNumberingScheme.cc b/Geometry/MTDCommonData/src/ETLNumberingScheme.cc
index 9f6c163ff1c4f..e614a72b33f84 100644
--- a/Geometry/MTDCommonData/src/ETLNumberingScheme.cc
+++ b/Geometry/MTDCommonData/src/ETLNumberingScheme.cc
@@ -3,7 +3,7 @@
 
 #include <iostream>
 
-//#define EDM_ML_DEBUG
+#define EDM_ML_DEBUG
 
 ETLNumberingScheme::ETLNumberingScheme() : MTDNumberingScheme() {
 #ifdef EDM_ML_DEBUG
@@ -30,12 +30,29 @@ uint32_t ETLNumberingScheme::getUnitID(const MTDBaseNumber& baseNumber) const {
     return 0;
   }
 
-  const uint32_t modCopy(baseNumber.getCopyNumber(2));
+  // Discriminate pre-TDR and TDR scenarios
+
+  const bool preTDR = (baseNumber.getLevelName(3).find("Ring") != std::string::npos);
 
+  const uint32_t modCopy(baseNumber.getCopyNumber(2));
+  
   const std::string& ringName(baseNumber.getLevelName(3));  // name of ring volume
-  const int modtyp(0);
+  int modtyp(0);
   std::string baseName = ringName.substr(ringName.find(":") + 1);
-  const int ringCopy(::atoi(baseName.c_str() + 4));
+  int ringCopy(::atoi(baseName.c_str() + 4));
+  
+  if ( !preTDR) {
+
+    uint32_t discN = (baseNumber.getLevelName(4).find("Disk1") != std::string::npos) ? 0 : 1;
+    uint32_t quarterS = (baseNumber.getLevelName(3).find("Front") != std::string::npos) ? 0 : 1;
+    uint32_t quarterN = baseNumber.getCopyNumber(3);
+    const uint32_t quarterOffset = 4;
+
+    ringCopy = quarterN+quarterS*quarterOffset+2*quarterOffset*discN;
+
+    modtyp = (baseNumber.getLevelName(2).find("_2") != std::string::npos ) ? 2 : 1;
+
+  }
 
   // Side choice: up to scenario D38 is given by level 7 (HGCal v9)
   int nSide(7);
@@ -58,21 +75,21 @@ uint32_t ETLNumberingScheme::getUnitID(const MTDBaseNumber& baseNumber) const {
 
   // error checking
 
-  if (modtyp != 0) {
+  if ((modtyp != 0 && preTDR) || (modtyp == 0 && !preTDR)) {
     edm::LogWarning("MTDGeom") << "ETLNumberingScheme::getUnitID(): "
                                << "****************** Bad module name = " << modtyp
                                << ", Volume Name = " << baseNumber.getLevelName(4);
     return 0;
   }
 
-  if (1 > modCopy || 176 < modCopy) {
+  if ((preTDR && (1 > modCopy || 176 < modCopy)) || (!preTDR && (1 > modCopy || 292 < modCopy))) {
     edm::LogWarning("MTDGeom") << "ETLNumberingScheme::getUnitID(): "
                                << "****************** Bad module copy = " << modCopy
                                << ", Volume Number = " << baseNumber.getCopyNumber(4);
     return 0;
   }
 
-  if (1 > ringCopy || 11 < ringCopy) {
+  if ((preTDR && (1 > ringCopy || 11 < ringCopy)) || ( !preTDR && (1 > ringCopy || 16 < ringCopy))) {
     edm::LogWarning("MTDGeom") << "ETLNumberingScheme::getUnitID(): "
                                << "****************** Bad ring copy = " << ringCopy
                                << ", Volume Number = " << baseNumber.getCopyNumber(3);

From 55ad920cc639516afb1fe9375423d7766c052e60 Mon Sep 17 00:00:00 2001
From: Fabio Cossutti <fabio.cossutti@ts.infn.it>
Date: Fri, 13 Dec 2019 11:01:19 +0100
Subject: [PATCH 04/15] Update of ETLDetId mask to fully exploit the module bit
 range, backward compatible

---
 DataFormats/ForwardDetId/interface/ETLDetId.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DataFormats/ForwardDetId/interface/ETLDetId.h b/DataFormats/ForwardDetId/interface/ETLDetId.h
index a8bddce19c321..97c6b006ea49f 100644
--- a/DataFormats/ForwardDetId/interface/ETLDetId.h
+++ b/DataFormats/ForwardDetId/interface/ETLDetId.h
@@ -15,7 +15,7 @@
 class ETLDetId : public MTDDetId {
 public:
   static const uint32_t kETLmoduleOffset = 7;
-  static const uint32_t kETLmoduleMask = 0xFF;
+  static const uint32_t kETLmoduleMask = 0x1FF;
   static const uint32_t kETLmodTypeOffset = 5;
   static const uint32_t kETLmodTypeMask = 0x3;
 

From 776fe46bc878f9fe9017b431c16a3aa912ab282a Mon Sep 17 00:00:00 2001
From: Fabio Cossutti <fabio.cossutti@ts.infn.it>
Date: Thu, 9 Jan 2020 11:50:50 +0100
Subject: [PATCH 05/15] Update scenario from D51 to D53 after rebase onto
 CMSSW_11_1_0_pre1

---
 .../python/GeometryExtended2026D53Reco_cff.py |  60 ++++++++
 .../python/GeometryExtended2026D53_cff.py     |  13 ++
 .../cmsExtendedGeometry2026D53XML_cfi.py      | 129 ++++++++++++++++++
 3 files changed, 202 insertions(+)
 create mode 100644 Configuration/Geometry/python/GeometryExtended2026D53Reco_cff.py
 create mode 100644 Configuration/Geometry/python/GeometryExtended2026D53_cff.py
 create mode 100644 Geometry/CMSCommonData/python/cmsExtendedGeometry2026D53XML_cfi.py

diff --git a/Configuration/Geometry/python/GeometryExtended2026D53Reco_cff.py b/Configuration/Geometry/python/GeometryExtended2026D53Reco_cff.py
new file mode 100644
index 0000000000000..7b1d819720a65
--- /dev/null
+++ b/Configuration/Geometry/python/GeometryExtended2026D53Reco_cff.py
@@ -0,0 +1,60 @@
+import FWCore.ParameterSet.Config as cms
+
+# This config was generated automatically using generate2026Geometry.py
+# If you notice a mistake, please update the generating script, not just this config
+
+from Configuration.Geometry.GeometryExtended2026D53_cff import *
+
+# tracker
+from Geometry.CommonTopologies.globalTrackingGeometry_cfi import *
+from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import *
+from Geometry.TrackerGeometryBuilder.trackerParameters_cfi import *
+from Geometry.TrackerNumberingBuilder.trackerTopology_cfi import *
+from Geometry.TrackerGeometryBuilder.idealForDigiTrackerGeometry_cff import *
+trackerGeometry.applyAlignment = cms.bool(False)
+
+# calo
+from Geometry.CaloEventSetup.HGCalV9Topology_cfi import *
+from Geometry.HGCalGeometry.HGCalGeometryESProducer_cfi import *
+from Geometry.CaloEventSetup.CaloTopology_cfi import *
+from Geometry.CaloEventSetup.CaloGeometryBuilder_cfi import *
+CaloGeometryBuilder = cms.ESProducer("CaloGeometryBuilder",
+    SelectedCalos = cms.vstring("HCAL",
+                                "ZDC",
+                                "EcalBarrel",
+                                "TOWER",
+                                "HGCalEESensitive",
+                                "HGCalHESiliconSensitive",
+                                "HGCalHEScintillatorSensitive"
+    )
+)
+from Geometry.EcalAlgo.EcalBarrelGeometry_cfi import *
+from Geometry.HcalEventSetup.HcalGeometry_cfi import *
+from Geometry.HcalEventSetup.CaloTowerGeometry_cfi import *
+from Geometry.HcalEventSetup.CaloTowerTopology_cfi import *
+from Geometry.HcalCommonData.hcalDDDRecConstants_cfi import *
+from Geometry.HcalEventSetup.hcalTopologyIdeal_cfi import *
+from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import *
+from Geometry.EcalMapping.EcalMapping_cfi import *
+from Geometry.EcalMapping.EcalMappingRecord_cfi import *
+
+# muon
+from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *
+from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *
+from Geometry.GEMGeometryBuilder.gemGeometry_cfi import *
+from Geometry.GEMGeometryBuilder.me0Geometry_cfi import *
+from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import *
+from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *
+
+# forward
+from Geometry.ForwardGeometry.ForwardGeometry_cfi import *
+
+# timing
+from RecoMTD.DetLayers.mtdDetLayerGeometry_cfi import *
+from Geometry.MTDGeometryBuilder.mtdParameters_cfi import *
+from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cfi import *
+from Geometry.MTDNumberingBuilder.mtdTopology_cfi import *
+from Geometry.MTDGeometryBuilder.mtdGeometry_cfi import *
+from Geometry.MTDGeometryBuilder.idealForDigiMTDGeometry_cff import *
+mtdGeometry.applyAlignment = cms.bool(False)
+
diff --git a/Configuration/Geometry/python/GeometryExtended2026D53_cff.py b/Configuration/Geometry/python/GeometryExtended2026D53_cff.py
new file mode 100644
index 0000000000000..55d08c00f8834
--- /dev/null
+++ b/Configuration/Geometry/python/GeometryExtended2026D53_cff.py
@@ -0,0 +1,13 @@
+import FWCore.ParameterSet.Config as cms
+
+# This config was generated automatically using generate2026Geometry.py
+# If you notice a mistake, please update the generating script, not just this config
+
+from Geometry.CMSCommonData.cmsExtendedGeometry2026D53XML_cfi import *
+from Geometry.TrackerNumberingBuilder.trackerNumberingGeometry_cfi import *
+from SLHCUpgradeSimulations.Geometry.fakeConditions_phase2TkT14_cff import *
+from Geometry.EcalCommonData.ecalSimulationParameters_cff import *
+from Geometry.HcalCommonData.hcalDDDSimConstants_cff import *
+from Geometry.HGCalCommonData.hgcalParametersInitialization_cfi import *
+from Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi import *
+from Geometry.MTDNumberingBuilder.mtdNumberingGeometry_cfi import *
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D53XML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D53XML_cfi.py
new file mode 100644
index 0000000000000..4d864ab1e5f2d
--- /dev/null
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2026D53XML_cfi.py
@@ -0,0 +1,129 @@
+import FWCore.ParameterSet.Config as cms
+
+# This config was generated automatically using generate2026Geometry.py
+# If you notice a mistake, please update the generating script, not just this config
+
+XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
+    geomXMLFiles = cms.vstring(
+        'Geometry/CMSCommonData/data/materials.xml',
+        'Geometry/CMSCommonData/data/rotations.xml',
+        'Geometry/CMSCommonData/data/extend/v2/cmsextent.xml',
+        'Geometry/CMSCommonData/data/cmsMother.xml',
+        'Geometry/CMSCommonData/data/eta3/etaMax.xml',
+        'Geometry/CMSCommonData/data/cmsTracker.xml',
+        'Geometry/CMSCommonData/data/cmsCalo.xml',
+        'Geometry/CMSCommonData/data/cmsMuon.xml',
+        'Geometry/CMSCommonData/data/mgnt.xml',
+        'Geometry/CMSCommonData/data/beampipe/2026/v1/beampipe.xml',
+        'Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml',
+        'Geometry/CMSCommonData/data/muonMB.xml',
+        'Geometry/CMSCommonData/data/muonMagnet.xml',
+        'Geometry/CMSCommonData/data/cavern/2021/v1/cavern.xml',
+        'Geometry/CMSCommonData/data/cavernData/2021/v1/cavernData.xml',
+        'Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml',
+        'Geometry/CMSCommonData/data/cms/2026/v3/cms.xml',
+        'Geometry/CMSCommonData/data/caloBase/2026/v2/caloBase.xml',
+        'Geometry/CMSCommonData/data/muonBase/2026/v3/muonBase.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/trackerParameters.xml',
+        'Geometry/TrackerCommonData/data/pixfwdCommon.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/pixfwd.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/pixbar.xml',
+        'Geometry/TrackerCommonData/data/trackermaterial.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/otst.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/tracker.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613_MB_2019_04/pixel.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerbar.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerfwd.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/trackerStructureTopology.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613/pixelStructureTopology.xml',
+        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackersens.xml',
+        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelsens.xml',
+        'Geometry/TrackerRecoData/data/PhaseII/TiltedTracker613_MB_2019_04/trackerRecoMaterial.xml',
+        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/trackerProdCuts.xml',
+        'Geometry/TrackerSimData/data/PhaseII/TiltedTracker404/pixelProdCuts.xml',
+        'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
+        'Geometry/EcalCommonData/data/eregalgo/2026/v2/eregalgo.xml',
+        'Geometry/EcalCommonData/data/ectkcable/2026/v1/ectkcable.xml',
+        'Geometry/EcalCommonData/data/ectkcablemat/2026/v1/ectkcablemat.xml',
+        'Geometry/EcalCommonData/data/ebalgo.xml',
+        'Geometry/EcalCommonData/data/ebcon.xml',
+        'Geometry/EcalCommonData/data/ebrot.xml',
+        'Geometry/HcalCommonData/data/hcalrotations.xml',
+        'Geometry/HcalCommonData/data/hcal/v2/hcalalgo.xml',
+        'Geometry/HcalCommonData/data/hcalbarrelalgo.xml',
+        'Geometry/HcalCommonData/data/hcalcablealgo/v2/hcalcablealgo.xml',
+        'Geometry/HcalCommonData/data/hcalouteralgo.xml',
+        'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
+        'Geometry/HcalCommonData/data/hcalSimNumbering/NoHE/hcalSimNumbering.xml',
+        'Geometry/HcalCommonData/data/hcalRecNumbering/NoHE/hcalRecNumbering.xml',
+        'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
+        'Geometry/HGCalCommonData/data/hgcalMaterial/v1/hgcalMaterial.xml',
+        'Geometry/HGCalCommonData/data/hgcal/v11/hgcal.xml',
+        'Geometry/HGCalCommonData/data/hgcalEE/v10/hgcalEE.xml',
+        'Geometry/HGCalCommonData/data/hgcalHEsil/v11/hgcalHEsil.xml',
+        'Geometry/HGCalCommonData/data/hgcalHEmix/v11/hgcalHEmix.xml',
+        'Geometry/HGCalCommonData/data/hgcalwafer/v9/hgcalwafer.xml',
+        'Geometry/HGCalCommonData/data/hgcalcell/v9/hgcalcell.xml',
+        'Geometry/HGCalCommonData/data/hgcalCons/v11/hgcalCons.xml',
+        'Geometry/MuonCommonData/data/mbCommon/2021/v1/mbCommon.xml',
+        'Geometry/MuonCommonData/data/mb1/2015/v2/mb1.xml',
+        'Geometry/MuonCommonData/data/mb2/2015/v2/mb2.xml',
+        'Geometry/MuonCommonData/data/mb3/2015/v2/mb3.xml',
+        'Geometry/MuonCommonData/data/mb4/2015/v2/mb4.xml',
+        'Geometry/MuonCommonData/data/mb4Shield/2021/v1/mb4Shield.xml',
+        'Geometry/MuonCommonData/data/muonYoke/2021/v2/muonYoke.xml',
+        'Geometry/MuonCommonData/data/csc/2021/v1/csc.xml',
+        'Geometry/MuonCommonData/data/mfshield/2017/v1/mfshield.xml',
+        'Geometry/MuonCommonData/data/mf/2026/v2/mf.xml',
+        'Geometry/MuonCommonData/data/rpcf/2026/v2/rpcf.xml',
+        'Geometry/MuonCommonData/data/gemf/TDR_BaseLine/gemf.xml',
+        'Geometry/MuonCommonData/data/gem11/TDR_BaseLine/gem11.xml',
+        'Geometry/MuonCommonData/data/gem21/TDR_Dev/gem21.xml',
+        'Geometry/MuonCommonData/data/mfshield/2026/v1/mfshield.xml',
+        'Geometry/MuonCommonData/data/me0/TDR_Dev/v2/me0.xml',
+        'Geometry/ForwardCommonData/data/forwardshield/2017/v1/forwardshield.xml',
+        'Geometry/ForwardCommonData/data/brmrotations.xml',
+        'Geometry/ForwardCommonData/data/PostLS2/brm.xml',
+        'Geometry/ForwardCommonData/data/zdcmaterials.xml',
+        'Geometry/ForwardCommonData/data/lumimaterials.xml',
+        'Geometry/ForwardCommonData/data/zdcrotations.xml',
+        'Geometry/ForwardCommonData/data/lumirotations.xml',
+        'Geometry/ForwardCommonData/data/zdc.xml',
+        'Geometry/ForwardCommonData/data/zdclumi.xml',
+        'Geometry/ForwardCommonData/data/cmszdc.xml',
+        'Geometry/MTDCommonData/data/mtdMaterial/v2/mtdMaterial.xml',
+        'Geometry/MTDCommonData/data/btl/v1/btl.xml',
+        'Geometry/MTDCommonData/data/btl/v1/btlStructureTopology.xml',
+        'Geometry/MTDCommonData/data/etl/v4/etl.xml',
+        'Geometry/MTDCommonData/data/mtdParameters/v1/mtdParameters.xml',
+    )+
+    cms.vstring(
+        'Geometry/MuonCommonData/data/muonNumbering/TDR_DeV/muonNumbering.xml',
+        'Geometry/EcalSimData/data/PhaseII/ecalsens.xml',
+        'Geometry/HcalCommonData/data/hcalsens/NoHE/hcalsenspmf.xml',
+        'Geometry/HcalSimData/data/hf.xml',
+        'Geometry/HcalSimData/data/hfpmt.xml',
+        'Geometry/HcalSimData/data/hffibrebundle.xml',
+        'Geometry/HcalSimData/data/CaloUtil.xml',
+        'Geometry/HGCalSimData/data/hgcsensv9.xml',
+        'Geometry/MuonSimData/data/PhaseII/ME0EtaPart/muonSens.xml',
+        'Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml',
+        'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
+        'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
+        'Geometry/RPCGeometryBuilder/data/2026/v1/RPCSpecs.xml',
+        'Geometry/GEMGeometryBuilder/data/v7/GEMSpecsFilter.xml',
+        'Geometry/GEMGeometryBuilder/data/v7/GEMSpecs.xml',
+        'Geometry/ForwardCommonData/data/brmsens.xml',
+        'Geometry/ForwardSimData/data/zdcsens.xml',
+        'Geometry/MTDSimData/data/v2/mtdsens.xml',
+        'Geometry/HcalSimData/data/HcalProdCuts.xml',
+        'Geometry/EcalSimData/data/EcalProdCuts.xml',
+        'Geometry/HGCalSimData/data/hgcProdCutsv9.xml',
+        'Geometry/MuonSimData/data/PhaseII/muonProdCuts.xml',
+        'Geometry/ForwardSimData/data/zdcProdCuts.xml',
+        'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
+        'Geometry/MTDSimData/data/v2/mtdProdCuts.xml',
+        'Geometry/CMSCommonData/data/FieldParameters.xml',
+    ),
+    rootNodeName = cms.string('cms:OCMS')
+)

From b09805cf781a9ba0f43c9967e172f8c2b6eeb1dd Mon Sep 17 00:00:00 2001
From: Fabio Cossutti <fabio.cossutti@ts.infn.it>
Date: Fri, 10 Jan 2020 17:28:44 +0100
Subject: [PATCH 06/15] Add methods to extract disc number, disc side and
 quarter number for ETL TDR model detid

---
 DataFormats/ForwardDetId/interface/ETLDetId.h | 22 ++++++++++++++++++-
 DataFormats/ForwardDetId/src/ETLDetId.cc      |  3 ++-
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/DataFormats/ForwardDetId/interface/ETLDetId.h b/DataFormats/ForwardDetId/interface/ETLDetId.h
index 97c6b006ea49f..61518850877e6 100644
--- a/DataFormats/ForwardDetId/interface/ETLDetId.h
+++ b/DataFormats/ForwardDetId/interface/ETLDetId.h
@@ -19,6 +19,13 @@ class ETLDetId : public MTDDetId {
   static const uint32_t kETLmodTypeOffset = 5;
   static const uint32_t kETLmodTypeMask = 0x3;
 
+  /// constants for the TDR ETL model 
+  static constexpr uint32_t kETLnDiscOffset = 3;
+  static const uint32_t kETLnDiscMask = 0x1;
+  static constexpr uint32_t kETLdiscSideOffset = 2;
+  static const uint32_t kETLdiscSideMask = 0x1;
+  static const uint32_t kETLquarterMask = 0x3;
+
   // ---------- Constructors, enumerated types ----------
 
   /** Construct a null id */
@@ -45,10 +52,23 @@ class ETLDetId : public MTDDetId {
   /** Returns ETL module number. */
   inline int module() const { return (id_ >> kETLmoduleOffset) & kETLmoduleMask; }
 
-  /** Returns ETL crystal type number. */
+  /** Returns ETL module type number. */
   inline int modType() const { return (id_ >> kETLmodTypeOffset) & kETLmodTypeMask; }
 
   ETLDetId geographicalId() const;
+
+  // --------- Methods for the TDR ETL model only -----------
+  // meaningless for TP model
+
+  // starting from 1
+  inline int quarter() const { return ((((id_ >> kRodRingOffset) & kRodRingMask)-1)  & kETLquarterMask)+1; }
+
+  // 0 = front, 1 = back
+  inline int discSide() const { return ((((id_ >> kRodRingOffset) & kRodRingMask)-1) >> kETLdiscSideOffset) & kETLdiscSideMask; }
+
+  // starting from 1
+  inline int nDisc() const { return (((((id_ >> kRodRingOffset) & kRodRingMask)-1) >> kETLnDiscOffset) & kETLnDiscMask)+1; }
+
 };
 
 std::ostream& operator<<(std::ostream&, const ETLDetId&);
diff --git a/DataFormats/ForwardDetId/src/ETLDetId.cc b/DataFormats/ForwardDetId/src/ETLDetId.cc
index 366d1bd99be5a..24abbcf4d13a6 100644
--- a/DataFormats/ForwardDetId/src/ETLDetId.cc
+++ b/DataFormats/ForwardDetId/src/ETLDetId.cc
@@ -10,7 +10,8 @@ std::ostream& operator<<(std::ostream& os, const ETLDetId& id) {
   os << (MTDDetId&)id;
   os << " ETL " << std::endl
      << " Side        : " << id.mtdSide() << std::endl
-     << " Ring        : " << id.mtdRR() << std::endl
+     << " Ring        : " << id.mtdRR() << "    "
+     << " Disc/Side/Quarter = " << id.nDisc() << " " << id.discSide() << " " << id.quarter() << std::endl
      << " Module      : " << id.module() << std::endl
      << " Module type : " << id.modType() << std::endl;
   return os;

From c1036b0ed4bf829ae8e375301d4105b649f665ec Mon Sep 17 00:00:00 2001
From: Fabio Cossutti <fabio.cossutti@ts.infn.it>
Date: Fri, 10 Jan 2020 17:55:37 +0100
Subject: [PATCH 07/15] remove unneeded constexpr

---
 DataFormats/ForwardDetId/interface/ETLDetId.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/DataFormats/ForwardDetId/interface/ETLDetId.h b/DataFormats/ForwardDetId/interface/ETLDetId.h
index 61518850877e6..aa22cd62fdb2e 100644
--- a/DataFormats/ForwardDetId/interface/ETLDetId.h
+++ b/DataFormats/ForwardDetId/interface/ETLDetId.h
@@ -20,9 +20,9 @@ class ETLDetId : public MTDDetId {
   static const uint32_t kETLmodTypeMask = 0x3;
 
   /// constants for the TDR ETL model 
-  static constexpr uint32_t kETLnDiscOffset = 3;
+  static const uint32_t kETLnDiscOffset = 3;
   static const uint32_t kETLnDiscMask = 0x1;
-  static constexpr uint32_t kETLdiscSideOffset = 2;
+  static const uint32_t kETLdiscSideOffset = 2;
   static const uint32_t kETLdiscSideMask = 0x1;
   static const uint32_t kETLquarterMask = 0x3;
 

From 6e3f9e5f5189aa4366264305ced90941646bc493 Mon Sep 17 00:00:00 2001
From: Fabio Cossutti <fabio.cossutti@ts.infn.it>
Date: Thu, 23 Jan 2020 10:40:56 +0100
Subject: [PATCH 08/15] Last version by F. Siviero without overlaps

---
 Geometry/MTDCommonData/data/etl/v4/etl.xml | 1948 ++++++++------------
 1 file changed, 800 insertions(+), 1148 deletions(-)

diff --git a/Geometry/MTDCommonData/data/etl/v4/etl.xml b/Geometry/MTDCommonData/data/etl/v4/etl.xml
index 75b5fc18172ee..9be28616fce61 100644
--- a/Geometry/MTDCommonData/data/etl/v4/etl.xml
+++ b/Geometry/MTDCommonData/data/etl/v4/etl.xml
@@ -2,10 +2,10 @@
 <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="etl.xml" eval="true/false">
-	<Constant name="ETLrmin" value="[caloBase:Rmin100]"/>   
-	<Constant name="ETLrmax" value="[caloBase:Rmax100]"/>   
+	<Constant name="ETLrmin" value="[caloBase:Rmin100]"/>   <!-- 26.3 cm -->
+	<Constant name="ETLrmax" value="[caloBase:Rmax100]"/>   <!-- 125.525 cm --> 
 	<Constant name="ETLzmin" value="-0.5*([caloBase:Zpos110]-[caloBase:Zpos10])"/>  
-	<Constant name="ETLzmax" value="0.5*([caloBase:Zpos110]-[caloBase:Zpos10])"/>
+	<Constant name="ETLzmax" value="0.5*([caloBase:Zpos110]-[caloBase:Zpos10])-2*cm"/>
 
 	<Constant name="Disk_thickness" value="1.894"/>  <!-- thickness of one disk comprising modules, service hybrids on both faces, mounted on the Al and MIC6-Al rings. Fig 3.73 TDR and line 354 Ulascan ETLDetectorDimensions.cc -->
 	<Constant name="DiskQuarter_thickness" value="0.585"/> <!-- this is the service hybrid height according to TDR table 3.9 -->
@@ -25,14 +25,14 @@
 
 	<Constant name="ServiceHybrid_X" value="3.4"/>  <!-- line 294 Ulascan ETLDetectorDimensions.cc -->
 	<Constant name="ServiceHybrid_Y" value="26.11"/> <!-- ORANGE 6x SensorModule_dy + 5x lgadSep_Y -->
-	<Constant name="ServiceHybrid_Y_short" value="13.055"/> <!-- RED 3x SensorModule_dy + 2x lgadSep_Y -->
+	<Constant name="ServiceHybrid_Y_short" value="13.03"/> <!-- RED 3x SensorModule_dy + 2x lgadSep_Y -->
 	<Constant name="ServiceHybrid_Z" value="0.585"/>
 	<Constant name="SensorModuledx" value="2.585"/>  <!-- Half of a 2-Sensor-Module line 181 Ulascan ETLDetectorDimensions.cc -->
 	<Constant name="SensorModuledy" value="4.31"/>
 	<Constant name="SensorModuledz" value="0.229"/>
 	<Constant name="DeltaX_ServiceModule" value="2.9925"/>
 	<Constant name="DeltaY" value="0.05"/>
-	<Constant name="DeltaY_ServiceLong_ServiceShort" value="19.5825"/>
+	<Constant name="DeltaY_ServiceLong_ServiceShort" value="19.57"/>
   </ConstantsSection>
 
 
@@ -42,16 +42,16 @@
 	  <ZSection z="[ETLzmax]"         rMin="[ETLrmin]"          rMax="[ETLrmax]" />
 	</Polycone>
 	<!-- Aluminium rings: dimensions as defined by ulascan (line 345 ETLDetectorDimensions.cc). Note: epoxy not considered as single element but included in "Aluminium_Disk" (0.081 + 0.008 cm) -->
-	<Tubs name="ThermalScreen" rMin="31*cm" rMax="127*cm" dz="0.5*(2)*cm" startPhi="0*deg" deltaPhi="360*deg"/>
-	<Tubs name="Disk" rMin="31*cm" rMax="127*cm" dz="0.5*[Disk_thickness]*cm" startPhi="0*deg" deltaPhi="360*deg"/>
-	<Tubs name="Aluminium_Disk" rMin="31*cm" rMax="127*cm" dz="0.5*(0.089)*cm" startPhi="0*deg" deltaPhi="360*deg"/>  
-	<Tubs name="MIC6_Aluminium_Disk" rMin="31*cm" rMax="127*cm" dz="0.5*(0.635)*cm" startPhi="0*deg" deltaPhi="360*deg"/>
+	<Tubs name="ThermalScreen" rMin="26.3*cm" rMax="124.37*cm" dz="0.5*(2)*cm" startPhi="0*deg" deltaPhi="360*deg"/> <!-- rMax=124.37*cm -->
+	<Tubs name="Disk" rMin="31*cm" rMax="119*cm" dz="0.5*[Disk_thickness]*cm" startPhi="0*deg" deltaPhi="360*deg"/>
+	<Tubs name="Aluminium_Disk" rMin="31*cm" rMax="119*cm" dz="0.5*(0.089)*cm" startPhi="0*deg" deltaPhi="360*deg"/>  
+	<Tubs name="MIC6_Aluminium_Disk" rMin="31*cm" rMax="119*cm" dz="0.5*(0.635)*cm" startPhi="0*deg" deltaPhi="360*deg"/>
 
 	<!-- FRONT: face closest to IP, BACK: furthest from IP -->
-	<Tubs name="DiskQuarter_Back" rMin="31*cm" rMax="127*cm" dz="0.5*[DiskQuarter_thickness]*cm" startPhi="90*deg" deltaPhi="90*deg"/>
-	<Tubs name="DiskQuarter_Front" rMin="31*cm" rMax="127*cm" dz="0.5*[DiskQuarter_thickness]*cm" startPhi="90*deg" deltaPhi="90*deg"/>
-	<Tubs name="DiskQuarter_Back_2" rMin="31*cm" rMax="127*cm" dz="0.5*[DiskQuarter_thickness]*cm" startPhi="0*deg" deltaPhi="90*deg"/>
-	<Tubs name="DiskQuarter_Front_2" rMin="31*cm" rMax="127*cm" dz="0.5*[DiskQuarter_thickness]*cm" startPhi="0*deg" deltaPhi="90*deg"/>
+	<Tubs name="DiskQuarter_Back" rMin="31*cm" rMax="119*cm" dz="0.5*[DiskQuarter_thickness]*cm" startPhi="90*deg" deltaPhi="90*deg"/>
+	<Tubs name="DiskQuarter_Front" rMin="31*cm" rMax="119*cm" dz="0.5*[DiskQuarter_thickness]*cm" startPhi="90*deg" deltaPhi="90*deg"/>
+	<Tubs name="DiskQuarter_Back_2" rMin="31*cm" rMax="119*cm" dz="0.5*[DiskQuarter_thickness]*cm" startPhi="0*deg" deltaPhi="90*deg"/>
+	<Tubs name="DiskQuarter_Front_2" rMin="31*cm" rMax="119*cm" dz="0.5*[DiskQuarter_thickness]*cm" startPhi="0*deg" deltaPhi="90*deg"/>
 	<Box name="SensorModule" dx="0.5*[SensorModuledx]*cm" dy="0.5*[SensorModuledy]*cm" dz="0.5*[SensorModuledz]*cm"/>
 	<Box name="ServiceHybrid" dx="0.5*[ServiceHybrid_X]*cm" dy="0.5*[ServiceHybrid_Y]*cm" dz="0.5*[ServiceHybrid_Z]*cm"/>
 	<Box name="ServiceHybrid_short" dx="0.5*[ServiceHybrid_X]*cm" dy="0.5*[ServiceHybrid_Y_short]*cm" dz="0.5*[ServiceHybrid_Z]*cm"/>
@@ -197,14 +197,14 @@
 	<PosPart copyNumber="1">                                           
 	  <rParent name="caloBase:CALOECFront"/>                         
 	  <rChild name="etl:EndcapTimingLayer"/>  
-	  <Translation x="0." y="0." z="0.5*([caloBase:Zpos110]+[caloBase:Zpos10])" />
+	  <Translation x="0." y="0." z="0.5*([caloBase:Zpos110]+[caloBase:Zpos10])+2*cm" />  <!--  -->
 	</PosPart>
 	
-	<!-- Positions wrt IP: endcap: 2966mm -> 3063mm  / Disk1 2996.62mm / Disk2 3017.62mm / Center of endcap 3014.5mm / Center of thermal screen 2976mm -->
+	<!-- Positions wrt IP: endcap: 2966mm -> 3063mm  / Disk1 3002.47mm / Disk2 3023.47mm / Center of endcap 3014.5mm / Center of thermal screen 2976mm -->
 	<PosPart copyNumber="1">                                           
 	  <rParent name="etl:EndcapTimingLayer"/>                         
 	  <rChild name="etl:ThermalScreen"/>  
-	  <Translation x="0." y="0." z="-3.85*cm" />
+	  <Translation x="0." y="0." z="-3.85*cm" />  <!-- -3.95*cm -->
 	</PosPart>
 	<PosPart copyNumber="1">                                           
 	  <rParent name="etl:EndcapTimingLayer"/>                         
@@ -214,7 +214,7 @@
 	<PosPart copyNumber="1">                                           
 	  <rParent name="etl:EndcapTimingLayer"/>                         
 	  <rChild name="etl:Disk2"/>  
-	  <Translation x="0." y="0." z="0.312*cm" />
+	  <Translation x="0." y="0." z="1.212*cm" />
 	</PosPart> 
 	<PosPart copyNumber="1">                                           
 	  <rParent name="etl:Disk1"/>                         
@@ -231,7 +231,7 @@
 	  <rParent name="etl:Disk1"/>                         
 	  <rChild name="etl:DiskQuarter_Front"/> 
 	  <rRotation name="etl:0"/> 
-	  <Translation x="0*cm" y="0*cm" z="-0.6545*cm" />
+	  <Translation x="0*cm" y="0*cm" z="-0.6545*cm" />  <!-- 1.2375 = 1.2 + 0.075/2 -->
 	</PosPart> 
 	<PosPart copyNumber="2">                                           
 	  <rParent name="etl:Disk1"/>                         
@@ -530,11 +530,11 @@
   <Algorithm name="global:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Front"/>
 	<String name="ChildName" value="etl:SensorModule_2"/>
-	<Numeric name="N" value="7"/>
+	<Numeric name="N" value="8"/>
 	<Numeric name="StartCopyNo" value="1"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> -120.325*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> -111.93*cm, 2.2925*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
@@ -547,7 +547,7 @@
     <Numeric name="StartCopyNo" value="1"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-120.325+[DeltaX_ServiceModule])*cm, 13.055*cm, 0.*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (-111.93+[DeltaX_ServiceModule])*cm, 13.1925*cm, 0.*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
@@ -560,7 +560,7 @@
     <Numeric name="StartCopyNo" value="1"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-120.325+[DeltaX_ServiceModule])*cm, (13.055+[DeltaY_ServiceLong_ServiceShort]+[DeltaY])*cm, 0*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (-111.93+[DeltaX_ServiceModule])*cm, (13.1925+[DeltaY_ServiceLong_ServiceShort]+[DeltaY])*cm, 0*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
@@ -573,7 +573,7 @@
     <Numeric name="StartCopyNo" value="1"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (-120.325+2*[DeltaX_ServiceModule])*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (-111.93+2*[DeltaX_ServiceModule])*cm, 2.2925*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
@@ -583,10 +583,10 @@
     <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:SensorModule_2"/>
     <Numeric name="N" value="12"/>
-    <Numeric name="StartCopyNo" value="8"/>
+    <Numeric name="StartCopyNo" value="12"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (-120.325+2*[DeltaX_ServiceModule]+[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (-111.93+2*[DeltaX_ServiceModule]+[SensorModuledx])*cm, 2.2925*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
@@ -599,7 +599,7 @@
     <Numeric name="StartCopyNo" value="2"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-120.325+3*[DeltaX_ServiceModule]+[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-111.93+3*[DeltaX_ServiceModule]+[SensorModuledx])*cm, 13.1925*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
@@ -612,7 +612,7 @@
     <Numeric name="StartCopyNo" value="10"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (-120.325+4*[DeltaX_ServiceModule]+[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (-111.93+4*[DeltaX_ServiceModule]+[SensorModuledx])*cm, 2.2925*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
@@ -625,7 +625,7 @@
     <Numeric name="StartCopyNo" value="20"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (-120.325+4*[DeltaX_ServiceModule]+2*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (-111.93+4*[DeltaX_ServiceModule]+2*[SensorModuledx])*cm, 2.2925*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
@@ -638,7 +638,7 @@
     <Numeric name="StartCopyNo" value="4"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-120.325+5*[DeltaX_ServiceModule]+2*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-111.93+5*[DeltaX_ServiceModule]+2*[SensorModuledx])*cm, 13.1925*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
@@ -651,7 +651,7 @@
     <Numeric name="StartCopyNo" value="2"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-120.325+5*[DeltaX_ServiceModule]+2*[SensorModuledx])*cm, (13.055+[ServiceHybrid_Y]+[DeltaY_ServiceLong_ServiceShort]+2*[DeltaY])*cm, 0*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (-111.93+5*[DeltaX_ServiceModule]+2*[SensorModuledx])*cm, (13.1925+[ServiceHybrid_Y]+[DeltaY_ServiceLong_ServiceShort]+2*[DeltaY])*cm, 0*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
@@ -661,10 +661,10 @@
     <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="15"/>
-    <Numeric name="StartCopyNo" value="22"/>
+    <Numeric name="StartCopyNo" value="20"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (-120.325+6*[DeltaX_ServiceModule]+2*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (-111.93+6*[DeltaX_ServiceModule]+2*[SensorModuledx])*cm, 2.2925*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
@@ -677,7 +677,7 @@
     <Numeric name="StartCopyNo" value="35"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (-120.325+6*[DeltaX_ServiceModule]+3*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (-111.93+6*[DeltaX_ServiceModule]+3*[SensorModuledx])*cm, 2.2925*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
@@ -690,7 +690,7 @@
     <Numeric name="StartCopyNo" value="6"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-120.325+7*[DeltaX_ServiceModule]+3*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-111.93+7*[DeltaX_ServiceModule]+3*[SensorModuledx])*cm, 13.1925*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
@@ -700,10 +700,10 @@
     <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="18"/>
-    <Numeric name="StartCopyNo" value="37"/>
+    <Numeric name="StartCopyNo" value="34"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (-120.325+8*[DeltaX_ServiceModule]+3*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (-111.93+8*[DeltaX_ServiceModule]+3*[SensorModuledx])*cm, 2.2925*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
@@ -712,50 +712,50 @@
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:SensorModule_2"/>
-    <Numeric name="N" value="21"/>
+    <Numeric name="N" value="20"/>
     <Numeric name="StartCopyNo" value="53"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (-120.325+8*[DeltaX_ServiceModule]+4*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (-111.93+8*[DeltaX_ServiceModule]+4*[SensorModuledx])*cm, 2.2925*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="global:DDMTDLinear">  <!-- y start changed from 13.1925 to 13.0925 to avoid extrusion -->
     <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="3"/>
     <Numeric name="StartCopyNo" value="9"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-120.325+9*[DeltaX_ServiceModule]+4*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-111.93+9*[DeltaX_ServiceModule]+4*[SensorModuledx])*cm, 13.0925*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <!-- <Algorithm name="global:DDMTDLinear">  
     <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:ServiceHybrid_short"/>
     <Numeric name="N" value="1"/>
     <Numeric name="StartCopyNo" value="3"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-120.325+9*[DeltaX_ServiceModule]+4*[SensorModuledx])*cm, (13.055+2*[ServiceHybrid_Y]+[DeltaY_ServiceLong_ServiceShort]+3*[DeltaY])*cm, 0*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (-111.93+9*[DeltaX_ServiceModule]+4*[SensorModuledx])*cm, (13.0925+2*[ServiceHybrid_Y]+[DeltaY_ServiceLong_ServiceShort]+3*[DeltaY])*cm, 0*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
-  </Algorithm>
+  </Algorithm> -->
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="21"/>
-    <Numeric name="StartCopyNo" value="55"/>
+    <Numeric name="StartCopyNo" value="53"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (-120.325+10*[DeltaX_ServiceModule]+4*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (-111.93+10*[DeltaX_ServiceModule]+4*[SensorModuledx])*cm, 2.2925*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
@@ -765,10 +765,10 @@
     <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:SensorModule_2"/>
     <Numeric name="N" value="21"/>
-    <Numeric name="StartCopyNo" value="74"/>
+    <Numeric name="StartCopyNo" value="73"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (-120.325+10*[DeltaX_ServiceModule]+5*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (-111.93+10*[DeltaX_ServiceModule]+5*[SensorModuledx])*cm, 2.2925*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
@@ -781,7 +781,7 @@
     <Numeric name="StartCopyNo" value="12"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-120.325+11*[DeltaX_ServiceModule]+5*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-111.93+11*[DeltaX_ServiceModule]+5*[SensorModuledx])*cm, 13.1925*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
@@ -794,7 +794,7 @@
     <Numeric name="StartCopyNo" value="4"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-120.325+11*[DeltaX_ServiceModule]+5*[SensorModuledx])*cm, (13.055+2*[ServiceHybrid_Y]+[DeltaY_ServiceLong_ServiceShort]+3*[DeltaY])*cm, 0*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (-111.93+11*[DeltaX_ServiceModule]+5*[SensorModuledx])*cm, (13.1925+2*[ServiceHybrid_Y]+[DeltaY_ServiceLong_ServiceShort]+3*[DeltaY])*cm, 0*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
@@ -804,10 +804,10 @@
     <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="21"/>
-    <Numeric name="StartCopyNo" value="76"/>
+    <Numeric name="StartCopyNo" value="73"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (-120.325+12*[DeltaX_ServiceModule]+5*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (-111.93+12*[DeltaX_ServiceModule]+5*[SensorModuledx])*cm, 2.2925*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
@@ -816,11 +816,11 @@
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:SensorModule_2"/>
-    <Numeric name="N" value="24"/>
-    <Numeric name="StartCopyNo" value="95"/>
+    <Numeric name="N" value="21"/>
+    <Numeric name="StartCopyNo" value="94"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (-120.325+12*[DeltaX_ServiceModule]+6*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (-111.93+12*[DeltaX_ServiceModule]+6*[SensorModuledx])*cm, 2.2925*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
@@ -829,37 +829,11 @@
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
-    <Numeric name="N" value="4"/>
+    <Numeric name="N" value="3"/>
     <Numeric name="StartCopyNo" value="15"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-120.325+13*[DeltaX_ServiceModule]+6*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-    <Numeric name="Theta_obj" value="90.*deg"/> 
-	<Numeric name="Phi_obj" value="0.*deg"/>
-  </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front"/>
-    <String name="ChildName" value="etl:SensorModule"/>
-    <Numeric name="N" value="24"/>
-    <Numeric name="StartCopyNo" value="97"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (-120.325+14*[DeltaX_ServiceModule]+6*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-    <Numeric name="Theta_obj" value="90.*deg"/> 
-	<Numeric name="Phi_obj" value="0.*deg"/>
-  </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front"/>
-    <String name="ChildName" value="etl:SensorModule_2"/>
-    <Numeric name="N" value="24"/>
-    <Numeric name="StartCopyNo" value="119"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (-120.325+14*[DeltaX_ServiceModule]+7*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (-111.93+13*[DeltaX_ServiceModule]+6*[SensorModuledx])*cm, 13.1925*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
@@ -867,12 +841,12 @@
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front"/>
-    <String name="ChildName" value="etl:ServiceHybrid"/>
-    <Numeric name="N" value="4"/>
-    <Numeric name="StartCopyNo" value="19"/>
+    <String name="ChildName" value="etl:ServiceHybrid_short"/>
+    <Numeric name="N" value="1"/>
+    <Numeric name="StartCopyNo" value="5"/>
     <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-120.325+15*[DeltaX_ServiceModule]+7*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+    <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-111.93+13*[DeltaX_ServiceModule]+6*[SensorModuledx])*cm, (13.1925+2*[ServiceHybrid_Y]+[DeltaY_ServiceLong_ServiceShort]+3*[DeltaY])*cm, 0*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
@@ -881,11 +855,11 @@
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:SensorModule"/>
-    <Numeric name="N" value="24"/>
-    <Numeric name="StartCopyNo" value="121"/>
+    <Numeric name="N" value="21"/>
+    <Numeric name="StartCopyNo" value="94"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (-120.325+16*[DeltaX_ServiceModule]+7*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (-111.93+14*[DeltaX_ServiceModule]+6*[SensorModuledx])*cm, 2.2925*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
@@ -895,10 +869,10 @@
     <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:SensorModule_2"/>
     <Numeric name="N" value="24"/>
-    <Numeric name="StartCopyNo" value="143"/>
+    <Numeric name="StartCopyNo" value="115"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (-120.325+16*[DeltaX_ServiceModule]+8*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (-111.93+14*[DeltaX_ServiceModule]+7*[SensorModuledx])*cm, 2.2925*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
@@ -908,10 +882,10 @@
     <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="4"/>
-    <Numeric name="StartCopyNo" value="23"/>
+    <Numeric name="StartCopyNo" value="18"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-120.325+17*[DeltaX_ServiceModule]+8*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-111.93+15*[DeltaX_ServiceModule]+7*[SensorModuledx])*cm, 13.1925*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
@@ -921,10 +895,10 @@
     <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="24"/>
-    <Numeric name="StartCopyNo" value="145"/>
+    <Numeric name="StartCopyNo" value="115"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (-120.325+18*[DeltaX_ServiceModule]+8*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (-111.93+16*[DeltaX_ServiceModule]+7*[SensorModuledx])*cm, 2.2925*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
@@ -933,24 +907,11 @@
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:SensorModule_2"/>
-    <Numeric name="N" value="27"/>
-    <Numeric name="StartCopyNo" value="167"/>
+    <Numeric name="N" value="24"/>
+    <Numeric name="StartCopyNo" value="139"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (-120.325+18*[DeltaX_ServiceModule]+9*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-    <Numeric name="Theta_obj" value="90.*deg"/> 
-	<Numeric name="Phi_obj" value="0.*deg"/>
-  </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front"/>
-    <String name="ChildName" value="etl:ServiceHybrid_short"/>
-    <Numeric name="N" value="1"/>
-    <Numeric name="StartCopyNo" value="5"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-120.325+19*[DeltaX_ServiceModule]+9*[SensorModuledx])*cm, 6.5275*cm, 0*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (-111.93+16*[DeltaX_ServiceModule]+8*[SensorModuledx])*cm, 2.2925*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
@@ -960,10 +921,10 @@
     <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="4"/>
-    <Numeric name="StartCopyNo" value="27"/>
+    <Numeric name="StartCopyNo" value="22"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-120.325+19*[DeltaX_ServiceModule]+9*[SensorModuledx])*cm, (6.5275+[DeltaY_ServiceLong_ServiceShort]+[DeltaY])*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-111.93+17*[DeltaX_ServiceModule]+8*[SensorModuledx])*cm, 13.1925*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
@@ -972,11 +933,11 @@
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:SensorModule"/>
-    <Numeric name="N" value="27"/>
-    <Numeric name="StartCopyNo" value="169"/>
+    <Numeric name="N" value="24"/>
+    <Numeric name="StartCopyNo" value="139"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (-120.325+20*[DeltaX_ServiceModule]+9*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (-111.93+18*[DeltaX_ServiceModule]+8*[SensorModuledx])*cm, 2.2925*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
@@ -985,37 +946,24 @@
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:SensorModule_2"/>
-    <Numeric name="N" value="27"/>
-    <Numeric name="StartCopyNo" value="194"/>
+    <Numeric name="N" value="24"/>
+    <Numeric name="StartCopyNo" value="163"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (-120.325+20*[DeltaX_ServiceModule]+10*[SensorModuledx])*cm, (2.155+[SensorModuledy]+[DeltaY])*cm, 0.178*cm </Vector> 
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-    <Numeric name="Theta_obj" value="90.*deg"/> 
-	<Numeric name="Phi_obj" value="0.*deg"/>
-  </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front"/>
-    <String name="ChildName" value="etl:ServiceHybrid_short"/>
-    <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="6"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-120.325+21*[DeltaX_ServiceModule]+10*[SensorModuledx])*cm, (2.155+2*[SensorModuledy]+2*[DeltaY])*cm, 0*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (-111.93+18*[DeltaX_ServiceModule]+9*[SensorModuledx])*cm, (2.2925+[SensorModuledy]+[DeltaY])*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+   <Algorithm name="global:DDMTDLinear">  <!-- y-pos of 1st SH module moved from 13.1925 to 16.2 to avoid module extrusion -->
     <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
-    <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="31"/>
+    <Numeric name="N" value="4"/>
+    <Numeric name="StartCopyNo" value="26"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-120.325+21*[DeltaX_ServiceModule]+10*[SensorModuledx])*cm, (2.155+2*[SensorModuledy]+2*[DeltaY]+2*[ServiceHybrid_Y_short]+[DeltaY_ServiceLong_ServiceShort]+3*[DeltaY])*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-111.93+19*[DeltaX_ServiceModule]+9*[SensorModuledx])*cm, (16.2+[SensorModuledy]+[DeltaY])*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
@@ -1024,11 +972,11 @@
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:SensorModule"/>
-    <Numeric name="N" value="24"/>
-    <Numeric name="StartCopyNo" value="196"/>
+    <Numeric name="N" value="21"/>
+    <Numeric name="StartCopyNo" value="163"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (-120.325+22*[DeltaX_ServiceModule]+10*[SensorModuledx])*cm, ( 2.155+4*[SensorModuledy]+4*[DeltaY])*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (-111.93+20*[DeltaX_ServiceModule]+9*[SensorModuledx])*cm, (2.2925+4*[SensorModuledy]+4*[DeltaY])*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
@@ -1037,24 +985,11 @@
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:SensorModule_2"/>
-    <Numeric name="N" value="21"/>
-    <Numeric name="StartCopyNo" value="221"/>
+    <Numeric name="N" value="18"/>
+    <Numeric name="StartCopyNo" value="187"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (-120.325+22*[DeltaX_ServiceModule]+11*[SensorModuledx])*cm, ( 2.155+6*[SensorModuledy]+6*[DeltaY])*cm, 0.178*cm </Vector> 
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-    <Numeric name="Theta_obj" value="90.*deg"/> 
-	<Numeric name="Phi_obj" value="0.*deg"/>
-  </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front"/>
-    <String name="ChildName" value="etl:ServiceHybrid_short"/>
-    <Numeric name="N" value="1"/>
-    <Numeric name="StartCopyNo" value="9"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-120.325+23*[DeltaX_ServiceModule]+11*[SensorModuledx])*cm, (2.155+7*[SensorModuledy]+7*[DeltaY])*cm, 0*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (-111.93+20*[DeltaX_ServiceModule]+10*[SensorModuledx])*cm, (2.2925+6*[SensorModuledy]+6*[DeltaY])*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
@@ -1064,10 +999,10 @@
     <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="34"/>
+    <Numeric name="StartCopyNo" value="30"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-120.325+23*[DeltaX_ServiceModule]+11*[SensorModuledx])*cm, (2.155+7*[SensorModuledy]+8*[DeltaY]+[DeltaY_ServiceLong_ServiceShort])*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-111.93+21*[DeltaX_ServiceModule]+10*[SensorModuledx])*cm, (13.1925+6*[SensorModuledy]+6*[DeltaY])*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
@@ -1076,11 +1011,11 @@
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:SensorModule"/>
-    <Numeric name="N" value="21"/>
-    <Numeric name="StartCopyNo" value="220"/>
+    <Numeric name="N" value="18"/>
+    <Numeric name="StartCopyNo" value="184"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (-120.325+24*[DeltaX_ServiceModule]+11*[SensorModuledx])*cm, ( 2.155+6*[SensorModuledy]+6*[DeltaY])*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (-111.93+22*[DeltaX_ServiceModule]+10*[SensorModuledx])*cm, ( 2.2925+6*[SensorModuledy]+6*[DeltaY])*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
@@ -1089,24 +1024,11 @@
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:SensorModule_2"/>
-    <Numeric name="N" value="21"/>
-    <Numeric name="StartCopyNo" value="242"/>
+    <Numeric name="N" value="18"/>
+    <Numeric name="StartCopyNo" value="205"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (-120.325+24*[DeltaX_ServiceModule]+12*[SensorModuledx])*cm, ( 2.155+7*[SensorModuledy]+7*[DeltaY])*cm, 0.178*cm </Vector> 
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-    <Numeric name="Theta_obj" value="90.*deg"/> 
-	<Numeric name="Phi_obj" value="0.*deg"/>
-  </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front"/>
-    <String name="ChildName" value="etl:ServiceHybrid_short"/>
-    <Numeric name="N" value="1"/>
-    <Numeric name="StartCopyNo" value="10"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-120.325+25*[DeltaX_ServiceModule]+12*[SensorModuledx])*cm, (2.155+8*[SensorModuledy]+8*[DeltaY])*cm, 0*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (-111.93+22*[DeltaX_ServiceModule]+11*[SensorModuledx])*cm, ( 2.2925+7*[SensorModuledy]+7*[DeltaY])*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
@@ -1116,10 +1038,10 @@
     <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="37"/>
+    <Numeric name="StartCopyNo" value="33"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-120.325+25*[DeltaX_ServiceModule]+12*[SensorModuledx])*cm, (2.155+8*[SensorModuledy]+9*[DeltaY]+[DeltaY_ServiceLong_ServiceShort])*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-111.93+23*[DeltaX_ServiceModule]+11*[SensorModuledx])*cm, (13.1925+7*[SensorModuledy]+7*[DeltaY])*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
@@ -1128,11 +1050,11 @@
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:SensorModule"/>
-    <Numeric name="N" value="21"/>
-    <Numeric name="StartCopyNo" value="241"/>
+    <Numeric name="N" value="18"/>
+    <Numeric name="StartCopyNo" value="202"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (-120.325+26*[DeltaX_ServiceModule]+12*[SensorModuledx])*cm, ( 2.155+7*[SensorModuledy]+7*[DeltaY])*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (-111.93+24*[DeltaX_ServiceModule]+11*[SensorModuledx])*cm, ( 2.2925+7*[SensorModuledy]+7*[DeltaY])*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
@@ -1141,24 +1063,11 @@
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:SensorModule_2"/>
-    <Numeric name="N" value="21"/>
-    <Numeric name="StartCopyNo" value="242"/>
+    <Numeric name="N" value="18"/>
+    <Numeric name="StartCopyNo" value="223"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (-120.325+26*[DeltaX_ServiceModule]+13*[SensorModuledx])*cm, ( 2.155+8*[SensorModuledy]+8*[DeltaY])*cm, 0.178*cm </Vector> 
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-    <Numeric name="Theta_obj" value="90.*deg"/> 
-	<Numeric name="Phi_obj" value="0.*deg"/>
-  </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front"/>
-    <String name="ChildName" value="etl:ServiceHybrid_short"/>
-    <Numeric name="N" value="1"/>
-    <Numeric name="StartCopyNo" value="11"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-120.325+27*[DeltaX_ServiceModule]+13*[SensorModuledx])*cm, (2.155+9*[SensorModuledy]+9*[DeltaY])*cm, 0*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (-111.93+24*[DeltaX_ServiceModule]+12*[SensorModuledx])*cm, ( 2.2925+8*[SensorModuledy]+8*[DeltaY])*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
@@ -1168,10 +1077,10 @@
     <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="40"/>
+    <Numeric name="StartCopyNo" value="36"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (-120.325+27*[DeltaX_ServiceModule]+13*[SensorModuledx])*cm, (2.155+9*[SensorModuledy]+10*[DeltaY]+[DeltaY_ServiceLong_ServiceShort])*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (-111.93+25*[DeltaX_ServiceModule]+12*[SensorModuledx])*cm, (13.1925+8*[SensorModuledy]+8*[DeltaY])*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
@@ -1180,20 +1089,17 @@
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:SensorModule"/>
-    <Numeric name="N" value="21"/>
-    <Numeric name="StartCopyNo" value="262"/>
+    <Numeric name="N" value="18"/>
+    <Numeric name="StartCopyNo" value="220"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (-120.325+28*[DeltaX_ServiceModule]+13*[SensorModuledx])*cm, ( 2.155+8*[SensorModuledy]+8*[DeltaY])*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (-111.93+26*[DeltaX_ServiceModule]+12*[SensorModuledx])*cm, ( 2.2925+8*[SensorModuledy]+8*[DeltaY])*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-
-
-
-
+ 
 
     <!-- Disk1 Back face -->
   <Algorithm name="global:DDMTDLinear">
@@ -1203,7 +1109,7 @@
 	<Numeric name="StartCopyNo" value="1"/>
 	<Numeric name="IncrCopyNo" value="1"/>
 	<Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-	<Vector  name="Base" type="numeric" nEntries="3"> -122.0*cm, 13.055*cm, 0.*cm </Vector> 
+	<Vector  name="Base" type="numeric" nEntries="3"> -113.555*cm, 13.1925*cm, 0.*cm </Vector> 
 	<Numeric name="Theta" value="90.*deg"/> <!-- translation along y -->
 	<Numeric name="Phi" value="90.*deg"/>
 	<Numeric name="Theta_obj" value="90.*deg"/> 
@@ -1216,7 +1122,7 @@
 	<Numeric name="StartCopyNo" value="1"/>
 	<Numeric name="IncrCopyNo" value="1"/>
 	<Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+[DeltaX_ServiceModule])*cm, 2.155*cm, -0.178*cm </Vector> 
+	<Vector  name="Base" type="numeric" nEntries="3"> (-113.555+[DeltaX_ServiceModule])*cm, 2.2925*cm, -0.178*cm </Vector> 
 	<Numeric name="Theta" value="90.*deg"/> 
 	<Numeric name="Phi" value="90.*deg"/>
 	<Numeric name="Theta_obj" value="90.*deg"/> 
@@ -1229,7 +1135,7 @@
 	<Numeric name="StartCopyNo" value="1"/>
 	<Numeric name="IncrCopyNo" value="1"/>
 	<Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+[DeltaX_ServiceModule]+[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+	<Vector  name="Base" type="numeric" nEntries="3"> (-113.555+[DeltaX_ServiceModule]+[SensorModuledx])*cm, 2.2925*cm, -0.178*cm </Vector> 
 	<Numeric name="Theta" value="90.*deg"/> 
 	<Numeric name="Phi" value="90.*deg"/>
 	<Numeric name="Theta_obj" value="90.*deg"/> 
@@ -1242,7 +1148,7 @@
 	<Numeric name="StartCopyNo" value="2"/>
 	<Numeric name="IncrCopyNo" value="1"/>
 	<Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+2*[DeltaX_ServiceModule]+[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+	<Vector  name="Base" type="numeric" nEntries="3"> (-113.555+2*[DeltaX_ServiceModule]+[SensorModuledx])*cm, 13.1925*cm, 0.*cm </Vector>
 	<Numeric name="Theta" value="90.*deg"/> 
 	<Numeric name="Phi" value="90.*deg"/>
 	<Numeric name="Theta_obj" value="90.*deg"/> 
@@ -1255,7 +1161,7 @@
 	<Numeric name="StartCopyNo" value="7"/>
 	<Numeric name="IncrCopyNo" value="1"/>
 	<Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+3*[DeltaX_ServiceModule]+[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+	<Vector  name="Base" type="numeric" nEntries="3"> (-113.555+3*[DeltaX_ServiceModule]+[SensorModuledx])*cm, 2.2925*cm, -0.178*cm </Vector> 
 	<Numeric name="Theta" value="90.*deg"/> 
 	<Numeric name="Phi" value="90.*deg"/>
 	<Numeric name="Theta_obj" value="90.*deg"/> 
@@ -1268,7 +1174,7 @@
 	<Numeric name="StartCopyNo" value="11"/>
 	<Numeric name="IncrCopyNo" value="1"/>
 	<Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+3*[DeltaX_ServiceModule]+2*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+	<Vector  name="Base" type="numeric" nEntries="3"> (-113.555+3*[DeltaX_ServiceModule]+2*[SensorModuledx])*cm, 2.2925*cm, -0.178*cm </Vector> 
 	<Numeric name="Theta" value="90.*deg"/> 
 	<Numeric name="Phi" value="90.*deg"/>
 	<Numeric name="Theta_obj" value="90.*deg"/> 
@@ -1281,7 +1187,7 @@
 	<Numeric name="StartCopyNo" value="4"/>
 	<Numeric name="IncrCopyNo" value="1"/>
 	<Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+4*[DeltaX_ServiceModule]+2*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+	<Vector  name="Base" type="numeric" nEntries="3"> (-113.555+4*[DeltaX_ServiceModule]+2*[SensorModuledx])*cm, 13.1925*cm, 0.*cm </Vector>
 	<Numeric name="Theta" value="90.*deg"/> 
 	<Numeric name="Phi" value="90.*deg"/>
 	<Numeric name="Theta_obj" value="90.*deg"/> 
@@ -1294,7 +1200,7 @@
 	<Numeric name="StartCopyNo" value="1"/>
 	<Numeric name="IncrCopyNo" value="1"/>
 	<Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+4*[DeltaX_ServiceModule]+2*[SensorModuledx])*cm, (13.055+[ServiceHybrid_Y]+2*[DeltaY]+[DeltaY_ServiceLong_ServiceShort])*cm, 0.*cm </Vector>
+	<Vector  name="Base" type="numeric" nEntries="3"> (-113.555+4*[DeltaX_ServiceModule]+2*[SensorModuledx])*cm, (13.1925+[ServiceHybrid_Y]+2*[DeltaY]+[DeltaY_ServiceLong_ServiceShort])*cm, 0.*cm </Vector>
 	<Numeric name="Theta" value="90.*deg"/> 
 	<Numeric name="Phi" value="90.*deg"/>
 	<Numeric name="Theta_obj" value="90.*deg"/> 
@@ -1307,7 +1213,7 @@
 	<Numeric name="StartCopyNo" value="19"/>
 	<Numeric name="IncrCopyNo" value="1"/>
 	<Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+5*[DeltaX_ServiceModule]+2*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+	<Vector  name="Base" type="numeric" nEntries="3"> (-113.555+5*[DeltaX_ServiceModule]+2*[SensorModuledx])*cm, 2.2925*cm, -0.178*cm </Vector> 
 	<Numeric name="Theta" value="90.*deg"/> 
 	<Numeric name="Phi" value="90.*deg"/>
 	<Numeric name="Theta_obj" value="90.*deg"/> 
@@ -1320,20 +1226,20 @@
 	<Numeric name="StartCopyNo" value="25"/>
 	<Numeric name="IncrCopyNo" value="1"/>
 	<Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+5*[DeltaX_ServiceModule]+3*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+	<Vector  name="Base" type="numeric" nEntries="3"> (-113.555+5*[DeltaX_ServiceModule]+3*[SensorModuledx])*cm, 2.2925*cm, -0.178*cm </Vector> 
 	<Numeric name="Theta" value="90.*deg"/> 
 	<Numeric name="Phi" value="90.*deg"/>
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="global:DDMTDLinear">  <!-- y start pos 13.0925 instead of 13.1925 to avoid extrusion -->
     <rParent name="etl:DiskQuarter_Back"/>
 	<String name="ChildName" value="etl:ServiceHybrid"/>
-	<Numeric name="N" value="3"/>
+	<Numeric name="N" value="2"/>  <!-- "3" -->
 	<Numeric name="StartCopyNo" value="6"/>
 	<Numeric name="IncrCopyNo" value="1"/>
 	<Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+6*[DeltaX_ServiceModule]+3*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+	<Vector  name="Base" type="numeric" nEntries="3"> (-113.555+6*[DeltaX_ServiceModule]+3*[SensorModuledx])*cm, 13.0925*cm, 0.*cm </Vector>
 	<Numeric name="Theta" value="90.*deg"/> 
 	<Numeric name="Phi" value="90.*deg"/>
 	<Numeric name="Theta_obj" value="90.*deg"/> 
@@ -1346,7 +1252,7 @@
 	<Numeric name="StartCopyNo" value="34"/>
 	<Numeric name="IncrCopyNo" value="1"/>
 	<Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+7*[DeltaX_ServiceModule]+3*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+	<Vector  name="Base" type="numeric" nEntries="3"> (-113.555+7*[DeltaX_ServiceModule]+3*[SensorModuledx])*cm, 2.2925*cm, -0.178*cm </Vector> 
 	<Numeric name="Theta" value="90.*deg"/> 
 	<Numeric name="Phi" value="90.*deg"/>
 	<Numeric name="Theta_obj" value="90.*deg"/> 
@@ -1359,7 +1265,7 @@
 	<Numeric name="StartCopyNo" value="42"/>
 	<Numeric name="IncrCopyNo" value="1"/>
 	<Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+7*[DeltaX_ServiceModule]+4*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+	<Vector  name="Base" type="numeric" nEntries="3"> (-113.555+7*[DeltaX_ServiceModule]+4*[SensorModuledx])*cm, 2.2925*cm, -0.178*cm </Vector> 
 	<Numeric name="Theta" value="90.*deg"/> 
 	<Numeric name="Phi" value="90.*deg"/>
 	<Numeric name="Theta_obj" value="90.*deg"/> 
@@ -1372,7 +1278,7 @@
 	<Numeric name="StartCopyNo" value="9"/>
 	<Numeric name="IncrCopyNo" value="1"/>
 	<Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+8*[DeltaX_ServiceModule]+4*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+	<Vector  name="Base" type="numeric" nEntries="3"> (-113.555+8*[DeltaX_ServiceModule]+4*[SensorModuledx])*cm, 13.1925*cm, 0.*cm </Vector>
 	<Numeric name="Theta" value="90.*deg"/> 
 	<Numeric name="Phi" value="90.*deg"/>
 	<Numeric name="Theta_obj" value="90.*deg"/> 
@@ -1385,7 +1291,7 @@
 	<Numeric name="StartCopyNo" value="52"/>
 	<Numeric name="IncrCopyNo" value="1"/>
 	<Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+9*[DeltaX_ServiceModule]+4*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+	<Vector  name="Base" type="numeric" nEntries="3"> (-113.555+9*[DeltaX_ServiceModule]+4*[SensorModuledx])*cm, 2.2925*cm, -0.178*cm </Vector> 
 	<Numeric name="Theta" value="90.*deg"/> 
 	<Numeric name="Phi" value="90.*deg"/>
 	<Numeric name="Theta_obj" value="90.*deg"/> 
@@ -1398,7 +1304,7 @@
 	<Numeric name="StartCopyNo" value="60"/>
 	<Numeric name="IncrCopyNo" value="1"/>
 	<Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+9*[DeltaX_ServiceModule]+5*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+	<Vector  name="Base" type="numeric" nEntries="3"> (-113.555+9*[DeltaX_ServiceModule]+5*[SensorModuledx])*cm, 2.2925*cm, -0.178*cm </Vector> 
 	<Numeric name="Theta" value="90.*deg"/> 
 	<Numeric name="Phi" value="90.*deg"/>
 	<Numeric name="Theta_obj" value="90.*deg"/> 
@@ -1411,7 +1317,7 @@
 	<Numeric name="StartCopyNo" value="12"/>
 	<Numeric name="IncrCopyNo" value="1"/>
 	<Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+10*[DeltaX_ServiceModule]+5*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+	<Vector  name="Base" type="numeric" nEntries="3"> (-113.555+10*[DeltaX_ServiceModule]+5*[SensorModuledx])*cm, 13.1925*cm, 0.*cm </Vector>
 	<Numeric name="Theta" value="90.*deg"/> 
 	<Numeric name="Phi" value="90.*deg"/>
 	<Numeric name="Theta_obj" value="90.*deg"/> 
@@ -1424,7 +1330,7 @@
 	<Numeric name="StartCopyNo" value="2"/>
 	<Numeric name="IncrCopyNo" value="1"/>
 	<Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+10*[DeltaX_ServiceModule]+5*[SensorModuledx])*cm, (13.055+2*[ServiceHybrid_Y]+3*[DeltaY]+[DeltaY_ServiceLong_ServiceShort])*cm, 0.*cm </Vector>
+	<Vector  name="Base" type="numeric" nEntries="3"> (-113.555+10*[DeltaX_ServiceModule]+5*[SensorModuledx])*cm, (13.1925+2*[ServiceHybrid_Y]+3*[DeltaY]+[DeltaY_ServiceLong_ServiceShort])*cm, 0.*cm </Vector>
 	<Numeric name="Theta" value="90.*deg"/> 
 	<Numeric name="Phi" value="90.*deg"/>
 	<Numeric name="Theta_obj" value="90.*deg"/> 
@@ -1437,7 +1343,7 @@
 	<Numeric name="StartCopyNo" value="70"/>
 	<Numeric name="IncrCopyNo" value="1"/>
 	<Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+11*[DeltaX_ServiceModule]+5*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+	<Vector  name="Base" type="numeric" nEntries="3"> (-113.555+11*[DeltaX_ServiceModule]+5*[SensorModuledx])*cm, 2.2925*cm, -0.178*cm </Vector> 
 	<Numeric name="Theta" value="90.*deg"/> 
 	<Numeric name="Phi" value="90.*deg"/>
 	<Numeric name="Theta_obj" value="90.*deg"/> 
@@ -1446,11 +1352,11 @@
   <Algorithm name="global:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back"/>
 	<String name="ChildName" value="etl:SensorModule_r_2"/>
-	<Numeric name="N" value="23"/>
+	<Numeric name="N" value="21"/>
 	<Numeric name="StartCopyNo" value="81"/>
 	<Numeric name="IncrCopyNo" value="1"/>
 	<Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+11*[DeltaX_ServiceModule]+6*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+	<Vector  name="Base" type="numeric" nEntries="3"> (-113.555+11*[DeltaX_ServiceModule]+6*[SensorModuledx])*cm, 2.2925*cm, -0.178*cm </Vector> 
 	<Numeric name="Theta" value="90.*deg"/> 
 	<Numeric name="Phi" value="90.*deg"/>
 	<Numeric name="Theta_obj" value="90.*deg"/> 
@@ -1459,11 +1365,24 @@
   <Algorithm name="global:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back"/>
 	<String name="ChildName" value="etl:ServiceHybrid"/>
-	<Numeric name="N" value="4"/>
+	<Numeric name="N" value="3"/>
 	<Numeric name="StartCopyNo" value="15"/>
 	<Numeric name="IncrCopyNo" value="1"/>
 	<Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+12*[DeltaX_ServiceModule]+6*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+	<Vector  name="Base" type="numeric" nEntries="3"> (-113.555+12*[DeltaX_ServiceModule]+6*[SensorModuledx])*cm, 13.1925*cm, 0.*cm </Vector>
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
+  </Algorithm>
+  <Algorithm name="global:DDMTDLinear">
+	<rParent name="etl:DiskQuarter_Back"/>
+	<String name="ChildName" value="etl:ServiceHybrid_short"/>
+	<Numeric name="N" value="1"/>
+	<Numeric name="StartCopyNo" value="3"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (-113.555+12*[DeltaX_ServiceModule]+6*[SensorModuledx])*cm, (13.1925+2*[ServiceHybrid_Y]+3*[DeltaY]+[DeltaY_ServiceLong_ServiceShort])*cm, 0.*cm </Vector>
 	<Numeric name="Theta" value="90.*deg"/> 
 	<Numeric name="Phi" value="90.*deg"/>
 	<Numeric name="Theta_obj" value="90.*deg"/> 
@@ -1472,11 +1391,11 @@
   <Algorithm name="global:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back"/>
 	<String name="ChildName" value="etl:SensorModule_r"/>
-	<Numeric name="N" value="24"/>
+	<Numeric name="N" value="21"/>
 	<Numeric name="StartCopyNo" value="91"/>
 	<Numeric name="IncrCopyNo" value="1"/>
 	<Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+13*[DeltaX_ServiceModule]+6*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+	<Vector  name="Base" type="numeric" nEntries="3"> (-113.555+13*[DeltaX_ServiceModule]+6*[SensorModuledx])*cm, 2.2925*cm, -0.178*cm </Vector> 
 	<Numeric name="Theta" value="90.*deg"/> 
 	<Numeric name="Phi" value="90.*deg"/>
 	<Numeric name="Theta_obj" value="90.*deg"/> 
@@ -1485,11 +1404,11 @@
   <Algorithm name="global:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back"/>
 	<String name="ChildName" value="etl:SensorModule_r_2"/>
-	<Numeric name="N" value="24"/>
-	<Numeric name="StartCopyNo" value="104"/>
+	<Numeric name="N" value="23"/>
+	<Numeric name="StartCopyNo" value="102"/>
 	<Numeric name="IncrCopyNo" value="1"/>
 	<Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+13*[DeltaX_ServiceModule]+7*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+	<Vector  name="Base" type="numeric" nEntries="3"> (-113.555+13*[DeltaX_ServiceModule]+7*[SensorModuledx])*cm, 2.2925*cm, -0.178*cm </Vector> 
 	<Numeric name="Theta" value="90.*deg"/> 
 	<Numeric name="Phi" value="90.*deg"/>
 	<Numeric name="Theta_obj" value="90.*deg"/> 
@@ -1499,10 +1418,10 @@
 	<rParent name="etl:DiskQuarter_Back"/>
 	<String name="ChildName" value="etl:ServiceHybrid"/>
 	<Numeric name="N" value="4"/>
-	<Numeric name="StartCopyNo" value="19"/>
+	<Numeric name="StartCopyNo" value="18"/>
 	<Numeric name="IncrCopyNo" value="1"/>
 	<Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+14*[DeltaX_ServiceModule]+7*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+	<Vector  name="Base" type="numeric" nEntries="3"> (-113.555+14*[DeltaX_ServiceModule]+7*[SensorModuledx])*cm, 13.1925*cm, 0.*cm </Vector>
 	<Numeric name="Theta" value="90.*deg"/> 
 	<Numeric name="Phi" value="90.*deg"/>
 	<Numeric name="Theta_obj" value="90.*deg"/> 
@@ -1512,10 +1431,10 @@
 	<rParent name="etl:DiskQuarter_Back"/>
 	<String name="ChildName" value="etl:SensorModule_r"/>
 	<Numeric name="N" value="24"/>
-	<Numeric name="StartCopyNo" value="115"/>
+	<Numeric name="StartCopyNo" value="112"/>
 	<Numeric name="IncrCopyNo" value="1"/>
 	<Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+15*[DeltaX_ServiceModule]+7*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+	<Vector  name="Base" type="numeric" nEntries="3"> (-113.555+15*[DeltaX_ServiceModule]+7*[SensorModuledx])*cm, 2.2925*cm, -0.178*cm </Vector> 
 	<Numeric name="Theta" value="90.*deg"/> 
 	<Numeric name="Phi" value="90.*deg"/>
 	<Numeric name="Theta_obj" value="90.*deg"/> 
@@ -1525,10 +1444,10 @@
 	<rParent name="etl:DiskQuarter_Back"/>
 	<String name="ChildName" value="etl:SensorModule_r_2"/>
 	<Numeric name="N" value="24"/>
-	<Numeric name="StartCopyNo" value="128"/>
+	<Numeric name="StartCopyNo" value="125"/>
 	<Numeric name="IncrCopyNo" value="1"/>
 	<Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+15*[DeltaX_ServiceModule]+8*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+	<Vector  name="Base" type="numeric" nEntries="3"> (-113.555+15*[DeltaX_ServiceModule]+8*[SensorModuledx])*cm, 2.2925*cm, -0.178*cm </Vector> 
 	<Numeric name="Theta" value="90.*deg"/> 
 	<Numeric name="Phi" value="90.*deg"/>
 	<Numeric name="Theta_obj" value="90.*deg"/> 
@@ -1538,10 +1457,10 @@
 	<rParent name="etl:DiskQuarter_Back"/>
 	<String name="ChildName" value="etl:ServiceHybrid"/>
 	<Numeric name="N" value="4"/>
-	<Numeric name="StartCopyNo" value="23"/>
+	<Numeric name="StartCopyNo" value="22"/>
 	<Numeric name="IncrCopyNo" value="1"/>
 	<Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+16*[DeltaX_ServiceModule]+8*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+	<Vector  name="Base" type="numeric" nEntries="3"> (-113.555+16*[DeltaX_ServiceModule]+8*[SensorModuledx])*cm, 13.1925*cm, 0.*cm </Vector>
 	<Numeric name="Theta" value="90.*deg"/> 
 	<Numeric name="Phi" value="90.*deg"/>
 	<Numeric name="Theta_obj" value="90.*deg"/> 
@@ -1551,10 +1470,10 @@
 	<rParent name="etl:DiskQuarter_Back"/>
 	<String name="ChildName" value="etl:SensorModule_r"/>
 	<Numeric name="N" value="24"/>
-	<Numeric name="StartCopyNo" value="139"/>
+	<Numeric name="StartCopyNo" value="136"/>
 	<Numeric name="IncrCopyNo" value="1"/>
 	<Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+17*[DeltaX_ServiceModule]+8*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+	<Vector  name="Base" type="numeric" nEntries="3"> (-113.555+17*[DeltaX_ServiceModule]+8*[SensorModuledx])*cm, 2.2925*cm, -0.178*cm </Vector> 
 	<Numeric name="Theta" value="90.*deg"/> 
 	<Numeric name="Phi" value="90.*deg"/>
 	<Numeric name="Theta_obj" value="90.*deg"/> 
@@ -1563,24 +1482,11 @@
   <Algorithm name="global:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back"/>
 	<String name="ChildName" value="etl:SensorModule_r_2"/>
-	<Numeric name="N" value="27"/>
-	<Numeric name="StartCopyNo" value="152"/>
+	<Numeric name="N" value="24"/>
+	<Numeric name="StartCopyNo" value="149"/>
 	<Numeric name="IncrCopyNo" value="1"/>
 	<Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+17*[DeltaX_ServiceModule]+9*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
-	<Numeric name="Theta" value="90.*deg"/> 
-	<Numeric name="Phi" value="90.*deg"/>
-	<Numeric name="Theta_obj" value="90.*deg"/> 
-	<Numeric name="Phi_obj" value="0.*deg"/>
-  </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
-	<rParent name="etl:DiskQuarter_Back"/>
-	<String name="ChildName" value="etl:ServiceHybrid_short"/>
-	<Numeric name="N" value="1"/>
-	<Numeric name="StartCopyNo" value="3"/>
-	<Numeric name="IncrCopyNo" value="1"/>
-	<Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+18*[DeltaX_ServiceModule]+9*[SensorModuledx])*cm, 6.5275*cm, 0.*cm </Vector>
+	<Vector  name="Base" type="numeric" nEntries="3"> (-113.555+17*[DeltaX_ServiceModule]+9*[SensorModuledx])*cm, 2.2925*cm, -0.178*cm </Vector> 
 	<Numeric name="Theta" value="90.*deg"/> 
 	<Numeric name="Phi" value="90.*deg"/>
 	<Numeric name="Theta_obj" value="90.*deg"/> 
@@ -1590,10 +1496,10 @@
 	<rParent name="etl:DiskQuarter_Back"/>
 	<String name="ChildName" value="etl:ServiceHybrid"/>
 	<Numeric name="N" value="4"/>
-	<Numeric name="StartCopyNo" value="27"/>
+	<Numeric name="StartCopyNo" value="26"/>
 	<Numeric name="IncrCopyNo" value="1"/>
 	<Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+18*[DeltaX_ServiceModule]+9*[SensorModuledx])*cm, (6.5275+[DeltaY_ServiceLong_ServiceShort]+[DeltaY])*cm, 0.*cm </Vector>
+	<Vector  name="Base" type="numeric" nEntries="3"> (-113.555+18*[DeltaX_ServiceModule]+9*[SensorModuledx])*cm, 13.1925*cm, 0.*cm </Vector>
 	<Numeric name="Theta" value="90.*deg"/> 
 	<Numeric name="Phi" value="90.*deg"/>
 	<Numeric name="Theta_obj" value="90.*deg"/> 
@@ -1602,11 +1508,11 @@
   <Algorithm name="global:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back"/>
 	<String name="ChildName" value="etl:SensorModule_r"/>
-	<Numeric name="N" value="27"/>
-	<Numeric name="StartCopyNo" value="163"/>
+	<Numeric name="N" value="24"/>
+	<Numeric name="StartCopyNo" value="160"/>
 	<Numeric name="IncrCopyNo" value="1"/>
 	<Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+19*[DeltaX_ServiceModule]+9*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+	<Vector  name="Base" type="numeric" nEntries="3"> (-113.555+19*[DeltaX_ServiceModule]+9*[SensorModuledx])*cm, 2.2925*cm, -0.178*cm </Vector> 
 	<Numeric name="Theta" value="90.*deg"/> 
 	<Numeric name="Phi" value="90.*deg"/>
 	<Numeric name="Theta_obj" value="90.*deg"/> 
@@ -1615,11 +1521,11 @@
   <Algorithm name="global:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back"/>
 	<String name="ChildName" value="etl:SensorModule_r_2"/>
-	<Numeric name="N" value="27"/>
-	<Numeric name="StartCopyNo" value="179"/>
+	<Numeric name="N" value="20"/>
+	<Numeric name="StartCopyNo" value="173"/>
 	<Numeric name="IncrCopyNo" value="1"/>
 	<Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+19*[DeltaX_ServiceModule]+10*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+	<Vector  name="Base" type="numeric" nEntries="3"> (-113.555+19*[DeltaX_ServiceModule]+10*[SensorModuledx])*cm, (2.2925+4*[SensorModuledy]+4*[DeltaY])*cm, -0.178*cm </Vector> 
 	<Numeric name="Theta" value="90.*deg"/> 
 	<Numeric name="Phi" value="90.*deg"/>
 	<Numeric name="Theta_obj" value="90.*deg"/> 
@@ -1627,12 +1533,12 @@
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back"/>
-	<String name="ChildName" value="etl:ServiceHybrid_short"/>
+	<String name="ChildName" value="etl:ServiceHybrid"/>
 	<Numeric name="N" value="3"/>
-	<Numeric name="StartCopyNo" value="4"/>
+	<Numeric name="StartCopyNo" value="30"/>
 	<Numeric name="IncrCopyNo" value="1"/>
-	<Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+20*[DeltaX_ServiceModule]+10*[SensorModuledx])*cm, 6.5275*cm, 0.*cm </Vector>
+	<Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (-113.555+20*[DeltaX_ServiceModule]+10*[SensorModuledx])*cm, (13.1925+4*[SensorModuledy]+4*[DeltaY])*cm, 0.*cm </Vector>
 	<Numeric name="Theta" value="90.*deg"/> 
 	<Numeric name="Phi" value="90.*deg"/>
 	<Numeric name="Theta_obj" value="90.*deg"/> 
@@ -1640,12 +1546,12 @@
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back"/>
-	<String name="ChildName" value="etl:ServiceHybrid"/>
-	<Numeric name="N" value="3"/>
-	<Numeric name="StartCopyNo" value="31"/>
+	<String name="ChildName" value="etl:ServiceHybrid_short"/>
+	<Numeric name="N" value="1"/>
+	<Numeric name="StartCopyNo" value="4"/>
 	<Numeric name="IncrCopyNo" value="1"/>
-	<Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+20*[DeltaX_ServiceModule]+10*[SensorModuledx])*cm, (6.5275+2*[ServiceHybrid_Y_short]+[DeltaY_ServiceLong_ServiceShort]+3*[DeltaY])*cm, 0.*cm </Vector>
+	<Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (-113.555+20*[DeltaX_ServiceModule]+10*[SensorModuledx])*cm, (13.1925+4*[SensorModuledy]+4*[DeltaY]+2*[ServiceHybrid_Y]+3*[DeltaY]+[DeltaY_ServiceLong_ServiceShort])*cm, 0.*cm </Vector>
 	<Numeric name="Theta" value="90.*deg"/> 
 	<Numeric name="Phi" value="90.*deg"/>
 	<Numeric name="Theta_obj" value="90.*deg"/> 
@@ -1654,11 +1560,11 @@
   <Algorithm name="global:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back"/>
 	<String name="ChildName" value="etl:SensorModule_r"/>
-	<Numeric name="N" value="27"/>
-	<Numeric name="StartCopyNo" value="190"/>
+	<Numeric name="N" value="20"/>
+	<Numeric name="StartCopyNo" value="184"/>
 	<Numeric name="IncrCopyNo" value="1"/>
 	<Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+21*[DeltaX_ServiceModule]+10*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
+	<Vector  name="Base" type="numeric" nEntries="3"> (-113.555+21*[DeltaX_ServiceModule]+10*[SensorModuledx])*cm, (2.2925+5*[SensorModuledy]+5*[DeltaY])*cm, -0.178*cm </Vector> 
 	<Numeric name="Theta" value="90.*deg"/> 
 	<Numeric name="Phi" value="90.*deg"/>
 	<Numeric name="Theta_obj" value="90.*deg"/> 
@@ -1667,63 +1573,50 @@
   <Algorithm name="global:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back"/>
 	<String name="ChildName" value="etl:SensorModule_r_2"/>
-	<Numeric name="N" value="24"/>
-	<Numeric name="StartCopyNo" value="206"/>
+	<Numeric name="N" value="20"/>
+	<Numeric name="StartCopyNo" value="193"/>
 	<Numeric name="IncrCopyNo" value="1"/>
 	<Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+21*[DeltaX_ServiceModule]+11*[SensorModuledx])*cm, (2.155+4*[SensorModuledy]+4*[DeltaY])*cm, -0.178*cm </Vector> 
+	<Vector  name="Base" type="numeric" nEntries="3"> (-113.555+21*[DeltaX_ServiceModule]+11*[SensorModuledx])*cm, (2.2925+6*[SensorModuledy]+6*[DeltaY])*cm, -0.178*cm </Vector> 
 	<Numeric name="Theta" value="90.*deg"/> 
 	<Numeric name="Phi" value="90.*deg"/>
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
-	<rParent name="etl:DiskQuarter_Back"/>
-	<String name="ChildName" value="etl:ServiceHybrid_short"/>
-	<Numeric name="N" value="2"/>
-	<Numeric name="StartCopyNo" value="7"/>
-	<Numeric name="IncrCopyNo" value="1"/>
-	<Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+22*[DeltaX_ServiceModule]+11*[SensorModuledx])*cm, (2.155+5*[SensorModuledy]+5*[DeltaY])*cm, 0.*cm </Vector>
-	<Numeric name="Theta" value="90.*deg"/> 
-	<Numeric name="Phi" value="90.*deg"/>
-	<Numeric name="Theta_obj" value="90.*deg"/> 
-	<Numeric name="Phi_obj" value="0.*deg"/>
-  </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+   <Algorithm name="global:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back"/>
 	<String name="ChildName" value="etl:ServiceHybrid"/>
 	<Numeric name="N" value="3"/>
-	<Numeric name="StartCopyNo" value="34"/>
+	<Numeric name="StartCopyNo" value="33"/>
 	<Numeric name="IncrCopyNo" value="1"/>
 	<Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+22*[DeltaX_ServiceModule]+11*[SensorModuledx])*cm, (2.155+5*[SensorModuledy]+5*[DeltaY]+[ServiceHybrid_Y_short]+[DeltaY_ServiceLong_ServiceShort]+2*[DeltaY])*cm, 0.*cm </Vector>
+	<Vector  name="Base" type="numeric" nEntries="3"> (-113.555+22*[DeltaX_ServiceModule]+11*[SensorModuledx])*cm, (13.1925+6*[SensorModuledy]+6*[DeltaY])*cm, 0.*cm </Vector>
 	<Numeric name="Theta" value="90.*deg"/> 
 	<Numeric name="Phi" value="90.*deg"/>
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <!--<Algorithm name="global:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back"/>
-	<String name="ChildName" value="etl:SensorModule_r"/>
-	<Numeric name="N" value="23"/>
-	<Numeric name="StartCopyNo" value="217"/>
+	<String name="ChildName" value="etl:ServiceHybrid_short"/>
+	<Numeric name="N" value="1"/>
+	<Numeric name="StartCopyNo" value="5"/>
 	<Numeric name="IncrCopyNo" value="1"/>
-	<Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+23*[DeltaX_ServiceModule]+11*[SensorModuledx])*cm, (2.155+5*[SensorModuledy]+5*[DeltaY])*cm, -0.178*cm </Vector> 
+	<Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (-113.555+22*[DeltaX_ServiceModule]+11*[SensorModuledx])*cm, (13.1925+6*[SensorModuledy]+6*[DeltaY]+2*[ServiceHybrid_Y]+3*[DeltaY]+[DeltaY_ServiceLong_ServiceShort])*cm, 0.*cm </Vector>
 	<Numeric name="Theta" value="90.*deg"/> 
 	<Numeric name="Phi" value="90.*deg"/>
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
-  </Algorithm>
+  </Algorithm> -->
   <Algorithm name="global:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back"/>
-	<String name="ChildName" value="etl:SensorModule_r_2"/>
-	<Numeric name="N" value="21"/>
-	<Numeric name="StartCopyNo" value="230"/>
+	<String name="ChildName" value="etl:SensorModule_r"/>
+	<Numeric name="N" value="19"/>   <!-- "20" -->
+	<Numeric name="StartCopyNo" value="204"/>
 	<Numeric name="IncrCopyNo" value="1"/>
 	<Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+23*[DeltaX_ServiceModule]+12*[SensorModuledx])*cm, (2.155+6*[SensorModuledy]+6*[DeltaY])*cm, -0.178*cm </Vector> 
+	<Vector  name="Base" type="numeric" nEntries="3"> (-113.555+23*[DeltaX_ServiceModule]+11*[SensorModuledx])*cm, (2.2925+7*[SensorModuledy]+7*[DeltaY])*cm, -0.178*cm </Vector> 
 	<Numeric name="Theta" value="90.*deg"/> 
 	<Numeric name="Phi" value="90.*deg"/>
 	<Numeric name="Theta_obj" value="90.*deg"/> 
@@ -1731,12 +1624,12 @@
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back"/>
-	<String name="ChildName" value="etl:ServiceHybrid_short"/>
-	<Numeric name="N" value="1"/>
-	<Numeric name="StartCopyNo" value="9"/>
+	<String name="ChildName" value="etl:SensorModule_r_2"/>
+	<Numeric name="N" value="18"/>
+	<Numeric name="StartCopyNo" value="213"/>
 	<Numeric name="IncrCopyNo" value="1"/>
-	<Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+24*[DeltaX_ServiceModule]+12*[SensorModuledx])*cm, (2.155+7*[SensorModuledy]+7*[DeltaY])*cm, 0.*cm </Vector>
+	<Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (-113.555+23*[DeltaX_ServiceModule]+12*[SensorModuledx])*cm, (2.2925+7*[SensorModuledy]+7*[DeltaY])*cm, -0.178*cm </Vector> 
 	<Numeric name="Theta" value="90.*deg"/> 
 	<Numeric name="Phi" value="90.*deg"/>
 	<Numeric name="Theta_obj" value="90.*deg"/> 
@@ -1746,10 +1639,10 @@
 	<rParent name="etl:DiskQuarter_Back"/>
 	<String name="ChildName" value="etl:ServiceHybrid"/>
 	<Numeric name="N" value="3"/>
-	<Numeric name="StartCopyNo" value="37"/>
+	<Numeric name="StartCopyNo" value="36"/>
 	<Numeric name="IncrCopyNo" value="1"/>
 	<Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+24*[DeltaX_ServiceModule]+12*[SensorModuledx])*cm, (2.155+7*[SensorModuledy]+7*[DeltaY]+[DeltaY_ServiceLong_ServiceShort]+[DeltaY])*cm, 0.*cm </Vector>
+	<Vector  name="Base" type="numeric" nEntries="3"> (-113.555+24*[DeltaX_ServiceModule]+12*[SensorModuledx])*cm, (13.1925+7*[SensorModuledy]+7*[DeltaY])*cm, 0.*cm </Vector>
 	<Numeric name="Theta" value="90.*deg"/> 
 	<Numeric name="Phi" value="90.*deg"/>
 	<Numeric name="Theta_obj" value="90.*deg"/> 
@@ -1758,11 +1651,11 @@
   <Algorithm name="global:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back"/>
 	<String name="ChildName" value="etl:SensorModule_r"/>
-	<Numeric name="N" value="20"/>
-	<Numeric name="StartCopyNo" value="240"/>
+	<Numeric name="N" value="17"/>
+	<Numeric name="StartCopyNo" value="224"/>
 	<Numeric name="IncrCopyNo" value="1"/>
 	<Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+25*[DeltaX_ServiceModule]+12*[SensorModuledx])*cm, (2.155+7*[SensorModuledy]+7*[DeltaY])*cm, -0.178*cm </Vector> 
+	<Vector  name="Base" type="numeric" nEntries="3"> (-113.555+25*[DeltaX_ServiceModule]+12*[SensorModuledx])*cm, (2.2925+8*[SensorModuledy]+8*[DeltaY])*cm, -0.178*cm </Vector> 
 	<Numeric name="Theta" value="90.*deg"/> 
 	<Numeric name="Phi" value="90.*deg"/>
 	<Numeric name="Theta_obj" value="90.*deg"/> 
@@ -1771,24 +1664,11 @@
   <Algorithm name="global:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back"/>
 	<String name="ChildName" value="etl:SensorModule_r_2"/>
-	<Numeric name="N" value="21"/>
-	<Numeric name="StartCopyNo" value="251"/>
+	<Numeric name="N" value="18"/>
+	<Numeric name="StartCopyNo" value="231"/>
 	<Numeric name="IncrCopyNo" value="1"/>
 	<Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+25*[DeltaX_ServiceModule]+13*[SensorModuledx])*cm, (2.155+7*[SensorModuledy]+7*[DeltaY])*cm, -0.178*cm </Vector> 
-	<Numeric name="Theta" value="90.*deg"/> 
-	<Numeric name="Phi" value="90.*deg"/>
-	<Numeric name="Theta_obj" value="90.*deg"/> 
-	<Numeric name="Phi_obj" value="0.*deg"/>
-  </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
-	<rParent name="etl:DiskQuarter_Back"/>
-	<String name="ChildName" value="etl:ServiceHybrid_short"/>
-	<Numeric name="N" value="1"/>
-	<Numeric name="StartCopyNo" value="10"/>
-	<Numeric name="IncrCopyNo" value="1"/>
-	<Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+26*[DeltaX_ServiceModule]+13*[SensorModuledx])*cm, (2.155+8*[SensorModuledy]+8*[DeltaY])*cm, 0*cm </Vector> 
+	<Vector  name="Base" type="numeric" nEntries="3"> (-113.555+25*[DeltaX_ServiceModule]+13*[SensorModuledx])*cm, (2.2925+8*[SensorModuledy]+8*[DeltaY])*cm, -0.178*cm </Vector> 
 	<Numeric name="Theta" value="90.*deg"/> 
 	<Numeric name="Phi" value="90.*deg"/>
 	<Numeric name="Theta_obj" value="90.*deg"/> 
@@ -1798,81 +1678,26 @@
 	<rParent name="etl:DiskQuarter_Back"/>
 	<String name="ChildName" value="etl:ServiceHybrid"/>
 	<Numeric name="N" value="3"/>
-	<Numeric name="StartCopyNo" value="40"/>
+	<Numeric name="StartCopyNo" value="39"/>
 	<Numeric name="IncrCopyNo" value="1"/>
 	<Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+26*[DeltaX_ServiceModule]+13*[SensorModuledx])*cm, (2.155+8*[SensorModuledy]+8*[DeltaY]+[DeltaY_ServiceLong_ServiceShort]+[DeltaY])*cm, 0.*cm </Vector>
-	<Numeric name="Theta" value="90.*deg"/> 
-	<Numeric name="Phi" value="90.*deg"/>
-	<Numeric name="Theta_obj" value="90.*deg"/> 
-	<Numeric name="Phi_obj" value="0.*deg"/>
-  </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
-	<rParent name="etl:DiskQuarter_Back"/>
-	<String name="ChildName" value="etl:SensorModule_r"/>
-	<Numeric name="N" value="20"/>
-	<Numeric name="StartCopyNo" value="260"/>
-	<Numeric name="IncrCopyNo" value="1"/>
-	<Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+27*[DeltaX_ServiceModule]+13*[SensorModuledx])*cm, (2.155+8*[SensorModuledy]+8*[DeltaY])*cm, -0.178*cm </Vector> 
+	<Vector  name="Base" type="numeric" nEntries="3"> (-113.555+26*[DeltaX_ServiceModule]+13*[SensorModuledx])*cm, (13.1925+8*[SensorModuledy]+8*[DeltaY])*cm, 0.*cm </Vector>
 	<Numeric name="Theta" value="90.*deg"/> 
 	<Numeric name="Phi" value="90.*deg"/>
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
+  
+
+  	<!-- Disk2 Front face -->
   <Algorithm name="global:DDMTDLinear">
-	<rParent name="etl:DiskQuarter_Back"/>
-	<String name="ChildName" value="etl:SensorModule_r_2"/>
-	<Numeric name="N" value="21"/>
-	<Numeric name="StartCopyNo" value="272"/>
-	<Numeric name="IncrCopyNo" value="1"/>
-	<Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+27*[DeltaX_ServiceModule]+14*[SensorModuledx])*cm, (2.155+8*[SensorModuledy]+8*[DeltaY])*cm, -0.178*cm </Vector> 
-	<Numeric name="Theta" value="90.*deg"/> 
-	<Numeric name="Phi" value="90.*deg"/>
-	<Numeric name="Theta_obj" value="90.*deg"/> 
-	<Numeric name="Phi_obj" value="0.*deg"/>
-  </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
-	<rParent name="etl:DiskQuarter_Back"/>
-	<String name="ChildName" value="etl:ServiceHybrid_short"/>
-	<Numeric name="N" value="1"/>
-	<Numeric name="StartCopyNo" value="11"/>
-	<Numeric name="IncrCopyNo" value="1"/>
-	<Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+28*[DeltaX_ServiceModule]+14*[SensorModuledx])*cm, (2.155+9*[SensorModuledy]+9*[DeltaY])*cm, 0*cm </Vector> 
-	<Numeric name="Theta" value="90.*deg"/> 
-	<Numeric name="Phi" value="90.*deg"/>
-	<Numeric name="Theta_obj" value="90.*deg"/> 
-	<Numeric name="Phi_obj" value="0.*deg"/>
-  </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
-	<rParent name="etl:DiskQuarter_Back"/>
-	<String name="ChildName" value="etl:ServiceHybrid"/>
-	<Numeric name="N" value="3"/>
-	<Numeric name="StartCopyNo" value="43"/>
-	<Numeric name="IncrCopyNo" value="1"/>
-	<Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-	<Vector  name="Base" type="numeric" nEntries="3"> (-122.0+28*[DeltaX_ServiceModule]+14*[SensorModuledx])*cm, (2.155+9*[SensorModuledy]+9*[DeltaY]+[DeltaY_ServiceLong_ServiceShort]+[DeltaY])*cm, 0*cm </Vector> 
-	<Numeric name="Theta" value="90.*deg"/> 
-	<Numeric name="Phi" value="90.*deg"/>
-	<Numeric name="Theta_obj" value="90.*deg"/> 
-	<Numeric name="Phi_obj" value="0.*deg"/>
-  </Algorithm>
-
-
-	
-
-
-  	<!-- Disk2 Front face -->
-  <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front_2"/>
-    <String name="ChildName" value="etl:SensorModule"/>
-    <Numeric name="N" value="7"/>
-    <Numeric name="StartCopyNo" value="1"/>
+	<rParent name="etl:DiskQuarter_Front_2"/>
+	<String name="ChildName" value="etl:SensorModule_2"/>
+	<Numeric name="N" value="8"/>
+	<Numeric name="StartCopyNo" value="1"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> 120.325*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> 111.93*cm, 2.2925*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
@@ -1885,7 +1710,7 @@
     <Numeric name="StartCopyNo" value="1"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (120.325-[DeltaX_ServiceModule])*cm, 13.055*cm, 0.*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (111.93-[DeltaX_ServiceModule])*cm, 13.1925*cm, 0.*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
@@ -1898,7 +1723,7 @@
     <Numeric name="StartCopyNo" value="1"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (120.325-[DeltaX_ServiceModule])*cm, (13.055+[DeltaY_ServiceLong_ServiceShort]+[DeltaY])*cm, 0*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (111.93-[DeltaX_ServiceModule])*cm, (13.1925+[DeltaY_ServiceLong_ServiceShort]+[DeltaY])*cm, 0*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
@@ -1906,12 +1731,12 @@
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front_2"/>
-    <String name="ChildName" value="etl:SensorModule_2"/>
+    <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="9"/>
     <Numeric name="StartCopyNo" value="1"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (120.325-2*[DeltaX_ServiceModule])*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (111.93-2*[DeltaX_ServiceModule])*cm, 2.2925*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
@@ -1919,12 +1744,12 @@
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front_2"/>
-    <String name="ChildName" value="etl:SensorModule"/>
+    <String name="ChildName" value="etl:SensorModule_2"/>
     <Numeric name="N" value="12"/>
-    <Numeric name="StartCopyNo" value="8"/>
+    <Numeric name="StartCopyNo" value="12"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (120.325-2*[DeltaX_ServiceModule]-[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (111.93-2*[DeltaX_ServiceModule]-[SensorModuledx])*cm, 2.2925*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
@@ -1937,7 +1762,7 @@
     <Numeric name="StartCopyNo" value="2"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (120.325-3*[DeltaX_ServiceModule]-[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (111.93-3*[DeltaX_ServiceModule]-[SensorModuledx])*cm, 13.1925*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
@@ -1945,12 +1770,12 @@
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front_2"/>
-    <String name="ChildName" value="etl:SensorModule_2"/>
+    <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="12"/>
     <Numeric name="StartCopyNo" value="10"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (120.325-4*[DeltaX_ServiceModule]-[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (111.93-4*[DeltaX_ServiceModule]-[SensorModuledx])*cm, 2.2925*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
@@ -1958,12 +1783,12 @@
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front_2"/>
-    <String name="ChildName" value="etl:SensorModule"/>
+    <String name="ChildName" value="etl:SensorModule_2"/>
     <Numeric name="N" value="15"/>
     <Numeric name="StartCopyNo" value="20"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (120.325-4*[DeltaX_ServiceModule]-2*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (111.93-4*[DeltaX_ServiceModule]-2*[SensorModuledx])*cm, 2.2925*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
@@ -1976,7 +1801,7 @@
     <Numeric name="StartCopyNo" value="4"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (120.325-5*[DeltaX_ServiceModule]-2*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (111.93-5*[DeltaX_ServiceModule]-2*[SensorModuledx])*cm, 13.1925*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
@@ -1989,7 +1814,7 @@
     <Numeric name="StartCopyNo" value="2"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (120.325-5*[DeltaX_ServiceModule]-2*[SensorModuledx])*cm, (13.055+[ServiceHybrid_Y]+[DeltaY_ServiceLong_ServiceShort]+2*[DeltaY])*cm, 0*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (111.93-5*[DeltaX_ServiceModule]-2*[SensorModuledx])*cm, (13.1925+[ServiceHybrid_Y]+[DeltaY_ServiceLong_ServiceShort]+2*[DeltaY])*cm, 0*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
@@ -1997,12 +1822,12 @@
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front_2"/>
-    <String name="ChildName" value="etl:SensorModule_2"/>
+    <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="15"/>
-    <Numeric name="StartCopyNo" value="22"/>
+    <Numeric name="StartCopyNo" value="20"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (120.325-6*[DeltaX_ServiceModule]-2*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (111.93-6*[DeltaX_ServiceModule]-2*[SensorModuledx])*cm, 2.2925*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
@@ -2010,12 +1835,12 @@
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front_2"/>
-    <String name="ChildName" value="etl:SensorModule"/>
+    <String name="ChildName" value="etl:SensorModule_2"/>
     <Numeric name="N" value="18"/>
     <Numeric name="StartCopyNo" value="35"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (120.325-6*[DeltaX_ServiceModule]-3*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (111.93-6*[DeltaX_ServiceModule]-3*[SensorModuledx])*cm, 2.2925*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
@@ -2028,7 +1853,7 @@
     <Numeric name="StartCopyNo" value="6"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (120.325-7*[DeltaX_ServiceModule]-3*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (111.93-7*[DeltaX_ServiceModule]-3*[SensorModuledx])*cm, 13.1925*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
@@ -2036,12 +1861,12 @@
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front_2"/>
-    <String name="ChildName" value="etl:SensorModule_2"/>
+    <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="18"/>
-    <Numeric name="StartCopyNo" value="37"/>
+    <Numeric name="StartCopyNo" value="34"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (120.325-8*[DeltaX_ServiceModule]-3*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (111.93-8*[DeltaX_ServiceModule]-3*[SensorModuledx])*cm, 2.2925*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
@@ -2049,51 +1874,51 @@
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front_2"/>
-    <String name="ChildName" value="etl:SensorModule"/>
-    <Numeric name="N" value="21"/>
+    <String name="ChildName" value="etl:SensorModule_2"/>
+    <Numeric name="N" value="20"/>
     <Numeric name="StartCopyNo" value="53"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (120.325-8*[DeltaX_ServiceModule]-4*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (111.93-8*[DeltaX_ServiceModule]-4*[SensorModuledx])*cm, 2.2925*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="global:DDMTDLinear"> <!-- y start changed from 13.1925 to 13.0925 to avoid extrusion -->
     <rParent name="etl:DiskQuarter_Front_2"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="3"/>
     <Numeric name="StartCopyNo" value="9"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (120.325-9*[DeltaX_ServiceModule]-4*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (111.93-9*[DeltaX_ServiceModule]-4*[SensorModuledx])*cm, 13.0925*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <!-- <Algorithm name="global:DDMTDLinear"> 
     <rParent name="etl:DiskQuarter_Front_2"/>
     <String name="ChildName" value="etl:ServiceHybrid_short"/>
     <Numeric name="N" value="1"/>
     <Numeric name="StartCopyNo" value="3"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (120.325-9*[DeltaX_ServiceModule]-4*[SensorModuledx])*cm, (13.055+2*[ServiceHybrid_Y]+[DeltaY_ServiceLong_ServiceShort]+3*[DeltaY])*cm, 0*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (111.93-9*[DeltaX_ServiceModule]-4*[SensorModuledx])*cm, (13.0925+2*[ServiceHybrid_Y]+[DeltaY_ServiceLong_ServiceShort]+3*[DeltaY])*cm, 0*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
-  </Algorithm>
+  </Algorithm> -->
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front_2"/>
-    <String name="ChildName" value="etl:SensorModule_2"/>
+    <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="21"/>
-    <Numeric name="StartCopyNo" value="55"/>
+    <Numeric name="StartCopyNo" value="53"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (120.325-10*[DeltaX_ServiceModule]-4*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (111.93-10*[DeltaX_ServiceModule]-4*[SensorModuledx])*cm, 2.2925*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
@@ -2101,12 +1926,12 @@
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front_2"/>
-    <String name="ChildName" value="etl:SensorModule"/>
+    <String name="ChildName" value="etl:SensorModule_2"/>
     <Numeric name="N" value="21"/>
-    <Numeric name="StartCopyNo" value="74"/>
+    <Numeric name="StartCopyNo" value="73"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (120.325-10*[DeltaX_ServiceModule]-5*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (111.93-10*[DeltaX_ServiceModule]-5*[SensorModuledx])*cm, 2.2925*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
@@ -2119,7 +1944,7 @@
     <Numeric name="StartCopyNo" value="12"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (120.325-11*[DeltaX_ServiceModule]-5*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (111.93-11*[DeltaX_ServiceModule]-5*[SensorModuledx])*cm, 13.1925*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
@@ -2132,7 +1957,7 @@
     <Numeric name="StartCopyNo" value="4"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (120.325-11*[DeltaX_ServiceModule]-5*[SensorModuledx])*cm, (13.055+2*[ServiceHybrid_Y]+[DeltaY_ServiceLong_ServiceShort]+3*[DeltaY])*cm, 0*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (111.93-11*[DeltaX_ServiceModule]-5*[SensorModuledx])*cm, (13.1925+2*[ServiceHybrid_Y]+[DeltaY_ServiceLong_ServiceShort]+3*[DeltaY])*cm, 0*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
@@ -2140,12 +1965,12 @@
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front_2"/>
-    <String name="ChildName" value="etl:SensorModule_2"/>
+    <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="21"/>
-    <Numeric name="StartCopyNo" value="76"/>
+    <Numeric name="StartCopyNo" value="73"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (120.325-12*[DeltaX_ServiceModule]-5*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (111.93-12*[DeltaX_ServiceModule]-5*[SensorModuledx])*cm, 2.2925*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
@@ -2153,12 +1978,12 @@
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front_2"/>
-    <String name="ChildName" value="etl:SensorModule"/>
-    <Numeric name="N" value="24"/>
-    <Numeric name="StartCopyNo" value="95"/>
+    <String name="ChildName" value="etl:SensorModule_2"/>
+    <Numeric name="N" value="21"/>
+    <Numeric name="StartCopyNo" value="94"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (120.325-12*[DeltaX_ServiceModule]-6*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (111.93-12*[DeltaX_ServiceModule]-6*[SensorModuledx])*cm, 2.2925*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
@@ -2167,11 +1992,11 @@
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front_2"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
-    <Numeric name="N" value="4"/>
+    <Numeric name="N" value="3"/>
     <Numeric name="StartCopyNo" value="15"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (120.325-13*[DeltaX_ServiceModule]-6*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (111.93-13*[DeltaX_ServiceModule]-6*[SensorModuledx])*cm, 13.1925*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
@@ -2179,12 +2004,12 @@
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front_2"/>
-    <String name="ChildName" value="etl:SensorModule_2"/>
-    <Numeric name="N" value="24"/>
-    <Numeric name="StartCopyNo" value="97"/>
+    <String name="ChildName" value="etl:ServiceHybrid_short"/>
+    <Numeric name="N" value="1"/>
+    <Numeric name="StartCopyNo" value="5"/>
     <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (120.325-14*[DeltaX_ServiceModule]-6*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3"> (111.93-13*[DeltaX_ServiceModule]-6*[SensorModuledx])*cm, (13.1925+2*[ServiceHybrid_Y]+[DeltaY_ServiceLong_ServiceShort]+3*[DeltaY])*cm, 0*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
@@ -2193,24 +2018,11 @@
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front_2"/>
     <String name="ChildName" value="etl:SensorModule"/>
-    <Numeric name="N" value="24"/>
-    <Numeric name="StartCopyNo" value="119"/>
+    <Numeric name="N" value="21"/>
+    <Numeric name="StartCopyNo" value="94"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (120.325-14*[DeltaX_ServiceModule]-7*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-    <Numeric name="Theta_obj" value="90.*deg"/> 
-	<Numeric name="Phi_obj" value="0.*deg"/>
-  </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid"/>
-    <Numeric name="N" value="4"/>
-    <Numeric name="StartCopyNo" value="19"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (120.325-15*[DeltaX_ServiceModule]-7*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3">  (111.93-14*[DeltaX_ServiceModule]-6*[SensorModuledx])*cm, 2.2925*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
@@ -2220,23 +2032,10 @@
     <rParent name="etl:DiskQuarter_Front_2"/>
     <String name="ChildName" value="etl:SensorModule_2"/>
     <Numeric name="N" value="24"/>
-    <Numeric name="StartCopyNo" value="121"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (120.325-16*[DeltaX_ServiceModule]-7*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-    <Numeric name="Theta_obj" value="90.*deg"/> 
-	<Numeric name="Phi_obj" value="0.*deg"/>
-  </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front_2"/>
-    <String name="ChildName" value="etl:SensorModule"/>
-    <Numeric name="N" value="24"/>
-    <Numeric name="StartCopyNo" value="143"/>
+    <Numeric name="StartCopyNo" value="115"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (120.325-16*[DeltaX_ServiceModule]-8*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (111.93-14*[DeltaX_ServiceModule]-7*[SensorModuledx])*cm, 2.2925*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
@@ -2246,10 +2045,10 @@
     <rParent name="etl:DiskQuarter_Front_2"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="4"/>
-    <Numeric name="StartCopyNo" value="23"/>
+    <Numeric name="StartCopyNo" value="18"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (120.325-17*[DeltaX_ServiceModule]-8*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (111.93-15*[DeltaX_ServiceModule]-7*[SensorModuledx])*cm, 13.1925*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
@@ -2257,12 +2056,12 @@
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front_2"/>
-    <String name="ChildName" value="etl:SensorModule_2"/>
+    <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="24"/>
-    <Numeric name="StartCopyNo" value="145"/>
+    <Numeric name="StartCopyNo" value="115"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (120.325-18*[DeltaX_ServiceModule]-8*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (111.93-16*[DeltaX_ServiceModule]-7*[SensorModuledx])*cm, 2.2925*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
@@ -2270,25 +2069,12 @@
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front_2"/>
-    <String name="ChildName" value="etl:SensorModule"/>
-    <Numeric name="N" value="27"/>
-    <Numeric name="StartCopyNo" value="167"/>
+    <String name="ChildName" value="etl:SensorModule_2"/>
+    <Numeric name="N" value="24"/>
+    <Numeric name="StartCopyNo" value="139"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (120.325-18*[DeltaX_ServiceModule]-9*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-    <Numeric name="Theta_obj" value="90.*deg"/> 
-    	<Numeric name="Phi_obj" value="0.*deg"/>
-  </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid_short"/>
-    <Numeric name="N" value="1"/>
-    <Numeric name="StartCopyNo" value="5"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (120.325-19*[DeltaX_ServiceModule]-9*[SensorModuledx])*cm, 6.5275*cm, 0*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (111.93-16*[DeltaX_ServiceModule]-8*[SensorModuledx])*cm, 2.2925*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
@@ -2298,23 +2084,10 @@
     <rParent name="etl:DiskQuarter_Front_2"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="4"/>
-    <Numeric name="StartCopyNo" value="27"/>
+    <Numeric name="StartCopyNo" value="22"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (120.325-19*[DeltaX_ServiceModule]-9*[SensorModuledx])*cm, (6.5275+[DeltaY_ServiceLong_ServiceShort]+[DeltaY])*cm, 0.*cm </Vector>
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-    <Numeric name="Theta_obj" value="90.*deg"/> 
-	<Numeric name="Phi_obj" value="0.*deg"/>
-  </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front_2"/>
-    <String name="ChildName" value="etl:SensorModule_2"/>
-    <Numeric name="N" value="27"/>
-    <Numeric name="StartCopyNo" value="169"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (120.325-20*[DeltaX_ServiceModule]-9*[SensorModuledx])*cm, 2.155*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (111.93-17*[DeltaX_ServiceModule]-8*[SensorModuledx])*cm, 13.1925*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
@@ -2323,11 +2096,11 @@
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front_2"/>
     <String name="ChildName" value="etl:SensorModule"/>
-    <Numeric name="N" value="27"/>
-    <Numeric name="StartCopyNo" value="194"/>
+    <Numeric name="N" value="24"/>
+    <Numeric name="StartCopyNo" value="139"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (120.325-20*[DeltaX_ServiceModule]-10*[SensorModuledx])*cm, (2.155+[SensorModuledy]+[DeltaY])*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (111.93-18*[DeltaX_ServiceModule]-8*[SensorModuledx])*cm, 2.2925*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
@@ -2335,38 +2108,25 @@
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid_short"/>
-    <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="6"/>
+    <String name="ChildName" value="etl:SensorModule_2"/>
+    <Numeric name="N" value="24"/>
+    <Numeric name="StartCopyNo" value="163"/>
     <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (120.325-21*[DeltaX_ServiceModule]-10*[SensorModuledx])*cm, (2.155+2*[SensorModuledy]+2*[DeltaY])*cm, 0*cm </Vector> 
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3">  (111.93-18*[DeltaX_ServiceModule]-9*[SensorModuledx])*cm, (2.2925+[SensorModuledy]+[DeltaY])*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+   <Algorithm name="global:DDMTDLinear"> <!-- y-pos of 1st SH module moved from 13.1925 to 16 to avoid module extrusion -->
     <rParent name="etl:DiskQuarter_Front_2"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
-    <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="31"/>
+    <Numeric name="N" value="4"/>
+    <Numeric name="StartCopyNo" value="26"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (120.325-21*[DeltaX_ServiceModule]-10*[SensorModuledx])*cm, (2.155+2*[SensorModuledy]+2*[DeltaY]+2*[ServiceHybrid_Y_short]+[DeltaY_ServiceLong_ServiceShort]+3*[DeltaY])*cm, 0.*cm </Vector>
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-    <Numeric name="Theta_obj" value="90.*deg"/> 
-	<Numeric name="Phi_obj" value="0.*deg"/>
-  </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front_2"/>
-    <String name="ChildName" value="etl:SensorModule_2"/>
-    <Numeric name="N" value="24"/>
-    <Numeric name="StartCopyNo" value="196"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (120.325-22*[DeltaX_ServiceModule]-10*[SensorModuledx])*cm, ( 2.155+4*[SensorModuledy]+4*[DeltaY])*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (111.93-19*[DeltaX_ServiceModule]-9*[SensorModuledx])*cm, (16.2+[SensorModuledy]+[DeltaY])*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
@@ -2376,10 +2136,10 @@
     <rParent name="etl:DiskQuarter_Front_2"/>
     <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="21"/>
-    <Numeric name="StartCopyNo" value="221"/>
+    <Numeric name="StartCopyNo" value="163"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (120.325-22*[DeltaX_ServiceModule]-11*[SensorModuledx])*cm, ( 2.155+6*[SensorModuledy]+6*[DeltaY])*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (111.93-20*[DeltaX_ServiceModule]-9*[SensorModuledx])*cm, (2.2925+4*[SensorModuledy]+4*[DeltaY])*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
@@ -2387,12 +2147,12 @@
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid_short"/>
-    <Numeric name="N" value="1"/>
-    <Numeric name="StartCopyNo" value="9"/>
+    <String name="ChildName" value="etl:SensorModule_2"/>
+    <Numeric name="N" value="18"/>
+    <Numeric name="StartCopyNo" value="187"/>
     <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (120.325-23*[DeltaX_ServiceModule]-11*[SensorModuledx])*cm, (2.155+7*[SensorModuledy]+7*[DeltaY])*cm, 0*cm </Vector> 
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3">  (111.93-20*[DeltaX_ServiceModule]-10*[SensorModuledx])*cm, (2.2925+6*[SensorModuledy]+6*[DeltaY])*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
@@ -2402,23 +2162,10 @@
     <rParent name="etl:DiskQuarter_Front_2"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="34"/>
+    <Numeric name="StartCopyNo" value="30"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (120.325-23*[DeltaX_ServiceModule]-11*[SensorModuledx])*cm, (2.155+7*[SensorModuledy]+8*[DeltaY]+[DeltaY_ServiceLong_ServiceShort])*cm, 0.*cm </Vector>
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-    <Numeric name="Theta_obj" value="90.*deg"/> 
-	<Numeric name="Phi_obj" value="0.*deg"/>
-  </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front_2"/>
-    <String name="ChildName" value="etl:SensorModule_2"/>
-    <Numeric name="N" value="21"/>
-    <Numeric name="StartCopyNo" value="220"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (120.325-24*[DeltaX_ServiceModule]-11*[SensorModuledx])*cm, ( 2.155+6*[SensorModuledy]+6*[DeltaY])*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (111.93-21*[DeltaX_ServiceModule]-10*[SensorModuledx])*cm, (13.1925+6*[SensorModuledy]+6*[DeltaY])*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
@@ -2427,11 +2174,11 @@
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front_2"/>
     <String name="ChildName" value="etl:SensorModule"/>
-    <Numeric name="N" value="21"/>
-    <Numeric name="StartCopyNo" value="242"/>
+    <Numeric name="N" value="18"/>
+    <Numeric name="StartCopyNo" value="184"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (120.325-24*[DeltaX_ServiceModule]-12*[SensorModuledx])*cm, ( 2.155+7*[SensorModuledy]+7*[DeltaY])*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (111.93-22*[DeltaX_ServiceModule]-10*[SensorModuledx])*cm, ( 2.2925+6*[SensorModuledy]+6*[DeltaY])*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
@@ -2439,12 +2186,12 @@
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid_short"/>
-    <Numeric name="N" value="1"/>
-    <Numeric name="StartCopyNo" value="10"/>
+    <String name="ChildName" value="etl:SensorModule_2"/>
+    <Numeric name="N" value="18"/>
+    <Numeric name="StartCopyNo" value="205"/>
     <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (120.325-25*[DeltaX_ServiceModule]-12*[SensorModuledx])*cm, (2.155+8*[SensorModuledy]+8*[DeltaY])*cm, 0*cm </Vector> 
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3">  (111.93-22*[DeltaX_ServiceModule]-11*[SensorModuledx])*cm, ( 2.2925+7*[SensorModuledy]+7*[DeltaY])*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
@@ -2454,23 +2201,10 @@
     <rParent name="etl:DiskQuarter_Front_2"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="37"/>
+    <Numeric name="StartCopyNo" value="33"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (120.325-25*[DeltaX_ServiceModule]-12*[SensorModuledx])*cm, (2.155+8*[SensorModuledy]+9*[DeltaY]+[DeltaY_ServiceLong_ServiceShort])*cm, 0.*cm </Vector>
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-    <Numeric name="Theta_obj" value="90.*deg"/> 
-	<Numeric name="Phi_obj" value="0.*deg"/>
-  </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Front_2"/>
-    <String name="ChildName" value="etl:SensorModule_2"/>
-    <Numeric name="N" value="21"/>
-    <Numeric name="StartCopyNo" value="241"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (120.325-26*[DeltaX_ServiceModule]-12*[SensorModuledx])*cm, ( 2.155+7*[SensorModuledy]+7*[DeltaY])*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3"> (111.93-23*[DeltaX_ServiceModule]-11*[SensorModuledx])*cm, (13.1925+7*[SensorModuledy]+7*[DeltaY])*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
@@ -2479,11 +2213,11 @@
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front_2"/>
     <String name="ChildName" value="etl:SensorModule"/>
-    <Numeric name="N" value="21"/>
-    <Numeric name="StartCopyNo" value="242"/>
+    <Numeric name="N" value="18"/>
+    <Numeric name="StartCopyNo" value="202"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (120.325-26*[DeltaX_ServiceModule]-13*[SensorModuledx])*cm, ( 2.155+8*[SensorModuledy]+8*[DeltaY])*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (111.93-24*[DeltaX_ServiceModule]-11*[SensorModuledx])*cm, ( 2.2925+7*[SensorModuledy]+7*[DeltaY])*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
@@ -2491,12 +2225,12 @@
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid_short"/>
-    <Numeric name="N" value="1"/>
-    <Numeric name="StartCopyNo" value="11"/>
+    <String name="ChildName" value="etl:SensorModule_2"/>
+    <Numeric name="N" value="18"/>
+    <Numeric name="StartCopyNo" value="223"/>
     <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (120.325-27*[DeltaX_ServiceModule]-13*[SensorModuledx])*cm, (2.155+9*[SensorModuledy]+9*[DeltaY])*cm, 0*cm </Vector> 
+    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+    <Vector  name="Base" type="numeric" nEntries="3">  (111.93-24*[DeltaX_ServiceModule]-12*[SensorModuledx])*cm, ( 2.2925+8*[SensorModuledy]+8*[DeltaY])*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
@@ -2506,10 +2240,10 @@
     <rParent name="etl:DiskQuarter_Front_2"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="40"/>
+    <Numeric name="StartCopyNo" value="36"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (120.325-27*[DeltaX_ServiceModule]-13*[SensorModuledx])*cm, (2.155+9*[SensorModuledy]+10*[DeltaY]+[DeltaY_ServiceLong_ServiceShort])*cm, 0.*cm </Vector>
+    <Vector  name="Base" type="numeric" nEntries="3"> (111.93-25*[DeltaX_ServiceModule]-12*[SensorModuledx])*cm, (13.1925+8*[SensorModuledy]+8*[DeltaY])*cm, 0.*cm </Vector>
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
@@ -2517,12 +2251,12 @@
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front_2"/>
-    <String name="ChildName" value="etl:SensorModule_2"/>
-    <Numeric name="N" value="21"/>
-    <Numeric name="StartCopyNo" value="262"/>
+    <String name="ChildName" value="etl:SensorModule"/>
+    <Numeric name="N" value="18"/>
+    <Numeric name="StartCopyNo" value="220"/>
     <Numeric name="IncrCopyNo" value="1"/>
     <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3">  (120.325-28*[DeltaX_ServiceModule]-13*[SensorModuledx])*cm, ( 2.155+8*[SensorModuledy]+8*[DeltaY])*cm, 0.178*cm </Vector> 
+    <Vector  name="Base" type="numeric" nEntries="3">  (111.93-26*[DeltaX_ServiceModule]-12*[SensorModuledx])*cm, ( 2.2925+8*[SensorModuledy]+8*[DeltaY])*cm, 0.178*cm </Vector> 
     <Numeric name="Theta" value="90.*deg"/> 
     <Numeric name="Phi" value="90.*deg"/>
     <Numeric name="Theta_obj" value="90.*deg"/> 
@@ -2530,675 +2264,593 @@
   </Algorithm>
 
 
-
-
-
     <!-- Disk2 Back face -->
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid"/>
-    <Numeric name="N" value="1"/>
-    <Numeric name="StartCopyNo" value="1"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> 122.0*cm, 13.055*cm, 0.*cm </Vector> 
-    <Numeric name="Theta" value="90.*deg"/> <!-- translation along y -->
-    <Numeric name="Phi" value="90.*deg"/>
-    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<rParent name="etl:DiskQuarter_Back_2"/>
+	<String name="ChildName" value="etl:ServiceHybrid"/>
+	<Numeric name="N" value="1"/>
+	<Numeric name="StartCopyNo" value="1"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> 113.555*cm, 13.1925*cm, 0.*cm </Vector> 
+	<Numeric name="Theta" value="90.*deg"/> <!-- translation along y -->
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back_2"/>
-    <String name="ChildName" value="etl:SensorModule_r_2"/>
-    <Numeric name="N" value="6"/>
-    <Numeric name="StartCopyNo" value="1"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-[DeltaX_ServiceModule])*cm, 2.155*cm, -0.178*cm </Vector> 
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<rParent name="etl:DiskQuarter_Back_2"/>
+	<String name="ChildName" value="etl:SensorModule_r"/>
+	<Numeric name="N" value="6"/>
+	<Numeric name="StartCopyNo" value="1"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (113.555-[DeltaX_ServiceModule])*cm, 2.2925*cm, -0.178*cm </Vector> 
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back_2"/>
-    <String name="ChildName" value="etl:SensorModule_r"/>
-    <Numeric name="N" value="10"/>
-    <Numeric name="StartCopyNo" value="1"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-[DeltaX_ServiceModule]-[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<rParent name="etl:DiskQuarter_Back_2"/>
+	<String name="ChildName" value="etl:SensorModule_r_2"/>
+	<Numeric name="N" value="10"/>
+	<Numeric name="StartCopyNo" value="1"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (113.555-[DeltaX_ServiceModule]-[SensorModuledx])*cm, 2.2925*cm, -0.178*cm </Vector> 
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid"/>
-    <Numeric name="N" value="2"/>
-    <Numeric name="StartCopyNo" value="2"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-2*[DeltaX_ServiceModule]-[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<rParent name="etl:DiskQuarter_Back_2"/>
+	<String name="ChildName" value="etl:ServiceHybrid"/>
+	<Numeric name="N" value="2"/>
+	<Numeric name="StartCopyNo" value="2"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (113.555-2*[DeltaX_ServiceModule]-[SensorModuledx])*cm, 13.1925*cm, 0.*cm </Vector>
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back_2"/>
-    <String name="ChildName" value="etl:SensorModule_r_2"/>
-    <Numeric name="N" value="12"/>
-    <Numeric name="StartCopyNo" value="7"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-3*[DeltaX_ServiceModule]-[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<rParent name="etl:DiskQuarter_Back_2"/>
+	<String name="ChildName" value="etl:SensorModule_r"/>
+	<Numeric name="N" value="12"/>
+	<Numeric name="StartCopyNo" value="7"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (113.555-3*[DeltaX_ServiceModule]-[SensorModuledx])*cm, 2.2925*cm, -0.178*cm </Vector> 
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back_2"/>
-    <String name="ChildName" value="etl:SensorModule_r"/>
-    <Numeric name="N" value="14"/>
-    <Numeric name="StartCopyNo" value="11"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-3*[DeltaX_ServiceModule]-2*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<rParent name="etl:DiskQuarter_Back_2"/>
+	<String name="ChildName" value="etl:SensorModule_r_2"/>
+	<Numeric name="N" value="14"/>
+	<Numeric name="StartCopyNo" value="11"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (113.555-3*[DeltaX_ServiceModule]-2*[SensorModuledx])*cm, 2.2925*cm, -0.178*cm </Vector> 
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid"/>
-    <Numeric name="N" value="2"/>
-    <Numeric name="StartCopyNo" value="4"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-4*[DeltaX_ServiceModule]-2*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<rParent name="etl:DiskQuarter_Back_2"/>
+	<String name="ChildName" value="etl:ServiceHybrid"/>
+	<Numeric name="N" value="2"/>
+	<Numeric name="StartCopyNo" value="4"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (113.555-4*[DeltaX_ServiceModule]-2*[SensorModuledx])*cm, 13.1925*cm, 0.*cm </Vector>
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">  <!-- 1st placement of a short service hybrid -->
-    <rParent name="etl:DiskQuarter_Back_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid_short"/>
-    <Numeric name="N" value="1"/>
-    <Numeric name="StartCopyNo" value="1"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-4*[DeltaX_ServiceModule]-2*[SensorModuledx])*cm, (13.055+[ServiceHybrid_Y]+2*[DeltaY]+[DeltaY_ServiceLong_ServiceShort])*cm, 0.*cm </Vector>
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-    <Numeric name="Theta_obj" value="90.*deg"/> 
-	<Numeric name="Phi_obj" value="0.*deg"/>
-  </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back_2"/>
-    <String name="ChildName" value="etl:SensorModule_r_2"/>
-    <Numeric name="N" value="15"/>
-    <Numeric name="StartCopyNo" value="19"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-5*[DeltaX_ServiceModule]-2*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-    <Numeric name="Theta_obj" value="90.*deg"/> 
-	<Numeric name="Phi_obj" value="0.*deg"/>
-  </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back_2"/>
-    <String name="ChildName" value="etl:SensorModule_r"/>
-    <Numeric name="N" value="17"/>
-    <Numeric name="StartCopyNo" value="25"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-5*[DeltaX_ServiceModule]-3*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-    <Numeric name="Theta_obj" value="90.*deg"/> 
-	<Numeric name="Phi_obj" value="0.*deg"/>
-  </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid"/>
-    <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="6"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-6*[DeltaX_ServiceModule]-3*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-    <Numeric name="Theta_obj" value="90.*deg"/> 
-	<Numeric name="Phi_obj" value="0.*deg"/>
-  </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back_2"/>
-    <String name="ChildName" value="etl:SensorModule_r_2"/>
-    <Numeric name="N" value="18"/>
-    <Numeric name="StartCopyNo" value="34"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-7*[DeltaX_ServiceModule]-3*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-    <Numeric name="Theta_obj" value="90.*deg"/> 
-	<Numeric name="Phi_obj" value="0.*deg"/>
-  </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back_2"/>
-    <String name="ChildName" value="etl:SensorModule_r"/>
-    <Numeric name="N" value="18"/>
-    <Numeric name="StartCopyNo" value="42"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-7*[DeltaX_ServiceModule]-4*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-    <Numeric name="Theta_obj" value="90.*deg"/> 
-	<Numeric name="Phi_obj" value="0.*deg"/>
-  </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid"/>
-    <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="9"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-8*[DeltaX_ServiceModule]-4*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-    <Numeric name="Theta_obj" value="90.*deg"/> 
-	<Numeric name="Phi_obj" value="0.*deg"/>
-  </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back_2"/>
-    <String name="ChildName" value="etl:SensorModule_r_2"/>
-    <Numeric name="N" value="18"/>
-    <Numeric name="StartCopyNo" value="52"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-9*[DeltaX_ServiceModule]-4*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-    <Numeric name="Theta_obj" value="90.*deg"/> 
-	<Numeric name="Phi_obj" value="0.*deg"/>
-  </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back_2"/>
-    <String name="ChildName" value="etl:SensorModule_r"/>
-    <Numeric name="N" value="21"/>
-    <Numeric name="StartCopyNo" value="60"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-9*[DeltaX_ServiceModule]-5*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<rParent name="etl:DiskQuarter_Back_2"/>
+	<String name="ChildName" value="etl:ServiceHybrid_short"/>
+	<Numeric name="N" value="1"/>
+	<Numeric name="StartCopyNo" value="1"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (113.555-4*[DeltaX_ServiceModule]-2*[SensorModuledx])*cm, (13.1925+[ServiceHybrid_Y]+2*[DeltaY]+[DeltaY_ServiceLong_ServiceShort])*cm, 0.*cm </Vector>
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid"/>
-    <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="12"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-10*[DeltaX_ServiceModule]-5*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<rParent name="etl:DiskQuarter_Back_2"/>
+	<String name="ChildName" value="etl:SensorModule_r"/>
+	<Numeric name="N" value="15"/>
+	<Numeric name="StartCopyNo" value="19"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (113.555-5*[DeltaX_ServiceModule]-2*[SensorModuledx])*cm, 2.2925*cm, -0.178*cm </Vector> 
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid_short"/>
-    <Numeric name="N" value="1"/>
-    <Numeric name="StartCopyNo" value="2"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-10*[DeltaX_ServiceModule]-5*[SensorModuledx])*cm, (13.055+2*[ServiceHybrid_Y]+3*[DeltaY]+[DeltaY_ServiceLong_ServiceShort])*cm, 0.*cm </Vector>
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<rParent name="etl:DiskQuarter_Back_2"/>
+	<String name="ChildName" value="etl:SensorModule_r_2"/>
+	<Numeric name="N" value="17"/>
+	<Numeric name="StartCopyNo" value="25"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (113.555-5*[DeltaX_ServiceModule]-3*[SensorModuledx])*cm, 2.2925*cm, -0.178*cm </Vector> 
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="global:DDMTDLinear"> <!-- y start pos 13.0925 instead of 13.1925 to avoid extrusion -->
     <rParent name="etl:DiskQuarter_Back_2"/>
-    <String name="ChildName" value="etl:SensorModule_r_2"/>
-    <Numeric name="N" value="21"/>
-    <Numeric name="StartCopyNo" value="70"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-11*[DeltaX_ServiceModule]-5*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<String name="ChildName" value="etl:ServiceHybrid"/>
+	<Numeric name="N" value="2"/>  <!-- "3" -->
+	<Numeric name="StartCopyNo" value="6"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (113.555-6*[DeltaX_ServiceModule]-3*[SensorModuledx])*cm, 13.0925*cm, 0.*cm </Vector>
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back_2"/>
-    <String name="ChildName" value="etl:SensorModule_r"/>
-    <Numeric name="N" value="23"/>
-    <Numeric name="StartCopyNo" value="81"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-11*[DeltaX_ServiceModule]-6*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<rParent name="etl:DiskQuarter_Back_2"/>
+	<String name="ChildName" value="etl:SensorModule_r"/>
+	<Numeric name="N" value="18"/>
+	<Numeric name="StartCopyNo" value="34"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (113.555-7*[DeltaX_ServiceModule]-3*[SensorModuledx])*cm, 2.2925*cm, -0.178*cm </Vector> 
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid"/>
-    <Numeric name="N" value="4"/>
-    <Numeric name="StartCopyNo" value="15"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-12*[DeltaX_ServiceModule]-6*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<rParent name="etl:DiskQuarter_Back_2"/>
+	<String name="ChildName" value="etl:SensorModule_r_2"/>
+	<Numeric name="N" value="18"/>
+	<Numeric name="StartCopyNo" value="42"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (113.555-7*[DeltaX_ServiceModule]-4*[SensorModuledx])*cm, 2.2925*cm, -0.178*cm </Vector> 
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back_2"/>
-    <String name="ChildName" value="etl:SensorModule_r_2"/>
-    <Numeric name="N" value="24"/>
-    <Numeric name="StartCopyNo" value="91"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-13*[DeltaX_ServiceModule]-6*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<rParent name="etl:DiskQuarter_Back_2"/>
+	<String name="ChildName" value="etl:ServiceHybrid"/>
+	<Numeric name="N" value="3"/>
+	<Numeric name="StartCopyNo" value="9"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (113.555-8*[DeltaX_ServiceModule]-4*[SensorModuledx])*cm, 13.1925*cm, 0.*cm </Vector>
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back_2"/>
-    <String name="ChildName" value="etl:SensorModule_r"/>
-    <Numeric name="N" value="24"/>
-    <Numeric name="StartCopyNo" value="104"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-13*[DeltaX_ServiceModule]-7*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<rParent name="etl:DiskQuarter_Back_2"/>
+	<String name="ChildName" value="etl:SensorModule_r"/>
+	<Numeric name="N" value="18"/>
+	<Numeric name="StartCopyNo" value="52"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (113.555-9*[DeltaX_ServiceModule]-4*[SensorModuledx])*cm, 2.2925*cm, -0.178*cm </Vector> 
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid"/>
-    <Numeric name="N" value="4"/>
-    <Numeric name="StartCopyNo" value="19"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-14*[DeltaX_ServiceModule]-7*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<rParent name="etl:DiskQuarter_Back_2"/>
+	<String name="ChildName" value="etl:SensorModule_r_2"/>
+	<Numeric name="N" value="21"/>
+	<Numeric name="StartCopyNo" value="60"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (113.555-9*[DeltaX_ServiceModule]-5*[SensorModuledx])*cm, 2.2925*cm, -0.178*cm </Vector> 
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back_2"/>
-    <String name="ChildName" value="etl:SensorModule_r_2"/>
-    <Numeric name="N" value="24"/>
-    <Numeric name="StartCopyNo" value="115"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-15*[DeltaX_ServiceModule]-7*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<rParent name="etl:DiskQuarter_Back_2"/>
+	<String name="ChildName" value="etl:ServiceHybrid"/>
+	<Numeric name="N" value="3"/>
+	<Numeric name="StartCopyNo" value="12"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (113.555-10*[DeltaX_ServiceModule]-5*[SensorModuledx])*cm, 13.1925*cm, 0.*cm </Vector>
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back_2"/>
-    <String name="ChildName" value="etl:SensorModule_r"/>
-    <Numeric name="N" value="24"/>
-    <Numeric name="StartCopyNo" value="128"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-15*[DeltaX_ServiceModule]-8*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<rParent name="etl:DiskQuarter_Back_2"/>
+	<String name="ChildName" value="etl:ServiceHybrid_short"/>
+	<Numeric name="N" value="1"/>
+	<Numeric name="StartCopyNo" value="2"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (113.555-10*[DeltaX_ServiceModule]-5*[SensorModuledx])*cm, (13.1925+2*[ServiceHybrid_Y]+3*[DeltaY]+[DeltaY_ServiceLong_ServiceShort])*cm, 0.*cm </Vector>
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid"/>
-    <Numeric name="N" value="4"/>
-    <Numeric name="StartCopyNo" value="23"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-16*[DeltaX_ServiceModule]-8*[SensorModuledx])*cm, 13.055*cm, 0.*cm </Vector>
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<rParent name="etl:DiskQuarter_Back_2"/>
+	<String name="ChildName" value="etl:SensorModule_r"/>
+	<Numeric name="N" value="21"/>
+	<Numeric name="StartCopyNo" value="70"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (113.555-11*[DeltaX_ServiceModule]-5*[SensorModuledx])*cm, 2.2925*cm, -0.178*cm </Vector> 
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back_2"/>
-    <String name="ChildName" value="etl:SensorModule_r_2"/>
-    <Numeric name="N" value="24"/>
-    <Numeric name="StartCopyNo" value="139"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-17*[DeltaX_ServiceModule]-8*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<rParent name="etl:DiskQuarter_Back_2"/>
+	<String name="ChildName" value="etl:SensorModule_r_2"/>
+	<Numeric name="N" value="21"/>
+	<Numeric name="StartCopyNo" value="81"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (113.555-11*[DeltaX_ServiceModule]-6*[SensorModuledx])*cm, 2.2925*cm, -0.178*cm </Vector> 
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back_2"/>
-    <String name="ChildName" value="etl:SensorModule_r"/>
-    <Numeric name="N" value="27"/>
-    <Numeric name="StartCopyNo" value="152"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-17*[DeltaX_ServiceModule]-9*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<rParent name="etl:DiskQuarter_Back_2"/>
+	<String name="ChildName" value="etl:ServiceHybrid"/>
+	<Numeric name="N" value="3"/>
+	<Numeric name="StartCopyNo" value="15"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (113.555-12*[DeltaX_ServiceModule]-6*[SensorModuledx])*cm, 13.1925*cm, 0.*cm </Vector>
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid_short"/>
-    <Numeric name="N" value="1"/>
-    <Numeric name="StartCopyNo" value="3"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-18*[DeltaX_ServiceModule]-9*[SensorModuledx])*cm, 6.5275*cm, 0.*cm </Vector>
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<rParent name="etl:DiskQuarter_Back_2"/>
+	<String name="ChildName" value="etl:ServiceHybrid_short"/>
+	<Numeric name="N" value="1"/>
+	<Numeric name="StartCopyNo" value="3"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (113.555-12*[DeltaX_ServiceModule]-6*[SensorModuledx])*cm, (13.1925+2*[ServiceHybrid_Y]+3*[DeltaY]+[DeltaY_ServiceLong_ServiceShort])*cm, 0.*cm </Vector>
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid"/>
-    <Numeric name="N" value="4"/>
-    <Numeric name="StartCopyNo" value="27"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-18*[DeltaX_ServiceModule]-9*[SensorModuledx])*cm, (6.5275+[DeltaY_ServiceLong_ServiceShort]+[DeltaY])*cm, 0.*cm </Vector>
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<rParent name="etl:DiskQuarter_Back_2"/>
+	<String name="ChildName" value="etl:SensorModule_r"/>
+	<Numeric name="N" value="21"/>
+	<Numeric name="StartCopyNo" value="91"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (113.555-13*[DeltaX_ServiceModule]-6*[SensorModuledx])*cm, 2.2925*cm, -0.178*cm </Vector> 
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back_2"/>
-    <String name="ChildName" value="etl:SensorModule_r_2"/>
-    <Numeric name="N" value="27"/>
-    <Numeric name="StartCopyNo" value="163"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-19*[DeltaX_ServiceModule]-9*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<rParent name="etl:DiskQuarter_Back_2"/>
+	<String name="ChildName" value="etl:SensorModule_r_2"/>
+	<Numeric name="N" value="23"/>
+	<Numeric name="StartCopyNo" value="102"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (113.555-13*[DeltaX_ServiceModule]-7*[SensorModuledx])*cm, 2.2925*cm, -0.178*cm </Vector> 
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back_2"/>
-    <String name="ChildName" value="etl:SensorModule_r"/>
-    <Numeric name="N" value="27"/>
-    <Numeric name="StartCopyNo" value="179"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-19*[DeltaX_ServiceModule]-10*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<rParent name="etl:DiskQuarter_Back_2"/>
+	<String name="ChildName" value="etl:ServiceHybrid"/>
+	<Numeric name="N" value="4"/>
+	<Numeric name="StartCopyNo" value="18"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (113.555-14*[DeltaX_ServiceModule]-7*[SensorModuledx])*cm, 13.1925*cm, 0.*cm </Vector>
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid_short"/>
-    <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="4"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-20*[DeltaX_ServiceModule]-10*[SensorModuledx])*cm, 6.5275*cm, 0.*cm </Vector>
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<rParent name="etl:DiskQuarter_Back_2"/>
+	<String name="ChildName" value="etl:SensorModule_r"/>
+	<Numeric name="N" value="24"/>
+	<Numeric name="StartCopyNo" value="112"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (113.555-15*[DeltaX_ServiceModule]-7*[SensorModuledx])*cm, 2.2925*cm, -0.178*cm </Vector> 
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid"/>
-    <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="31"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-20*[DeltaX_ServiceModule]-10*[SensorModuledx])*cm, (6.5275+2*[ServiceHybrid_Y_short]+[DeltaY_ServiceLong_ServiceShort]+3*[DeltaY])*cm, 0.*cm </Vector>
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<rParent name="etl:DiskQuarter_Back_2"/>
+	<String name="ChildName" value="etl:SensorModule_r_2"/>
+	<Numeric name="N" value="24"/>
+	<Numeric name="StartCopyNo" value="125"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (113.555-15*[DeltaX_ServiceModule]-8*[SensorModuledx])*cm, 2.2925*cm, -0.178*cm </Vector> 
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back_2"/>
-    <String name="ChildName" value="etl:SensorModule_r_2"/>
-    <Numeric name="N" value="27"/>
-    <Numeric name="StartCopyNo" value="190"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-21*[DeltaX_ServiceModule]-10*[SensorModuledx])*cm, 2.155*cm, -0.178*cm </Vector> 
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<rParent name="etl:DiskQuarter_Back_2"/>
+	<String name="ChildName" value="etl:ServiceHybrid"/>
+	<Numeric name="N" value="4"/>
+	<Numeric name="StartCopyNo" value="22"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (113.555-16*[DeltaX_ServiceModule]-8*[SensorModuledx])*cm, 13.1925*cm, 0.*cm </Vector>
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back_2"/>
-    <String name="ChildName" value="etl:SensorModule_r"/>
-    <Numeric name="N" value="24"/>
-    <Numeric name="StartCopyNo" value="206"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-21*[DeltaX_ServiceModule]-11*[SensorModuledx])*cm, (2.155+4*[SensorModuledy]+4*[DeltaY])*cm, -0.178*cm </Vector> 
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<rParent name="etl:DiskQuarter_Back_2"/>
+	<String name="ChildName" value="etl:SensorModule_r"/>
+	<Numeric name="N" value="24"/>
+	<Numeric name="StartCopyNo" value="136"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (113.555-17*[DeltaX_ServiceModule]-8*[SensorModuledx])*cm, 2.2925*cm, -0.178*cm </Vector> 
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid_short"/>
-    <Numeric name="N" value="2"/>
-    <Numeric name="StartCopyNo" value="7"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-22*[DeltaX_ServiceModule]-11*[SensorModuledx])*cm, (2.155+5*[SensorModuledy]+5*[DeltaY])*cm, 0.*cm </Vector>
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<rParent name="etl:DiskQuarter_Back_2"/>
+	<String name="ChildName" value="etl:SensorModule_r_2"/>
+	<Numeric name="N" value="24"/>
+	<Numeric name="StartCopyNo" value="149"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (113.555-17*[DeltaX_ServiceModule]-9*[SensorModuledx])*cm, 2.2925*cm, -0.178*cm </Vector> 
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid"/>
-    <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="34"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-22*[DeltaX_ServiceModule]-11*[SensorModuledx])*cm, (2.155+5*[SensorModuledy]+5*[DeltaY]+[ServiceHybrid_Y_short]+[DeltaY_ServiceLong_ServiceShort]+2*[DeltaY])*cm, 0.*cm </Vector>
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<rParent name="etl:DiskQuarter_Back_2"/>
+	<String name="ChildName" value="etl:ServiceHybrid"/>
+	<Numeric name="N" value="4"/>
+	<Numeric name="StartCopyNo" value="26"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (113.555-18*[DeltaX_ServiceModule]-9*[SensorModuledx])*cm, 13.1925*cm, 0.*cm </Vector>
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back_2"/>
-    <String name="ChildName" value="etl:SensorModule_r_2"/>
-    <Numeric name="N" value="23"/>
-    <Numeric name="StartCopyNo" value="217"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-23*[DeltaX_ServiceModule]-11*[SensorModuledx])*cm, (2.155+5*[SensorModuledy]+5*[DeltaY])*cm, -0.178*cm </Vector> 
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<rParent name="etl:DiskQuarter_Back_2"/>
+	<String name="ChildName" value="etl:SensorModule_r"/>
+	<Numeric name="N" value="24"/>
+	<Numeric name="StartCopyNo" value="160"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (113.555-19*[DeltaX_ServiceModule]-9*[SensorModuledx])*cm, 2.2925*cm, -0.178*cm </Vector> 
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back_2"/>
-    <String name="ChildName" value="etl:SensorModule_r"/>
-    <Numeric name="N" value="21"/>
-    <Numeric name="StartCopyNo" value="230"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-23*[DeltaX_ServiceModule]-12*[SensorModuledx])*cm, (2.155+6*[SensorModuledy]+6*[DeltaY])*cm, -0.178*cm </Vector> 
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<rParent name="etl:DiskQuarter_Back_2"/>
+	<String name="ChildName" value="etl:SensorModule_r_2"/>
+	<Numeric name="N" value="20"/>
+	<Numeric name="StartCopyNo" value="173"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (113.555-19*[DeltaX_ServiceModule]-10*[SensorModuledx])*cm, (2.2925+4*[SensorModuledy]+4*[DeltaY])*cm, -0.178*cm </Vector> 
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid_short"/>
-    <Numeric name="N" value="1"/>
-    <Numeric name="StartCopyNo" value="9"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-24*[DeltaX_ServiceModule]-12*[SensorModuledx])*cm, (2.155+7*[SensorModuledy]+7*[DeltaY])*cm, 0.*cm </Vector>
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<rParent name="etl:DiskQuarter_Back_2"/>
+	<String name="ChildName" value="etl:ServiceHybrid"/>
+	<Numeric name="N" value="3"/>
+	<Numeric name="StartCopyNo" value="30"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (113.555-20*[DeltaX_ServiceModule]-10*[SensorModuledx])*cm, (13.1925+4*[SensorModuledy]+4*[DeltaY])*cm, 0.*cm </Vector>
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid"/>
-    <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="37"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-24*[DeltaX_ServiceModule]-12*[SensorModuledx])*cm, (2.155+7*[SensorModuledy]+7*[DeltaY]+[DeltaY_ServiceLong_ServiceShort]+[DeltaY])*cm, 0.*cm </Vector>
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<rParent name="etl:DiskQuarter_Back_2"/>
+	<String name="ChildName" value="etl:ServiceHybrid_short"/>
+	<Numeric name="N" value="1"/>
+	<Numeric name="StartCopyNo" value="4"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (113.555-20*[DeltaX_ServiceModule]-10*[SensorModuledx])*cm, (13.1925+4*[SensorModuledy]+4*[DeltaY]+2*[ServiceHybrid_Y]+3*[DeltaY]+[DeltaY_ServiceLong_ServiceShort])*cm, 0.*cm </Vector>
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back_2"/>
-    <String name="ChildName" value="etl:SensorModule_r_2"/>
-    <Numeric name="N" value="20"/>
-    <Numeric name="StartCopyNo" value="240"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-25*[DeltaX_ServiceModule]-12*[SensorModuledx])*cm, (2.155+7*[SensorModuledy]+7*[DeltaY])*cm, -0.178*cm </Vector> 
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<rParent name="etl:DiskQuarter_Back_2"/>
+	<String name="ChildName" value="etl:SensorModule_r"/>
+	<Numeric name="N" value="20"/>
+	<Numeric name="StartCopyNo" value="184"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (113.555-21*[DeltaX_ServiceModule]-10*[SensorModuledx])*cm, (2.2925+5*[SensorModuledy]+5*[DeltaY])*cm, -0.178*cm </Vector> 
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back_2"/>
-    <String name="ChildName" value="etl:SensorModule_r"/>
-    <Numeric name="N" value="21"/>
-    <Numeric name="StartCopyNo" value="251"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-25*[DeltaX_ServiceModule]-13*[SensorModuledx])*cm, (2.155+7*[SensorModuledy]+7*[DeltaY])*cm, -0.178*cm </Vector> 
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<rParent name="etl:DiskQuarter_Back_2"/>
+	<String name="ChildName" value="etl:SensorModule_r_2"/>
+	<Numeric name="N" value="20"/>
+	<Numeric name="StartCopyNo" value="193"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (113.555-21*[DeltaX_ServiceModule]-11*[SensorModuledx])*cm, (2.2925+6*[SensorModuledy]+6*[DeltaY])*cm, -0.178*cm </Vector> 
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
+  </Algorithm>
+   <Algorithm name="global:DDMTDLinear">
+	<rParent name="etl:DiskQuarter_Back_2"/>
+	<String name="ChildName" value="etl:ServiceHybrid"/>
+	<Numeric name="N" value="3"/>
+	<Numeric name="StartCopyNo" value="33"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (113.555-22*[DeltaX_ServiceModule]-11*[SensorModuledx])*cm, (13.1925+6*[SensorModuledy]+6*[DeltaY])*cm, 0.*cm </Vector>
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
+  <!-- <Algorithm name="global:DDMTDLinear">
+	<rParent name="etl:DiskQuarter_Back_2"/>
+	<String name="ChildName" value="etl:ServiceHybrid_short"/>
+	<Numeric name="N" value="1"/>
+	<Numeric name="StartCopyNo" value="5"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (113.555-22*[DeltaX_ServiceModule]-11*[SensorModuledx])*cm, (13.1925+6*[SensorModuledy]+6*[DeltaY]+2*[ServiceHybrid_Y]+3*[DeltaY]+[DeltaY_ServiceLong_ServiceShort])*cm, 0.*cm </Vector>
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
+	<Numeric name="Phi_obj" value="0.*deg"/>
+  </Algorithm> -->
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid_short"/>
-    <Numeric name="N" value="1"/>
-    <Numeric name="StartCopyNo" value="10"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-26*[DeltaX_ServiceModule]-13*[SensorModuledx])*cm, (2.155+8*[SensorModuledy]+8*[DeltaY])*cm, 0*cm </Vector> 
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<rParent name="etl:DiskQuarter_Back_2"/>
+	<String name="ChildName" value="etl:SensorModule_r"/>
+	<Numeric name="N" value="19"/>  <!-- "20" --> 
+	<Numeric name="StartCopyNo" value="204"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (113.555-23*[DeltaX_ServiceModule]-11*[SensorModuledx])*cm, (2.2925+7*[SensorModuledy]+7*[DeltaY])*cm, -0.178*cm </Vector> 
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid"/>
-    <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="40"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-26*[DeltaX_ServiceModule]-13*[SensorModuledx])*cm, (2.155+8*[SensorModuledy]+8*[DeltaY]+[DeltaY_ServiceLong_ServiceShort]+[DeltaY])*cm, 0.*cm </Vector>
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<rParent name="etl:DiskQuarter_Back_2"/>
+	<String name="ChildName" value="etl:SensorModule_r_2"/>
+	<Numeric name="N" value="18"/>
+	<Numeric name="StartCopyNo" value="213"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (113.555-23*[DeltaX_ServiceModule]-12*[SensorModuledx])*cm, (2.2925+7*[SensorModuledy]+7*[DeltaY])*cm, -0.178*cm </Vector> 
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back_2"/>
-    <String name="ChildName" value="etl:SensorModule_r_2"/>
-    <Numeric name="N" value="20"/>
-    <Numeric name="StartCopyNo" value="260"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-27*[DeltaX_ServiceModule]-13*[SensorModuledx])*cm, (2.155+8*[SensorModuledy]+8*[DeltaY])*cm, -0.178*cm </Vector> 
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<rParent name="etl:DiskQuarter_Back_2"/>
+	<String name="ChildName" value="etl:ServiceHybrid"/>
+	<Numeric name="N" value="3"/>
+	<Numeric name="StartCopyNo" value="36"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (113.555-24*[DeltaX_ServiceModule]-12*[SensorModuledx])*cm, (13.1925+7*[SensorModuledy]+7*[DeltaY])*cm, 0.*cm </Vector>
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back_2"/>
-    <String name="ChildName" value="etl:SensorModule_r"/>
-    <Numeric name="N" value="21"/>
-    <Numeric name="StartCopyNo" value="272"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-27*[DeltaX_ServiceModule]-14*[SensorModuledx])*cm, (2.155+8*[SensorModuledy]+8*[DeltaY])*cm, -0.178*cm </Vector> 
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<rParent name="etl:DiskQuarter_Back_2"/>
+	<String name="ChildName" value="etl:SensorModule_r"/>
+	<Numeric name="N" value="17"/>
+	<Numeric name="StartCopyNo" value="224"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (113.555-25*[DeltaX_ServiceModule]-12*[SensorModuledx])*cm, (2.2925+8*[SensorModuledy]+8*[DeltaY])*cm, -0.178*cm </Vector> 
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid_short"/>
-    <Numeric name="N" value="1"/>
-    <Numeric name="StartCopyNo" value="11"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([ServiceHybrid_Y_short]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-28*[DeltaX_ServiceModule]-14*[SensorModuledx])*cm, (2.155+9*[SensorModuledy]+9*[DeltaY])*cm, 0*cm </Vector> 
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<rParent name="etl:DiskQuarter_Back_2"/>
+	<String name="ChildName" value="etl:SensorModule_r_2"/>
+	<Numeric name="N" value="18"/>
+	<Numeric name="StartCopyNo" value="231"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([SensorModuledy]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (113.555-25*[DeltaX_ServiceModule]-13*[SensorModuledx])*cm, (2.2925+8*[SensorModuledy]+8*[DeltaY])*cm, -0.178*cm </Vector> 
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
   <Algorithm name="global:DDMTDLinear">
-    <rParent name="etl:DiskQuarter_Back_2"/>
-    <String name="ChildName" value="etl:ServiceHybrid"/>
-    <Numeric name="N" value="3"/>
-    <Numeric name="StartCopyNo" value="43"/>
-    <Numeric name="IncrCopyNo" value="1"/>
-    <Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
-    <Vector  name="Base" type="numeric" nEntries="3"> (122.0-28*[DeltaX_ServiceModule]-14*[SensorModuledx])*cm, (2.155+9*[SensorModuledy]+9*[DeltaY]+[DeltaY_ServiceLong_ServiceShort]+[DeltaY])*cm, 0*cm </Vector> 
-    <Numeric name="Theta" value="90.*deg"/> 
-    <Numeric name="Phi" value="90.*deg"/>
-    <Numeric name="Theta_obj" value="90.*deg"/> 
+	<rParent name="etl:DiskQuarter_Back_2"/>
+	<String name="ChildName" value="etl:ServiceHybrid"/>
+	<Numeric name="N" value="3"/>
+	<Numeric name="StartCopyNo" value="39"/>
+	<Numeric name="IncrCopyNo" value="1"/>
+	<Numeric name="Delta" value="([ServiceHybrid_Y]+[DeltaY])*cm"/>
+	<Vector  name="Base" type="numeric" nEntries="3"> (113.555-26*[DeltaX_ServiceModule]-13*[SensorModuledx])*cm, (13.1925+8*[SensorModuledy]+8*[DeltaY])*cm, 0.*cm </Vector>
+	<Numeric name="Theta" value="90.*deg"/> 
+	<Numeric name="Phi" value="90.*deg"/>
+	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-
-
+  
     
 
 </DDDefinition>

From 5ca4e560fb83b20db1ab00b1e8b6f85154ce23a7 Mon Sep 17 00:00:00 2001
From: Fabio Cossutti <fabio.cossutti@ts.infn.it>
Date: Thu, 23 Jan 2020 14:29:11 +0100
Subject: [PATCH 09/15] Update of DD4hep scenarios to test also new ETL, while
 keeping D50 as a reference

---
 ...d-geometry.xml => cms-mtdD50-geometry.xml} |  0
 .../data/dd4hep/cms-mtdD53-geometry.xml       | 72 +++++++++++++++++++
 .../MTDCommonData/test/testMTDinDD4hep.py     |  2 +-
 .../test/python/testMTDGeometry.py            |  2 +-
 4 files changed, 74 insertions(+), 2 deletions(-)
 rename Geometry/MTDCommonData/data/dd4hep/{cms-mtd-geometry.xml => cms-mtdD50-geometry.xml} (100%)
 create mode 100644 Geometry/MTDCommonData/data/dd4hep/cms-mtdD53-geometry.xml

diff --git a/Geometry/MTDCommonData/data/dd4hep/cms-mtd-geometry.xml b/Geometry/MTDCommonData/data/dd4hep/cms-mtdD50-geometry.xml
similarity index 100%
rename from Geometry/MTDCommonData/data/dd4hep/cms-mtd-geometry.xml
rename to Geometry/MTDCommonData/data/dd4hep/cms-mtdD50-geometry.xml
diff --git a/Geometry/MTDCommonData/data/dd4hep/cms-mtdD53-geometry.xml b/Geometry/MTDCommonData/data/dd4hep/cms-mtdD53-geometry.xml
new file mode 100644
index 0000000000000..50eafbfe2be44
--- /dev/null
+++ b/Geometry/MTDCommonData/data/dd4hep/cms-mtdD53-geometry.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0"?>
+<DDDefinition>
+  <debug>
+    <debug_shapes/>
+    <debug_includes/>
+    <debug_rotations/>
+    <debug_includes/>
+    <debug_volumes/>
+    <debug_constants/>
+    <debug_materials/>
+    <debug_namespaces/>
+    <debug_placements/>
+    <debug_algorithms/>
+    <debug_materials/>
+    <debug_visattr/>
+    <debug_specpars/>
+  </debug>
+  
+  <open_geometry/>
+  <close_geometry/>
+
+  <ConstantsSection label="" eval="true">
+    <Constant name="world_x" value="100*m"/>
+    <Constant name="world_y" value="100*m"/>
+    <Constant name="world_z" value="100*m"/>
+    <Constant name="fm"      value="1e-12*m"/>
+    <Constant name="mum"     value="1.e-3*mm"/>
+    <Constant name="Air"     value="materials:Air"     type="string"/>
+    <Constant name="Vacuum"  value="materials:Vacuum"  type="string"/>
+  </ConstantsSection>
+
+  <IncludeSection>
+    <Include ref='Geometry/CMSCommonData/data/materials.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/rotations.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/extend/v2/cmsextent.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cms/2026/v2/cms.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/eta3/etaMax.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cmsMother.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cmsTracker.xml'/>
+    <Include ref='Geometry/CMSCommonData/data/cmsCalo.xml'/>
+    <!-- <Include ref='Geometry/CMSCommonData/data/muonBase/2026/v2/muonBase.xml'/> -->
+    <!-- <Include ref='Geometry/CMSCommonData/data/cmsMuon.xml'/> -->
+    <!-- <Include ref='Geometry/CMSCommonData/data/mgnt.xml'/> -->
+    <!-- <Include ref='Geometry/CMSCommonData/data/beampipe/2026/v1/beampipe.xml'/> -->
+    <!-- <Include ref='Geometry/CMSCommonData/data/cmsBeam/2026/v1/cmsBeam.xml'/> -->
+    <!-- <Include ref='Geometry/CMSCommonData/data/muonMB.xml'/> -->
+    <!-- <Include ref='Geometry/CMSCommonData/data/muonMagnet.xml'/> -->
+    <!-- <Include ref='Geometry/CMSCommonData/data/cavern/2017/v2/cavern.xml'/> -->
+    <Include ref='Geometry/CMSCommonData/data/cavernData/2017/v1/cavernData.xml'/>
+    <!-- <Include ref='Geometry/CMSCommonData/data/cavernFloor/2017/v1/cavernFloor.xml'/> -->
+    <Include ref='Geometry/CMSCommonData/data/caloBase/2026/v2/caloBase.xml'/>
+    <Include ref='Geometry/TrackerCommonData/data/trackermaterial.xml'/>
+    <!-- <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613/pixfwd.xml'/> -->
+    <!-- <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker613/tracker.xml'/> -->
+    <!-- <Include ref='Geometry/TrackerCommonData/data/PhaseII/TiltedTracker404/pixbar.xml'/> -->
+    <Include ref='Geometry/MTDCommonData/data/dd4hep/tracker.xml'/>
+    <Include ref='Geometry/MTDCommonData/data/mtdMaterial/v2/mtdMaterial.xml'/>
+    <Include ref='Geometry/MTDCommonData/data/btl/v1/btl.xml'/>
+    <Include ref='Geometry/MTDCommonData/data/btl/v1/btlStructureTopology.xml'/>
+    <Include ref='Geometry/MTDCommonData/data/etl/v4/etl.xml'/>
+    <Include ref='Geometry/MTDCommonData/data/mtdParameters/v1/mtdParameters.xml'/>
+    <Include ref='Geometry/MTDSimData/data/v2/mtdsens.xml'/>
+    <Include ref='Geometry/MTDSimData/data/v2/mtdProdCuts.xml'/>
+  </IncludeSection>
+  
+  <!-- <PosPartSection label=""> -->
+  <!--   <PosPart copyNumber="1"> -->
+  <!--     <rParent name=":world_volume"/> -->
+  <!--     <rChild name="cms:OCMS"/> -->
+  <!--   </PosPart> -->
+  <!-- </PosPartSection> -->
+</DDDefinition>
diff --git a/Geometry/MTDCommonData/test/testMTDinDD4hep.py b/Geometry/MTDCommonData/test/testMTDinDD4hep.py
index b6c4e3c7c721b..23bb6c4da17f4 100644
--- a/Geometry/MTDCommonData/test/testMTDinDD4hep.py
+++ b/Geometry/MTDCommonData/test/testMTDinDD4hep.py
@@ -8,7 +8,7 @@
         )
 
 process.DDDetectorESProducer = cms.ESSource("DDDetectorESProducer",
-                                            confGeomXMLFiles = cms.FileInPath('Geometry/MTDCommonData/data/dd4hep/cms-mtd-geometry.xml'),
+                                            confGeomXMLFiles = cms.FileInPath('Geometry/MTDCommonData/data/dd4hep/cms-mtdD50-geometry.xml'),
                                             appendToDataLabel = cms.string('MTD')
 )
 
diff --git a/Geometry/MTDGeometryBuilder/test/python/testMTDGeometry.py b/Geometry/MTDGeometryBuilder/test/python/testMTDGeometry.py
index 898c88f28c3da..b9e7b4ddb28b4 100644
--- a/Geometry/MTDGeometryBuilder/test/python/testMTDGeometry.py
+++ b/Geometry/MTDGeometryBuilder/test/python/testMTDGeometry.py
@@ -39,7 +39,7 @@
     )
 
 process.DDDetectorESProducer = cms.ESSource("DDDetectorESProducer",
-                                            confGeomXMLFiles = cms.FileInPath('Geometry/MTDCommonData/data/dd4hep/cms-mtd-geometry.xml'),
+                                            confGeomXMLFiles = cms.FileInPath('Geometry/MTDCommonData/data/dd4hep/cms-mtdD50-geometry.xml'),
                                             appendToDataLabel = cms.string('MTD')
                                             )
 

From a2dce6e0a9f7775dbe469371ad20ddf28ce1181a Mon Sep 17 00:00:00 2001
From: Fabio Cossutti <fabio.cossutti@ts.infn.it>
Date: Thu, 23 Jan 2020 18:23:16 +0100
Subject: [PATCH 10/15] scram b code-format

---
 DataFormats/ForwardDetId/interface/ETLDetId.h | 13 ++++---
 Geometry/MTDCommonData/plugins/DDMTDLinear.cc | 39 +++++++++++--------
 .../MTDCommonData/src/ETLNumberingScheme.cc   | 12 +++---
 3 files changed, 36 insertions(+), 28 deletions(-)

diff --git a/DataFormats/ForwardDetId/interface/ETLDetId.h b/DataFormats/ForwardDetId/interface/ETLDetId.h
index aa22cd62fdb2e..e573f66eee5c4 100644
--- a/DataFormats/ForwardDetId/interface/ETLDetId.h
+++ b/DataFormats/ForwardDetId/interface/ETLDetId.h
@@ -19,7 +19,7 @@ class ETLDetId : public MTDDetId {
   static const uint32_t kETLmodTypeOffset = 5;
   static const uint32_t kETLmodTypeMask = 0x3;
 
-  /// constants for the TDR ETL model 
+  /// constants for the TDR ETL model
   static const uint32_t kETLnDiscOffset = 3;
   static const uint32_t kETLnDiscMask = 0x1;
   static const uint32_t kETLdiscSideOffset = 2;
@@ -61,14 +61,17 @@ class ETLDetId : public MTDDetId {
   // meaningless for TP model
 
   // starting from 1
-  inline int quarter() const { return ((((id_ >> kRodRingOffset) & kRodRingMask)-1)  & kETLquarterMask)+1; }
+  inline int quarter() const { return ((((id_ >> kRodRingOffset) & kRodRingMask) - 1) & kETLquarterMask) + 1; }
 
   // 0 = front, 1 = back
-  inline int discSide() const { return ((((id_ >> kRodRingOffset) & kRodRingMask)-1) >> kETLdiscSideOffset) & kETLdiscSideMask; }
+  inline int discSide() const {
+    return ((((id_ >> kRodRingOffset) & kRodRingMask) - 1) >> kETLdiscSideOffset) & kETLdiscSideMask;
+  }
 
   // starting from 1
-  inline int nDisc() const { return (((((id_ >> kRodRingOffset) & kRodRingMask)-1) >> kETLnDiscOffset) & kETLnDiscMask)+1; }
-
+  inline int nDisc() const {
+    return (((((id_ >> kRodRingOffset) & kRodRingMask) - 1) >> kETLnDiscOffset) & kETLnDiscMask) + 1;
+  }
 };
 
 std::ostream& operator<<(std::ostream&, const ETLDetId&);
diff --git a/Geometry/MTDCommonData/plugins/DDMTDLinear.cc b/Geometry/MTDCommonData/plugins/DDMTDLinear.cc
index 2e4c1d3b45de9..0f5f58768c6e9 100644
--- a/Geometry/MTDCommonData/plugins/DDMTDLinear.cc
+++ b/Geometry/MTDCommonData/plugins/DDMTDLinear.cc
@@ -22,7 +22,8 @@ using namespace angle_units::operators;
 
 class DDMTDLinear : public DDAlgorithm {
 public:
-  DDMTDLinear() : m_n(1), m_startCopyNo(1), m_incrCopyNo(1), m_theta(0.), m_phi(0.), m_delta(0.), m_phi_obj(0.), m_theta_obj(0.) {}
+  DDMTDLinear()
+      : m_n(1), m_startCopyNo(1), m_incrCopyNo(1), m_theta(0.), m_phi(0.), m_delta(0.), m_phi_obj(0.), m_theta_obj(0.) {}
 
   void initialize(const DDNumericArguments& nArgs,
                   const DDVectorArguments& vArgs,
@@ -48,10 +49,10 @@ class DDMTDLinear : public DDAlgorithm {
 };
 
 void DDMTDLinear::initialize(const DDNumericArguments& nArgs,
-                          const DDVectorArguments& vArgs,
-                          const DDMapArguments&,
-                          const DDStringArguments& sArgs,
-                          const DDStringVectorArguments&) {
+                             const DDVectorArguments& vArgs,
+                             const DDMapArguments&,
+                             const DDStringArguments& sArgs,
+                             const DDStringVectorArguments&) {
   m_n = int(nArgs["N"]);
   m_startCopyNo = int(nArgs["StartCopyNo"]);
   m_incrCopyNo = int(nArgs["IncrCopyNo"]);
@@ -66,8 +67,8 @@ void DDMTDLinear::initialize(const DDNumericArguments& nArgs,
                           << "ing:: n " << m_n << " Direction Theta, Phi, Offset, Delta " << convertRadToDeg(m_theta)
                           << " " << convertRadToDeg(m_phi) << " "
                           << " " << convertRadToDeg(m_delta) << " Base " << m_base[0] << ", " << m_base[1] << ", "
-                          << m_base[2] << "Objects placement Phi_obj, Theta_obj " << convertRadToDeg(m_phi_obj) 
-                          << " " << convertRadToDeg(m_theta_obj);
+                          << m_base[2] << "Objects placement Phi_obj, Theta_obj " << convertRadToDeg(m_phi_obj) << " "
+                          << convertRadToDeg(m_theta_obj);
 
   m_childNmNs = DDSplit(sArgs["ChildName"]);
   if (m_childNmNs.second.empty())
@@ -90,26 +91,32 @@ void DDMTDLinear::execute(DDCompactView& cpv) {
   //rotation is in xy plane
   long double x_phi = 0.5;
   double thetaZ = m_theta_obj - angle_units::operators::operator""_pi(x_phi);
-  double phiZ = m_phi_obj;  
-  double thetaX = m_theta_obj;  
-  double thetaY = m_theta_obj;  
-  double phiX = m_phi_obj;     
-  double phiY = m_phi_obj + angle_units::operators::operator""_pi(x_phi);  
+  double phiZ = m_phi_obj;
+  double thetaX = m_theta_obj;
+  double thetaY = m_theta_obj;
+  double phiX = m_phi_obj;
+  double phiY = m_phi_obj + angle_units::operators::operator""_pi(x_phi);
 
   //DDRotation rotation = DDRotation("IdentityRotation");  this is the default rotation matrix in DDLinear
   DDRotation rotation = DDRotation("Rotation");
 
-
   if (!rotation) {
     LogDebug("DDAlgorithm") << "DDMTDLinear: Creating a new "
                             << "rotation: IdentityRotation for " << ddname;
 
-    rotation = DDrot( "Rotation", DDcreateRotationMatrix(thetaX, phiX, thetaY, phiY, thetaZ, phiZ)); //rotation = DDrot("IdentityRotation", std::make_unique<DDRotationMatrix>());
+    rotation = DDrot(
+        "Rotation",
+        DDcreateRotationMatrix(thetaX,
+                               phiX,
+                               thetaY,
+                               phiY,
+                               thetaZ,
+                               phiZ));  //rotation = DDrot("IdentityRotation", std::make_unique<DDRotationMatrix>());
   }
 
   for (int i = 0; i < m_n; ++i) {
-    DDTranslation tran = basetr + (double(i) * m_delta) * direction;   
-    cpv.position(ddname, mother, copy, tran, rotation);  
+    DDTranslation tran = basetr + (double(i) * m_delta) * direction;
+    cpv.position(ddname, mother, copy, tran, rotation);
     LogDebug("DDAlgorithm") << "DDMTDLinear: " << m_childNmNs.second << ":" << m_childNmNs.first << " number " << copy
                             << " positioned in " << mother << " at " << tran << " with " << rotation;
     copy += m_incrCopyNo;
diff --git a/Geometry/MTDCommonData/src/ETLNumberingScheme.cc b/Geometry/MTDCommonData/src/ETLNumberingScheme.cc
index e614a72b33f84..bc609480129e2 100644
--- a/Geometry/MTDCommonData/src/ETLNumberingScheme.cc
+++ b/Geometry/MTDCommonData/src/ETLNumberingScheme.cc
@@ -35,23 +35,21 @@ uint32_t ETLNumberingScheme::getUnitID(const MTDBaseNumber& baseNumber) const {
   const bool preTDR = (baseNumber.getLevelName(3).find("Ring") != std::string::npos);
 
   const uint32_t modCopy(baseNumber.getCopyNumber(2));
-  
+
   const std::string& ringName(baseNumber.getLevelName(3));  // name of ring volume
   int modtyp(0);
   std::string baseName = ringName.substr(ringName.find(":") + 1);
   int ringCopy(::atoi(baseName.c_str() + 4));
-  
-  if ( !preTDR) {
 
+  if (!preTDR) {
     uint32_t discN = (baseNumber.getLevelName(4).find("Disk1") != std::string::npos) ? 0 : 1;
     uint32_t quarterS = (baseNumber.getLevelName(3).find("Front") != std::string::npos) ? 0 : 1;
     uint32_t quarterN = baseNumber.getCopyNumber(3);
     const uint32_t quarterOffset = 4;
 
-    ringCopy = quarterN+quarterS*quarterOffset+2*quarterOffset*discN;
-
-    modtyp = (baseNumber.getLevelName(2).find("_2") != std::string::npos ) ? 2 : 1;
+    ringCopy = quarterN + quarterS * quarterOffset + 2 * quarterOffset * discN;
 
+    modtyp = (baseNumber.getLevelName(2).find("_2") != std::string::npos) ? 2 : 1;
   }
 
   // Side choice: up to scenario D38 is given by level 7 (HGCal v9)
@@ -89,7 +87,7 @@ uint32_t ETLNumberingScheme::getUnitID(const MTDBaseNumber& baseNumber) const {
     return 0;
   }
 
-  if ((preTDR && (1 > ringCopy || 11 < ringCopy)) || ( !preTDR && (1 > ringCopy || 16 < ringCopy))) {
+  if ((preTDR && (1 > ringCopy || 11 < ringCopy)) || (!preTDR && (1 > ringCopy || 16 < ringCopy))) {
     edm::LogWarning("MTDGeom") << "ETLNumberingScheme::getUnitID(): "
                                << "****************** Bad ring copy = " << ringCopy
                                << ", Volume Number = " << baseNumber.getCopyNumber(3);

From 69df67b093b601419a5c13e81f795687d4d37e43 Mon Sep 17 00:00:00 2001
From: Fabio Cossutti <fabio.cossutti@ts.infn.it>
Date: Fri, 24 Jan 2020 17:28:57 +0100
Subject: [PATCH 11/15] Technical cleaning of MTDCommonData plugin

---
 Geometry/MTDCommonData/plugins/BuildFile.xml  | 20 ++++++-------------
 Geometry/MTDCommonData/plugins/DDMTDLinear.cc |  8 +++-----
 2 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/Geometry/MTDCommonData/plugins/BuildFile.xml b/Geometry/MTDCommonData/plugins/BuildFile.xml
index cb9e5f6b4f370..68c97743eca7b 100644
--- a/Geometry/MTDCommonData/plugins/BuildFile.xml
+++ b/Geometry/MTDCommonData/plugins/BuildFile.xml
@@ -1,15 +1,7 @@
-<use   name="FWCore/Framework"/>
-<use   name="Geometry/Records"/>
-<use   name="Geometry/MTDCommonData"/>
-<use   name="DetectorDescription/DDCMS"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="DataFormats/Math"/>
-
-
-<library  file="DDMTDLinear.cc">
-
-  <use   name="DetectorDescription/Core"/>
-  <use   name="DetectorDescription/Parser"/>
-  <flags   EDM_PLUGIN="1"/>
+<library name="DDMTDLinear" file="DDMTDLinear.cc">
+ <use name="DataFormats/Math"/>
+ <use name="DetectorDescription/Core"/>
+ <use name="FWCore/MessageLogger"/>
+ <use name="FWCore/PluginManager"/>
+ <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/Geometry/MTDCommonData/plugins/DDMTDLinear.cc b/Geometry/MTDCommonData/plugins/DDMTDLinear.cc
index 0f5f58768c6e9..e854044143fa5 100644
--- a/Geometry/MTDCommonData/plugins/DDMTDLinear.cc
+++ b/Geometry/MTDCommonData/plugins/DDMTDLinear.cc
@@ -10,7 +10,6 @@
 #include "DetectorDescription/Core/interface/DDTranslation.h"
 #include "DetectorDescription/Core/interface/DDTypes.h"
 #include "DataFormats/Math/interface/GeantUnits.h"
-#include "DataFormats/Math/interface/angle_units.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/PluginManager/interface/PluginFactory.h"
 
@@ -89,20 +88,19 @@ void DDMTDLinear::execute(DDCompactView& cpv) {
   DDTranslation basetr(m_base[0], m_base[1], m_base[2]);
 
   //rotation is in xy plane
-  long double x_phi = 0.5;
-  double thetaZ = m_theta_obj - angle_units::operators::operator""_pi(x_phi);
+  double thetaZ = m_theta_obj - 0.5_pi;
   double phiZ = m_phi_obj;
   double thetaX = m_theta_obj;
   double thetaY = m_theta_obj;
   double phiX = m_phi_obj;
-  double phiY = m_phi_obj + angle_units::operators::operator""_pi(x_phi);
+  double phiY = m_phi_obj + 0.5_pi;
 
   //DDRotation rotation = DDRotation("IdentityRotation");  this is the default rotation matrix in DDLinear
   DDRotation rotation = DDRotation("Rotation");
 
   if (!rotation) {
     LogDebug("DDAlgorithm") << "DDMTDLinear: Creating a new "
-                            << "rotation: IdentityRotation for " << ddname;
+                            << "rotation for " << ddname;
 
     rotation = DDrot(
         "Rotation",

From 8410664f28e9c236be93fd3931e2991185470ba3 Mon Sep 17 00:00:00 2001
From: Fabio Cossutti <fabio.cossutti@ts.infn.it>
Date: Sun, 26 Jan 2020 17:17:33 +0100
Subject: [PATCH 12/15] Address comments by K. Pedro, minor code cleaning

---
 DataFormats/ForwardDetId/interface/ETLDetId.h    |  6 ++++++
 Geometry/MTDCommonData/plugins/DDMTDLinear.cc    | 10 +---------
 Geometry/MTDCommonData/src/ETLNumberingScheme.cc |  6 ++++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/DataFormats/ForwardDetId/interface/ETLDetId.h b/DataFormats/ForwardDetId/interface/ETLDetId.h
index e573f66eee5c4..d61e0926b45db 100644
--- a/DataFormats/ForwardDetId/interface/ETLDetId.h
+++ b/DataFormats/ForwardDetId/interface/ETLDetId.h
@@ -19,6 +19,9 @@ class ETLDetId : public MTDDetId {
   static const uint32_t kETLmodTypeOffset = 5;
   static const uint32_t kETLmodTypeMask = 0x3;
 
+  static constexpr int kETLv1maxRing = 11;
+  static constexpr int kETLv1maxModule = 176;
+
   /// constants for the TDR ETL model
   static const uint32_t kETLnDiscOffset = 3;
   static const uint32_t kETLnDiscMask = 0x1;
@@ -26,6 +29,9 @@ class ETLDetId : public MTDDetId {
   static const uint32_t kETLdiscSideMask = 0x1;
   static const uint32_t kETLquarterMask = 0x3;
 
+  static constexpr int kETLv2maxRing = 16;
+  static constexpr int kETLv2maxModule = 292;
+
   // ---------- Constructors, enumerated types ----------
 
   /** Construct a null id */
diff --git a/Geometry/MTDCommonData/plugins/DDMTDLinear.cc b/Geometry/MTDCommonData/plugins/DDMTDLinear.cc
index e854044143fa5..37b1c03475a2b 100644
--- a/Geometry/MTDCommonData/plugins/DDMTDLinear.cc
+++ b/Geometry/MTDCommonData/plugins/DDMTDLinear.cc
@@ -95,21 +95,13 @@ void DDMTDLinear::execute(DDCompactView& cpv) {
   double phiX = m_phi_obj;
   double phiY = m_phi_obj + 0.5_pi;
 
-  //DDRotation rotation = DDRotation("IdentityRotation");  this is the default rotation matrix in DDLinear
   DDRotation rotation = DDRotation("Rotation");
 
   if (!rotation) {
     LogDebug("DDAlgorithm") << "DDMTDLinear: Creating a new "
                             << "rotation for " << ddname;
 
-    rotation = DDrot(
-        "Rotation",
-        DDcreateRotationMatrix(thetaX,
-                               phiX,
-                               thetaY,
-                               phiY,
-                               thetaZ,
-                               phiZ));  //rotation = DDrot("IdentityRotation", std::make_unique<DDRotationMatrix>());
+    rotation = DDrot("Rotation", DDcreateRotationMatrix(thetaX, phiX, thetaY, phiY, thetaZ, phiZ));
   }
 
   for (int i = 0; i < m_n; ++i) {
diff --git a/Geometry/MTDCommonData/src/ETLNumberingScheme.cc b/Geometry/MTDCommonData/src/ETLNumberingScheme.cc
index bc609480129e2..c0c4efb16e7f1 100644
--- a/Geometry/MTDCommonData/src/ETLNumberingScheme.cc
+++ b/Geometry/MTDCommonData/src/ETLNumberingScheme.cc
@@ -80,14 +80,16 @@ uint32_t ETLNumberingScheme::getUnitID(const MTDBaseNumber& baseNumber) const {
     return 0;
   }
 
-  if ((preTDR && (1 > modCopy || 176 < modCopy)) || (!preTDR && (1 > modCopy || 292 < modCopy))) {
+  if ((preTDR && (1 > modCopy || ETLDetId::kETLv1maxModule < modCopy)) ||
+      (!preTDR && (1 > modCopy || ETLDetId::kETLv2maxModule < modCopy))) {
     edm::LogWarning("MTDGeom") << "ETLNumberingScheme::getUnitID(): "
                                << "****************** Bad module copy = " << modCopy
                                << ", Volume Number = " << baseNumber.getCopyNumber(4);
     return 0;
   }
 
-  if ((preTDR && (1 > ringCopy || 11 < ringCopy)) || (!preTDR && (1 > ringCopy || 16 < ringCopy))) {
+  if ((preTDR && (1 > ringCopy || ETLDetId::kETLv1maxRing < ringCopy)) ||
+      (!preTDR && (1 > ringCopy || ETLDetId::kETLv2maxRing < ringCopy))) {
     edm::LogWarning("MTDGeom") << "ETLNumberingScheme::getUnitID(): "
                                << "****************** Bad ring copy = " << ringCopy
                                << ", Volume Number = " << baseNumber.getCopyNumber(3);

From 6ceceaf856b7e6115de1cdaaa6376299c179b8e9 Mon Sep 17 00:00:00 2001
From: Fabio Cossutti <fabio.cossutti@ts.infn.it>
Date: Sun, 26 Jan 2020 17:33:13 +0100
Subject: [PATCH 13/15] Add scenario D53 to StandardSequences list (fix unit
 test)

---
 Configuration/StandardSequences/python/GeometryConf.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Configuration/StandardSequences/python/GeometryConf.py b/Configuration/StandardSequences/python/GeometryConf.py
index 20d4045c74edf..dfc495b0e2d6c 100644
--- a/Configuration/StandardSequences/python/GeometryConf.py
+++ b/Configuration/StandardSequences/python/GeometryConf.py
@@ -40,4 +40,5 @@
     'Extended2026D50' : 'Extended2026D50,Extended2026D50Reco',
     'Extended2026D51' : 'Extended2026D51,Extended2026D51Reco',
     'Extended2026D52' : 'Extended2026D52,Extended2026D52Reco',
+    'Extended2026D53' : 'Extended2026D53,Extended2026D53Reco',
     }

From 6ea8b6542e44a169f46b7a2375bb6632ac022484 Mon Sep 17 00:00:00 2001
From: Fabio Cossutti <fabio.cossutti@ts.infn.it>
Date: Mon, 27 Jan 2020 11:17:41 +0100
Subject: [PATCH 14/15] Turn the DDMTDLinear algorithm from global into mtd
 namespace

---
 Geometry/MTDCommonData/data/etl/v4/etl.xml    | 356 +++++++++---------
 Geometry/MTDCommonData/plugins/DDMTDLinear.cc |   2 +-
 2 files changed, 179 insertions(+), 179 deletions(-)

diff --git a/Geometry/MTDCommonData/data/etl/v4/etl.xml b/Geometry/MTDCommonData/data/etl/v4/etl.xml
index 9be28616fce61..21f9b38a62901 100644
--- a/Geometry/MTDCommonData/data/etl/v4/etl.xml
+++ b/Geometry/MTDCommonData/data/etl/v4/etl.xml
@@ -527,7 +527,7 @@
 
   <!-- Algorithm Section begins -->
     <!-- Disk1 Front face -->
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Front"/>
 	<String name="ChildName" value="etl:SensorModule_2"/>
 	<Numeric name="N" value="8"/>
@@ -540,7 +540,7 @@
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="1"/>
@@ -553,7 +553,7 @@
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:ServiceHybrid_short"/>
     <Numeric name="N" value="1"/>
@@ -566,7 +566,7 @@
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="9"/>
@@ -579,7 +579,7 @@
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:SensorModule_2"/>
     <Numeric name="N" value="12"/>
@@ -592,7 +592,7 @@
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="2"/>
@@ -605,7 +605,7 @@
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="12"/>
@@ -618,7 +618,7 @@
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:SensorModule_2"/>
     <Numeric name="N" value="15"/>
@@ -631,7 +631,7 @@
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="2"/>
@@ -644,7 +644,7 @@
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:ServiceHybrid_short"/>
     <Numeric name="N" value="1"/>
@@ -657,7 +657,7 @@
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="15"/>
@@ -670,7 +670,7 @@
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:SensorModule_2"/>
     <Numeric name="N" value="18"/>
@@ -683,7 +683,7 @@
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="3"/>
@@ -696,7 +696,7 @@
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="18"/>
@@ -709,7 +709,7 @@
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:SensorModule_2"/>
     <Numeric name="N" value="20"/>
@@ -722,7 +722,7 @@
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">  <!-- y start changed from 13.1925 to 13.0925 to avoid extrusion -->
+  <Algorithm name="mtd:DDMTDLinear">  <!-- y start changed from 13.1925 to 13.0925 to avoid extrusion -->
     <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="3"/>
@@ -735,7 +735,7 @@
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <!-- <Algorithm name="global:DDMTDLinear">  
+  <!-- <Algorithm name="mtd:DDMTDLinear">  
     <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:ServiceHybrid_short"/>
     <Numeric name="N" value="1"/>
@@ -748,7 +748,7 @@
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm> -->
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="21"/>
@@ -761,7 +761,7 @@
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:SensorModule_2"/>
     <Numeric name="N" value="21"/>
@@ -774,7 +774,7 @@
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="3"/>
@@ -787,7 +787,7 @@
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:ServiceHybrid_short"/>
     <Numeric name="N" value="1"/>
@@ -800,7 +800,7 @@
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="21"/>
@@ -813,7 +813,7 @@
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:SensorModule_2"/>
     <Numeric name="N" value="21"/>
@@ -826,7 +826,7 @@
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="3"/>
@@ -839,7 +839,7 @@
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:ServiceHybrid_short"/>
     <Numeric name="N" value="1"/>
@@ -852,7 +852,7 @@
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="21"/>
@@ -865,7 +865,7 @@
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:SensorModule_2"/>
     <Numeric name="N" value="24"/>
@@ -878,7 +878,7 @@
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="4"/>
@@ -891,7 +891,7 @@
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="24"/>
@@ -904,7 +904,7 @@
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:SensorModule_2"/>
     <Numeric name="N" value="24"/>
@@ -917,7 +917,7 @@
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="4"/>
@@ -930,7 +930,7 @@
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="24"/>
@@ -943,7 +943,7 @@
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:SensorModule_2"/>
     <Numeric name="N" value="24"/>
@@ -956,7 +956,7 @@
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-   <Algorithm name="global:DDMTDLinear">  <!-- y-pos of 1st SH module moved from 13.1925 to 16.2 to avoid module extrusion -->
+   <Algorithm name="mtd:DDMTDLinear">  <!-- y-pos of 1st SH module moved from 13.1925 to 16.2 to avoid module extrusion -->
     <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="4"/>
@@ -969,7 +969,7 @@
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="21"/>
@@ -982,7 +982,7 @@
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:SensorModule_2"/>
     <Numeric name="N" value="18"/>
@@ -995,7 +995,7 @@
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="3"/>
@@ -1008,7 +1008,7 @@
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="18"/>
@@ -1021,7 +1021,7 @@
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:SensorModule_2"/>
     <Numeric name="N" value="18"/>
@@ -1034,7 +1034,7 @@
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="3"/>
@@ -1047,7 +1047,7 @@
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="18"/>
@@ -1060,7 +1060,7 @@
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:SensorModule_2"/>
     <Numeric name="N" value="18"/>
@@ -1073,7 +1073,7 @@
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="3"/>
@@ -1086,7 +1086,7 @@
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front"/>
     <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="18"/>
@@ -1102,7 +1102,7 @@
  
 
     <!-- Disk1 Back face -->
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back"/>
 	<String name="ChildName" value="etl:ServiceHybrid"/>
 	<Numeric name="N" value="1"/>
@@ -1115,7 +1115,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back"/>
 	<String name="ChildName" value="etl:SensorModule_r"/>
 	<Numeric name="N" value="6"/>
@@ -1128,7 +1128,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back"/>
 	<String name="ChildName" value="etl:SensorModule_r_2"/>
 	<Numeric name="N" value="10"/>
@@ -1141,7 +1141,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back"/>
 	<String name="ChildName" value="etl:ServiceHybrid"/>
 	<Numeric name="N" value="2"/>
@@ -1154,7 +1154,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back"/>
 	<String name="ChildName" value="etl:SensorModule_r"/>
 	<Numeric name="N" value="12"/>
@@ -1167,7 +1167,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back"/>
 	<String name="ChildName" value="etl:SensorModule_r_2"/>
 	<Numeric name="N" value="14"/>
@@ -1180,7 +1180,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back"/>
 	<String name="ChildName" value="etl:ServiceHybrid"/>
 	<Numeric name="N" value="2"/>
@@ -1193,7 +1193,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">  <!-- 1st placement of a short service hybrid -->
+  <Algorithm name="mtd:DDMTDLinear">  <!-- 1st placement of a short service hybrid -->
 	<rParent name="etl:DiskQuarter_Back"/>
 	<String name="ChildName" value="etl:ServiceHybrid_short"/>
 	<Numeric name="N" value="1"/>
@@ -1206,7 +1206,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back"/>
 	<String name="ChildName" value="etl:SensorModule_r"/>
 	<Numeric name="N" value="15"/>
@@ -1219,7 +1219,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back"/>
 	<String name="ChildName" value="etl:SensorModule_r_2"/>
 	<Numeric name="N" value="17"/>
@@ -1232,7 +1232,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">  <!-- y start pos 13.0925 instead of 13.1925 to avoid extrusion -->
+  <Algorithm name="mtd:DDMTDLinear">  <!-- y start pos 13.0925 instead of 13.1925 to avoid extrusion -->
     <rParent name="etl:DiskQuarter_Back"/>
 	<String name="ChildName" value="etl:ServiceHybrid"/>
 	<Numeric name="N" value="2"/>  <!-- "3" -->
@@ -1245,7 +1245,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back"/>
 	<String name="ChildName" value="etl:SensorModule_r"/>
 	<Numeric name="N" value="18"/>
@@ -1258,7 +1258,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back"/>
 	<String name="ChildName" value="etl:SensorModule_r_2"/>
 	<Numeric name="N" value="18"/>
@@ -1271,7 +1271,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back"/>
 	<String name="ChildName" value="etl:ServiceHybrid"/>
 	<Numeric name="N" value="3"/>
@@ -1284,7 +1284,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back"/>
 	<String name="ChildName" value="etl:SensorModule_r"/>
 	<Numeric name="N" value="18"/>
@@ -1297,7 +1297,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back"/>
 	<String name="ChildName" value="etl:SensorModule_r_2"/>
 	<Numeric name="N" value="21"/>
@@ -1310,7 +1310,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back"/>
 	<String name="ChildName" value="etl:ServiceHybrid"/>
 	<Numeric name="N" value="3"/>
@@ -1323,7 +1323,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back"/>
 	<String name="ChildName" value="etl:ServiceHybrid_short"/>
 	<Numeric name="N" value="1"/>
@@ -1336,7 +1336,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back"/>
 	<String name="ChildName" value="etl:SensorModule_r"/>
 	<Numeric name="N" value="21"/>
@@ -1349,7 +1349,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back"/>
 	<String name="ChildName" value="etl:SensorModule_r_2"/>
 	<Numeric name="N" value="21"/>
@@ -1362,7 +1362,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back"/>
 	<String name="ChildName" value="etl:ServiceHybrid"/>
 	<Numeric name="N" value="3"/>
@@ -1375,7 +1375,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back"/>
 	<String name="ChildName" value="etl:ServiceHybrid_short"/>
 	<Numeric name="N" value="1"/>
@@ -1388,7 +1388,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back"/>
 	<String name="ChildName" value="etl:SensorModule_r"/>
 	<Numeric name="N" value="21"/>
@@ -1401,7 +1401,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back"/>
 	<String name="ChildName" value="etl:SensorModule_r_2"/>
 	<Numeric name="N" value="23"/>
@@ -1414,7 +1414,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back"/>
 	<String name="ChildName" value="etl:ServiceHybrid"/>
 	<Numeric name="N" value="4"/>
@@ -1427,7 +1427,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back"/>
 	<String name="ChildName" value="etl:SensorModule_r"/>
 	<Numeric name="N" value="24"/>
@@ -1440,7 +1440,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back"/>
 	<String name="ChildName" value="etl:SensorModule_r_2"/>
 	<Numeric name="N" value="24"/>
@@ -1453,7 +1453,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back"/>
 	<String name="ChildName" value="etl:ServiceHybrid"/>
 	<Numeric name="N" value="4"/>
@@ -1466,7 +1466,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back"/>
 	<String name="ChildName" value="etl:SensorModule_r"/>
 	<Numeric name="N" value="24"/>
@@ -1479,7 +1479,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back"/>
 	<String name="ChildName" value="etl:SensorModule_r_2"/>
 	<Numeric name="N" value="24"/>
@@ -1492,7 +1492,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back"/>
 	<String name="ChildName" value="etl:ServiceHybrid"/>
 	<Numeric name="N" value="4"/>
@@ -1505,7 +1505,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back"/>
 	<String name="ChildName" value="etl:SensorModule_r"/>
 	<Numeric name="N" value="24"/>
@@ -1518,7 +1518,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back"/>
 	<String name="ChildName" value="etl:SensorModule_r_2"/>
 	<Numeric name="N" value="20"/>
@@ -1531,7 +1531,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back"/>
 	<String name="ChildName" value="etl:ServiceHybrid"/>
 	<Numeric name="N" value="3"/>
@@ -1544,7 +1544,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back"/>
 	<String name="ChildName" value="etl:ServiceHybrid_short"/>
 	<Numeric name="N" value="1"/>
@@ -1557,7 +1557,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back"/>
 	<String name="ChildName" value="etl:SensorModule_r"/>
 	<Numeric name="N" value="20"/>
@@ -1570,7 +1570,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back"/>
 	<String name="ChildName" value="etl:SensorModule_r_2"/>
 	<Numeric name="N" value="20"/>
@@ -1583,7 +1583,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-   <Algorithm name="global:DDMTDLinear">
+   <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back"/>
 	<String name="ChildName" value="etl:ServiceHybrid"/>
 	<Numeric name="N" value="3"/>
@@ -1596,7 +1596,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <!--<Algorithm name="global:DDMTDLinear">
+  <!--<Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back"/>
 	<String name="ChildName" value="etl:ServiceHybrid_short"/>
 	<Numeric name="N" value="1"/>
@@ -1609,7 +1609,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm> -->
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back"/>
 	<String name="ChildName" value="etl:SensorModule_r"/>
 	<Numeric name="N" value="19"/>   <!-- "20" -->
@@ -1622,7 +1622,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back"/>
 	<String name="ChildName" value="etl:SensorModule_r_2"/>
 	<Numeric name="N" value="18"/>
@@ -1635,7 +1635,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back"/>
 	<String name="ChildName" value="etl:ServiceHybrid"/>
 	<Numeric name="N" value="3"/>
@@ -1648,7 +1648,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back"/>
 	<String name="ChildName" value="etl:SensorModule_r"/>
 	<Numeric name="N" value="17"/>
@@ -1661,7 +1661,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back"/>
 	<String name="ChildName" value="etl:SensorModule_r_2"/>
 	<Numeric name="N" value="18"/>
@@ -1674,7 +1674,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back"/>
 	<String name="ChildName" value="etl:ServiceHybrid"/>
 	<Numeric name="N" value="3"/>
@@ -1690,7 +1690,7 @@
   
 
   	<!-- Disk2 Front face -->
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Front_2"/>
 	<String name="ChildName" value="etl:SensorModule_2"/>
 	<Numeric name="N" value="8"/>
@@ -1703,7 +1703,7 @@
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front_2"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="1"/>
@@ -1716,7 +1716,7 @@
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front_2"/>
     <String name="ChildName" value="etl:ServiceHybrid_short"/>
     <Numeric name="N" value="1"/>
@@ -1729,7 +1729,7 @@
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front_2"/>
     <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="9"/>
@@ -1742,7 +1742,7 @@
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front_2"/>
     <String name="ChildName" value="etl:SensorModule_2"/>
     <Numeric name="N" value="12"/>
@@ -1755,7 +1755,7 @@
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front_2"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="2"/>
@@ -1768,7 +1768,7 @@
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front_2"/>
     <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="12"/>
@@ -1781,7 +1781,7 @@
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front_2"/>
     <String name="ChildName" value="etl:SensorModule_2"/>
     <Numeric name="N" value="15"/>
@@ -1794,7 +1794,7 @@
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front_2"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="2"/>
@@ -1807,7 +1807,7 @@
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front_2"/>
     <String name="ChildName" value="etl:ServiceHybrid_short"/>
     <Numeric name="N" value="1"/>
@@ -1820,7 +1820,7 @@
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front_2"/>
     <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="15"/>
@@ -1833,7 +1833,7 @@
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front_2"/>
     <String name="ChildName" value="etl:SensorModule_2"/>
     <Numeric name="N" value="18"/>
@@ -1846,7 +1846,7 @@
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front_2"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="3"/>
@@ -1859,7 +1859,7 @@
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front_2"/>
     <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="18"/>
@@ -1872,7 +1872,7 @@
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front_2"/>
     <String name="ChildName" value="etl:SensorModule_2"/>
     <Numeric name="N" value="20"/>
@@ -1885,7 +1885,7 @@
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear"> <!-- y start changed from 13.1925 to 13.0925 to avoid extrusion -->
+  <Algorithm name="mtd:DDMTDLinear"> <!-- y start changed from 13.1925 to 13.0925 to avoid extrusion -->
     <rParent name="etl:DiskQuarter_Front_2"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="3"/>
@@ -1898,7 +1898,7 @@
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <!-- <Algorithm name="global:DDMTDLinear"> 
+  <!-- <Algorithm name="mtd:DDMTDLinear"> 
     <rParent name="etl:DiskQuarter_Front_2"/>
     <String name="ChildName" value="etl:ServiceHybrid_short"/>
     <Numeric name="N" value="1"/>
@@ -1911,7 +1911,7 @@
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm> -->
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front_2"/>
     <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="21"/>
@@ -1924,7 +1924,7 @@
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front_2"/>
     <String name="ChildName" value="etl:SensorModule_2"/>
     <Numeric name="N" value="21"/>
@@ -1937,7 +1937,7 @@
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front_2"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="3"/>
@@ -1950,7 +1950,7 @@
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front_2"/>
     <String name="ChildName" value="etl:ServiceHybrid_short"/>
     <Numeric name="N" value="1"/>
@@ -1963,7 +1963,7 @@
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front_2"/>
     <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="21"/>
@@ -1976,7 +1976,7 @@
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front_2"/>
     <String name="ChildName" value="etl:SensorModule_2"/>
     <Numeric name="N" value="21"/>
@@ -1989,7 +1989,7 @@
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front_2"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="3"/>
@@ -2002,7 +2002,7 @@
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front_2"/>
     <String name="ChildName" value="etl:ServiceHybrid_short"/>
     <Numeric name="N" value="1"/>
@@ -2015,7 +2015,7 @@
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front_2"/>
     <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="21"/>
@@ -2028,7 +2028,7 @@
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front_2"/>
     <String name="ChildName" value="etl:SensorModule_2"/>
     <Numeric name="N" value="24"/>
@@ -2041,7 +2041,7 @@
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front_2"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="4"/>
@@ -2054,7 +2054,7 @@
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front_2"/>
     <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="24"/>
@@ -2067,7 +2067,7 @@
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front_2"/>
     <String name="ChildName" value="etl:SensorModule_2"/>
     <Numeric name="N" value="24"/>
@@ -2080,7 +2080,7 @@
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front_2"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="4"/>
@@ -2093,7 +2093,7 @@
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front_2"/>
     <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="24"/>
@@ -2106,7 +2106,7 @@
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front_2"/>
     <String name="ChildName" value="etl:SensorModule_2"/>
     <Numeric name="N" value="24"/>
@@ -2119,7 +2119,7 @@
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-   <Algorithm name="global:DDMTDLinear"> <!-- y-pos of 1st SH module moved from 13.1925 to 16 to avoid module extrusion -->
+   <Algorithm name="mtd:DDMTDLinear"> <!-- y-pos of 1st SH module moved from 13.1925 to 16 to avoid module extrusion -->
     <rParent name="etl:DiskQuarter_Front_2"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="4"/>
@@ -2132,7 +2132,7 @@
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front_2"/>
     <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="21"/>
@@ -2145,7 +2145,7 @@
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front_2"/>
     <String name="ChildName" value="etl:SensorModule_2"/>
     <Numeric name="N" value="18"/>
@@ -2158,7 +2158,7 @@
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front_2"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="3"/>
@@ -2171,7 +2171,7 @@
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front_2"/>
     <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="18"/>
@@ -2184,7 +2184,7 @@
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front_2"/>
     <String name="ChildName" value="etl:SensorModule_2"/>
     <Numeric name="N" value="18"/>
@@ -2197,7 +2197,7 @@
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front_2"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="3"/>
@@ -2210,7 +2210,7 @@
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front_2"/>
     <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="18"/>
@@ -2223,7 +2223,7 @@
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front_2"/>
     <String name="ChildName" value="etl:SensorModule_2"/>
     <Numeric name="N" value="18"/>
@@ -2236,7 +2236,7 @@
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front_2"/>
     <String name="ChildName" value="etl:ServiceHybrid"/>
     <Numeric name="N" value="3"/>
@@ -2249,7 +2249,7 @@
     <Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
     <rParent name="etl:DiskQuarter_Front_2"/>
     <String name="ChildName" value="etl:SensorModule"/>
     <Numeric name="N" value="18"/>
@@ -2265,7 +2265,7 @@
 
 
     <!-- Disk2 Back face -->
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back_2"/>
 	<String name="ChildName" value="etl:ServiceHybrid"/>
 	<Numeric name="N" value="1"/>
@@ -2278,7 +2278,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back_2"/>
 	<String name="ChildName" value="etl:SensorModule_r"/>
 	<Numeric name="N" value="6"/>
@@ -2291,7 +2291,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back_2"/>
 	<String name="ChildName" value="etl:SensorModule_r_2"/>
 	<Numeric name="N" value="10"/>
@@ -2304,7 +2304,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back_2"/>
 	<String name="ChildName" value="etl:ServiceHybrid"/>
 	<Numeric name="N" value="2"/>
@@ -2317,7 +2317,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back_2"/>
 	<String name="ChildName" value="etl:SensorModule_r"/>
 	<Numeric name="N" value="12"/>
@@ -2330,7 +2330,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back_2"/>
 	<String name="ChildName" value="etl:SensorModule_r_2"/>
 	<Numeric name="N" value="14"/>
@@ -2343,7 +2343,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back_2"/>
 	<String name="ChildName" value="etl:ServiceHybrid"/>
 	<Numeric name="N" value="2"/>
@@ -2356,7 +2356,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">  <!-- 1st placement of a short service hybrid -->
+  <Algorithm name="mtd:DDMTDLinear">  <!-- 1st placement of a short service hybrid -->
 	<rParent name="etl:DiskQuarter_Back_2"/>
 	<String name="ChildName" value="etl:ServiceHybrid_short"/>
 	<Numeric name="N" value="1"/>
@@ -2369,7 +2369,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back_2"/>
 	<String name="ChildName" value="etl:SensorModule_r"/>
 	<Numeric name="N" value="15"/>
@@ -2382,7 +2382,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back_2"/>
 	<String name="ChildName" value="etl:SensorModule_r_2"/>
 	<Numeric name="N" value="17"/>
@@ -2395,7 +2395,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear"> <!-- y start pos 13.0925 instead of 13.1925 to avoid extrusion -->
+  <Algorithm name="mtd:DDMTDLinear"> <!-- y start pos 13.0925 instead of 13.1925 to avoid extrusion -->
     <rParent name="etl:DiskQuarter_Back_2"/>
 	<String name="ChildName" value="etl:ServiceHybrid"/>
 	<Numeric name="N" value="2"/>  <!-- "3" -->
@@ -2408,7 +2408,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back_2"/>
 	<String name="ChildName" value="etl:SensorModule_r"/>
 	<Numeric name="N" value="18"/>
@@ -2421,7 +2421,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back_2"/>
 	<String name="ChildName" value="etl:SensorModule_r_2"/>
 	<Numeric name="N" value="18"/>
@@ -2434,7 +2434,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back_2"/>
 	<String name="ChildName" value="etl:ServiceHybrid"/>
 	<Numeric name="N" value="3"/>
@@ -2447,7 +2447,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back_2"/>
 	<String name="ChildName" value="etl:SensorModule_r"/>
 	<Numeric name="N" value="18"/>
@@ -2460,7 +2460,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back_2"/>
 	<String name="ChildName" value="etl:SensorModule_r_2"/>
 	<Numeric name="N" value="21"/>
@@ -2473,7 +2473,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back_2"/>
 	<String name="ChildName" value="etl:ServiceHybrid"/>
 	<Numeric name="N" value="3"/>
@@ -2486,7 +2486,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back_2"/>
 	<String name="ChildName" value="etl:ServiceHybrid_short"/>
 	<Numeric name="N" value="1"/>
@@ -2499,7 +2499,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back_2"/>
 	<String name="ChildName" value="etl:SensorModule_r"/>
 	<Numeric name="N" value="21"/>
@@ -2512,7 +2512,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back_2"/>
 	<String name="ChildName" value="etl:SensorModule_r_2"/>
 	<Numeric name="N" value="21"/>
@@ -2525,7 +2525,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back_2"/>
 	<String name="ChildName" value="etl:ServiceHybrid"/>
 	<Numeric name="N" value="3"/>
@@ -2538,7 +2538,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back_2"/>
 	<String name="ChildName" value="etl:ServiceHybrid_short"/>
 	<Numeric name="N" value="1"/>
@@ -2551,7 +2551,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back_2"/>
 	<String name="ChildName" value="etl:SensorModule_r"/>
 	<Numeric name="N" value="21"/>
@@ -2564,7 +2564,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back_2"/>
 	<String name="ChildName" value="etl:SensorModule_r_2"/>
 	<Numeric name="N" value="23"/>
@@ -2577,7 +2577,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back_2"/>
 	<String name="ChildName" value="etl:ServiceHybrid"/>
 	<Numeric name="N" value="4"/>
@@ -2590,7 +2590,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back_2"/>
 	<String name="ChildName" value="etl:SensorModule_r"/>
 	<Numeric name="N" value="24"/>
@@ -2603,7 +2603,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back_2"/>
 	<String name="ChildName" value="etl:SensorModule_r_2"/>
 	<Numeric name="N" value="24"/>
@@ -2616,7 +2616,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back_2"/>
 	<String name="ChildName" value="etl:ServiceHybrid"/>
 	<Numeric name="N" value="4"/>
@@ -2629,7 +2629,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back_2"/>
 	<String name="ChildName" value="etl:SensorModule_r"/>
 	<Numeric name="N" value="24"/>
@@ -2642,7 +2642,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back_2"/>
 	<String name="ChildName" value="etl:SensorModule_r_2"/>
 	<Numeric name="N" value="24"/>
@@ -2655,7 +2655,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back_2"/>
 	<String name="ChildName" value="etl:ServiceHybrid"/>
 	<Numeric name="N" value="4"/>
@@ -2668,7 +2668,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back_2"/>
 	<String name="ChildName" value="etl:SensorModule_r"/>
 	<Numeric name="N" value="24"/>
@@ -2681,7 +2681,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back_2"/>
 	<String name="ChildName" value="etl:SensorModule_r_2"/>
 	<Numeric name="N" value="20"/>
@@ -2694,7 +2694,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back_2"/>
 	<String name="ChildName" value="etl:ServiceHybrid"/>
 	<Numeric name="N" value="3"/>
@@ -2707,7 +2707,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back_2"/>
 	<String name="ChildName" value="etl:ServiceHybrid_short"/>
 	<Numeric name="N" value="1"/>
@@ -2720,7 +2720,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back_2"/>
 	<String name="ChildName" value="etl:SensorModule_r"/>
 	<Numeric name="N" value="20"/>
@@ -2733,7 +2733,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back_2"/>
 	<String name="ChildName" value="etl:SensorModule_r_2"/>
 	<Numeric name="N" value="20"/>
@@ -2746,7 +2746,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-   <Algorithm name="global:DDMTDLinear">
+   <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back_2"/>
 	<String name="ChildName" value="etl:ServiceHybrid"/>
 	<Numeric name="N" value="3"/>
@@ -2759,7 +2759,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <!-- <Algorithm name="global:DDMTDLinear">
+  <!-- <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back_2"/>
 	<String name="ChildName" value="etl:ServiceHybrid_short"/>
 	<Numeric name="N" value="1"/>
@@ -2772,7 +2772,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm> -->
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back_2"/>
 	<String name="ChildName" value="etl:SensorModule_r"/>
 	<Numeric name="N" value="19"/>  <!-- "20" --> 
@@ -2785,7 +2785,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back_2"/>
 	<String name="ChildName" value="etl:SensorModule_r_2"/>
 	<Numeric name="N" value="18"/>
@@ -2798,7 +2798,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back_2"/>
 	<String name="ChildName" value="etl:ServiceHybrid"/>
 	<Numeric name="N" value="3"/>
@@ -2811,7 +2811,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back_2"/>
 	<String name="ChildName" value="etl:SensorModule_r"/>
 	<Numeric name="N" value="17"/>
@@ -2824,7 +2824,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back_2"/>
 	<String name="ChildName" value="etl:SensorModule_r_2"/>
 	<Numeric name="N" value="18"/>
@@ -2837,7 +2837,7 @@
 	<Numeric name="Theta_obj" value="90.*deg"/> 
 	<Numeric name="Phi_obj" value="0.*deg"/>
   </Algorithm>
-  <Algorithm name="global:DDMTDLinear">
+  <Algorithm name="mtd:DDMTDLinear">
 	<rParent name="etl:DiskQuarter_Back_2"/>
 	<String name="ChildName" value="etl:ServiceHybrid"/>
 	<Numeric name="N" value="3"/>
diff --git a/Geometry/MTDCommonData/plugins/DDMTDLinear.cc b/Geometry/MTDCommonData/plugins/DDMTDLinear.cc
index 37b1c03475a2b..ee8774745bf7e 100644
--- a/Geometry/MTDCommonData/plugins/DDMTDLinear.cc
+++ b/Geometry/MTDCommonData/plugins/DDMTDLinear.cc
@@ -113,4 +113,4 @@ void DDMTDLinear::execute(DDCompactView& cpv) {
   }
 }
 
-DEFINE_EDM_PLUGIN(DDAlgorithmFactory, DDMTDLinear, "global:DDMTDLinear");
+DEFINE_EDM_PLUGIN(DDAlgorithmFactory, DDMTDLinear, "mtd:DDMTDLinear");

From c3dae8cb9753c54c7aeae5d72cf3b2aba8d3a9ac Mon Sep 17 00:00:00 2001
From: Fabio Cossutti <fabio.cossutti@ts.infn.it>
Date: Mon, 27 Jan 2020 13:23:34 +0100
Subject: [PATCH 15/15] Clean mtdMaterial.xml for unused elementary materials
 inherited by tkLayout

---
 .../data/mtdMaterial/v2/mtdMaterial.xml       | 139 ------------------
 1 file changed, 139 deletions(-)

diff --git a/Geometry/MTDCommonData/data/mtdMaterial/v2/mtdMaterial.xml b/Geometry/MTDCommonData/data/mtdMaterial/v2/mtdMaterial.xml
index a1d9959960f5f..29416f4aae673 100644
--- a/Geometry/MTDCommonData/data/mtdMaterial/v2/mtdMaterial.xml
+++ b/Geometry/MTDCommonData/data/mtdMaterial/v2/mtdMaterial.xml
@@ -2,148 +2,9 @@
 <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">
 
   <MaterialSection label="mtdMaterial.xml">
-    <ElementaryMaterial name="mtdtkLayout_Li" symbol="Li" atomicNumber="3" atomicWeight="6.8678*g/mole" density="0.534*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Be" symbol="Be" atomicNumber="4" atomicWeight="9.06332*g/mole" density="1.85*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_B" symbol="B" atomicNumber="5" atomicWeight="11.0826*g/mole" density="2.37*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_C" symbol="C" atomicNumber="6" atomicWeight="12.3025*g/mole" density="2*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Na" symbol="Na" atomicNumber="11" atomicWeight="23.2593*g/mole" density="0.971*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Mg" symbol="Mg" atomicNumber="12" atomicWeight="24.5327*g/mole" density="1.74*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Al" symbol="Al" atomicNumber="13" atomicWeight="27.1837*g/mole" density="2.7*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Al_MV" symbol="Al_MV" atomicNumber="13" atomicWeight="27.1837*g/mole" density="2.7*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Al_HV" symbol="Al_HV" atomicNumber="13" atomicWeight="27.1837*g/mole" density="2.7*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Al_twp" symbol="Al_twp" atomicNumber="13" atomicWeight="27.1837*g/mole" density="2.7*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_SenSi" symbol="SenSi" atomicNumber="14" atomicWeight="28.2688*g/mole" density="2.33*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Si" symbol="Si" atomicNumber="14" atomicWeight="28.2688*g/mole" density="2.33*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_P" symbol="P" atomicNumber="15" atomicWeight="31.1175*g/mole" density="2.2*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_S" symbol="S" atomicNumber="16" atomicWeight="32.1629*g/mole" density="2*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_K" symbol="K" atomicNumber="19" atomicWeight="39.1139*g/mole" density="0.862*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Ca" symbol="Ca" atomicNumber="20" atomicWeight="40.0474*g/mole" density="1.55*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Sc" symbol="Sc" atomicNumber="21" atomicWeight="44.8867*g/mole" density="2.99*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Ti" symbol="Ti" atomicNumber="22" atomicWeight="47.747*g/mole" density="4.54*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Ti_L1" symbol="Ti_L1" atomicNumber="22" atomicWeight="47.747*g/mole" density="4.54*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Ti_L2" symbol="Ti_L2" atomicNumber="22" atomicWeight="47.747*g/mole" density="4.54*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Ti_L3" symbol="Ti_L3" atomicNumber="22" atomicWeight="47.747*g/mole" density="4.54*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Ti_L4" symbol="Ti_L4" atomicNumber="22" atomicWeight="47.747*g/mole" density="4.54*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_V" symbol="V" atomicNumber="23" atomicWeight="50.771*g/mole" density="6.11*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Cr" symbol="Cr" atomicNumber="24" atomicWeight="51.8161*g/mole" density="7.18*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Mn" symbol="Mn" atomicNumber="25" atomicWeight="54.7227*g/mole" density="7.44*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Fe" symbol="Fe" atomicNumber="26" atomicWeight="55.6502*g/mole" density="7.87*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Co" symbol="Co" atomicNumber="27" atomicWeight="58.6913*g/mole" density="8.9*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Ni" symbol="Ni" atomicNumber="28" atomicWeight="58.4818*g/mole" density="8.9*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Cu" symbol="Cu" atomicNumber="29" atomicWeight="63.2581*g/mole" density="8.96*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Cu_TWP_1+1_LS" symbol="Cu_TWP_1+1_LS" atomicNumber="29" atomicWeight="63.2581*g/mole" density="8.96*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Cu_TWP_1+1_LS_div4" symbol="Cu_TWP_1+1_LS_div4" atomicNumber="29" atomicWeight="63.2581*g/mole" density="8.96*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Cu_TWP_1+1_HS" symbol="Cu_TWP_1+1_HS" atomicNumber="29" atomicWeight="63.2581*g/mole" density="8.96*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Cu_TWP_1+1_HS_div4" symbol="Cu_TWP_1+1_HS_div4" atomicNumber="29" atomicWeight="63.2581*g/mole" density="8.96*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Cu_TWP_2+1_HS" symbol="Cu_TWP_2+1_HS" atomicNumber="29" atomicWeight="63.2581*g/mole" density="8.96*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Cu_TWP_3+1_HS" symbol="Cu_TWP_3+1_HS" atomicNumber="29" atomicWeight="63.2581*g/mole" density="8.96*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Cu_TWP_6+1_HS" symbol="Cu_TWP_6+1_HS" atomicNumber="29" atomicWeight="63.2581*g/mole" density="8.96*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Cu_HV" symbol="Cu_HV" atomicNumber="29" atomicWeight="63.2581*g/mole" density="8.96*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Cu_MV" symbol="Cu_MV" atomicNumber="29" atomicWeight="63.2581*g/mole" density="8.96*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Cu_twp" symbol="Cu_twp" atomicNumber="29" atomicWeight="63.2581*g/mole" density="8.96*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Zn" symbol="Zn" atomicNumber="30" atomicWeight="65.0982*g/mole" density="7.13*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Ga" symbol="Ga" atomicNumber="31" atomicWeight="69.3766*g/mole" density="5.9*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Ge" symbol="Ge" atomicNumber="32" atomicWeight="72.2862*g/mole" density="5.32*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_As" symbol="As" atomicNumber="33" atomicWeight="74.5952*g/mole" density="5.73*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Se" symbol="Se" atomicNumber="34" atomicWeight="78.5982*g/mole" density="4.5*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Rb" symbol="Rb" atomicNumber="37" atomicWeight="85.0738*g/mole" density="1.53*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Sr" symbol="Sr" atomicNumber="38" atomicWeight="87.215*g/mole" density="2.54*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Y" symbol="Y" atomicNumber="39" atomicWeight="88.5185*g/mole" density="4.47*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Zr" symbol="Zr" atomicNumber="40" atomicWeight="90.8471*g/mole" density="6.51*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Nb" symbol="Nb" atomicNumber="41" atomicWeight="92.5*g/mole" density="8.57*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Mo" symbol="Mo" atomicNumber="42" atomicWeight="95.5581*g/mole" density="10.2*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Tc" symbol="Tc" atomicNumber="43" atomicWeight="97.4763*g/mole" density="11.5*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Ru" symbol="Ru" atomicNumber="44" atomicWeight="100.651*g/mole" density="12.4*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Rh" symbol="Rh" atomicNumber="45" atomicWeight="102.542*g/mole" density="12.4*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Pd" symbol="Pd" atomicNumber="46" atomicWeight="106.002*g/mole" density="12*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Ag" symbol="Ag" atomicNumber="47" atomicWeight="107.496*g/mole" density="10.5*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Cd" symbol="Cd" atomicNumber="48" atomicWeight="112.076*g/mole" density="8.65*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_In" symbol="In" atomicNumber="49" atomicWeight="114.461*g/mole" density="7.31*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Sn" symbol="Sn" atomicNumber="50" atomicWeight="118.411*g/mole" density="7.31*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Sb" symbol="Sb" atomicNumber="51" atomicWeight="121.471*g/mole" density="6.69*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_I" symbol="I" atomicNumber="53" atomicWeight="126.652*g/mole" density="4.93*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Te" symbol="Te" atomicNumber="52" atomicWeight="127.391*g/mole" density="6.24*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Cs" symbol="Cs" atomicNumber="55" atomicWeight="132.724*g/mole" density="1.87*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Ba" symbol="Ba" atomicNumber="56" atomicWeight="137.15*g/mole" density="3.5*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_La" symbol="La" atomicNumber="57" atomicWeight="138.777*g/mole" density="6.15*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Ce" symbol="Ce" atomicNumber="58" atomicWeight="139.951*g/mole" density="6.66*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Pr" symbol="Pr" atomicNumber="59" atomicWeight="140.79*g/mole" density="6.71*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Nd" symbol="Nd" atomicNumber="60" atomicWeight="144.165*g/mole" density="6.9*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Pm" symbol="Pm" atomicNumber="61" atomicWeight="144.751*g/mole" density="7.22*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Sm" symbol="Sm" atomicNumber="62" atomicWeight="150.251*g/mole" density="7.46*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Eu" symbol="Eu" atomicNumber="63" atomicWeight="151.927*g/mole" density="5.24*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Gd" symbol="Gd" atomicNumber="64" atomicWeight="157.198*g/mole" density="7.9*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Tb" symbol="Tb" atomicNumber="65" atomicWeight="158.963*g/mole" density="8.23*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Dy" symbol="Dy" atomicNumber="66" atomicWeight="162.601*g/mole" density="8.55*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Ho" symbol="Ho" atomicNumber="67" atomicWeight="165.022*g/mole" density="8.8*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Er" symbol="Er" atomicNumber="68" atomicWeight="167.312*g/mole" density="9.07*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Tm" symbol="Tm" atomicNumber="69" atomicWeight="169.05*g/mole" density="9.32*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Yb" symbol="Yb" atomicNumber="70" atomicWeight="173.254*g/mole" density="6.73*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Lu" symbol="Lu" atomicNumber="71" atomicWeight="175.189*g/mole" density="9.84*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Hf" symbol="Hf" atomicNumber="72" atomicWeight="178.783*g/mole" density="13.3*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Ta" symbol="Ta" atomicNumber="73" atomicWeight="181.381*g/mole" density="16.7*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_W" symbol="W" atomicNumber="74" atomicWeight="184.135*g/mole" density="19.3*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Re" symbol="Re" atomicNumber="75" atomicWeight="186.687*g/mole" density="21*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Os" symbol="Os" atomicNumber="76" atomicWeight="190.771*g/mole" density="22.6*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Ir" symbol="Ir" atomicNumber="77" atomicWeight="192.697*g/mole" density="22.4*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Pt" symbol="Pt" atomicNumber="78" atomicWeight="195.583*g/mole" density="21.5*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Au" symbol="Au" atomicNumber="79" atomicWeight="197.524*g/mole" density="19.3*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Hg" symbol="Hg" atomicNumber="81" atomicWeight="204.241*g/mole" density="13.5*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Tl" symbol="Tl" atomicNumber="82" atomicWeight="208.071*g/mole" density="11.7*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Pb" symbol="Pb" atomicNumber="83" atomicWeight="210.921*g/mole" density="11.4*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Bi" symbol="Bi" atomicNumber="84" atomicWeight="212.741*g/mole" density="9.75*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Po" symbol="Po" atomicNumber="84" atomicWeight="209.8*g/mole" density="9.32*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_C6F14" symbol="C6F14" atomicNumber="8" atomicWeight="15.9086*g/mole" density="1.88*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_CF" symbol="CF" atomicNumber="5" atomicWeight="8.68516*g/mole" density="1.69*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Pyroid" symbol="Pyroid" atomicNumber="5" atomicWeight="8.68516*g/mole" density="2.22*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_PGS" symbol="PGS" atomicNumber="5" atomicWeight="8.68516*g/mole" density="0.85*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_CO2" symbol="CO2" atomicNumber="8" atomicWeight="16.2692*g/mole" density="1*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_CO2_L1" symbol="CO2_L1" atomicNumber="8" atomicWeight="16.2692*g/mole" density="1*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_CO2_L2" symbol="CO2_L2" atomicNumber="8" atomicWeight="16.2692*g/mole" density="1*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_CO2_L3" symbol="CO2_L3" atomicNumber="8" atomicWeight="16.2692*g/mole" density="1*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_CO2_L4" symbol="CO2_L4" atomicNumber="8" atomicWeight="16.2692*g/mole" density="1*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_G10" symbol="G10" atomicNumber="8" atomicWeight="16.7615*g/mole" density="1.9*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Gten" symbol="Gten" atomicNumber="8" atomicWeight="16.7615*g/mole" density="1.9*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_PE" symbol="PE" atomicNumber="4" atomicWeight="5.979*g/mole" density="0.95*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_PE_twp" symbol="PE_twp" atomicNumber="4" atomicWeight="5.979*g/mole" density="0.95*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Steel" symbol="Steel" atomicNumber="28" atomicWeight="58.335*g/mole" density="7.8*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Silicone" symbol="Silicone" atomicNumber="8" atomicWeight="14.4647*g/mole" density="74.15*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Al2O3" symbol="Al2O3" atomicNumber="10" atomicWeight="19.8836*g/mole" density="3.965*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_BGA" symbol="BGA" atomicNumber="63" atomicWeight="158.433*g/mole" density="8.82*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_ConCon" symbol="ConCon" atomicNumber="18" atomicWeight="33.9466*g/mole" density="5.89*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Kapton" symbol="Kapton" atomicNumber="6" atomicWeight="11.8879*g/mole" density="1.42*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_2S-FEH-mix" symbol="2S-FEH-mix" atomicNumber="12" atomicWeight="20.4403*g/mole" density="1.83*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_WB-enc" symbol="WB-enc" atomicNumber="7" atomicWeight="13.5157*g/mole" density="1.5*g/cm3"/>
     <ElementaryMaterial name="mtdtkLayout_Epoxy" symbol="Epoxy" atomicNumber="7" atomicWeight="13.9368*g/mole" density="1.16*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Siliconeglue" symbol="Siliconeglue" atomicNumber="7" atomicWeight="13.5157*g/mole" density="1.5*g/cm3"/>
     <ElementaryMaterial name="mtdtkLayout_CFRP" symbol="CFRP" atomicNumber="6" atomicWeight="12.1475*g/mole" density="1.84*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Parylene" symbol="Parylene" atomicNumber="6" atomicWeight="11.8184*g/mole" density="1.3*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_2S-SEH-mix" symbol="2S-SEH-mix" atomicNumber="7" atomicWeight="12.6353*g/mole" density="1.22*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Al-CF" symbol="Al-CF" atomicNumber="9" atomicWeight="18.1096*g/mole" density="2.4*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_PS-FEH-mix" symbol="PS-FEH-mix" atomicNumber="9" atomicWeight="16.0276*g/mole" density="1.61*g/cm3"/>
     <ElementaryMaterial name="mtdtkLayout_PS-ROH-mix" symbol="PS-ROH-mix" atomicNumber="8" atomicWeight="15.1128*g/mole" density="1.54*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_PS-POH-mix" symbol="PS-POH-mix" atomicNumber="6" atomicWeight="10.3891*g/mole" density="0.99*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_SenLYSO" symbol="SenLYSO" atomicNumber="44" atomicWeight="89.6738*g/mole" density="7.4*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Sn95Ag5" symbol="Sn95Ag5" atomicNumber="50" atomicWeight="118.302*g/mole" density="7.5*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_TEDD_Steel" symbol="TEDD_Steel" atomicNumber="28" atomicWeight="58.335*g/mole" density="7.8*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_TEDD_Al" symbol="TEDD_Al" atomicNumber="13" atomicWeight="27.1837*g/mole" density="2.7*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_TEDD_CO2" symbol="TEDD_CO2" atomicNumber="8" atomicWeight="16.2692*g/mole" density="1*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_TEDD_Cu" symbol="TEDD_Cu" atomicNumber="29" atomicWeight="63.2581*g/mole" density="8.96*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_TEDD_PE" symbol="TEDD_PE" atomicNumber="4" atomicWeight="5.979*g/mole" density="0.95*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_FPIX_Steel" symbol="FPIX_Steel" atomicNumber="28" atomicWeight="58.335*g/mole" density="7.8*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_FPIX_Ti" symbol="FPIX_Ti" atomicNumber="22" atomicWeight="47.747*g/mole" density="4.54*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_FPIX_CO2" symbol="FPIX_CO2" atomicNumber="8" atomicWeight="16.2692*g/mole" density="1*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_FPIX_Al" symbol="FPIX_Al" atomicNumber="13" atomicWeight="27.1837*g/mole" density="2.7*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_FPIX_Al_HV" symbol="FPIX_Al_HV" atomicNumber="13" atomicWeight="27.1837*g/mole" density="2.7*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_FPIX_PE" symbol="FPIX_PE" atomicNumber="4" atomicWeight="5.979*g/mole" density="0.95*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_FPIX_Cu" symbol="FPIX_Cu" atomicNumber="29" atomicWeight="63.2581*g/mole" density="8.96*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Brass" symbol="Brass" atomicNumber="29" atomicWeight="62.9057*g/mole" density="8.7*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Acrylate" symbol="Acrylate" atomicNumber="6" atomicWeight="11.3976*g/mole" density="1.16*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Glass" symbol="Glass" atomicNumber="14" atomicWeight="28.2688*g/mole" density="2.33*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Airex" symbol="Airex" atomicNumber="6" atomicWeight="11.8147*g/mole" density="0.06*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Pix_Bumps" symbol="Pix_Bumps" atomicNumber="64" atomicWeight="155.311*g/mole" density="8.92*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Pix_Caps" symbol="Pix_Caps" atomicNumber="13" atomicWeight="25.164*g/mole" density="6.02*g/cm3"/>
-    <ElementaryMaterial name="mtdtkLayout_Kevlar" symbol="Kevlar" atomicNumber="6" atomicWeight="11.8879*g/mole" density="1.42*g/cm3"/>
     <CompositeMaterial name="mtdhybridcompositeBModule1Layer1PositiveZFSide" density="4.60957*g/cm3" method="mixture by weight">
       <MaterialFraction fraction="0.0408204">
         <rMaterial name="mtdMaterial:mtdtkLayout_CFRP"/>