diff --git a/Configuration/Geometry/python/GeometryExtended2023MuonReco_cff.py b/Configuration/Geometry/python/GeometryExtended2023MuonReco_cff.py
index a555b5f7d2f56..5520b8305c2e3 100644
--- a/Configuration/Geometry/python/GeometryExtended2023MuonReco_cff.py
+++ b/Configuration/Geometry/python/GeometryExtended2023MuonReco_cff.py
@@ -15,7 +15,8 @@
 #Muon
 from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *
 from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *
-from Geometry.GEMGeometryBuilder.gemGeometry_cfi import *
+from Geometry.GEMGeometry.gemGeometry_cfi import *
+from Geometry.GEMGeometry.me0Geometry_cfi import *
 
 #  Alignment
 from Geometry.TrackerGeometryBuilder.idealForDigiTrackerSLHCGeometry_cff import *
@@ -48,5 +49,5 @@
 from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import *
 from Geometry.EcalMapping.EcalMapping_cfi import *
 from Geometry.EcalMapping.EcalMappingRecord_cfi import *
-from Geometry.HcalCommonData.hcalNumberingInitialization_cfi import *
+from Geometry.HcalCommonData.hcalRecNumberingInitialization_cfi import *
 
diff --git a/Configuration/Geometry/python/GeometryExtendedPhase1Pixel10DReco_cff.py b/Configuration/Geometry/python/GeometryExtendedPhase1Pixel10DReco_cff.py
new file mode 100644
index 0000000000000..c713bfad2cb1d
--- /dev/null
+++ b/Configuration/Geometry/python/GeometryExtendedPhase1Pixel10DReco_cff.py
@@ -0,0 +1,33 @@
+import FWCore.ParameterSet.Config as cms
+
+# Ideal geometry, needed for transient ECAL alignement
+from Configuration.Geometry.GeometryExtendedPhase1Pixel10D_cff import *
+
+
+
+# Reconstruction geometry services
+#  Tracking Geometry
+#bah - well, this is not a cfi!
+from Geometry.CommonDetUnit.globalTrackingSLHCGeometry_cfi import *
+
+#Tracker
+from RecoTracker.GeometryESProducer.TrackerRecoGeometryESProducer_cfi import *
+from Geometry.TrackerNumberingBuilder.trackerTopologyConstants_cfi import *
+
+#Muon
+from Geometry.MuonNumbering.muonNumberingInitialization_cfi import *
+from RecoMuon.DetLayers.muonDetLayerGeometry_cfi import *
+
+#  Alignment
+from Geometry.TrackerGeometryBuilder.idealForDigiTrackerSLHCGeometry_cff import *
+from Geometry.CSCGeometryBuilder.idealForDigiCscGeometry_cff import *
+from Geometry.DTGeometryBuilder.idealForDigiDtGeometry_cff import *
+trackerSLHCGeometry.applyAlignment = cms.bool(False)
+
+#  Calorimeters
+from Geometry.CaloEventSetup.CaloTopology_cfi import *
+from Geometry.CaloEventSetup.CaloGeometry_cff import *
+from Geometry.CaloEventSetup.EcalTrigTowerConstituents_cfi import *
+from Geometry.EcalMapping.EcalMapping_cfi import *
+from Geometry.EcalMapping.EcalMappingRecord_cfi import *
+from Geometry.HcalCommonData.hcalRecNumberingInitialization_cfi import *
diff --git a/Configuration/Geometry/python/GeometryExtendedPhase1Pixel10D_cff.py b/Configuration/Geometry/python/GeometryExtendedPhase1Pixel10D_cff.py
new file mode 100644
index 0000000000000..b23ffb6bf7e08
--- /dev/null
+++ b/Configuration/Geometry/python/GeometryExtendedPhase1Pixel10D_cff.py
@@ -0,0 +1,9 @@
+import FWCore.ParameterSet.Config as cms
+
+#
+# Geometry master configuration
+#
+# Ideal geometry, needed for simulation
+from Geometry.CMSCommonData.cmsExtendedGeometryPhase1Pixel10DXML_cfi import *
+from Geometry.TrackerNumberingBuilder.trackerNumberingSLHCGeometry_cfi import *
+from Geometry.HcalCommonData.hcalSimNumberingInitialization_cfi import *
diff --git a/Configuration/PyReleaseValidation/python/relval_steps.py b/Configuration/PyReleaseValidation/python/relval_steps.py
index 609daf8c95742..58b7009f96ad0 100644
--- a/Configuration/PyReleaseValidation/python/relval_steps.py
+++ b/Configuration/PyReleaseValidation/python/relval_steps.py
@@ -1085,8 +1085,27 @@ def genvalid(fragment,d,suffix='all',fi=''):
 
 
 
-# you will need separate scenarios HERE for full and fast 
-upgradeKeys=['2017','2019','BE5D','2017Fast','BE5DFast','BE5DForwardFast','2019WithGEM','BE5DPixel10D','2017Aging','2019Aging','Extended2023','Extended2023HGCalMuon','Extended2023SHCal','Extended2023SHCal4Eta','Extended2023TTI','Extended2023Muon']
+# You will need separate scenarios HERE for full and fast. DON'T CHANGE THE ORDER, only
+# append new keys. Otherwise the numbering for the runTheMatrix tests will change.
+upgradeKeys=['2017',
+             '2019',
+             'BE5D',
+             '2017Fast',
+             'BE5DFast',
+             'BE5DForwardFast',
+             '2019WithGEM',
+             'BE5DPixel10D',
+             '2017Aging',
+             '2019Aging',
+             'Extended2023',
+             'Extended2023HGCalMuon',
+             'Extended2023SHCal',
+             'Extended2023SHCal4Eta',
+             'Extended2023TTI',
+             'Extended2023Muon',
+             'Extended2023CFCal',
+             'Extended2023CFCal4Eta'
+             ]
 upgradeGeoms={ '2017' : 'Extended2017',
                '2019' : 'Extended2019',
                '2019WithGEM' : 'Extended2019',
@@ -1102,7 +1121,9 @@ def genvalid(fragment,d,suffix='all',fi=''):
                'Extended2023SHCal' : 'Extended2023SHCal,Extended2023SHCalReco',
                'Extended2023SHCal4Eta' : 'Extended2023SHCal4Eta,Extended2023SHCalReco',
                'Extended2023TTI' : 'Extended2023TTI,Extended2023TTIReco',
-               'Extended2023Muon' : 'Extended2023Muon,Extended2023MuonReco'
+               'Extended2023Muon' : 'Extended2023Muon,Extended2023MuonReco',
+               'Extended2023CFCal' : 'Extended2023CFCal,Extended2023CFCalReco',
+               'Extended2023CFCal4Eta' : 'Extended2023CFCal4Eta,Extended2023CFCal4EtaReco'
                }
 upgradeGTs={ '2017' : 'auto:upgrade2017',
              '2019' : 'auto:upgrade2019',
@@ -1119,7 +1140,9 @@ def genvalid(fragment,d,suffix='all',fi=''):
              'Extended2023SHCal' : 'auto:upgradePLS3',
              'Extended2023SHCal4Eta' : 'auto:upgradePLS3',
              'Extended2023TTI' : 'auto:upgradePLS3',
-             'Extended2023Muon' : 'auto:upgradePLS3'
+             'Extended2023Muon' : 'auto:upgradePLS3',
+             'Extended2023CFCal' : 'auto:upgradePLS3',
+             'Extended2023CFCal4Eta' : 'auto:upgradePLS3'
              }
 upgradeCustoms={ '2017' : 'SLHCUpgradeSimulations/Configuration/combinedCustoms.cust_2017',
                  '2019' : 'SLHCUpgradeSimulations/Configuration/combinedCustoms.cust_2019',
@@ -1136,7 +1159,9 @@ def genvalid(fragment,d,suffix='all',fi=''):
                  'Extended2023SHCal' : 'SLHCUpgradeSimulations/Configuration/combinedCustoms.cust_2023',
                  'Extended2023SHCal4Eta' : 'SLHCUpgradeSimulations/Configuration/combinedCustoms.cust_2023',
                  'Extended2023TTI' : 'SLHCUpgradeSimulations/Configuration/combinedCustoms_TTI.cust_phase2_BE5D',
-                 'Extended2023Muon' : 'SLHCUpgradeSimulations/Configuration/combinedCustoms.cust_2023Muon'
+                 'Extended2023Muon' : 'SLHCUpgradeSimulations/Configuration/combinedCustoms.cust_2023Muon',
+                 'Extended2023CFCal' : 'SLHCUpgradeSimulations/Configuration/combinedCustoms.cust_2023',
+                 'Extended2023CFCal4Eta' : 'SLHCUpgradeSimulations/Configuration/combinedCustoms.cust_2023'
                  }
 ### remember that you need to add a new step for phase 2 to include the track trigger
 ### remember that you need to add fastsim
@@ -1149,24 +1174,26 @@ def genvalid(fragment,d,suffix='all',fi=''):
 # step6 is fastsim
 # step7 is fastsim harvesting
 
-upgradeSteps=['GenSimFull','DigiFull','RecoFull','HarvFull','DigiTrkTrigFull','FastSim','HarvFast']
-
-upgradeScenToRun={ '2017':['GenSimFull','DigiFull','RecoFull','HarvFull'],
-                   '2019':['GenSimFull','DigiFull','RecoFull','HarvFull'],
-                   '2019WithGEM':['GenSimFull','DigiFull','RecoFull','HarvFull'],
-                   '2017Aging':['GenSimFull','DigiFull','RecoFull','HarvFull'],
-                   '2019Aging':['GenSimFull','DigiFull','RecoFull','HarvFull'],
-                   'BE5D':['GenSimFull','DigiTrkTrigFull','RecoFull','HarvFull'],
-                   'BE5DPixel10D':['GenSimFull','DigiFull','RecoFull','HarvFull'],
-                   '2017Fast':['FastSim','HarvFast'],
-                   'BE5DFast':['FastSim','HarvFast'],
-                   'BE5DForwardFast':['FastSim','HarvFast'],
-                   'Extended2023':['GenSimFull','DigiFull','RecoFull','HarvFull'],
-                   'Extended2023HGCalMuon':['GenSimFull','DigiFull','RecoFull','HarvFull'],
-                   'Extended2023SHCal':['GenSimFull','DigiFull','RecoFull','HarvFull'],
-                   'Extended2023SHCal4Eta':['GenSimFull','DigiFull','RecoFull','HarvFull'],
-                   'Extended2023TTI':['GenSimFull','DigiTrkTrigFull','RecoFull','HarvFull'],
-                   'Extended2023Muon':['GenSimFull','DigiFull','RecoFull','HarvFull']
+upgradeSteps=['GenSimFull','DigiFull','RecoFull','HARVESTFull','DigiTrkTrigFull','FastSim','HARVESTFast']
+
+upgradeScenToRun={ '2017':['GenSimFull','DigiFull','RecoFull','HARVESTFull'],
+                   '2019':['GenSimFull','DigiFull','RecoFull','HARVESTFull'],
+                   '2019WithGEM':['GenSimFull','DigiFull','RecoFull','HARVESTFull'],
+                   '2017Aging':['GenSimFull','DigiFull','RecoFull','HARVESTFull'],
+                   '2019Aging':['GenSimFull','DigiFull','RecoFull','HARVESTFull'],
+                   'BE5D':['GenSimFull','DigiTrkTrigFull','RecoFull','HARVESTFull'],
+                   'BE5DPixel10D':['GenSimFull','DigiFull','RecoFull','HARVESTFull'],
+                   '2017Fast':['FastSim','HARVESTFast'],
+                   'BE5DFast':['FastSim','HARVESTFast'],
+                   'BE5DForwardFast':['FastSim','HARVESTFast'],
+                   'Extended2023':['GenSimFull','DigiFull','RecoFull','HARVESTFull'],
+                   'Extended2023HGCalMuon':['GenSimFull','DigiFull','RecoFull','HARVESTFull'],
+                   'Extended2023SHCal':['GenSimFull','DigiFull','RecoFull','HARVESTFull'],
+                   'Extended2023SHCal4Eta':['GenSimFull','DigiFull','RecoFull','HARVESTFull'],
+                   'Extended2023TTI':['GenSimFull','DigiTrkTrigFull','RecoFull','HARVESTFull'],
+                   'Extended2023Muon':['GenSimFull','DigiFull','RecoFull','HARVESTFull'],
+                   'Extended2023CFCal':['GenSimFull','DigiFull','RecoFull','HARVESTFull'],
+                   'Extended2023CFCal4Eta':['GenSimFull','DigiFull','RecoFull','HARVESTFull']
                    }
 
 upgradeStepDict={}
@@ -1217,14 +1244,14 @@ def genvalid(fragment,d,suffix='all',fi=''):
                                       }
     if upgradeCustoms[k]!=None : upgradeStepDict['RecoFull'][k]['--customise']=upgradeCustoms[k]
     
-    upgradeStepDict['HarvFull'][k]={'-s':'HARVESTING:validationHarvesting+dqmHarvesting',
+    upgradeStepDict['HARVESTFull'][k]={'-s':'HARVESTING:validationHarvesting+dqmHarvesting',
                                     '--conditions':upgradeGTs[k],
                                     '--mc':'',
                                     '--magField' : '38T_PostLS1',
                                     '--geometry' : upgradeGeoms[k],
                                     '--scenario' : 'pp'
                                     }
-    if upgradeCustoms[k]!=None : upgradeStepDict['HarvFull'][k]['--customise']=upgradeCustoms[k]
+    if upgradeCustoms[k]!=None : upgradeStepDict['HARVESTFull'][k]['--customise']=upgradeCustoms[k]
 
     upgradeStepDict['FastSim'][k]={'-s':'GEN,SIM,RECO,VALIDATION',
                                    '--eventcontent':'FEVTDEBUGHLT,DQM',
@@ -1235,14 +1262,14 @@ def genvalid(fragment,d,suffix='all',fi=''):
                                    '--relval':'27000,3000'}
     if upgradeCustoms[k]!=None : upgradeStepDict['FastSim'][k]['--customise']=upgradeCustoms[k]
 
-    upgradeStepDict['HarvFast'][k]={'-s':'HARVESTING:validationHarvestingFS',
+    upgradeStepDict['HARVESTFast'][k]={'-s':'HARVESTING:validationHarvestingFS',
                                     '--conditions':upgradeGTs[k],
                                     '--mc':'',
                                     '--magField' : '38T_PostLS1',
                                     '--geometry' : upgradeGeoms[k],
                                     '--scenario' : 'pp'
                                     }
-    if upgradeCustoms[k]!=None : upgradeStepDict['HarvFast'][k]['--customise']=upgradeCustoms[k]
+    if upgradeCustoms[k]!=None : upgradeStepDict['HARVESTFast'][k]['--customise']=upgradeCustoms[k]
 
 
 upgradeFragments=['FourMuPt_1_200_cfi','SingleElectronPt10_cfi',
diff --git a/Configuration/StandardSequences/python/GeometryConf.py b/Configuration/StandardSequences/python/GeometryConf.py
index a7bc0033ce9e6..2f81b75eb4608 100644
--- a/Configuration/StandardSequences/python/GeometryConf.py
+++ b/Configuration/StandardSequences/python/GeometryConf.py
@@ -26,6 +26,7 @@
     'Extended2023CFCal'   : 'Extended2023CFCal,Extended2023CFCalReco',
     'Extended2023CFCal4Eta'   : 'Extended2023CFCal4Eta,Extended2023CFCal4EtaReco',
     'Extended2023RPCUpscope'   : 'Extended2023RPCUpscope,Extended2023RPCUpscopeReco',
+    'ExtendedPhase1Pixel10D'   : 'ExtendedPhase1Pixel10D,ExtendedPhase1Pixel10DReco',
     'ExtendedPhase2TkBE'   : 'ExtendedPhase2TkBE,ExtendedPhase2TkBEReco',
     'ExtendedPhase2TkBE5D'   : 'ExtendedPhase2TkBE5D,ExtendedPhase2TkBE5DReco',
     'ExtendedPhase2TkBE5DPixel10D'   : 'ExtendedPhase2TkBE5DPixel10D,ExtendedPhase2TkBE5DPixel10DReco',
diff --git a/DataFormats/EcalDetId/interface/EcalSubdetector.h b/DataFormats/EcalDetId/interface/EcalSubdetector.h
index 0ada4706529b1..4d4fc90409448 100644
--- a/DataFormats/EcalDetId/interface/EcalSubdetector.h
+++ b/DataFormats/EcalDetId/interface/EcalSubdetector.h
@@ -9,6 +9,6 @@
  */
 
 
-enum EcalSubdetector { EcalBarrel=1, EcalEndcap=2, EcalPreshower=3, EcalTriggerTower=4, EcalLaserPnDiode=5 };
+enum EcalSubdetector { EcalBarrel=1, EcalEndcap=2, EcalPreshower=3, EcalTriggerTower=4, EcalLaserPnDiode=5, EcalShashlik=6 };
 
 #endif
diff --git a/Geometry/CMSCommonData/data/PhaseI/cms.xml b/Geometry/CMSCommonData/data/PhaseI/cms.xml
index 65ae61ec733b3..e786d906dcdaa 100644
--- a/Geometry/CMSCommonData/data/PhaseI/cms.xml
+++ b/Geometry/CMSCommonData/data/PhaseI/cms.xml
@@ -39,7 +39,7 @@
  <Constant name="TotemBeamZ2"  value="13.381*m"/>
  <Constant name="TotemBeamZ3"  value="13.439*m"/>
  <Constant name="TotemBeamZ4"  value="13.465*m"/>
- <Constant name="TotemBeamR1"  value="11.64*cm"/>
+ <Constant name="TotemBeamR1"  value="11.785*cm"/>
  <Constant name="TotemBeamR2"  value="12.15*cm"/>
  <Constant name="TotemBeamR3"  value="12.20*cm"/>
  <Constant name="TotemBeamR4"  value="3.675*cm"/>
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023MuonXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2023MuonXML_cfi.py
index 10813bb4bfe34..dd3d40cb422a7 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023MuonXML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2023MuonXML_cfi.py
@@ -20,20 +20,38 @@
         'Geometry/CMSCommonData/data/muonMB.xml',
         'Geometry/CMSCommonData/data/muonMagnet.xml',
         'Geometry/CMSCommonData/data/cavern.xml',
-        'Geometry/TrackerCommonData/data/PhaseI/pixfwdMaterials.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdMaterials.xml',
         'Geometry/TrackerCommonData/data/pixfwdCommon.xml',
-        'Geometry/TrackerCommonData/data/PhaseI/pixfwdCylinder.xml', 
-        'Geometry/TrackerCommonData/data/PhaseII/BarrelEndcap5D/pixfwd.xml', 
-        'Geometry/TrackerCommonData/data/PhaseI/pixfwdDisks.xml', 
-        'Geometry/TrackerCommonData/data/PhaseI/pixfwdInnerDisk1.xml',
-        'Geometry/TrackerCommonData/data/PhaseI/pixfwdInnerDisk2.xml',
-        'Geometry/TrackerCommonData/data/PhaseI/pixfwdInnerDisk3.xml',
-        'Geometry/TrackerCommonData/data/PhaseI/pixfwdOuterDisk1.xml',
-        'Geometry/TrackerCommonData/data/PhaseI/pixfwdOuterDisk2.xml',
-        'Geometry/TrackerCommonData/data/PhaseI/pixfwdOuterDisk3.xml',
-        'Geometry/TrackerCommonData/data/PhaseI/pixfwdblade1.xml',
-        'Geometry/TrackerCommonData/data/PhaseI/pixfwdblade2.xml',
-        'Geometry/TrackerCommonData/data/PhaseI/pixfwdblade3.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdCylinder.xml', 
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwd.xml', 
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdDisks.xml', 
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk1.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk2.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk3.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk4.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk5.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk6.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk7.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk1.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk2.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk3.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk4.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk5.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk6.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk7.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk8.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk9.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk10.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdblade1.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdblade2.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdblade3.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdblade4.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdblade5.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdblade6.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdblade7.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdblade8.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdblade9.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdblade10.xml',
         'Geometry/TrackerCommonData/data/PhaseI/pixbarmaterial.xml', 
         'Geometry/TrackerCommonData/data/PhaseI/pixbarladder.xml', 
         'Geometry/TrackerCommonData/data/PhaseI/pixbarladderfull0.xml', 
@@ -50,14 +68,14 @@
         'Geometry/TrackerCommonData/data/PhaseII/BarrelEndcap5D/tracker.xml',
         'Geometry/TrackerCommonData/data/trackerpixbar.xml',
         'Geometry/TrackerCommonData/data/PhaseI/trackerpixfwd.xml',
-        'Geometry/EcalCommonData/data/eregalgo.xml',
+        'Geometry/EcalCommonData/data/PhaseII/ShortEE/eregalgo.xml',
         'Geometry/EcalCommonData/data/ebalgo.xml',
         'Geometry/EcalCommonData/data/ebcon.xml',
         'Geometry/EcalCommonData/data/ebrot.xml',
         'Geometry/EcalCommonData/data/eecon.xml',
         'Geometry/EcalCommonData/data/ectkcable.xml',
-        'Geometry/EcalCommonData/data/eefixed.xml',
-        'Geometry/EcalCommonData/data/eehier.xml',
+        'Geometry/EcalCommonData/data/PhaseII/ShortEE/eefixed.xml',
+        'Geometry/EcalCommonData/data/PhaseII/ShortEE/eehier.xml',
         'Geometry/EcalCommonData/data/eealgo.xml',
         'Geometry/EcalCommonData/data/escon.xml',
         'Geometry/EcalCommonData/data/esalgo.xml',
@@ -79,7 +97,7 @@
         'Geometry/MuonCommonData/data/v1/mb3.xml',
         'Geometry/MuonCommonData/data/v1/mb4.xml',
         'Geometry/MuonCommonData/data/design/muonYoke.xml',
-        'Geometry/MuonCommonData/data/v7/mf.xml',
+        'Geometry/MuonCommonData/data/PhaseII/v3/mf.xml',
         'Geometry/MuonCommonData/data/PhaseII/v3/rpcf.xml',
         'Geometry/MuonCommonData/data/v2/gemf.xml',
         'Geometry/MuonCommonData/data/v5/gem11.xml',
@@ -104,10 +122,10 @@
         'Geometry/ForwardCommonData/data/zdc.xml',
         'Geometry/ForwardCommonData/data/zdclumi.xml',
         'Geometry/ForwardCommonData/data/cmszdc.xml')+cms.vstring(
-        'Geometry/MuonCommonData/data/PhaseII/v2/muonNumbering.xml',
-        'Geometry/TrackerCommonData/data/PhaseII/BarrelEndcap5D/trackerStructureTopology.xml',
-        'Geometry/TrackerSimData/data/PhaseII/BarrelEndcap5D/trackersens.xml',
-        'Geometry/TrackerRecoData/data/PhaseII/BarrelEndcap5D/trackerRecoMaterial.xml',
+        'Geometry/MuonCommonData/data/PhaseII/v3/muonNumbering.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/trackerStructureTopology.xml',
+        'Geometry/TrackerSimData/data/PhaseII/Pixel10D/trackersens.xml',
+        'Geometry/TrackerRecoData/data/PhaseII/Pixel10D/trackerRecoMaterial.xml',
         'Geometry/EcalSimData/data/ecalsens.xml',
         'Geometry/HcalCommonData/data/hcalsenspmf.xml',
         'Geometry/HcalSimData/data/hf.xml',
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023SHCal4EtaXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometry2023SHCal4EtaXML_cfi.py
index be4996cda6e57..205c85064e0b6 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometry2023SHCal4EtaXML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometry2023SHCal4EtaXML_cfi.py
@@ -12,7 +12,7 @@
         'Geometry/CMSCommonData/data/eta4/etaMax.xml',
         'Geometry/CMSCommonData/data/PhaseII/caloBase.xml',
         'Geometry/CMSCommonData/data/cmsCalo.xml',
-        'Geometry/CMSCommonData/data/muonBase.xml',
+        'Geometry/CMSCommonData/data/PhaseII/muonBase.xml',
         'Geometry/CMSCommonData/data/cmsMuon.xml',
         'Geometry/CMSCommonData/data/mgnt.xml',
         'Geometry/CMSCommonData/data/PhaseI/beampipe.xml',
@@ -75,13 +75,14 @@
         'Geometry/MuonCommonData/data/v1/mb3.xml',
         'Geometry/MuonCommonData/data/v1/mb4.xml',
         'Geometry/MuonCommonData/data/design/muonYoke.xml',
-        'Geometry/MuonCommonData/data/PhaseII/v2/mf.xml',
+        'Geometry/MuonCommonData/data/v7/mf.xml',
         'Geometry/MuonCommonData/data/PhaseII/v3/rpcf.xml',
         'Geometry/MuonCommonData/data/v2/gemf.xml',
         'Geometry/MuonCommonData/data/v5/gem11.xml',
         'Geometry/MuonCommonData/data/v6/gem21.xml',
         'Geometry/MuonCommonData/data/v2/csc.xml',
-        'Geometry/MuonCommonData/data/PhaseII/v3/mfshield.xml',
+        'Geometry/MuonCommonData/data/v7/mfshield.xml',
+        'Geometry/MuonCommonData/data/v7/me0.xml',
         'Geometry/ForwardCommonData/data/forward.xml',
         'Geometry/ForwardCommonData/data/v2/forwardshield.xml',
         'Geometry/ForwardCommonData/data/brmrotations.xml',
@@ -99,7 +100,7 @@
         'Geometry/ForwardCommonData/data/zdc.xml',
         'Geometry/ForwardCommonData/data/zdclumi.xml',
         'Geometry/ForwardCommonData/data/cmszdc.xml')+cms.vstring(
-        'Geometry/MuonCommonData/data/PhaseII/v2/muonNumbering.xml',
+        'Geometry/MuonCommonData/data/PhaseII/v3/muonNumbering.xml',
         'Geometry/TrackerCommonData/data/PhaseII/BarrelEndcap5D/trackerStructureTopology.xml',
         'Geometry/TrackerSimData/data/PhaseII/BarrelEndcap5D/trackersens.xml',
         'Geometry/TrackerRecoData/data/PhaseII/BarrelEndcap5D/trackerRecoMaterial.xml',
@@ -109,7 +110,7 @@
         'Geometry/HcalSimData/data/hfpmt.xml',
         'Geometry/HcalSimData/data/hffibrebundle.xml',
         'Geometry/HcalSimData/data/CaloUtil.xml',
-        'Geometry/MuonSimData/data/PhaseII/v3/muonSens.xml',
+        'Geometry/MuonSimData/data/PhaseII/v4/muonSens.xml',
         'Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
         'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometryPhase1Pixel10DXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometryPhase1Pixel10DXML_cfi.py
new file mode 100644
index 0000000000000..746e4a44a400f
--- /dev/null
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometryPhase1Pixel10DXML_cfi.py
@@ -0,0 +1,304 @@
+
+import FWCore.ParameterSet.Config as cms
+
+## 2015 + new phase 1 pixel detector
+
+XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
+    geomXMLFiles = cms.vstring('Geometry/CMSCommonData/data/materials.xml',
+        'Geometry/CMSCommonData/data/rotations.xml',
+        'Geometry/CMSCommonData/data/extend/cmsextent.xml',
+        'Geometry/CMSCommonData/data/PhaseI/cms.xml',
+        'Geometry/CMSCommonData/data/cmsMother.xml',
+        'Geometry/CMSCommonData/data/cmsTracker.xml',
+        'Geometry/CMSCommonData/data/caloBase.xml',
+        'Geometry/CMSCommonData/data/cmsCalo.xml',
+        'Geometry/CMSCommonData/data/muonBase.xml',
+        'Geometry/CMSCommonData/data/cmsMuon.xml',
+        'Geometry/CMSCommonData/data/mgnt.xml',
+        'Geometry/CMSCommonData/data/PhaseI/beampipe.xml',
+        'Geometry/CMSCommonData/data/cmsBeam.xml',
+        'Geometry/CMSCommonData/data/muonMB.xml',
+        'Geometry/CMSCommonData/data/muonMagnet.xml',
+        'Geometry/CMSCommonData/data/cavern.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdMaterials.xml',
+        'Geometry/TrackerCommonData/data/pixfwdCommon.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdCylinder.xml', 
+        'Geometry/TrackerCommonData/data/PhaseI/Pixel10D/pixfwd.xml', 
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdDisks.xml', 
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk1.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk2.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk3.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk4.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk5.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk6.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk7.xml',
+#        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk8.xml',
+#        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk9.xml',
+#        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk10.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk1.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk2.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk3.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk4.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk5.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk6.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk7.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk8.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk9.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk10.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdblade1.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdblade2.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdblade3.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdblade4.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdblade5.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdblade6.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdblade7.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdblade8.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdblade9.xml',
+        'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdblade10.xml',
+        'Geometry/TrackerCommonData/data/PhaseI/pixbarmaterial.xml', 
+        'Geometry/TrackerCommonData/data/PhaseI/pixbarladder.xml', 
+        'Geometry/TrackerCommonData/data/PhaseI/pixbarladderfull0.xml', 
+        'Geometry/TrackerCommonData/data/PhaseI/pixbarladderfull1.xml', 
+        'Geometry/TrackerCommonData/data/PhaseI/pixbarladderfull2.xml', 
+        'Geometry/TrackerCommonData/data/PhaseI/pixbarladderfull3.xml', 
+        'Geometry/TrackerCommonData/data/PhaseI/pixbarlayer.xml', 
+        'Geometry/TrackerCommonData/data/PhaseI/pixbarlayer0.xml', 
+        'Geometry/TrackerCommonData/data/PhaseI/pixbarlayer1.xml', 
+        'Geometry/TrackerCommonData/data/PhaseI/pixbarlayer2.xml', 
+        'Geometry/TrackerCommonData/data/PhaseI/pixbarlayer3.xml', 
+        'Geometry/TrackerCommonData/data/PhaseI/Pixel10D/pixbar.xml', 
+        'Geometry/TrackerCommonData/data/tibtidcommonmaterial.xml',
+        'Geometry/TrackerCommonData/data/tibmaterial.xml',
+        'Geometry/TrackerCommonData/data/tibmodpar.xml',
+        'Geometry/TrackerCommonData/data/tibmodule0.xml',
+        'Geometry/TrackerCommonData/data/tibmodule0a.xml',
+        'Geometry/TrackerCommonData/data/tibmodule0b.xml',
+        'Geometry/TrackerCommonData/data/tibmodule2.xml',
+        'Geometry/TrackerCommonData/data/tibstringpar.xml',
+        'Geometry/TrackerCommonData/data/tibstring0ll.xml',
+        'Geometry/TrackerCommonData/data/tibstring0lr.xml',
+        'Geometry/TrackerCommonData/data/tibstring0ul.xml',
+        'Geometry/TrackerCommonData/data/tibstring0ur.xml',
+        'Geometry/TrackerCommonData/data/tibstring0.xml',
+        'Geometry/TrackerCommonData/data/tibstring1ll.xml',
+        'Geometry/TrackerCommonData/data/tibstring1lr.xml',
+        'Geometry/TrackerCommonData/data/tibstring1ul.xml',
+        'Geometry/TrackerCommonData/data/tibstring1ur.xml',
+        'Geometry/TrackerCommonData/data/tibstring1.xml',
+        'Geometry/TrackerCommonData/data/tibstring2ll.xml',
+        'Geometry/TrackerCommonData/data/tibstring2lr.xml',
+        'Geometry/TrackerCommonData/data/tibstring2ul.xml',
+        'Geometry/TrackerCommonData/data/tibstring2ur.xml',
+        'Geometry/TrackerCommonData/data/tibstring2.xml',
+        'Geometry/TrackerCommonData/data/tibstring3ll.xml',
+        'Geometry/TrackerCommonData/data/tibstring3lr.xml',
+        'Geometry/TrackerCommonData/data/tibstring3ul.xml',
+        'Geometry/TrackerCommonData/data/tibstring3ur.xml',
+        'Geometry/TrackerCommonData/data/tibstring3.xml',
+        'Geometry/TrackerCommonData/data/tiblayerpar.xml',
+        'Geometry/TrackerCommonData/data/tiblayer0.xml',
+        'Geometry/TrackerCommonData/data/tiblayer1.xml',
+        'Geometry/TrackerCommonData/data/tiblayer2.xml',
+        'Geometry/TrackerCommonData/data/tiblayer3.xml',
+        'Geometry/TrackerCommonData/data/tib.xml',
+        'Geometry/TrackerCommonData/data/tidmaterial.xml',
+        'Geometry/TrackerCommonData/data/tidmodpar.xml',
+        'Geometry/TrackerCommonData/data/tidmodule0.xml',
+        'Geometry/TrackerCommonData/data/tidmodule0r.xml',
+        'Geometry/TrackerCommonData/data/tidmodule0l.xml',
+        'Geometry/TrackerCommonData/data/tidmodule1.xml',
+        'Geometry/TrackerCommonData/data/tidmodule1r.xml',
+        'Geometry/TrackerCommonData/data/tidmodule1l.xml',
+        'Geometry/TrackerCommonData/data/tidmodule2.xml',
+        'Geometry/TrackerCommonData/data/tidringpar.xml',
+        'Geometry/TrackerCommonData/data/tidring0.xml',
+        'Geometry/TrackerCommonData/data/tidring0f.xml',
+        'Geometry/TrackerCommonData/data/tidring0b.xml',
+        'Geometry/TrackerCommonData/data/tidring1.xml',
+        'Geometry/TrackerCommonData/data/tidring1f.xml',
+        'Geometry/TrackerCommonData/data/tidring1b.xml',
+        'Geometry/TrackerCommonData/data/tidring2.xml',
+        'Geometry/TrackerCommonData/data/tid.xml',
+        'Geometry/TrackerCommonData/data/tidf.xml',
+        'Geometry/TrackerCommonData/data/tidb.xml',
+        'Geometry/TrackerCommonData/data/tibtidservices.xml',
+        'Geometry/TrackerCommonData/data/tibtidservicesf.xml',
+        'Geometry/TrackerCommonData/data/tibtidservicesb.xml',
+        'Geometry/TrackerCommonData/data/tobmaterial.xml',
+        'Geometry/TrackerCommonData/data/tobmodpar.xml',
+        'Geometry/TrackerCommonData/data/tobmodule0.xml',
+        'Geometry/TrackerCommonData/data/tobmodule2.xml',
+        'Geometry/TrackerCommonData/data/tobmodule4.xml',
+        'Geometry/TrackerCommonData/data/tobrodpar.xml',
+        'Geometry/TrackerCommonData/data/tobrod0c.xml',
+        'Geometry/TrackerCommonData/data/tobrod0l.xml',
+        'Geometry/TrackerCommonData/data/tobrod0h.xml',
+        'Geometry/TrackerCommonData/data/tobrod0.xml',
+        'Geometry/TrackerCommonData/data/tobrod1l.xml',
+        'Geometry/TrackerCommonData/data/tobrod1h.xml',
+        'Geometry/TrackerCommonData/data/tobrod1.xml',
+        'Geometry/TrackerCommonData/data/tobrod2c.xml',
+        'Geometry/TrackerCommonData/data/tobrod2l.xml',
+        'Geometry/TrackerCommonData/data/tobrod2h.xml',
+        'Geometry/TrackerCommonData/data/tobrod2.xml',
+        'Geometry/TrackerCommonData/data/tobrod3l.xml',
+        'Geometry/TrackerCommonData/data/tobrod3h.xml',
+        'Geometry/TrackerCommonData/data/tobrod3.xml',
+        'Geometry/TrackerCommonData/data/tobrod4c.xml',
+        'Geometry/TrackerCommonData/data/tobrod4l.xml',
+        'Geometry/TrackerCommonData/data/tobrod4h.xml',
+        'Geometry/TrackerCommonData/data/tobrod4.xml',
+        'Geometry/TrackerCommonData/data/tobrod5l.xml',
+        'Geometry/TrackerCommonData/data/tobrod5h.xml',
+        'Geometry/TrackerCommonData/data/tobrod5.xml',
+        'Geometry/TrackerCommonData/data/tob.xml',
+        'Geometry/TrackerCommonData/data/tecmaterial.xml',
+        'Geometry/TrackerCommonData/data/tecmodpar.xml',
+        'Geometry/TrackerCommonData/data/tecmodule0.xml',
+        'Geometry/TrackerCommonData/data/tecmodule0r.xml',
+        'Geometry/TrackerCommonData/data/tecmodule0s.xml',
+        'Geometry/TrackerCommonData/data/tecmodule1.xml',
+        'Geometry/TrackerCommonData/data/tecmodule1r.xml',
+        'Geometry/TrackerCommonData/data/tecmodule1s.xml',
+        'Geometry/TrackerCommonData/data/tecmodule2.xml',
+        'Geometry/TrackerCommonData/data/tecmodule3.xml',
+        'Geometry/TrackerCommonData/data/tecmodule4.xml',
+        'Geometry/TrackerCommonData/data/tecmodule4r.xml',
+        'Geometry/TrackerCommonData/data/tecmodule4s.xml',
+        'Geometry/TrackerCommonData/data/tecmodule5.xml',
+        'Geometry/TrackerCommonData/data/tecmodule6.xml',
+        'Geometry/TrackerCommonData/data/tecpetpar.xml',
+        'Geometry/TrackerCommonData/data/tecring0.xml',
+        'Geometry/TrackerCommonData/data/tecring1.xml',
+        'Geometry/TrackerCommonData/data/tecring2.xml',
+        'Geometry/TrackerCommonData/data/tecring3.xml',
+        'Geometry/TrackerCommonData/data/tecring4.xml',
+        'Geometry/TrackerCommonData/data/tecring5.xml',
+        'Geometry/TrackerCommonData/data/tecring6.xml',
+        'Geometry/TrackerCommonData/data/tecring0f.xml',
+        'Geometry/TrackerCommonData/data/tecring1f.xml',
+        'Geometry/TrackerCommonData/data/tecring2f.xml',
+        'Geometry/TrackerCommonData/data/tecring3f.xml',
+        'Geometry/TrackerCommonData/data/tecring4f.xml',
+        'Geometry/TrackerCommonData/data/tecring5f.xml',
+        'Geometry/TrackerCommonData/data/tecring6f.xml',
+        'Geometry/TrackerCommonData/data/tecring0b.xml',
+        'Geometry/TrackerCommonData/data/tecring1b.xml',
+        'Geometry/TrackerCommonData/data/tecring2b.xml',
+        'Geometry/TrackerCommonData/data/tecring3b.xml',
+        'Geometry/TrackerCommonData/data/tecring4b.xml',
+        'Geometry/TrackerCommonData/data/tecring5b.xml',
+        'Geometry/TrackerCommonData/data/tecring6b.xml',
+        'Geometry/TrackerCommonData/data/tecpetalf.xml',
+        'Geometry/TrackerCommonData/data/tecpetalb.xml',
+        'Geometry/TrackerCommonData/data/tecpetal0.xml',
+        'Geometry/TrackerCommonData/data/tecpetal0f.xml',
+        'Geometry/TrackerCommonData/data/tecpetal0b.xml',
+        'Geometry/TrackerCommonData/data/tecpetal3.xml',
+        'Geometry/TrackerCommonData/data/tecpetal3f.xml',
+        'Geometry/TrackerCommonData/data/tecpetal3b.xml',
+        'Geometry/TrackerCommonData/data/tecpetal6f.xml',
+        'Geometry/TrackerCommonData/data/tecpetal6b.xml',
+        'Geometry/TrackerCommonData/data/tecpetal8f.xml',
+        'Geometry/TrackerCommonData/data/tecpetal8b.xml',
+        'Geometry/TrackerCommonData/data/tecwheel.xml',
+        'Geometry/TrackerCommonData/data/tecwheela.xml',
+        'Geometry/TrackerCommonData/data/tecwheelb.xml',
+        'Geometry/TrackerCommonData/data/tecwheelc.xml',
+        'Geometry/TrackerCommonData/data/tecwheeld.xml',
+        'Geometry/TrackerCommonData/data/tecwheel6.xml',
+        'Geometry/TrackerCommonData/data/tecservices.xml',
+        'Geometry/TrackerCommonData/data/tecbackplate.xml',
+        'Geometry/TrackerCommonData/data/tec.xml',
+        'Geometry/TrackerCommonData/data/trackermaterial.xml',
+        'Geometry/TrackerCommonData/data/tracker.xml',
+        'Geometry/TrackerCommonData/data/trackerpixbar.xml',
+        'Geometry/TrackerCommonData/data/PhaseI/trackerpixfwd.xml',
+        'Geometry/TrackerCommonData/data/trackertibtidservices.xml',
+        'Geometry/TrackerCommonData/data/trackertib.xml',
+        'Geometry/TrackerCommonData/data/trackertid.xml',
+        'Geometry/TrackerCommonData/data/trackertob.xml',
+        'Geometry/TrackerCommonData/data/trackertec.xml',
+        'Geometry/TrackerCommonData/data/trackerbulkhead.xml',
+        'Geometry/TrackerCommonData/data/trackerother.xml')+cms.vstring(
+        'Geometry/EcalCommonData/data/eregalgo.xml',
+        'Geometry/EcalCommonData/data/ebalgo.xml',
+        'Geometry/EcalCommonData/data/ebcon.xml',
+        'Geometry/EcalCommonData/data/ebrot.xml',
+        'Geometry/EcalCommonData/data/eecon.xml',
+        'Geometry/EcalCommonData/data/ectkcable.xml',
+        'Geometry/EcalCommonData/data/eefixed.xml',
+        'Geometry/EcalCommonData/data/eehier.xml',
+        'Geometry/EcalCommonData/data/eealgo.xml',
+        'Geometry/EcalCommonData/data/escon.xml',
+        'Geometry/EcalCommonData/data/esalgo.xml',
+        'Geometry/EcalCommonData/data/eeF.xml',
+        'Geometry/EcalCommonData/data/eeB.xml',
+        'Geometry/HcalCommonData/data/hcalrotations.xml',
+        'Geometry/HcalCommonData/data/hcalalgo.xml',
+        'Geometry/HcalCommonData/data/hcalbarrelalgo.xml',
+        'Geometry/HcalCommonData/data/hcalendcapalgo.xml',
+        'Geometry/HcalCommonData/data/hcalouteralgo.xml',
+        'Geometry/HcalCommonData/data/hcalforwardalgo.xml',
+        'Geometry/HcalCommonData/data/average/hcalforwardmaterial.xml',
+        'Geometry/HcalCommonData/data/Phase0/hcalSimNumbering.xml',
+        'Geometry/HcalCommonData/data/Phase0/hcalRecNumbering.xml',
+        'Geometry/MuonCommonData/data/v1/mbCommon.xml',
+        'Geometry/MuonCommonData/data/v1/mb1.xml',
+        'Geometry/MuonCommonData/data/v1/mb2.xml',
+        'Geometry/MuonCommonData/data/v1/mb3.xml',
+        'Geometry/MuonCommonData/data/v1/mb4.xml',
+        'Geometry/MuonCommonData/data/design/muonYoke.xml',
+        'Geometry/MuonCommonData/data/v2/mf.xml',
+        'Geometry/MuonCommonData/data/v2/rpcf.xml',
+        'Geometry/MuonCommonData/data/v2/csc.xml',
+        'Geometry/MuonCommonData/data/v2/mfshield.xml',
+        'Geometry/ForwardCommonData/data/forward.xml',
+        'Geometry/ForwardCommonData/data/v2/forwardshield.xml',
+        'Geometry/ForwardCommonData/data/brmrotations.xml',
+        'Geometry/ForwardCommonData/data/brm.xml',
+        'Geometry/ForwardCommonData/data/totemMaterials.xml',
+        'Geometry/ForwardCommonData/data/totemRotations.xml',
+        'Geometry/ForwardCommonData/data/totemt1.xml',
+        'Geometry/ForwardCommonData/data/totemt2.xml',
+        'Geometry/ForwardCommonData/data/ionpump.xml',
+        'Geometry/ForwardCommonData/data/castor.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/MuonCommonData/data/v2/muonNumbering.xml',
+        'Geometry/TrackerCommonData/data/PhaseI/Pixel10D/trackerStructureTopology.xml',
+        'Geometry/TrackerSimData/data/PhaseI/Pixel10D/trackersens.xml',
+        'Geometry/TrackerRecoData/data/PhaseI/Pixel10D/trackerRecoMaterial.xml',
+        'Geometry/EcalSimData/data/ecalsens.xml',
+        'Geometry/HcalCommonData/data/hcalsenspmf.xml',
+        'Geometry/HcalSimData/data/hf.xml',
+        'Geometry/HcalSimData/data/hfpmt.xml',
+        'Geometry/HcalSimData/data/hffibrebundle.xml',
+        'Geometry/HcalSimData/data/CaloUtil.xml',
+        'Geometry/MuonSimData/data/muonSens.xml',
+        'Geometry/DTGeometryBuilder/data/dtSpecsFilter.xml',
+        'Geometry/CSCGeometryBuilder/data/cscSpecsFilter.xml',
+        'Geometry/CSCGeometryBuilder/data/cscSpecs.xml',
+        'Geometry/RPCGeometryBuilder/data/RPCSpecs.xml',
+        'Geometry/ForwardCommonData/data/brmsens.xml',
+        'Geometry/ForwardSimData/data/castorsens.xml',
+        'Geometry/ForwardSimData/data/zdcsens.xml',
+        'Geometry/HcalSimData/data/HcalProdCuts.xml',
+        'Geometry/EcalSimData/data/EcalProdCuts.xml',
+        'Geometry/EcalSimData/data/ESProdCuts.xml',
+        'Geometry/TrackerSimData/data/PhaseI/Pixel10D/trackerProdCuts.xml',
+        'Geometry/TrackerSimData/data/trackerProdCutsBEAM.xml',
+        'Geometry/MuonSimData/data/muonProdCuts.xml',
+        'Geometry/ForwardSimData/data/CastorProdCuts.xml',
+        'Geometry/ForwardSimData/data/zdcProdCuts.xml',
+        'Geometry/ForwardSimData/data/ForwardShieldProdCuts.xml',
+        'Geometry/CMSCommonData/data/FieldParameters.xml'),
+    rootNodeName = cms.string('cms:OCMS')
+)
+
+
diff --git a/Geometry/CMSCommonData/python/cmsExtendedGeometryPhase2TkBE5DPixel10DXML_cfi.py b/Geometry/CMSCommonData/python/cmsExtendedGeometryPhase2TkBE5DPixel10DXML_cfi.py
index 33b9a434a04e7..298dc3a595325 100644
--- a/Geometry/CMSCommonData/python/cmsExtendedGeometryPhase2TkBE5DPixel10DXML_cfi.py
+++ b/Geometry/CMSCommonData/python/cmsExtendedGeometryPhase2TkBE5DPixel10DXML_cfi.py
@@ -54,20 +54,6 @@
         'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdblade8.xml',
         'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdblade9.xml',
         'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdblade10.xml',
-        #'Geometry/TrackerCommonData/data/PhaseI/pixfwdMaterials.xml',
-        #'Geometry/TrackerCommonData/data/pixfwdCommon.xml',
-        #'Geometry/TrackerCommonData/data/PhaseI/pixfwdCylinder.xml', 
-        #'Geometry/TrackerCommonData/data/PhaseII/BarrelEndcap5D/pixfwd.xml', 
-        #'Geometry/TrackerCommonData/data/PhaseI/pixfwdDisks.xml', 
-        #'Geometry/TrackerCommonData/data/PhaseI/pixfwdInnerDisk1.xml',
-        #'Geometry/TrackerCommonData/data/PhaseI/pixfwdInnerDisk2.xml',
-        #'Geometry/TrackerCommonData/data/PhaseI/pixfwdInnerDisk3.xml',
-        #'Geometry/TrackerCommonData/data/PhaseI/pixfwdOuterDisk1.xml',
-        #'Geometry/TrackerCommonData/data/PhaseI/pixfwdOuterDisk2.xml',
-        #'Geometry/TrackerCommonData/data/PhaseI/pixfwdOuterDisk3.xml',
-        #'Geometry/TrackerCommonData/data/PhaseI/pixfwdblade1.xml',
-        #'Geometry/TrackerCommonData/data/PhaseI/pixfwdblade2.xml',
-        #'Geometry/TrackerCommonData/data/PhaseI/pixfwdblade3.xml',
         'Geometry/TrackerCommonData/data/PhaseI/pixbarmaterial.xml', 
         'Geometry/TrackerCommonData/data/PhaseI/pixbarladder.xml', 
         'Geometry/TrackerCommonData/data/PhaseI/pixbarladderfull0.xml', 
@@ -80,160 +66,10 @@
         'Geometry/TrackerCommonData/data/PhaseI/pixbarlayer2.xml', 
         'Geometry/TrackerCommonData/data/PhaseI/pixbarlayer3.xml', 
         'Geometry/TrackerCommonData/data/PhaseII/BarrelEndcap5D/pixbar.xml', 
-        #'Geometry/TrackerCommonData/data/tibtidcommonmaterial.xml',
-        #'Geometry/TrackerCommonData/data/tibmaterial.xml',
-        #'Geometry/TrackerCommonData/data/tibmodpar.xml',
-        #'Geometry/TrackerCommonData/data/tibmodule0.xml',
-        #'Geometry/TrackerCommonData/data/tibmodule0a.xml',
-        #'Geometry/TrackerCommonData/data/tibmodule0b.xml',
-        #'Geometry/TrackerCommonData/data/tibmodule2.xml',
-        #'Geometry/TrackerCommonData/data/tibstringpar.xml',
-        #'Geometry/TrackerCommonData/data/tibstring0ll.xml',
-        #'Geometry/TrackerCommonData/data/tibstring0lr.xml',
-        #'Geometry/TrackerCommonData/data/tibstring0ul.xml',
-        #'Geometry/TrackerCommonData/data/tibstring0ur.xml',
-        #'Geometry/TrackerCommonData/data/tibstring0.xml',
-        #'Geometry/TrackerCommonData/data/tibstring1ll.xml',
-        #'Geometry/TrackerCommonData/data/tibstring1lr.xml',
-        #'Geometry/TrackerCommonData/data/tibstring1ul.xml',
-        #'Geometry/TrackerCommonData/data/tibstring1ur.xml',
-        #'Geometry/TrackerCommonData/data/tibstring1.xml',
-        #'Geometry/TrackerCommonData/data/tibstring2ll.xml',
-        #'Geometry/TrackerCommonData/data/tibstring2lr.xml',
-        #'Geometry/TrackerCommonData/data/tibstring2ul.xml',
-        #'Geometry/TrackerCommonData/data/tibstring2ur.xml',
-        #'Geometry/TrackerCommonData/data/tibstring2.xml',
-        #'Geometry/TrackerCommonData/data/tibstring3ll.xml',
-        #'Geometry/TrackerCommonData/data/tibstring3lr.xml',
-        #'Geometry/TrackerCommonData/data/tibstring3ul.xml',
-        #'Geometry/TrackerCommonData/data/tibstring3ur.xml',
-        #'Geometry/TrackerCommonData/data/tibstring3.xml',
-        #'Geometry/TrackerCommonData/data/tiblayerpar.xml',
-        #'Geometry/TrackerCommonData/data/tiblayer0.xml',
-        #'Geometry/TrackerCommonData/data/tiblayer1.xml',
-        #'Geometry/TrackerCommonData/data/tiblayer2.xml',
-        #'Geometry/TrackerCommonData/data/tiblayer3.xml',
-        #'Geometry/TrackerCommonData/data/tib.xml',
-        #'Geometry/TrackerCommonData/data/tidmaterial.xml',
-        #'Geometry/TrackerCommonData/data/tidmodpar.xml',
-        #'Geometry/TrackerCommonData/data/tidmodule0.xml',
-        #'Geometry/TrackerCommonData/data/tidmodule0r.xml',
-        #'Geometry/TrackerCommonData/data/tidmodule0l.xml',
-        #'Geometry/TrackerCommonData/data/tidmodule1.xml',
-        #'Geometry/TrackerCommonData/data/tidmodule1r.xml',
-        #'Geometry/TrackerCommonData/data/tidmodule1l.xml',
-        #'Geometry/TrackerCommonData/data/tidmodule2.xml',
-        #'Geometry/TrackerCommonData/data/tidringpar.xml',
-        #'Geometry/TrackerCommonData/data/tidring0.xml',
-        #'Geometry/TrackerCommonData/data/tidring0f.xml',
-        #'Geometry/TrackerCommonData/data/tidring0b.xml',
-        #'Geometry/TrackerCommonData/data/tidring1.xml',
-        #'Geometry/TrackerCommonData/data/tidring1f.xml',
-        #'Geometry/TrackerCommonData/data/tidring1b.xml',
-        #'Geometry/TrackerCommonData/data/tidring2.xml',
-        #'Geometry/TrackerCommonData/data/tid.xml',
-        #'Geometry/TrackerCommonData/data/tidf.xml',
-        #'Geometry/TrackerCommonData/data/tidb.xml',
-        #'Geometry/TrackerCommonData/data/tibtidservices.xml',
-        #'Geometry/TrackerCommonData/data/tibtidservicesf.xml',
-        #'Geometry/TrackerCommonData/data/tibtidservicesb.xml',
-        #'Geometry/TrackerCommonData/data/tobmaterial.xml',
-        #'Geometry/TrackerCommonData/data/tobmodpar.xml',
-        #'Geometry/TrackerCommonData/data/tobmodule0.xml',
-        #'Geometry/TrackerCommonData/data/tobmodule2.xml',
-        #'Geometry/TrackerCommonData/data/tobmodule4.xml',
-        #'Geometry/TrackerCommonData/data/tobrodpar.xml',
-        #'Geometry/TrackerCommonData/data/tobrod0c.xml',
-        #'Geometry/TrackerCommonData/data/tobrod0l.xml',
-        #'Geometry/TrackerCommonData/data/tobrod0h.xml',
-        #'Geometry/TrackerCommonData/data/tobrod0.xml',
-        #'Geometry/TrackerCommonData/data/tobrod1l.xml',
-        #'Geometry/TrackerCommonData/data/tobrod1h.xml',
-        #'Geometry/TrackerCommonData/data/tobrod1.xml',
-        #'Geometry/TrackerCommonData/data/tobrod2c.xml',
-        #'Geometry/TrackerCommonData/data/tobrod2l.xml',
-        #'Geometry/TrackerCommonData/data/tobrod2h.xml',
-        #'Geometry/TrackerCommonData/data/tobrod2.xml',
-        #'Geometry/TrackerCommonData/data/tobrod3l.xml',
-        #'Geometry/TrackerCommonData/data/tobrod3h.xml',
-        #'Geometry/TrackerCommonData/data/tobrod3.xml',
-        #'Geometry/TrackerCommonData/data/tobrod4c.xml',
-        #'Geometry/TrackerCommonData/data/tobrod4l.xml',
-        #'Geometry/TrackerCommonData/data/tobrod4h.xml',
-        #'Geometry/TrackerCommonData/data/tobrod4.xml',
-        #'Geometry/TrackerCommonData/data/tobrod5l.xml',
-        #'Geometry/TrackerCommonData/data/tobrod5h.xml',
-        #'Geometry/TrackerCommonData/data/tobrod5.xml',
-        #'Geometry/TrackerCommonData/data/tob.xml',
-        #'Geometry/TrackerCommonData/data/tecmaterial.xml',
-        #'Geometry/TrackerCommonData/data/tecmodpar.xml',
-        #'Geometry/TrackerCommonData/data/tecmodule0.xml',
-        #'Geometry/TrackerCommonData/data/tecmodule0r.xml',
-        #'Geometry/TrackerCommonData/data/tecmodule0s.xml',
-        #'Geometry/TrackerCommonData/data/tecmodule1.xml',
-        #'Geometry/TrackerCommonData/data/tecmodule1r.xml',
-        #'Geometry/TrackerCommonData/data/tecmodule1s.xml',
-        #'Geometry/TrackerCommonData/data/tecmodule2.xml',
-        #'Geometry/TrackerCommonData/data/tecmodule3.xml',
-        #'Geometry/TrackerCommonData/data/tecmodule4.xml',
-        #'Geometry/TrackerCommonData/data/tecmodule4r.xml',
-        #'Geometry/TrackerCommonData/data/tecmodule4s.xml',
-        #'Geometry/TrackerCommonData/data/tecmodule5.xml',
-        #'Geometry/TrackerCommonData/data/tecmodule6.xml',
-        #'Geometry/TrackerCommonData/data/tecpetpar.xml',
-        #'Geometry/TrackerCommonData/data/tecring0.xml',
-        #'Geometry/TrackerCommonData/data/tecring1.xml',
-        #'Geometry/TrackerCommonData/data/tecring2.xml',
-        #'Geometry/TrackerCommonData/data/tecring3.xml',
-        #'Geometry/TrackerCommonData/data/tecring4.xml',
-        #'Geometry/TrackerCommonData/data/tecring5.xml',
-        #'Geometry/TrackerCommonData/data/tecring6.xml',
-        #'Geometry/TrackerCommonData/data/tecring0f.xml',
-        #'Geometry/TrackerCommonData/data/tecring1f.xml',
-        #'Geometry/TrackerCommonData/data/tecring2f.xml',
-        #'Geometry/TrackerCommonData/data/tecring3f.xml',
-        #'Geometry/TrackerCommonData/data/tecring4f.xml',
-        #'Geometry/TrackerCommonData/data/tecring5f.xml',
-        #'Geometry/TrackerCommonData/data/tecring6f.xml',
-        #'Geometry/TrackerCommonData/data/tecring0b.xml',
-        #'Geometry/TrackerCommonData/data/tecring1b.xml',
-        #'Geometry/TrackerCommonData/data/tecring2b.xml',
-        #'Geometry/TrackerCommonData/data/tecring3b.xml',
-        #'Geometry/TrackerCommonData/data/tecring4b.xml',
-        #'Geometry/TrackerCommonData/data/tecring5b.xml',
-        #'Geometry/TrackerCommonData/data/tecring6b.xml',
-        #'Geometry/TrackerCommonData/data/tecpetalf.xml',
-        #'Geometry/TrackerCommonData/data/tecpetalb.xml',
-        #'Geometry/TrackerCommonData/data/tecpetal0.xml',
-        #'Geometry/TrackerCommonData/data/tecpetal0f.xml',
-        #'Geometry/TrackerCommonData/data/tecpetal0b.xml',
-        #'Geometry/TrackerCommonData/data/tecpetal3.xml',
-        #'Geometry/TrackerCommonData/data/tecpetal3f.xml',
-        #'Geometry/TrackerCommonData/data/tecpetal3b.xml',
-        #'Geometry/TrackerCommonData/data/tecpetal6f.xml',
-        #'Geometry/TrackerCommonData/data/tecpetal6b.xml',
-        #'Geometry/TrackerCommonData/data/tecpetal8f.xml',
-        #'Geometry/TrackerCommonData/data/tecpetal8b.xml',
-        #'Geometry/TrackerCommonData/data/tecwheel.xml',
-        #'Geometry/TrackerCommonData/data/tecwheela.xml',
-        #'Geometry/TrackerCommonData/data/tecwheelb.xml',
-        #'Geometry/TrackerCommonData/data/tecwheelc.xml',
-        #'Geometry/TrackerCommonData/data/tecwheeld.xml',
-        #'Geometry/TrackerCommonData/data/tecwheel6.xml',
-        #'Geometry/TrackerCommonData/data/tecservices.xml',
-        #'Geometry/TrackerCommonData/data/tecbackplate.xml',
-        #'Geometry/TrackerCommonData/data/tec.xml',
         'Geometry/TrackerCommonData/data/trackermaterial.xml',
         'Geometry/TrackerCommonData/data/PhaseII/BarrelEndcap5D/tracker.xml',
         'Geometry/TrackerCommonData/data/trackerpixbar.xml',
         'Geometry/TrackerCommonData/data/PhaseI/trackerpixfwd.xml',
-        #'Geometry/TrackerCommonData/data/trackertibtidservices.xml',
-        #'Geometry/TrackerCommonData/data/trackertib.xml',
-        #'Geometry/TrackerCommonData/data/trackertid.xml',
-        #'Geometry/TrackerCommonData/data/trackertob.xml',
-        #'Geometry/TrackerCommonData/data/trackertec.xml',
-        #'Geometry/TrackerCommonData/data/trackerbulkhead.xml',
-        #'Geometry/TrackerCommonData/data/trackerother.xml',
         'Geometry/EcalCommonData/data/eregalgo.xml',
         'Geometry/EcalCommonData/data/ebalgo.xml',
         'Geometry/EcalCommonData/data/ebcon.xml',
@@ -284,9 +120,6 @@
         'Geometry/ForwardCommonData/data/zdclumi.xml',
         'Geometry/ForwardCommonData/data/cmszdc.xml')+cms.vstring(
         'Geometry/MuonCommonData/data/v2/muonNumbering.xml',
-        #'Geometry/TrackerCommonData/data/PhaseII/BarrelEndcap5D/trackerStructureTopology.xml',
-        #'Geometry/TrackerSimData/data/PhaseII/BarrelEndcap5D/trackersens.xml',
-        #'Geometry/TrackerRecoData/data/PhaseII/BarrelEndcap5D/trackerRecoMaterial.xml',
         'Geometry/TrackerCommonData/data/PhaseII/Pixel10D/trackerStructureTopology.xml',
         'Geometry/TrackerSimData/data/PhaseII/Pixel10D/trackersens.xml',
         'Geometry/TrackerRecoData/data/PhaseII/Pixel10D/trackerRecoMaterial.xml',
diff --git a/Geometry/EcalCommonData/data/PhaseII/ShortEE/eefixed.xml b/Geometry/EcalCommonData/data/PhaseII/ShortEE/eefixed.xml
new file mode 100644
index 0000000000000..f3a41edd4378d
--- /dev/null
+++ b/Geometry/EcalCommonData/data/PhaseII/ShortEE/eefixed.xml
@@ -0,0 +1,1177 @@
+<?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">
+
+<SolidSection label="eefixed.xml">
+  <Tubs name="EEBackPlate" rMin="[eecon:EEBackPlateIR]" rMax="[eecon:EEBackPlateOR]" dz="[eecon:EEBackPlateThick]/2." startPhi="0*deg" deltaPhi="90*deg"/>
+  <Tubs name="EEBPPV" rMin="[eecon:EEBackPlateIR]" rMax="[eecon:EEBackPlateOR]" dz="[eecon:EEBPPOR]" startPhi="0*deg" deltaPhi="90*deg"/>
+  <Tubs name="EEBPPAW" rMin="0*mm" rMax="[eecon:EEBPPIR]" dz="0.5*[eecon:EEBPPLA]" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="EEBPPAP" rMin="0*mm" rMax="[eecon:EEBPPOR]" dz="0.5*[eecon:EEBPPLA]" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="EEBPPBW" rMin="0*mm" rMax="[eecon:EEBPPIR]" dz="0.5*[eecon:EEBPPLB]" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="EEBPPBP" rMin="0*mm" rMax="[eecon:EEBPPOR]" dz="0.5*[eecon:EEBPPLB]" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="EEBPPCW" rMin="0*mm" rMax="[eecon:EEBPPIR]" dz="0.5*[eecon:EEBPPLC]" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="EEBPPCP" rMin="0*mm" rMax="[eecon:EEBPPOR]" dz="0.5*[eecon:EEBPPLC]" startPhi="0*deg" deltaPhi="360*deg"/>
+  <!-- Cables -->
+  <Tubs name="EECableF" rMin="[eecon:EEIModO8]" rMax="[eecon:EESRingIR]" dz="[eecon:EECableFdz]" startPhi="0*deg" deltaPhi="90*deg"/>
+  <Tubs name="EECableR" rMin="[eecon:EEIModO8]" rMax="[eecon:EESRingIR]" dz="[eecon:EECableRdz]" startPhi="0*deg" deltaPhi="90*deg"/>
+  <!-- Moderators -->
+  <Tubs name="EERMod" rMin="[eecon:EERModIR]" rMax="[eecon:EERModOR]" dz="[eecon:EERModTh]/2." startPhi="0*deg" deltaPhi="90*deg"/>
+  <Tubs name="EERMCP" rMin="[eecon:EERModIR]" rMax="[eecon:EERModOR]" dz="[eecon:EERMCPTh]/2." startPhi="0*deg" deltaPhi="90*deg"/>
+  <Polycone name="EEIMod" startPhi="0*deg" deltaPhi="90*deg">
+    <ZSection z="[eecon:EEIModZ1]" rMin="[eecon:EEIModI1]" rMax="[eecon:EEIModO1]"/>
+    <ZSection z="[eecon:EEIModZ2]" rMin="[eecon:EEIModI2]" rMax="[eecon:EEIModO2]"/>
+    <ZSection z="[eecon:EEIModZ3]" rMin="[eecon:EEIModI3]" rMax="[eecon:EEIModO3]"/>
+    <ZSection z="[eecon:EEIModZ4]" rMin="[eecon:EEIModI4]" rMax="[eecon:EEIModO4]"/>
+    <ZSection z="[eecon:EEIModZ5]" rMin="[eecon:EEIModI5]" rMax="[eecon:EEIModO5]"/>
+    <ZSection z="[eecon:EEIModZ6]" rMin="[eecon:EEIModI6]" rMax="[eecon:EEIModO6]"/>
+    <ZSection z="[eecon:EEIModZ7]" rMin="[eecon:EEIModI7]" rMax="[eecon:EEIModO7]"/>
+    <ZSection z="[eecon:EEIModZ8]" rMin="[eecon:EEIModI8]" rMax="[eecon:EEIModO8]"/>
+    <ZSection z="[eecon:EEIModZ9]" rMin="[eecon:EEIModI9]" rMax="[eecon:EEIModO9]"/>
+    <ZSection z="[eecon:EEIModZA]" rMin="[eecon:EEIModIA]" rMax="[eecon:EEIModOA]"/>
+  </Polycone>
+  <Polycone name="EEFMod" startPhi="0*deg" deltaPhi="90*deg">
+    <ZSection z="-[eecon:EEFModDZ]" rMin="[eecon:EEFModIR]" rMax="[eecon:EEFModOR1]"/>
+    <ZSection z="0*mm" rMin="[eecon:EEFModIR]" rMax="[eecon:EEFModOR1]"/>
+    <ZSection z="0*mm" rMin="[eecon:EEFModIR]" rMax="[eecon:EEFModOR2]"/>
+    <ZSection z=" [eecon:EEFModDZ]" rMin="[eecon:EEFModIR]" rMax="[eecon:EEFModOR2]"/>
+  </Polycone>
+  <!-- Support Ring -->
+  <Polycone name="EESRing" startPhi="0*deg" deltaPhi="90*deg">
+    <ZSection z="[eecon:EESRingZ1]" rMin="[eecon:EESRingIR]" rMax="[eecon:EESRingOR1]"/>
+    <ZSection z="[eecon:EESRingZ2]" rMin="[eecon:EESRingIR]" rMax="[eecon:EESRingOR2]"/>
+    <ZSection z="[eecon:EESRingZ3]" rMin="[eecon:EESRingIR]" rMax="[eecon:EESRingOR3]"/>
+    <ZSection z="[eecon:EESRingZ4]" rMin="[eecon:EESRingIR]" rMax="[eecon:EESRingOR4]"/>
+    <ZSection z="[eecon:EESRingZ5]" rMin="[eecon:EESRingIR]" rMax="[eecon:EESRingOR5]"/>
+    <ZSection z="[eecon:EESRingZ6]" rMin="[eecon:EESRingIR]" rMax="[eecon:EESRingOR6]"/>
+    <ZSection z="[eecon:EESRingZ7]" rMin="[eecon:EESRingIR]" rMax="[eecon:EESRingOR7]"/>
+    <ZSection z="[eecon:EESRingZ8]" rMin="[eecon:EESRingIR]" rMax="[eecon:EESRingOR8]"/>
+  </Polycone>
+  <!-- Environmental screen volumes -->
+  <Polycone name="EEfEnvScr" startPhi="0*deg" deltaPhi="90*deg">
+    <ZSection z="[eecon:EEfEnvScrZ1]" rMin="[eecon:EEfEnvScrIR1]" rMax="[eecon:EEfEnvScrOR1]"/>
+    <ZSection z="[eecon:EEfEnvScrZ2]" rMin="[eecon:EEfEnvScrIR2]" rMax="[eecon:EEfEnvScrOR2]"/>
+    <ZSection z="[eecon:EEfEnvScrZ3]" rMin="[eecon:EEfEnvScrIR3]" rMax="[eecon:EEfEnvScrOR3]"/>
+    <ZSection z="[eecon:EEfEnvScrZ4]" rMin="[eecon:EEfEnvScrIR4]" rMax="[eecon:EEfEnvScrOR4]"/>
+  </Polycone>
+  <Polycone name="EEgEnvScr" startPhi="0*deg" deltaPhi="90*deg">
+    <ZSection z="[eecon:EEgEnvScrZ1]" rMin="[eecon:EEgEnvScrIR1]" rMax="[eecon:EEgEnvScrOR1]"/>
+    <ZSection z="[eecon:EEgEnvScrZ2]" rMin="[eecon:EEgEnvScrIR2]" rMax="[eecon:EEgEnvScrOR2]"/>
+  </Polycone>
+  <Polycone name="EEiEnvScr" startPhi="0*deg" deltaPhi="90*deg">
+    <ZSection z="[eecon:EEiEnvScrZ1]" rMin="[eecon:EEiEnvScrIR1]" rMax="[eecon:EEiEnvScrOR1]"/>
+    <ZSection z="[eecon:EEiEnvScrZ2]" rMin="[eecon:EEiEnvScrIR2]" rMax="[eecon:EEiEnvScrOR2]"/>
+    <ZSection z="[eecon:EEiEnvScrZ3]" rMin="[eecon:EEiEnvScrIR3]" rMax="[eecon:EEiEnvScrOR3]"/>
+    <ZSection z="[eecon:EEiEnvScrZ4]" rMin="[eecon:EEiEnvScrIR4]" rMax="[eecon:EEiEnvScrOR4]"/>
+    <ZSection z="[eecon:EEiEnvScrZ5]" rMin="[eecon:EEiEnvScrIR5]" rMax="[eecon:EEiEnvScrOR5]"/>
+  </Polycone>
+  <!-- Slats for front environmental screen -->
+  <Box name="EEhSlat" dx="[eecon:EESlatLength]/2.0" dy="[eecon:EEhSlatWidth]/4.0" dz="[eecon:EEhSlatThick]/2.0"/>
+  <Box name="EEvSlat" dx="[eecon:EEvSlatWidth]/4.0" dy="[eecon:EESlatLength]/2.0" dz="[eecon:EEvSlatThick]/2.0"/>
+  <!-- Pipes for front environmental screen -->
+  <Tubs name="EEfC100W" rMin="0*mm" rMax="[eecon:EEfCoolIR]" dz=" 50*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="EEfC100P" rMin="0*mm" rMax="[eecon:EEfCoolOR]" dz=" 50*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="EEfC450W" rMin="0*mm" rMax="[eecon:EEfCoolIR]" dz="219*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="EEfC450P" rMin="0*mm" rMax="[eecon:EEfCoolOR]" dz="219*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="EEfC150W" rMin="0*mm" rMax="[eecon:EEfCoolIR]" dz=" 68*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="EEfC150P" rMin="0*mm" rMax="[eecon:EEfCoolOR]" dz=" 68*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="EEfC300W" rMin="0*mm" rMax="[eecon:EEfCoolIR]" dz="144*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="EEfC300P" rMin="0*mm" rMax="[eecon:EEfCoolOR]" dz="144*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="EEfC600W" rMin="0*mm" rMax="[eecon:EEfCoolIR]" dz="294*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="EEfC600P" rMin="0*mm" rMax="[eecon:EEfCoolOR]" dz="294*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="EEfC740W" rMin="0*mm" rMax="[eecon:EEfCoolIR]" dz="370*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="EEfC740P" rMin="0*mm" rMax="[eecon:EEfCoolOR]" dz="370*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="EEfC420W" rMin="0*mm" rMax="[eecon:EEfCoolIR]" dz="205*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="EEfC420P" rMin="0*mm" rMax="[eecon:EEfCoolOR]" dz="205*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+  <!-- Pipes for cooling bars -->
+  <Tubs name="EECBXP1W" rMin="0*mm" rMax="[eecon:EECBXPIR]" dz="0.5*[eecon:EECBLen]" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="EECBXP1P" rMin="0*mm" rMax="[eecon:EECBXPOR]" dz="0.5*[eecon:EECBLen]" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="EECBXP2W" rMin="0*mm" rMax="[eecon:EECBXPIR]" dz="    [eecon:EECBLen]" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="EECBXP2P" rMin="0*mm" rMax="[eecon:EECBXPOR]" dz="    [eecon:EECBLen]" startPhi="0*deg" deltaPhi="360*deg"/>
+  <!-- For Preshower support -->
+  <Polycone name="ESCone" startPhi="0*deg" deltaPhi="360*deg">
+    <ZSection z="[eecon:ESConeZ1]" rMin="[eecon:ESConeI1]" rMax="[eecon:ESConeO1]"/>
+    <ZSection z="[eecon:ESConeZ2]" rMin="[eecon:ESConeI2]" rMax="[eecon:ESConeO2]"/>
+  </Polycone>
+  <Tubs name="ESRing" rMin="[eecon:ESRingIR]" rMax="[eecon:ESRingOR]" dz="[eecon:ESRingZThick]/2" startPhi="0*deg" deltaPhi="360*deg"/>
+  <!-- Cooling bar-related volumes -->
+  <Tubs name="EECoolQ" rMin="[eecon:EECQIR]" rMax="[eecon:EECQOR]" dz="0.5*[eecon:EECBHt]" startPhi="0*deg" deltaPhi="90*deg"/>
+  <Box name="EECoolBox" dy="0.5*[eecon:EECBLen]" dz="0.5*[eecon:EECBHt]" dx="0.5*[eecon:EECBWid]"/>
+  <Box name="EECoolIns" dy="0.5*([eecon:EECBLen]-6*mm)" dz="0.5*([eecon:EECBHt] -6*mm)" dx="0.5*([eecon:EECBWid]-6*mm)"/>
+  <Box name="EETankSS" dy="0.5*17.*mm" dz="0.5*28.*mm" dx="0.5*90.*mm"/>
+  <Box name="EETankWa" dy="0.5*11.*mm" dz="0.5*22.*mm" dx="0.5*84.*mm"/>
+  <!-- Just behind SuperCrystal: lump together positional spacer, housing, HV, interface plate, etc. -->
+  <Box name="EESpacer" dx="[eecon:EESpaWidth]/2." dy="[eecon:EESpaWidth]/2." dz="[eecon:EESpaDepth]/2."/>
+  <Box name="EESpAir" dx="[eecon:EESpAirWidth]/2." dy="[eecon:EESpAirWidth]/2." dz="[eecon:EESpAirDepth]/2."/>
+  <Box name="EEHV" dx="[eecon:EESpAirWidth]/2." dy="[eecon:EESpAirWidth]/2." dz="[eecon:EESpHVDepth]/2."/>
+  <Box name="EEHVCa" dx="[eecon:EESpAirWidth]/2." dy="[eecon:EESpAirWidth]/2." dz="[eecon:EESpCaDepth]/2."/>
+  <!-- Cooling pipes in outer environmental screen -->
+  <Torus name="EEOCool1" innerRadius="0*mm" outerRadius="7*mm" torusRadius="1571.6*mm" startPhi="2.5*deg" deltaPhi="85*deg"/>
+  <Torus name="EEOCool2" innerRadius="0*mm" outerRadius="7*mm" torusRadius="1605.8*mm" startPhi="5.5*deg" deltaPhi="82*deg"/>
+  <Torus name="EEOCool3" innerRadius="0*mm" outerRadius="7*mm" torusRadius="1640.0*mm" startPhi="5.5*deg" deltaPhi="82*deg"/>
+  <Torus name="EEOCool4" innerRadius="0*mm" outerRadius="7*mm" torusRadius="1674.2*mm" startPhi="2.5*deg" deltaPhi="85*deg"/>
+  <Tubs name="EEOCool5" rMin="0*mm" rMax="7*mm" dz=" 50*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="EEOCool6" rMin="0*mm" rMax="7*mm" dz="150*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Torus name="EEOCool1W" innerRadius="0*mm" outerRadius="6*mm" torusRadius="1571.6*mm" startPhi="2.5*deg" deltaPhi="85*deg"/>
+  <Torus name="EEOCool2W" innerRadius="0*mm" outerRadius="6*mm" torusRadius="1605.8*mm" startPhi="5.5*deg" deltaPhi="82*deg"/>
+  <Torus name="EEOCool3W" innerRadius="0*mm" outerRadius="6*mm" torusRadius="1640.0*mm" startPhi="5.5*deg" deltaPhi="82*deg"/>
+  <Torus name="EEOCool4W" innerRadius="0*mm" outerRadius="6*mm" torusRadius="1674.2*mm" startPhi="2.5*deg" deltaPhi="85*deg"/>
+  <Tubs name="EEOCool5W" rMin="0*mm" rMax="6*mm" dz=" 50*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+  <Tubs name="EEOCool6W" rMin="0*mm" rMax="6*mm" dz="150*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+</SolidSection>
+
+<LogicalPartSection label="eefixed.xml">
+  <LogicalPart name="EEBackPlate" category="unspecified">
+    <rSolid name="EEBackPlate"/>
+    <rMaterial name="materials:Aluminium"/>
+  </LogicalPart>
+  <LogicalPart name="EEBPPV" category="unspecified">
+    <rSolid name="EEBPPV"/>
+    <rMaterial name="materials:E_Air"/>
+  </LogicalPart>
+  <LogicalPart name="EEBPPAP" category="unspecified">
+    <rSolid name="EEBPPAP"/>
+    <rMaterial name="materials:StainlessSteel"/>
+  </LogicalPart>
+  <LogicalPart name="EEBPPAW" category="unspecified">
+    <rSolid name="EEBPPAW"/>
+    <rMaterial name="materials:E_Water"/>
+  </LogicalPart>
+  <LogicalPart name="EEBPPBP" category="unspecified">
+    <rSolid name="EEBPPBP"/>
+    <rMaterial name="materials:StainlessSteel"/>
+  </LogicalPart>
+  <LogicalPart name="EEBPPBW" category="unspecified">
+    <rSolid name="EEBPPBW"/>
+    <rMaterial name="materials:E_Water"/>
+  </LogicalPart>
+  <LogicalPart name="EEBPPCP" category="unspecified">
+    <rSolid name="EEBPPCP"/>
+    <rMaterial name="materials:StainlessSteel"/>
+  </LogicalPart>
+  <LogicalPart name="EEBPPCW" category="unspecified">
+    <rSolid name="EEBPPCW"/>
+    <rMaterial name="materials:E_Water"/>
+  </LogicalPart>
+  <LogicalPart name="EECableF" category="unspecified">
+    <rSolid name="EECableF"/>
+    <rMaterial name="materials:E_Cables"/>
+  </LogicalPart>
+  <LogicalPart name="EECableR" category="unspecified">
+    <rSolid name="EECableR"/>
+    <rMaterial name="materials:E_Cables"/>
+  </LogicalPart>
+  <LogicalPart name="EEIMod" category="unspecified">
+    <rSolid name="EEIMod"/>
+    <rMaterial name="materials:Polyethylene"/>
+  </LogicalPart>
+  <LogicalPart name="EERMod" category="unspecified">
+    <rSolid name="EERMod"/>
+    <rMaterial name="materials:Polyethylene"/>
+  </LogicalPart>
+  <LogicalPart name="EERMCP" category="unspecified">
+    <rSolid name="EERMCP"/>
+    <rMaterial name="materials:Aluminium"/>
+  </LogicalPart>
+  <LogicalPart name="EEFMod" category="unspecified">
+    <rSolid name="EEFMod"/>
+    <rMaterial name="materials:Polyethylene"/>
+  </LogicalPart>
+  <LogicalPart name="EESRing" category="unspecified">
+    <rSolid name="EESRing"/>
+    <rMaterial name="materials:Aluminium"/>
+  </LogicalPart>
+  <LogicalPart name="EEfEnvScr" category="unspecified">
+    <rSolid name="EEfEnvScr"/>
+    <rMaterial name="materials:Aluminium"/>
+  </LogicalPart>
+  <LogicalPart name="EEgEnvScr" category="unspecified">
+    <rSolid name="EEgEnvScr"/>
+    <rMaterial name="materials:Foam"/>
+  </LogicalPart>
+  <LogicalPart name="EEiEnvScr" category="unspecified">
+    <rSolid name="EEiEnvScr"/>
+    <rMaterial name="materials:Aluminium"/>
+  </LogicalPart>
+  <LogicalPart name="EEhSlat" category="unspecified">
+    <rSolid name="EEhSlat"/>
+    <rMaterial name="materials:Aluminium"/>
+  </LogicalPart>
+  <LogicalPart name="EEvSlat" category="unspecified">
+    <rSolid name="EEvSlat"/>
+    <rMaterial name="materials:Aluminium"/>
+  </LogicalPart>
+  <LogicalPart name="EEfC100P" category="unspecified">
+    <rSolid name="EEfC100P"/>
+    <rMaterial name="materials:StainlessSteel"/>
+  </LogicalPart>
+  <LogicalPart name="EEfC100W" category="unspecified">
+    <rSolid name="EEfC100W"/>
+    <rMaterial name="materials:E_Water"/>
+  </LogicalPart>
+  <LogicalPart name="EEfC450P" category="unspecified">
+    <rSolid name="EEfC450P"/>
+    <rMaterial name="materials:StainlessSteel"/>
+  </LogicalPart>
+  <LogicalPart name="EEfC450W" category="unspecified">
+    <rSolid name="EEfC450W"/>
+    <rMaterial name="materials:E_Water"/>
+  </LogicalPart>
+  <LogicalPart name="EEfC150P" category="unspecified">
+    <rSolid name="EEfC150P"/>
+    <rMaterial name="materials:StainlessSteel"/>
+  </LogicalPart>
+  <LogicalPart name="EEfC150W" category="unspecified">
+    <rSolid name="EEfC150W"/>
+    <rMaterial name="materials:E_Water"/>
+  </LogicalPart>
+  <LogicalPart name="EEfC300P" category="unspecified">
+    <rSolid name="EEfC300P"/>
+    <rMaterial name="materials:StainlessSteel"/>
+  </LogicalPart>
+  <LogicalPart name="EEfC300W" category="unspecified">
+    <rSolid name="EEfC300W"/>
+    <rMaterial name="materials:E_Water"/>
+  </LogicalPart>
+  <LogicalPart name="EEfC600P" category="unspecified">
+    <rSolid name="EEfC600P"/>
+    <rMaterial name="materials:StainlessSteel"/>
+  </LogicalPart>
+  <LogicalPart name="EEfC600W" category="unspecified">
+    <rSolid name="EEfC600W"/>
+    <rMaterial name="materials:E_Water"/>
+  </LogicalPart>
+  <LogicalPart name="EEfC740P" category="unspecified">
+    <rSolid name="EEfC740P"/>
+    <rMaterial name="materials:StainlessSteel"/>
+  </LogicalPart>
+  <LogicalPart name="EEfC740W" category="unspecified">
+    <rSolid name="EEfC740W"/>
+    <rMaterial name="materials:E_Water"/>
+  </LogicalPart>
+  <LogicalPart name="EEfC420P" category="unspecified">
+    <rSolid name="EEfC420P"/>
+    <rMaterial name="materials:StainlessSteel"/>
+  </LogicalPart>
+  <LogicalPart name="EEfC420W" category="unspecified">
+    <rSolid name="EEfC420W"/>
+    <rMaterial name="materials:E_Water"/>
+  </LogicalPart>
+  <LogicalPart name="EECBXP1P" category="unspecified">
+    <rSolid name="EECBXP1P"/>
+    <rMaterial name="materials:StainlessSteel"/>
+  </LogicalPart>
+  <LogicalPart name="EECBXP1W" category="unspecified">
+    <rSolid name="EECBXP1W"/>
+    <rMaterial name="materials:E_Water"/>
+  </LogicalPart>
+  <LogicalPart name="EECBXP2P" category="unspecified">
+    <rSolid name="EECBXP2P"/>
+    <rMaterial name="materials:StainlessSteel"/>
+  </LogicalPart>
+  <LogicalPart name="EECBXP2W" category="unspecified">
+    <rSolid name="EECBXP2W"/>
+    <rMaterial name="materials:E_Water"/>
+  </LogicalPart>
+  <LogicalPart name="ESCone" category="unspecified">
+    <rSolid name="ESCone"/>
+    <rMaterial name="materials:Aluminium"/>
+  </LogicalPart>
+  <LogicalPart name="ESRing" category="unspecified">
+    <rSolid name="ESRing"/>
+    <rMaterial name="materials:Aluminium"/>
+  </LogicalPart>
+  <LogicalPart name="EECoolBox" category="unspecified">
+    <rSolid name="EECoolBox"/>
+    <rMaterial name="materials:Aluminium"/>
+  </LogicalPart>
+  <LogicalPart name="EECoolIns" category="unspecified">
+    <rSolid name="EECoolIns"/>
+    <rMaterial name="materials:E_Air"/>
+  </LogicalPart>
+  <LogicalPart name="EETankSS" category="unspecified">
+    <rSolid name="EETankSS"/>
+    <rMaterial name="materials:StainlessSteel"/>
+  </LogicalPart>
+  <LogicalPart name="EETankWa" category="unspecified">
+    <rSolid name="EETankWa"/>
+    <rMaterial name="materials:E_Water"/>
+  </LogicalPart>
+  <LogicalPart name="EECoolQ" category="unspecified">
+    <rSolid name="EECoolQ"/>
+    <rMaterial name="materials:E_Air"/>
+  </LogicalPart>
+  <LogicalPart name="EESpacer" category="unspecified">
+    <rSolid name="EESpacer"/>
+    <rMaterial name="materials:Aluminium"/>
+  </LogicalPart>
+  <LogicalPart name="EESpAir" category="unspecified">
+    <rSolid name="EESpAir"/>
+    <rMaterial name="materials:E_Air"/>
+  </LogicalPart>
+  <LogicalPart name="EEHV" category="unspecified">
+    <rSolid name="EEHV"/>
+    <rMaterial name="materials:E_G10"/>
+  </LogicalPart>
+  <LogicalPart name="EEHVCa" category="unspecified">
+    <rSolid name="EEHVCa"/>
+    <rMaterial name="materials:E_Cables"/>
+  </LogicalPart>
+  <LogicalPart name="EEOCool1" category="unspecified">
+    <rSolid name="EEOCool1"/>
+    <rMaterial name="materials:StainlessSteel"/>
+  </LogicalPart>
+  <LogicalPart name="EEOCool2" category="unspecified">
+    <rSolid name="EEOCool2"/>
+    <rMaterial name="materials:StainlessSteel"/>
+  </LogicalPart>
+  <LogicalPart name="EEOCool3" category="unspecified">
+    <rSolid name="EEOCool3"/>
+    <rMaterial name="materials:StainlessSteel"/>
+  </LogicalPart>
+  <LogicalPart name="EEOCool4" category="unspecified">
+    <rSolid name="EEOCool4"/>
+    <rMaterial name="materials:StainlessSteel"/>
+  </LogicalPart>
+  <LogicalPart name="EEOCool5" category="unspecified">
+    <rSolid name="EEOCool5"/>
+    <rMaterial name="materials:StainlessSteel"/>
+  </LogicalPart>
+  <LogicalPart name="EEOCool6" category="unspecified">
+    <rSolid name="EEOCool6"/>
+    <rMaterial name="materials:StainlessSteel"/>
+  </LogicalPart>
+  <LogicalPart name="EEOCool1W" category="unspecified">
+    <rSolid name="EEOCool1W"/>
+    <rMaterial name="materials:E_Water"/>
+  </LogicalPart>
+  <LogicalPart name="EEOCool2W" category="unspecified">
+    <rSolid name="EEOCool2W"/>
+    <rMaterial name="materials:E_Water"/>
+  </LogicalPart>
+  <LogicalPart name="EEOCool3W" category="unspecified">
+    <rSolid name="EEOCool3W"/>
+    <rMaterial name="materials:E_Water"/>
+  </LogicalPart>
+  <LogicalPart name="EEOCool4W" category="unspecified">
+    <rSolid name="EEOCool4W"/>
+    <rMaterial name="materials:E_Water"/>
+  </LogicalPart>
+  <LogicalPart name="EEOCool5W" category="unspecified">
+    <rSolid name="EEOCool5W"/>
+    <rMaterial name="materials:E_Water"/>
+  </LogicalPart>
+  <LogicalPart name="EEOCool6W" category="unspecified">
+    <rSolid name="EEOCool6W"/>
+    <rMaterial name="materials:E_Water"/>
+  </LogicalPart>
+</LogicalPartSection>
+
+<PosPartSection label="eefixed.xml">
+  <!-- Preshower Ring -->
+  <PosPart copyNumber="1">
+    <rParent name="eregalgo:EREG"/>
+    <rChild name="eefixed:ESRing"/>
+    <Translation x="0*mm" y="0*mm" z="[eecon:ESRingZFront] + [eecon:ESRingZThick]/2"/>
+  </PosPart>
+  <!-- Preshower Support Cone -->
+  <PosPart copyNumber="1">
+    <rParent name="eregalgo:EREG"/>
+    <rChild name="eefixed:ESCone"/>
+    <Translation x="0*mm" y="0*mm" z="[eecon:ESRingZFront] + [eecon:ESRingZThick] - [eecon:ESConeZ1]"/>
+  </PosPart>
+  <!-- Backplate and its cooling pipes -->
+  <PosPart copyNumber="1">
+    <rParent name="eehier:EEBackQuad"/>
+    <rChild name="eefixed:EEBackPlate"/>
+    <Translation x="0*mm" y="0*mm" z="[eecon:EEzBack] + [eecon:EEBackPlateThick]/2"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="eehier:EEBackQuad"/>
+    <rChild name="eefixed:EEBPPV"/>
+    <Translation x="0*mm" y="0*mm" z="[eecon:EEzBackBack] + [eecon:EEBPPOR]"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="eefixed:EEBPPAP"/>
+    <rChild name="eefixed:EEBPPAW"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="eefixed:EEBPPBP"/>
+    <rChild name="eefixed:EEBPPBW"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="eefixed:EEBPPCP"/>
+    <rChild name="eefixed:EEBPPCW"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="eefixed:EEBPPV"/>
+    <rChild name="eefixed:EEBPPAP"/>
+    <Translation x="[eecon:EEBackPlateIR] + [eecon:EEBPPLA]/2" y="[eecon:EEBPPLC]" z="0*mm"/>
+    <rRotation name="eecon:EEfCRotY"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="eefixed:EEBPPV"/>
+    <rChild name="eefixed:EEBPPAP"/>
+    <Translation x="[eecon:EEBackPlateIR] + [eecon:EEBPPLA]/2" y="2*[eecon:EEBPPLC]" z="0*mm"/>
+    <rRotation name="eecon:EEfCRotY"/>
+  </PosPart>
+  <PosPart copyNumber="3">
+    <rParent name="eefixed:EEBPPV"/>
+    <rChild name="eefixed:EEBPPAP"/>
+    <Translation x="[eecon:EEBackPlateIR] + [eecon:EEBPPLA]/2" y="3*[eecon:EEBPPLC]" z="0*mm"/>
+    <rRotation name="eecon:EEfCRotY"/>
+  </PosPart>
+  <PosPart copyNumber="4">
+    <rParent name="eefixed:EEBPPV"/>
+    <rChild name="eefixed:EEBPPAP"/>
+    <Translation x="[eecon:EEBPPLC] +   [eecon:EEBPPLA]/2" y="4*[eecon:EEBPPLC]" z="0*mm"/>
+    <rRotation name="eecon:EEfCRotY"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="eefixed:EEBPPV"/>
+    <rChild name="eefixed:EEBPPBP"/>
+    <Translation x="[eecon:EEBPPLC] +   [eecon:EEBPPLB]/2" y="5*[eecon:EEBPPLC]" z="0*mm"/>
+    <rRotation name="eecon:EEfCRotY"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="eefixed:EEBPPV"/>
+    <rChild name="eefixed:EEBPPBP"/>
+    <Translation x="[eecon:EEBPPLC] + 3*[eecon:EEBPPLB]/2" y="5*[eecon:EEBPPLC]" z="0*mm"/>
+    <rRotation name="eecon:EEfCRotY"/>
+  </PosPart>
+  <PosPart copyNumber="3">
+    <rParent name="eefixed:EEBPPV"/>
+    <rChild name="eefixed:EEBPPBP"/>
+    <Translation x="[eecon:EEBPPLC] - 2*[eecon:EEBPPOR]" y="[eecon:EEBackPlateOR] -   [eecon:EEBPPLB]/2 - 5*[eecon:EEBPPOR]" z="0*mm"/>
+    <rRotation name="eecon:EEfCRotX"/>
+  </PosPart>
+  <PosPart copyNumber="4">
+    <rParent name="eefixed:EEBPPV"/>
+    <rChild name="eefixed:EEBPPBP"/>
+    <Translation x="[eecon:EEBPPLC] - 2*[eecon:EEBPPOR]" y="[eecon:EEBackPlateOR] - 3*[eecon:EEBPPLB]/2 - 5*[eecon:EEBPPOR]" z="0*mm"/>
+    <rRotation name="eecon:EEfCRotX"/>
+  </PosPart>
+  <PosPart copyNumber="5">
+    <rParent name="eefixed:EEBPPV"/>
+    <rChild name="eefixed:EEBPPBP"/>
+    <Translation x="2*[eecon:EEBPPLC]" y="[eecon:EEBackPlateOR] - [eecon:EEBPPLB]/2 - 3*[eecon:EEBPPLC]/2" z="0*mm"/>
+    <rRotation name="eecon:EEfCRotX"/>
+  </PosPart>
+  <PosPart copyNumber="6">
+    <rParent name="eefixed:EEBPPV"/>
+    <rChild name="eefixed:EEBPPBP"/>
+    <Translation x="3*[eecon:EEBPPLC]" y="[eecon:EEBackPlateOR] - [eecon:EEBPPLB]/2 - 3*[eecon:EEBPPLC]/2" z="0*mm"/>
+    <rRotation name="eecon:EEfCRotX"/>
+  </PosPart>
+  <PosPart copyNumber="7">
+    <rParent name="eefixed:EEBPPV"/>
+    <rChild name="eefixed:EEBPPBP"/>
+    <Translation x="4*[eecon:EEBPPLC]" y="[eecon:EEBackPlateOR] - [eecon:EEBPPLB]/2 - 3*[eecon:EEBPPLC]/2" z="0*mm"/>
+    <rRotation name="eecon:EEfCRotX"/>
+  </PosPart>
+  <PosPart copyNumber="8">
+    <rParent name="eefixed:EEBPPV"/>
+    <rChild name="eefixed:EEBPPBP"/>
+    <Translation x="5*[eecon:EEBPPLC]" y="[eecon:EEBackPlateOR] - [eecon:EEBPPLB]/2 - 3*[eecon:EEBPPLC]/2" z="0*mm"/>
+    <rRotation name="eecon:EEfCRotX"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="eefixed:EEBPPV"/>
+    <rChild name="eefixed:EEBPPCP"/>
+    <Translation x="8.5*[eecon:EEBPPLC]+2*[eecon:EEBPPOR]" y="5*[eecon:EEBPPLC]" z="0*mm"/>
+    <rRotation name="eecon:EEfCRotY"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="eefixed:EEBPPV"/>
+    <rChild name="eefixed:EEBPPCP"/>
+    <Translation x="6.5*[eecon:EEBPPLC]" y="6*[eecon:EEBPPLC]" z="0*mm"/>
+    <rRotation name="eecon:EEfCRotY"/>
+  </PosPart>
+  <PosPart copyNumber="3">
+    <rParent name="eefixed:EEBPPV"/>
+    <rChild name="eefixed:EEBPPCP"/>
+    <Translation x="4.5*[eecon:EEBPPLC]" y="6*[eecon:EEBPPLC]" z="0*mm"/>
+    <rRotation name="eecon:EEfCRotY"/>
+  </PosPart>
+  <PosPart copyNumber="4">
+    <rParent name="eefixed:EEBPPV"/>
+    <rChild name="eefixed:EEBPPCP"/>
+    <Translation x="2.5*[eecon:EEBPPLC]" y="6*[eecon:EEBPPLC]" z="0*mm"/>
+    <rRotation name="eecon:EEfCRotY"/>
+  </PosPart>
+  <PosPart copyNumber="5">
+    <rParent name="eefixed:EEBPPV"/>
+    <rChild name="eefixed:EEBPPCP"/>
+    <Translation x="6.5*[eecon:EEBPPLC]" y="7.5*[eecon:EEBPPLC]" z="0*mm"/>
+    <rRotation name="eecon:EEfCRotY"/>
+  </PosPart>
+  <PosPart copyNumber="6">
+    <rParent name="eefixed:EEBPPV"/>
+    <rChild name="eefixed:EEBPPCP"/>
+    <Translation x="5.5*[eecon:EEBPPLC] + 3*[eecon:EEBPPOR]" y="  8*[eecon:EEBPPLC]" z="0*mm"/>
+    <rRotation name="eecon:EEfCRotY"/>
+  </PosPart>
+  <PosPart copyNumber="7">
+    <rParent name="eefixed:EEBPPV"/>
+    <rChild name="eefixed:EEBPPCP"/>
+    <Translation x="1.5*[eecon:EEBPPLC]" y=" 10*[eecon:EEBPPLC]" z="0*mm"/>
+    <rRotation name="eecon:EEfCRotX"/>
+  </PosPart>
+  <PosPart copyNumber="8">
+    <rParent name="eefixed:EEBPPV"/>
+    <rChild name="eefixed:EEBPPCP"/>
+    <Translation x="6*[eecon:EEBPPLC]" y="6.75*[eecon:EEBPPLC]" z="0*mm"/>
+    <rRotation name="eecon:EEfCRotX"/>
+  </PosPart>
+  <PosPart copyNumber="9">
+    <rParent name="eefixed:EEBPPV"/>
+    <rChild name="eefixed:EEBPPCP"/>
+    <Translation x="8.2*[eecon:EEBPPLC]" y="5.5*[eecon:EEBPPLC] + 4*[eecon:EEBPPOR]" z="0*mm"/>
+    <rRotation name="eecon:EEfCRotX"/>
+  </PosPart>
+  <PosPart copyNumber="10">
+    <rParent name="eefixed:EEBPPV"/>
+    <rChild name="eefixed:EEBPPCP"/>
+    <Translation x="9.2*[eecon:EEBPPLC] + 4*[eecon:EEBPPOR]" y="4.5*[eecon:EEBPPLC]" z="0*mm"/>
+    <rRotation name="eecon:EEfCRotX"/>
+  </PosPart>
+  <PosPart copyNumber="11">
+    <rParent name="eefixed:EEBPPV"/>
+    <rChild name="eefixed:EEBPPCP"/>
+    <Translation x="9.5*[eecon:EEBPPLC]" y="3.5*[eecon:EEBPPLC] + 2*[eecon:EEBPPOR]" z="0*mm"/>
+    <rRotation name="eecon:EEfCRotX"/>
+  </PosPart>
+  <PosPart copyNumber="12">
+    <rParent name="eefixed:EEBPPV"/>
+    <rChild name="eefixed:EEBPPCP"/>
+    <Translation x="10*[eecon:EEBPPLC] + 3*[eecon:EEBPPOR]" y="1.5*[eecon:EEBPPLC]" z="0*mm"/>
+    <rRotation name="eecon:EEfCRotX"/>
+  </PosPart>
+  <PosPart copyNumber="13">
+    <rParent name="eefixed:EEBPPV"/>
+    <rChild name="eefixed:EEBPPCP"/>
+    <Translation x="2.3*[eecon:EEBPPLC] - 5*[eecon:EEBPPOR]" y="2.5*[eecon:EEBPPLC]" z="0*mm"/>
+    <rRotation name="eecon:EEfCRotX"/>
+  </PosPart>
+  <PosPart copyNumber="14">
+    <rParent name="eefixed:EEBPPV"/>
+    <rChild name="eefixed:EEBPPCP"/>
+    <Translation x="[eecon:EEBPPLC] - 2*[eecon:EEBPPOR]" y="3.5*[eecon:EEBPPLC]" z="0*mm"/>
+    <rRotation name="eecon:EEfCRotX"/>
+  </PosPart>
+  <PosPart copyNumber="15">
+    <rParent name="eefixed:EEBPPV"/>
+    <rChild name="eefixed:EEBPPCP"/>
+    <Translation x="3.5*[eecon:EEBPPLC]" y="9.2*[eecon:EEBPPLC] + 2*[eecon:EEBPPOR]" z="0*mm"/>
+    <rRotation name="eecon:EEfCRotY"/>
+  </PosPart>
+  <PosPart copyNumber="16">
+    <rParent name="eefixed:EEBPPV"/>
+    <rChild name="eefixed:EEBPPCP"/>
+    <Translation x="8*[eecon:EEBPPLC]" y="4.5*[eecon:EEBPPLC]+2*[eecon:EEBPPOR]" z="0*mm"/>
+    <rRotation name="eecon:EEfCRotX"/>
+  </PosPart>
+  <PosPart copyNumber="17">
+    <rParent name="eefixed:EEBPPV"/>
+    <rChild name="eefixed:EEBPPCP"/>
+    <Translation x="8*[eecon:EEBPPLC]" y="5.5*[eecon:EEBPPLC]+2*[eecon:EEBPPOR]" z="0*mm"/>
+    <rRotation name="eecon:EEfCRotX"/>
+  </PosPart>
+  <PosPart copyNumber="18">
+    <rParent name="eefixed:EEBPPV"/>
+    <rChild name="eefixed:EEBPPCP"/>
+    <Translation x="7*[eecon:EEBPPLC]+2*[eecon:EEBPPOR]" y="5.5*[eecon:EEBPPLC]+2*[eecon:EEBPPOR]" z="0*mm"/>
+    <rRotation name="eecon:EEfCRotX"/>
+  </PosPart>
+  <PosPart copyNumber="19">
+    <rParent name="eefixed:EEBPPV"/>
+    <rChild name="eefixed:EEBPPCP"/>
+    <Translation x="5.5*[eecon:EEBPPLC]+2*[eecon:EEBPPOR]" y="8.5*[eecon:EEBPPLC]+2*[eecon:EEBPPOR]" z="0*mm"/>
+    <rRotation name="eecon:EEfCRotY"/>
+  </PosPart>
+  <PosPart copyNumber="20">
+    <rParent name="eefixed:EEBPPV"/>
+    <rChild name="eefixed:EEBPPCP"/>
+    <Translation x="2*[eecon:EEBPPLC]" y="1.5*[eecon:EEBPPLC]" z="0*mm"/>
+    <rRotation name="eecon:EEfCRot45"/>
+  </PosPart>
+  <PosPart copyNumber="21">
+    <rParent name="eefixed:EEBPPV"/>
+    <rChild name="eefixed:EEBPPCP"/>
+    <Translation x="1.15*[eecon:EEBPPLC]" y="2.5*[eecon:EEBPPLC]" z="0*mm"/>
+    <rRotation name="eecon:EEfCRot45"/>
+  </PosPart>
+  <!-- Cables -->
+  <PosPart copyNumber="1">
+    <rParent name="eehier:EEBackQuad"/>
+    <rChild name="eefixed:EECableF"/>
+    <Translation x="0*mm" y="0*mm" z="[eecon:EEzBackBack] + 2*[eecon:EEBPPOR] + [eecon:EECableFdz]"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="eehier:EEBackQuad"/>
+    <rChild name="eefixed:EECableR"/>
+    <Translation x="0*mm" y="0*mm" z="[eecon:EEzCoolQ] + [eecon:EECableRdz] + [eecon:EECBHt]/2"/>
+  </PosPart>
+  <!-- Rear, inner, front moderators -->
+  <PosPart copyNumber="1">
+    <rParent name="eehier:EEBackQuad"/>
+    <rChild name="eefixed:EEIMod"/>
+    <Translation x="0*mm" y="0*mm" z="[eecon:EEzMidIMod] "/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="eehier:EEBackQuad"/>
+    <rChild name="eefixed:EEFMod"/>
+    <Translation x="0*mm" y="0*mm" z="[eecon:EEzFMod] "/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="eehier:EEBackQuad"/>
+    <rChild name="eefixed:EERMod"/>
+    <Translation x="0*mm" y="0*mm" z="[eecon:EEzBackIMod] - [eecon:EERModTh]/2."/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="eehier:EEBackQuad"/>
+    <rChild name="eefixed:EERMCP"/>
+    <Translation x="0*mm" y="0*mm" z="[eecon:EEzBackIMod]-[eecon:EERModTh]-[eecon:EERMCPTh]/2."/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="eehier:EEBackQuad"/>
+    <rChild name="eefixed:EESRing"/>
+  </PosPart>
+  <!-- Environmental screens -->
+  <PosPart copyNumber="1">
+    <rParent name="eehier:EEFrontQuad"/>
+    <rChild name="eefixed:EEfEnvScr"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="eefixed:EEfEnvScr"/>
+    <rChild name="eefixed:EEgEnvScr"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="eehier:EEFrontQuad"/>
+    <rChild name="eefixed:EEiEnvScr"/>
+  </PosPart>
+  <!-- Horizontal and Vertical slats across inside of front environmental screen -->
+  <PosPart copyNumber="1">
+    <rParent name="eehier:EEFrontQuad"/>
+    <rChild name="eefixed:EEhSlat"/>
+    <Translation x="[eecon:EEiEnvScrOR1] + [eecon:EESlatLength]/2." y="[eecon:EEvSlatWidth]/4." z="[eecon:EEfEnvScrZ2] + [eecon:EEhSlatThick]/2."/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="eehier:EEFrontQuad"/>
+    <rChild name="eefixed:EEvSlat"/>
+    <Translation y="[eecon:EEiEnvScrOR1] + [eecon:EESlatLength]/2." x="[eecon:EEvSlatWidth]/4." z="[eecon:EEfEnvScrZ2] + [eecon:EEvSlatThick]/2."/>
+  </PosPart>
+  <!-- Cooling Pipes for Front Environmental Screen -->
+  <PosPart copyNumber="1">
+    <rParent name="eefixed:EEfC100P"/>
+    <rChild name="eefixed:EEfC100W"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="eefixed:EEfC450P"/>
+    <rChild name="eefixed:EEfC450W"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="eefixed:EEfC150P"/>
+    <rChild name="eefixed:EEfC150W"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="eefixed:EEfC300P"/>
+    <rChild name="eefixed:EEfC300W"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="eefixed:EEfC600P"/>
+    <rChild name="eefixed:EEfC600W"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="eefixed:EEfC740P"/>
+    <rChild name="eefixed:EEfC740W"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="eefixed:EEfC420P"/>
+    <rChild name="eefixed:EEfC420W"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="eehier:EEFrontQuad"/>
+    <rChild name="eefixed:EEfC100P"/>
+    <Translation x="1250*mm" y="800*mm" z="[eecon:EEfCoolZOff]"/>
+    <rRotation name="eecon:EEfCR100"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="eehier:EEFrontQuad"/>
+    <rChild name="eefixed:EEfC450P"/>
+    <Translation x="1215*mm" y="540*mm" z="[eecon:EEfCoolZOff]"/>
+    <rRotation name="eecon:EEfCRotX"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="eehier:EEFrontQuad"/>
+    <rChild name="eefixed:EEfC450P"/>
+    <Translation x="1065*mm" y="540*mm" z="[eecon:EEfCoolZOff]"/>
+    <rRotation name="eecon:EEfCRotX"/>
+  </PosPart>
+  <PosPart copyNumber="3">
+    <rParent name="eehier:EEFrontQuad"/>
+    <rChild name="eefixed:EEfC450P"/>
+    <Translation x="915*mm" y="990*mm" z="[eecon:EEfCoolZOff]"/>
+    <rRotation name="eecon:EEfCRotX"/>
+  </PosPart>
+  <PosPart copyNumber="4">
+    <rParent name="eehier:EEFrontQuad"/>
+    <rChild name="eefixed:EEfC450P"/>
+    <Translation x="535*mm" y="765*mm" z="[eecon:EEfCoolZOff]"/>
+    <rRotation name="eecon:EEfCRotY"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="eehier:EEFrontQuad"/>
+    <rChild name="eefixed:EEfC150P"/>
+    <Translation x="1140*mm" y="305*mm" z="[eecon:EEfCoolZOff]"/>
+    <rRotation name="eecon:EEfCRotY"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="eehier:EEFrontQuad"/>
+    <rChild name="eefixed:EEfC150P"/>
+    <Translation x="990*mm" y="765*mm" z="[eecon:EEfCoolZOff]"/>
+    <rRotation name="eecon:EEfCRotY"/>
+  </PosPart>
+  <PosPart copyNumber="3">
+    <rParent name="eehier:EEFrontQuad"/>
+    <rChild name="eefixed:EEfC150P"/>
+    <Translation x="615*mm" y="1290*mm" z="[eecon:EEfCoolZOff]"/>
+    <rRotation name="eecon:EEfCRotX"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="eehier:EEFrontQuad"/>
+    <rChild name="eefixed:EEfC300P"/>
+    <Translation x="765*mm" y="1215*mm" z="[eecon:EEfCoolZOff]"/>
+    <rRotation name="eecon:EEfCRotY"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="eehier:EEFrontQuad"/>
+    <rChild name="eefixed:EEfC300P"/>
+    <Translation x="460*mm" y="1365*mm" z="[eecon:EEfCoolZOff]"/>
+    <rRotation name="eecon:EEfCRotY"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="eehier:EEFrontQuad"/>
+    <rChild name="eefixed:EEfC600P"/>
+    <Translation x="305*mm" y="1065*mm" z="[eecon:EEfCoolZOff]"/>
+    <rRotation name="eecon:EEfCRotX"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="eehier:EEFrontQuad"/>
+    <rChild name="eefixed:EEfC740P"/>
+    <Translation x="765*mm" y="395*mm" z="[eecon:EEfCoolZOff]"/>
+    <rRotation name="eecon:EEfCRotX"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="eehier:EEFrontQuad"/>
+    <rChild name="eefixed:EEfC420P"/>
+    <Translation x="1353*mm" y="862*mm" z="0*mm"/>
+    <rRotation name="eecon:EEfCR420"/>
+  </PosPart>
+  <!-- Cooling Box Quadrant -->
+  <PosPart copyNumber="1">
+    <rParent name="eehier:EEBackQuad"/>
+    <rChild name="eefixed:EECoolQ"/>
+    <Translation x="0*mm" y="0*mm" z="[eecon:EEzCoolQ]"/>
+  </PosPart>
+  <!-- Cooling box placement -->
+  <PosPart copyNumber="1">
+    <rParent name="eefixed:EECoolQ"/>
+    <rChild name="eefixed:EECoolBox"/>
+    <Translation y="[eecon:EECBY1]" x="[eecon:EECBX1]" z="0*mm"/>
+    <rRotation name="eecon:EERotZ90"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="eefixed:EECoolQ"/>
+    <rChild name="eefixed:EECoolBox"/>
+    <Translation y="[eecon:EECBY2]" x="[eecon:EECBX2]" z="0*mm"/>
+    <rRotation name="eecon:EERotZ90"/>
+  </PosPart>
+  <PosPart copyNumber="3">
+    <rParent name="eefixed:EECoolQ"/>
+    <rChild name="eefixed:EECoolBox"/>
+    <Translation y="[eecon:EECBY3]" x="[eecon:EECBX3]" z="0*mm"/>
+    <rRotation name="eecon:EERotZ90"/>
+  </PosPart>
+  <PosPart copyNumber="4">
+    <rParent name="eefixed:EECoolQ"/>
+    <rChild name="eefixed:EECoolBox"/>
+    <Translation y="[eecon:EECBY4]" x="[eecon:EECBX4]" z="0*mm"/>
+    <rRotation name="eecon:EERotZ90"/>
+  </PosPart>
+  <PosPart copyNumber="5">
+    <rParent name="eefixed:EECoolQ"/>
+    <rChild name="eefixed:EECoolBox"/>
+    <Translation y="[eecon:EECBY5]" x="[eecon:EECBX5]" z="0*mm"/>
+    <rRotation name="eecon:EERotZ90"/>
+  </PosPart>
+  <PosPart copyNumber="6">
+    <rParent name="eefixed:EECoolQ"/>
+    <rChild name="eefixed:EECoolBox"/>
+    <Translation x="[eecon:EECBX6]" y="[eecon:EECBY6]" z="0*mm"/>
+    <rRotation name="rotations:000D"/>
+  </PosPart>
+  <PosPart copyNumber="7">
+    <rParent name="eefixed:EECoolQ"/>
+    <rChild name="eefixed:EECoolBox"/>
+    <Translation y="[eecon:EECBY7]" x="[eecon:EECBX7]" z="0*mm"/>
+    <rRotation name="eecon:EERotZ90"/>
+  </PosPart>
+  <PosPart copyNumber="8">
+    <rParent name="eefixed:EECoolQ"/>
+    <rChild name="eefixed:EECoolBox"/>
+    <Translation y="[eecon:EECBY8]" x="[eecon:EECBX8]" z="0*mm"/>
+    <rRotation name="eecon:EERotZ90"/>
+  </PosPart>
+  <PosPart copyNumber="9">
+    <rParent name="eefixed:EECoolQ"/>
+    <rChild name="eefixed:EECoolBox"/>
+    <Translation y="[eecon:EECBY9]" x="[eecon:EECBX9]" z="0*mm"/>
+    <rRotation name="eecon:EERotZ90"/>
+  </PosPart>
+  <PosPart copyNumber="10">
+    <rParent name="eefixed:EECoolQ"/>
+    <rChild name="eefixed:EECoolBox"/>
+    <Translation y="[eecon:EECBY10]" x="[eecon:EECBX10]" z="0*mm"/>
+    <rRotation name="eecon:EERotZ90"/>
+  </PosPart>
+  <PosPart copyNumber="11">
+    <rParent name="eefixed:EECoolQ"/>
+    <rChild name="eefixed:EECoolBox"/>
+    <Translation y="[eecon:EECBY11]" x="[eecon:EECBX11]" z="0*mm"/>
+    <rRotation name="eecon:EERotZ90"/>
+  </PosPart>
+  <PosPart copyNumber="12">
+    <rParent name="eefixed:EECoolQ"/>
+    <rChild name="eefixed:EECoolBox"/>
+    <Translation y="[eecon:EECBY12]" x="[eecon:EECBX12]" z="0*mm"/>
+    <rRotation name="eecon:EERotZ90"/>
+  </PosPart>
+  <PosPart copyNumber="13">
+    <rParent name="eefixed:EECoolQ"/>
+    <rChild name="eefixed:EECoolBox"/>
+    <Translation y="[eecon:EECBY13]" x="[eecon:EECBX13]" z="0*mm"/>
+    <rRotation name="eecon:EERotZ90"/>
+  </PosPart>
+  <PosPart copyNumber="14">
+    <rParent name="eefixed:EECoolQ"/>
+    <rChild name="eefixed:EECoolBox"/>
+    <Translation y="[eecon:EECBY14]" x="[eecon:EECBX14]" z="0*mm"/>
+    <rRotation name="eecon:EERotZ90"/>
+  </PosPart>
+  <PosPart copyNumber="15">
+    <rParent name="eefixed:EECoolQ"/>
+    <rChild name="eefixed:EECoolBox"/>
+    <Translation y="[eecon:EECBY15]" x="[eecon:EECBX15]" z="0*mm"/>
+    <rRotation name="eecon:EERotZ90"/>
+  </PosPart>
+  <PosPart copyNumber="16">
+    <rParent name="eefixed:EECoolQ"/>
+    <rChild name="eefixed:EECoolBox"/>
+    <Translation x="[eecon:EECBX16]" y="[eecon:EECBY16]" z="0*mm"/>
+    <rRotation name="rotations:000D"/>
+  </PosPart>
+  <PosPart copyNumber="17">
+    <rParent name="eefixed:EECoolQ"/>
+    <rChild name="eefixed:EECoolBox"/>
+    <Translation x="[eecon:EECBX17]" y="[eecon:EECBY17]" z="0*mm"/>
+    <rRotation name="rotations:000D"/>
+  </PosPart>
+  <PosPart copyNumber="18">
+    <rParent name="eefixed:EECoolQ"/>
+    <rChild name="eefixed:EECoolBox"/>
+    <Translation x="[eecon:EECBX18]" y="[eecon:EECBY18]" z="0*mm"/>
+    <rRotation name="rotations:000D"/>
+  </PosPart>
+  <PosPart copyNumber="19">
+    <rParent name="eefixed:EECoolQ"/>
+    <rChild name="eefixed:EECoolBox"/>
+    <Translation x="[eecon:EECBX19]" y="[eecon:EECBY19]" z="0*mm"/>
+    <rRotation name="rotations:000D"/>
+  </PosPart>
+  <!-- Interior of cooling bar box and water supply tanks -->
+  <PosPart copyNumber="1">
+    <rParent name="eefixed:EECoolBox"/>
+    <rChild name="eefixed:EECoolIns"/>
+    <Translation x="0*mm" y="0*mm" z="0*mm"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="eefixed:EECoolIns"/>
+    <rChild name="eefixed:EETankSS"/>
+    <Translation y="-230*mm" z="-31*mm" x="0*mm"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="eefixed:EECoolIns"/>
+    <rChild name="eefixed:EETankSS"/>
+    <Translation y="-230*mm" z="31*mm" x="0*mm"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="eefixed:EETankSS"/>
+    <rChild name="eefixed:EETankWa"/>
+  </PosPart>
+  <!-- Cooling bars inside cooling box interior -->
+  <PosPart copyNumber="101">
+    <rParent name="eefixed:EECoolIns"/>
+    <rChild name="eregalgo:ECVFE"/>
+    <Translation y="15*mm" z="0*mm" x="-36*mm"/>
+    <rRotation name="eecon:EEfCRotY"/>
+  </PosPart>
+  <PosPart copyNumber="102">
+    <rParent name="eefixed:EECoolIns"/>
+    <rChild name="eregalgo:ECVFE"/>
+    <Translation y="15*mm" z="0*mm" x="0*mm"/>
+    <rRotation name="eecon:EEfCRotY"/>
+  </PosPart>
+  <PosPart copyNumber="103">
+    <rParent name="eefixed:EECoolIns"/>
+    <rChild name="eregalgo:ECVFE"/>
+    <Translation y="15*mm" z="0*mm" x="36*mm"/>
+    <rRotation name="eecon:EEfCRotY"/>
+  </PosPart>
+  <!-- Extra cooling bars for 4-bar units -->
+  <PosPart copyNumber="104">
+    <rParent name="eefixed:EECoolQ"/>
+    <rChild name="eregalgo:ECVFE"/>
+    <Translation x="[eecon:EECBX1]" y="12*mm" z="0*mm"/>
+    <rRotation name="eecon:EERotVFE"/>
+  </PosPart>
+  <PosPart copyNumber="105">
+    <rParent name="eefixed:EECoolQ"/>
+    <rChild name="eregalgo:ECVFE"/>
+    <Translation x="[eecon:EECBX10]" y="[eecon:EECBY10] - [eecon:EECBWid]/2 -13*mm" z="0*mm"/>
+    <rRotation name="eecon:EERotVFE"/>
+  </PosPart>
+  <PosPart copyNumber="106">
+    <rParent name="eefixed:EECoolQ"/>
+    <rChild name="eregalgo:ECVFE"/>
+    <Translation x="[eecon:EECBX16] - [eecon:EECBWid]/2 -13*mm" y="[eecon:EECBY16]" z="0*mm"/>
+    <rRotation name="eecon:EEfCRotY"/>
+  </PosPart>
+  <!-- Piping to cooling blocks -->
+  <PosPart copyNumber="1">
+    <rParent name="eefixed:EECBXP1P"/>
+    <rChild name="eefixed:EECBXP1W"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="eefixed:EECBXP2P"/>
+    <rChild name="eefixed:EECBXP2W"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="eefixed:EECoolQ"/>
+    <rChild name="eefixed:EECBXP2P"/>
+    <Translation x="([eecon:EECBX1] + [eecon:EECBX7])/2" y="[eecon:EECBY1] - [eecon:EECBWid]/2 -13*mm" z="[eecon:EECBzPip]"/>
+    <rRotation name="eecon:EEfCRotY"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="eefixed:EECoolQ"/>
+    <rChild name="eefixed:EECBXP2P"/>
+    <Translation x="([eecon:EECBX1] + [eecon:EECBX7])/2" y="[eecon:EECBY1] - [eecon:EECBWid]/2 -13*mm" z="-[eecon:EECBzPip]"/>
+    <rRotation name="eecon:EEfCRotY"/>
+  </PosPart>
+  <PosPart copyNumber="3">
+    <rParent name="eefixed:EECoolQ"/>
+    <rChild name="eefixed:EECBXP2P"/>
+    <Translation x="([eecon:EECBX2] + [eecon:EECBX8])/2" y="([eecon:EECBY1] + [eecon:EECBY2])/2" z="[eecon:EECBzPip]"/>
+    <rRotation name="eecon:EEfCRotY"/>
+  </PosPart>
+  <PosPart copyNumber="4">
+    <rParent name="eefixed:EECoolQ"/>
+    <rChild name="eefixed:EECBXP2P"/>
+    <Translation x="([eecon:EECBX2] + [eecon:EECBX8])/2" y="([eecon:EECBY1] + [eecon:EECBY2])/2" z="-[eecon:EECBzPip]"/>
+    <rRotation name="eecon:EEfCRotY"/>
+  </PosPart>
+  <PosPart copyNumber="5">
+    <rParent name="eefixed:EECoolQ"/>
+    <rChild name="eefixed:EECBXP2P"/>
+    <Translation x="([eecon:EECBX3] + [eecon:EECBX9])/2" y="([eecon:EECBY2] + [eecon:EECBY3])/2" z="[eecon:EECBzPip]"/>
+    <rRotation name="eecon:EEfCRotY"/>
+  </PosPart>
+  <PosPart copyNumber="6">
+    <rParent name="eefixed:EECoolQ"/>
+    <rChild name="eefixed:EECBXP2P"/>
+    <Translation x="([eecon:EECBX3] + [eecon:EECBX9])/2" y="([eecon:EECBY2] + [eecon:EECBY3])/2" z="-[eecon:EECBzPip]"/>
+    <rRotation name="eecon:EEfCRotY"/>
+  </PosPart>
+  <PosPart copyNumber="7">
+    <rParent name="eefixed:EECoolQ"/>
+    <rChild name="eefixed:EECBXP2P"/>
+    <Translation x="([eecon:EECBX4] + [eecon:EECBX10])/2" y="([eecon:EECBY3] + [eecon:EECBY4])/2" z="[eecon:EECBzPip]"/>
+    <rRotation name="eecon:EEfCRotY"/>
+  </PosPart>
+  <PosPart copyNumber="8">
+    <rParent name="eefixed:EECoolQ"/>
+    <rChild name="eefixed:EECBXP2P"/>
+    <Translation x="([eecon:EECBX4] + [eecon:EECBX10])/2" y="([eecon:EECBY3] + [eecon:EECBY4])/2" z="-[eecon:EECBzPip]"/>
+    <rRotation name="eecon:EEfCRotY"/>
+  </PosPart>
+  <PosPart copyNumber="9">
+    <rParent name="eefixed:EECoolQ"/>
+    <rChild name="eefixed:EECBXP2P"/>
+    <Translation x="([eecon:EECBX5] + [eecon:EECBX11])/2" y="([eecon:EECBY4] + [eecon:EECBY5])/2" z="[eecon:EECBzPip]"/>
+    <rRotation name="eecon:EEfCRotY"/>
+  </PosPart>
+  <PosPart copyNumber="10">
+    <rParent name="eefixed:EECoolQ"/>
+    <rChild name="eefixed:EECBXP2P"/>
+    <Translation x="([eecon:EECBX5] + [eecon:EECBX11])/2" y="([eecon:EECBY4] + [eecon:EECBY5])/2" z="-[eecon:EECBzPip]"/>
+    <rRotation name="eecon:EEfCRotY"/>
+  </PosPart>
+  <PosPart copyNumber="11">
+    <rParent name="eefixed:EECoolQ"/>
+    <rChild name="eefixed:EECBXP2P"/>
+    <Translation x="([eecon:EECBX5] + [eecon:EECBX11])/2" y="([eecon:EECBY11] + [eecon:EECBY12])/2 - 10*mm" z="[eecon:EECBzPip]"/>
+    <rRotation name="eecon:EEfCRotY"/>
+  </PosPart>
+  <PosPart copyNumber="12">
+    <rParent name="eefixed:EECoolQ"/>
+    <rChild name="eefixed:EECBXP2P"/>
+    <Translation x="([eecon:EECBX5] + [eecon:EECBX11])/2" y="([eecon:EECBY11] + [eecon:EECBY12])/2 - 10*mm" z="-[eecon:EECBzPip]"/>
+    <rRotation name="eecon:EEfCRotY"/>
+  </PosPart>
+  <PosPart copyNumber="13">
+    <rParent name="eefixed:EECoolQ"/>
+    <rChild name="eefixed:EECBXP1P"/>
+    <Translation x=" [eecon:EECBX12]" y="([eecon:EECBY12] + [eecon:EECBY13])/2" z="[eecon:EECBzPip]"/>
+    <rRotation name="eecon:EEfCRotY"/>
+  </PosPart>
+  <PosPart copyNumber="14">
+    <rParent name="eefixed:EECoolQ"/>
+    <rChild name="eefixed:EECBXP1P"/>
+    <Translation x=" [eecon:EECBX12]" y="([eecon:EECBY12] + [eecon:EECBY13])/2" z="-[eecon:EECBzPip]"/>
+    <rRotation name="eecon:EEfCRotY"/>
+  </PosPart>
+  <PosPart copyNumber="15">
+    <rParent name="eefixed:EECoolQ"/>
+    <rChild name="eefixed:EECBXP1P"/>
+    <Translation x=" [eecon:EECBX13]" y="([eecon:EECBY13] + [eecon:EECBY14])/2" z="[eecon:EECBzPip]"/>
+    <rRotation name="eecon:EEfCRotY"/>
+  </PosPart>
+  <PosPart copyNumber="16">
+    <rParent name="eefixed:EECoolQ"/>
+    <rChild name="eefixed:EECBXP1P"/>
+    <Translation x=" [eecon:EECBX13]" y="([eecon:EECBY13] + [eecon:EECBY14])/2" z="-[eecon:EECBzPip]"/>
+    <rRotation name="eecon:EEfCRotY"/>
+  </PosPart>
+  <PosPart copyNumber="17">
+    <rParent name="eefixed:EECoolQ"/>
+    <rChild name="eefixed:EECBXP1P"/>
+    <Translation x=" [eecon:EECBX14]" y="([eecon:EECBY14] + [eecon:EECBY15])/2" z="[eecon:EECBzPip]"/>
+    <rRotation name="eecon:EEfCRotY"/>
+  </PosPart>
+  <PosPart copyNumber="18">
+    <rParent name="eefixed:EECoolQ"/>
+    <rChild name="eefixed:EECBXP1P"/>
+    <Translation x=" [eecon:EECBX14]" y="([eecon:EECBY14] + [eecon:EECBY15])/2" z="-[eecon:EECBzPip]"/>
+    <rRotation name="eecon:EEfCRotY"/>
+  </PosPart>
+  <PosPart copyNumber="19">
+    <rParent name="eefixed:EECoolQ"/>
+    <rChild name="eefixed:EECBXP2P"/>
+    <Translation x=" [eecon:EECBX16] + [eecon:EECBWid]/2 + 13*mm" y="([eecon:EECBY16] + [eecon:EECBY17])/2" z="[eecon:EECBzPip]"/>
+    <rRotation name="eecon:EEfCRotX"/>
+  </PosPart>
+  <PosPart copyNumber="20">
+    <rParent name="eefixed:EECoolQ"/>
+    <rChild name="eefixed:EECBXP2P"/>
+    <Translation x=" [eecon:EECBX16] + [eecon:EECBWid]/2 + 13*mm" y="([eecon:EECBY16] + [eecon:EECBY17])/2" z="-[eecon:EECBzPip]"/>
+    <rRotation name="eecon:EEfCRotX"/>
+  </PosPart>
+  <PosPart copyNumber="21">
+    <rParent name="eefixed:EECoolQ"/>
+    <rChild name="eefixed:EECBXP2P"/>
+    <Translation x="([eecon:EECBX16] + [eecon:EECBX18])/2" y="([eecon:EECBY18] + [eecon:EECBY19])/2" z="[eecon:EECBzPip]"/>
+    <rRotation name="eecon:EEfCRotX"/>
+  </PosPart>
+  <PosPart copyNumber="22">
+    <rParent name="eefixed:EECoolQ"/>
+    <rChild name="eefixed:EECBXP2P"/>
+    <Translation x="([eecon:EECBX16] + [eecon:EECBX18])/2" y="([eecon:EECBY18] + [eecon:EECBY19])/2" z="-[eecon:EECBzPip]"/>
+    <rRotation name="eecon:EEfCRotX"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="eefixed:EEHV"/>
+    <rChild name="eefixed:EEHVCa"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="eefixed:EESpAir"/>
+    <rChild name="eefixed:EEHV"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="eefixed:EESpacer"/>
+    <rChild name="eefixed:EESpAir"/>
+    <Translation x="0*mm" y="0*mm" z="[eecon:EESpAirZOff]"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="eregalgo:EESCEnv1"/>
+    <rChild name="eefixed:EESpacer"/>
+    <Translation x="[eecon:EESpaXYOff]" y="[eecon:EESpaXYOff]" z="-[eecon:EESpaDepth]/2. + [eecon:SCEnvLength]/2."/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="eefixed:EEOCool1"/>
+    <rChild name="eefixed:EEOCool1W"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="eefixed:EEOCool2"/>
+    <rChild name="eefixed:EEOCool2W"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="eefixed:EEOCool3"/>
+    <rChild name="eefixed:EEOCool3W"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="eefixed:EEOCool4"/>
+    <rChild name="eefixed:EEOCool4W"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="eefixed:EEOCool5"/>
+    <rChild name="eefixed:EEOCool5W"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="eefixed:EEOCool6"/>
+    <rChild name="eefixed:EEOCool6W"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="eefixed:EEgEnvScr"/>
+    <rChild name="eefixed:EEOCool1"/>
+    <Translation x="0*mm" y="0*mm" z="-157*mm"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="eefixed:EEgEnvScr"/>
+    <rChild name="eefixed:EEOCool2"/>
+    <Translation x="0*mm" y="0*mm" z="-63*mm"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="eefixed:EEgEnvScr"/>
+    <rChild name="eefixed:EEOCool3"/>
+    <Translation x="0*mm" y="0*mm" z=" 32*mm"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="eefixed:EEgEnvScr"/>
+    <rChild name="eefixed:EEOCool4"/>
+    <Translation x="0*mm" y="0*mm" z="124*mm"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="eefixed:EEgEnvScr"/>
+    <rChild name="eefixed:EEOCool5"/>
+    <Translation x="1583.7*sin(2*deg)*mm" y="1583.7*cos(2*deg)*mm" z="-118*mm"/>
+    <rRotation name="eecon:EEOScrR5A"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="eefixed:EEgEnvScr"/>
+    <rChild name="eefixed:EEOCool5"/>
+    <Translation x="1652.1*sin(2*deg)*mm" y="1652.1*cos(2*deg)*mm" z="70*mm"/>
+    <rRotation name="eecon:EEOScrR5A"/>
+  </PosPart>
+  <PosPart copyNumber="3">
+    <rParent name="eefixed:EEgEnvScr"/>
+    <rChild name="eefixed:EEOCool5"/>
+    <Translation y="1618*sin(5*deg)*mm" x="1618*cos(5*deg)*mm" z="-24*mm"/>
+    <rRotation name="eecon:EEOScrR5B"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="eefixed:EEgEnvScr"/>
+    <rChild name="eefixed:EEOCool6"/>
+    <Translation y="1618*sin(2*deg)*mm" x="1618*cos(2*deg)*mm" z="-24*mm"/>
+    <rRotation name="eecon:EEOScrR5B"/>
+  </PosPart>
+</PosPartSection>
+
+</DDDefinition>
diff --git a/Geometry/EcalCommonData/data/PhaseII/ShortEE/eehier.xml b/Geometry/EcalCommonData/data/PhaseII/ShortEE/eehier.xml
new file mode 100644
index 0000000000000..13b6d4d2f2193
--- /dev/null
+++ b/Geometry/EcalCommonData/data/PhaseII/ShortEE/eehier.xml
@@ -0,0 +1,92 @@
+<?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="eehier.xml" eval="true">
+		<Constant name="EESCLimsXlo" value="1"/>
+		<Constant name="EESCLimsXhi" value="10"/>
+		<Constant name="EESCLimsYlo" value="1"/>
+		<Constant name="EESCLimsYhi" value="10"/>
+	</ConstantsSection>
+	<SolidSection label="eehier.xml">
+		<!-- Endcap, dee, quadrant, backplate volumes -->
+		<Polycone name="ENCA" startPhi="0*deg" deltaPhi="360*deg">
+			<ZSection z="[eecon:EEzFront]" rMin="[eecon:EEfEnvScrIR1]" rMax="[eecon:EErMax1]"/>
+			<ZSection z="[eecon:EEFrontMidZ]" rMin="[eecon:EEiEnvScrIR3]" rMax="[eecon:EEFrontMidOR]"/>
+			<ZSection z="[eecon:EEzBack]" rMin="[eecon:ENCAEnvRBack]" rMax="[eecon:EErMax2]"/>
+		</Polycone>
+		<Polycone name="EEDee" startPhi="-90*deg" deltaPhi="180*deg">
+			<ZSection z="[eecon:EEzFront]" rMin="[eecon:EEfEnvScrIR1]" rMax="[eecon:EErMax1]"/>
+			<ZSection z="[eecon:EEFrontMidZ]" rMin="[eecon:EEiEnvScrIR3]" rMax="[eecon:EEFrontMidOR]"/>
+			<ZSection z="[eecon:EEzBack]" rMin="[eecon:ENCAEnvRBack]" rMax="[eecon:EErMax2]"/>
+		</Polycone>
+		<Polycone name="EEBackQuad" startPhi="0*deg" deltaPhi="90*deg">
+			<ZSection z="[eecon:EEzBack]" rMin="[eecon:ENCAEnvRBack]" rMax="[eecon:EBRMax]"/>
+			<ZSection z="[eecon:EEzNeck]" rMin="[eecon:ENCAEnvRNeck]" rMax="[eecon:EBRMax]"/>
+			<ZSection z="[eecon:EEzNeck]" rMin="[eecon:ENCAEnvRNeck]" rMax="[eecon:EErNeck]"/>
+			<ZSection z="[eecon:EEBConeZ]" rMin="[eecon:ENCAEnvRBCone]" rMax="[eecon:EErNeck]"/>
+			<ZSection z="[eecon:EEBConeZ]" rMin="[eecon:EEBConeIR]" rMax="[eecon:EErNeck]"/>
+			<ZSection z="[eecon:EEFarZ]" rMin="[eecon:EEBConeIR]" rMax="[eecon:EErNeck]"/>
+		</Polycone>
+		<Polycone name="EEFrontDee" startPhi="-90*deg" deltaPhi="180*deg">
+			<ZSection z="[eecon:EEfEnvScrZ1]" rMin="[eecon:EEfEnvScrIR1]" rMax="[eecon:EErMax1]"/>
+			<ZSection z="[eecon:EEiEnvScrZ3]" rMin="[eecon:EEiEnvScrIR3]" rMax="[eecon:EEFrontMidOR]"/>
+			<ZSection z="[eecon:EEiEnvScrZ5]" rMin="[eecon:EEiEnvScrIR5]" rMax="[eecon:EErMax2]"/>
+		</Polycone>
+		<Polycone name="EEFrontQuad" startPhi="0*deg" deltaPhi="90*deg">
+			<ZSection z="[eecon:EEfEnvScrZ1]" rMin="[eecon:EEfEnvScrIR1]" rMax="[eecon:EErMax1]"/>
+			<ZSection z="[eecon:EEiEnvScrZ3]" rMin="[eecon:EEiEnvScrIR3]" rMax="[eecon:EEFrontMidOR]"/>
+			<ZSection z="[eecon:EEiEnvScrZ5]" rMin="[eecon:EEiEnvScrIR5]" rMax="[eecon:EEfEnvScrOR4]"/>
+		</Polycone>
+	</SolidSection>
+	<LogicalPartSection label="eehier.xml">
+		<LogicalPart name="ENCA" category="unspecified">
+			<rSolid name="ENCA"/>
+			<rMaterial name="materials:E_Air"/>
+		</LogicalPart>
+		<LogicalPart name="EEDee" category="unspecified">
+			<rSolid name="EEDee"/>
+			<rMaterial name="materials:E_Air"/>
+		</LogicalPart>
+		<LogicalPart name="EEFrontDee" category="unspecified">
+			<rSolid name="EEFrontDee"/>
+			<rMaterial name="materials:E_Air"/>
+		</LogicalPart>
+		<LogicalPart name="EEFrontQuad" category="unspecified">
+			<rSolid name="EEFrontQuad"/>
+			<rMaterial name="materials:E_Air"/>
+		</LogicalPart>
+		<LogicalPart name="EEBackQuad" category="unspecified">
+			<rSolid name="EEBackQuad"/>
+			<rMaterial name="materials:E_Air"/>
+		</LogicalPart>
+	</LogicalPartSection>
+	<PosPartSection label="eehier.xml">
+		<!-- Full endcap, dees, front and back quadrants -->
+		<PosPart copyNumber="1">
+			<rParent name="eregalgo:EREG"/>
+			<rChild name="eehier:ENCA"/>
+		</PosPart>
+		<PosPart copyNumber="1">
+			<rParent name="eehier:ENCA"/>
+			<rChild name="eehier:EEDee"/>
+		</PosPart>
+		<PosPart copyNumber="2">
+			<rParent name="eehier:ENCA"/>
+			<rChild name="eehier:EEDee"/>
+			<rRotation name="rotations:R180"/>
+		</PosPart>
+		<PosPart copyNumber="1">
+			<rParent name="eehier:EEDee"/>
+			<rChild name="eehier:EEFrontDee"/>
+			<Translation x="0*mm" y="0*mm" z="[eecon:EEzFront] + [eecon:EEdz]"/>
+		</PosPart>
+		<PosPart copyNumber="1">
+			<rParent name="eehier:EEFrontDee"/>
+			<rChild name="eehier:EEFrontQuad"/>
+		</PosPart>
+		<PosPart copyNumber="2">
+			<rParent name="eehier:EEFrontDee"/>
+			<rChild name="eehier:EEFrontQuad"/>
+			<rReflectionRotation name="eecon:ReflectionY"/>
+		</PosPart>
+	</PosPartSection>
+</DDDefinition>
diff --git a/Geometry/EcalCommonData/data/PhaseII/ShortEE/eregalgo.xml b/Geometry/EcalCommonData/data/PhaseII/ShortEE/eregalgo.xml
new file mode 100644
index 0000000000000..d99b9a5bf9f7e
--- /dev/null
+++ b/Geometry/EcalCommonData/data/PhaseII/ShortEE/eregalgo.xml
@@ -0,0 +1,44 @@
+<?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="eregalgo.xml" eval="true">
+		
+		
+	</ConstantsSection>
+	<SolidSection label="eregalgo.xml">
+		<Polycone name="ECAL" startPhi="0*deg" deltaPhi="360*deg">
+			<ZSection z="-[eecon:EEzBack]"  rMin="[eecon:EEIRECAL]" rMax="[eecon:EBRMax]"/>
+			<ZSection z="-[eecon:EEzFront]" rMin="[eecon:EEIRECAL]" rMax="[eecon:EBRMax]"/>
+			<ZSection z="-([escon:PRESH_Z_OFFSET] - [escon:PRESH_Z_TOTAL]/2. + [eecon:EEzMagF])" rMin="[eecon:EEIRECAL]" rMax="[eecon:EBRMax]"/>
+			<ZSection z="-([escon:PRESH_Z_OFFSET] - [escon:PRESH_Z_TOTAL]/2. + [eecon:EEzMagF])" rMin="[eecon:EBRMin]" rMax="[eecon:EBRMax]"/>
+			<ZSection z="  [escon:PRESH_Z_OFFSET] - [escon:PRESH_Z_TOTAL]/2. + [eecon:EEzMagF]" rMin="[eecon:EBRMin]" rMax="[eecon:EBRMax]"/>
+			<ZSection z="  [escon:PRESH_Z_OFFSET] - [escon:PRESH_Z_TOTAL]/2. + [eecon:EEzMagF]" rMin="[eecon:EEIRECAL]" rMax="[eecon:EBRMax]"/>
+			<ZSection z="  [eecon:EEzFront]" rMin="[eecon:EEIRECAL]" rMax="[eecon:EBRMax]"/>
+			<ZSection z="  [eecon:EEzBack]"  rMin="[eecon:EEIRECAL]" rMax="[eecon:EBRMax]"/>
+		</Polycone>
+		<Polycone name="EREG" startPhi="0*deg" deltaPhi="360*deg">
+			<ZSection z="[escon:PRESH_Z_OFFSET] - [escon:PRESH_Z_TOTAL]/2." rMin="[eecon:EEIREREG]" rMax="[escon:PRESH_RMAX_FRONT]"/>
+			<ZSection z="[escon:PRESH_Z_OFFSET] + [escon:PRESH_MID_Z]" rMin="[eecon:EEIREREG]" rMax="[escon:PRESH_RMAX_BACK]"/>
+			<ZSection z="[escon:PRESH_Z_OFFSET] + [escon:PRESH_Z_TOTAL]/2." rMin="[eecon:EEIREREG]" rMax="[escon:PRESH_RMAX_BACK]"/>
+			<ZSection z="[eecon:EEzFront]" rMin="[eecon:EEIREREG]" rMax="[escon:PRESH_RMAX_BACK]"/>
+			<ZSection z="[eecon:EEzFront]" rMin="[eecon:EEIREREG]" rMax="[eecon:EErMax1]"/>
+			<ZSection z="[eecon:EEzBack]" rMin="[eecon:EEIREREG]" rMax="[eecon:EErMax2]"/>
+		</Polycone>
+	</SolidSection>
+	<LogicalPartSection label="eregalgo.xml">
+		<LogicalPart name="ECAL" category="unspecified">
+			<rSolid name="ECAL"/>
+			<rMaterial name="materials:Air"/>
+		</LogicalPart>
+		<LogicalPart name="EREG" category="unspecified">
+			<rSolid name="EREG"/>
+			<rMaterial name="materials:E_Air"/>
+		</LogicalPart>
+	</LogicalPartSection>
+	<PosPartSection label="eregalgo.xml">
+		<PosPart copyNumber="1">
+			<rParent name="caloBase:CALO"/>
+			<rChild name="eregalgo:ECAL"/>
+			<rRotation name="rotations:000D"/>
+		</PosPart>
+	</PosPartSection>
+</DDDefinition>
diff --git a/Geometry/HGCalCommonData/plugins/DDShashlikEndcap.cc b/Geometry/HGCalCommonData/plugins/DDShashlikEndcap.cc
index b722c34220a3f..804cc4379f1f5 100644
--- a/Geometry/HGCalCommonData/plugins/DDShashlikEndcap.cc
+++ b/Geometry/HGCalCommonData/plugins/DDShashlikEndcap.cc
@@ -65,11 +65,11 @@ DDShashlikEndcap::createQuarter( DDCompactView& cpv, int xQuadrant, int yQuadran
   double offsetZ = m_zoffset;
   double offsetX = offsetZ * tan( xphi );
   double offsetY = offsetZ * tan( yphi );
-
-  while( abs(offsetY) < m_rMax )
-  {
-    while( abs(offsetX) < m_rMax )
-    {
+  int row(0), column(0);
+  while( abs(offsetX) < m_rMax ) {
+    column++;
+    while( abs(offsetY) < m_rMax ) {
+      row++;
       double limit = sqrt( offsetX*offsetX + offsetY*offsetY );
       
       // Make sure we do not add supermodules in rMin area
@@ -93,18 +93,17 @@ DDShashlikEndcap::createQuarter( DDCompactView& cpv, int xQuadrant, int yQuadran
 	
 	DDName parentName = parent().name(); 
 	cpv.position( DDName( m_childName ), parentName, copyNo, tran, rotation );
-
 	copyNo += m_incrCopyNo;
       }
-      xphi +=  xQuadrant*2.*tiltAngle;
-      offsetX = offsetZ * tan( xphi );
+      yphi += yQuadrant*2.*tiltAngle;
+      offsetY = offsetZ * tan( yphi );
     }
-    yphi += yQuadrant*2.*tiltAngle;
-    xphi =  xQuadrant*tiltAngle;
+    xphi +=  xQuadrant*2.*tiltAngle;
+    yphi  =  yQuadrant*tiltAngle;
     offsetX = offsetZ * tan( xphi );
     offsetY = offsetZ * tan( yphi );
   }
-  
+  std::cout << row << " rows and " << column << " columns in quadrant " << xQuadrant << ":" << yQuadrant << std::endl;
   return copyNo;
 }
 
diff --git a/Geometry/HGCalCommonData/python/shashlikCapsuleGeometryXML_cfi.py b/Geometry/HGCalCommonData/python/shashlikCapsuleGeometryXML_cfi.py
deleted file mode 100644
index 7d51a4ab4e261..0000000000000
--- a/Geometry/HGCalCommonData/python/shashlikCapsuleGeometryXML_cfi.py
+++ /dev/null
@@ -1,10 +0,0 @@
-import FWCore.ParameterSet.Config as cms
-
-XMLIdealGeometryESSource = cms.ESSource("XMLIdealGeometryESSource",
-    geomXMLFiles = cms.vstring('Geometry/CMSCommonData/data/materials.xml',
-         'Geometry/CMSCommonData/data/rotations.xml',
-         'Geometry/HGCalCommonData/data/shashlikcapsule.xml'),
-    rootNodeName = cms.string('shashlikcapsule:ShashlikCapsule')
-)
-
- 
diff --git a/Geometry/HGCalCommonData/python/testShashlikModuleXML_cfi.py b/Geometry/HGCalCommonData/python/testShashlikModuleXML_cfi.py
index a0ff243d439d3..9a21f29c3c6b9 100644
--- a/Geometry/HGCalCommonData/python/testShashlikModuleXML_cfi.py
+++ b/Geometry/HGCalCommonData/python/testShashlikModuleXML_cfi.py
@@ -7,8 +7,7 @@
          'Geometry/CMSCommonData/data/cms.xml',
          'Geometry/CMSCommonData/data/cmsMother.xml',
          'Geometry/HGCalCommonData/data/shashlikModuleinCMSE.xml',
-         'Geometry/HGCalCommonData/data/shashlikmodule.xml',
-         'Geometry/HGCalCommonData/data/shashlikcapsule.xml'),
+         'Geometry/HGCalCommonData/data/shashlikmodule.xml'),
     rootNodeName = cms.string('cms:OCMS')
 )
 
diff --git a/Geometry/HGCalCommonData/python/testShashlikXML_cfi.py b/Geometry/HGCalCommonData/python/testShashlikXML_cfi.py
index 1245748e25a22..bcbf96e032640 100644
--- a/Geometry/HGCalCommonData/python/testShashlikXML_cfi.py
+++ b/Geometry/HGCalCommonData/python/testShashlikXML_cfi.py
@@ -6,8 +6,12 @@
          'Geometry/CMSCommonData/data/extend/cmsextent.xml',
          'Geometry/CMSCommonData/data/cms.xml',
          'Geometry/CMSCommonData/data/cmsMother.xml',
-         'Geometry/HGCalCommonData/data/shashlikCapsuleinCMSE.xml',
-         'Geometry/HGCalCommonData/data/shashlikcapsule.xml'),
+         'Geometry/CMSCommonData/data/eta3/etaMax.xml',
+         'Geometry/CMSCommonData/data/PhaseII/caloBase.xml',
+         'Geometry/CMSCommonData/data/cmsCalo.xml',
+         'Geometry/HGCalCommonData/data/shashlik.xml',
+         'Geometry/HGCalCommonData/data/shashliksupermodule.xml',
+         'Geometry/HGCalCommonData/data/shashlikmodule.xml'),
     rootNodeName = cms.string('cms:OCMS')
 )
 
diff --git a/Geometry/TrackerCommonData/data/PhaseI/Pixel10D/pixbar.xml b/Geometry/TrackerCommonData/data/PhaseI/Pixel10D/pixbar.xml
new file mode 100644
index 0000000000000..d0850e3abd181
--- /dev/null
+++ b/Geometry/TrackerCommonData/data/PhaseI/Pixel10D/pixbar.xml
@@ -0,0 +1,1084 @@
+<?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="pixbar.xml" eval="true">
+ <Constant name="zero"              value="0.0*fm"/>
+ <Constant name="Rin1"              value="2.50*cm"/>
+ <Constant name="Rin2"              value="18.00*cm"/>
+<!-- <Constant name="Rin3"              value="18.50*cm"/> -->
+ <Constant name="Rin3"              value="18.6*cm"/> <!--cc useless at the moment -->
+ <Constant name="RinSupTubCab"      value="17.45*cm"/>
+ <Constant name="Rout1"             value="21.80*cm"/>
+ <Constant name="Rout2"             value="21.00*cm"/>
+ <!-- <Constant name="Zv1"               value="30.00*cm"/> 
+ to avoid overlap with Phase 1 FPIX this should be set to
+ pixfwd:ZPixelForward + pixfwd:RootStartZ
+ -->
+ <Constant name="Zv1"               value="28.70*cm"/> <!-- 28.90*cm -->
+ <Constant name="Zv2"               value="56.00*cm"/>
+ <Constant name="Zv3"               value="110.5*cm"/>
+ <Constant name="Zv4"               value="282.0*cm"/>
+ <Constant name="ZvSupTubCab"       value="248.0*cm"/>
+ <Constant name="SupportL"          value="221.0*cm"/>
+ <Constant name="SupportRin"        value="21.65*cm"/>
+ <Constant name="SupportW"          value="20.00*cm"/>
+ <Constant name="SupportT"          value="0.350*cm"/>
+ <Constant name="SupportL_cut"          value="[FlangeT]"/>
+ <Constant name="SupportW_cut"          value="7.00*cm"/>
+ <Constant name="SupportY_base"          value="19.00*cm"/>
+ <Constant name="SupportY"          value="[SupportY_base]+[SupportT]/2"/>
+ <Constant name="ShieldL"           value="54.0*cm"/> <!-- both shields end at the beginning of the flange (for simplicity is not glued on top of it)-->
+ <!--
+ <Constant name="Shield1Rin"        value="2.700*cm"/>
+ <Constant name="Shield1Rout"       value="2.705*cm"/>
+ <Constant name="Shield2Rout"       value="2.730*cm"/>
+ <Constant name="Shield3Rin"        value="18.470*cm"/>
+ <Constant name="Shield3Rout"       value="18.475*cm"/>
+ -->
+ <Constant name="Shield1Rin"        value="[FlangeRin]"/> 
+ <Constant name="Shield1Rout"       value="[FlangeRin]+[ShieldAL_T]"/>
+ <Constant name="Shield2Rout"       value="[FlangeRin]+[ShieldAL_T]+[ShieldKevlar_T]"/>
+ <Constant name="Shield3Rin"        value="[FlangeRout]-[ShieldAL_T]-[ShieldKevlar_T]"/> 
+ <Constant name="Shield3Rout"       value="[FlangeRout]-[ShieldKevlar_T]"/>
+ <Constant name="Shield4Rout"       value="[FlangeRout]"/>
+ <Constant name="ShieldAL_T"        value="0.005*cm"/>
+ <Constant name="ShieldKevlar_T"    value="0.025*cm"/>
+ <Constant name="FlangeRin"         value="2.500*cm"/> <!-- 3.400*cm for 16 faces opt-->
+ <Constant name="FlangeRout"        value="18.980*cm"/>
+ <Constant name="FlangeR12"         value="4.900*cm"/> <!-- 5.3500*cm for 16 faces opt-->
+ <Constant name="FlangeR23"         value="8.850*cm"/>
+ <Constant name="FlangeR34"         value="13.450*cm"/>
+ <Constant name="FlangeT_Airex"     value="0.400*cm"/>
+ <Constant name="FlangeT_CFK"       value="0.020*cm"/>
+ <Constant name="FlangeT"           value="[FlangeT_Airex]+2*[FlangeT_CFK]"/>
+ <Constant name="FlangeZ"           value="27.22*cm"/>
+ <Constant name="FlangeHCT"         value="0.528*cm"/>
+
+ <Constant name="CableSignal1Rin"          value="3.00*cm"/>
+ <Constant name="CableSignal1T1"           value="0.00335*cm"/>
+ <Constant name="CableSignal1T2"           value="0.02088*cm"/>
+ <Constant name="CableSignal2Rin"          value="6.800*cm"/>
+ <Constant name="CableSignal2T1"           value="0.0114*cm"/>
+ <Constant name="CableSignal2T2"           value="0.03135*cm"/>
+ <Constant name="CableSignal3Rin"          value="10.90*cm"/>
+ <Constant name="CableSignal3T1"           value="0.0203*cm"/>
+ <Constant name="CableSignal3T2"           value="0.034827*cm"/>
+ <Constant name="CableSignal4Rin"          value="16.0*cm"/>
+ <Constant name="CableSignal4T1"           value="0.0308*cm"/>
+ <Constant name="CableSignal4T2"           value="0.035998*cm"/>
+ <Constant name="CableRout"                value="18.70*cm"/>
+
+
+ <Constant name="CableSignal4Z1"          value="[FlangeZ]+[FlangeT]/2+[CoolT]+[CoolRadialDZp]"/> <!-- CoolRadialDZp is larger than CoolRadialDZm-->
+ <Constant name="CableSignal4Z2"          value="[CableSignal4Z1]+[CableSignal4T1]"/>
+ <Constant name="CableSignal4Z3"          value="[CableSignal4Z1]+[CableSignal4T2]"/>
+
+ <Constant name="CableSignal3Z1"          value="[CableSignal4Z3]"/>
+ <Constant name="CableSignal3Z2"          value="[CableSignal3Z1]+[CableSignal3T1]"/>
+ <Constant name="CableSignal3Z3"          value="[CableSignal3Z1]+[CableSignal3T2]"/>
+
+ <Constant name="CableSignal2Z1"          value="[CableSignal3Z3]"/>
+ <Constant name="CableSignal2Z2"          value="[CableSignal2Z1]+[CableSignal2T1]"/>
+ <Constant name="CableSignal2Z3"          value="[CableSignal2Z1]+[CableSignal2T2]"/>
+
+ <Constant name="CableSignal1Z1"          value="[CableSignal2Z3]"/>
+ <Constant name="CableSignal1Z2"          value="[CableSignal1Z1]+[CableSignal1T1]"/>
+ <Constant name="CableSignal1Z3"          value="[CableSignal1Z1]+[CableSignal1T2]"/>
+
+ <Constant name="CablePower1Rin"          value="3.00*cm"/>
+ <Constant name="CablePower1T1"           value="0.0098*cm"/>
+ <Constant name="CablePower1T2"           value="0.0611*cm"/>
+ <Constant name="CablePower2Rin"          value="6.800*cm"/>
+ <Constant name="CablePower2T1"           value="0.0334*cm"/>
+ <Constant name="CablePower2T2"           value="0.09185*cm"/>
+ <Constant name="CablePower3Rin"          value="10.90*cm"/>
+ <Constant name="CablePower3T1"           value="0.0593*cm"/>
+ <Constant name="CablePower3T2"           value="0.101735*cm"/>
+ <Constant name="CablePower4Rin"          value="16.0*cm"/>
+ <Constant name="CablePower4T1"           value="0.0902*cm"/>
+ <Constant name="CablePower4T2"           value="0.105421*cm"/>
+
+ 
+
+ <Constant name="CablePower4Z1"          value="[CableSignal1Z3]"/>
+ <Constant name="CablePower4Z2"          value="[CablePower4Z1]+[CablePower4T1]"/>
+ <Constant name="CablePower4Z3"          value="[CablePower4Z1]+[CablePower4T2]"/>
+
+ <Constant name="CablePower3Z1"          value="[CablePower4Z3]"/>
+ <Constant name="CablePower3Z2"          value="[CablePower3Z1]+[CablePower3T1]"/>
+ <Constant name="CablePower3Z3"          value="[CablePower3Z1]+[CablePower3T2]"/>
+
+ <Constant name="CablePower2Z1"          value="[CablePower3Z3]"/>
+ <Constant name="CablePower2Z2"          value="[CablePower2Z1]+[CablePower2T1]"/>
+ <Constant name="CablePower2Z3"          value="[CablePower2Z1]+[CablePower2T2]"/>
+
+ <Constant name="CablePower1Z1"          value="[CablePower2Z3]"/>
+ <Constant name="CablePower1Z2"          value="[CablePower1Z1]+[CablePower1T1]"/>
+ <Constant name="CablePower1Z3"          value="[CablePower1Z1]+[CablePower1T2]"/>
+
+ <Constant name="CableSignalFlangeToST_L"          value="1.680*cm"/>
+ <Constant name="CablePowerFlangeToST_L"           value="1.680*cm"/>
+ <Constant name="CableSignalFlangeToST_dR"         value="0.087*cm"/>
+ <Constant name="CablePowerFlangeToST_dR"          value="0.258*cm"/>
+ <Constant name="CableSignalFlangeToST_Rmin"          value="[CableRout]"/>
+ <Constant name="CableSignalFlangeToST_Rmax"          value="[CableSignalFlangeToST_Rmin]+[CableSignalFlangeToST_dR]"/>
+ <Constant name="CablePowerFlangeToST_Rmin"           value="[CableSignalFlangeToST_Rmax]"/>
+ <Constant name="CablePowerFlangeToST_Rmax"           value="[CablePowerFlangeToST_Rmin]+[CablePowerFlangeToST_dR]"/>
+ <Constant name="PixelBarrelCableSignal_FlangeToST_Z"          value="[FlangeZ]+[FlangeT]/2+[CableSignalFlangeToST_L]/2"/>
+ <Constant name="PixelBarrelCablePower_FlangeToST_Z"           value="[FlangeZ]+[FlangeT]/2+[CablePowerFlangeToST_L]/2"/>
+
+ <Constant name="PipeFlangeToST_L"           value="1.680*cm"/>
+ <Constant name="PipeFlangeToST_dR"           value="0.0742*cm"/>
+ <Constant name="PipeFlangeToST_Rmin"           value="[CablePowerFlangeToST_Rmax]"/>
+ <Constant name="PipeFlangeToST_Rmax"           value="[PipeFlangeToST_Rmin]+[PipeFlangeToST_dR]"/>
+ <Constant name="PixelBarrelPipe_FlangeToST_Z"           value="[FlangeZ]+[FlangeT]/2+[PipeFlangeToST_L]/2"/>
+
+ <Constant name="Conn1T"            value="0.190*cm"/>
+
+<!--
+ <Constant name="Cable3Z1"          value="[FlangeZ]+[FlangeT]/2"/>
+ <Constant name="Cable3Z2"          value="[Cable3Z1]+[Cable3T]"/>
+ <Constant name="Cable2Z1"          value="[Cable3Z1]+[CableT]"/>
+ <Constant name="Cable2Z2"          value="[Cable2Z1]+[Cable2T]"/>
+ <Constant name="Cable1Z1"          value="[Cable2Z1]+[CableT]"/>
+ <Constant name="Cable1Z2"          value="[Cable1Z1]+[Cable1T]"/>
+ <Constant name="Cable0Z1"          value="[Cable1Z1]+[CableT]"/>
+-->
+ <Constant name="Cool1Rin"          value="3.0*cm"/>
+ <Constant name="Cool2Rin"          value="6.80*cm"/>
+ <Constant name="Cool3Rin"          value="10.90*cm"/>
+ <Constant name="Cool4Rin"          value="16.00*cm"/>
+ <Constant name="CoolRout"          value="18.70*cm"/>
+ <Constant name="Cool1DRZp"            value="0.195*cm"/>
+ <Constant name="Cool1DRZm"            value="0.245*cm"/>
+ <Constant name="Cool2DRZp"            value="0.178*cm"/>
+ <Constant name="Cool2DRZm"            value="0.240*cm"/>
+ <Constant name="Cool3DRZp"            value="0.170*cm"/>
+ <Constant name="Cool3DRZm"            value="0.227*cm"/>
+ <Constant name="Cool4DRZp"            value="0.1685*cm"/>
+ <Constant name="Cool4DRZm"            value="0.221*cm"/>
+ <Constant name="CoolRadialDZp"            value="0.00439*cm"/>
+ <Constant name="CoolRadialDZm"            value="0.00365*cm"/>
+ <Constant name="CoolT"             value="0.050*cm"/>
+ <Constant name="CoolZ"             value="[FlangeZ]+[FlangeT]/2+[CoolT]/2"/>
+ <Constant name="CoolRadialZp"       value="[CoolZ]+[CoolT]/2+[CoolRadialDZp]/2"/>
+ <Constant name="CoolRadialZm"       value="[CoolZ]+[CoolT]/2+[CoolRadialDZm]/2"/>
+ <Constant name="Cool1RoutZp"         value="[Cool1Rin]+[Cool1DRZp]"/>
+ <Constant name="Cool2RoutZp"         value="[Cool2Rin]+[Cool2DRZp]"/>
+ <Constant name="Cool3RoutZp"         value="[Cool3Rin]+[Cool3DRZp]"/>
+ <Constant name="Cool4RoutZp"         value="[Cool4Rin]+[Cool4DRZp]"/>
+ <Constant name="Cool1RoutZm"         value="[Cool1Rin]+[Cool1DRZm]"/>
+ <Constant name="Cool2RoutZm"         value="[Cool2Rin]+[Cool2DRZm]"/>
+ <Constant name="Cool3RoutZm"         value="[Cool3Rin]+[Cool3DRZm]"/>
+ <Constant name="Cool4RoutZm"         value="[Cool4Rin]+[Cool4DRZm]"/>
+ <Constant name="Conn1Rin"          value="12.00*cm"/>
+ <Constant name="Conn2Rin"          value="11.00*cm"/>
+ <Constant name="Conn1Z"            value="[FlangeZ]-[FlangeT]/2-[Conn1T]/2"/>
+ <Constant name="Conn2Z"            value="[FlangeZ]+[FlangeT]/2+[Conn1T]/2"/>
+ <Constant name="Conn3Rout"         value="19.0*cm"/>
+ <Constant name="Conn3Rin"          value="18.0*cm"/>
+ <Constant name="Conn4Rin"          value="18.0*cm"/>
+ <Constant name="ConnToSTT"         value="3.00*cm"/>
+ <Constant name="ConnToSTRin"       value="18.0*cm"/>
+ <Constant name="ConnToSTRout"      value="18.8*cm"/>
+ <Constant name="Conn3T"            value="51.0*cm"/> <!-- 49.3*cm -->
+ <Constant name="Conn4T"            value="120.00*cm"/>
+ <Constant name="ConnToSTZ"         value="30.50*cm"/>
+ <Constant name="Conn3Z"            value="54.62*cm"/> <!-- 56.65*cm-->
+ <Constant name="Conn4Z"            value="[Conn3Z]+
+                                           ([Conn3T]+[Conn4T])/2"/>
+ <Constant name="ServiceRout"          value="21.0*cm"/>
+ <Constant name="ServiceRin"          value="18.0*cm"/>
+ <Constant name="ServT"             value="48.5*cm"/>
+ <Constant name="ServZ"             value="[Conn4Z]+
+                                           ([Conn4T]+[ServT])/2"/>
+ <Constant name="ServCablT"         value="32.2*cm"/>
+ <Constant name="ServCablZ"         value="[ServZ]+[ServT]/2+[ServCablT]/2"/>
+
+ <Constant name="RadialCoolZ"        value="29.5*cm"/>
+ <Constant name="RadialCoolDZ"       value="1.0*cm"/>
+ <Constant name="RadialCoolRin"      value="4.0*cm"/>
+
+
+</ConstantsSection>
+
+<RotationSection label="pixbar.xml">
+  <Rotation name="180D" thetaX="90*deg" phiX="180*deg"   thetaY="90*deg" 
+                        phiY="90*deg"   thetaZ="180*deg" phiZ="0*deg" />
+</RotationSection>
+
+<SolidSection label="pixbar.xml">
+ <Polycone name="PixelBarrel" startPhi="0*deg" deltaPhi="360*deg">
+  <ZSection z="-[Zv4]"         rMin="[RinSupTubCab]"  rMax="[Rout2]" />
+  <ZSection z="-[ZvSupTubCab]" rMin="[RinSupTubCab]"  rMax="[Rout2]" />
+  <ZSection z="-[ZvSupTubCab]" rMin="[Rin2]"          rMax="[Rout2]" />
+  <ZSection z="-[Zv3]"         rMin="[Rin2]"          rMax="[Rout2]" />
+  <ZSection z="-[Zv3]"         rMin="[Rin2]"          rMax="[Rout1]" />
+  <ZSection z="-[Zv1]"         rMin="[Rin2]"          rMax="[Rout1]" />
+  <ZSection z="-[Zv1]"         rMin="[Rin1]"          rMax="[Rout1]" />
+  <ZSection z="[Zv1]"          rMin="[Rin1]"          rMax="[Rout1]" />
+  <ZSection z="[Zv1]"          rMin="[Rin2]"          rMax="[Rout1]" />
+  <ZSection z="[Zv3]"          rMin="[Rin2]"          rMax="[Rout1]" />
+  <ZSection z="[Zv3]"          rMin="[Rin2]"          rMax="[Rout2]" />
+  <ZSection z="[ZvSupTubCab]"  rMin="[Rin2]"          rMax="[Rout2]" />
+  <ZSection z="[ZvSupTubCab]"  rMin="[RinSupTubCab]"  rMax="[Rout2]" />
+  <ZSection z="[Zv4]"          rMin="[RinSupTubCab]"  rMax="[Rout2]" />
+ </Polycone> 
+ <Tubs name="PixelBarrelSuppTub" rMin="[SupportRin]"     rMax="[Rout1]"
+       dz="[SupportL]/2"         startPhi="0*deg"        deltaPhi="360*deg"/>
+ <Box name="PixelBarrelSuppBox_full"  dx="[SupportW]/2"       dy="[SupportT]/2"
+       dz="[SupportL]/2"/>
+ <Box name="PixelBarrelSuppBox_cut"  dx="[SupportW_cut]/2"       dy="[SupportT]/2"
+       dz="[SupportL_cut]/2"/>
+ <SubtractionSolid name="PixelBarrelSuppBox_1">
+    <rSolid name="PixelBarrelSuppBox_full"/>
+    <rSolid name="PixelBarrelSuppBox_cut"/>
+    <Translation x="0*cm" y="0*cm" z="[FlangeZ]"/>
+ </SubtractionSolid>
+ <SubtractionSolid name="PixelBarrelSuppBox">
+    <rSolid name="PixelBarrelSuppBox_1"/>
+    <rSolid name="PixelBarrelSuppBox_cut"/>
+    <Translation x="0*cm" y="0*cm" z="-[FlangeZ]"/>
+ </SubtractionSolid>
+ <Tubs name="PixelBarrelShield1" rMin="[Shield1Rin]"     rMax="[Shield1Rout]"
+       dz="[ShieldL]/2"          startPhi="0*deg"        deltaPhi="360*deg"/>
+ <Tubs name="PixelBarrelShield2" rMin="[Shield1Rout]"    rMax="[Shield2Rout]"
+       dz="[ShieldL]/2"          startPhi="0*deg"        deltaPhi="360*deg"/>
+ <Tubs name="PixelBarrelShield3" rMin="[Shield3Rin]"     rMax="[Shield3Rout]"
+       dz="[ShieldL]/2"          startPhi="0*deg"        deltaPhi="360*deg"/>
+<!--cc
+ <Tubs name="PixelBarrelShield4" rMin="[Shield3Rout]"    rMax="[Rin3]"
+       dz="[ShieldL]/2"          startPhi="0*deg"        deltaPhi="360*deg"/>
+-->
+ <Tubs name="PixelBarrelShield4" rMin="[Shield3Rout]"    rMax="[Shield4Rout]"
+       dz="[ShieldL]/2"          startPhi="0*deg"        deltaPhi="360*deg"/>
+ <Tubs name="PixelBarrelFlange1_Airex"  rMin="[FlangeRin]"      rMax="[FlangeR12]"
+       dz="[FlangeT_Airex]/2"          startPhi="0*deg"        deltaPhi="360*deg"/>
+ <Tubs name="PixelBarrelFlange1_CFK"  rMin="[FlangeRin]"      rMax="[FlangeR12]"
+       dz="[FlangeT_CFK]/2"          startPhi="0*deg"        deltaPhi="360*deg"/>
+ <Tubs name="PixelBarrelFlange2_Airex"  rMin="[FlangeR12]"      rMax="[FlangeR23]"
+       dz="[FlangeT_Airex]/2"          startPhi="0*deg"        deltaPhi="360*deg"/>
+ <Tubs name="PixelBarrelFlange2_CFK"  rMin="[FlangeR12]"      rMax="[FlangeR23]"
+       dz="[FlangeT_CFK]/2"          startPhi="0*deg"        deltaPhi="360*deg"/>
+ <Tubs name="PixelBarrelFlange3_Airex"  rMin="[FlangeR23]"      rMax="[FlangeR34]"
+       dz="[FlangeT_Airex]/2"          startPhi="0*deg"        deltaPhi="360*deg"/>
+ <Tubs name="PixelBarrelFlange3_CFK"  rMin="[FlangeR23]"      rMax="[FlangeR34]"
+       dz="[FlangeT_CFK]/2"          startPhi="0*deg"        deltaPhi="360*deg"/>
+ <Tubs name="PixelBarrelFlange4_Airex"  rMin="[FlangeR34]"      rMax="[FlangeRout]"
+       dz="[FlangeT_Airex]/2"          startPhi="0*deg"        deltaPhi="360*deg"/>
+ <Tubs name="PixelBarrelFlange4_CFK"  rMin="[FlangeR34]"      rMax="[FlangeRout]"
+       dz="[FlangeT_CFK]/2"          startPhi="0*deg"        deltaPhi="360*deg"/>
+<!-- <Tubs name="PixelBarrelFlangIn" rMin="[FlangeRin]"      rMax="[Rin2]"
+       dz="[FlangeHCT]/2"        startPhi="0*deg"        deltaPhi="360*deg"/> -->
+ <Tubs name="PixelBarrelRadialCooling"  rMin="[RadialCoolRin]"      rMax="[Rin2]"
+       dz="[RadialCoolDZ]/2"          startPhi="290*deg"        deltaPhi="140*deg"/>
+
+ <Polycone name="PixelBarrelCableSignal1" startPhi="0*deg" deltaPhi="360*deg">
+  <ZSection z="[CableSignal1Z1]" rMin="[CableSignal1Rin]"  rMax="[CableRout]" />
+  <ZSection z="[CableSignal1Z2]" rMin="[CableSignal1Rin]"  rMax="[CableRout]" />
+  <ZSection z="[CableSignal1Z3]" rMin="[CableSignal1Rin]"  rMax="[CableSignal1Rin]" />
+ </Polycone> 
+ <Polycone name="PixelBarrelCableSignal2" startPhi="0*deg" deltaPhi="360*deg">
+  <ZSection z="[CableSignal2Z1]" rMin="[CableSignal2Rin]"  rMax="[CableRout]" />
+  <ZSection z="[CableSignal2Z2]" rMin="[CableSignal2Rin]"  rMax="[CableRout]" />
+  <ZSection z="[CableSignal2Z3]" rMin="[CableSignal2Rin]"  rMax="[CableSignal2Rin]" />
+ </Polycone> 
+ <Polycone name="PixelBarrelCableSignal3" startPhi="0*deg" deltaPhi="360*deg">
+  <ZSection z="[CableSignal3Z1]" rMin="[CableSignal3Rin]"  rMax="[CableRout]" />
+  <ZSection z="[CableSignal3Z2]" rMin="[CableSignal3Rin]"  rMax="[CableRout]" />
+  <ZSection z="[CableSignal3Z3]" rMin="[CableSignal3Rin]"  rMax="[CableSignal3Rin]" />
+ </Polycone> 
+ <Polycone name="PixelBarrelCableSignal4" startPhi="0*deg" deltaPhi="360*deg">
+  <ZSection z="[CableSignal4Z1]" rMin="[CableSignal4Rin]"  rMax="[CableRout]" />
+  <ZSection z="[CableSignal4Z2]" rMin="[CableSignal4Rin]"  rMax="[CableRout]" />
+  <ZSection z="[CableSignal4Z3]" rMin="[CableSignal4Rin]"  rMax="[CableSignal4Rin]" />
+ </Polycone> 
+ 
+  <Polycone name="PixelBarrelCablePower1" startPhi="0*deg" deltaPhi="360*deg">
+  <ZSection z="[CablePower1Z1]" rMin="[CablePower1Rin]"  rMax="[CableRout]" />
+  <ZSection z="[CablePower1Z2]" rMin="[CablePower1Rin]"  rMax="[CableRout]" />
+  <ZSection z="[CablePower1Z3]" rMin="[CablePower1Rin]"  rMax="[CablePower1Rin]" />
+ </Polycone> 
+ <Polycone name="PixelBarrelCablePower2" startPhi="0*deg" deltaPhi="360*deg">
+  <ZSection z="[CablePower2Z1]" rMin="[CablePower2Rin]"  rMax="[CableRout]" />
+  <ZSection z="[CablePower2Z2]" rMin="[CablePower2Rin]"  rMax="[CableRout]" />
+  <ZSection z="[CablePower2Z3]" rMin="[CablePower2Rin]"  rMax="[CablePower2Rin]" />
+ </Polycone> 
+ <Polycone name="PixelBarrelCablePower3" startPhi="0*deg" deltaPhi="360*deg">
+  <ZSection z="[CablePower3Z1]" rMin="[CablePower3Rin]"  rMax="[CableRout]" />
+  <ZSection z="[CablePower3Z2]" rMin="[CablePower3Rin]"  rMax="[CableRout]" />
+  <ZSection z="[CablePower3Z3]" rMin="[CablePower3Rin]"  rMax="[CablePower3Rin]" />
+ </Polycone> 
+ <Polycone name="PixelBarrelCablePower4" startPhi="0*deg" deltaPhi="360*deg">
+  <ZSection z="[CablePower4Z1]" rMin="[CablePower4Rin]"  rMax="[CableRout]" />
+  <ZSection z="[CablePower4Z2]" rMin="[CablePower4Rin]"  rMax="[CableRout]" />
+  <ZSection z="[CablePower4Z3]" rMin="[CablePower4Rin]"  rMax="[CablePower4Rin]" />
+ </Polycone> 
+
+  <Tubs name="PixelBarrelCableSignal_FlangeToST"   rMin="[CableSignalFlangeToST_Rmin]"       rMax="[CableSignalFlangeToST_Rmax]"
+       dz="[CableSignalFlangeToST_L]/2"            startPhi="285*deg"        deltaPhi="150*deg"/>
+  <Tubs name="PixelBarrelCablePower_FlangeToST"   rMin="[CablePowerFlangeToST_Rmin]"       rMax="[CablePowerFlangeToST_Rmax]"
+       dz="[CablePowerFlangeToST_L]/2"            startPhi="285*deg"        deltaPhi="150*deg"/>
+
+ <Tubs name="PixelBarrelCool1Zp"   rMin="[Cool1Rin]"       rMax="[Cool1RoutZp]"
+       dz="[CoolT]/2"            startPhi="0*deg"        deltaPhi="360*deg"/>
+ <Tubs name="PixelBarrelCool1Zm"   rMin="[Cool1Rin]"       rMax="[Cool1RoutZm]"
+       dz="[CoolT]/2"            startPhi="0*deg"        deltaPhi="360*deg"/>
+ <Tubs name="PixelBarrelCool2Zp"   rMin="[Cool2Rin]"       rMax="[Cool2RoutZp]"
+       dz="[CoolT]/2"            startPhi="0*deg"        deltaPhi="360*deg"/>
+ <Tubs name="PixelBarrelCool2Zm"   rMin="[Cool2Rin]"       rMax="[Cool2RoutZm]"
+       dz="[CoolT]/2"            startPhi="0*deg"        deltaPhi="360*deg"/>
+ <Tubs name="PixelBarrelCool3Zp"   rMin="[Cool3Rin]"       rMax="[Cool3RoutZp]"
+       dz="[CoolT]/2"            startPhi="0*deg"        deltaPhi="360*deg"/>
+ <Tubs name="PixelBarrelCool3Zm"   rMin="[Cool3Rin]"       rMax="[Cool3RoutZm]"
+       dz="[CoolT]/2"            startPhi="0*deg"        deltaPhi="360*deg"/>
+ <Tubs name="PixelBarrelCool4Zp"   rMin="[Cool4Rin]"       rMax="[Cool4RoutZp]"
+       dz="[CoolT]/2"            startPhi="0*deg"        deltaPhi="360*deg"/>
+ <Tubs name="PixelBarrelCool4Zm"   rMin="[Cool4Rin]"       rMax="[Cool4RoutZm]"
+       dz="[CoolT]/2"            startPhi="0*deg"        deltaPhi="360*deg"/>
+
+ <Tubs name="PixelBarrelCoolRadialZp"   rMin="[Cool1Rin]"       rMax="[CoolRout]"
+       dz="[CoolRadialDZp]/2"            startPhi="0*deg"        deltaPhi="360*deg"/>
+ <Tubs name="PixelBarrelCoolRadialZm"   rMin="[Cool1Rin]"       rMax="[CoolRout]"
+       dz="[CoolRadialDZm]/2"            startPhi="0*deg"        deltaPhi="360*deg"/>
+	   
+ <Tubs name="PixelBarrelPipes_FlangeToSTXp"   rMin="[PipeFlangeToST_Rmin]"       rMax="[PipeFlangeToST_Rmax]"
+       dz="[PipeFlangeToST_L]/2"            startPhi="-10*deg"        deltaPhi="20*deg"/>
+ 
+ <Tubs name="PixelBarrelPipes_FlangeToSTXm"   rMin="[PipeFlangeToST_Rmin]"       rMax="[PipeFlangeToST_Rmax]"
+       dz="[PipeFlangeToST_L]/2"            startPhi="170*deg"        deltaPhi="20*deg"/>
+	   
+ <Tubs name="PixelBarrelConn1"   rMin="[Conn1Rin]"       rMax="[Shield3Rin]"
+       dz="[Conn1T]/2"           startPhi="0*deg"        deltaPhi="360*deg"/>
+ <Tubs name="PixelBarrelConn2"   rMin="[Conn2Rin]"       rMax="[Shield3Rin]"
+       dz="[Conn1T]/2"           startPhi="0*deg"        deltaPhi="360*deg"/>
+ <Tubs name="PixelBarrelConnToST"   rMin="[ConnToSTRin]" rMax="[ConnToSTRout]"
+       dz="[ConnToSTT]/2"           startPhi="0*deg"        deltaPhi="360*deg"/>
+ <Tubs name="PixelBarrelConn3"   rMin="[Conn3Rin]"           rMax="[Conn3Rout]"
+       dz="[Conn3T]/2"           startPhi="0*deg"        deltaPhi="360*deg"/>
+ <Tubs name="PixelBarrelConn4"   rMin="[Conn4Rin]"           rMax="[Conn3Rout]"
+       dz="[Conn4T]/2"           startPhi="0*deg"        deltaPhi="360*deg"/>
+ <Tubs name="PixelBarrelService" rMin="[ServiceRin]"           rMax="[ServiceRout]"
+       dz="[ServT]/2"            startPhi="0*deg"        deltaPhi="360*deg"/>
+ <Tubs name="PixelBarrelSupTubCables" rMin="[RinSupTubCab]" rMax="[Conn3Rout]+2.*cm"
+       dz="[ServCablT]/2"            startPhi="0*deg"        deltaPhi="360*deg"/>
+</SolidSection>
+
+<LogicalPartSection label="pixbar.xml">
+ <LogicalPart name="PixelBarrel" category="unspecified">
+  <rSolid name="PixelBarrel"/>
+  <rMaterial name="materials:Air"/> 
+ </LogicalPart>
+ <LogicalPart name="PixelBarrelSuppTub" category="unspecified">
+  <rSolid name="PixelBarrelSuppTub"/>
+  <rMaterial name="trackermaterial:T_CarbonFibreStr"/>
+ </LogicalPart>
+ <LogicalPart name="PixelBarrelSuppBox" category="unspecified">
+  <rSolid name="PixelBarrelSuppBox"/>
+  <rMaterial name="trackermaterial:T_CarbonFibreStr"/>
+ </LogicalPart>
+ <LogicalPart name="PixelBarrelShield1" category="unspecified">
+  <rSolid name="PixelBarrelShield1"/>
+  <rMaterial name="trackermaterial:T_Aluminium"/>
+ </LogicalPart>
+ <LogicalPart name="PixelBarrelShield2" category="unspecified">
+  <rSolid name="PixelBarrelShield2"/>
+  <rMaterial name="trackermaterial:T_Kevlar"/>
+ </LogicalPart>
+ <LogicalPart name="PixelBarrelShield3" category="unspecified">
+  <rSolid name="PixelBarrelShield3"/>
+  <rMaterial name="trackermaterial:T_Aluminium"/>
+ </LogicalPart>
+ <LogicalPart name="PixelBarrelShield4" category="unspecified">
+  <rSolid name="PixelBarrelShield4"/>
+  <rMaterial name="trackermaterial:T_Kevlar"/>
+ </LogicalPart>
+ <LogicalPart name="PixelBarrelFlange1_Airex" category="unspecified">
+  <rSolid name="PixelBarrelFlange1_Airex"/>
+  <rMaterial name="pixbarmaterial:Flange1_Airex"/>
+ </LogicalPart>
+ <LogicalPart name="PixelBarrelFlange1_CFK" category="unspecified">
+  <rSolid name="PixelBarrelFlange1_CFK"/>
+  <rMaterial name="pixbarmaterial:Flange1_CFK"/>
+ </LogicalPart>
+ <LogicalPart name="PixelBarrelFlange2_Airex" category="unspecified">
+  <rSolid name="PixelBarrelFlange2_Airex"/>
+  <rMaterial name="pixbarmaterial:Flange2_Airex"/>
+ </LogicalPart>
+ <LogicalPart name="PixelBarrelFlange2_CFK" category="unspecified">
+  <rSolid name="PixelBarrelFlange2_CFK"/>
+  <rMaterial name="pixbarmaterial:Flange2_CFK"/>
+ </LogicalPart>
+ <LogicalPart name="PixelBarrelFlange3_Airex" category="unspecified">
+  <rSolid name="PixelBarrelFlange3_Airex"/>
+  <rMaterial name="pixbarmaterial:Flange3_Airex"/>
+ </LogicalPart>
+ <LogicalPart name="PixelBarrelFlange3_CFK" category="unspecified">
+  <rSolid name="PixelBarrelFlange3_CFK"/>
+  <rMaterial name="pixbarmaterial:Flange3_CFK"/>
+ </LogicalPart>
+ <LogicalPart name="PixelBarrelFlange4_Airex" category="unspecified">
+  <rSolid name="PixelBarrelFlange4_Airex"/>
+  <rMaterial name="pixbarmaterial:Flange4_Airex"/>
+ </LogicalPart>
+ <LogicalPart name="PixelBarrelFlange4_CFK" category="unspecified">
+  <rSolid name="PixelBarrelFlange4_CFK"/>
+  <rMaterial name="pixbarmaterial:Flange4_CFK"/>
+ </LogicalPart>
+<!-- <LogicalPart name="PixelBarrelFlangIn" category="unspecified">
+  <rSolid name="PixelBarrelFlangIn"/>
+  <rMaterial name="pixbarmaterial:Pix_Bar_Ring_HC"/>
+ </LogicalPart> -->
+ <LogicalPart name="PixelBarrelRadialCooling" category="unspecified">
+  <rSolid name="PixelBarrelRadialCooling"/>
+  <rMaterial name="materials:Air"/>
+ </LogicalPart>
+ <LogicalPart name="PixelBarrelCableSignal1" category="unspecified">
+  <rSolid name="PixelBarrelCableSignal1"/>
+  <rMaterial name="pixbarmaterial:Pix_Bar_CableSignal_Upgrade"/>
+ </LogicalPart>
+ <LogicalPart name="PixelBarrelCableSignal2" category="unspecified">
+  <rSolid name="PixelBarrelCableSignal2"/>
+  <rMaterial name="pixbarmaterial:Pix_Bar_CableSignal_Upgrade"/>
+ </LogicalPart>
+ <LogicalPart name="PixelBarrelCableSignal3" category="unspecified">
+  <rSolid name="PixelBarrelCableSignal3"/>
+  <rMaterial name="pixbarmaterial:Pix_Bar_CableSignal_Upgrade"/>
+ </LogicalPart>
+ <LogicalPart name="PixelBarrelCableSignal4" category="unspecified">
+  <rSolid name="PixelBarrelCableSignal4"/>
+  <rMaterial name="pixbarmaterial:Pix_Bar_CableSignal_Upgrade"/>
+ </LogicalPart>
+  <LogicalPart name="PixelBarrelCablePower1" category="unspecified">
+  <rSolid name="PixelBarrelCablePower1"/>
+  <rMaterial name="pixbarmaterial:Pix_Bar_CablePower_Upgrade"/>
+ </LogicalPart>
+ <LogicalPart name="PixelBarrelCablePower2" category="unspecified">
+  <rSolid name="PixelBarrelCablePower2"/>
+  <rMaterial name="pixbarmaterial:Pix_Bar_CablePower_Upgrade"/>
+ </LogicalPart>
+ <LogicalPart name="PixelBarrelCablePower3" category="unspecified">
+  <rSolid name="PixelBarrelCablePower3"/>
+  <rMaterial name="pixbarmaterial:Pix_Bar_CablePower_Upgrade"/>
+ </LogicalPart>
+ <LogicalPart name="PixelBarrelCablePower4" category="unspecified">
+  <rSolid name="PixelBarrelCablePower4"/>
+  <rMaterial name="pixbarmaterial:Pix_Bar_CablePower_Upgrade"/>
+ </LogicalPart>
+ 
+ <LogicalPart name="PixelBarrelCableSignal_FlangeToST" category="unspecified">
+  <rSolid name="PixelBarrelCableSignal_FlangeToST"/>
+  <rMaterial name="pixbarmaterial:Pix_Bar_CableSignal_Upgrade"/>
+ </LogicalPart>
+ <LogicalPart name="PixelBarrelCablePower_FlangeToST" category="unspecified">
+  <rSolid name="PixelBarrelCablePower_FlangeToST"/>
+  <rMaterial name="pixbarmaterial:Pix_Bar_CablePower_Upgrade"/>
+ </LogicalPart>
+
+ <LogicalPart name="PixelBarrelCool1Zp" category="unspecified">
+  <rSolid name="PixelBarrelCool1Zp"/>
+  <rMaterial name="pixbarmaterial:CoolPipesDaisyChain"/>
+ </LogicalPart>
+ <LogicalPart name="PixelBarrelCool1Zm" category="unspecified">
+  <rSolid name="PixelBarrelCool1Zm"/>
+  <rMaterial name="pixbarmaterial:CoolPipesDaisyChain"/>
+ </LogicalPart>
+ <LogicalPart name="PixelBarrelCool2Zp" category="unspecified">
+  <rSolid name="PixelBarrelCool2Zp"/>
+  <rMaterial name="pixbarmaterial:CoolPipesDaisyChain"/>
+ </LogicalPart>
+ <LogicalPart name="PixelBarrelCool2Zm" category="unspecified">
+  <rSolid name="PixelBarrelCool2Zm"/>
+  <rMaterial name="pixbarmaterial:CoolPipesDaisyChain"/>
+ </LogicalPart>
+ <LogicalPart name="PixelBarrelCool3Zp" category="unspecified">
+  <rSolid name="PixelBarrelCool3Zp"/>
+  <rMaterial name="pixbarmaterial:CoolPipesDaisyChain"/>
+ </LogicalPart>
+ <LogicalPart name="PixelBarrelCool3Zm" category="unspecified">
+  <rSolid name="PixelBarrelCool3Zm"/>
+  <rMaterial name="pixbarmaterial:CoolPipesDaisyChain"/>
+ </LogicalPart>
+ <LogicalPart name="PixelBarrelCool4Zp" category="unspecified">
+  <rSolid name="PixelBarrelCool4Zp"/>
+  <rMaterial name="pixbarmaterial:CoolPipesDaisyChain"/>
+ </LogicalPart>
+ <LogicalPart name="PixelBarrelCool4Zm" category="unspecified">
+  <rSolid name="PixelBarrelCool4Zm"/>
+  <rMaterial name="pixbarmaterial:CoolPipesDaisyChain"/>
+ </LogicalPart>
+ <LogicalPart name="PixelBarrelCoolRadialZp" category="unspecified">
+  <rSolid name="PixelBarrelCoolRadialZp"/>
+  <rMaterial name="pixbarmaterial:CoolPipesDaisyChain"/>
+ </LogicalPart>
+ <LogicalPart name="PixelBarrelCoolRadialZm" category="unspecified">
+  <rSolid name="PixelBarrelCoolRadialZm"/>
+  <rMaterial name="pixbarmaterial:CoolPipesDaisyChain"/>
+ </LogicalPart>
+
+  <LogicalPart name="PixelBarrelPipes_FlangeToSTXp" category="unspecified">
+  <rSolid name="PixelBarrelPipes_FlangeToSTXp"/>
+  <rMaterial name="pixbarmaterial:CoolPipesDaisyChain"/>
+ </LogicalPart>
+  <LogicalPart name="PixelBarrelPipes_FlangeToSTXm" category="unspecified">
+  <rSolid name="PixelBarrelPipes_FlangeToSTXm"/>
+  <rMaterial name="pixbarmaterial:CoolPipesDaisyChain"/>
+ </LogicalPart>
+ 
+ <LogicalPart name="PixelBarrelConn1" category="unspecified">
+  <rSolid name="PixelBarrelConn1"/>
+  <rMaterial name="pixbarmaterial:Layer3_EndringPrints_Upgrade"/>
+ </LogicalPart>
+ <LogicalPart name="PixelBarrelConn2" category="unspecified">
+  <rSolid name="PixelBarrelConn2"/>
+  <rMaterial name="pixbarmaterial:Layer1_2_EndringPrints_Upgrade"/>
+ </LogicalPart>
+ <LogicalPart name="PixelBarrelConnToST" category="unspecified">
+  <rSolid name="PixelBarrelConnToST"/>
+  <rMaterial name="pixbarmaterial:cable_endring_to_tube_Upgrade"/>
+ </LogicalPart>
+ <LogicalPart name="PixelBarrelConn3" category="unspecified">
+  <rSolid name="PixelBarrelConn3"/>
+  <rMaterial name="pixbarmaterial:SupplyTubeConn3_3Disks"/>
+ </LogicalPart>
+ <LogicalPart name="PixelBarrelConn4" category="unspecified">
+  <rSolid name="PixelBarrelConn4"/>
+  <rMaterial name="pixbarmaterial:SectorC_3Disks"/>
+ </LogicalPart>
+ <LogicalPart name="PixelBarrelService" category="unspecified">
+  <rSolid name="PixelBarrelService"/>
+  <rMaterial name="pixbarmaterial:SectorA_3Disks"/>
+ </LogicalPart>
+ <LogicalPart name="PixelBarrelSupTubCables" category="unspecified">
+  <rSolid name="PixelBarrelSupTubCables"/>
+  <rMaterial name="pixbarmaterial:PixelBarrelSupTubCables2_3Disks"/>
+ </LogicalPart>
+</LogicalPartSection>
+
+<PosPartSection label="pixbar.xml">
+ <PosPart copyNumber="1">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelSuppTub"/>
+ </PosPart>
+ <PosPart copyNumber="1">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelSuppBox"/>
+  <Translation x="[zero]" y="[SupportY]" z="[zero]" />
+ </PosPart>
+ <PosPart copyNumber="2">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelSuppBox"/>
+  <Translation x="[zero]" y="-[SupportY]" z="[zero]" />
+ </PosPart>
+ <PosPart copyNumber="1">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelShield1"/>
+ </PosPart>
+ <PosPart copyNumber="1">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelShield2"/>
+ </PosPart>
+ <PosPart copyNumber="1">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelShield3"/>
+ </PosPart>
+ <PosPart copyNumber="1">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelShield4"/>
+ </PosPart>
+<!-- <PosPart copyNumber="1">
+   <rParent name="pixbar:PixelBarrelFlange"/>
+   <rChild name="pixbar:PixelBarrelFlangIn"/>
+ </PosPart> -->
+
+ <PosPart copyNumber="1">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelFlange1_Airex"/>
+  <Translation x="[zero]" y="[zero]" z="[FlangeZ]" />
+ </PosPart>
+ <PosPart copyNumber="2">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelFlange1_Airex"/>
+  <Translation x="[zero]" y="[zero]" z="-[FlangeZ]" />
+ </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelFlange1_CFK"/>
+  <Translation x="[zero]" y="[zero]" z="[FlangeZ]+[FlangeT_Airex]/2+[FlangeT_CFK]/2" />
+ </PosPart>
+  <PosPart copyNumber="2">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelFlange1_CFK"/>
+  <Translation x="[zero]" y="[zero]" z="[FlangeZ]-[FlangeT_Airex]/2-[FlangeT_CFK]/2" />
+ </PosPart>
+  <PosPart copyNumber="3">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelFlange1_CFK"/>
+  <Translation x="[zero]" y="[zero]" z="-[FlangeZ]+[FlangeT_Airex]/2+[FlangeT_CFK]/2" />
+ </PosPart>
+  <PosPart copyNumber="4">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelFlange1_CFK"/>
+  <Translation x="[zero]" y="[zero]" z="-[FlangeZ]-[FlangeT_Airex]/2-[FlangeT_CFK]/2" />
+ </PosPart>
+
+  <PosPart copyNumber="1">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelFlange2_Airex"/>
+  <Translation x="[zero]" y="[zero]" z="[FlangeZ]" />
+ </PosPart>
+ <PosPart copyNumber="2">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelFlange2_Airex"/>
+  <Translation x="[zero]" y="[zero]" z="-[FlangeZ]" />
+ </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelFlange2_CFK"/>
+  <Translation x="[zero]" y="[zero]" z="[FlangeZ]+[FlangeT_Airex]/2+[FlangeT_CFK]/2" />
+ </PosPart>
+  <PosPart copyNumber="2">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelFlange2_CFK"/>
+  <Translation x="[zero]" y="[zero]" z="[FlangeZ]-[FlangeT_Airex]/2-[FlangeT_CFK]/2" />
+ </PosPart>
+  <PosPart copyNumber="3">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelFlange2_CFK"/>
+  <Translation x="[zero]" y="[zero]" z="-[FlangeZ]+[FlangeT_Airex]/2+[FlangeT_CFK]/2" />
+ </PosPart>
+  <PosPart copyNumber="4">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelFlange2_CFK"/>
+  <Translation x="[zero]" y="[zero]" z="-[FlangeZ]-[FlangeT_Airex]/2-[FlangeT_CFK]/2" />
+ </PosPart>
+
+  <PosPart copyNumber="1">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelFlange3_Airex"/>
+  <Translation x="[zero]" y="[zero]" z="[FlangeZ]" />
+ </PosPart>
+ <PosPart copyNumber="2">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelFlange3_Airex"/>
+  <Translation x="[zero]" y="[zero]" z="-[FlangeZ]" />
+ </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelFlange3_CFK"/>
+  <Translation x="[zero]" y="[zero]" z="[FlangeZ]+[FlangeT_Airex]/2+[FlangeT_CFK]/2" />
+ </PosPart>
+  <PosPart copyNumber="2">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelFlange3_CFK"/>
+  <Translation x="[zero]" y="[zero]" z="[FlangeZ]-[FlangeT_Airex]/2-[FlangeT_CFK]/2" />
+ </PosPart>
+  <PosPart copyNumber="3">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelFlange3_CFK"/>
+  <Translation x="[zero]" y="[zero]" z="-[FlangeZ]+[FlangeT_Airex]/2+[FlangeT_CFK]/2" />
+ </PosPart>
+  <PosPart copyNumber="4">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelFlange3_CFK"/>
+  <Translation x="[zero]" y="[zero]" z="-[FlangeZ]-[FlangeT_Airex]/2-[FlangeT_CFK]/2" />
+ </PosPart>
+
+  <PosPart copyNumber="1">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelFlange4_Airex"/>
+  <Translation x="[zero]" y="[zero]" z="[FlangeZ]" />
+ </PosPart>
+ <PosPart copyNumber="2">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelFlange4_Airex"/>
+  <Translation x="[zero]" y="[zero]" z="-[FlangeZ]" />
+ </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelFlange4_CFK"/>
+  <Translation x="[zero]" y="[zero]" z="[FlangeZ]+[FlangeT_Airex]/2+[FlangeT_CFK]/2" />
+ </PosPart>
+  <PosPart copyNumber="2">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelFlange4_CFK"/>
+  <Translation x="[zero]" y="[zero]" z="[FlangeZ]-[FlangeT_Airex]/2-[FlangeT_CFK]/2" />
+ </PosPart>
+  <PosPart copyNumber="3">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelFlange4_CFK"/>
+  <Translation x="[zero]" y="[zero]" z="-[FlangeZ]+[FlangeT_Airex]/2+[FlangeT_CFK]/2" />
+ </PosPart>
+  <PosPart copyNumber="4">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelFlange4_CFK"/>
+  <Translation x="[zero]" y="[zero]" z="-[FlangeZ]-[FlangeT_Airex]/2-[FlangeT_CFK]/2" />
+ </PosPart>
+
+ 
+<!--  <PosPart copyNumber="1">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelRadialCooling"/>
+   <Translation x="[zero]" y="[zero]" z="[RadialCoolZ]" />
+ </PosPart>
+
+ <PosPart copyNumber="2">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelRadialCooling"/>
+  <rRotation name="pixbar:180D"/>
+  <Translation x="[zero]" y="[zero]" z="[RadialCoolZ]" />
+ </PosPart>
+ <PosPart copyNumber="3">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelRadialCooling"/>
+  <Translation x="[zero]" y="[zero]" z="-[RadialCoolZ]" />
+ </PosPart>
+
+ <PosPart copyNumber="4">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelRadialCooling"/>
+   <rRotation name="pixbar:180D"/>
+   <Translation x="[zero]" y="[zero]" z="-[RadialCoolZ]" />
+ </PosPart> -->
+ 
+
+<PosPart copyNumber="1">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelCableSignal1"/>
+ </PosPart>
+ <PosPart copyNumber="2">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelCableSignal1"/>
+  <rRotation name="pixbar:180D"/>
+ </PosPart>
+ <PosPart copyNumber="1">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelCableSignal2"/>
+ </PosPart>
+ <PosPart copyNumber="2">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelCableSignal2"/>
+  <rRotation name="pixbar:180D"/>
+ </PosPart>
+ <PosPart copyNumber="1">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelCableSignal3"/>
+ </PosPart>
+ <PosPart copyNumber="2">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelCableSignal3"/>
+  <rRotation name="pixbar:180D"/>
+ </PosPart>
+ <PosPart copyNumber="1">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelCableSignal4"/>
+ </PosPart>
+ <PosPart copyNumber="2">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelCableSignal4"/>
+  <rRotation name="pixbar:180D"/>
+ </PosPart>
+  
+<PosPart copyNumber="1">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelCablePower1"/>
+ </PosPart>
+ <PosPart copyNumber="2">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelCablePower1"/>
+  <rRotation name="pixbar:180D"/>
+ </PosPart>
+ <PosPart copyNumber="1">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelCablePower2"/>
+ </PosPart>
+ <PosPart copyNumber="2">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelCablePower2"/>
+  <rRotation name="pixbar:180D"/>
+ </PosPart>
+ <PosPart copyNumber="1">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelCablePower3"/>
+ </PosPart>
+ <PosPart copyNumber="2">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelCablePower3"/>
+  <rRotation name="pixbar:180D"/>
+ </PosPart>
+ <PosPart copyNumber="1">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelCablePower4"/>
+ </PosPart>
+ <PosPart copyNumber="2">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelCablePower4"/>
+  <rRotation name="pixbar:180D"/>
+ </PosPart>
+
+  <PosPart copyNumber="1">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelCableSignal_FlangeToST"/>
+   <Translation x="[zero]" y="[zero]" z="[PixelBarrelCableSignal_FlangeToST_Z]" />
+ </PosPart>
+  <PosPart copyNumber="2">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelCableSignal_FlangeToST"/>
+   <rRotation name="pixbar:180D"/>
+   <Translation x="[zero]" y="[zero]" z="[PixelBarrelCableSignal_FlangeToST_Z]" />
+ </PosPart>
+  <PosPart copyNumber="3">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelCableSignal_FlangeToST"/>
+   <Translation x="[zero]" y="[zero]" z="-[PixelBarrelCableSignal_FlangeToST_Z]" />
+ </PosPart>
+  <PosPart copyNumber="4">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelCableSignal_FlangeToST"/>
+   <rRotation name="pixbar:180D"/>
+   <Translation x="[zero]" y="[zero]" z="-[PixelBarrelCableSignal_FlangeToST_Z]" />
+ </PosPart>
+  <PosPart copyNumber="1">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelCablePower_FlangeToST"/>
+   <Translation x="[zero]" y="[zero]" z="[PixelBarrelCablePower_FlangeToST_Z]" />
+ </PosPart>
+  <PosPart copyNumber="2">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rRotation name="pixbar:180D"/>
+   <rChild name="pixbar:PixelBarrelCablePower_FlangeToST"/>
+   <Translation x="[zero]" y="[zero]" z="[PixelBarrelCablePower_FlangeToST_Z]" />
+ </PosPart>
+  <PosPart copyNumber="3">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelCablePower_FlangeToST"/>
+   <Translation x="[zero]" y="[zero]" z="-[PixelBarrelCablePower_FlangeToST_Z]" />
+ </PosPart>
+  <PosPart copyNumber="4">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rRotation name="pixbar:180D"/>
+   <rChild name="pixbar:PixelBarrelCablePower_FlangeToST"/>
+   <Translation x="[zero]" y="[zero]" z="-[PixelBarrelCablePower_FlangeToST_Z]" />
+ </PosPart>
+
+ <PosPart copyNumber="1">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelCool1Zp"/>
+  <Translation x="[zero]" y="[zero]" z="[CoolZ]" />
+ </PosPart>
+ <PosPart copyNumber="1">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelCool1Zm"/>
+  <rRotation name="pixbar:180D"/> 
+  <Translation x="[zero]" y="[zero]" z="-[CoolZ]" />
+ </PosPart>
+
+ <PosPart copyNumber="1">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelCool2Zp"/>
+  <Translation x="[zero]" y="[zero]" z="[CoolZ]" />
+ </PosPart>
+
+ <PosPart copyNumber="1">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelCool2Zm"/>
+  <rRotation name="pixbar:180D"/>
+  <Translation x="[zero]" y="[zero]" z="-[CoolZ]" />
+ </PosPart>
+ 
+ 
+ <PosPart copyNumber="1">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelCool3Zp"/>
+  <Translation x="[zero]" y="[zero]" z="[CoolZ]" />
+ </PosPart>
+ <PosPart copyNumber="1">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelCool3Zm"/>
+  <rRotation name="pixbar:180D"/>
+  <Translation x="[zero]" y="[zero]" z="-[CoolZ]" />
+ </PosPart>
+
+ <PosPart copyNumber="1">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelCool4Zp"/>
+  <Translation x="[zero]" y="[zero]" z="[CoolZ]" />
+ </PosPart>
+ <PosPart copyNumber="1">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelCool4Zm"/>
+  <rRotation name="pixbar:180D"/>
+  <Translation x="[zero]" y="[zero]" z="-[CoolZ]" />
+ </PosPart>
+
+ <PosPart copyNumber="1">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelCoolRadialZp"/>
+  <Translation x="[zero]" y="[zero]" z="[CoolRadialZp]" />
+ </PosPart>
+ <PosPart copyNumber="1">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelCoolRadialZm"/>
+  <rRotation name="pixbar:180D"/>
+  <Translation x="[zero]" y="[zero]" z="-[CoolRadialZm]" />
+ </PosPart>
+
+   <PosPart copyNumber="1">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelPipes_FlangeToSTXp"/>
+   <Translation x="[zero]" y="[zero]" z="[PixelBarrelPipe_FlangeToST_Z]" />
+ </PosPart>
+  <PosPart copyNumber="2">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelPipes_FlangeToSTXp"/>
+   <Translation x="[zero]" y="[zero]" z="-[PixelBarrelPipe_FlangeToST_Z]" />
+ </PosPart>
+   <PosPart copyNumber="1">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelPipes_FlangeToSTXm"/>
+   <Translation x="[zero]" y="[zero]" z="[PixelBarrelPipe_FlangeToST_Z]" />
+ </PosPart>
+  <PosPart copyNumber="2">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelPipes_FlangeToSTXm"/>
+   <Translation x="[zero]" y="[zero]" z="-[PixelBarrelPipe_FlangeToST_Z]" />
+ </PosPart>
+
+ 
+ <!--
+ <PosPart copyNumber="1">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelConn1"/>
+  <Translation x="[zero]" y="[zero]" z="[Conn1Z]" />
+ </PosPart>
+ <PosPart copyNumber="2">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelConn1"/>
+  <rRotation name="pixbar:180D"/>
+  <Translation x="[zero]" y="[zero]" z="-[Conn1Z]" />
+ </PosPart>
+ <PosPart copyNumber="1">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelConn2"/>
+  <Translation x="[zero]" y="[zero]" z="[Conn2Z]" />
+ </PosPart>
+ <PosPart copyNumber="2">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelConn2"/>
+  <rRotation name="pixbar:180D"/>
+  <Translation x="[zero]" y="[zero]" z="-[Conn2Z]" />
+ </PosPart>
+
+ <PosPart copyNumber="1">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelConnToST"/>
+  <Translation x="[zero]" y="[zero]" z="[ConnToSTZ]" />
+ </PosPart>
+ <PosPart copyNumber="2">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelConnToST"/>
+  <rRotation name="pixbar:180D"/>
+  <Translation x="[zero]" y="[zero]" z="-[ConnToSTZ]" />
+ </PosPart>
+-->
+
+ <PosPart copyNumber="1">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelConn3"/>
+  <Translation x="[zero]" y="[zero]" z="[Conn3Z]" />
+ </PosPart>
+ <PosPart copyNumber="2">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelConn3"/>
+  <rRotation name="pixbar:180D"/>
+  <Translation x="[zero]" y="[zero]" z="[Conn3Z]" />
+ </PosPart>
+ <PosPart copyNumber="3">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelConn3"/>
+  <Translation x="[zero]" y="[zero]" z="-[Conn3Z]" />
+ </PosPart>
+ <PosPart copyNumber="4">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelConn3"/>
+  <rRotation name="pixbar:180D"/>
+  <Translation x="[zero]" y="[zero]" z="-[Conn3Z]" />
+ </PosPart>
+
+ <PosPart copyNumber="1">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelConn4"/>
+  <Translation x="[zero]" y="[zero]" z="[Conn4Z]" />
+ </PosPart>
+ <PosPart copyNumber="2">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelConn4"/>
+  <rRotation name="pixbar:180D"/>
+  <Translation x="[zero]" y="[zero]" z="[Conn4Z]" />
+ </PosPart>
+ <PosPart copyNumber="3">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelConn4"/>
+  <Translation x="[zero]" y="[zero]" z="-[Conn4Z]" />
+ </PosPart>
+ <PosPart copyNumber="4">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelConn4"/>
+  <rRotation name="pixbar:180D"/>
+  <Translation x="[zero]" y="[zero]" z="-[Conn4Z]" />
+ </PosPart>
+
+ <PosPart copyNumber="1">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelService"/>
+  <Translation x="[zero]" y="[zero]" z="[ServZ]" />
+ </PosPart>
+ <PosPart copyNumber="2">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelService"/>
+  <rRotation name="pixbar:180D"/>
+  <Translation x="[zero]" y="[zero]" z="[ServZ]" />
+ </PosPart>
+ <PosPart copyNumber="3">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelService"/>
+  <Translation x="[zero]" y="[zero]" z="-[ServZ]" />
+ </PosPart>
+ <PosPart copyNumber="4">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelService"/>
+  <rRotation name="pixbar:180D"/>
+  <Translation x="[zero]" y="[zero]" z="-[ServZ]" />
+ </PosPart>
+
+ <PosPart copyNumber="1">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelSupTubCables"/>
+  <Translation x="[zero]" y="[zero]" z="[ServCablZ]" />
+ </PosPart>
+ <PosPart copyNumber="2">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbar:PixelBarrelSupTubCables"/>
+  <rRotation name="pixbar:180D"/>
+  <Translation x="[zero]" y="[zero]" z="-[ServCablZ]" />
+ </PosPart>
+
+ <PosPart copyNumber="1">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbarlayer0:PixelBarrelLayer0"/>
+ </PosPart>
+ <PosPart copyNumber="1">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbarlayer1:PixelBarrelLayer1"/>
+ </PosPart>
+ <PosPart copyNumber="1">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbarlayer2:PixelBarrelLayer2"/>
+ </PosPart>
+ <PosPart copyNumber="1">
+   <rParent name="pixbar:PixelBarrel"/>
+   <rChild name="pixbarlayer3:PixelBarrelLayer3"/>
+ </PosPart>
+</PosPartSection>
+
+</DDDefinition>
diff --git a/Geometry/TrackerCommonData/data/PhaseI/Pixel10D/pixfwd.xml b/Geometry/TrackerCommonData/data/PhaseI/Pixel10D/pixfwd.xml
new file mode 100644
index 0000000000000..b6b8f0c825b0a
--- /dev/null
+++ b/Geometry/TrackerCommonData/data/PhaseI/Pixel10D/pixfwd.xml
@@ -0,0 +1,148 @@
+<?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="pixfwd.xml" eval="true">
+ <Constant name="RootRadius"     value="[pixfwdCylinder:CylindersOuterRmax]"/>
+ <Constant name="RootHalfLength" value="[pixfwdCylinder:CylindersOuterLength]/2.+ [pixfwdCylinder:CylindersEndFlangeLength]/2.+[Zextension]/2."/>
+
+ <Constant name="AnchorZ"        value="0.*mm"/>
+ <Constant name="ZPixelForward"  value="291.*mm"/>
+ <Constant name="RootStartZ"     value="-4*mm"/> <!-- -2*mm-->
+ <Constant name="RootMidZ1"      value="[cms:TrackLumiZ1]-[ZPixelForward]"/>
+ <Constant name="RootMidZ2"      value="[cms:TrackLumiZ2]-[ZPixelForward]"/>
+ <Constant name="RootMidZ3"      value="[cms:TrackBeamZ1]-[ZPixelForward]"/>
+ <Constant name="RootEndZ"       value="2*[RootHalfLength]"/>
+ <Constant name="Zextension"      value="273.11*mm"/>
+
+ <Constant name="Disk1Z"         value="[pixfwdDisks:DiskHalfWidth]+[RootStartZ]"/> <!-- 35.75*mm-->
+ <Constant name="Disk2Z"         value="[Disk1Z]+75.0*mm"/>
+ <Constant name="Disk3Z"         value="[Disk2Z]+95.0*mm"/>
+ <Constant name="Disk4Z"         value="[Disk3Z]+147.0*mm"/>
+ <Constant name="Disk5Z"         value="[Disk4Z]+188.0*mm"/> 
+ <Constant name="Disk6Z"         value="[Disk5Z]+242.0*mm"/> 
+ <Constant name="Disk7Z"         value="[Disk6Z]+311.0*mm"/> 
+ <Constant name="Disk8Z"         value="[Disk7Z]+600.0*mm"/> 
+ <Constant name="Disk9Z"         value="[Disk8Z]+302.0*mm"/>
+ <Constant name="Disk10Z"         value="[Disk9Z]+348.0*mm"/>
+ <!--
+ <Constant name="Disk11Z"         value="[Disk10Z]+391.0*mm"/> 
+ <Constant name="Disk12Z"         value="[Disk11Z]+477.0*mm"/>
+-->
+ <Constant name="ZCylinder"      value="[AnchorZ]"/>
+
+</ConstantsSection>
+
+<SolidSection label="pixfwd.xml">
+ <Polycone name="PixelForward" startPhi="0*deg" deltaPhi="360*deg" >
+ <ZSection z="[RootStartZ]"  rMin="[cms:TrackBeamR1]" rMax="[RootRadius]"/>
+ <ZSection z="[RootMidZ1]"   rMin="[cms:TrackBeamR1]" rMax="[RootRadius]"/>
+ <ZSection z="[RootMidZ1]"   rMin="[cms:TrackLumiR1]" rMax="[RootRadius]"/>
+ <ZSection z="[RootMidZ2]"   rMin="[cms:TrackLumiR1]" rMax="[RootRadius]"/>
+ <ZSection z="[RootMidZ2]"   rMin="[cms:TrackBeamR1]" rMax="[RootRadius]"/>
+ <ZSection z="[RootMidZ3]"   rMin="[cms:TrackBeamR1]" rMax="[RootRadius]"/>
+ <ZSection z="[RootEndZ]"    rMin="[cms:TrackBeamR2]" rMax="[RootRadius]"/>
+ </Polycone>
+</SolidSection>
+ 
+<LogicalPartSection label="pixfwd.xml">
+ <LogicalPart name="PixelForward" category="envelope">
+  <rSolid name="PixelForward"/>
+  <rMaterial name="materials:Air"/>
+ </LogicalPart>
+</LogicalPartSection>
+
+
+<!-- Position disks inside root -->
+
+<PosPartSection label="pixfwd.xml">
+  <PosPart copyNumber="1">
+    <rParent name="pixfwd:PixelForward"/>
+    <rChild name="pixfwdDisks:PixelForwardDisk1"/>
+    <Translation x="0." y="0." z="[AnchorZ]+[Disk1Z]"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="pixfwd:PixelForward"/>
+    <rChild name="pixfwdDisks:PixelForwardDisk2"/>
+    <Translation x="0." y="0." z="[AnchorZ]+[Disk2Z]"/>
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="pixfwd:PixelForward"/>
+    <rChild name="pixfwdDisks:PixelForwardDisk3"/>
+    <Translation x="0." y="0." z="[AnchorZ]+ [Disk3Z]" />
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="pixfwd:PixelForward"/>
+    <rChild name="pixfwdDisks:PixelForwardDisk4"/>
+    <Translation x="0." y="0." z="[AnchorZ]+ [Disk4Z]" />
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="pixfwd:PixelForward"/>
+    <rChild name="pixfwdDisks:PixelForwardDisk5"/>
+    <Translation x="0." y="0." z="[AnchorZ]+ [Disk5Z]" />
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="pixfwd:PixelForward"/>
+    <rChild name="pixfwdDisks:PixelForwardDisk6"/>
+    <Translation x="0." y="0." z="[AnchorZ]+ [Disk6Z]" />
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="pixfwd:PixelForward"/>
+    <rChild name="pixfwdDisks:PixelForwardDisk7"/>
+    <Translation x="0." y="0." z="[AnchorZ]+ [Disk7Z]" />
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="pixfwd:PixelForward"/>
+    <rChild name="pixfwdDisks:PixelForwardDisk8"/>
+    <Translation x="0." y="0." z="[AnchorZ]+ [Disk8Z]" />
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="pixfwd:PixelForward"/>
+    <rChild name="pixfwdDisks:PixelForwardDisk9"/>
+    <Translation x="0." y="0." z="[AnchorZ]+ [Disk9Z]" />
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="pixfwd:PixelForward"/>
+    <rChild name="pixfwdDisks:PixelForwardDisk10"/>
+    <Translation x="0." y="0." z="[AnchorZ]+ [Disk10Z]" />
+  </PosPart>
+<!--
+  <PosPart copyNumber="1">
+    <rParent name="pixfwd:PixelForward"/>
+    <rChild name="pixfwdDisks:PixelForwardDisk11"/>
+    <Translation x="0." y="0." z="[AnchorZ]+ [Disk11Z]" />
+  </PosPart>
+  <PosPart copyNumber="1">
+    <rParent name="pixfwd:PixelForward"/>
+    <rChild name="pixfwdDisks:PixelForwardDisk12"/>
+    <Translation x="0." y="0." z="[AnchorZ]+ [Disk12Z]" />
+  </PosPart>
+-->
+  <PosPart copyNumber="1">
+    <rParent name="pixfwd:PixelForward"/>
+    <rChild name="pixfwdCylinder:PixelForwardServiceCylinder"/>
+    <Translation x="0." y="0." z="0."/>
+  </PosPart>
+  <PosPart copyNumber="1">
+
+  <rParent name="pixfwd:PixelForward"/>
+    <rChild name="pixfwdCylinder:PixelForwardCylinderEndFlange"/>
+    <Translation x="0." y="0." z="[pixfwd:ZCylinder]+[pixfwdCylinder:CylindersOuterLength]+[pixfwdCylinder:CylindersEndFlangeLength]/2."/>
+    <rRotation name="pixfwdCylinder:EndFlangeRot1"/>
+  </PosPart>
+  <PosPart copyNumber="2">
+    <rParent name="pixfwd:PixelForward"/>
+    <rChild name="pixfwdCylinder:PixelForwardCylinderEndFlange"/>
+    <Translation x="0." y="0." z="[pixfwd:ZCylinder]+[pixfwdCylinder:CylindersOuterLength]+[pixfwdCylinder:CylindersEndFlangeLength]/2."/>
+    <rRotation name="pixfwdCylinder:EndFlangeRot2"/>  <!-- xt rRotation name="pixfwdCommon:Z180" / xt-->
+  </PosPart>
+
+  <!-- xt PosPart copyNumber="1">
+    <rParent name="pixfwd:PixelForward"/>
+    <rChild name="pixfwdCylinder:PixelForwardCylinderBackCyl"/>
+    <Translation x="0." y="0." z="[pixfwd:ZCylinder]+[pixfwdCylinder:CylindersFrontLength]+[pixfwdCylinder:CylinderBackLength]/2." />
+  </PosPart xt -->
+
+</PosPartSection>
+    
+</DDDefinition>
diff --git a/Geometry/TrackerCommonData/data/PhaseI/Pixel10D/trackerStructureTopology.xml b/Geometry/TrackerCommonData/data/PhaseI/Pixel10D/trackerStructureTopology.xml
new file mode 100644
index 0000000000000..d4e8ebdd19935
--- /dev/null
+++ b/Geometry/TrackerCommonData/data/PhaseI/Pixel10D/trackerStructureTopology.xml
@@ -0,0 +1,622 @@
+<?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">
+ 
+<!--
+Modified for Phase 1 Pixel Forward Geometry
+
+Pratima Jindal, Purdue University Calumet
+July 2009
+
+
+-->
+
+ <SpecParSection label="spec-pars2.xml">
+
+    <SpecPar name="FullTrackerPar">
+      <PartSelector path="//Tracker" />
+      <Parameter name="TkDDDStructure" value="FullTracker"/>
+    </SpecPar>
+
+    <SpecPar name="PixelBarrelSubDetPar">
+      <PartSelector path="//PixelBarrel" />
+      <Parameter name="TkDDDStructure" value="PixelBarrel"/>
+    </SpecPar>
+
+
+    <SpecPar name="PixelBarrelLayerPar">
+      <PartSelector path="//PixelBarrelLayer0" />
+      <PartSelector path="//PixelBarrelLayer1" />
+      <PartSelector path="//PixelBarrelLayer2" />
+      <PartSelector path="//PixelBarrelLayer3" />
+      <Parameter name="TkDDDStructure" value="PixelBarrelLayer"/>
+    </SpecPar>
+
+    <SpecPar name="PixelBarrelLadderPar">
+      <PartSelector path="//PixelBarrelLadderFull0" />
+      <PartSelector path="//PixelBarrelLadderFull1" />
+      <PartSelector path="//PixelBarrelLadderFull2" />
+      <PartSelector path="//PixelBarrelLadderFull3" />
+      <Parameter name="TkDDDStructure" value="PixelBarrelLadder"/>
+    </SpecPar>
+
+
+    <SpecPar name="PixelBarrelModulePar">
+      <PartSelector path="//PixelBarrelActiveFull0" />
+      <PartSelector path="//PixelBarrelActiveFull1" />
+      <PartSelector path="//PixelBarrelActiveFull2" />
+      <PartSelector path="//PixelBarrelActiveFull3" />
+      <Parameter name="TkDDDStructure" value="PixelBarrelDet"/>
+    </SpecPar>
+
+   <SpecPar name="PixelEndcapSubDetPar">
+      <PartSelector path="//PixelForward" />
+  
+      <Parameter name="TkDDDStructure" value="PixelEndcapSubDet"/>
+    </SpecPar>
+
+    <SpecPar name="PixelEndcapDiskPar">
+       <PartSelector path="//PixelForwardDisk1"/>
+       <PartSelector path="//PixelForwardDisk2"/>
+       <PartSelector path="//PixelForwardDisk3"/>
+       <PartSelector path="//PixelForwardDisk4"/>
+       <PartSelector path="//PixelForwardDisk5"/>
+       <PartSelector path="//PixelForwardDisk6"/>
+       <PartSelector path="//PixelForwardDisk7"/>
+       <PartSelector path="//PixelForwardDisk8"/>
+       <PartSelector path="//PixelForwardDisk9"/>
+       <PartSelector path="//PixelForwardDisk10"/>
+<!--       
+       <PartSelector path="//PixelForwardDisk11"/>
+       <PartSelector path="//PixelForwardDisk12"/>
+-->
+      <Parameter name="TkDDDStructure" value="PixelEndcapDisk"/>
+    </SpecPar>
+
+     <SpecPar name="PixelEndcapPanelPar">
+      <PartSelector path="//PixelForwardWafer1" />
+      <PartSelector path="//PixelForwardWafer2" />
+      <PartSelector path="//PixelForwardWafer3" />
+      <PartSelector path="//PixelForwardWafer4" />
+      <PartSelector path="//PixelForwardWafer5" />
+      <PartSelector path="//PixelForwardWafer6" />
+      <PartSelector path="//PixelForwardWafer7" />
+      <PartSelector path="//PixelForwardWafer8" />
+      <PartSelector path="//PixelForwardWafer9" />
+      <PartSelector path="//PixelForwardWafer10" />
+<!--      
+      <PartSelector path="//PixelForwardWafer11" />
+      <PartSelector path="//PixelForwardWafer12" />
+-->
+       <Parameter name="TkDDDStructure" value="PixelEndcapPanel"/>
+    </SpecPar>
+
+    <SpecPar name="PixelEndcapDetPar">
+      <PartSelector path="//PixelForwardSensor1" />
+      <PartSelector path="//PixelForwardSensor2" />
+      <PartSelector path="//PixelForwardSensor3" />
+      <PartSelector path="//PixelForwardSensor4" />
+      <PartSelector path="//PixelForwardSensor5" />
+      <PartSelector path="//PixelForwardSensor6" />
+      <PartSelector path="//PixelForwardSensor7" />
+      <PartSelector path="//PixelForwardSensor8" />
+      <PartSelector path="//PixelForwardSensor9" />
+      <PartSelector path="//PixelForwardSensor10" />
+<!--      
+      <PartSelector path="//PixelForwardSensor11" />
+      <PartSelector path="//PixelForwardSensor12" />
+-->
+       <Parameter name="TkDDDStructure" value="PixelEndcapDet"/>
+    </SpecPar>
+
+
+    <SpecPar name="TIBSubDetPar">
+      <PartSelector path="//TIB" />
+      <Parameter name="TkDDDStructure" value="TIB"/>
+    </SpecPar>
+
+    <SpecPar name="TIBSubDetLayerPar">
+      <PartSelector path="//TIBLayer0" />
+      <PartSelector path="//TIBLayer1" />
+      <PartSelector path="//TIBLayer2" />
+      <PartSelector path="//TIBLayer3" />
+      <Parameter name="TkDDDStructure" value="TIBLayer"/>
+    </SpecPar>
+
+<!--definire plus e minus-->
+
+    <SpecPar name="TIBSubDetStringPar">
+      <PartSelector path="//TIBString0LoMin1" />
+      <PartSelector path="//TIBString0LoPls1" />
+      <PartSelector path="//TIBString0UpMin1" />
+      <PartSelector path="//TIBString0UpPls1" />
+      <PartSelector path="//TIBString1LoMin1" />
+      <PartSelector path="//TIBString1LoPls1" />
+      <PartSelector path="//TIBString1UpMin1" />
+      <PartSelector path="//TIBString1UpPls1" />
+      <PartSelector path="//TIBString2LoMin1" />
+      <PartSelector path="//TIBString2LoPls1" />
+      <PartSelector path="//TIBString2UpMin1" />
+      <PartSelector path="//TIBString2UpPls1" />
+      <PartSelector path="//TIBString3LoMin1" />
+      <PartSelector path="//TIBString3LoPls1" />
+      <PartSelector path="//TIBString3UpMin1" />
+      <PartSelector path="//TIBString3UpPls1" />
+      <Parameter name="TkDDDStructure" value="TIBString"/>
+    </SpecPar>				
+
+    <SpecPar name="TIBSubDetGluedDetPar">
+      <PartSelector path="//TIBModule0A" />
+      <PartSelector path="//TIBModule0B" />
+      <Parameter name="TkDDDStructure" value="TIBGluedDet"/>
+    </SpecPar>
+
+    <SpecPar name="TIBSubDetDetPar">
+      <PartSelector path="//TIBActiveRphi0" />
+      <PartSelector path="//TIBActiveSter0" />
+      <PartSelector path="//TIBActiveRphi2" />
+      <Parameter name="TkDDDStructure" value="TIBDet"/>
+    </SpecPar>
+
+    <SpecPar name="TIDSubDetPar">
+      <PartSelector path="//TIDB" />
+      <PartSelector path="//TIDF" />
+      <Parameter name="TkDDDStructure" value="TID"/>
+    </SpecPar>
+
+    <SpecPar name="TIDSubDetWheelPar">
+      <PartSelector path="//TIDWheelB" />
+      <PartSelector path="//TIDWheelF" />
+      <Parameter name="TkDDDStructure" value="TIDWheel"/>
+    </SpecPar>
+
+    <SpecPar name="TIDSubDetRingPar">
+      <PartSelector path="//TIDRing0F" />
+      <PartSelector path="//TIDRing1F" />
+      <PartSelector path="//TIDRing0B" />
+      <PartSelector path="//TIDRing1B" />
+      <PartSelector path="//TIDRing2" />
+      <Parameter name="TkDDDStructure" value="TIDRing"/>
+    </SpecPar>
+
+    <SpecPar name="TIDSubDetGluedDetPar">
+      <PartSelector path="//TIDModule0L" />
+      <PartSelector path="//TIDModule0R" />
+      <PartSelector path="//TIDModule1L" />
+      <PartSelector path="//TIDModule1R" />
+      <Parameter name="TkDDDStructure" value="TIDGluedDet"/>
+    </SpecPar>
+
+    <SpecPar name="TIDSubDetDetPar">
+      <PartSelector path="//TIDModule0RphiActive" />
+      <PartSelector path="//TIDModule0StereoActive" />
+      <PartSelector path="//TIDModule1RphiActive" />
+      <PartSelector path="//TIDModule1StereoActive" />
+      <PartSelector path="//TIDModule2RphiActive" />
+      <Parameter name="TkDDDStructure" value="TIDDet"/>
+    </SpecPar>
+
+    <SpecPar name="TOBSubDetPar">
+      <PartSelector path="//TOB" />
+      <Parameter name="TkDDDStructure" value="TOB"/>
+    </SpecPar>
+
+    <SpecPar name="TOBSubDetLayerPar">
+      <PartSelector path="//TOBLayer0" />
+      <PartSelector path="//TOBLayer1" />
+      <PartSelector path="//TOBLayer2" />
+      <PartSelector path="//TOBLayer3" />
+      <PartSelector path="//TOBLayer4" />
+      <PartSelector path="//TOBLayer5" />
+      <Parameter name="TkDDDStructure" value="TOBLayer"/>
+    </SpecPar>
+
+    <SpecPar name="TOBSubDetRodPar">
+      <PartSelector path="//TOBRod0L" />
+      <PartSelector path="//TOBRod0H" />
+      <PartSelector path="//TOBRod1L" />
+      <PartSelector path="//TOBRod1H" />
+      <PartSelector path="//TOBRod2L" />
+      <PartSelector path="//TOBRod2H" />
+      <PartSelector path="//TOBRod3L" />
+      <PartSelector path="//TOBRod3H" />
+      <PartSelector path="//TOBRod4L" />
+      <PartSelector path="//TOBRod4H" />
+      <PartSelector path="//TOBRod5L" />
+      <PartSelector path="//TOBRod5H" />
+      <Parameter name="TkDDDStructure" value="TOBRod"/>
+    </SpecPar>
+
+    <SpecPar name="TOBSubDetGluedDetPar">
+      <PartSelector path="//TOBModule0" />
+      <Parameter name="TkDDDStructure" value="TOBGluedDet"/>
+    </SpecPar>
+
+    <SpecPar name="TOBSubDetDetPar">
+      <PartSelector path="//TOBActiveRphi0" />
+      <PartSelector path="//TOBActiveSter0" />
+      <PartSelector path="//TOBActiveRphi2" />
+      <PartSelector path="//TOBActiveRphi4" />
+      <Parameter name="TkDDDStructure" value="TOBDet"/>
+    </SpecPar>
+
+    <SpecPar name="TECSubDetPar">
+      <PartSelector path="//TEC" />
+      <Parameter name="TkDDDStructure" value="TEC"/>
+    </SpecPar>
+
+    <SpecPar name="TECSubDetWheelPar">
+      <PartSelector path="//TECWheelA" />
+      <PartSelector path="//TECWheelB" />
+      <PartSelector path="//TECWheel6" /> <!-- special disk that contains the beamsplitters (for alignment)-->
+      <PartSelector path="//TECWheelC" />
+      <PartSelector path="//TECWheelD" />
+      <Parameter name="TkDDDStructure" value="TECWheel"/>
+    </SpecPar>
+
+    <SpecPar name="TECSubDetPetalPar">
+      <PartSelector path="//TECPetalCont0F" />
+      <PartSelector path="//TECPetalCont0B" />
+      <PartSelector path="//TECPetalCont3F" />
+      <PartSelector path="//TECPetalCont3B" />
+      <PartSelector path="//TECPetalCont6F" />
+      <PartSelector path="//TECPetalCont6B" />
+      <PartSelector path="//TECPetalCont8F" />
+      <PartSelector path="//TECPetalCont8B" />
+      <Parameter name="TkDDDStructure" value="TECPetal"/>
+    </SpecPar>
+
+
+    <SpecPar name="TECSubDetRingPar">
+      <PartSelector path="//TECRing0F" />
+      <PartSelector path="//TECRing0B" />
+      <PartSelector path="//TECRing1F" />
+      <PartSelector path="//TECRing1B" />
+      <PartSelector path="//TECRing2F" />
+      <PartSelector path="//TECRing2B" />
+      <PartSelector path="//TECRing3F" />
+      <PartSelector path="//TECRing3B" />
+      <PartSelector path="//TECRing4F" />
+      <PartSelector path="//TECRing4B" />
+      <PartSelector path="//TECRing5F" />
+      <PartSelector path="//TECRing5B" />
+      <PartSelector path="//TECRing6F" />
+      <PartSelector path="//TECRing6B" />
+      <Parameter name="TkDDDStructure" value="TECRing"/>
+    </SpecPar>
+
+
+    <SpecPar name="TECSubDetGluedDetPar">
+      <PartSelector path="//TECModule0" />
+      <PartSelector path="//TECModule1" />
+      <PartSelector path="//TECModule4" />
+      <Parameter name="TkDDDStructure" value="TECGluedDet"/>
+    </SpecPar>
+
+    <SpecPar name="TECSubDetDetPar">
+      <PartSelector path="//TECModule0RphiActive" />
+      <PartSelector path="//TECModule0StereoActive" />
+      <PartSelector path="//TECModule1RphiActive" />
+      <PartSelector path="//TECModule1StereoActive" />
+      <PartSelector path="//TECModule2RphiActive" />
+      <PartSelector path="//TECModule3RphiActive" />
+      <PartSelector path="//TECModule4RphiActive" /> 
+      <PartSelector path="//TECModule4StereoActive" />
+      <PartSelector path="//TECModule5RphiActive" />
+      <PartSelector path="//TECModule6RphiActive" />
+      <Parameter name="TkDDDStructure" value="TECDet"/>
+    </SpecPar>
+
+  <SpecPar name="TrackerStereoDetectorsPar">
+      <PartSelector path="//TIBActiveSter0" />
+      <PartSelector path="//TIDModule0StereoActive" />
+      <PartSelector path="//TIDModule1StereoActive" />
+      <PartSelector path="//TOBActiveSter0" />
+      <PartSelector path="//TECModule0StereoActive" />
+      <PartSelector path="//TECModule1StereoActive" />
+      <PartSelector path="//TECModule4StereoActive" />
+      <Parameter name="TrackerStereoDetectors" value="true"/>
+  </SpecPar>
+
+
+  <SpecPar name="TrackerAPVNumber6Par">
+      <PartSelector path="//TIBActiveRphi0" />
+      <PartSelector path="//TIBActiveSter0" />
+      <PartSelector path="//TIDModule0RphiActive" />
+      <PartSelector path="//TIDModule0StereoActive" />
+      <PartSelector path="//TIDModule1RphiActive" />
+      <PartSelector path="//TIDModule1StereoActive" />
+      <PartSelector path="//TOBActiveRphi4" />
+      <PartSelector path="//TECModule0RphiActive" />
+      <PartSelector path="//TECModule0StereoActive" />
+      <PartSelector path="//TECModule1RphiActive" />
+      <PartSelector path="//TECModule1StereoActive" />
+      <PartSelector path="//TECModule4RphiActive" /> 
+      <PartSelector path="//TECModule4StereoActive" />
+      <Parameter name="SiliconAPVNumber" value="6"/>
+  </SpecPar>
+
+  <SpecPar name="TrackerAPVNumber4Par">
+      <PartSelector path="//TIBActiveRphi2" />
+      <PartSelector path="//TIDModule2RphiActive" />
+      <PartSelector path="//TOBActiveRphi0" />
+      <PartSelector path="//TOBActiveSter0" />
+      <PartSelector path="//TOBActiveRphi2" />
+      <PartSelector path="//TECModule2RphiActive" />
+      <PartSelector path="//TECModule3RphiActive" />
+      <PartSelector path="//TECModule5RphiActive" />
+      <PartSelector path="//TECModule6RphiActive" />
+      <Parameter name="SiliconAPVNumber" value="4"/>
+  </SpecPar>
+
+  <SpecPar name="PixelROCRowsPar_L0">
+      <PartSelector path="//PixelBarrelActiveFull0" />
+      <Parameter name="PixelROCRows" value="80"/>
+  </SpecPar>
+  <SpecPar name="PixelROCRowsPar_L1">
+      <PartSelector path="//PixelBarrelActiveFull1" />
+      <Parameter name="PixelROCRows" value="80"/>
+  </SpecPar>
+  <SpecPar name="PixelROCRowsPar_L2">
+      <PartSelector path="//PixelBarrelActiveFull2" />
+      <Parameter name="PixelROCRows" value="80"/>
+  </SpecPar>
+  <SpecPar name="PixelROCRowsPar_L3">
+      <PartSelector path="//PixelBarrelActiveFull3" />
+      <Parameter name="PixelROCRows" value="80"/>
+  </SpecPar>
+
+  <SpecPar name="PixelROCRowsPar_D1">
+      <PartSelector path="//PixelForwardSensor1" />
+      <Parameter name="PixelROCRows" value="80"/>
+  </SpecPar>
+  <SpecPar name="PixelROCRowsPar_D2">
+      <PartSelector path="//PixelForwardSensor2" />
+      <Parameter name="PixelROCRows" value="80"/>
+  </SpecPar>
+  <SpecPar name="PixelROCRowsPar_D3">
+      <PartSelector path="//PixelForwardSensor3" />
+      <Parameter name="PixelROCRows" value="80"/>
+  </SpecPar>
+  <SpecPar name="PixelROCRowsPar_D4">
+      <PartSelector path="//PixelForwardSensor4" />
+      <Parameter name="PixelROCRows" value="80"/>
+  </SpecPar>
+  <SpecPar name="PixelROCRowsPar_D5">
+      <PartSelector path="//PixelForwardSensor5" />
+      <Parameter name="PixelROCRows" value="80"/>
+  </SpecPar>
+  <SpecPar name="PixelROCRowsPar_D6">
+      <PartSelector path="//PixelForwardSensor6" />
+      <Parameter name="PixelROCRows" value="80"/>
+  </SpecPar>
+  <SpecPar name="PixelROCRowsPar_D7">
+      <PartSelector path="//PixelForwardSensor7" />
+      <Parameter name="PixelROCRows" value="80"/>
+  </SpecPar>
+  <SpecPar name="PixelROCRowsPar_D8">
+      <PartSelector path="//PixelForwardSensor8" />
+      <Parameter name="PixelROCRows" value="80"/>
+  </SpecPar>
+  <SpecPar name="PixelROCRowsPar_D9">
+      <PartSelector path="//PixelForwardSensor9" />
+      <Parameter name="PixelROCRows" value="80"/>
+  </SpecPar>
+  <SpecPar name="PixelROCRowsPar_D10">
+      <PartSelector path="//PixelForwardSensor10" />
+      <Parameter name="PixelROCRows" value="80"/>
+  </SpecPar>
+<!--  
+  <SpecPar name="PixelROCRowsPar_D11">
+      <PartSelector path="//PixelForwardSensor11" />
+      <Parameter name="PixelROCRows" value="80"/>
+  </SpecPar>
+  <SpecPar name="PixelROCRowsPar_D12">
+      <PartSelector path="//PixelForwardSensor12" />
+      <Parameter name="PixelROCRows" value="80"/>
+  </SpecPar>
+-->
+  <SpecPar name="PixelROCColsPar_L0">
+      <PartSelector path="//PixelBarrelActiveFull0" />
+      <Parameter name="PixelROCCols" value="52"/>
+  </SpecPar>
+  <SpecPar name="PixelROCColsPar_L1">
+      <PartSelector path="//PixelBarrelActiveFull1" />
+      <Parameter name="PixelROCCols" value="52"/>
+  </SpecPar>
+  <SpecPar name="PixelROCColsPar_L2">
+      <PartSelector path="//PixelBarrelActiveFull2" />
+      <Parameter name="PixelROCCols" value="52"/>
+  </SpecPar>
+  <SpecPar name="PixelROCColsPar_L3">
+      <PartSelector path="//PixelBarrelActiveFull3" />
+      <Parameter name="PixelROCCols" value="52"/>
+  </SpecPar>
+
+  <SpecPar name="PixelROCColsPar_D1">
+      <PartSelector path="//PixelForwardSensor1" />
+      <Parameter name="PixelROCCols" value="52"/>
+  </SpecPar>
+  <SpecPar name="PixelROCColsPar_D2">
+      <PartSelector path="//PixelForwardSensor2" />
+      <Parameter name="PixelROCCols" value="52"/>
+  </SpecPar>
+  <SpecPar name="PixelROCColsPar_D3">
+      <PartSelector path="//PixelForwardSensor3" />
+      <Parameter name="PixelROCCols" value="52"/>
+  </SpecPar>
+  <SpecPar name="PixelROCColsPar_D4">
+      <PartSelector path="//PixelForwardSensor4" />
+      <Parameter name="PixelROCCols" value="52"/>
+  </SpecPar>
+  <SpecPar name="PixelROCColsPar_D5">
+      <PartSelector path="//PixelForwardSensor5" />
+      <Parameter name="PixelROCCols" value="52"/>
+  </SpecPar>
+  <SpecPar name="PixelROCColsPar_D6">
+      <PartSelector path="//PixelForwardSensor6" />
+      <Parameter name="PixelROCCols" value="52"/>
+  </SpecPar>
+  <SpecPar name="PixelROCColsPar_D7">
+      <PartSelector path="//PixelForwardSensor7" />
+      <Parameter name="PixelROCCols" value="52"/>
+  </SpecPar>
+  <SpecPar name="PixelROCColsPar_D8">
+      <PartSelector path="//PixelForwardSensor8" />
+      <Parameter name="PixelROCCols" value="52"/>
+  </SpecPar>
+  <SpecPar name="PixelROCColsPar_D9">
+      <PartSelector path="//PixelForwardSensor9" />
+      <Parameter name="PixelROCCols" value="52"/>
+  </SpecPar>
+  <SpecPar name="PixelROCColsPar_D10">
+      <PartSelector path="//PixelForwardSensor10" />
+      <Parameter name="PixelROCCols" value="52"/>
+  </SpecPar>
+<!--  
+  <SpecPar name="PixelROCColsPar_D11">
+      <PartSelector path="//PixelForwardSensor11" />
+      <Parameter name="PixelROCCols" value="52"/>
+  </SpecPar>
+  <SpecPar name="PixelROCColsPar_D12">
+      <PartSelector path="//PixelForwardSensor12" />
+      <Parameter name="PixelROCCols" value="52"/>
+  </SpecPar>
+-->
+  <SpecPar name="PixelROC_XPar_L0">
+      <PartSelector path="//PixelBarrelActiveFull0" />
+      <Parameter name="PixelROC_X" value="2"/>
+  </SpecPar>
+
+  <SpecPar name="PixelROC_XPar_L1">
+      <PartSelector path="//PixelBarrelActiveFull1" />
+      <Parameter name="PixelROC_X" value="2"/>
+  </SpecPar>
+  <SpecPar name="PixelROC_XPar_L2">
+      <PartSelector path="//PixelBarrelActiveFull2" />
+      <Parameter name="PixelROC_X" value="2"/>
+  </SpecPar>
+  <SpecPar name="PixelROC_XPar_L3">
+      <PartSelector path="//PixelBarrelActiveFull3" />
+      <Parameter name="PixelROC_X" value="2"/>
+  </SpecPar>
+
+  <SpecPar name="PixelROC_XPar_D1">
+      <PartSelector path="//PixelForwardSensor1" />
+      <Parameter name="PixelROC_X" value="2"/>
+  </SpecPar>
+  <SpecPar name="PixelROC_XPar_D2">
+      <PartSelector path="//PixelForwardSensor2" />
+      <Parameter name="PixelROC_X" value="2"/>
+  </SpecPar>
+  <SpecPar name="PixelROC_XPar_D3">
+      <PartSelector path="//PixelForwardSensor3" />
+      <Parameter name="PixelROC_X" value="2"/>
+  </SpecPar>
+  <SpecPar name="PixelROC_XPar_D4">
+      <PartSelector path="//PixelForwardSensor4" />
+      <Parameter name="PixelROC_X" value="2"/>
+  </SpecPar>
+  <SpecPar name="PixelROC_XPar_D5">
+      <PartSelector path="//PixelForwardSensor5" />
+      <Parameter name="PixelROC_X" value="2"/>
+  </SpecPar>
+  <SpecPar name="PixelROC_XPar_D6">
+      <PartSelector path="//PixelForwardSensor6" />
+      <Parameter name="PixelROC_X" value="2"/>
+  </SpecPar>
+  <SpecPar name="PixelROC_XPar_D7">
+      <PartSelector path="//PixelForwardSensor7" />
+      <Parameter name="PixelROC_X" value="2"/>
+  </SpecPar>
+  <SpecPar name="PixelROC_XPar_D8">
+      <PartSelector path="//PixelForwardSensor8" />
+      <Parameter name="PixelROC_X" value="2"/>
+  </SpecPar>
+  <SpecPar name="PixelROC_XPar_D9">
+      <PartSelector path="//PixelForwardSensor9" />
+      <Parameter name="PixelROC_X" value="2"/>
+  </SpecPar>
+  <SpecPar name="PixelROC_XPar_D10">
+      <PartSelector path="//PixelForwardSensor10" />
+      <Parameter name="PixelROC_X" value="2"/>
+  </SpecPar>
+<!--  
+  <SpecPar name="PixelROC_XPar_D11">
+      <PartSelector path="//PixelForwardSensor11" />
+      <Parameter name="PixelROC_X" value="2"/>
+  </SpecPar>
+  <SpecPar name="PixelROC_XPar_D12">
+      <PartSelector path="//PixelForwardSensor12" />
+      <Parameter name="PixelROC_X" value="2"/>
+  </SpecPar>
+-->
+  <SpecPar name="PixelROC_YPar_L0">
+      <PartSelector path="//PixelBarrelActiveFull0" />
+      <Parameter name="PixelROC_Y" value="8"/>
+  </SpecPar>
+  <SpecPar name="PixelROC_YPar_L1">
+      <PartSelector path="//PixelBarrelActiveFull1" />
+      <Parameter name="PixelROC_Y" value="8"/>
+  </SpecPar>
+  <SpecPar name="PixelROC_YPar_L2">
+      <PartSelector path="//PixelBarrelActiveFull2" />
+      <Parameter name="PixelROC_Y" value="8"/>
+  </SpecPar>
+  <SpecPar name="PixelROC_YPar_L3">
+      <PartSelector path="//PixelBarrelActiveFull3" />
+      <Parameter name="PixelROC_Y" value="8"/>
+  </SpecPar>
+
+  <SpecPar name="PixelROC_YPar_D1">
+      <PartSelector path="//PixelForwardSensor1" />
+      <Parameter name="PixelROC_Y" value="8"/>
+  </SpecPar>
+  <SpecPar name="PixelROC_YPar_D2">
+      <PartSelector path="//PixelForwardSensor2" />
+      <Parameter name="PixelROC_Y" value="8"/>
+  </SpecPar>
+  <SpecPar name="PixelROC_YPar_D3">
+      <PartSelector path="//PixelForwardSensor3" />
+      <Parameter name="PixelROC_Y" value="8"/>
+  </SpecPar>
+  <SpecPar name="PixelROC_YPar_D4">
+      <PartSelector path="//PixelForwardSensor4" />
+      <Parameter name="PixelROC_Y" value="8"/>
+  </SpecPar>
+  <SpecPar name="PixelROC_YPar_D5">
+      <PartSelector path="//PixelForwardSensor5" />
+      <Parameter name="PixelROC_Y" value="8"/>
+  </SpecPar>
+  <SpecPar name="PixelROC_YPar_D6">
+      <PartSelector path="//PixelForwardSensor6" />
+      <Parameter name="PixelROC_Y" value="8"/>
+  </SpecPar>
+  <SpecPar name="PixelROC_YPar_D7">
+      <PartSelector path="//PixelForwardSensor7" />
+      <Parameter name="PixelROC_Y" value="8"/>
+  </SpecPar>
+  <SpecPar name="PixelROC_YPar_D8">
+      <PartSelector path="//PixelForwardSensor8" />
+      <Parameter name="PixelROC_Y" value="8"/>
+  </SpecPar>
+  <SpecPar name="PixelROC_YPar_D9">
+      <PartSelector path="//PixelForwardSensor9" />
+      <Parameter name="PixelROC_Y" value="8"/>
+  </SpecPar>
+  <SpecPar name="PixelROC_YPar_D10">
+      <PartSelector path="//PixelForwardSensor10" />
+      <Parameter name="PixelROC_Y" value="8"/>
+  </SpecPar>
+<!--  
+  <SpecPar name="PixelROC_YPar_D11">
+      <PartSelector path="//PixelForwardSensor11" />
+      <Parameter name="PixelROC_Y" value="8"/>
+  </SpecPar>
+  <SpecPar name="PixelROC_YPar_D12">
+      <PartSelector path="//PixelForwardSensor12" />
+      <Parameter name="PixelROC_Y" value="8"/>
+  </SpecPar>
+-->
+  </SpecParSection>
+</DDDefinition>
+
diff --git a/Geometry/TrackerCommonData/data/PhaseI/pixbar.xml b/Geometry/TrackerCommonData/data/PhaseI/pixbar.xml
index 30e8d5df589c4..664f5887d8da8 100644
--- a/Geometry/TrackerCommonData/data/PhaseI/pixbar.xml
+++ b/Geometry/TrackerCommonData/data/PhaseI/pixbar.xml
@@ -355,11 +355,11 @@
  <Tubs name="PixelBarrelConnToST"   rMin="[ConnToSTRin]" rMax="[ConnToSTRout]"
        dz="[ConnToSTT]/2"           startPhi="0*deg"        deltaPhi="360*deg"/>
  <Tubs name="PixelBarrelConn3"   rMin="[Conn3Rin]"           rMax="[Conn3Rout]"
-       dz="[Conn3T]/2"           startPhi="285*deg"        deltaPhi="150*deg"/>
+       dz="[Conn3T]/2"           startPhi="0*deg"        deltaPhi="360*deg"/>
  <Tubs name="PixelBarrelConn4"   rMin="[Conn4Rin]"           rMax="[Conn3Rout]"
-       dz="[Conn4T]/2"           startPhi="285*deg"        deltaPhi="150*deg"/>
+       dz="[Conn4T]/2"           startPhi="0*deg"        deltaPhi="360*deg"/>
  <Tubs name="PixelBarrelService" rMin="[ServiceRin]"           rMax="[ServiceRout]"
-       dz="[ServT]/2"            startPhi="293*deg"        deltaPhi="134*deg"/>
+       dz="[ServT]/2"            startPhi="0*deg"        deltaPhi="360*deg"/>
  <Tubs name="PixelBarrelSupTubCables" rMin="[RinSupTubCab]" rMax="[Conn3Rout]"
        dz="[ServCablT]/2"            startPhi="0*deg"        deltaPhi="360*deg"/>
 </SolidSection>
@@ -539,19 +539,19 @@
  </LogicalPart>
  <LogicalPart name="PixelBarrelConn3" category="unspecified">
   <rSolid name="PixelBarrelConn3"/>
-  <rMaterial name="pixbarmaterial:SupplyTubeConn3"/>
+  <rMaterial name="pixbarmaterial:SupplyTubeConn3_3Disks"/>
  </LogicalPart>
  <LogicalPart name="PixelBarrelConn4" category="unspecified">
   <rSolid name="PixelBarrelConn4"/>
-  <rMaterial name="pixbarmaterial:SectorC"/>
+  <rMaterial name="pixbarmaterial:SectorC_3Disks"/>
  </LogicalPart>
  <LogicalPart name="PixelBarrelService" category="unspecified">
   <rSolid name="PixelBarrelService"/>
-  <rMaterial name="pixbarmaterial:SectorA"/>
+  <rMaterial name="pixbarmaterial:SectorA_3Disks"/>
  </LogicalPart>
  <LogicalPart name="PixelBarrelSupTubCables" category="unspecified">
   <rSolid name="PixelBarrelSupTubCables"/>
-  <rMaterial name="pixbarmaterial:PixelBarrelSupTubCables2"/>
+  <rMaterial name="pixbarmaterial:PixelBarrelSupTubCables2_3Disks"/>
  </LogicalPart>
 </LogicalPartSection>
 
diff --git a/Geometry/TrackerCommonData/data/PhaseI/pixbarmaterial.xml b/Geometry/TrackerCommonData/data/PhaseI/pixbarmaterial.xml
index 198ef40105560..6d45c7af27a3d 100644
--- a/Geometry/TrackerCommonData/data/PhaseI/pixbarmaterial.xml
+++ b/Geometry/TrackerCommonData/data/PhaseI/pixbarmaterial.xml
@@ -4,7 +4,7 @@
 <MaterialSection label="pixbarmaterial.xml">
 
 <!-- New materials -->
-  <CompositeMaterial name="SupplyTubeConn3" density="0.3556*g/cm3" symbol=" " method="mixture by weight">   <!--Supply tube material in Conn3 volume-->
+  <CompositeMaterial name="SupplyTubeConn3" density="0.3556*g/cm3" symbol=" " method="mixture by weight">   <!--Supply tube material in Conn3 volume (no fpix contribution and 150/180 deg sectors)-->
      <MaterialFraction fraction="0.027795">
       <rMaterial name="materials:Bpix_Pipe_Steel"/>
      </MaterialFraction>
@@ -30,6 +30,17 @@
       <rMaterial name="materials:T_Kapton"/>
     </MaterialFraction>
    </CompositeMaterial>
+   
+  <CompositeMaterial name="SupplyTubeConn3_3Disks" density="0.4646*g/cm3" symbol=" " method="mixture by weight"> <!-- fpix 3 disks service material added -->
+    <MaterialFraction fraction="1.00000000">
+      <rMaterial name="SupplyTubeConn3"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  <CompositeMaterial name="SupplyTubeConn3_10Disks" density="0.7908*g/cm3" symbol=" " method="mixture by weight"> <!-- fpix 10 disks service material added -->
+    <MaterialFraction fraction="1.00000000">
+      <rMaterial name="SupplyTubeConn3"/>
+    </MaterialFraction>
+  </CompositeMaterial>
 
   <CompositeMaterial name="SupplyTubeEpoxy" density="1.05*g/cm3" symbol=" " method="mixture by weight">
     <MaterialFraction fraction="0.5999">
@@ -576,6 +587,17 @@
       <rMaterial name="trackermaterial:T_Nomex"/>
     </MaterialFraction>
   </CompositeMaterial>
+  
+ <CompositeMaterial name="SectorA_3Disks" density="0.55812*g/cm3" symbol=" " method="mixture by weight"> <!-- fpix 3 disks service material added -->
+    <MaterialFraction fraction="1.0">
+      <rMaterial name="pixbarmaterial:SectorA"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+ <CompositeMaterial name="SectorA_10Disks" density="0.95001*g/cm3" symbol=" " method="mixture by weight"> <!-- fpix 10 disks service material added -->
+    <MaterialFraction fraction="1.0">
+      <rMaterial name="pixbarmaterial:SectorA"/>
+    </MaterialFraction>
+  </CompositeMaterial>
 
   <CompositeMaterial name="SectorB" density="0.74961*g/cm3" symbol=" " method="mixture by weight">
     <MaterialFraction fraction="0.19011">
@@ -648,6 +670,17 @@
       <rMaterial name="trackermaterial:T_Nomex"/>
     </MaterialFraction>
   </CompositeMaterial>
+  
+ <CompositeMaterial name="SectorC_3Disks" density="1.22394*g/cm3" symbol=" " method="mixture by weight"> <!-- fpix 3 disks service material added -->
+    <MaterialFraction fraction="1.000000">
+      <rMaterial name="pixbarmaterial:SectorC"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+ <CompositeMaterial name="SectorC_10Disks" density="2.18549*g/cm3" symbol=" " method="mixture by weight"> <!-- fpix 10 disks service material added -->
+    <MaterialFraction fraction="1.000000">
+      <rMaterial name="pixbarmaterial:SectorC"/>
+    </MaterialFraction>
+  </CompositeMaterial>
 
   <CompositeMaterial name="SectorC_Upgrade" density="0.19652*g/cm3" symbol=" " method="mixture by weight">
     <MaterialFraction fraction="1.00000000">
@@ -685,6 +718,17 @@
       <rMaterial name="trackermaterial:T_Copper"/>
     </MaterialFraction>
   </CompositeMaterial>
+  
+  <CompositeMaterial name="PixelBarrelSupTubCables2_3Disks" density="0.96016*g/cm3" symbol=" " method="mixture by weight"> <!-- fpix 3 disks service material added -->
+    <MaterialFraction fraction="1.00000000">
+      <rMaterial name="PixelBarrelSupTubCables2"/>
+    </MaterialFraction>
+  </CompositeMaterial>
+  <CompositeMaterial name="PixelBarrelSupTubCables2_10Disks" density="1.63436*g/cm3" symbol=" " method="mixture by weight"> <!-- fpix 10 disks service material added -->
+    <MaterialFraction fraction="1.00000000">
+      <rMaterial name="PixelBarrelSupTubCables2"/>
+    </MaterialFraction>
+  </CompositeMaterial>
 
 
 </MaterialSection>
diff --git a/Geometry/TrackerCommonData/data/PhaseI/pixfwdOuterDisk1.xml b/Geometry/TrackerCommonData/data/PhaseI/pixfwdOuterDisk1.xml
index e924c89b5f5d1..aa1a3224a10d7 100644
--- a/Geometry/TrackerCommonData/data/PhaseI/pixfwdOuterDisk1.xml
+++ b/Geometry/TrackerCommonData/data/PhaseI/pixfwdOuterDisk1.xml
@@ -10,7 +10,7 @@
 <!--  <Constant name="OuterRingHalfWidth"   value="18.6*mm"/> -->
   <Constant name="OuterRingHalfWidth"   value="18.6*mm"/>
   <Constant name="OuterRingZ"           value="-[pixfwdDisks:DiskHalfWidth]+[OuterRingHalfWidth]"/>
-  <Constant name="InnerRingRMax"      value="89.2"/>
+  <Constant name="InnerRingRMax"      value="89.2*mm"/>
   <Constant name="InnerRingRMin"      value="[InnerRingRMax]-2.0*mm"/>
   <Constant name="InnerRingCFRMax"     value="[InnerRingRMin]"/>
   <Constant name="InnerRingCFRMin"     value="[InnerRingCFRMax]-0.5*mm"/>
diff --git a/Geometry/TrackerCommonData/data/PhaseI/pixfwdOuterDisk2.xml b/Geometry/TrackerCommonData/data/PhaseI/pixfwdOuterDisk2.xml
index 794b1c5e8255b..11a7049047648 100644
--- a/Geometry/TrackerCommonData/data/PhaseI/pixfwdOuterDisk2.xml
+++ b/Geometry/TrackerCommonData/data/PhaseI/pixfwdOuterDisk2.xml
@@ -9,7 +9,7 @@
 <!--  <Constant name="OuterRingHalfWidth"   value="18.6*mm"/> -->
   <Constant name="OuterRingHalfWidth"   value="18.6*mm"/>
   <Constant name="OuterRingZ"           value="-[pixfwdDisks:DiskHalfWidth]+[OuterRingHalfWidth]"/>
-  <Constant name="InnerRingRMax"      value="89.2"/>
+  <Constant name="InnerRingRMax"      value="89.2*mm"/>
   <Constant name="InnerRingRMin"      value="[InnerRingRMax]-2.0*mm"/>
   <Constant name="InnerRingCFRMax"     value="[InnerRingRMin]"/>
   <Constant name="InnerRingCFRMin"     value="[InnerRingCFRMax]-0.5*mm"/>
diff --git a/Geometry/TrackerCommonData/data/PhaseI/pixfwdOuterDisk3.xml b/Geometry/TrackerCommonData/data/PhaseI/pixfwdOuterDisk3.xml
index ddf6631f81f66..a83bc73637555 100644
--- a/Geometry/TrackerCommonData/data/PhaseI/pixfwdOuterDisk3.xml
+++ b/Geometry/TrackerCommonData/data/PhaseI/pixfwdOuterDisk3.xml
@@ -10,7 +10,7 @@
 <!--  <Constant name="OuterRingHalfWidth"   value="18.6*mm"/> -->
   <Constant name="OuterRingHalfWidth"   value="18.6*mm"/>
   <Constant name="OuterRingZ"           value="-[pixfwdDisks:DiskHalfWidth]+[OuterRingHalfWidth]"/>
-  <Constant name="InnerRingRMax"      value="89.2"/>
+  <Constant name="InnerRingRMax"      value="89.2*mm"/>
   <Constant name="InnerRingRMin"      value="[InnerRingRMax]-2.0*mm"/>
   <Constant name="InnerRingCFRMax"     value="[InnerRingRMin]"/>
   <Constant name="InnerRingCFRMin"     value="[InnerRingCFRMax]-0.5*mm"/>
diff --git a/Geometry/TrackerCommonData/data/PhaseII/BarrelEndcap5D/pixbar.xml b/Geometry/TrackerCommonData/data/PhaseII/BarrelEndcap5D/pixbar.xml
index 1b06168cda8d1..4904142b547ed 100644
--- a/Geometry/TrackerCommonData/data/PhaseII/BarrelEndcap5D/pixbar.xml
+++ b/Geometry/TrackerCommonData/data/PhaseII/BarrelEndcap5D/pixbar.xml
@@ -5,8 +5,7 @@
     <Constant name="Rin1" value="2.50*cm"/>
     <Constant name="Rin2" value="18.00*cm"/>
     <Constant name="Rin3" value="18.6*cm"/>
-    <Constant name="RinSupTubCab" value="15.00*cm"/>
-    <Constant name="Rout1" value="21.35*cm"/>
+    <Constant name="Rout1" value="20.35*cm"/> <!-- 21.35*cm-->
     <Constant name="Rout2" value="21.00*cm"/>
     <Constant name="Zv1" value="28.70*cm"/>
     <Constant name="Zv2" value="56.00*cm"/>
@@ -14,7 +13,7 @@
     <Constant name="Zv4" value="282.0*cm"/>
     <Constant name="ZvSupTubCab" value="248.0*cm"/>
     <Constant name="SupportL" value="221.0*cm"/>
-    <Constant name="SupportRin" value="21.2*cm"/>
+    <Constant name="SupportRin" value="20.2*cm"/> <!-- 21.2*cm-->
     <Constant name="SupportL_cut" value="[FlangeT]"/>
     <Constant name="SupportW_cut" value="7.00*cm"/>
     <Constant name="SupportW" value="20.00*cm"/>
@@ -136,23 +135,9 @@
     <Constant name="Conn2Rin" value="11.00*cm"/>
     <Constant name="Conn1Z" value="[FlangeZ]-[FlangeT]/2-[Conn1T]/2"/>
     <Constant name="Conn2Z" value="[FlangeZ]+[FlangeT]/2+[Conn1T]/2"/>
-    <Constant name="Conn3Rout" value="19.0*cm"/>
-    <Constant name="Conn3Rin" value="18.0*cm"/>
-    <Constant name="Conn4Rin" value="18.0*cm"/>
     <Constant name="ConnToSTT" value="3.00*cm"/>
     <Constant name="ConnToSTRin" value="18.0*cm"/>
     <Constant name="ConnToSTRout" value="18.8*cm"/>
-    <Constant name="Conn3T" value="51.0*cm"/>
-    <Constant name="Conn4T" value="120.00*cm"/>
-    <Constant name="ConnToSTZ" value="30.50*cm"/>
-    <Constant name="Conn3Z" value="54.62*cm"/>
-    <Constant name="Conn4Z" value="[Conn3Z]+                                            ([Conn3T]+[Conn4T])/2"/>
-    <Constant name="ServiceRout" value="21.0*cm"/>
-    <Constant name="ServiceRin" value="18.0*cm"/>
-    <Constant name="ServT" value="48.5*cm"/>
-    <Constant name="ServZ" value="[Conn4Z]+                                            ([Conn4T]+[ServT])/2"/>
-    <Constant name="ServCablT" value="32.2*cm"/>
-    <Constant name="ServCablZ" value="[ServZ]+[ServT]/2+[ServCablT]/2"/>
     <Constant name="RadialCoolZ" value="29.5*cm"/>
     <Constant name="RadialCoolDZ" value="1.0*cm"/>
     <Constant name="RadialCoolRin" value="4.0*cm"/>
@@ -162,24 +147,20 @@
   </RotationSection>
   <SolidSection label="pixbar.xml">
     <Polycone name="PixelBarrel" startPhi="0*deg" deltaPhi="360*deg">
-      <ZSection z="-281.00*cm" rMin="[RinSupTubCab]" rMax="21.8*cm"/>
-      <ZSection z="-245.00*cm" rMin="[RinSupTubCab]" rMax="21.8*cm"/>
-      <ZSection z="-245.00*cm" rMin="[Rin2]" rMax="21.8*cm"/>
-      <ZSection z="-118.5*cm" rMin="[Rin2]" rMax="21.8*cm"/>
-      <ZSection z="-118.5*cm" rMin="[Rin2]" rMax="67.087*cm"/>
-      <ZSection z="-116.9*cm" rMin="[Rin2]" rMax="67.087*cm"/>
-      <ZSection z="-116.9*cm" rMin="[Rin2]" rMax="109.65*cm"/>
-      <ZSection z="-28.70*cm" rMin="[Rin2]" rMax="109.65*cm"/>
-      <ZSection z="-28.70*cm" rMin="[Rin1]" rMax="109.65*cm"/>
-      <ZSection z="28.70*cm" rMin="[Rin1]" rMax="109.65*cm"/>
-      <ZSection z="28.70*cm" rMin="[Rin2]" rMax="109.65*cm"/>
-      <ZSection z="116.9*cm" rMin="[Rin2]" rMax="109.65*cm"/>
-      <ZSection z="116.9*cm" rMin="[Rin2]" rMax="67.087*cm"/>
-      <ZSection z="118.5*cm" rMin="[Rin2]" rMax="67.087*cm"/>
-      <ZSection z="118.5*cm" rMin="[Rin2]" rMax="21.8*cm"/>
-      <ZSection z="245.00*cm" rMin="[Rin2]" rMax="21.8*cm"/>
-      <ZSection z="245.00*cm" rMin="[RinSupTubCab]" rMax="21.8*cm"/>
-      <ZSection z="281.00*cm" rMin="[RinSupTubCab]" rMax="21.8*cm"/>
+      <ZSection z="-291.0*cm" rMin="117.99*cm" rMax="120.0*cm"/>
+      <ZSection z="-119.0*cm" rMin="117.99*cm" rMax="120.0*cm"/>
+      <ZSection z="-119.0*cm" rMin="19.0*cm" rMax="120.0*cm"/>
+      <ZSection z="-29.12*cm" rMin="19.0*cm" rMax="120.0*cm"/>
+      <ZSection z="-29.12*cm" rMin="[Rin2]" rMax="120.0*cm"/>
+      <ZSection z="-28.70*cm" rMin="[Rin2]" rMax="120.0*cm"/>
+      <ZSection z="-28.70*cm" rMin="[Rin1]" rMax="120.0*cm"/>
+      <ZSection z="28.70*cm" rMin="[Rin1]" rMax="120.0*cm"/>
+      <ZSection z="28.70*cm" rMin="[Rin2]" rMax="120.0*cm"/>
+      <ZSection z="29.12*cm" rMin="[Rin2]" rMax="120.0*cm"/>
+      <ZSection z="29.12*cm" rMin="19.0*cm" rMax="120.0*cm"/>
+      <ZSection z="119.0*cm" rMin="19.0*cm" rMax="120.0*cm"/>
+      <ZSection z="119.0*cm" rMin="117.99*cm" rMax="120.0*cm"/>
+      <ZSection z="291.0*cm" rMin="117.99*cm" rMax="120.0*cm"/>
     </Polycone>
     <!--
     <Polycone name="PixelBarrel" startPhi="0*deg" deltaPhi="360*deg">
@@ -209,7 +190,7 @@
     </Polycone>
     -->
     <Tubs name="PixelBarrelSuppTub" rMin="[SupportRin]" rMax="[Rout1]" dz="[SupportL]/2" startPhi="0*deg" deltaPhi="360*deg"/>
-    <Box name="PixelBarrelSuppBox_full" dx="[SupportW]/2 - 3.2*cm" dy="[SupportT]/2" dz="[SupportL]/2"/>
+    <Box name="PixelBarrelSuppBox_full" dx="[SupportW]/2 - 3.7*cm" dy="[SupportT]/2" dz="[SupportL]/2"/>
     <Box name="PixelBarrelSuppBox_cut" dx="[SupportW_cut]/2" dy="[SupportT]/2" dz="[SupportL_cut]/2"/>
     <SubtractionSolid name="PixelBarrelSuppBox_1">
       <rSolid name="PixelBarrelSuppBox_full"/>
@@ -291,10 +272,6 @@
     <Tubs name="PixelBarrelConn1" rMin="[Conn1Rin]" rMax="[Shield3Rin]" dz="[Conn1T]/2" startPhi="0*deg" deltaPhi="360*deg"/>
     <Tubs name="PixelBarrelConn2" rMin="[Conn2Rin]" rMax="[Shield3Rin]" dz="[Conn1T]/2" startPhi="0*deg" deltaPhi="360*deg"/>
     <Tubs name="PixelBarrelConnToST" rMin="[ConnToSTRin]" rMax="[ConnToSTRout]" dz="[ConnToSTT]/2" startPhi="0*deg" deltaPhi="360*deg"/>
-    <Tubs name="PixelBarrelConn3" rMin="[Conn3Rin]" rMax="[Conn3Rout]" dz="[Conn3T]/2" startPhi="285*deg" deltaPhi="150*deg"/>
-    <Tubs name="PixelBarrelConn4" rMin="[Conn4Rin]" rMax="[Conn3Rout]" dz="[Conn4T]/2" startPhi="285*deg" deltaPhi="150*deg"/>
-    <Tubs name="PixelBarrelService" rMin="[ServiceRin]" rMax="[ServiceRout]" dz="[ServT]/2" startPhi="293*deg" deltaPhi="134*deg"/>
-    <Tubs name="PixelBarrelSupTubCables" rMin="[RinSupTubCab]" rMax="[Conn3Rout]" dz="[ServCablT]/2" startPhi="0*deg" deltaPhi="360*deg"/>
   </SolidSection>
   <LogicalPartSection label="pixbar.xml">
     <LogicalPart name="PixelBarrel" category="unspecified">
@@ -461,22 +438,6 @@
       <rSolid name="PixelBarrelConnToST"/>
       <rMaterial name="pixbarmaterial:cable_endring_to_tube_Upgrade"/>
     </LogicalPart>
-    <LogicalPart name="PixelBarrelConn3" category="unspecified">
-      <rSolid name="PixelBarrelConn3"/>
-      <rMaterial name="pixbarmaterial:SupplyTubeConn3"/>
-    </LogicalPart>
-    <LogicalPart name="PixelBarrelConn4" category="unspecified">
-      <rSolid name="PixelBarrelConn4"/>
-      <rMaterial name="pixbarmaterial:SectorC"/>
-    </LogicalPart>
-    <LogicalPart name="PixelBarrelService" category="unspecified">
-      <rSolid name="PixelBarrelService"/>
-      <rMaterial name="pixbarmaterial:SectorA"/>
-    </LogicalPart>
-    <LogicalPart name="PixelBarrelSupTubCables" category="unspecified">
-      <rSolid name="PixelBarrelSupTubCables"/>
-      <rMaterial name="pixbarmaterial:PixelBarrelSupTubCables2"/>
-    </LogicalPart>
   </LogicalPartSection>
   <PosPartSection label="pixbar.xml">
 <!-- -->
@@ -822,83 +783,6 @@
       <rChild name="pixbar:PixelBarrelPipes_FlangeToSTXm"/>
       <Translation x="[zero]" y="[zero]" z="-[PixelBarrelPipe_FlangeToST_Z]"/>
     </PosPart>
-    <PosPart copyNumber="1">
-      <rParent name="pixbar:PixelBarrel"/>
-      <rChild name="pixbar:PixelBarrelConn3"/>
-      <Translation x="[zero]" y="[zero]" z="[Conn3Z]"/>
-    </PosPart>
-    <PosPart copyNumber="2">
-      <rParent name="pixbar:PixelBarrel"/>
-      <rChild name="pixbar:PixelBarrelConn3"/>
-      <rRotation name="pixbar:180D"/>
-      <Translation x="[zero]" y="[zero]" z="[Conn3Z]"/>
-    </PosPart>
-    <PosPart copyNumber="3">
-      <rParent name="pixbar:PixelBarrel"/>
-      <rChild name="pixbar:PixelBarrelConn3"/>
-      <Translation x="[zero]" y="[zero]" z="-[Conn3Z]"/>
-    </PosPart>
-    <PosPart copyNumber="4">
-      <rParent name="pixbar:PixelBarrel"/>
-      <rChild name="pixbar:PixelBarrelConn3"/>
-      <rRotation name="pixbar:180D"/>
-      <Translation x="[zero]" y="[zero]" z="-[Conn3Z]"/>
-    </PosPart>
-    <PosPart copyNumber="1">
-      <rParent name="pixbar:PixelBarrel"/>
-      <rChild name="pixbar:PixelBarrelConn4"/>
-      <Translation x="[zero]" y="[zero]" z="[Conn4Z]"/>
-    </PosPart>
-    <PosPart copyNumber="2">
-      <rParent name="pixbar:PixelBarrel"/>
-      <rChild name="pixbar:PixelBarrelConn4"/>
-      <rRotation name="pixbar:180D"/>
-      <Translation x="[zero]" y="[zero]" z="[Conn4Z]"/>
-    </PosPart>
-    <PosPart copyNumber="3">
-      <rParent name="pixbar:PixelBarrel"/>
-      <rChild name="pixbar:PixelBarrelConn4"/>
-      <Translation x="[zero]" y="[zero]" z="-[Conn4Z]"/>
-    </PosPart>
-    <PosPart copyNumber="4">
-      <rParent name="pixbar:PixelBarrel"/>
-      <rChild name="pixbar:PixelBarrelConn4"/>
-      <rRotation name="pixbar:180D"/>
-      <Translation x="[zero]" y="[zero]" z="-[Conn4Z]"/>
-    </PosPart>
-    <PosPart copyNumber="1">
-      <rParent name="pixbar:PixelBarrel"/>
-      <rChild name="pixbar:PixelBarrelService"/>
-      <Translation x="[zero]" y="[zero]" z="[ServZ]"/>
-    </PosPart>
-    <PosPart copyNumber="2">
-      <rParent name="pixbar:PixelBarrel"/>
-      <rChild name="pixbar:PixelBarrelService"/>
-      <rRotation name="pixbar:180D"/>
-      <Translation x="[zero]" y="[zero]" z="[ServZ]"/>
-    </PosPart>
-    <PosPart copyNumber="3">
-      <rParent name="pixbar:PixelBarrel"/>
-      <rChild name="pixbar:PixelBarrelService"/>
-      <Translation x="[zero]" y="[zero]" z="-[ServZ]"/>
-    </PosPart>
-    <PosPart copyNumber="4">
-      <rParent name="pixbar:PixelBarrel"/>
-      <rChild name="pixbar:PixelBarrelService"/>
-      <rRotation name="pixbar:180D"/>
-      <Translation x="[zero]" y="[zero]" z="-[ServZ]"/>
-    </PosPart>
-    <PosPart copyNumber="1">
-      <rParent name="pixbar:PixelBarrel"/>
-      <rChild name="pixbar:PixelBarrelSupTubCables"/>
-      <Translation x="[zero]" y="[zero]" z="[ServCablZ]"/>
-    </PosPart>
-    <PosPart copyNumber="2">
-      <rParent name="pixbar:PixelBarrel"/>
-      <rChild name="pixbar:PixelBarrelSupTubCables"/>
-      <rRotation name="pixbar:180D"/>
-      <Translation x="[zero]" y="[zero]" z="-[ServCablZ]"/>
-    </PosPart>
     <PosPart copyNumber="1">
       <rParent name="pixbar:PixelBarrel"/>
       <rChild name="pixbarlayer0:PixelBarrelLayer0"/>
diff --git a/Geometry/TrackerCommonData/data/PhaseII/BarrelEndcap5D/pixfwd.xml b/Geometry/TrackerCommonData/data/PhaseII/BarrelEndcap5D/pixfwd.xml
index 9bd9becaea9e3..6f9d08221a4d7 100644
--- a/Geometry/TrackerCommonData/data/PhaseII/BarrelEndcap5D/pixfwd.xml
+++ b/Geometry/TrackerCommonData/data/PhaseII/BarrelEndcap5D/pixfwd.xml
@@ -3,35 +3,67 @@
     
 
 <ConstantsSection label="pixfwd.xml" eval="true">
+ <Constant name="zero" value="0.0*fm"/>
  <Constant name="RootRadius"     value="[pixfwdCylinder:CylindersOuterRmax]"/>
- <Constant name="RootHalfLength" value="[pixfwdCylinder:CylindersOuterLength]/2.+ [pixfwdCylinder:CylindersEndFlangeLength]/2."/>
+ <Constant name="RootHalfLength" value="[pixfwdCylinder:CylindersOuterLength]/2.+ [pixfwdCylinder:CylindersEndFlangeLength]/2.+[Zextension]/2."/>
 
  <Constant name="AnchorZ"        value="0.*mm"/>
  <Constant name="ZPixelForward"  value="291.*mm"/>
- <Constant name="RootStartZ"     value="-2*mm"/>
+ <Constant name="RootStartZ"     value="-4*mm"/>
  <Constant name="RootMidZ1"      value="[cms:TrackLumiZ1]-[ZPixelForward]"/>
  <Constant name="RootMidZ2"      value="[cms:TrackLumiZ2]-[ZPixelForward]"/>
  <Constant name="RootMidZ3"      value="[cms:TrackBeamZ1]-[ZPixelForward]"/>
  <Constant name="RootEndZ"       value="2*[RootHalfLength]"/>
+ <Constant name="Zextension"      value="273.11*mm"/>
+ <Constant name="ZextensionCables"      value="203.5*mm"/>
 
- <Constant name="Disk1Z"         value="35.75*mm"/>
- <Constant name="Disk2Z"         value="[Disk1Z]+72.5*mm"/>
- <Constant name="Disk3Z"         value="[Disk2Z]+120*mm"/>
+ <Constant name="Disk1Z"         value="[pixfwdDisks:DiskHalfWidth]+[RootStartZ]"/> <!-- 35.75*mm-->
+ <Constant name="Disk2Z"         value="[Disk1Z]+75.0*mm"/>
+ <Constant name="Disk3Z"         value="[Disk2Z]+95.0*mm"/>
 
  <Constant name="ZCylinder"      value="[AnchorZ]"/>
 
+    <Constant name="Conn3Rout" value="19.0*cm"/>
+    <Constant name="Conn3Rin" value="18.0*cm"/>
+    <Constant name="Conn4Rin" value="18.0*cm"/>
+    <Constant name="Conn3T" value="51.0*cm"/>
+    <Constant name="Conn4T" value="120.00*cm"/>
+    <Constant name="ConnToSTZ" value="30.50*cm"/>
+    <Constant name="Conn3Z" value="54.62*cm-[ZPixelForward]"/>
+    <Constant name="Conn4Z" value="[Conn3Z]+([Conn3T]+[Conn4T])/2"/>
+    <Constant name="ServiceRout" value="21.0*cm"/>
+    <Constant name="ServiceRin" value="18.0*cm"/>
+    <Constant name="ServT" value="48.5*cm"/>
+    <Constant name="ServZ" value="[Conn4Z]+([Conn4T]+[ServT])/2"/>
+    <Constant name="ServCablT" value="32.2*cm"/>
+    <Constant name="ServCablZ" value="[ServZ]+[ServT]/2+[ServCablT]/2"/>
+    <Constant name="RinSupTubCab" value="18.00*cm"/>
+
 </ConstantsSection>
 
 <SolidSection label="pixfwd.xml">
  <Polycone name="PixelForward" startPhi="0*deg" deltaPhi="360*deg" >
-   <ZSection z="-0.40*cm" rMin="[cms:TrackBeamR1]" rMax="17.451*cm"/>
-   <ZSection z="99.00*cm" rMin="2.50*cm" rMax="17.451*cm"/>
-   <ZSection z="99.00*cm" rMin="2.50*cm" rMax="110.0*cm"/>
-   <ZSection z="102.80*cm" rMin="2.50*cm" rMax="110.0*cm"/>
-   <ZSection z="102.80*cm" rMin="9.99*cm" rMax="110.0*cm"/>
-   <ZSection z="214.24*cm" rMin="9.99*cm" rMax="110.0*cm"/>
-   <ZSection z="214.24*cm" rMin="22.19*cm" rMax="110.0*cm"/>
-   <ZSection z="245.30*cm" rMin="22.19*cm" rMax="110.0*cm"/>
+   <ZSection z="[RootStartZ]" rMin="[cms:TrackBeamR1]" rMax="18.0*cm"/>
+   <ZSection z="0.02*cm" rMin="[cms:TrackBeamR1]" rMax="18.0*cm"/>
+   <ZSection z="0.02*cm" rMin="[cms:TrackBeamR1]" rMax="19.0*cm"/>
+   <ZSection z="89.9*cm" rMin="[cms:TrackBeamR1]" rMax="19.0*cm"/>
+   <ZSection z="89.9*cm" rMin="[cms:TrackBeamR1]" rMax="21.6*cm"/>
+   <ZSection z="99.00*cm" rMin="[cms:TrackBeamR1]" rMax="21.6*cm"/>
+   <ZSection z="99.00*cm" rMin="[cms:TrackBeamR1]" rMax="111.105*cm"/>
+   <ZSection z="[RootMidZ1]"   rMin="[cms:TrackBeamR1]" rMax="111.105*cm"/>
+   <ZSection z="[RootMidZ1]"   rMin="[cms:TrackLumiR1]" rMax="111.105*cm"/>
+   <ZSection z="[RootMidZ2]"   rMin="[cms:TrackLumiR1]" rMax="111.105*cm"/>
+   <ZSection z="[RootMidZ2]"   rMin="[cms:TrackBeamR1]" rMax="111.105*cm"/>
+   <ZSection z="[RootMidZ3]"   rMin="[cms:TrackBeamR1]" rMax="111.105*cm"/>
+   <ZSection z="[RootEndZ]"    rMin="[cms:TrackBeamR2]" rMax="111.105*cm"/>
+   <ZSection z="[RootEndZ]+[ZextensionCables]"    rMin="[cms:TrackBeamR2]" rMax="111.105*cm"/>
+</Polycone>
+
+    <Tubs name="PixelBarrelConn3" rMin="[Conn3Rin]" rMax="[Conn3Rout]" dz="[Conn3T]/2" startPhi="0*deg" deltaPhi="360*deg"/>
+    <Tubs name="PixelBarrelConn4" rMin="[Conn4Rin]" rMax="[Conn3Rout]" dz="[Conn4T]/2" startPhi="0*deg" deltaPhi="360*deg"/>
+    <Tubs name="PixelBarrelService" rMin="[ServiceRin]" rMax="[ServiceRout]" dz="[ServT]/2" startPhi="0*deg" deltaPhi="360*deg"/>
+    <Tubs name="PixelBarrelSupTubCables" rMin="[RinSupTubCab]" rMax="[Conn3Rout]" dz="[ServCablT]/2" startPhi="0*deg" deltaPhi="360*deg"/>
+
 <!--
  <ZSection z="[RootStartZ]"  rMin="[cms:TrackBeamR1]" rMax="[RootRadius]"/>
  <ZSection z="[RootMidZ1]"   rMin="[cms:TrackBeamR1]" rMax="[RootRadius]"/>
@@ -73,7 +105,6 @@
  <RZPoint r="[cms:TrackBeamR1]" z="[RootStartZ]"/>
 -->
 
- </Polycone>
 </SolidSection>
  
 <LogicalPartSection label="pixfwd.xml">
@@ -81,6 +112,22 @@
   <rSolid name="PixelForward"/>
   <rMaterial name="materials:Air"/>
  </LogicalPart>
+     <LogicalPart name="PixelBarrelConn3" category="unspecified">
+      <rSolid name="PixelBarrelConn3"/>
+      <rMaterial name="pixbarmaterial:SupplyTubeConn3_3Disks"/>
+    </LogicalPart>
+    <LogicalPart name="PixelBarrelConn4" category="unspecified">
+      <rSolid name="PixelBarrelConn4"/>
+      <rMaterial name="pixbarmaterial:SectorC_3Disks"/>
+    </LogicalPart>
+    <LogicalPart name="PixelBarrelService" category="unspecified">
+      <rSolid name="PixelBarrelService"/>
+      <rMaterial name="pixbarmaterial:SectorA_3Disks"/>
+    </LogicalPart>
+    <LogicalPart name="PixelBarrelSupTubCables" category="unspecified">
+      <rSolid name="PixelBarrelSupTubCables"/>
+      <rMaterial name="pixbarmaterial:PixelBarrelSupTubCables2_3Disks"/>
+    </LogicalPart>
 </LogicalPartSection>
 
 
@@ -121,6 +168,26 @@
     <Translation x="0." y="0." z="[pixfwd:ZCylinder]+[pixfwdCylinder:CylindersOuterLength]+[pixfwdCylinder:CylindersEndFlangeLength]/2."/>
     <rRotation name="pixfwdCylinder:EndFlangeRot2"/>  <!-- xt rRotation name="pixfwdCommon:Z180" / xt-->
   </PosPart>
+    <PosPart copyNumber="1">
+      <rParent name="pixfwd:PixelForward"/>
+      <rChild name="pixfwd:PixelBarrelConn3"/>
+      <Translation x="[zero]" y="[zero]" z="[Conn3Z]"/>
+    </PosPart>
+    <PosPart copyNumber="1">
+      <rParent name="pixfwd:PixelForward"/>
+      <rChild name="pixfwd:PixelBarrelConn4"/>
+      <Translation x="[zero]" y="[zero]" z="[Conn4Z]"/>
+    </PosPart>
+    <PosPart copyNumber="1">
+      <rParent name="pixfwd:PixelForward"/>
+      <rChild name="pixfwd:PixelBarrelService"/>
+      <Translation x="[zero]" y="[zero]" z="[ServZ]"/>
+    </PosPart>
+    <PosPart copyNumber="1">
+      <rParent name="pixfwd:PixelForward"/>
+      <rChild name="pixfwd:PixelBarrelSupTubCables"/>
+      <Translation x="[zero]" y="[zero]" z="[ServCablZ]"/>
+    </PosPart>
 
   <!-- xt PosPart copyNumber="1">
     <rParent name="pixfwd:PixelForward"/>
diff --git a/Geometry/TrackerCommonData/data/PhaseII/BarrelEndcap5D/tracker.xml b/Geometry/TrackerCommonData/data/PhaseII/BarrelEndcap5D/tracker.xml
index 6dfca79669eb1..e975780d303bc 100644
--- a/Geometry/TrackerCommonData/data/PhaseII/BarrelEndcap5D/tracker.xml
+++ b/Geometry/TrackerCommonData/data/PhaseII/BarrelEndcap5D/tracker.xml
@@ -16023,7 +16023,28 @@
 </LogicalPart>
 </LogicalPartSection>
 <SolidSection label="tracker.xml">
+<!--
 <Tubs name="Tracker" rMin="25*mm" rMax="1190*mm" dz="2910*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+-->
+    <Polycone name="Tracker" startPhi="0*deg" deltaPhi="360*deg">
+      <ZSection z="-291.0*cm" rMin="7.4*cm" rMax="120.0*cm"/>
+      <ZSection z="-270.65*cm" rMin="7.4*cm" rMax="120.0*cm"/>
+      <ZSection z="-270.65*cm" rMin="7.4*cm" rMax="120.0*cm"/>
+      <ZSection z="-194.8*cm" rMin="[cms:TrackBeamR1]" rMax="120.0*cm"/>
+      <ZSection z="-180.0*cm" rMin="[cms:TrackBeamR1]" rMax="120.0*cm"/>
+      <ZSection z="-180.0*cm" rMin="[cms:TrackLumiR1]" rMax="120.0*cm"/>
+      <ZSection z="-172.2*cm" rMin="[cms:TrackLumiR1]" rMax="120.0*cm"/>
+      <ZSection z="-172.2*cm" rMin="[cms:TrackBeamR1]" rMax="120.0*cm"/>
+      <ZSection z="172.2*cm" rMin="[cms:TrackBeamR1]" rMax="120.0*cm"/>
+      <ZSection z="172.2*cm" rMin="[cms:TrackLumiR1]" rMax="120.0*cm"/>
+      <ZSection z="180.0*cm" rMin="[cms:TrackLumiR1]" rMax="120.0*cm"/>
+      <ZSection z="180.0*cm" rMin="[cms:TrackBeamR1]" rMax="120.0*cm"/>
+      <ZSection z="194.8*cm" rMin="[cms:TrackBeamR1]" rMax="120.0*cm"/>
+      <ZSection z="270.65*cm" rMin="7.4*cm" rMax="120.0*cm"/>
+      <ZSection z="270.65*cm" rMin="7.4*cm" rMax="120.0*cm"/>
+      <ZSection z="291.0*cm" rMin="7.4*cm" rMax="120.0*cm"/>
+    </Polycone>
+ 
 <Box name="BModule1Layer1" dx="48*mm" dy="23.13*mm" dz="1.4*mm"/>
 <Box name="BModule1Layer1INNERwafer" dx="48*mm" dy="23.13*mm" dz="0.1*mm"/>
 <Box name="BModule1Layer1OUTERwafer" dx="48*mm" dy="23.13*mm" dz="0.1*mm"/>
@@ -17131,26 +17152,40 @@
 <Tubs name="serviceR1179Z2415" rMin="1179.9*mm" rMax="1189.9*mm" dz="205.659*mm" startPhi="0*deg" deltaPhi="360*deg"/>
 <Tubs name="serviceR1179Z2765" rMin="1179.9*mm" rMax="1189.9*mm" dz="144.2*mm" startPhi="0*deg" deltaPhi="360*deg"/>
 <Tubs name="supportR1190Z2910" rMin="1190*mm" rMax="1200*mm" dz="2910*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="supportR214Z1160" rMin="214.978*mm" rMax="492.978*mm" dz="5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<!--<Tubs name="supportR214Z1160" rMin="214.978*mm" rMax="492.978*mm" dz="5*mm" startPhi="0*deg" deltaPhi="360*deg"/> -->
+<Tubs name="supportR214Z1160" rMin="224.978*mm" rMax="492.978*mm" dz="5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
 <Tubs name="supportR670Z1179" rMin="670.978*mm" rMax="1064.98*mm" dz="5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="supportR204Z1169" rMin="204.878*mm" rMax="214.878*mm" dz="1169.44*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="supportR1096Z1169" rMin="1096.08*mm" rMax="1106.08*mm" dz="1169.44*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<!-- <Tubs name="supportR204Z1169" rMin="204.878*mm" rMax="214.878*mm" dz="1169.44*mm" startPhi="0*deg" deltaPhi="360*deg"/> -->
+<Tubs name="supportR204Z1169" rMin="203.578*mm" rMax="213.578*mm" dz="1169.44*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<!--<Tubs name="supportR1096Z1169" rMin="1096.08*mm" rMax="1106.08*mm" dz="1169.44*mm" startPhi="0*deg" deltaPhi="360*deg"/> -->
+<Tubs name="supportR1096Z1169" rMin="1096.98*mm" rMax="1106.98*mm" dz="1169.44*mm" startPhi="0*deg" deltaPhi="360*deg"/>
 <Tubs name="supportR1101Z1320" rMin="1101.05*mm" rMax="1111.05*mm" dz="650.278*mm" startPhi="0*deg" deltaPhi="360*deg"/>
 <Tubs name="supportR235Z1320" rMin="235.459*mm" rMax="245.459*mm" dz="650.278*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="supportR249Z285" rMin="249.779*mm" rMax="342.246*mm" dz="5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="supportR375Z285" rMin="375.571*mm" rMax="492.878*mm" dz="5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="supportR525Z285" rMin="525.32*mm" rMax="670.878*mm" dz="5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="supportR702Z285" rMin="702.611*mm" rMax="872.779*mm" dz="5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="supportR904Z285" rMin="904.18*mm" rMax="1064.88*mm" dz="5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<!-- <Tubs name="supportR249Z285" rMin="249.779*mm" rMax="342.246*mm" dz="5*mm" startPhi="0*deg" deltaPhi="360*deg"/> -->
+<Tubs name="supportR249Z285" rMin="251.079*mm" rMax="341.446*mm" dz="5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<!--<Tubs name="supportR375Z285" rMin="375.571*mm" rMax="492.878*mm" dz="5*mm" startPhi="0*deg" deltaPhi="360*deg"/>-->
+<Tubs name="supportR375Z285" rMin="376.371*mm" rMax="492.078*mm" dz="5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<!--<Tubs name="supportR525Z285" rMin="525.32*mm" rMax="670.878*mm" dz="5*mm" startPhi="0*deg" deltaPhi="360*deg"/>-->
+<Tubs name="supportR525Z285" rMin="526.12*mm" rMax="669.978*mm" dz="5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<!--<Tubs name="supportR702Z285" rMin="702.611*mm" rMax="872.779*mm" dz="5*mm" startPhi="0*deg" deltaPhi="360*deg"/>-->
+<Tubs name="supportR702Z285" rMin="703.511*mm" rMax="871.879*mm" dz="5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<!--<Tubs name="supportR904Z285" rMin="904.18*mm" rMax="1064.88*mm" dz="5*mm" startPhi="0*deg" deltaPhi="360*deg"/>-->
+<Tubs name="supportR904Z285" rMin="905.08*mm" rMax="1063.98*mm" dz="5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
 <Tubs name="supportR214Z1170" rMin="214.978*mm" rMax="492.978*mm" dz="5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
 <Tubs name="supportR670Z1189" rMin="670.978*mm" rMax="1064.98*mm" dz="5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
 <Tubs name="supportR1101Z2621" rMin="1101.05*mm" rMax="1111.05*mm" dz="650.278*mm" startPhi="0*deg" deltaPhi="360*deg"/>
 <Tubs name="supportR235Z2621" rMin="235.459*mm" rMax="245.459*mm" dz="650.278*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="supportR249Z295" rMin="249.779*mm" rMax="342.246*mm" dz="5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="supportR375Z295" rMin="375.571*mm" rMax="492.878*mm" dz="5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="supportR525Z295" rMin="525.32*mm" rMax="670.878*mm" dz="5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="supportR702Z295" rMin="702.611*mm" rMax="872.779*mm" dz="5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
-<Tubs name="supportR904Z295" rMin="904.18*mm" rMax="1064.88*mm" dz="5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<!-- <Tubs name="supportR249Z295" rMin="249.779*mm" rMax="342.246*mm" dz="5*mm" startPhi="0*deg" deltaPhi="360*deg"/> -->
+<!--<Tubs name="supportR249Z295" rMin="251.079*mm" rMax="342.246*mm" dz="5*mm" startPhi="0*deg" deltaPhi="360*deg"/>-->
+<Tubs name="supportR249Z295" rMin="251.079*mm" rMax="341.446*mm" dz="5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<!--<Tubs name="supportR375Z295" rMin="375.571*mm" rMax="492.878*mm" dz="5*mm" startPhi="0*deg" deltaPhi="360*deg"/>-->
+<Tubs name="supportR375Z295" rMin="376.371*mm" rMax="492.078*mm" dz="5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<!--<Tubs name="supportR525Z295" rMin="525.32*mm" rMax="670.878*mm" dz="5*mm" startPhi="0*deg" deltaPhi="360*deg"/>-->
+<Tubs name="supportR525Z295" rMin="526.12*mm" rMax="669.978*mm" dz="5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<!--<Tubs name="supportR702Z295" rMin="702.611*mm" rMax="872.779*mm" dz="5*mm" startPhi="0*deg" deltaPhi="360*deg"/>-->
+<Tubs name="supportR702Z295" rMin="703.511*mm" rMax="871.879*mm" dz="5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
+<!--<Tubs name="supportR904Z295" rMin="904.18*mm" rMax="1064.88*mm" dz="5*mm" startPhi="0*deg" deltaPhi="360*deg"/>-->
+<Tubs name="supportR904Z295" rMin="905.08*mm" rMax="1063.98*mm" dz="5*mm" startPhi="0*deg" deltaPhi="360*deg"/>
 </SolidSection>
 <PosPartSection label="tracker.xml">
 <PosPart copyNumber="1">
@@ -22606,224 +22641,226 @@
 <Translation x="0*mm" y="0*mm" z="2325*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
-<rParent name="tracker:Tracker"/>
+<rParent name="pixbar:PixelBarrel"/>
 <rChild name="tracker:serviceR214Z1150"/>
 <Translation x="0*mm" y="0*mm" z="1159.77*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
-<rParent name="tracker:Tracker"/>
+<rParent name="pixbar:PixelBarrel"/>
 <rChild name="tracker:serviceR214Z1169"/>
-<Translation x="0*mm" y="0*mm" z="1174.44*mm"/>
+<Translation x="0*mm" y="0*mm" z="1174.443*mm"/> <!-- 1174.44*mm-->
 </PosPart>
 <PosPart copyNumber="1">
-<rParent name="tracker:Tracker"/>
+<rParent name="pixbar:PixelBarrel"/>
 <rChild name="tracker:serviceR342Z1150"/>
 <Translation x="0*mm" y="0*mm" z="1159.77*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
-<rParent name="tracker:Tracker"/>
+<rParent name="pixbar:PixelBarrel"/>
 <rChild name="tracker:serviceR342Z1169"/>
-<Translation x="0*mm" y="0*mm" z="1174.44*mm"/>
+<Translation x="0*mm" y="0*mm" z="1174.443*mm"/> <!-- 1174.44*mm-->
 </PosPart>
 <PosPart copyNumber="1">
-<rParent name="tracker:Tracker"/>
+<rParent name="pixbar:PixelBarrel"/>
 <rChild name="tracker:serviceR492Z1150"/>
 <Translation x="0*mm" y="0*mm" z="1159.77*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
-<rParent name="tracker:Tracker"/>
+<rParent name="pixbar:PixelBarrel"/>
 <rChild name="tracker:serviceR492Z1169"/>
-<Translation x="0*mm" y="0*mm" z="1174.44*mm"/>
+<Translation x="0*mm" y="0*mm" z="1174.443*mm"/> <!-- 1174.44*mm-->
 </PosPart>
 <PosPart copyNumber="1">
-<rParent name="tracker:Tracker"/>
+<rParent name="pixbar:PixelBarrel"/>
 <rChild name="tracker:serviceR670Z1169"/>
-<Translation x="0*mm" y="0*mm" z="1174.54*mm"/>
+<Translation x="0*mm" y="0*mm" z="1174.443*mm"/> <!-- 1174.44*mm-->
 </PosPart>
 <PosPart copyNumber="1">
-<rParent name="tracker:Tracker"/>
+<rParent name="pixbar:PixelBarrel"/>
 <rChild name="tracker:serviceR872Z1169"/>
-<Translation x="0*mm" y="0*mm" z="1174.54*mm"/>
+<Translation x="0*mm" y="0*mm" z="1174.443*mm"/> <!-- 1174.44*mm-->
 </PosPart>
 <PosPart copyNumber="1">
-<rParent name="tracker:Tracker"/>
+<rParent name="pixbar:PixelBarrel"/>
 <rChild name="tracker:serviceR1064Z1169"/>
-<Translation x="0*mm" y="0*mm" z="1174.54*mm"/>
+<Translation x="0*mm" y="0*mm" z="1174.443*mm"/> <!-- 1174.44*mm-->
 </PosPart>
 <PosPart copyNumber="1">
-<rParent name="tracker:Tracker"/>
+<rParent name="pixbar:PixelBarrel"/>
 <rChild name="tracker:serviceR214Z-1169"/>
 <Translation x="0*mm" y="0*mm" z="-1159.77*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
-<rParent name="tracker:Tracker"/>
+<rParent name="pixbar:PixelBarrel"/>
 <rChild name="tracker:serviceR214Z-1179"/>
-<Translation x="0*mm" y="0*mm" z="-1174.44*mm"/>
+<Translation x="0*mm" y="0*mm" z="-1174.443*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
-<rParent name="tracker:Tracker"/>
+<rParent name="pixbar:PixelBarrel"/>
 <rChild name="tracker:serviceR342Z-1169"/>
-<Translation x="0*mm" y="0*mm" z="-1159.77*mm"/>
+<Translation x="0*mm" y="0*mm" z="-1159.77*mm"/> 
 </PosPart>
 <PosPart copyNumber="1">
-<rParent name="tracker:Tracker"/>
+<rParent name="pixbar:PixelBarrel"/>
 <rChild name="tracker:serviceR342Z-1179"/>
-<Translation x="0*mm" y="0*mm" z="-1174.44*mm"/>
+<Translation x="0*mm" y="0*mm" z="-1174.443*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
-<rParent name="tracker:Tracker"/>
+<rParent name="pixbar:PixelBarrel"/>
 <rChild name="tracker:serviceR492Z-1169"/>
-<Translation x="0*mm" y="0*mm" z="-1159.77*mm"/>
+<Translation x="0*mm" y="0*mm" z="-1159.77*mm"/> 
 </PosPart>
 <PosPart copyNumber="1">
-<rParent name="tracker:Tracker"/>
+<rParent name="pixbar:PixelBarrel"/>
 <rChild name="tracker:serviceR492Z-1179"/>
-<Translation x="0*mm" y="0*mm" z="-1174.44*mm"/>
+<Translation x="0*mm" y="0*mm" z="-1174.443*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
-<rParent name="tracker:Tracker"/>
+<rParent name="pixbar:PixelBarrel"/>
 <rChild name="tracker:serviceR670Z-1179"/>
 <Translation x="0*mm" y="0*mm" z="-1174.54*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
-<rParent name="tracker:Tracker"/>
+<rParent name="pixbar:PixelBarrel"/>
 <rChild name="tracker:serviceR872Z-1179"/>
 <Translation x="0*mm" y="0*mm" z="-1174.54*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
-<rParent name="tracker:Tracker"/>
+<rParent name="pixbar:PixelBarrel"/>
 <rChild name="tracker:serviceR1064Z-1179"/>
 <Translation x="0*mm" y="0*mm" z="-1174.54*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
-<rParent name="tracker:Tracker"/>
+<rParent name="pixbar:PixelBarrel"/>
 <rChild name="tracker:serviceR1179Z1250"/>
-<Translation x="0*mm" y="0*mm" z="1250.29*mm"/>
+<Translation x="0*mm" y="0*mm" z="1250.29*mm"/> <!-- 1250.29-->
 </PosPart>
 <PosPart copyNumber="1">
-<rParent name="tracker:Tracker"/>
+<rParent name="pixbar:PixelBarrel"/>
 <rChild name="tracker:serviceR1179Z1444"/>
-<Translation x="0*mm" y="0*mm" z="1445*mm"/>
+<Translation x="0*mm" y="0*mm" z="1445.0*mm"/> <!-- 1445.0*mm-->
 </PosPart>
 <PosPart copyNumber="1">
-<rParent name="tracker:Tracker"/>
+<rParent name="pixbar:PixelBarrel"/>
 <rChild name="tracker:serviceR1179Z1715"/>
-<Translation x="0*mm" y="0*mm" z="1715.8*mm"/>
+<Translation x="0*mm" y="0*mm" z="1715.8*mm"/> <!-- 1715.8*mm-->
 </PosPart>
 <PosPart copyNumber="1">
-<rParent name="tracker:Tracker"/>
+<rParent name="pixbar:PixelBarrel"/>
 <rChild name="tracker:serviceR1179Z2036"/>
-<Translation x="0*mm" y="0*mm" z="2036.36*mm"/>
+<Translation x="0*mm" y="0*mm" z="2036.36*mm"/> <!-- 2036.36*mm-->
 </PosPart>
 <PosPart copyNumber="1">
-<rParent name="tracker:Tracker"/>
+<rParent name="pixbar:PixelBarrel"/>
 <rChild name="tracker:serviceR1179Z2415"/>
-<Translation x="0*mm" y="0*mm" z="2415.84*mm"/>
+<Translation x="0*mm" y="0*mm" z="2415.84*mm"/> <!-- 2415.84*mm-->
 </PosPart>
 <PosPart copyNumber="1">
-<rParent name="tracker:Tracker"/>
+<rParent name="pixbar:PixelBarrel"/>
 <rChild name="tracker:serviceR1179Z2765"/>
-<Translation x="0*mm" y="0*mm" z="2765.8*mm"/>
+<Translation x="0*mm" y="0*mm" z="2765.3*mm"/> <!-- 2765.8*mm-->
 </PosPart>
 <PosPart copyNumber="1">
-<rParent name="tracker:Tracker"/>
+<rParent name="pixbar:PixelBarrel"/>
 <rChild name="tracker:supportR1190Z2910"/>
 </PosPart>
 <PosPart copyNumber="1">
-<rParent name="tracker:Tracker"/>
+<rParent name="pixbar:PixelBarrel"/>
 <rChild name="tracker:supportR214Z1160"/>
-<Translation x="0*mm" y="0*mm" z="1165.2*mm"/>
+<Translation x="0*mm" y="0*mm" z="1184.64*mm"/> <!-- 1165.2*mm-->
 </PosPart>
 <PosPart copyNumber="1">
-<rParent name="tracker:Tracker"/>
+<rParent name="pixbar:PixelBarrel"/>
 <rChild name="tracker:supportR670Z1179"/>
 <Translation x="0*mm" y="0*mm" z="1184.64*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
-<rParent name="tracker:Tracker"/>
+<rParent name="pixbar:PixelBarrel"/>
 <rChild name="tracker:supportR204Z1169"/>
 </PosPart>
 <PosPart copyNumber="1">
-<rParent name="tracker:Tracker"/>
+<rParent name="pixbar:PixelBarrel"/>
 <rChild name="tracker:supportR1096Z1169"/>
 </PosPart>
 <PosPart copyNumber="1">
-<rParent name="tracker:Tracker"/>
+<rParent name="pixfwd:PixelForward"/>
 <rChild name="tracker:supportR1101Z1320"/>
-<Translation x="0*mm" y="0*mm" z="1971.22*mm"/>
+<Translation x="0*mm" y="0*mm" z="1680.22*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
-<rParent name="tracker:Tracker"/>
+<rParent name="pixfwd:PixelForward"/>
 <rChild name="tracker:supportR235Z1320"/>
-<Translation x="0*mm" y="0*mm" z="1971.22*mm"/>
+<Translation x="0*mm" y="0*mm" z="1680.22*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
-<rParent name="tracker:Tracker"/>
+<rParent name="pixbar:PixelBarrel"/>
 <rChild name="tracker:supportR249Z285"/>
 <Translation x="0*mm" y="0*mm" z="290*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
-<rParent name="tracker:Tracker"/>
+<rParent name="pixbar:PixelBarrel"/>
 <rChild name="tracker:supportR375Z285"/>
 <Translation x="0*mm" y="0*mm" z="290*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
-<rParent name="tracker:Tracker"/>
+<rParent name="pixbar:PixelBarrel"/>
 <rChild name="tracker:supportR525Z285"/>
 <Translation x="0*mm" y="0*mm" z="290*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
-<rParent name="tracker:Tracker"/>
+<rParent name="pixbar:PixelBarrel"/>
 <rChild name="tracker:supportR702Z285"/>
 <Translation x="0*mm" y="0*mm" z="290*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
-<rParent name="tracker:Tracker"/>
+<rParent name="pixbar:PixelBarrel"/>
 <rChild name="tracker:supportR904Z285"/>
 <Translation x="0*mm" y="0*mm" z="290*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
-<rParent name="tracker:Tracker"/>
+<rParent name="pixbar:PixelBarrel"/>
 <rChild name="tracker:supportR214Z1170"/>
-<Translation x="0*mm" y="0*mm" z="-1165.2*mm"/>
+<Translation x="0*mm" y="0*mm" z="-1184.64*mm"/> <!-- 1165.2*mm -->
 </PosPart>
 <PosPart copyNumber="1">
-<rParent name="tracker:Tracker"/>
+<rParent name="pixbar:PixelBarrel"/>
 <rChild name="tracker:supportR670Z1189"/>
 <Translation x="0*mm" y="0*mm" z="-1184.64*mm"/>
 </PosPart>
+<!--
 <PosPart copyNumber="1">
-<rParent name="tracker:Tracker"/>
+<rParent name="pixfwd:PixelForward"/>
 <rChild name="tracker:supportR1101Z2621"/>
 <Translation x="0*mm" y="0*mm" z="-1971.22*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
-<rParent name="tracker:Tracker"/>
+<rParent name="pixfwd:PixelForward"/>
 <rChild name="tracker:supportR235Z2621"/>
 <Translation x="0*mm" y="0*mm" z="-1971.22*mm"/>
 </PosPart>
+-->
 <PosPart copyNumber="1">
-<rParent name="tracker:Tracker"/>
+<rParent name="pixbar:PixelBarrel"/>
 <rChild name="tracker:supportR249Z295"/>
 <Translation x="0*mm" y="0*mm" z="-290*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
-<rParent name="tracker:Tracker"/>
+<rParent name="pixbar:PixelBarrel"/>
 <rChild name="tracker:supportR375Z295"/>
 <Translation x="0*mm" y="0*mm" z="-290*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
-<rParent name="tracker:Tracker"/>
+<rParent name="pixbar:PixelBarrel"/>
 <rChild name="tracker:supportR525Z295"/>
 <Translation x="0*mm" y="0*mm" z="-290*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
-<rParent name="tracker:Tracker"/>
+<rParent name="pixbar:PixelBarrel"/>
 <rChild name="tracker:supportR702Z295"/>
 <Translation x="0*mm" y="0*mm" z="-290*mm"/>
 </PosPart>
 <PosPart copyNumber="1">
-<rParent name="tracker:Tracker"/>
+<rParent name="pixbar:PixelBarrel"/>
 <rChild name="tracker:supportR904Z295"/>
 <Translation x="0*mm" y="0*mm" z="-290*mm"/>
 </PosPart>
diff --git a/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwd.xml b/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwd.xml
index f1c706771a0b3..8e86e4c1e2b02 100644
--- a/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwd.xml
+++ b/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwd.xml
@@ -3,6 +3,7 @@
     
 
 <ConstantsSection label="pixfwd.xml" eval="true">
+ <Constant name="zero" value="0.0*fm"/>
  <Constant name="RootRadius"     value="[pixfwdCylinder:CylindersOuterRmax]"/>
  <Constant name="RootHalfLength" value="[pixfwdCylinder:CylindersOuterLength]/2.+ [pixfwdCylinder:CylindersEndFlangeLength]/2.+[Zextension]/2."/>
 
@@ -14,10 +15,11 @@
  <Constant name="RootMidZ3"      value="[cms:TrackBeamZ1]-[ZPixelForward]"/>
  <Constant name="RootEndZ"       value="2*[RootHalfLength]"/>
  <Constant name="Zextension"      value="273.11*mm"/>
+ <Constant name="ZextensionCables"      value="203.5*mm"/>
 
  <Constant name="Disk1Z"         value="[pixfwdDisks:DiskHalfWidth]+[RootStartZ]"/> <!-- 35.75*mm-->
- <Constant name="Disk2Z"         value="[Disk1Z]+89.0*mm"/>
- <Constant name="Disk3Z"         value="[Disk2Z]+113.0*mm"/>
+ <Constant name="Disk2Z"         value="[Disk1Z]+75.0*mm"/>
+ <Constant name="Disk3Z"         value="[Disk2Z]+95.0*mm"/>
  <Constant name="Disk4Z"         value="[Disk3Z]+147.0*mm"/>
  <Constant name="Disk5Z"         value="[Disk4Z]+188.0*mm"/> 
  <Constant name="Disk6Z"         value="[Disk5Z]+242.0*mm"/> 
@@ -30,20 +32,47 @@
  <Constant name="Disk12Z"         value="[Disk11Z]+477.0*mm"/>
 -->
  <Constant name="ZCylinder"      value="[AnchorZ]"/>
+ 
+    <Constant name="Conn3Rout" value="19.0*cm"/>
+    <Constant name="Conn3Rin" value="18.0*cm"/>
+    <Constant name="Conn4Rin" value="18.0*cm"/>
+    <Constant name="Conn3T" value="51.0*cm"/>
+    <Constant name="Conn4T" value="120.00*cm"/>
+    <Constant name="ConnToSTZ" value="30.50*cm"/>
+    <Constant name="Conn3Z" value="54.62*cm-[ZPixelForward]"/>
+    <Constant name="Conn4Z" value="[Conn3Z]+([Conn3T]+[Conn4T])/2"/>
+    <Constant name="ServiceRout" value="21.0*cm"/>
+    <Constant name="ServiceRin" value="18.0*cm"/>
+    <Constant name="ServT" value="48.5*cm"/>
+    <Constant name="ServZ" value="[Conn4Z]+([Conn4T]+[ServT])/2"/>
+    <Constant name="ServCablT" value="32.2*cm"/>
+    <Constant name="ServCablZ" value="[ServZ]+[ServT]/2+[ServCablT]/2"/>
+    <Constant name="RinSupTubCab" value="18.00*cm"/>
 
 </ConstantsSection>
 <SolidSection label="pixfwd.xml">
  <Polycone name="PixelForward" startPhi="0*deg" deltaPhi="360*deg" >
-   <ZSection z="[RootStartZ]" rMin="[cms:TrackBeamR1]" rMax="[RootRadius]"/>
-   <ZSection z="99.00*cm" rMin="[cms:TrackBeamR1]" rMax="[RootRadius]"/>
-   <ZSection z="99.00*cm" rMin="[cms:TrackBeamR1]" rMax="110.0*cm"/>
-   <ZSection z="[RootMidZ1]"   rMin="[cms:TrackBeamR1]" rMax="110.0*cm"/>
-   <ZSection z="[RootMidZ1]"   rMin="[cms:TrackLumiR1]" rMax="110.0*cm"/>
-   <ZSection z="[RootMidZ2]"   rMin="[cms:TrackLumiR1]" rMax="110.0*cm"/>
-   <ZSection z="[RootMidZ2]"   rMin="[cms:TrackBeamR1]" rMax="110.0*cm"/>
-   <ZSection z="[RootMidZ3]"   rMin="[cms:TrackBeamR1]" rMax="110.0*cm"/>
-   <ZSection z="[RootEndZ]"    rMin="[cms:TrackBeamR2]" rMax="110.0*cm"/>
+   <ZSection z="[RootStartZ]" rMin="[cms:TrackBeamR1]" rMax="18.0*cm"/>
+   <ZSection z="0.02*cm" rMin="[cms:TrackBeamR1]" rMax="18.0*cm"/>
+   <ZSection z="0.02*cm" rMin="[cms:TrackBeamR1]" rMax="19.0*cm"/>
+   <ZSection z="89.9*cm" rMin="[cms:TrackBeamR1]" rMax="19.0*cm"/>
+   <ZSection z="89.9*cm" rMin="[cms:TrackBeamR1]" rMax="21.6*cm"/>
+   <ZSection z="99.00*cm" rMin="[cms:TrackBeamR1]" rMax="21.6*cm"/>
+   <ZSection z="99.00*cm" rMin="[cms:TrackBeamR1]" rMax="111.105*cm"/>
+   <ZSection z="[RootMidZ1]"   rMin="[cms:TrackBeamR1]" rMax="111.105*cm"/>
+   <ZSection z="[RootMidZ1]"   rMin="[cms:TrackLumiR1]" rMax="111.105*cm"/>
+   <ZSection z="[RootMidZ2]"   rMin="[cms:TrackLumiR1]" rMax="111.105*cm"/>
+   <ZSection z="[RootMidZ2]"   rMin="[cms:TrackBeamR1]" rMax="111.105*cm"/>
+   <ZSection z="[RootMidZ3]"   rMin="[cms:TrackBeamR1]" rMax="111.105*cm"/>
+   <ZSection z="[RootEndZ]"    rMin="[cms:TrackBeamR2]" rMax="111.105*cm"/>
+   <ZSection z="[RootEndZ]+[ZextensionCables]"    rMin="[cms:TrackBeamR2]" rMax="111.105*cm"/>
 </Polycone>
+
+    <Tubs name="PixelBarrelConn3" rMin="[Conn3Rin]" rMax="[Conn3Rout]" dz="[Conn3T]/2" startPhi="0*deg" deltaPhi="360*deg"/>
+    <Tubs name="PixelBarrelConn4" rMin="[Conn4Rin]" rMax="[Conn3Rout]" dz="[Conn4T]/2" startPhi="0*deg" deltaPhi="360*deg"/>
+    <Tubs name="PixelBarrelService" rMin="[ServiceRin]" rMax="[ServiceRout]" dz="[ServT]/2" startPhi="0*deg" deltaPhi="360*deg"/>
+    <Tubs name="PixelBarrelSupTubCables" rMin="[RinSupTubCab]" rMax="[Conn3Rout]" dz="[ServCablT]/2" startPhi="0*deg" deltaPhi="360*deg"/>
+
 </SolidSection>
 
 <!--
@@ -64,6 +93,23 @@
   <rSolid name="PixelForward"/>
   <rMaterial name="materials:Air"/>
  </LogicalPart>
+     <LogicalPart name="PixelBarrelConn3" category="unspecified">
+      <rSolid name="PixelBarrelConn3"/>
+      <rMaterial name="pixbarmaterial:SupplyTubeConn3_10Disks"/>
+    </LogicalPart>
+    <LogicalPart name="PixelBarrelConn4" category="unspecified">
+      <rSolid name="PixelBarrelConn4"/>
+      <rMaterial name="pixbarmaterial:SectorC_10Disks"/>
+    </LogicalPart>
+    <LogicalPart name="PixelBarrelService" category="unspecified">
+      <rSolid name="PixelBarrelService"/>
+      <rMaterial name="pixbarmaterial:SectorA_10Disks"/>
+    </LogicalPart>
+    <LogicalPart name="PixelBarrelSupTubCables" category="unspecified">
+      <rSolid name="PixelBarrelSupTubCables"/>
+      <rMaterial name="pixbarmaterial:PixelBarrelSupTubCables2_10Disks"/>
+    </LogicalPart>
+
 </LogicalPartSection>
 
 
@@ -150,6 +196,26 @@
     <Translation x="0." y="0." z="[pixfwd:ZCylinder]+[pixfwdCylinder:CylindersOuterLength]+[pixfwdCylinder:CylindersEndFlangeLength]/2."/>
     <rRotation name="pixfwdCylinder:EndFlangeRot2"/>  <!-- xt rRotation name="pixfwdCommon:Z180" / xt-->
   </PosPart>
+    <PosPart copyNumber="1">
+      <rParent name="pixfwd:PixelForward"/>
+      <rChild name="pixfwd:PixelBarrelConn3"/>
+      <Translation x="[zero]" y="[zero]" z="[Conn3Z]"/>
+    </PosPart>
+    <PosPart copyNumber="1">
+      <rParent name="pixfwd:PixelForward"/>
+      <rChild name="pixfwd:PixelBarrelConn4"/>
+      <Translation x="[zero]" y="[zero]" z="[Conn4Z]"/>
+    </PosPart>
+    <PosPart copyNumber="1">
+      <rParent name="pixfwd:PixelForward"/>
+      <rChild name="pixfwd:PixelBarrelService"/>
+      <Translation x="[zero]" y="[zero]" z="[ServZ]"/>
+    </PosPart>
+    <PosPart copyNumber="1">
+      <rParent name="pixfwd:PixelForward"/>
+      <rChild name="pixfwd:PixelBarrelSupTubCables"/>
+      <Translation x="[zero]" y="[zero]" z="[ServCablZ]"/>
+    </PosPart>
 
   <!-- xt PosPart copyNumber="1">
     <rParent name="pixfwd:PixelForward"/>
diff --git a/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdDisks.xml b/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdDisks.xml
index ae32be20391b2..15609f535a7aa 100644
--- a/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdDisks.xml
+++ b/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdDisks.xml
@@ -5,7 +5,7 @@
  <Constant name="DiskRmin1to7"         value="37.5*mm"/>
  <Constant name="DiskRmin8to10"         value="86.7*mm"/>
  <Constant name="DiskRmax"         value="166.0*mm"/><!-- 166.00*mm-->
- <Constant name="DiskHalfWidth"    value="39.75*mm"/>  <!-- 35.75*mm-->
+ <Constant name="DiskHalfWidth"    value="37.5*mm"/>  <!-- 35.75*mm-->
 </ConstantsSection>
  
 <SolidSection label="pixfwdDisks.xml">
diff --git a/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk1.xml b/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk1.xml
index 020290a4eef07..141c7c5112752 100644
--- a/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk1.xml
+++ b/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk1.xml
@@ -94,7 +94,7 @@
   <Numeric name="NumberOfBlades"   value="22"/>
   <Numeric name="BladeAngle"       value="20*deg"/>
   <Numeric name="BladeTilt"        value="12*deg"/>
-  <Numeric name="BladeCommonZ"     value="-18.7*mm"/>
+  <Numeric name="BladeCommonZ"     value="-16.45*mm"/> <!-- -18.7*mm-->
   <Vector name="BladeZShift" type="numeric" nEntries="22">
      7.12*mm,  2.62*mm, -1.88*mm, -6.38*mm, -10.88*mm,      
      11.62*mm,  7.12*mm,  2.62*mm, -1.88*mm, -6.38*mm, -10.88*mm,      
diff --git a/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk2.xml b/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk2.xml
index a31d5171c5962..feedde6fb6355 100644
--- a/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk2.xml
+++ b/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk2.xml
@@ -94,7 +94,7 @@
   <Numeric name="NumberOfBlades"   value="22"/>
   <Numeric name="BladeAngle"       value="20*deg"/>
   <Numeric name="BladeTilt"        value="12*deg"/>
-  <Numeric name="BladeCommonZ"     value="-18.7*mm"/>
+  <Numeric name="BladeCommonZ"     value="-16.45*mm"/> <!-- -18.7*mm-->
   <Vector name="BladeZShift" type="numeric" nEntries="22">
      7.12*mm,  2.62*mm, -1.88*mm, -6.38*mm, -10.88*mm,      
      11.62*mm,  7.12*mm,  2.62*mm, -1.88*mm, -6.38*mm, -10.88*mm,      
diff --git a/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk3.xml b/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk3.xml
index 2aa822da5e38d..e6654a4ec9f40 100644
--- a/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk3.xml
+++ b/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk3.xml
@@ -94,7 +94,7 @@
   <Numeric name="NumberOfBlades"   value="22"/>
   <Numeric name="BladeAngle"       value="20*deg"/>
   <Numeric name="BladeTilt"        value="12*deg"/>
-  <Numeric name="BladeCommonZ"     value="-18.7*mm"/>
+  <Numeric name="BladeCommonZ"     value="-16.45*mm"/> <!-- -18.7*mm-->
   <Vector name="BladeZShift" type="numeric" nEntries="22">
      7.12*mm,  2.62*mm, -1.88*mm, -6.38*mm, -10.88*mm,      
      11.62*mm,  7.12*mm,  2.62*mm, -1.88*mm, -6.38*mm, -10.88*mm,      
diff --git a/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk4.xml b/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk4.xml
index cb0762d302a0c..5a22a42f3448d 100644
--- a/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk4.xml
+++ b/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk4.xml
@@ -94,7 +94,7 @@
   <Numeric name="NumberOfBlades"   value="22"/>
   <Numeric name="BladeAngle"       value="20*deg"/>
   <Numeric name="BladeTilt"        value="12*deg"/>
-  <Numeric name="BladeCommonZ"     value="-18.7*mm"/>
+  <Numeric name="BladeCommonZ"     value="-16.45*mm"/> <!-- -18.7*mm-->
   <Vector name="BladeZShift" type="numeric" nEntries="22">
      7.12*mm,  2.62*mm, -1.88*mm, -6.38*mm, -10.88*mm,      
      11.62*mm,  7.12*mm,  2.62*mm, -1.88*mm, -6.38*mm, -10.88*mm,      
diff --git a/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk5.xml b/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk5.xml
index 6866ede9344ef..c0b2874840179 100644
--- a/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk5.xml
+++ b/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk5.xml
@@ -94,7 +94,7 @@
   <Numeric name="NumberOfBlades"   value="22"/>
   <Numeric name="BladeAngle"       value="20*deg"/>
   <Numeric name="BladeTilt"        value="12*deg"/>
-  <Numeric name="BladeCommonZ"     value="-18.7*mm"/>
+  <Numeric name="BladeCommonZ"     value="-16.45*mm"/> <!-- -18.7*mm-->
   <Vector name="BladeZShift" type="numeric" nEntries="22">
      7.12*mm,  2.62*mm, -1.88*mm, -6.38*mm, -10.88*mm,      
      11.62*mm,  7.12*mm,  2.62*mm, -1.88*mm, -6.38*mm, -10.88*mm,      
diff --git a/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk6.xml b/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk6.xml
index f1582e11ec3c9..d4b1d788a7fa1 100644
--- a/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk6.xml
+++ b/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk6.xml
@@ -94,7 +94,7 @@
   <Numeric name="NumberOfBlades"   value="22"/>
   <Numeric name="BladeAngle"       value="20*deg"/>
   <Numeric name="BladeTilt"        value="12*deg"/>
-  <Numeric name="BladeCommonZ"     value="-18.7*mm"/>
+  <Numeric name="BladeCommonZ"     value="-16.45*mm"/> <!-- -18.7*mm-->
   <Vector name="BladeZShift" type="numeric" nEntries="22">
      7.12*mm,  2.62*mm, -1.88*mm, -6.38*mm, -10.88*mm,      
      11.62*mm,  7.12*mm,  2.62*mm, -1.88*mm, -6.38*mm, -10.88*mm,      
diff --git a/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk7.xml b/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk7.xml
index 565a7c8fea4e8..a7cea1490d990 100644
--- a/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk7.xml
+++ b/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdInnerDisk7.xml
@@ -94,7 +94,7 @@
   <Numeric name="NumberOfBlades"   value="22"/>
   <Numeric name="BladeAngle"       value="20*deg"/>
   <Numeric name="BladeTilt"        value="12*deg"/>
-  <Numeric name="BladeCommonZ"     value="-18.7*mm"/>
+  <Numeric name="BladeCommonZ"     value="-16.45*mm"/> <!-- -18.7*mm-->
   <Vector name="BladeZShift" type="numeric" nEntries="22">
      7.12*mm,  2.62*mm, -1.88*mm, -6.38*mm, -10.88*mm,      
      11.62*mm,  7.12*mm,  2.62*mm, -1.88*mm, -6.38*mm, -10.88*mm,      
diff --git a/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk1.xml b/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk1.xml
index 963571e33fead..aa1a3224a10d7 100644
--- a/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk1.xml
+++ b/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk1.xml
@@ -94,7 +94,7 @@
   <Numeric name="NumberOfBlades"   value="34"/>
   <Numeric name="BladeAngle"       value="20*deg"/>
   <Numeric name="BladeTilt"        value="0*deg"/>
-  <Numeric name="BladeCommonZ"     value="-3.75*mm"/>
+  <Numeric name="BladeCommonZ"     value="-1.5*mm"/> <!-- -3.75*mm-->
   <Vector  name="BladeZShift" type="numeric" nEntries="34">
    -9.92*mm, -12.42*mm,-14.92*mm,-17.42*mm,-19.92*mm,-22.42*mm,-24.92*mm, -27.42*mm,
    -7.42*mm, -9.92*mm, -12.42*mm,-14.92*mm,-17.42*mm,-19.92*mm,-22.42*mm,-24.92*mm, -27.42*mm,
diff --git a/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk10.xml b/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk10.xml
index 22483765f973a..a754171fdd583 100644
--- a/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk10.xml
+++ b/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk10.xml
@@ -94,7 +94,7 @@
   <Numeric name="NumberOfBlades"   value="34"/>
   <Numeric name="BladeAngle"       value="20*deg"/>
   <Numeric name="BladeTilt"        value="0*deg"/>
-  <Numeric name="BladeCommonZ"     value="-3.75*mm"/>
+  <Numeric name="BladeCommonZ"     value="-1.5*mm"/> <!-- -3.75*mm-->
   <Vector  name="BladeZShift" type="numeric" nEntries="34">
    -9.92*mm, -12.42*mm,-14.92*mm,-17.42*mm,-19.92*mm,-22.42*mm,-24.92*mm, -27.42*mm,
    -7.42*mm, -9.92*mm, -12.42*mm,-14.92*mm,-17.42*mm,-19.92*mm,-22.42*mm,-24.92*mm, -27.42*mm,
diff --git a/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk2.xml b/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk2.xml
index 7a4d66484a6fe..11a7049047648 100644
--- a/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk2.xml
+++ b/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk2.xml
@@ -94,7 +94,7 @@
   <Numeric name="NumberOfBlades"   value="34"/>
   <Numeric name="BladeAngle"       value="20*deg"/>
   <Numeric name="BladeTilt"        value="0*deg"/>
-  <Numeric name="BladeCommonZ"     value="-3.75*mm"/>
+  <Numeric name="BladeCommonZ"     value="-1.5*mm"/> <!-- -3.75*mm-->
   <Vector  name="BladeZShift" type="numeric" nEntries="34">
    -9.92*mm, -12.42*mm,-14.92*mm,-17.42*mm,-19.92*mm,-22.42*mm,-24.92*mm, -27.42*mm,
    -7.42*mm, -9.92*mm, -12.42*mm,-14.92*mm,-17.42*mm,-19.92*mm,-22.42*mm,-24.92*mm, -27.42*mm,
diff --git a/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk3.xml b/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk3.xml
index 3873949ee54e9..a83bc73637555 100644
--- a/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk3.xml
+++ b/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk3.xml
@@ -95,7 +95,7 @@
   <Numeric name="NumberOfBlades"   value="34"/>
   <Numeric name="BladeAngle"       value="20*deg"/>
   <Numeric name="BladeTilt"        value="0*deg"/>
-  <Numeric name="BladeCommonZ"     value="-3.75*mm"/>
+  <Numeric name="BladeCommonZ"     value="-1.5*mm"/> <!-- -3.75*mm-->
   <Vector  name="BladeZShift" type="numeric" nEntries="34">
    -9.92*mm, -12.42*mm,-14.92*mm,-17.42*mm,-19.92*mm,-22.42*mm,-24.92*mm, -27.42*mm,
    -7.42*mm, -9.92*mm, -12.42*mm,-14.92*mm,-17.42*mm,-19.92*mm,-22.42*mm,-24.92*mm, -27.42*mm,
diff --git a/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk4.xml b/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk4.xml
index 3dbc86ae0962b..f7a3b09ec754b 100644
--- a/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk4.xml
+++ b/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk4.xml
@@ -94,7 +94,7 @@
   <Numeric name="NumberOfBlades"   value="34"/>
   <Numeric name="BladeAngle"       value="20*deg"/>
   <Numeric name="BladeTilt"        value="0*deg"/>
-  <Numeric name="BladeCommonZ"     value="-3.75*mm"/>
+  <Numeric name="BladeCommonZ"     value="-1.5*mm"/> <!-- -3.75*mm-->
   <Vector  name="BladeZShift" type="numeric" nEntries="34">
    -9.92*mm, -12.42*mm,-14.92*mm,-17.42*mm,-19.92*mm,-22.42*mm,-24.92*mm, -27.42*mm,
    -7.42*mm, -9.92*mm, -12.42*mm,-14.92*mm,-17.42*mm,-19.92*mm,-22.42*mm,-24.92*mm, -27.42*mm,
diff --git a/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk5.xml b/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk5.xml
index 76ecac7329f83..3177a903b5bb0 100644
--- a/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk5.xml
+++ b/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk5.xml
@@ -94,7 +94,7 @@
   <Numeric name="NumberOfBlades"   value="34"/>
   <Numeric name="BladeAngle"       value="20*deg"/>
   <Numeric name="BladeTilt"        value="0*deg"/>
-  <Numeric name="BladeCommonZ"     value="-3.75*mm"/>
+  <Numeric name="BladeCommonZ"     value="-1.5*mm"/> <!-- -3.75*mm-->
   <Vector  name="BladeZShift" type="numeric" nEntries="34">
    -9.92*mm, -12.42*mm,-14.92*mm,-17.42*mm,-19.92*mm,-22.42*mm,-24.92*mm, -27.42*mm,
    -7.42*mm, -9.92*mm, -12.42*mm,-14.92*mm,-17.42*mm,-19.92*mm,-22.42*mm,-24.92*mm, -27.42*mm,
diff --git a/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk6.xml b/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk6.xml
index 4c7bbd5ccae83..83f024ee671db 100644
--- a/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk6.xml
+++ b/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk6.xml
@@ -94,7 +94,7 @@
   <Numeric name="NumberOfBlades"   value="34"/>
   <Numeric name="BladeAngle"       value="20*deg"/>
   <Numeric name="BladeTilt"        value="0*deg"/>
-  <Numeric name="BladeCommonZ"     value="-3.75*mm"/>
+  <Numeric name="BladeCommonZ"     value="-1.5*mm"/> <!-- -3.75*mm-->
   <Vector  name="BladeZShift" type="numeric" nEntries="34">
    -9.92*mm, -12.42*mm,-14.92*mm,-17.42*mm,-19.92*mm,-22.42*mm,-24.92*mm, -27.42*mm,
    -7.42*mm, -9.92*mm, -12.42*mm,-14.92*mm,-17.42*mm,-19.92*mm,-22.42*mm,-24.92*mm, -27.42*mm,
diff --git a/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk7.xml b/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk7.xml
index e1001237c1a34..9b713ec72b4fe 100644
--- a/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk7.xml
+++ b/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk7.xml
@@ -94,7 +94,7 @@
   <Numeric name="NumberOfBlades"   value="34"/>
   <Numeric name="BladeAngle"       value="20*deg"/>
   <Numeric name="BladeTilt"        value="0*deg"/>
-  <Numeric name="BladeCommonZ"     value="-3.75*mm"/>
+  <Numeric name="BladeCommonZ"     value="-1.5*mm"/> <!-- -3.75*mm-->
   <Vector  name="BladeZShift" type="numeric" nEntries="34">
    -9.92*mm, -12.42*mm,-14.92*mm,-17.42*mm,-19.92*mm,-22.42*mm,-24.92*mm, -27.42*mm,
    -7.42*mm, -9.92*mm, -12.42*mm,-14.92*mm,-17.42*mm,-19.92*mm,-22.42*mm,-24.92*mm, -27.42*mm,
diff --git a/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk8.xml b/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk8.xml
index c4f221ab13f66..1bdd96b4b2fc5 100644
--- a/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk8.xml
+++ b/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk8.xml
@@ -94,7 +94,7 @@
   <Numeric name="NumberOfBlades"   value="34"/>
   <Numeric name="BladeAngle"       value="20*deg"/>
   <Numeric name="BladeTilt"        value="0*deg"/>
-  <Numeric name="BladeCommonZ"     value="-3.75*mm"/>
+  <Numeric name="BladeCommonZ"     value="-1.5*mm"/> <!-- -3.75*mm-->
   <Vector  name="BladeZShift" type="numeric" nEntries="34">
    -9.92*mm, -12.42*mm,-14.92*mm,-17.42*mm,-19.92*mm,-22.42*mm,-24.92*mm, -27.42*mm,
    -7.42*mm, -9.92*mm, -12.42*mm,-14.92*mm,-17.42*mm,-19.92*mm,-22.42*mm,-24.92*mm, -27.42*mm,
diff --git a/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk9.xml b/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk9.xml
index 1c484c922259d..b7e1789947e73 100644
--- a/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk9.xml
+++ b/Geometry/TrackerCommonData/data/PhaseII/Pixel10D/pixfwdOuterDisk9.xml
@@ -94,7 +94,7 @@
   <Numeric name="NumberOfBlades"   value="34"/>
   <Numeric name="BladeAngle"       value="20*deg"/>
   <Numeric name="BladeTilt"        value="0*deg"/>
-  <Numeric name="BladeCommonZ"     value="-3.75*mm"/>
+  <Numeric name="BladeCommonZ"     value="-1.5*mm"/> <!-- -3.75*mm-->
   <Vector  name="BladeZShift" type="numeric" nEntries="34">
    -9.92*mm, -12.42*mm,-14.92*mm,-17.42*mm,-19.92*mm,-22.42*mm,-24.92*mm, -27.42*mm,
    -7.42*mm, -9.92*mm, -12.42*mm,-14.92*mm,-17.42*mm,-19.92*mm,-22.42*mm,-24.92*mm, -27.42*mm,
diff --git a/Geometry/TrackerRecoData/data/PhaseI/Pixel10D/trackerRecoMaterial.xml b/Geometry/TrackerRecoData/data/PhaseI/Pixel10D/trackerRecoMaterial.xml
new file mode 100644
index 0000000000000..4cd6a84649854
--- /dev/null
+++ b/Geometry/TrackerRecoData/data/PhaseI/Pixel10D/trackerRecoMaterial.xml
@@ -0,0 +1,802 @@
+<?xml version="1.0" encoding="utf-8"?>
+<DDDefinition xmlns="http://www.cern.ch/cms/DDL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.cern.ch/cms/DDL ../../../DetectorDescription/Schema/DDLSchema.xsd">
+  <SpecParSection label="spec-pars2.xml">
+
+    <SpecPar name="TrackerRecMaterialPixelBarrelLayer0" eval="true">
+      <PartSelector path="//PixelBarrel/PixelBarrelLayer0/PixelBarrelLadderFull0/pixbarladderfull0:PixelBarrelModuleBoxFull/pixbarladderfull0:PixelBarrelModuleFullPlus/pixbarladderfull0:PixelBarrelSensorFull/PixelBarrelActiveFull0"/>
+      <PartSelector path="//PixelBarrel/PixelBarrelLayer0/PixelBarrelLadderFull0/pixbarladderfull0:PixelBarrelModuleBoxFull/pixbarladderfull0:PixelBarrelModuleFullMinus/pixbarladderfull0:PixelBarrelSensorFull/PixelBarrelActiveFull0"/>
+      <Parameter name="TrackerRadLength" value="0.0112"/> <!-- 0.0250998-->
+      <Parameter name="TrackerXi" value="2.367e-05"/> <!-- 5.30482e-05 -->
+<!--      <Parameter name="TrackerRadLength" value="0.0257"/>
+      <Parameter name="TrackerXi" value="5.42e-05"/> -->
+    </SpecPar>
+
+    <SpecPar name="TrackerRecMaterialPixelBarrelLayer1" eval="true">
+      <PartSelector path="//PixelBarrel/PixelBarrelLayer1/PixelBarrelLadderFull1/pixbarladderfull1:PixelBarrelModuleBoxFull/pixbarladderfull1:PixelBarrelModuleFullPlus/pixbarladderfull1:PixelBarrelSensorFull/PixelBarrelActiveFull1"/>
+      <PartSelector path="//PixelBarrel/PixelBarrelLayer1/PixelBarrelLadderFull1/pixbarladderfull1:PixelBarrelModuleBoxFull/pixbarladderfull1:PixelBarrelModuleFullMinus/pixbarladderfull1:PixelBarrelSensorFull/PixelBarrelActiveFull1"/>
+      <Parameter name="TrackerRadLength" value="0.0112"/>
+      <Parameter name="TrackerXi" value="2.13e-05"/>
+<!--      <Parameter name="TrackerRadLength" value="0.0233"/>
+      <Parameter name="TrackerXi" value="4.27e-05"/> -->
+    </SpecPar>
+
+    <SpecPar name="TrackerRecMaterialPixelBarrelLayer2" eval="true">
+      <PartSelector path="//PixelBarrel/PixelBarrelLayer2/PixelBarrelLadderFull2/pixbarladderfull2:PixelBarrelModuleBoxFull/pixbarladderfull2:PixelBarrelModuleFullPlus/pixbarladderfull2:PixelBarrelSensorFull/PixelBarrelActiveFull2"/>
+      <PartSelector path="//PixelBarrel/PixelBarrelLayer2/PixelBarrelLadderFull2/pixbarladderfull2:PixelBarrelModuleBoxFull/pixbarladderfull2:PixelBarrelModuleFullMinus/pixbarladderfull2:PixelBarrelSensorFull/PixelBarrelActiveFull2"/>
+      <Parameter name="TrackerRadLength" value="0.0112"/>
+      <Parameter name="TrackerXi" value="2.13e-05"/>
+<!--      <Parameter name="TrackerRadLength" value="0.0302"/>
+      <Parameter name="TrackerXi" value="5.66e-05"/> -->
+    </SpecPar>
+
+    <SpecPar name="TrackerRecMaterialPixelBarrelLayer3" eval="true">
+      <PartSelector path="//PixelBarrel/PixelBarrelLayer3/PixelBarrelLadderFull3/pixbarladderfull3:PixelBarrelModuleBoxFull/pixbarladderfull3:PixelBarrelModuleFullPlus/pixbarladderfull3:PixelBarrelSensorFull/PixelBarrelActiveFull3"/>
+      <PartSelector path="//PixelBarrel/PixelBarrelLayer3/PixelBarrelLadderFull3/pixbarladderfull3:PixelBarrelModuleBoxFull/pixbarladderfull3:PixelBarrelModuleFullMinus/pixbarladderfull3:PixelBarrelSensorFull/PixelBarrelActiveFull3"/>
+      <Parameter name="TrackerRadLength" value="0.0112" />
+      <Parameter name="TrackerXi" value="2.13e-05" />
+<!--      <Parameter name="TrackerRadLength" value="0.0302"/>
+      <Parameter name="TrackerXi" value="5.66e-05"/>
+-->
+    </SpecPar>
+
+
+    <SpecPar name="TrackerRecMaterialTIBLayer0_Z0" eval="true">
+      <PartSelector path="//Tracker/TIB/TIBLayer0/TIBLayer0Down/TIBString0Lo1/TIBString0LoMin1/TIBModule0B[3]/TIBWaferRphi0/TIBActiveRphi0"/>
+      <PartSelector path="//Tracker/TIB/TIBLayer0/TIBLayer0Down/TIBString0Lo1/TIBString0LoMin1/TIBModule0B[3]/TIBWaferSter0/TIBActiveSter0"/>
+      <PartSelector path="//Tracker/TIB/TIBLayer0/TIBLayer0Down/TIBString0Lo1/TIBString0LoPls1/TIBModule0B[1]/TIBWaferRphi0/TIBActiveRphi0"/>
+      <PartSelector path="//Tracker/TIB/TIBLayer0/TIBLayer0Down/TIBString0Lo1/TIBString0LoPls1/TIBModule0B[1]/TIBWaferSter0/TIBActiveSter0"/>
+      <PartSelector path="//Tracker/TIB/TIBLayer0/TIBLayer0Up/TIBString0Up1/TIBString0UpMin1/TIBModule0A[3]/TIBWaferRphi0/TIBActiveRphi0"/>
+      <PartSelector path="//Tracker/TIB/TIBLayer0/TIBLayer0Up/TIBString0Up1/TIBString0UpMin1/TIBModule0A[3]/TIBWaferSter0/TIBActiveSter0"/>
+      <PartSelector path="//Tracker/TIB/TIBLayer0/TIBLayer0Up/TIBString0Up1/TIBString0UpPls1/TIBModule0A[1]/TIBWaferRphi0/TIBActiveRphi0"/>
+      <PartSelector path="//Tracker/TIB/TIBLayer0/TIBLayer0Up/TIBString0Up1/TIBString0UpPls1/TIBModule0A[1]/TIBWaferSter0/TIBActiveSter0"/>
+      <Parameter name="TrackerRadLength" value="0.0499323"/>
+      <Parameter name="TrackerXi" value="0.000114569"/>
+    </SpecPar>
+    
+    <SpecPar name="TrackerRecMaterialTIBLayer0_Z20" eval="true">
+      <PartSelector path="//Tracker/TIB/TIBLayer0/TIBLayer0Down/TIBString0Lo1/TIBString0LoMin1/TIBModule0B[1]/TIBWaferRphi0/TIBActiveRphi0"/>
+      <PartSelector path="//Tracker/TIB/TIBLayer0/TIBLayer0Down/TIBString0Lo1/TIBString0LoMin1/TIBModule0B[1]/TIBWaferSter0/TIBActiveSter0"/>
+      <PartSelector path="//Tracker/TIB/TIBLayer0/TIBLayer0Down/TIBString0Lo1/TIBString0LoMin1/TIBModule0B[2]/TIBWaferRphi0/TIBActiveRphi0"/>
+      <PartSelector path="//Tracker/TIB/TIBLayer0/TIBLayer0Down/TIBString0Lo1/TIBString0LoMin1/TIBModule0B[2]/TIBWaferSter0/TIBActiveSter0"/>
+      <PartSelector path="//Tracker/TIB/TIBLayer0/TIBLayer0Down/TIBString0Lo1/TIBString0LoPls1/TIBModule0B[2]/TIBWaferRphi0/TIBActiveRphi0"/>
+      <PartSelector path="//Tracker/TIB/TIBLayer0/TIBLayer0Down/TIBString0Lo1/TIBString0LoPls1/TIBModule0B[2]/TIBWaferSter0/TIBActiveSter0"/>
+      <PartSelector path="//Tracker/TIB/TIBLayer0/TIBLayer0Down/TIBString0Lo1/TIBString0LoPls1/TIBModule0B[3]/TIBWaferRphi0/TIBActiveRphi0"/>
+      <PartSelector path="//Tracker/TIB/TIBLayer0/TIBLayer0Down/TIBString0Lo1/TIBString0LoPls1/TIBModule0B[3]/TIBWaferSter0/TIBActiveSter0"/>
+      <PartSelector path="//Tracker/TIB/TIBLayer0/TIBLayer0Up/TIBString0Up1/TIBString0UpMin1/TIBModule0A[1]/TIBWaferRphi0/TIBActiveRphi0"/>
+      <PartSelector path="//Tracker/TIB/TIBLayer0/TIBLayer0Up/TIBString0Up1/TIBString0UpMin1/TIBModule0A[1]/TIBWaferSter0/TIBActiveSter0"/>
+      <PartSelector path="//Tracker/TIB/TIBLayer0/TIBLayer0Up/TIBString0Up1/TIBString0UpMin1/TIBModule0A[2]/TIBWaferRphi0/TIBActiveRphi0"/>
+      <PartSelector path="//Tracker/TIB/TIBLayer0/TIBLayer0Up/TIBString0Up1/TIBString0UpMin1/TIBModule0A[2]/TIBWaferSter0/TIBActiveSter0"/>
+      <PartSelector path="//Tracker/TIB/TIBLayer0/TIBLayer0Up/TIBString0Up1/TIBString0UpPls1/TIBModule0A[2]/TIBWaferRphi0/TIBActiveRphi0"/>
+      <PartSelector path="//Tracker/TIB/TIBLayer0/TIBLayer0Up/TIBString0Up1/TIBString0UpPls1/TIBModule0A[2]/TIBWaferSter0/TIBActiveSter0"/>
+      <PartSelector path="//Tracker/TIB/TIBLayer0/TIBLayer0Up/TIBString0Up1/TIBString0UpPls1/TIBModule0A[3]/TIBWaferRphi0/TIBActiveRphi0"/>
+      <PartSelector path="//Tracker/TIB/TIBLayer0/TIBLayer0Up/TIBString0Up1/TIBString0UpPls1/TIBModule0A[3]/TIBWaferSter0/TIBActiveSter0"/>
+      <Parameter name="TrackerRadLength" value="0.0838454"/>
+      <Parameter name="TrackerXi" value="0.000177827"/>
+    </SpecPar>
+    
+    <SpecPar name="TrackerRecMaterialTIBLayer1_Z0" eval="true">
+      <PartSelector path="//Tracker/TIB/TIBLayer1/TIBLayer1Down/TIBString1Lo1/TIBString1LoMin1/TIBModule0A[3]/TIBWaferRphi0/TIBActiveRphi0"/>
+      <PartSelector path="//Tracker/TIB/TIBLayer1/TIBLayer1Down/TIBString1Lo1/TIBString1LoMin1/TIBModule0A[3]/TIBWaferSter0/TIBActiveSter0"/>
+      <PartSelector path="//Tracker/TIB/TIBLayer1/TIBLayer1Down/TIBString1Lo1/TIBString1LoPls1/TIBModule0A[1]/TIBWaferRphi0/TIBActiveRphi0"/>
+      <PartSelector path="//Tracker/TIB/TIBLayer1/TIBLayer1Down/TIBString1Lo1/TIBString1LoPls1/TIBModule0A[1]/TIBWaferSter0/TIBActiveSter0"/>
+      <PartSelector path="//Tracker/TIB/TIBLayer1/TIBLayer1Down/TIBString1Lo1/TIBString1LoPls1/TIBModule0A[2]/TIBWaferRphi0/TIBActiveRphi0"/>
+      <PartSelector path="//Tracker/TIB/TIBLayer1/TIBLayer1Down/TIBString1Lo1/TIBString1LoPls1/TIBModule0A[2]/TIBWaferSter0/TIBActiveSter0"/>
+      <PartSelector path="//Tracker/TIB/TIBLayer1/TIBLayer1Up/TIBString1Up1/TIBString1UpMin1/TIBModule0B[3]/TIBWaferRphi0/TIBActiveRphi0"/>
+      <PartSelector path="//Tracker/TIB/TIBLayer1/TIBLayer1Up/TIBString1Up1/TIBString1UpMin1/TIBModule0B[3]/TIBWaferSter0/TIBActiveSter0"/>
+      <PartSelector path="//Tracker/TIB/TIBLayer1/TIBLayer1Up/TIBString1Up1/TIBString1UpPls1/TIBModule0B[1]/TIBWaferRphi0/TIBActiveRphi0"/>
+      <PartSelector path="//Tracker/TIB/TIBLayer1/TIBLayer1Up/TIBString1Up1/TIBString1UpPls1/TIBModule0B[1]/TIBWaferSter0/TIBActiveSter0"/>
+      <Parameter name="TrackerRadLength" value="0.0461994"/>
+      <Parameter name="TrackerXi" value="0.0000953946"/>
+    </SpecPar>
+    
+    <SpecPar name="TrackerRecMaterialTIBLayer1_Z30" eval="true">
+      <PartSelector path="//Tracker/TIB/TIBLayer1/TIBLayer1Down/TIBString1Lo1/TIBString1LoMin1/TIBModule0A[1]/TIBWaferRphi0/TIBActiveRphi0"/>
+      <PartSelector path="//Tracker/TIB/TIBLayer1/TIBLayer1Down/TIBString1Lo1/TIBString1LoMin1/TIBModule0A[1]/TIBWaferSter0/TIBActiveSter0"/>
+      <PartSelector path="//Tracker/TIB/TIBLayer1/TIBLayer1Down/TIBString1Lo1/TIBString1LoMin1/TIBModule0A[2]/TIBWaferRphi0/TIBActiveRphi0"/>
+      <PartSelector path="//Tracker/TIB/TIBLayer1/TIBLayer1Down/TIBString1Lo1/TIBString1LoMin1/TIBModule0A[2]/TIBWaferSter0/TIBActiveSter0"/>
+      <PartSelector path="//Tracker/TIB/TIBLayer1/TIBLayer1Down/TIBString1Lo1/TIBString1LoPls1/TIBModule0A[3]/TIBWaferRphi0/TIBActiveRphi0"/>
+      <PartSelector path="//Tracker/TIB/TIBLayer1/TIBLayer1Down/TIBString1Lo1/TIBString1LoPls1/TIBModule0A[3]/TIBWaferSter0/TIBActiveSter0"/>
+      <PartSelector path="//Tracker/TIB/TIBLayer1/TIBLayer1Up/TIBString1Up1/TIBString1UpMin1/TIBModule0B[1]/TIBWaferRphi0/TIBActiveRphi0"/>
+      <PartSelector path="//Tracker/TIB/TIBLayer1/TIBLayer1Up/TIBString1Up1/TIBString1UpMin1/TIBModule0B[1]/TIBWaferSter0/TIBActiveSter0"/>
+      <PartSelector path="//Tracker/TIB/TIBLayer1/TIBLayer1Up/TIBString1Up1/TIBString1UpMin1/TIBModule0B[2]/TIBWaferRphi0/TIBActiveRphi0"/>
+      <PartSelector path="//Tracker/TIB/TIBLayer1/TIBLayer1Up/TIBString1Up1/TIBString1UpMin1/TIBModule0B[2]/TIBWaferSter0/TIBActiveSter0"/>
+      <PartSelector path="//Tracker/TIB/TIBLayer1/TIBLayer1Up/TIBString1Up1/TIBString1UpPls1/TIBModule0B[2]/TIBWaferRphi0/TIBActiveRphi0"/>
+      <PartSelector path="//Tracker/TIB/TIBLayer1/TIBLayer1Up/TIBString1Up1/TIBString1UpPls1/TIBModule0B[2]/TIBWaferSter0/TIBActiveSter0"/>
+      <PartSelector path="//Tracker/TIB/TIBLayer1/TIBLayer1Up/TIBString1Up1/TIBString1UpPls1/TIBModule0B[3]/TIBWaferRphi0/TIBActiveRphi0"/>
+      <PartSelector path="//Tracker/TIB/TIBLayer1/TIBLayer1Up/TIBString1Up1/TIBString1UpPls1/TIBModule0B[3]/TIBWaferSter0/TIBActiveSter0"/>
+      <Parameter name="TrackerRadLength" value="0.0659822"/>
+      <Parameter name="TrackerXi" value="0.000133117"/>
+    </SpecPar>
+    
+    <SpecPar name="TrackerRecMaterialTIBLayer2_Z0" eval="true">
+      <PartSelector path="//Tracker/TIB/TIBLayer2/TIBLayer2Down/TIBString2Lo1/TIBString2LoMin1/TIBModule2[2]/TIBWaferRphi2/TIBActiveRphi2"/>
+      <PartSelector path="//Tracker/TIB/TIBLayer2/TIBLayer2Down/TIBString2Lo1/TIBString2LoMin1/TIBModule2[3]/TIBWaferRphi2/TIBActiveRphi2"/>
+      <PartSelector path="//Tracker/TIB/TIBLayer2/TIBLayer2Down/TIBString2Lo1/TIBString2LoPls1/TIBModule2[1]/TIBWaferRphi2/TIBActiveRphi2"/>
+      <PartSelector path="//Tracker/TIB/TIBLayer2/TIBLayer2Down/TIBString2Lo1/TIBString2LoPls1/TIBModule2[2]/TIBWaferRphi2/TIBActiveRphi2"/>
+      <PartSelector path="//Tracker/TIB/TIBLayer2/TIBLayer2Up/TIBString2Up1/TIBString2UpMin1/TIBModule2[2]/TIBWaferRphi2/TIBActiveRphi2"/>
+      <PartSelector path="//Tracker/TIB/TIBLayer2/TIBLayer2Up/TIBString2Up1/TIBString2UpMin1/TIBModule2[3]/TIBWaferRphi2/TIBActiveRphi2"/>
+      <PartSelector path="//Tracker/TIB/TIBLayer2/TIBLayer2Up/TIBString2Up1/TIBString2UpPls1/TIBModule2[1]/TIBWaferRphi2/TIBActiveRphi2"/>
+      <PartSelector path="//Tracker/TIB/TIBLayer2/TIBLayer2Up/TIBString2Up1/TIBString2UpPls1/TIBModule2[2]/TIBWaferRphi2/TIBActiveRphi2"/>
+      <Parameter name="TrackerRadLength" value="0.0404423"/>
+      <Parameter name="TrackerXi" value="0.0000846575"/>
+    </SpecPar>
+    
+    <SpecPar name="TrackerRecMaterialTIBLayer2_Z40" eval="true">
+      <PartSelector path="//Tracker/TIB/TIBLayer2/TIBLayer2Down/TIBString2Lo1/TIBString2LoMin1/TIBModule2[1]/TIBWaferRphi2/TIBActiveRphi2"/>
+      <PartSelector path="//Tracker/TIB/TIBLayer2/TIBLayer2Down/TIBString2Lo1/TIBString2LoPls1/TIBModule2[3]/TIBWaferRphi2/TIBActiveRphi2"/>
+      <PartSelector path="//Tracker/TIB/TIBLayer2/TIBLayer2Up/TIBString2Up1/TIBString2UpMin1/TIBModule2[1]/TIBWaferRphi2/TIBActiveRphi2"/>
+      <PartSelector path="//Tracker/TIB/TIBLayer2/TIBLayer2Up/TIBString2Up1/TIBString2UpPls1/TIBModule2[3]/TIBWaferRphi2/TIBActiveRphi2"/>
+      <Parameter name="TrackerRadLength" value="0.0613079"/>
+      <Parameter name="TrackerXi" value="0.000125477"/>
+    </SpecPar>
+    
+    <SpecPar name="TrackerRecMaterialTIBLayer3_Z0" eval="true">
+      <PartSelector path="//Tracker/TIB/TIBLayer3/TIBLayer3Down/TIBString3Lo1/TIBString3LoMin1/TIBModule2[2]/TIBWaferRphi2/TIBActiveRphi2"/>
+      <PartSelector path="//Tracker/TIB/TIBLayer3/TIBLayer3Down/TIBString3Lo1/TIBString3LoMin1/TIBModule2[3]/TIBWaferRphi2/TIBActiveRphi2"/>
+      <PartSelector path="//Tracker/TIB/TIBLayer3/TIBLayer3Down/TIBString3Lo1/TIBString3LoPls1/TIBModule2[1]/TIBWaferRphi2/TIBActiveRphi2"/>
+      <PartSelector path="//Tracker/TIB/TIBLayer3/TIBLayer3Down/TIBString3Lo1/TIBString3LoPls1/TIBModule2[2]/TIBWaferRphi2/TIBActiveRphi2"/>
+      <PartSelector path="//Tracker/TIB/TIBLayer3/TIBLayer3Down/TIBString3Lo1/TIBString3LoPls1/TIBModule2[3]/TIBWaferRphi2/TIBActiveRphi2"/>
+      <PartSelector path="//Tracker/TIB/TIBLayer3/TIBLayer3Up/TIBString3Up1/TIBString3UpMin1/TIBModule2[2]/TIBWaferRphi2/TIBActiveRphi2"/>
+      <PartSelector path="//Tracker/TIB/TIBLayer3/TIBLayer3Up/TIBString3Up1/TIBString3UpMin1/TIBModule2[3]/TIBWaferRphi2/TIBActiveRphi2"/>
+      <PartSelector path="//Tracker/TIB/TIBLayer3/TIBLayer3Up/TIBString3Up1/TIBString3UpPls1/TIBModule2[1]/TIBWaferRphi2/TIBActiveRphi2"/>
+      <PartSelector path="//Tracker/TIB/TIBLayer3/TIBLayer3Up/TIBString3Up1/TIBString3UpPls1/TIBModule2[2]/TIBWaferRphi2/TIBActiveRphi2"/>
+      <Parameter name="TrackerRadLength" value="0.0356819"/>
+      <Parameter name="TrackerXi" value="0.0000750728"/>
+    </SpecPar>
+    
+    <SpecPar name="TrackerRecMaterialTIBLayer3_Z50" eval="true">
+      <PartSelector path="//Tracker/TIB/TIBLayer3/TIBLayer3Down/TIBString3Lo1/TIBString3LoMin1/TIBModule2[1]/TIBWaferRphi2/TIBActiveRphi2"/>
+      <PartSelector path="//Tracker/TIB/TIBLayer3/TIBLayer3Up/TIBString3Up1/TIBString3UpMin1/TIBModule2[1]/TIBWaferRphi2/TIBActiveRphi2"/>
+      <PartSelector path="//Tracker/TIB/TIBLayer3/TIBLayer3Up/TIBString3Up1/TIBString3UpPls1/TIBModule2[3]/TIBWaferRphi2/TIBActiveRphi2"/>
+      <Parameter name="TrackerRadLength" value="0.050652"/>
+      <Parameter name="TrackerXi" value="0.000105773"/>
+    </SpecPar>
+    
+    <SpecPar name="TrackerRecMaterialTOBLayer0_Z0" eval="true">
+      <PartSelector path="//Tracker/TOB/TOBLayer0/TOBRod0/TOBRod0L/TOBRodCentral0L/TOBModule0[6]/TOBWaferRphi0/TOBActiveRphi0"/>
+      <PartSelector path="//Tracker/TOB/TOBLayer0/TOBRod0/TOBRod0L/TOBRodCentral0L/TOBModule0[6]/TOBWaferSter0/TOBActiveSter0"/>
+      <PartSelector path="//Tracker/TOB/TOBLayer0/TOBRod0/TOBRod0H/TOBRodCentral0H/TOBModule0[1]/TOBWaferRphi0/TOBActiveRphi0"/>
+      <PartSelector path="//Tracker/TOB/TOBLayer0/TOBRod0/TOBRod0H/TOBRodCentral0H/TOBModule0[1]/TOBWaferSter0/TOBActiveSter0"/>
+      <Parameter name="TrackerRadLength" value="0.0445001"/>
+      <Parameter name="TrackerXi" value="0.00011131"/>
+    </SpecPar>
+    
+    <SpecPar name="TrackerRecMaterialTOBLayer0_Z20" eval="true">
+      <PartSelector path="//Tracker/TOB/TOBLayer0/TOBRod0/TOBRod0L/TOBRodCentral0L/TOBModule0[3]/TOBWaferRphi0/TOBActiveRphi0"/>
+      <PartSelector path="//Tracker/TOB/TOBLayer0/TOBRod0/TOBRod0L/TOBRodCentral0L/TOBModule0[3]/TOBWaferSter0/TOBActiveSter0"/>
+      <PartSelector path="//Tracker/TOB/TOBLayer0/TOBRod0/TOBRod0L/TOBRodCentral0L/TOBModule0[4]/TOBWaferRphi0/TOBActiveRphi0"/>
+      <PartSelector path="//Tracker/TOB/TOBLayer0/TOBRod0/TOBRod0L/TOBRodCentral0L/TOBModule0[4]/TOBWaferSter0/TOBActiveSter0"/>
+      <PartSelector path="//Tracker/TOB/TOBLayer0/TOBRod0/TOBRod0L/TOBRodCentral0L/TOBModule0[5]/TOBWaferRphi0/TOBActiveRphi0"/>
+      <PartSelector path="//Tracker/TOB/TOBLayer0/TOBRod0/TOBRod0L/TOBRodCentral0L/TOBModule0[5]/TOBWaferSter0/TOBActiveSter0"/>
+      <PartSelector path="//Tracker/TOB/TOBLayer0/TOBRod0/TOBRod0H/TOBRodCentral0H/TOBModule0[2]/TOBWaferRphi0/TOBActiveRphi0"/>
+      <PartSelector path="//Tracker/TOB/TOBLayer0/TOBRod0/TOBRod0H/TOBRodCentral0H/TOBModule0[2]/TOBWaferSter0/TOBActiveSter0"/>
+      <PartSelector path="//Tracker/TOB/TOBLayer0/TOBRod0/TOBRod0H/TOBRodCentral0H/TOBModule0[3]/TOBWaferRphi0/TOBActiveRphi0"/>
+      <PartSelector path="//Tracker/TOB/TOBLayer0/TOBRod0/TOBRod0H/TOBRodCentral0H/TOBModule0[3]/TOBWaferSter0/TOBActiveSter0"/>
+      <PartSelector path="//Tracker/TOB/TOBLayer0/TOBRod0/TOBRod0H/TOBRodCentral0H/TOBModule0[4]/TOBWaferRphi0/TOBActiveRphi0"/>
+      <PartSelector path="//Tracker/TOB/TOBLayer0/TOBRod0/TOBRod0H/TOBRodCentral0H/TOBModule0[4]/TOBWaferSter0/TOBActiveSter0"/>
+      <Parameter name="TrackerRadLength" value="0.0684551"/>
+      <Parameter name="TrackerXi" value="0.000153442"/>
+    </SpecPar>
+    
+    <SpecPar name="TrackerRecMaterialTOBLayer0_Z70" eval="true">
+      <PartSelector path="//Tracker/TOB/TOBLayer0/TOBRod0/TOBRod0L/TOBRodCentral0L/TOBModule0[1]/TOBWaferRphi0/TOBActiveRphi0"/>
+      <PartSelector path="//Tracker/TOB/TOBLayer0/TOBRod0/TOBRod0L/TOBRodCentral0L/TOBModule0[1]/TOBWaferSter0/TOBActiveSter0"/>
+      <PartSelector path="//Tracker/TOB/TOBLayer0/TOBRod0/TOBRod0L/TOBRodCentral0L/TOBModule0[2]/TOBWaferRphi0/TOBActiveRphi0"/>
+      <PartSelector path="//Tracker/TOB/TOBLayer0/TOBRod0/TOBRod0L/TOBRodCentral0L/TOBModule0[2]/TOBWaferSter0/TOBActiveSter0"/>
+      <PartSelector path="//Tracker/TOB/TOBLayer0/TOBRod0/TOBRod0H/TOBRodCentral0H/TOBModule0[5]/TOBWaferRphi0/TOBActiveRphi0"/>
+      <PartSelector path="//Tracker/TOB/TOBLayer0/TOBRod0/TOBRod0H/TOBRodCentral0H/TOBModule0[5]/TOBWaferSter0/TOBActiveSter0"/>
+      <PartSelector path="//Tracker/TOB/TOBLayer0/TOBRod0/TOBRod0H/TOBRodCentral0H/TOBModule0[6]/TOBWaferRphi0/TOBActiveRphi0"/>
+      <PartSelector path="//Tracker/TOB/TOBLayer0/TOBRod0/TOBRod0H/TOBRodCentral0H/TOBModule0[6]/TOBWaferSter0/TOBActiveSter0"/>
+      <Parameter name="TrackerRadLength" value="0.12827"/>
+      <Parameter name="TrackerXi" value="0.000262192"/>
+    </SpecPar>
+    
+    <SpecPar name="TrackerRecMaterialTOBLayer1_Z0" eval="true">
+      <PartSelector path="//Tracker/TOB/TOBLayer1/TOBRod1/TOBRod1L/TOBRodCentral1L/TOBModule0[6]/TOBWaferRphi0/TOBActiveRphi0"/>
+      <PartSelector path="//Tracker/TOB/TOBLayer1/TOBRod1/TOBRod1L/TOBRodCentral1L/TOBModule0[6]/TOBWaferSter0/TOBActiveSter0"/>
+      <PartSelector path="//Tracker/TOB/TOBLayer1/TOBRod1/TOBRod1H/TOBRodCentral1H/TOBModule0[1]/TOBWaferRphi0/TOBActiveRphi0"/>
+      <PartSelector path="//Tracker/TOB/TOBLayer1/TOBRod1/TOBRod1H/TOBRodCentral1H/TOBModule0[1]/TOBWaferSter0/TOBActiveSter0"/>
+      <Parameter name="TrackerRadLength" value="0.0230002"/>
+      <Parameter name="TrackerXi" value="0.0000486523"/>
+    </SpecPar>
+    
+    <SpecPar name="TrackerRecMaterialTOBLayer1_Z20" eval="true">
+      <PartSelector path="//Tracker/TOB/TOBLayer1/TOBRod1/TOBRod1L/TOBRodCentral1L/TOBModule0[3]/TOBWaferRphi0/TOBActiveRphi0"/>
+      <PartSelector path="//Tracker/TOB/TOBLayer1/TOBRod1/TOBRod1L/TOBRodCentral1L/TOBModule0[3]/TOBWaferSter0/TOBActiveSter0"/>
+      <PartSelector path="//Tracker/TOB/TOBLayer1/TOBRod1/TOBRod1L/TOBRodCentral1L/TOBModule0[4]/TOBWaferRphi0/TOBActiveRphi0"/>
+      <PartSelector path="//Tracker/TOB/TOBLayer1/TOBRod1/TOBRod1L/TOBRodCentral1L/TOBModule0[4]/TOBWaferSter0/TOBActiveSter0"/>
+      <PartSelector path="//Tracker/TOB/TOBLayer1/TOBRod1/TOBRod1L/TOBRodCentral1L/TOBModule0[5]/TOBWaferRphi0/TOBActiveRphi0"/>
+      <PartSelector path="//Tracker/TOB/TOBLayer1/TOBRod1/TOBRod1L/TOBRodCentral1L/TOBModule0[5]/TOBWaferSter0/TOBActiveSter0"/>
+      <PartSelector path="//Tracker/TOB/TOBLayer1/TOBRod1/TOBRod1H/TOBRodCentral1H/TOBModule0[2]/TOBWaferRphi0/TOBActiveRphi0"/>
+      <PartSelector path="//Tracker/TOB/TOBLayer1/TOBRod1/TOBRod1H/TOBRodCentral1H/TOBModule0[2]/TOBWaferSter0/TOBActiveSter0"/>
+      <PartSelector path="//Tracker/TOB/TOBLayer1/TOBRod1/TOBRod1H/TOBRodCentral1H/TOBModule0[3]/TOBWaferRphi0/TOBActiveRphi0"/>
+      <PartSelector path="//Tracker/TOB/TOBLayer1/TOBRod1/TOBRod1H/TOBRodCentral1H/TOBModule0[3]/TOBWaferSter0/TOBActiveSter0"/>
+      <PartSelector path="//Tracker/TOB/TOBLayer1/TOBRod1/TOBRod1H/TOBRodCentral1H/TOBModule0[4]/TOBWaferRphi0/TOBActiveRphi0"/>
+      <PartSelector path="//Tracker/TOB/TOBLayer1/TOBRod1/TOBRod1H/TOBRodCentral1H/TOBModule0[4]/TOBWaferSter0/TOBActiveSter0"/>
+      <Parameter name="TrackerRadLength" value="0.0493919"/>
+      <Parameter name="TrackerXi" value="0.000097715"/>
+    </SpecPar>
+    
+    <SpecPar name="TrackerRecMaterialTOBLayer1_Z80" eval="true">
+      <PartSelector path="//Tracker/TOB/TOBLayer1/TOBRod1/TOBRod1L/TOBRodCentral1L/TOBModule0[1]/TOBWaferRphi0/TOBActiveRphi0"/>
+      <PartSelector path="//Tracker/TOB/TOBLayer1/TOBRod1/TOBRod1L/TOBRodCentral1L/TOBModule0[1]/TOBWaferSter0/TOBActiveSter0"/>
+      <PartSelector path="//Tracker/TOB/TOBLayer1/TOBRod1/TOBRod1L/TOBRodCentral1L/TOBModule0[2]/TOBWaferRphi0/TOBActiveRphi0"/>
+      <PartSelector path="//Tracker/TOB/TOBLayer1/TOBRod1/TOBRod1L/TOBRodCentral1L/TOBModule0[2]/TOBWaferSter0/TOBActiveSter0"/>
+      <PartSelector path="//Tracker/TOB/TOBLayer1/TOBRod1/TOBRod1H/TOBRodCentral1H/TOBModule0[5]/TOBWaferRphi0/TOBActiveRphi0"/>
+      <PartSelector path="//Tracker/TOB/TOBLayer1/TOBRod1/TOBRod1H/TOBRodCentral1H/TOBModule0[5]/TOBWaferSter0/TOBActiveSter0"/>
+      <PartSelector path="//Tracker/TOB/TOBLayer1/TOBRod1/TOBRod1H/TOBRodCentral1H/TOBModule0[6]/TOBWaferRphi0/TOBActiveRphi0"/>
+      <PartSelector path="//Tracker/TOB/TOBLayer1/TOBRod1/TOBRod1H/TOBRodCentral1H/TOBModule0[6]/TOBWaferSter0/TOBActiveSter0"/>
+      <Parameter name="TrackerRadLength" value="0.0546651"/>
+      <Parameter name="TrackerXi" value="0.000106385"/>
+    </SpecPar>
+    
+    <SpecPar name="TrackerRecMaterialTOBLayer2_Z0" eval="true">
+      <PartSelector path="//Tracker/TOB/TOBLayer2/TOBRod2/TOBRod2L/TOBRodCentral2L/TOBModule2[6]/TOBWaferRphi2/TOBActiveRphi2"/>
+      <PartSelector path="//Tracker/TOB/TOBLayer2/TOBRod2/TOBRod2H/TOBRodCentral2H/TOBModule2[1]/TOBWaferRphi2/TOBActiveRphi2"/>
+      <Parameter name="TrackerRadLength" value="0.0154492"/>
+      <Parameter name="TrackerXi" value="0.0000344627"/>
+    </SpecPar>
+    
+    <SpecPar name="TrackerRecMaterialTOBLayer2_Z25" eval="true">
+      <PartSelector path="//Tracker/TOB/TOBLayer2/TOBRod2/TOBRod2L/TOBRodCentral2L/TOBModule2[3]/TOBWaferRphi2/TOBActiveRphi2"/>
+      <PartSelector path="//Tracker/TOB/TOBLayer2/TOBRod2/TOBRod2L/TOBRodCentral2L/TOBModule2[4]/TOBWaferRphi2/TOBActiveRphi2"/>
+      <PartSelector path="//Tracker/TOB/TOBLayer2/TOBRod2/TOBRod2L/TOBRodCentral2L/TOBModule2[5]/TOBWaferRphi2/TOBActiveRphi2"/>
+      <PartSelector path="//Tracker/TOB/TOBLayer2/TOBRod2/TOBRod2H/TOBRodCentral2H/TOBModule2[2]/TOBWaferRphi2/TOBActiveRphi2"/>
+      <PartSelector path="//Tracker/TOB/TOBLayer2/TOBRod2/TOBRod2H/TOBRodCentral2H/TOBModule2[3]/TOBWaferRphi2/TOBActiveRphi2"/>
+      <PartSelector path="//Tracker/TOB/TOBLayer2/TOBRod2/TOBRod2H/TOBRodCentral2H/TOBModule2[4]/TOBWaferRphi2/TOBActiveRphi2"/>
+      <Parameter name="TrackerRadLength" value="0.0381806"/>
+      <Parameter name="TrackerXi" value="0.0000764069"/>
+    </SpecPar>
+    
+    <SpecPar name="TrackerRecMaterialTOBLayer2_Z80" eval="true">
+      <PartSelector path="//Tracker/TOB/TOBLayer2/TOBRod2/TOBRod2L/TOBRodCentral2L/TOBModule2[1]/TOBWaferRphi2/TOBActiveRphi2"/>
+      <PartSelector path="//Tracker/TOB/TOBLayer2/TOBRod2/TOBRod2L/TOBRodCentral2L/TOBModule2[2]/TOBWaferRphi2/TOBActiveRphi2"/>
+      <PartSelector path="//Tracker/TOB/TOBLayer2/TOBRod2/TOBRod2H/TOBRodCentral2H/TOBModule2[5]/TOBWaferRphi2/TOBActiveRphi2"/>
+      <PartSelector path="//Tracker/TOB/TOBLayer2/TOBRod2/TOBRod2H/TOBRodCentral2H/TOBModule2[6]/TOBWaferRphi2/TOBActiveRphi2"/>
+      <Parameter name="TrackerRadLength" value="0.0432571"/>
+      <Parameter name="TrackerXi" value="0.0000839064"/>
+    </SpecPar>
+    
+    <SpecPar name="TrackerRecMaterialTOBLayer3_Z0" eval="true">
+      <PartSelector path="//Tracker/TOB/TOBLayer3/TOBRod3/TOBRod3L/TOBRodCentral3L/TOBModule2[6]/TOBWaferRphi2/TOBActiveRphi2"/>
+      <PartSelector path="//Tracker/TOB/TOBLayer3/TOBRod3/TOBRod3H/TOBRodCentral3H/TOBModule2[1]/TOBWaferRphi2/TOBActiveRphi2"/>
+      <Parameter name="TrackerRadLength" value="0.0148792"/>
+      <Parameter name="TrackerXi" value="0.0000331637"/>
+    </SpecPar>
+    
+    <SpecPar name="TrackerRecMaterialTOBLayer3_Z25" eval="true">
+      <PartSelector path="//Tracker/TOB/TOBLayer3/TOBRod3/TOBRod3L/TOBRodCentral3L/TOBModule2[3]/TOBWaferRphi2/TOBActiveRphi2"/>
+      <PartSelector path="//Tracker/TOB/TOBLayer3/TOBRod3/TOBRod3L/TOBRodCentral3L/TOBModule2[4]/TOBWaferRphi2/TOBActiveRphi2"/>
+      <PartSelector path="//Tracker/TOB/TOBLayer3/TOBRod3/TOBRod3L/TOBRodCentral3L/TOBModule2[5]/TOBWaferRphi2/TOBActiveRphi2"/>
+      <PartSelector path="//Tracker/TOB/TOBLayer3/TOBRod3/TOBRod3H/TOBRodCentral3H/TOBModule2[2]/TOBWaferRphi2/TOBActiveRphi2"/>
+      <PartSelector path="//Tracker/TOB/TOBLayer3/TOBRod3/TOBRod3H/TOBRodCentral3H/TOBModule2[3]/TOBWaferRphi2/TOBActiveRphi2"/>
+      <PartSelector path="//Tracker/TOB/TOBLayer3/TOBRod3/TOBRod3H/TOBRodCentral3H/TOBModule2[4]/TOBWaferRphi2/TOBActiveRphi2"/>
+      <Parameter name="TrackerRadLength" value="0.0342274"/>
+      <Parameter name="TrackerXi" value="0.0000683527"/>
+    </SpecPar>
+    
+    <SpecPar name="TrackerRecMaterialTOBLayer3_Z80" eval="true">
+      <PartSelector path="//Tracker/TOB/TOBLayer3/TOBRod3/TOBRod3L/TOBRodCentral3L/TOBModule2[1]/TOBWaferRphi2/TOBActiveRphi2"/>
+      <PartSelector path="//Tracker/TOB/TOBLayer3/TOBRod3/TOBRod3L/TOBRodCentral3L/TOBModule2[2]/TOBWaferRphi2/TOBActiveRphi2"/>
+      <PartSelector path="//Tracker/TOB/TOBLayer3/TOBRod3/TOBRod3H/TOBRodCentral3H/TOBModule2[5]/TOBWaferRphi2/TOBActiveRphi2"/>
+      <PartSelector path="//Tracker/TOB/TOBLayer3/TOBRod3/TOBRod3H/TOBRodCentral3H/TOBModule2[6]/TOBWaferRphi2/TOBActiveRphi2"/>
+      <Parameter name="TrackerRadLength" value="0.0377054"/>
+      <Parameter name="TrackerXi" value="0.0000728117"/>
+    </SpecPar>
+    
+    <SpecPar name="TrackerRecMaterialTOBLayer4_Z0" eval="true">
+      <PartSelector path="//Tracker/TOB/TOBLayer4/TOBRod4/TOBRod4L/TOBRodCentral4L/TOBModule4[6]/TOBWaferRphi4/TOBActiveRphi4"/>
+      <PartSelector path="//Tracker/TOB/TOBLayer4/TOBRod4/TOBRod4H/TOBRodCentral4H/TOBModule4[1]/TOBWaferRphi4/TOBActiveRphi4"/>
+      <Parameter name="TrackerRadLength" value="0.0148619"/>
+      <Parameter name="TrackerXi" value="0.0000329913"/>
+    </SpecPar>
+    
+    <SpecPar name="TrackerRecMaterialTOBLayer4_Z25" eval="true">
+      <PartSelector path="//Tracker/TOB/TOBLayer4/TOBRod4/TOBRod4L/TOBRodCentral4L/TOBModule4[3]/TOBWaferRphi4/TOBActiveRphi4"/>
+      <PartSelector path="//Tracker/TOB/TOBLayer4/TOBRod4/TOBRod4L/TOBRodCentral4L/TOBModule4[4]/TOBWaferRphi4/TOBActiveRphi4"/>
+      <PartSelector path="//Tracker/TOB/TOBLayer4/TOBRod4/TOBRod4L/TOBRodCentral4L/TOBModule4[5]/TOBWaferRphi4/TOBActiveRphi4"/>
+      <PartSelector path="//Tracker/TOB/TOBLayer4/TOBRod4/TOBRod4H/TOBRodCentral4H/TOBModule4[2]/TOBWaferRphi4/TOBActiveRphi4"/>
+      <PartSelector path="//Tracker/TOB/TOBLayer4/TOBRod4/TOBRod4H/TOBRodCentral4H/TOBModule4[3]/TOBWaferRphi4/TOBActiveRphi4"/>
+      <PartSelector path="//Tracker/TOB/TOBLayer4/TOBRod4/TOBRod4H/TOBRodCentral4H/TOBModule4[4]/TOBWaferRphi4/TOBActiveRphi4"/>
+      <Parameter name="TrackerRadLength" value="0.0347104"/>
+      <Parameter name="TrackerXi" value="0.0000704833"/>
+    </SpecPar>
+    
+    <SpecPar name="TrackerRecMaterialTOBLayer4_Z80" eval="true">
+      <PartSelector path="//Tracker/TOB/TOBLayer4/TOBRod4/TOBRod4L/TOBRodCentral4L/TOBModule4[1]/TOBWaferRphi4/TOBActiveRphi4"/>
+      <PartSelector path="//Tracker/TOB/TOBLayer4/TOBRod4/TOBRod4L/TOBRodCentral4L/TOBModule4[2]/TOBWaferRphi4/TOBActiveRphi4"/>
+      <PartSelector path="//Tracker/TOB/TOBLayer4/TOBRod4/TOBRod4H/TOBRodCentral4H/TOBModule4[5]/TOBWaferRphi4/TOBActiveRphi4"/>
+      <PartSelector path="//Tracker/TOB/TOBLayer4/TOBRod4/TOBRod4H/TOBRodCentral4H/TOBModule4[6]/TOBWaferRphi4/TOBActiveRphi4"/>
+      <Parameter name="TrackerRadLength" value="0.0375432"/>
+      <Parameter name="TrackerXi" value="0.0000733171"/>
+    </SpecPar>
+    
+    <SpecPar name="TrackerRecMaterialTOBLayer5_Z0" eval="true">
+      <PartSelector path="//Tracker/TOB/TOBLayer5/TOBRod5/TOBRod5L/TOBRodCentral5L/TOBModule4[6]/TOBWaferRphi4/TOBActiveRphi4"/>
+      <PartSelector path="//Tracker/TOB/TOBLayer5/TOBRod5/TOBRod5H/TOBRodCentral5H/TOBModule4[1]/TOBWaferRphi4/TOBActiveRphi4"/>
+      <Parameter name="TrackerRadLength" value="0.014789"/>
+      <Parameter name="TrackerXi" value="0.0000329983"/>
+    </SpecPar>
+    
+    <SpecPar name="TrackerRecMaterialTOBLayer5_Z25" eval="true">
+      <PartSelector path="//Tracker/TOB/TOBLayer5/TOBRod5/TOBRod5L/TOBRodCentral5L/TOBModule4[3]/TOBWaferRphi4/TOBActiveRphi4"/>
+      <PartSelector path="//Tracker/TOB/TOBLayer5/TOBRod5/TOBRod5L/TOBRodCentral5L/TOBModule4[4]/TOBWaferRphi4/TOBActiveRphi4"/>
+      <PartSelector path="//Tracker/TOB/TOBLayer5/TOBRod5/TOBRod5L/TOBRodCentral5L/TOBModule4[5]/TOBWaferRphi4/TOBActiveRphi4"/>
+      <PartSelector path="//Tracker/TOB/TOBLayer5/TOBRod5/TOBRod5H/TOBRodCentral5H/TOBModule4[2]/TOBWaferRphi4/TOBActiveRphi4"/>
+      <PartSelector path="//Tracker/TOB/TOBLayer5/TOBRod5/TOBRod5H/TOBRodCentral5H/TOBModule4[3]/TOBWaferRphi4/TOBActiveRphi4"/>
+      <PartSelector path="//Tracker/TOB/TOBLayer5/TOBRod5/TOBRod5H/TOBRodCentral5H/TOBModule4[4]/TOBWaferRphi4/TOBActiveRphi4"/>
+      <Parameter name="TrackerRadLength" value="0.0362598"/>
+      <Parameter name="TrackerXi" value="0.0000750769"/>
+    </SpecPar>
+    
+    <SpecPar name="TrackerRecMaterialTOBLayer5_Z80" eval="true">
+      <PartSelector path="//Tracker/TOB/TOBLayer5/TOBRod5/TOBRod5L/TOBRodCentral5L/TOBModule4[1]/TOBWaferRphi4/TOBActiveRphi4"/>
+      <PartSelector path="//Tracker/TOB/TOBLayer5/TOBRod5/TOBRod5L/TOBRodCentral5L/TOBModule4[2]/TOBWaferRphi4/TOBActiveRphi4"/>
+      <PartSelector path="//Tracker/TOB/TOBLayer5/TOBRod5/TOBRod5H/TOBRodCentral5H/TOBModule4[5]/TOBWaferRphi4/TOBActiveRphi4"/>
+      <PartSelector path="//Tracker/TOB/TOBLayer5/TOBRod5/TOBRod5H/TOBRodCentral5H/TOBModule4[6]/TOBWaferRphi4/TOBActiveRphi4"/>
+      <Parameter name="TrackerRadLength" value="0.0377906"/>
+      <Parameter name="TrackerXi" value="0.0000740375"/>
+    </SpecPar>
+    
+    <SpecPar name="TrackerRecMaterialPixelEndcapDisk1Fw" eval="true">
+      <PartSelector path="//PixelForward[1]/PixelForwardDisk1/PixelForwardModule1[1]/PixelForwardWafer1/PixelForwardSensor1"/>
+      <PartSelector path="//PixelForward[1]/PixelForwardDisk1/PixelForwardModule1[2]/PixelForwardWafer1/PixelForwardSensor1"/>
+      <PartSelector path="//PixelForward[1]/PixelForwardDisk1/PixelForwardModule1[1]/PixelForwardWafer1/PixelForwardSensor1"/>
+      <PartSelector path="//PixelForward[1]/PixelForwardDisk1/PixelForwardModule1[2]/PixelForwardWafer1/PixelForwardSensor1"/>
+        <Parameter name="TrackerRadLength" value="0.055"/>
+      <Parameter name="TrackerXi" value="0.0002116"/>
+    </SpecPar>
+
+    <SpecPar name="TrackerRecMaterialPixelEndcapDisk2Fw" eval="true">
+      <PartSelector path="//PixelForward[1]/PixelForwardDisk2/PixelForwardModule2[1]/PixelForwardWafer2/PixelForwardSensor2"/>
+      <PartSelector path="//PixelForward[1]/PixelForwardDisk2/PixelForwardModule2[2]/PixelForwardWafer2/PixelForwardSensor2"/>
+      <PartSelector path="//PixelForward[1]/PixelForwardDisk2/PixelForwardModule2[1]/PixelForwardWafer2/PixelForwardSensor2"/>
+      <PartSelector path="//PixelForward[1]/PixelForwardDisk2/PixelForwardModule2[2]/PixelForwardWafer2/PixelForwardSensor2"/>
+
+      <Parameter name="TrackerRadLength" value="0.031"/>
+      <Parameter name="TrackerXi" value="0.0003217"/>
+    </SpecPar>
+
+     <SpecPar name="TrackerRecMaterialPixelEndcapDisk3Fw" eval="true">
+      <PartSelector path="//PixelForward[1]/PixelForwardDisk3/PixelForwardModule3[1]/PixelForwardWafer3/PixelForwardSensor3"/>
+      <PartSelector path="//PixelForward[1]/PixelForwardDisk3/PixelForwardModule3[2]/PixelForwardWafer3/PixelForwardSensor3"/>
+      <PartSelector path="//PixelForward[1]/PixelForwardDisk3/PixelForwardModule3[1]/PixelForwardWafer3/PixelForwardSensor3"/>
+      <PartSelector path="//PixelForward[1]/PixelForwardDisk3/PixelForwardModule3[2]/PixelForwardWafer3/PixelForwardSensor3"/>
+      <Parameter name="TrackerRadLength" value="0.031"/>
+      <Parameter name="TrackerXi" value="0.0003217"/>
+    </SpecPar>
+
+    <SpecPar name="TrackerRecMaterialPixelEndcapDisk4Fw" eval="true">
+      <PartSelector path="//PixelForward[1]/PixelForwardDisk4/PixelForwardModule4[1]/PixelForwardWafer4/PixelForwardSensor4"/>
+      <PartSelector path="//PixelForward[1]/PixelForwardDisk4/PixelForwardModule4[2]/PixelForwardWafer4/PixelForwardSensor4"/>
+      <PartSelector path="//PixelForward[1]/PixelForwardDisk4/PixelForwardModule4[1]/PixelForwardWafer4/PixelForwardSensor4"/>
+      <PartSelector path="//PixelForward[1]/PixelForwardDisk4/PixelForwardModule4[2]/PixelForwardWafer4/PixelForwardSensor4"/>
+      <Parameter name="TrackerRadLength" value="0.031"/>
+      <Parameter name="TrackerXi" value="0.0003217"/>
+    </SpecPar>
+    <SpecPar name="TrackerRecMaterialPixelEndcapDisk5Fw" eval="true">
+      <PartSelector path="//PixelForward[1]/PixelForwardDisk5/PixelForwardModule5[1]/PixelForwardWafer5/PixelForwardSensor5"/>
+      <PartSelector path="//PixelForward[1]/PixelForwardDisk5/PixelForwardModule5[2]/PixelForwardWafer5/PixelForwardSensor5"/>
+      <PartSelector path="//PixelForward[1]/PixelForwardDisk5/PixelForwardModule5[1]/PixelForwardWafer5/PixelForwardSensor5"/>
+      <PartSelector path="//PixelForward[1]/PixelForwardDisk5/PixelForwardModule5[2]/PixelForwardWafer5/PixelForwardSensor5"/>
+      <Parameter name="TrackerRadLength" value="0.031"/>
+      <Parameter name="TrackerXi" value="0.0003217"/>
+    </SpecPar>
+    <SpecPar name="TrackerRecMaterialPixelEndcapDisk6Fw" eval="true">
+      <PartSelector path="//PixelForward[1]/PixelForwardDisk6/PixelForwardModule6[1]/PixelForwardWafer6/PixelForwardSensor6"/>
+      <PartSelector path="//PixelForward[1]/PixelForwardDisk6/PixelForwardModule6[2]/PixelForwardWafer6/PixelForwardSensor6"/>
+      <PartSelector path="//PixelForward[1]/PixelForwardDisk6/PixelForwardModule6[1]/PixelForwardWafer6/PixelForwardSensor6"/>
+      <PartSelector path="//PixelForward[1]/PixelForwardDisk6/PixelForwardModule6[2]/PixelForwardWafer6/PixelForwardSensor6"/>
+      <Parameter name="TrackerRadLength" value="0.031"/>
+      <Parameter name="TrackerXi" value="0.0003217"/>
+    </SpecPar>
+    <SpecPar name="TrackerRecMaterialPixelEndcapDisk7Fw" eval="true">
+      <PartSelector path="//PixelForward[1]/PixelForwardDisk7/PixelForwardModule7[1]/PixelForwardWafer7/PixelForwardSensor7"/>
+      <PartSelector path="//PixelForward[1]/PixelForwardDisk7/PixelForwardModule7[2]/PixelForwardWafer7/PixelForwardSensor7"/>
+      <PartSelector path="//PixelForward[1]/PixelForwardDisk7/PixelForwardModule7[1]/PixelForwardWafer7/PixelForwardSensor7"/>
+      <PartSelector path="//PixelForward[1]/PixelForwardDisk7/PixelForwardModule7[2]/PixelForwardWafer7/PixelForwardSensor7"/>
+      <Parameter name="TrackerRadLength" value="0.031"/>
+      <Parameter name="TrackerXi" value="0.0003217"/>
+    </SpecPar>
+    <SpecPar name="TrackerRecMaterialPixelEndcapDisk8Fw" eval="true">
+      <PartSelector path="//PixelForward[1]/PixelForwardDisk8/PixelForwardModule8[1]/PixelForwardWafer8/PixelForwardSensor8"/>
+      <PartSelector path="//PixelForward[1]/PixelForwardDisk8/PixelForwardModule8[2]/PixelForwardWafer8/PixelForwardSensor8"/>
+      <PartSelector path="//PixelForward[1]/PixelForwardDisk8/PixelForwardModule8[1]/PixelForwardWafer8/PixelForwardSensor8"/>
+      <PartSelector path="//PixelForward[1]/PixelForwardDisk8/PixelForwardModule8[2]/PixelForwardWafer8/PixelForwardSensor8"/>
+      <Parameter name="TrackerRadLength" value="0.031"/>
+      <Parameter name="TrackerXi" value="0.0003217"/>
+    </SpecPar>
+    <SpecPar name="TrackerRecMaterialPixelEndcapDisk9Fw" eval="true">
+      <PartSelector path="//PixelForward[1]/PixelForwardDisk9/PixelForwardModule9[1]/PixelForwardWafer9/PixelForwardSensor9"/>
+      <PartSelector path="//PixelForward[1]/PixelForwardDisk9/PixelForwardModule9[2]/PixelForwardWafer9/PixelForwardSensor9"/>
+      <PartSelector path="//PixelForward[1]/PixelForwardDisk9/PixelForwardModule9[1]/PixelForwardWafer9/PixelForwardSensor9"/>
+      <PartSelector path="//PixelForward[1]/PixelForwardDisk9/PixelForwardModule9[2]/PixelForwardWafer9/PixelForwardSensor9"/>
+      <Parameter name="TrackerRadLength" value="0.031"/>
+      <Parameter name="TrackerXi" value="0.0003217"/>
+    </SpecPar>
+    <SpecPar name="TrackerRecMaterialPixelEndcapDisk10Fw" eval="true">
+      <PartSelector path="//PixelForward[1]/PixelForwardDisk10/PixelForwardModule10[1]/PixelForwardWafer10/PixelForwardSensor10"/>
+      <PartSelector path="//PixelForward[1]/PixelForwardDisk10/PixelForwardModule10[2]/PixelForwardWafer10/PixelForwardSensor10"/>
+      <PartSelector path="//PixelForward[1]/PixelForwardDisk10/PixelForwardModule10[1]/PixelForwardWafer10/PixelForwardSensor10"/>
+      <PartSelector path="//PixelForward[1]/PixelForwardDisk10/PixelForwardModule10[2]/PixelForwardWafer10/PixelForwardSensor10"/>
+      <Parameter name="TrackerRadLength" value="0.031"/>
+      <Parameter name="TrackerXi" value="0.0003217"/>
+    </SpecPar>
+
+  <SpecPar name="TrackerRecMaterialPixelEndcapDisk1Bw" eval="true">
+      <PartSelector path="//PixelForward[2]/PixelForwardDisk1/PixelForwardModule1[1]/PixelForwardWafer1/PixelForwardSensor1"/>
+      <PartSelector path="//PixelForward[2]/PixelForwardDisk1/PixelForwardModule1[2]/PixelForwardWafer1/PixelForwardSensor1"/>
+      <PartSelector path="//PixelForward[2]/PixelForwardDisk1/PixelForwardModule1[1]/PixelForwardWafer1/PixelForwardSensor1"/>
+      <PartSelector path="//PixelForward[2]/PixelForwardDisk1/PixelForwardModule1[2]/PixelForwardWafer1/PixelForwardSensor1"/>
+      <Parameter name="TrackerRadLength" value="0.055"/>
+      <Parameter name="TrackerXi" value="0.0002116"/>
+    </SpecPar>
+
+    <SpecPar name="TrackerRecMaterialPixelEndcapDisk2Bw" eval="true">
+      <PartSelector path="//PixelForward[2]/PixelForwardDisk2/PixelForwardModule2[1]/PixelForwardWafer2/PixelForwardSensor2"/>
+      <PartSelector path="//PixelForward[2]/PixelForwardDisk2/PixelForwardModule2[2]/PixelForwardWafer2/PixelForwardSensor2"/>
+      <PartSelector path="//PixelForward[2]/PixelForwardDisk2/PixelForwardModule2[1]/PixelForwardWafer2/PixelForwardSensor2"/>
+      <PartSelector path="//PixelForward[2]/PixelForwardDisk2/PixelForwardModule2[2]/PixelForwardWafer2/PixelForwardSensor2"/>
+      <Parameter name="TrackerRadLength" value="0.031"/>
+      <Parameter name="TrackerXi" value="0.0003217"/>
+    </SpecPar>
+
+     <SpecPar name="TrackerRecMaterialPixelEndcapDisk3Bw" eval="true">
+      <PartSelector path="//PixelForward[2]/PixelForwardDisk3/PixelForwardModule3[1]/PixelForwardWafer3/PixelForwardSensor3"/>
+      <PartSelector path="//PixelForward[2]/PixelForwardDisk3/PixelForwardModule3[2]/PixelForwardWafer3/PixelForwardSensor3"/>
+      <PartSelector path="//PixelForward[2]/PixelForwardDisk3/PixelForwardModule3[1]/PixelForwardWafer3/PixelForwardSensor3"/>
+      <PartSelector path="//PixelForward[2]/PixelForwardDisk3/PixelForwardModule3[2]/PixelForwardWafer3/PixelForwardSensor3"/>
+      <Parameter name="TrackerRadLength" value="0.031"/>
+      <Parameter name="TrackerXi" value="0.0003217"/>
+    </SpecPar>
+
+    <SpecPar name="TrackerRecMaterialPixelEndcapDisk4Bw" eval="true">
+      <PartSelector path="//PixelForward[2]/PixelForwardDisk4/PixelForwardModule4[1]/PixelForwardWafer4/PixelForwardSensor4"/>
+      <PartSelector path="//PixelForward[2]/PixelForwardDisk4/PixelForwardModule4[2]/PixelForwardWafer4/PixelForwardSensor4"/>
+      <PartSelector path="//PixelForward[2]/PixelForwardDisk4/PixelForwardModule4[1]/PixelForwardWafer4/PixelForwardSensor4"/>
+      <PartSelector path="//PixelForward[2]/PixelForwardDisk4/PixelForwardModule4[2]/PixelForwardWafer4/PixelForwardSensor4"/>
+      <Parameter name="TrackerRadLength" value="0.031"/>
+      <Parameter name="TrackerXi" value="0.0003217"/>
+    </SpecPar>
+    <SpecPar name="TrackerRecMaterialPixelEndcapDisk5Bw" eval="true">
+      <PartSelector path="//PixelForward[2]/PixelForwardDisk5/PixelForwardModule5[1]/PixelForwardWafer5/PixelForwardSensor5"/>
+      <PartSelector path="//PixelForward[2]/PixelForwardDisk5/PixelForwardModule5[2]/PixelForwardWafer5/PixelForwardSensor5"/>
+      <PartSelector path="//PixelForward[2]/PixelForwardDisk5/PixelForwardModule5[1]/PixelForwardWafer5/PixelForwardSensor5"/>
+      <PartSelector path="//PixelForward[2]/PixelForwardDisk5/PixelForwardModule5[2]/PixelForwardWafer5/PixelForwardSensor5"/>
+      <Parameter name="TrackerRadLength" value="0.031"/>
+      <Parameter name="TrackerXi" value="0.0003217"/>
+    </SpecPar>
+    <SpecPar name="TrackerRecMaterialPixelEndcapDisk6Bw" eval="true">
+      <PartSelector path="//PixelForward[2]/PixelForwardDisk6/PixelForwardModule6[1]/PixelForwardWafer6/PixelForwardSensor6"/>
+      <PartSelector path="//PixelForward[2]/PixelForwardDisk6/PixelForwardModule6[2]/PixelForwardWafer6/PixelForwardSensor6"/>
+      <PartSelector path="//PixelForward[2]/PixelForwardDisk6/PixelForwardModule6[1]/PixelForwardWafer6/PixelForwardSensor6"/>
+      <PartSelector path="//PixelForward[2]/PixelForwardDisk6/PixelForwardModule6[2]/PixelForwardWafer6/PixelForwardSensor6"/>
+      <Parameter name="TrackerRadLength" value="0.031"/>
+      <Parameter name="TrackerXi" value="0.0003217"/>
+    </SpecPar>
+    <SpecPar name="TrackerRecMaterialPixelEndcapDisk7Bw" eval="true">
+      <PartSelector path="//PixelForward[2]/PixelForwardDisk7/PixelForwardModule7[1]/PixelForwardWafer7/PixelForwardSensor7"/>
+      <PartSelector path="//PixelForward[2]/PixelForwardDisk7/PixelForwardModule7[2]/PixelForwardWafer7/PixelForwardSensor7"/>
+      <PartSelector path="//PixelForward[2]/PixelForwardDisk7/PixelForwardModule7[1]/PixelForwardWafer7/PixelForwardSensor7"/>
+      <PartSelector path="//PixelForward[2]/PixelForwardDisk7/PixelForwardModule7[2]/PixelForwardWafer7/PixelForwardSensor7"/>
+      <Parameter name="TrackerRadLength" value="0.031"/>
+      <Parameter name="TrackerXi" value="0.0003217"/>
+    </SpecPar>
+    <SpecPar name="TrackerRecMaterialPixelEndcapDisk8Bw" eval="true">
+      <PartSelector path="//PixelForward[2]/PixelForwardDisk8/PixelForwardModule8[1]/PixelForwardWafer8/PixelForwardSensor8"/>
+      <PartSelector path="//PixelForward[2]/PixelForwardDisk8/PixelForwardModule8[2]/PixelForwardWafer8/PixelForwardSensor8"/>
+      <PartSelector path="//PixelForward[2]/PixelForwardDisk8/PixelForwardModule8[1]/PixelForwardWafer8/PixelForwardSensor8"/>
+      <PartSelector path="//PixelForward[2]/PixelForwardDisk8/PixelForwardModule8[2]/PixelForwardWafer8/PixelForwardSensor8"/>
+      <Parameter name="TrackerRadLength" value="0.031"/>
+      <Parameter name="TrackerXi" value="0.0003217"/>
+    </SpecPar>
+    <SpecPar name="TrackerRecMaterialPixelEndcapDisk9Bw" eval="true">
+      <PartSelector path="//PixelForward[2]/PixelForwardDisk9/PixelForwardModule9[1]/PixelForwardWafer9/PixelForwardSensor9"/>
+      <PartSelector path="//PixelForward[2]/PixelForwardDisk9/PixelForwardModule9[2]/PixelForwardWafer9/PixelForwardSensor9"/>
+      <PartSelector path="//PixelForward[2]/PixelForwardDisk9/PixelForwardModule9[1]/PixelForwardWafer9/PixelForwardSensor9"/>
+      <PartSelector path="//PixelForward[2]/PixelForwardDisk9/PixelForwardModule9[2]/PixelForwardWafer9/PixelForwardSensor9"/>
+      <Parameter name="TrackerRadLength" value="0.031"/>
+      <Parameter name="TrackerXi" value="0.0003217"/>
+    </SpecPar>
+    <SpecPar name="TrackerRecMaterialPixelEndcapDisk10Bw" eval="true">
+      <PartSelector path="//PixelForward[2]/PixelForwardDisk10/PixelForwardModule10[1]/PixelForwardWafer10/PixelForwardSensor10"/>
+      <PartSelector path="//PixelForward[2]/PixelForwardDisk10/PixelForwardModule10[2]/PixelForwardWafer10/PixelForwardSensor10"/>
+      <PartSelector path="//PixelForward[2]/PixelForwardDisk10/PixelForwardModule10[1]/PixelForwardWafer10/PixelForwardSensor10"/>
+      <PartSelector path="//PixelForward[2]/PixelForwardDisk10/PixelForwardModule10[2]/PixelForwardWafer10/PixelForwardSensor10"/>
+      <Parameter name="TrackerRadLength" value="0.031"/>
+      <Parameter name="TrackerXi" value="0.0003217"/>
+    </SpecPar>
+
+    <SpecPar name="TrackerRecMaterialTIDDisk1_R0" eval="true">
+      <PartSelector path="//Tracker/TIDF/TIDWheelF[1]/TIDRing0F/TIDModule0L/TIDModule0RphiWafer/TIDModule0RphiActive"/>
+      <PartSelector path="//Tracker/TIDF/TIDWheelF[1]/TIDRing0F/TIDModule0L/TIDModule0StereoWafer/TIDModule0StereoActive"/>
+      <PartSelector path="//Tracker/TIDF/TIDWheelF[1]/TIDRing0F/TIDModule0R/TIDModule0RphiWafer/TIDModule0RphiActive"/>
+      <PartSelector path="//Tracker/TIDF/TIDWheelF[1]/TIDRing0F/TIDModule0R/TIDModule0StereoWafer/TIDModule0StereoActive"/>
+      <PartSelector path="//Tracker/TIDB/TIDWheelB[1]/TIDRing0B/TIDModule0L/TIDModule0RphiWafer/TIDModule0RphiActive"/>
+      <PartSelector path="//Tracker/TIDB/TIDWheelB[1]/TIDRing0B/TIDModule0L/TIDModule0StereoWafer/TIDModule0StereoActive"/>
+      <PartSelector path="//Tracker/TIDB/TIDWheelB[1]/TIDRing0B/TIDModule0R/TIDModule0RphiWafer/TIDModule0RphiActive"/>
+      <PartSelector path="//Tracker/TIDB/TIDWheelB[1]/TIDRing0B/TIDModule0R/TIDModule0StereoWafer/TIDModule0StereoActive"/>
+      <Parameter name="TrackerRadLength" value="0.302858"/>
+      <Parameter name="TrackerXi" value="0.000625266"/>
+    </SpecPar>
+    
+    <SpecPar name="TrackerRecMaterialTIDDisk1_R30" eval="true">
+      <PartSelector path="//Tracker/TIDF/TIDWheelF[1]/TIDRing1F/TIDModule1L/TIDModule1RphiWafer/TIDModule1RphiActive"/>
+      <PartSelector path="//Tracker/TIDF/TIDWheelF[1]/TIDRing1F/TIDModule1L/TIDModule1StereoWafer/TIDModule1StereoActive"/>
+      <PartSelector path="//Tracker/TIDF/TIDWheelF[1]/TIDRing1F/TIDModule1R/TIDModule1RphiWafer/TIDModule1RphiActive"/>
+      <PartSelector path="//Tracker/TIDF/TIDWheelF[1]/TIDRing1F/TIDModule1R/TIDModule1StereoWafer/TIDModule1StereoActive"/>
+      <PartSelector path="//Tracker/TIDF/TIDWheelF[1]/TIDRing2/TIDModule2/TIDModule2RphiWafer/TIDModule2RphiActive"/>
+      <PartSelector path="//Tracker/TIDB/TIDWheelB[1]/TIDRing1B/TIDModule1L/TIDModule1RphiWafer/TIDModule1RphiActive"/>
+      <PartSelector path="//Tracker/TIDB/TIDWheelB[1]/TIDRing1B/TIDModule1L/TIDModule1StereoWafer/TIDModule1StereoActive"/>
+      <PartSelector path="//Tracker/TIDB/TIDWheelB[1]/TIDRing1B/TIDModule1R/TIDModule1RphiWafer/TIDModule1RphiActive"/>
+      <PartSelector path="//Tracker/TIDB/TIDWheelB[1]/TIDRing1B/TIDModule1R/TIDModule1StereoWafer/TIDModule1StereoActive"/>
+      <PartSelector path="//Tracker/TIDB/TIDWheelB[1]/TIDRing2/TIDModule2/TIDModule2RphiWafer/TIDModule2RphiActive"/>
+      <Parameter name="TrackerRadLength" value="0.18083"/>
+      <Parameter name="TrackerXi" value="0.000343126"/>
+    </SpecPar>
+    
+    <SpecPar name="TrackerRecMaterialTIDDisk2_R25" eval="true">
+      <PartSelector path="//Tracker/TIDF/TIDWheelF[2]/TIDRing0F/TIDModule0L/TIDModule0RphiWafer/TIDModule0RphiActive"/>
+      <PartSelector path="//Tracker/TIDF/TIDWheelF[2]/TIDRing0F/TIDModule0L/TIDModule0StereoWafer/TIDModule0StereoActive"/>
+      <PartSelector path="//Tracker/TIDF/TIDWheelF[2]/TIDRing0F/TIDModule0R/TIDModule0RphiWafer/TIDModule0RphiActive"/>
+      <PartSelector path="//Tracker/TIDF/TIDWheelF[2]/TIDRing0F/TIDModule0R/TIDModule0StereoWafer/TIDModule0StereoActive"/>
+      <PartSelector path="//Tracker/TIDB/TIDWheelB[2]/TIDRing0B/TIDModule0L/TIDModule0RphiWafer/TIDModule0RphiActive"/>
+      <PartSelector path="//Tracker/TIDB/TIDWheelB[2]/TIDRing0B/TIDModule0L/TIDModule0StereoWafer/TIDModule0StereoActive"/>
+      <PartSelector path="//Tracker/TIDB/TIDWheelB[2]/TIDRing0B/TIDModule0R/TIDModule0RphiWafer/TIDModule0RphiActive"/>
+      <PartSelector path="//Tracker/TIDB/TIDWheelB[2]/TIDRing0B/TIDModule0R/TIDModule0StereoWafer/TIDModule0StereoActive"/>
+      <Parameter name="TrackerRadLength" value="0.114732"/>
+      <Parameter name="TrackerXi" value="0.00027425"/>
+    </SpecPar>
+    
+    <SpecPar name="TrackerRecMaterialTIDDisk2_R30" eval="true">
+      <PartSelector path="//Tracker/TIDF/TIDWheelF[2]/TIDRing1F/TIDModule1L/TIDModule1RphiWafer/TIDModule1RphiActive"/>
+      <PartSelector path="//Tracker/TIDF/TIDWheelF[2]/TIDRing1F/TIDModule1L/TIDModule1StereoWafer/TIDModule1StereoActive"/>
+      <PartSelector path="//Tracker/TIDF/TIDWheelF[2]/TIDRing1F/TIDModule1R/TIDModule1RphiWafer/TIDModule1RphiActive"/>
+      <PartSelector path="//Tracker/TIDF/TIDWheelF[2]/TIDRing1F/TIDModule1R/TIDModule1StereoWafer/TIDModule1StereoActive"/>
+      <PartSelector path="//Tracker/TIDB/TIDWheelB[2]/TIDRing1B/TIDModule1L/TIDModule1RphiWafer/TIDModule1RphiActive"/>
+      <PartSelector path="//Tracker/TIDB/TIDWheelB[2]/TIDRing1B/TIDModule1L/TIDModule1StereoWafer/TIDModule1StereoActive"/>
+      <PartSelector path="//Tracker/TIDB/TIDWheelB[2]/TIDRing1B/TIDModule1R/TIDModule1RphiWafer/TIDModule1RphiActive"/>
+      <PartSelector path="//Tracker/TIDB/TIDWheelB[2]/TIDRing1B/TIDModule1R/TIDModule1StereoWafer/TIDModule1StereoActive"/>
+      <Parameter name="TrackerRadLength" value="0.0591204"/>
+      <Parameter name="TrackerXi" value="0.000130465"/>
+    </SpecPar>
+    
+    <SpecPar name="TrackerRecMaterialTIDDisk2_R40" eval="true">
+      <PartSelector path="//Tracker/TIDF/TIDWheelF[2]/TIDRing2/TIDModule2/TIDModule2RphiWafer/TIDModule2RphiActive"/>
+      <PartSelector path="//Tracker/TIDB/TIDWheelB[2]/TIDRing2/TIDModule2/TIDModule2RphiWafer/TIDModule2RphiActive"/>
+      <Parameter name="TrackerRadLength" value="0.0701756"/>
+      <Parameter name="TrackerXi" value="0.000145315"/>
+    </SpecPar>
+    
+    <SpecPar name="TrackerRecMaterialTIDDisk3_R24" eval="true">
+      <PartSelector path="//Tracker/TIDF/TIDWheelF[3]/TIDRing0F/TIDModule0L/TIDModule0RphiWafer/TIDModule0RphiActive"/>
+      <PartSelector path="//Tracker/TIDF/TIDWheelF[3]/TIDRing0F/TIDModule0L/TIDModule0StereoWafer/TIDModule0StereoActive"/>
+      <PartSelector path="//Tracker/TIDF/TIDWheelF[3]/TIDRing0F/TIDModule0R/TIDModule0RphiWafer/TIDModule0RphiActive"/>
+      <PartSelector path="//Tracker/TIDF/TIDWheelF[3]/TIDRing0F/TIDModule0R/TIDModule0StereoWafer/TIDModule0StereoActive"/>
+      <PartSelector path="//Tracker/TIDF/TIDWheelF[3]/TIDRing1F/TIDModule1L/TIDModule1RphiWafer/TIDModule1RphiActive"/>
+      <PartSelector path="//Tracker/TIDF/TIDWheelF[3]/TIDRing1F/TIDModule1L/TIDModule1StereoWafer/TIDModule1StereoActive"/>
+      <PartSelector path="//Tracker/TIDF/TIDWheelF[3]/TIDRing1F/TIDModule1R/TIDModule1RphiWafer/TIDModule1RphiActive"/>
+      <PartSelector path="//Tracker/TIDF/TIDWheelF[3]/TIDRing1F/TIDModule1R/TIDModule1StereoWafer/TIDModule1StereoActive"/>
+      <PartSelector path="//Tracker/TIDF/TIDWheelF[3]/TIDRing2/TIDModule2/TIDModule2RphiWafer/TIDModule2RphiActive"/>
+      <PartSelector path="//Tracker/TIDB/TIDWheelB[3]/TIDRing0B/TIDModule0L/TIDModule0RphiWafer/TIDModule0RphiActive"/>
+      <PartSelector path="//Tracker/TIDB/TIDWheelB[3]/TIDRing0B/TIDModule0L/TIDModule0StereoWafer/TIDModule0StereoActive"/>
+      <PartSelector path="//Tracker/TIDB/TIDWheelB[3]/TIDRing0B/TIDModule0R/TIDModule0RphiWafer/TIDModule0RphiActive"/>
+      <PartSelector path="//Tracker/TIDB/TIDWheelB[3]/TIDRing0B/TIDModule0R/TIDModule0StereoWafer/TIDModule0StereoActive"/>
+      <PartSelector path="//Tracker/TIDB/TIDWheelB[3]/TIDRing1B/TIDModule1L/TIDModule1RphiWafer/TIDModule1RphiActive"/>
+      <PartSelector path="//Tracker/TIDB/TIDWheelB[3]/TIDRing1B/TIDModule1L/TIDModule1StereoWafer/TIDModule1StereoActive"/>
+      <PartSelector path="//Tracker/TIDB/TIDWheelB[3]/TIDRing1B/TIDModule1R/TIDModule1RphiWafer/TIDModule1RphiActive"/>
+      <PartSelector path="//Tracker/TIDB/TIDWheelB[3]/TIDRing1B/TIDModule1R/TIDModule1StereoWafer/TIDModule1StereoActive"/>
+      <PartSelector path="//Tracker/TIDB/TIDWheelB[3]/TIDRing2/TIDModule2/TIDModule2RphiWafer/TIDModule2RphiActive"/>
+      <Parameter name="TrackerRadLength" value="0.0960482"/>
+      <Parameter name="TrackerXi" value="0.00021912"/>
+    </SpecPar>
+    
+    <SpecPar name="TrackerRecMaterialTECDisk0_R20" eval="true">
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelA[0]/TECPetalCont0F/TECRing0F/TECModule0/TECModule0RphiWafer/TECModule0RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelA[0]/TECPetalCont0F/TECRing0F/TECModule0/TECModule0StereoWafer/TECModule0StereoActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelA[0]/TECPetalCont0F/TECRing1F/TECModule1/TECModule1RphiWafer/TECModule1RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelA[0]/TECPetalCont0F/TECRing1F/TECModule1/TECModule1StereoWafer/TECModule1StereoActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelA[0]/TECPetalCont0B/TECRing0B/TECModule0/TECModule0RphiWafer/TECModule0RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelA[0]/TECPetalCont0B/TECRing0B/TECModule0/TECModule0StereoWafer/TECModule0StereoActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelA[0]/TECPetalCont0B/TECRing1B/TECModule1/TECModule1RphiWafer/TECModule1RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelA[0]/TECPetalCont0B/TECRing1B/TECModule1/TECModule1StereoWafer/TECModule1StereoActive"/>
+      <Parameter name="TrackerRadLength" value="0.206625"/>
+      <Parameter name="TrackerXi" value="0.000484302"/>
+    </SpecPar>
+    
+    <SpecPar name="TrackerRecMaterialTECDisk0_R40" eval="true">
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelA[0]/TECPetalCont0F/TECRing2F/TECModule2/TECModule2RphiWafer/TECModule2RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelA[0]/TECPetalCont0B/TECRing2B/TECModule2/TECModule2RphiWafer/TECModule2RphiActive"/>
+      <Parameter name="TrackerRadLength" value="0.100807"/>
+      <Parameter name="TrackerXi" value="0.000262011"/>
+    </SpecPar>
+    
+    <SpecPar name="TrackerRecMaterialTECDisk0_R50" eval="true">
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelA[0]/TECPetalCont0F/TECRing3F/TECModule3/TECModule3RphiWafer/TECModule3RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelA[0]/TECPetalCont0B/TECRing3B/TECModule3/TECModule3RphiWafer/TECModule3RphiActive"/>
+      <Parameter name="TrackerRadLength" value="0.166558"/>
+      <Parameter name="TrackerXi" value="0.000388072"/>
+    </SpecPar>
+    
+    <SpecPar name="TrackerRecMaterialTECDisk0_R60" eval="true">
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelA[0]/TECPetalCont0F/TECRing4F/TECModule4/TECModule4RphiWafer/TECModule4RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelA[0]/TECPetalCont0F/TECRing4F/TECModule4/TECModule4StereoWafer/TECModule4StereoActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelA[0]/TECPetalCont0F/TECRing5F/TECModule5/TECModule5RphiWafer/TECModule5RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelA[0]/TECPetalCont0B/TECRing4B/TECModule4/TECModule4RphiWafer/TECModule4RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelA[0]/TECPetalCont0B/TECRing4B/TECModule4/TECModule4StereoWafer/TECModule4StereoActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelA[0]/TECPetalCont0B/TECRing5B/TECModule5/TECModule5RphiWafer/TECModule5RphiActive"/>
+      <Parameter name="TrackerRadLength" value="0.289455"/>
+      <Parameter name="TrackerXi" value="0.00054809"/>
+    </SpecPar>
+    
+    <SpecPar name="TrackerRecMaterialTECDisk0_R90" eval="true">
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelA[0]/TECPetalCont0F/TECRing6F/TECModule6/TECModule6RphiWafer/TECModule6RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelA[0]/TECPetalCont0B/TECRing6B/TECModule6/TECModule6RphiWafer/TECModule6RphiActive"/>
+      <Parameter name="TrackerRadLength" value="0.278665"/>
+      <Parameter name="TrackerXi" value="0.000475715"/>
+    </SpecPar>
+    
+    <SpecPar name="TrackerRecMaterialTECDisk1_R20" eval="true">
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelA[1]/TECPetalCont0F/TECRing0F/TECModule0/TECModule0RphiWafer/TECModule0RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelA[1]/TECPetalCont0F/TECRing0F/TECModule0/TECModule0StereoWafer/TECModule0StereoActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelA[1]/TECPetalCont0F/TECRing1F/TECModule1/TECModule1RphiWafer/TECModule1RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelA[1]/TECPetalCont0F/TECRing1F/TECModule1/TECModule1StereoWafer/TECModule1StereoActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelA[1]/TECPetalCont0F/TECRing2F/TECModule2/TECModule2RphiWafer/TECModule2RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelA[1]/TECPetalCont0F/TECRing3F/TECModule3/TECModule3RphiWafer/TECModule3RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelA[1]/TECPetalCont0F/TECRing4F/TECModule4/TECModule4RphiWafer/TECModule4RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelA[1]/TECPetalCont0F/TECRing4F/TECModule4/TECModule4StereoWafer/TECModule4StereoActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelA[1]/TECPetalCont0F/TECRing5F/TECModule5/TECModule5RphiWafer/TECModule5RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelA[1]/TECPetalCont0F/TECRing6F/TECModule6/TECModule6RphiWafer/TECModule6RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelA[1]/TECPetalCont0B/TECRing0B/TECModule0/TECModule0RphiWafer/TECModule0RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelA[1]/TECPetalCont0B/TECRing0B/TECModule0/TECModule0StereoWafer/TECModule0StereoActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelA[1]/TECPetalCont0B/TECRing1B/TECModule1/TECModule1RphiWafer/TECModule1RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelA[1]/TECPetalCont0B/TECRing1B/TECModule1/TECModule1StereoWafer/TECModule1StereoActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelA[1]/TECPetalCont0B/TECRing2B/TECModule2/TECModule2RphiWafer/TECModule2RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelA[1]/TECPetalCont0B/TECRing3B/TECModule3/TECModule3RphiWafer/TECModule3RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelA[1]/TECPetalCont0B/TECRing4B/TECModule4/TECModule4RphiWafer/TECModule4RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelA[1]/TECPetalCont0B/TECRing4B/TECModule4/TECModule4StereoWafer/TECModule4StereoActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelA[1]/TECPetalCont0B/TECRing5B/TECModule5/TECModule5RphiWafer/TECModule5RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelA[1]/TECPetalCont0B/TECRing6B/TECModule6/TECModule6RphiWafer/TECModule6RphiActive"/>
+      <Parameter name="TrackerRadLength" value="0.0711444"/>
+      <Parameter name="TrackerXi" value="0.000158792"/>
+    </SpecPar>
+    
+    <SpecPar name="TrackerRecMaterialTECDisk2_R20" eval="true">
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelA[2]/TECPetalCont0F/TECRing0F/TECModule0/TECModule0RphiWafer/TECModule0RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelA[2]/TECPetalCont0F/TECRing0F/TECModule0/TECModule0StereoWafer/TECModule0StereoActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelA[2]/TECPetalCont0F/TECRing1F/TECModule1/TECModule1RphiWafer/TECModule1RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelA[2]/TECPetalCont0F/TECRing1F/TECModule1/TECModule1StereoWafer/TECModule1StereoActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelA[2]/TECPetalCont0F/TECRing2F/TECModule2/TECModule2RphiWafer/TECModule2RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelA[2]/TECPetalCont0F/TECRing3F/TECModule3/TECModule3RphiWafer/TECModule3RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelA[2]/TECPetalCont0F/TECRing4F/TECModule4/TECModule4RphiWafer/TECModule4RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelA[2]/TECPetalCont0F/TECRing4F/TECModule4/TECModule4StereoWafer/TECModule4StereoActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelA[2]/TECPetalCont0F/TECRing5F/TECModule5/TECModule5RphiWafer/TECModule5RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelA[2]/TECPetalCont0F/TECRing6F/TECModule6/TECModule6RphiWafer/TECModule6RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelA[2]/TECPetalCont0B/TECRing0B/TECModule0/TECModule0RphiWafer/TECModule0RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelA[2]/TECPetalCont0B/TECRing0B/TECModule0/TECModule0StereoWafer/TECModule0StereoActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelA[2]/TECPetalCont0B/TECRing1B/TECModule1/TECModule1RphiWafer/TECModule1RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelA[2]/TECPetalCont0B/TECRing1B/TECModule1/TECModule1StereoWafer/TECModule1StereoActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelA[2]/TECPetalCont0B/TECRing2B/TECModule2/TECModule2RphiWafer/TECModule2RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelA[2]/TECPetalCont0B/TECRing3B/TECModule3/TECModule3RphiWafer/TECModule3RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelA[2]/TECPetalCont0B/TECRing4B/TECModule4/TECModule4RphiWafer/TECModule4RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelA[2]/TECPetalCont0B/TECRing4B/TECModule4/TECModule4StereoWafer/TECModule4StereoActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelA[2]/TECPetalCont0B/TECRing5B/TECModule5/TECModule5RphiWafer/TECModule5RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelA[2]/TECPetalCont0B/TECRing6B/TECModule6/TECModule6RphiWafer/TECModule6RphiActive"/>
+      <Parameter name="TrackerRadLength" value="0.0536887"/>
+      <Parameter name="TrackerXi" value="0.000121022"/>
+    </SpecPar>
+    
+    <SpecPar name="TrackerRecMaterialTECDisk3" eval="true">
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelB[3]/TECPetalCont3F/TECRing1F/TECModule1/TECModule1RphiWafer/TECModule1RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelB[3]/TECPetalCont3F/TECRing1F/TECModule1/TECModule1StereoWafer/TECModule1StereoActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelB[3]/TECPetalCont3F/TECRing2F/TECModule2/TECModule2RphiWafer/TECModule2RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelB[3]/TECPetalCont3F/TECRing3F/TECModule3/TECModule3RphiWafer/TECModule3RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelB[3]/TECPetalCont3F/TECRing4F/TECModule4/TECModule4RphiWafer/TECModule4RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelB[3]/TECPetalCont3F/TECRing4F/TECModule4/TECModule4StereoWafer/TECModule4StereoActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelB[3]/TECPetalCont3F/TECRing5F/TECModule5/TECModule5RphiWafer/TECModule5RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelB[3]/TECPetalCont3F/TECRing6F/TECModule6/TECModule6RphiWafer/TECModule6RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelB[3]/TECPetalCont3B/TECRing1B/TECModule1/TECModule1RphiWafer/TECModule1RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelB[3]/TECPetalCont3B/TECRing1B/TECModule1/TECModule1StereoWafer/TECModule1StereoActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelB[3]/TECPetalCont3B/TECRing2B/TECModule2/TECModule2RphiWafer/TECModule2RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelB[3]/TECPetalCont3B/TECRing3B/TECModule3/TECModule3RphiWafer/TECModule3RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelB[3]/TECPetalCont3B/TECRing4B/TECModule4/TECModule4RphiWafer/TECModule4RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelB[3]/TECPetalCont3B/TECRing4B/TECModule4/TECModule4StereoWafer/TECModule4StereoActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelB[3]/TECPetalCont3B/TECRing5B/TECModule5/TECModule5RphiWafer/TECModule5RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelB[3]/TECPetalCont3B/TECRing6B/TECModule6/TECModule6RphiWafer/TECModule6RphiActive"/>
+      <Parameter name="TrackerRadLength" value="0.0471239"/>
+      <Parameter name="TrackerXi" value="0.000106928"/>
+    </SpecPar>
+    
+    <SpecPar name="TrackerRecMaterialTECDisk4_R33" eval="true">
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelB[4]/TECPetalCont3F/TECRing1F/TECModule1/TECModule1RphiWafer/TECModule1RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelB[4]/TECPetalCont3F/TECRing1F/TECModule1/TECModule1StereoWafer/TECModule1StereoActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelB[4]/TECPetalCont3F/TECRing2F/TECModule2/TECModule2RphiWafer/TECModule2RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelB[4]/TECPetalCont3F/TECRing3F/TECModule3/TECModule3RphiWafer/TECModule3RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelB[4]/TECPetalCont3F/TECRing4F/TECModule4/TECModule4RphiWafer/TECModule4RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelB[4]/TECPetalCont3F/TECRing4F/TECModule4/TECModule4StereoWafer/TECModule4StereoActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelB[4]/TECPetalCont3F/TECRing5F/TECModule5/TECModule5RphiWafer/TECModule5RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelB[4]/TECPetalCont3F/TECRing6F/TECModule6/TECModule6RphiWafer/TECModule6RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelB[4]/TECPetalCont3B/TECRing1B/TECModule1/TECModule1RphiWafer/TECModule1RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelB[4]/TECPetalCont3B/TECRing1B/TECModule1/TECModule1StereoWafer/TECModule1StereoActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelB[4]/TECPetalCont3B/TECRing2B/TECModule2/TECModule2RphiWafer/TECModule2RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelB[4]/TECPetalCont3B/TECRing3B/TECModule3/TECModule3RphiWafer/TECModule3RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelB[4]/TECPetalCont3B/TECRing4B/TECModule4/TECModule4RphiWafer/TECModule4RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelB[4]/TECPetalCont3B/TECRing4B/TECModule4/TECModule4StereoWafer/TECModule4StereoActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelB[4]/TECPetalCont3B/TECRing5B/TECModule5/TECModule5RphiWafer/TECModule5RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelB[4]/TECPetalCont3B/TECRing6B/TECModule6/TECModule6RphiWafer/TECModule6RphiActive"/>
+      <Parameter name="TrackerRadLength" value="0.0507337"/>
+      <Parameter name="TrackerXi" value="0.000118276"/>
+    </SpecPar>
+    
+    <SpecPar name="TrackerRecMaterialTECDisk5_R33" eval="true">
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheel6[5]/TECPetalCont3F/TECRing1F/TECModule1/TECModule1RphiWafer/TECModule1RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheel6[5]/TECPetalCont3F/TECRing1F/TECModule1/TECModule1StereoWafer/TECModule1StereoActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheel6[5]/TECPetalCont3F/TECRing2F/TECModule2/TECModule2RphiWafer/TECModule2RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheel6[5]/TECPetalCont3F/TECRing3F/TECModule3/TECModule3RphiWafer/TECModule3RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheel6[5]/TECPetalCont3F/TECRing4F/TECModule4/TECModule4RphiWafer/TECModule4RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheel6[5]/TECPetalCont3F/TECRing4F/TECModule4/TECModule4StereoWafer/TECModule4StereoActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheel6[5]/TECPetalCont3F/TECRing5F/TECModule5/TECModule5RphiWafer/TECModule5RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheel6[5]/TECPetalCont3F/TECRing6F/TECModule6/TECModule6RphiWafer/TECModule6RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheel6[5]/TECPetalCont3B/TECRing1B/TECModule1/TECModule1RphiWafer/TECModule1RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheel6[5]/TECPetalCont3B/TECRing1B/TECModule1/TECModule1StereoWafer/TECModule1StereoActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheel6[5]/TECPetalCont3B/TECRing2B/TECModule2/TECModule2RphiWafer/TECModule2RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheel6[5]/TECPetalCont3B/TECRing3B/TECModule3/TECModule3RphiWafer/TECModule3RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheel6[5]/TECPetalCont3B/TECRing4B/TECModule4/TECModule4RphiWafer/TECModule4RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheel6[5]/TECPetalCont3B/TECRing4B/TECModule4/TECModule4StereoWafer/TECModule4StereoActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheel6[5]/TECPetalCont3B/TECRing5B/TECModule5/TECModule5RphiWafer/TECModule5RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheel6[5]/TECPetalCont3B/TECRing6B/TECModule6/TECModule6RphiWafer/TECModule6RphiActive"/>
+      <Parameter name="TrackerRadLength" value="0.0527718"/>
+      <Parameter name="TrackerXi" value="0.000122312"/>
+    </SpecPar>
+    
+    <SpecPar name="TrackerRecMaterialTECDisk6" eval="true">
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelC[6]/TECPetalCont6F/TECRing2F/TECModule2/TECModule2RphiWafer/TECModule2RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelC[6]/TECPetalCont6F/TECRing3F/TECModule3/TECModule3RphiWafer/TECModule3RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelC[6]/TECPetalCont6F/TECRing4F/TECModule4/TECModule4RphiWafer/TECModule4RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelC[6]/TECPetalCont6F/TECRing4F/TECModule4/TECModule4StereoWafer/TECModule4StereoActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelC[6]/TECPetalCont6F/TECRing5F/TECModule5/TECModule5RphiWafer/TECModule5RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelC[6]/TECPetalCont6F/TECRing6F/TECModule6/TECModule6RphiWafer/TECModule6RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelC[6]/TECPetalCont6B/TECRing2B/TECModule2/TECModule2RphiWafer/TECModule2RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelC[6]/TECPetalCont6B/TECRing3B/TECModule3/TECModule3RphiWafer/TECModule3RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelC[6]/TECPetalCont6B/TECRing4B/TECModule4/TECModule4RphiWafer/TECModule4RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelC[6]/TECPetalCont6B/TECRing4B/TECModule4/TECModule4StereoWafer/TECModule4StereoActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelC[6]/TECPetalCont6B/TECRing5B/TECModule5/TECModule5RphiWafer/TECModule5RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelC[6]/TECPetalCont6B/TECRing6B/TECModule6/TECModule6RphiWafer/TECModule6RphiActive"/>
+      <Parameter name="TrackerRadLength" value="0.0470615"/>
+      <Parameter name="TrackerXi" value="0.000105712"/>
+    </SpecPar>
+    
+    <SpecPar name="TrackerRecMaterialTECDisk7_R40" eval="true">
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelC[7]/TECPetalCont6F/TECRing2F/TECModule2/TECModule2RphiWafer/TECModule2RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelC[7]/TECPetalCont6F/TECRing3F/TECModule3/TECModule3RphiWafer/TECModule3RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelC[7]/TECPetalCont6F/TECRing4F/TECModule4/TECModule4RphiWafer/TECModule4RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelC[7]/TECPetalCont6F/TECRing4F/TECModule4/TECModule4StereoWafer/TECModule4StereoActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelC[7]/TECPetalCont6F/TECRing5F/TECModule5/TECModule5RphiWafer/TECModule5RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelC[7]/TECPetalCont6F/TECRing6F/TECModule6/TECModule6RphiWafer/TECModule6RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelC[7]/TECPetalCont6B/TECRing2B/TECModule2/TECModule2RphiWafer/TECModule2RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelC[7]/TECPetalCont6B/TECRing3B/TECModule3/TECModule3RphiWafer/TECModule3RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelC[7]/TECPetalCont6B/TECRing4B/TECModule4/TECModule4RphiWafer/TECModule4RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelC[7]/TECPetalCont6B/TECRing4B/TECModule4/TECModule4StereoWafer/TECModule4StereoActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelC[7]/TECPetalCont6B/TECRing5B/TECModule5/TECModule5RphiWafer/TECModule5RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelC[7]/TECPetalCont6B/TECRing6B/TECModule6/TECModule6RphiWafer/TECModule6RphiActive"/>
+      <Parameter name="TrackerRadLength" value="0.0453539"/>
+      <Parameter name="TrackerXi" value="0.000103887"/>
+    </SpecPar>
+    
+    <SpecPar name="TrackerRecMaterialTECDisk8" eval="true">
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelD[8]/TECPetalCont8F/TECRing3F/TECModule3/TECModule3RphiWafer/TECModule3RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelD[8]/TECPetalCont8F/TECRing4F/TECModule4/TECModule4RphiWafer/TECModule4RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelD[8]/TECPetalCont8F/TECRing4F/TECModule4/TECModule4StereoWafer/TECModule4StereoActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelD[8]/TECPetalCont8F/TECRing5F/TECModule5/TECModule5RphiWafer/TECModule5RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelD[8]/TECPetalCont8F/TECRing6F/TECModule6/TECModule6RphiWafer/TECModule6RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelD[8]/TECPetalCont8B/TECRing3B/TECModule3/TECModule3RphiWafer/TECModule3RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelD[8]/TECPetalCont8B/TECRing4B/TECModule4/TECModule4RphiWafer/TECModule4RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelD[8]/TECPetalCont8B/TECRing4B/TECModule4/TECModule4StereoWafer/TECModule4StereoActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelD[8]/TECPetalCont8B/TECRing5B/TECModule5/TECModule5RphiWafer/TECModule5RphiActive"/>
+      <PartSelector path="//Tracker/TEC/TECWheels/TECWheelD[8]/TECPetalCont8B/TECRing6B/TECModule6/TECModule6RphiWafer/TECModule6RphiActive"/>
+      <Parameter name="TrackerRadLength" value="0.0452548"/>
+      <Parameter name="TrackerXi" value="0.000102518"/>
+    </SpecPar>
+    
+  </SpecParSection>
+</DDDefinition>
diff --git a/Geometry/TrackerSimData/data/PhaseI/Pixel10D/trackerProdCuts.xml b/Geometry/TrackerSimData/data/PhaseI/Pixel10D/trackerProdCuts.xml
new file mode 100644
index 0000000000000..8a31534e37080
--- /dev/null
+++ b/Geometry/TrackerSimData/data/PhaseI/Pixel10D/trackerProdCuts.xml
@@ -0,0 +1,101 @@
+<?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">
+<!--
+Modified for Phase 1 Pixel Forward Geometry
+
+Pratima Jindal, Purdue University Calumet
+July 2009
+
+-->  
+<SpecParSection label="trackerProdCuts.xml" eval="true">
+  <SpecPar name="tracker-dead">
+    <PartSelector path="//Tracker" />
+    <Parameter name="CMSCutsRegion" value="TrackerDeadRegion" eval="false"/>
+    <Parameter name="ProdCutsForElectrons" value="1*mm"/>
+    <Parameter name="ProdCutsForPositrons" value="1*mm"/>
+    <Parameter name="ProdCutsForGamma" value="1*mm"/>
+  </SpecPar>
+  <SpecPar name="tracker-sens">
+    <PartSelector path="//TIBActiveRphi0" />
+    <PartSelector path="//TIBActiveSter0" />
+    <PartSelector path="//TIBActiveRphi2" />
+    <PartSelector path="//TIDModule0RphiActive" />
+    <PartSelector path="//TIDModule0StereoActive" />
+    <PartSelector path="//TIDModule1RphiActive" />
+    <PartSelector path="//TIDModule1StereoActive" />
+    <PartSelector path="//TIDModule2RphiActive" />
+    <PartSelector path="//TOBActiveRphi0" />
+    <PartSelector path="//TOBActiveSter0" />
+    <PartSelector path="//TOBActiveRphi2" />
+    <PartSelector path="//TOBActiveRphi4" />
+    <PartSelector path="//TECModule0RphiActive" />
+    <PartSelector path="//TECModule0StereoActive" />
+    <PartSelector path="//TECModule1RphiActive" />
+    <PartSelector path="//TECModule1StereoActive" />
+    <PartSelector path="//TECModule2RphiActive" />
+    <PartSelector path="//TECModule3RphiActive" />
+    <PartSelector path="//TECModule4RphiActive" />
+    <PartSelector path="//TECModule4StereoActive" />
+    <PartSelector path="//TECModule5RphiActive" />
+    <PartSelector path="//TECModule6RphiActive" />
+    <PartSelector path="//TIBWaferRphi0" />
+    <PartSelector path="//TIBWaferSter0" />
+    <PartSelector path="//TIBWaferRphi2" />
+    <PartSelector path="//TIDModule0RphiWafer" />
+    <PartSelector path="//TIDModule0StereoWafer" />
+    <PartSelector path="//TIDModule1RphiWafer" />
+    <PartSelector path="//TIDModule1StereoWafer" />
+    <PartSelector path="//TIDModule2RphiWafer" />
+    <PartSelector path="//TOBWaferRphi0" />
+    <PartSelector path="//TOBWaferSter0" />
+    <PartSelector path="//TOBWaferRphi2" />
+    <PartSelector path="//TOBWaferRphi4" />
+    <PartSelector path="//TECModule0RphiWafer" />
+    <PartSelector path="//TECModule0StereoWafer" />
+    <PartSelector path="//TECModule1RphiWafer" />
+    <PartSelector path="//TECModule1StereoWafer" />
+    <PartSelector path="//TECModule2RphiWafer" />
+    <PartSelector path="//TECModule3RphiWafer" />
+    <PartSelector path="//TECModule4RphiWafer" />
+    <PartSelector path="//TECModule4StereoWafer" />
+    <PartSelector path="//TECModule5RphiWafer" />
+    <PartSelector path="//TECModule6RphiWafer" />
+    <Parameter name="CMSCutsRegion" value="TrackerSensRegion" 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="tracker-dead-pixel">
+    <PartSelector path="//PixelBarrel" />
+    <PartSelector path="//PixelForward" />
+    <Parameter name="CMSCutsRegion" value="TrackerPixelDeadRegion" eval="false"/>
+    <Parameter name="ProdCutsForElectrons" value="1*mm"/>
+    <Parameter name="ProdCutsForPositrons" value="1*mm"/>
+    <Parameter name="ProdCutsForGamma" value="1*mm"/>
+  </SpecPar>
+
+  <SpecPar name="tracker-sens-pixel">
+    <PartSelector path="//PixelBarrelActiveFull0" />
+    <PartSelector path="//PixelBarrelActiveFull1" />
+    <PartSelector path="//PixelBarrelActiveFull2" />
+    <PartSelector path="//PixelBarrelActiveFull3" />
+    <PartSelector path="//PixelForwardSensor1" />
+    <PartSelector path="//PixelForwardSensor2" />
+    <PartSelector path="//PixelForwardSensor3" />
+    <PartSelector path="//PixelForwardSensor4" />
+    <PartSelector path="//PixelForwardSensor5" />
+    <PartSelector path="//PixelForwardSensor6" />
+    <PartSelector path="//PixelForwardSensor7" />
+    <PartSelector path="//PixelForwardSensor8" />
+    <PartSelector path="//PixelForwardSensor9" />
+    <PartSelector path="//PixelForwardSensor10" />
+    <Parameter name="CMSCutsRegion" value="TrackerPixelSensRegion" eval="false"/>
+    <Parameter name="ProdCutsForElectrons" value="0.01*mm"/>
+    <Parameter name="ProdCutsForPositrons" value="0.01*mm"/>
+    <Parameter name="ProdCutsForGamma" value="0.01*mm"/>
+  </SpecPar>
+
+</SpecParSection>
+</DDDefinition>
+
+
diff --git a/Geometry/TrackerSimData/data/PhaseI/Pixel10D/trackersens.xml b/Geometry/TrackerSimData/data/PhaseI/Pixel10D/trackersens.xml
new file mode 100644
index 0000000000000..3754af08e0073
--- /dev/null
+++ b/Geometry/TrackerSimData/data/PhaseI/Pixel10D/trackersens.xml
@@ -0,0 +1,76 @@
+<?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">
+
+<!--
+
+Modified for Phase 1 Pixel Forward Geometry
+
+Pratima Jindal, Purdue University Calumet
+July 2009
+
+-->
+
+<SpecParSection label="spec-pars.xml">
+  <SpecPar name="ROUHitsTrackerPixelBarrel">
+    <PartSelector path="//PixelBarrelActiveFull0" />
+    <PartSelector path="//PixelBarrelActiveFull1" />
+    <PartSelector path="//PixelBarrelActiveFull2" />
+    <PartSelector path="//PixelBarrelActiveFull3" />
+    <Parameter name="SensitiveDetector" value="TkAccumulatingSensitiveDetector" />
+    <Parameter name="ReadOutName" value="TrackerHitsPixelBarrel" />
+  </SpecPar>
+  <SpecPar name="ROUHitsTrackerPixelEndcap">
+    <PartSelector path="//PixelForwardSensor1" />
+    <PartSelector path="//PixelForwardSensor2" />
+    <PartSelector path="//PixelForwardSensor3" />
+    <PartSelector path="//PixelForwardSensor4" />
+    <PartSelector path="//PixelForwardSensor5" />
+    <PartSelector path="//PixelForwardSensor6" />
+    <PartSelector path="//PixelForwardSensor7" />
+    <PartSelector path="//PixelForwardSensor8" />
+    <PartSelector path="//PixelForwardSensor9" />
+    <PartSelector path="//PixelForwardSensor10" />
+    <Parameter name="SensitiveDetector" value="TkAccumulatingSensitiveDetector" />
+    <Parameter name="ReadOutName" value="TrackerHitsPixelEndcap" />
+  </SpecPar>
+  <SpecPar name="ROUHitsTrackerTIB">
+    <PartSelector path="//TIBActiveRphi0" />
+    <PartSelector path="//TIBActiveSter0" />
+    <PartSelector path="//TIBActiveRphi2" />
+    <Parameter name="SensitiveDetector" value="TkAccumulatingSensitiveDetector" />
+    <Parameter name="ReadOutName" value="TrackerHitsTIB" />
+  </SpecPar>
+  <SpecPar name="ROUHitsTrackerTID">
+     <PartSelector path="//TIDModule0RphiActive" />
+     <PartSelector path="//TIDModule0StereoActive" />
+     <PartSelector path="//TIDModule1RphiActive" />
+     <PartSelector path="//TIDModule1StereoActive" />
+     <PartSelector path="//TIDModule2RphiActive" />
+    <Parameter name="SensitiveDetector" value="TkAccumulatingSensitiveDetector" />
+    <Parameter name="ReadOutName" value="TrackerHitsTID" />
+  </SpecPar>
+  <SpecPar name="ROUHitsTrackerTOB">
+    <PartSelector path="//TOBActiveRphi0" />
+    <PartSelector path="//TOBActiveSter0" />
+    <PartSelector path="//TOBActiveRphi2" />
+    <PartSelector path="//TOBActiveRphi4" />
+    <Parameter name="SensitiveDetector" value="TkAccumulatingSensitiveDetector" />
+    <Parameter name="ReadOutName" value="TrackerHitsTOB" />
+  </SpecPar>
+  <SpecPar name="ROUHitsTrackerTEC">
+    <PartSelector path="//TECModule0RphiActive" />
+    <PartSelector path="//TECModule0StereoActive" />
+    <PartSelector path="//TECModule1RphiActive" />
+    <PartSelector path="//TECModule1StereoActive" />
+    <PartSelector path="//TECModule2RphiActive" />
+    <PartSelector path="//TECModule3RphiActive" />
+    <PartSelector path="//TECModule4RphiActive" />
+    <PartSelector path="//TECModule4StereoActive" />
+    <PartSelector path="//TECModule5RphiActive" />
+    <PartSelector path="//TECModule6RphiActive" />
+    <Parameter name="SensitiveDetector" value="TkAccumulatingSensitiveDetector" />
+    <Parameter name="ReadOutName" value="TrackerHitsTEC" />
+  </SpecPar>
+</SpecParSection>
+</DDDefinition>
+ 
diff --git a/L1Trigger/CSCTrackFinder/test/BuildFile.xml b/L1Trigger/CSCTrackFinder/test/BuildFile.xml
index c324310d1f592..049a28469ae15 100644
--- a/L1Trigger/CSCTrackFinder/test/BuildFile.xml
+++ b/L1Trigger/CSCTrackFinder/test/BuildFile.xml
@@ -19,33 +19,33 @@
 # to generate and test PT and SR LUTs, 
 # please don't remove them
 
-#<library file="analysis/CSCMakeSRLUT.cc" name="CSCMakeSRLUT">
-#     <flags EDM_PLUGIN="1"/>
-#</library>
+###<library file="analysis/CSCMakeSRLUT.cc" name="CSCMakeSRLUT">
+###     <flags EDM_PLUGIN="1"/>
+###</library>
 
-#<library file="analysis/CSCMakePTLUT.cc" name="CSCMakePTLUT">
-#     <flags EDM_PLUGIN="1"/>
-#</library>
+###<library file="analysis/CSCMakePTLUT.cc" name="CSCMakePTLUT">
+###     <flags EDM_PLUGIN="1"/>
+###</library>
 
 #The following plugins require this library to be built
 
-#<library file="src/*.cc" name="CSCTFAnaHelpers">
-#</library>
+###<library file="src/*.cc" name="CSCTFAnaHelpers">
+###</library>
 
-#<library file="analysis/CSCTFEfficiency.cc" name="CSCTFEfficiency">
-#     <flags EDM_PLUGIN="1"/>
-#     <lib name="CSCTFAnaHelpers"/>
-#</library>
+###<library file="analysis/CSCTFEfficiency.cc" name="CSCTFEfficiency">
+###     <flags EDM_PLUGIN="1"/>
+###     <lib name="CSCTFAnaHelpers"/>
+###</library>
 
-#<library file="analysis/LCT*.cc" name="CSCTFLCTAna">
-#     <flags EDM_PLUGIN="1"/>
-#     <lib name="CSCTFAnaHelpers"/>
-#     <use name="DataFormats/Luminosity"/>
-#</library>
+###<library file="analysis/LCT*.cc" name="CSCTFLCTAna">
+###     <flags EDM_PLUGIN="1"/>
+###     <lib name="CSCTFAnaHelpers"/>
+###     <use name="DataFormats/Luminosity"/>
+###</library>
 
-#<library file="analysis/CSCTFFilter.cc" name="CSCTFFilter">
-#     <flags EDM_PLUGIN="1"/>
-#     <lib name="CSCTFAnaHelpers"/>
-#</library>
+###<library file="analysis/CSCTFFilter.cc" name="CSCTFFilter">
+###     <flags EDM_PLUGIN="1"/>
+###     <lib name="CSCTFAnaHelpers"/>
+###</library>
 
 
diff --git a/L1Trigger/CSCTrackFinder/test/src/ResolutionHistogramList.cc b/L1Trigger/CSCTrackFinder/test/src/ResolutionHistogramList.cc
index ba36b86ed6f20..b0eaebfcc8cd9 100644
--- a/L1Trigger/CSCTrackFinder/test/src/ResolutionHistogramList.cc
+++ b/L1Trigger/CSCTrackFinder/test/src/ResolutionHistogramList.cc
@@ -10,9 +10,9 @@ namespace csctf_analysis
 
 	TFileDirectory dir = fs->mkdir(dirname);
 	
-	double maxpt=parameters->getUntrackedParameter<double>("MaxPtHist");
-	double minpt=parameters->getUntrackedParameter<double>("MinPtHist");
-	int ptbins=parameters->getUntrackedParameter<double>("BinsPtHist");
+	// double maxpt=parameters->getUntrackedParameter<double>("MaxPtHist");
+	// double minpt=parameters->getUntrackedParameter<double>("MinPtHist");
+	// int ptbins=parameters->getUntrackedParameter<double>("BinsPtHist");
 
 	
 	PtQ1Res = dir.make<TH1F>("PtQ1Res","Pt Q>=1 Resolution",300,-1.5,1.5);
diff --git a/L1Trigger/CSCTrackFinder/test/src/TFTrack.cc b/L1Trigger/CSCTrackFinder/test/src/TFTrack.cc
index 6a83060609ae9..44c7b196a84f1 100644
--- a/L1Trigger/CSCTrackFinder/test/src/TFTrack.cc
+++ b/L1Trigger/CSCTrackFinder/test/src/TFTrack.cc
@@ -74,7 +74,7 @@ namespace csctf_analysis
     Mode =  track.first.mode();
 
     // To throw an error if the newer fixed L1Track::mode() isn't implemented
-    int AddressEta = track.first.addressEta();
+    //    int AddressEta = track.first.addressEta();
 
     Phi = phi;
     PhiPacked = track.first.localPhi();
diff --git a/L1Trigger/TrackFindingAM/plugins/AMOutputMerger.cc b/L1Trigger/TrackFindingAM/plugins/AMOutputMerger.cc
index 2357a59482baa..50e973ffbba7f 100644
--- a/L1Trigger/TrackFindingAM/plugins/AMOutputMerger.cc
+++ b/L1Trigger/TrackFindingAM/plugins/AMOutputMerger.cc
@@ -186,7 +186,8 @@ void AMOutputMerger::produce( edm::Event& iEvent, const edm::EventSetup& iSetup
 	
 	tempTTPatt.setSector(iterTTTrack->getSector());
 	tempTTPatt.setWedge(iterTTTrack->getWedge());
-
+	tempTTPatt.setMomentum(iterTTTrack->getMomentum());
+	tempTTPatt.setPOCA(iterTTTrack->getPOCA());
 
 	TTTracksForOutput->push_back(tempTTPatt);
       }
diff --git a/L1Trigger/TrackFindingAM/test/batch/AMPR.csh b/L1Trigger/TrackFindingAM/test/batch/AMPR.csh
index 7e358e41c6686..754bfa8851302 100755
--- a/L1Trigger/TrackFindingAM/test/batch/AMPR.csh
+++ b/L1Trigger/TrackFindingAM/test/batch/AMPR.csh
@@ -96,7 +96,7 @@ lfc-mkdir $OUTDIR
 
 # We loop over the data directory in order to find all the files to process
 
-foreach l (`lcg-ls $INDIR_GRID/ | cut -d/ -f15`) 
+foreach l (`lcg-ls $INDIR_GRID | cut -d/ -f15`) 
 	    
     @ i = 0
     @ j = $NPFILE
@@ -143,7 +143,7 @@ foreach l (`lcg-ls $INDIR_GRID/ | cut -d/ -f15`)
 	    continue
 	endif
 
-        foreach k (`ls $BANKDIR | grep _sec`) 
+        foreach k (`\ls $BANKDIR | grep _sec`) 
 
 	    # By default, for CMSSW, we loop over all available bank in the directory provided
 	    echo 'Working with bank file '$k
@@ -162,7 +162,7 @@ foreach l (`lcg-ls $INDIR_GRID/ | cut -d/ -f15`)
 	    
 	    if ($deal == "0") then
 
-		set running = `ls fpr_job_$OUTS1.sh | wc -l`
+		set running = `\ls fpr_job_$OUTS1.sh | wc -l`
 
 		if ($running == "0") then
 
@@ -191,7 +191,7 @@ foreach l (`lcg-ls $INDIR_GRID/ | cut -d/ -f15`)
 	    # If not process the file
 	    if ($dealm == "0") then
 
-		set running = `ls merge_job_${MATTER}_${i}_${j}.sh | wc -l`
+		set running = `\ls merge_job_${MATTER}_${i}_${j}.sh | wc -l`
 
 		if ($running == "0") then
 
@@ -219,12 +219,14 @@ foreach l (`lcg-ls $INDIR_GRID/ | cut -d/ -f15`)
     # file have been processed. Then launch the final merging 
     # 
 
+    echo $processed,$section
+
     if ($processed == $section) then
 
         # If not process the file
         if ($dealf == "0") then
 
-	    set running = `ls final_job_${MATTER}.sh | wc -l`
+	    set running = `\ls final_job_${MATTER}.sh | wc -l`
 
 	    if ($running == "0") then
 
diff --git a/L1Trigger/TrackFindingAM/test/extract_AM_info.py b/L1Trigger/TrackFindingAM/test/extract_AM_info.py
index 36f11e212610c..e315e9b577ebf 100644
--- a/L1Trigger/TrackFindingAM/test/extract_AM_info.py
+++ b/L1Trigger/TrackFindingAM/test/extract_AM_info.py
@@ -1,21 +1,23 @@
 #########
 #
-# Example script to run the python extractor on MC events
-# produced with the full geometry and official software
+# Example script to run the extractor on events containing
+# the L1 tracking info produced with the full geometry
+# and official software
 #
-# This script extract the AM pattern reco output
+# This script extract the AM pattern reco output just the pattern 
+# info or the full stuff if available
 #
 # Usage: cmsRun extract_AM_info.py
 #
 # More info:
-# http://sviret.web.cern.ch/sviret/Welcome.php?n=CMS.HLLHCTuto
+# http://sviret.web.cern.ch/sviret/Welcome.php?n=CMS.HLLHCTuto620
 #
-# Look at STEP V
+# Look at part 6.2.1 of the tutorial
 #
 # Author: S.Viret (viret@in2p3.fr)
-# Date  : 17/02/2014
+# Date  : 27/02/2014
 #
-# Script tested with release CMSSW_6_2_0_SLHC7
+# Script tested with release CMSSW_6_2_0_SLHC8
 #
 #########
 
@@ -64,10 +66,12 @@
 process.MIBextraction.doMatch          = True
 process.MIBextraction.doMC             = True
 process.MIBextraction.doSTUB           = True
-process.MIBextraction.CLUS_container   = cms.string( "MergePROutput" )
-process.MIBextraction.STUB_container   = cms.string( "MergePROutput" )
-process.MIBextraction.CLUS_name        = cms.string( "ClusInPattern" ) 
-process.MIBextraction.STUB_name        = cms.string( "StubInPattern" )
+process.MIBextraction.doL1TRK          = True
+process.MIBextraction.L1pattern_tag    = cms.InputTag( "MergePROutput", "AML1Patterns")
+
+# Choose the first line if you have only the patterns 
+process.MIBextraction.L1track_tag      = cms.InputTag( "", "")
+#process.MIBextraction.L1track_tag      = cms.InputTag( "MergeFITOutput", "AML1Tracks")
 
 process.p = cms.Path(process.MIBextraction)
 
diff --git a/SLHCUpgradeSimulations/Configuration/python/HCalCustoms.py b/SLHCUpgradeSimulations/Configuration/python/HCalCustoms.py
index c85d5f0eb2f34..2bb73753baa0a 100644
--- a/SLHCUpgradeSimulations/Configuration/python/HCalCustoms.py
+++ b/SLHCUpgradeSimulations/Configuration/python/HCalCustoms.py
@@ -69,6 +69,20 @@ def customise_HcalPhase1(process):
     process=customise_condOverRides(process)
     return process
 
+def customise_HcalPhase2(process):
+    process = customise_HcalPhase1(process)
+    if hasattr(process,'digitisation_step') and hasattr(process, 'mix'):
+        process.mix.digitizers.hcal.he.photoelectronsToAnalog = cms.vdouble([10.]*29)
+        etaIndex = 21-16 #start at ieta 21 but subtract off the 15 in hb plus 1 for zero indexing
+        while len(process.mix.digitizers.hcal.he.samplingFactors) < 29:
+            sf_now = process.mix.digitizers.hcal.he.samplingFactors[etaIndex]
+            if etaIndex+1 < len(process.mix.digitizers.hcal.he.samplingFactors):
+                process.mix.digitizers.hcal.he.samplingFactors.insert(etaIndex+1, sf_now)
+            else:
+                process.mix.digitizers.hcal.he.samplingFactors.extend([sf_now]*(29-etaIndex-1))
+            etaIndex += 2
+        # print len(process.mix.digitizers.hcal.he.samplingFactors),process.mix.digitizers.hcal.he.samplingFactors
+    return process
 
 def customise_Sim(process):
     process.g4SimHits.HCalSD.TestNumberingScheme = True
@@ -95,8 +109,7 @@ def customise_Digi(process):
         process.mix.digitizers.hcal.he.pixels = cms.int32(4500*4*2)
         process.mix.digitizers.hcal.HFUpgradeQIE = True
         process.mix.digitizers.hcal.HcalReLabel.RelabelHits=cms.untracked.bool(True)
-        process.mix.digitizers.hcal.doTimeSlew = False 
-
+        process.mix.digitizers.hcal.doTimeSlew = False
     if hasattr(process,'simHcalDigis'):
         process.simHcalDigis.useConfigZSvalues=cms.int32(1)
         process.simHcalDigis.HBlevel=cms.int32(16)
diff --git a/SLHCUpgradeSimulations/Configuration/python/combinedCustoms.py b/SLHCUpgradeSimulations/Configuration/python/combinedCustoms.py
index e5e1251d4dc55..bafd974f0cac4 100644
--- a/SLHCUpgradeSimulations/Configuration/python/combinedCustoms.py
+++ b/SLHCUpgradeSimulations/Configuration/python/combinedCustoms.py
@@ -12,7 +12,8 @@
 from SLHCUpgradeSimulations.Configuration.phase2TkCustoms_LB_4LPS_2L2S import l1EventContent as customise_ev_LB4LPS_2L2S
 from SLHCUpgradeSimulations.Configuration.customise_mixing import customise_NoCrossing
 from SLHCUpgradeSimulations.Configuration.phase1TkCustoms import customise as customisePhase1Tk
-from SLHCUpgradeSimulations.Configuration.HCalCustoms import customise_HcalPhase1, customise_HcalPhase0
+from SLHCUpgradeSimulations.Configuration.phase1TkCustomsPixel10D import customise as customisePhase1TkPixel10D
+from SLHCUpgradeSimulations.Configuration.HCalCustoms import customise_HcalPhase1, customise_HcalPhase0, customise_HcalPhase2
 from SLHCUpgradeSimulations.Configuration.gemCustoms import customise as customise_gem
 from SLHCUpgradeSimulations.Configuration.me0Customs import customise as customise_me0
 from SLHCUpgradeSimulations.Configuration.fastsimCustoms import customiseDefault as fastCustomiseDefault
@@ -22,24 +23,30 @@
 
 import SLHCUpgradeSimulations.Configuration.aging as aging
 
+def cust_phase1_Pixel10D(process):
+    process=customisePostLS1(process)
+    process=customisePhase1TkPixel10D(process)
+    process=customise_HcalPhase1(process)
+    return process 
+
 def cust_phase2_BE5DPixel10D(process):
     process=customisePostLS1(process)
     process=customiseBE5DPixel10D(process)
-    process=customise_HcalPhase1(process)
+    process=customise_HcalPhase2(process)
     process=customise_ev_BE5DPixel10D(process)
     return process
 
 def cust_phase2_BE5D(process):
     process=customisePostLS1(process)
     process=customiseBE5D(process)
-    process=customise_HcalPhase1(process)
+    process=customise_HcalPhase2(process)
     process=customise_ev_BE5D(process)
     return process
 
 def cust_phase2_BE(process):
     process=customisePostLS1(process)
     process=customiseBE(process)
-    process=customise_HcalPhase1(process)
+    process=customise_HcalPhase2(process)
     process=customise_ev_BE(process)
     return process
 
@@ -77,7 +84,7 @@ def cust_2019WithGem(process):
 def cust_2023(process):
     process=customisePostLS1(process)
     process=customiseBE5D(process)
-    process=customise_HcalPhase1(process)
+    process=customise_HcalPhase2(process)
     process=customise_ev_BE5D(process)
     process=customise_gem(process)
     process=CustomiseValidation_NoGem_2023(process)
@@ -86,7 +93,7 @@ def cust_2023(process):
 def cust_2023Muon(process):
     process=customisePostLS1(process)
     process=customiseBE5DPixel10D(process)
-    process=customise_HcalPhase1(process)
+    process=customise_HcalPhase2(process)
     process=customise_ev_BE5DPixel10D(process)
     process=customise_gem(process)
     process=CustomiseValidation_NoGem_2023(process)
diff --git a/SLHCUpgradeSimulations/Configuration/python/phase1TkCustomsPixel10D.py b/SLHCUpgradeSimulations/Configuration/python/phase1TkCustomsPixel10D.py
new file mode 100644
index 0000000000000..f87db49179012
--- /dev/null
+++ b/SLHCUpgradeSimulations/Configuration/python/phase1TkCustomsPixel10D.py
@@ -0,0 +1,293 @@
+import FWCore.ParameterSet.Config as cms
+
+from RecoTracker.IterativeTracking.iterativeTk_cff import *
+from RecoTracker.IterativeTracking.ElectronSeeds_cff import *
+from SLHCUpgradeSimulations.Configuration.customise_mixing import customise_pixelMixing_PU
+
+def customise(process):
+    if hasattr(process,'DigiToRaw'):
+        process=customise_DigiToRaw(process)
+    if hasattr(process,'RawToDigi'):
+        process=customise_RawToDigi(process)
+    n=0
+    if hasattr(process,'reconstruction') or hasattr(process,'dqmoffline_step'):
+        if hasattr(process,'mix'): 
+            if hasattr(process.mix,'input'):
+                n=process.mix.input.nbPileupEvents.averageNumber.value()
+        else:
+            print 'phase1TkCustoms requires a --pileup option to cmsDriver to run the reconstruction/dqm'
+            print 'Please provide one!'
+            sys.exit(1)
+    if hasattr(process,'reconstruction'):
+        process=customise_Reco(process,float(n))
+                
+    if hasattr(process,'digitisation_step'):
+        process=customise_Digi(process)
+    if hasattr(process,'dqmoffline_step'):
+        process=customise_DQM(process,n)
+    if hasattr(process,'dqmHarvesting'):
+        process=customise_harvesting(process)
+    if hasattr(process,'validation_step'):
+        process=customise_Validation(process,float(n))
+    process=customise_condOverRides(process)
+    
+    return process
+
+def customise_DigiToRaw(process):
+    process.digi2raw_step.remove(process.siPixelRawData)
+    process.digi2raw_step.remove(process.castorRawData)
+    return process
+
+def customise_RawToDigi(process):
+    process.raw2digi_step.remove(process.siPixelDigis)
+    process.raw2digi_step.remove(process.castorDigis)
+    return process
+
+def customise_Digi(process):
+    process.mix.digitizers.pixel.MissCalibrate = False
+    process.mix.digitizers.pixel.LorentzAngle_DB = False
+    process.mix.digitizers.pixel.killModules = False
+    process.mix.digitizers.pixel.useDB = False
+    process.mix.digitizers.pixel.DeadModules_DB = False
+    process.mix.digitizers.pixel.NumPixelBarrel = cms.int32(4)
+    process.mix.digitizers.pixel.NumPixelEndcap = cms.int32(10)
+    process.mix.digitizers.pixel.ThresholdInElectrons_FPix = cms.double(2000.0)
+    process.mix.digitizers.pixel.ThresholdInElectrons_BPix = cms.double(2000.0)
+    process.mix.digitizers.pixel.ThresholdInElectrons_BPix_L1 = cms.double(2000.0)
+    process.mix.digitizers.pixel.thePixelColEfficiency_BPix4 = cms.double(0.999)
+    process.mix.digitizers.pixel.thePixelEfficiency_BPix4 = cms.double(0.999)
+    process.mix.digitizers.pixel.thePixelChipEfficiency_BPix4 = cms.double(0.999)
+    process.mix.digitizers.pixel.thePixelColEfficiency_FPix3 = cms.double(0.999)
+    process.mix.digitizers.pixel.thePixelEfficiency_FPix3 = cms.double(0.999)
+    process.mix.digitizers.pixel.thePixelChipEfficiency_FPix3 = cms.double(0.999)
+    process.mix.digitizers.pixel.AddPixelInefficiencyFromPython = cms.bool(True)
+
+    process=customise_pixelMixing_PU(process)
+    return process
+
+
+# DQM steps change
+def customise_DQM(process,pileup):
+    # We cut down the number of iterative tracking steps
+    process.dqmoffline_step.remove(process.muonAnalyzer)
+    process.dqmoffline_step.remove(process.jetMETAnalyzer)
+
+    #put isUpgrade flag==true
+    process.SiPixelRawDataErrorSource.isUpgrade = cms.untracked.bool(True)
+    process.SiPixelDigiSource.isUpgrade = cms.untracked.bool(True)
+    process.SiPixelClusterSource.isUpgrade = cms.untracked.bool(True)
+    process.SiPixelRecHitSource.isUpgrade = cms.untracked.bool(True)
+    process.SiPixelTrackResidualSource.isUpgrade = cms.untracked.bool(True)
+    process.SiPixelHitEfficiencySource.isUpgrade = cms.untracked.bool(True)
+
+    from DQM.TrackingMonitor.customizeTrackingMonitorSeedNumber import customise_trackMon_IterativeTracking_PHASE1PU140
+    from DQM.TrackingMonitor.customizeTrackingMonitorSeedNumber import customise_trackMon_IterativeTracking_PHASE1PU70
+
+    if pileup>100:
+        process=customise_trackMon_IterativeTracking_PHASE1PU140(process)
+    else:
+        process=customise_trackMon_IterativeTracking_PHASE1PU70(process)
+    return process
+
+def customise_Validation(process,pileup):
+    process.validation_step.remove(process.PixelTrackingRecHitsValid)
+    # We don't run the HLT
+    process.validation_step.remove(process.HLTSusyExoVal)
+    process.validation_step.remove(process.hltHiggsValidator)
+    process.validation_step.remove(process.relvalMuonBits)
+    if pileup>30:
+        process.trackValidator.label=cms.VInputTag(cms.InputTag("cutsRecoTracksHp"))
+        process.tracksValidationSelectors = cms.Sequence(process.cutsRecoTracksHp)
+        process.globalValidation.remove(process.recoMuonValidation)
+        process.validation.remove(process.recoMuonValidation)
+        process.validation_preprod.remove(process.recoMuonValidation)
+        process.validation_step.remove(process.recoMuonValidation)
+        process.validation.remove(process.globalrechitsanalyze)
+        process.validation_prod.remove(process.globalrechitsanalyze)
+        process.validation_step.remove(process.globalrechitsanalyze)
+        process.validation.remove(process.stripRecHitsValid)
+        process.validation_step.remove(process.stripRecHitsValid)
+        process.validation_step.remove(process.StripTrackingRecHitsValid)
+        process.globalValidation.remove(process.vertexValidation)
+        process.validation.remove(process.vertexValidation)
+        process.validation_step.remove(process.vertexValidation)
+        process.mix.input.nbPileupEvents.averageNumber = cms.double(0.0)
+        process.mix.minBunch = cms.int32(0)
+        process.mix.maxBunch = cms.int32(0)
+
+    return process
+
+def customise_harvesting(process):
+    process.dqmHarvesting.remove(process.jetMETDQMOfflineClient)
+    process.dqmHarvesting.remove(process.dataCertificationJetMET)
+    #######process.dqmHarvesting.remove(process.sipixelEDAClient)
+    process.sipixelEDAClient.isUpgrade = cms.untracked.bool(True)
+    process.dqmHarvesting.remove(process.sipixelCertification)
+    return (process)        
+
+def customise_condOverRides(process):
+    process.load('SLHCUpgradeSimulations.Geometry.fakeConditions_Phase1Pixel10D_cff')
+    process.trackerTopologyConstants.pxb_layerStartBit = cms.uint32(20)
+    process.trackerTopologyConstants.pxb_ladderStartBit = cms.uint32(12)
+    process.trackerTopologyConstants.pxb_moduleStartBit = cms.uint32(2)
+    process.trackerTopologyConstants.pxb_layerMask = cms.uint32(15)
+    process.trackerTopologyConstants.pxb_ladderMask = cms.uint32(255)
+    process.trackerTopologyConstants.pxb_moduleMask = cms.uint32(1023)
+    process.trackerTopologyConstants.pxf_diskStartBit = cms.uint32(18)
+    process.trackerTopologyConstants.pxf_bladeStartBit = cms.uint32(12)
+    process.trackerTopologyConstants.pxf_panelStartBit = cms.uint32(10)
+    process.trackerTopologyConstants.pxf_moduleMask = cms.uint32(255)
+    return process
+
+def add_detailed_pixel_dqm(process):
+    #enable modOn
+    process.SiPixelRawDataErrorSource.modOn = cms.untracked.bool(True)
+    process.SiPixelDigiSource.modOn = cms.untracked.bool(True)
+    process.SiPixelClusterSource.modOn = cms.untracked.bool(True)
+    process.SiPixelRecHitSource.modOn = cms.untracked.bool(True)
+    process.SiPixelTrackResidualSource.modOn = cms.untracked.bool(True)
+    process.SiPixelHitEfficiencySource.modOn = cms.untracked.bool(True)
+
+    return process
+
+
+def remove_pixel_ineff(process):
+    if hasattr(process,'mix'):
+        process.mix.digitizers.pixel.AddPixelInefficiencyFromPython = cms.bool(False) 
+
+    return process
+    
+
+def customise_Reco(process,pileup):
+
+    #this code supports either 70 or 140 pileup configurations - should fix as to support 0
+    nPU=70
+    if pileup>100: nPU=140
+    
+    #use with latest pixel geometry
+    process.ClusterShapeHitFilterESProducer.PixelShapeFile = cms.string('RecoPixelVertexing/PixelLowPtUtilities/data/pixelShape_Phase1Tk.par')
+    # Need this line to stop error about missing siPixelDigis.
+    process.MeasurementTracker.inactivePixelDetectorLabels = cms.VInputTag()
+
+    # new layer list (3/4 pixel seeding) in InitialStep and pixelTracks
+    process.pixellayertriplets.layerList = cms.vstring( 'BPix1+BPix2+BPix3',
+                                                        'BPix2+BPix3+BPix4',
+                                                        'BPix1+BPix3+BPix4',
+                                                        'BPix1+BPix2+BPix4',
+                                                        'BPix2+BPix3+FPix1_pos',
+                                                        'BPix2+BPix3+FPix1_neg',
+                                                        'BPix1+BPix2+FPix1_pos',
+                                                        'BPix1+BPix2+FPix1_neg',
+                                                        'BPix2+FPix1_pos+FPix2_pos',
+                                                        'BPix2+FPix1_neg+FPix2_neg',
+                                                        'BPix1+FPix1_pos+FPix2_pos',
+                                                        'BPix1+FPix1_neg+FPix2_neg',
+                                                        'FPix1_pos+FPix2_pos+FPix3_pos',
+                                                        'FPix1_neg+FPix2_neg+FPix3_neg',
+                                                        # ale
+                                                        'BPix1+FPix1_pos+FPix3_pos',
+                                                        'BPix1+FPix1_neg+FPix3_neg',
+                                                        'BPix1+FPix2_pos+FPix3_pos',
+                                                        'BPix1+FPix2_neg+FPix3_neg',
+                                                        'BPix1+FPix3_pos+FPix4_pos',
+                                                        'BPix1+FPix3_neg+FPix4_neg',
+                                                        'FPix3_pos+FPix4_pos+FPix5_pos',
+                                                        'FPix3_neg+FPix4_neg+FPix5_neg',
+                                                        'FPix4_pos+FPix5_pos+FPix6_pos',
+                                                        'FPix4_neg+FPix5_neg+FPix6_neg',
+                                                        'FPix5_pos+FPix6_pos+FPix7_pos',
+                                                        'FPix5_neg+FPix6_neg+FPix7_neg',
+                                                        'FPix6_pos+FPix7_pos+FPix9_pos',
+                                                        'FPix6_neg+FPix7_neg+FPix9_neg',
+                                                        'FPix6_pos+FPix7_pos+FPix10_pos',
+                                                        'FPix6_neg+FPix7_neg+FPix10_neg',
+                                                        'FPix7_pos+FPix9_pos+FPix10_pos',
+                                                        'FPix7_neg+FPix9_neg+FPix10_neg'
+                                                        )
+
+    # New tracking.  This is really ugly because it redefines globalreco and reconstruction.
+    # It can be removed if change one line in Configuration/StandardSequences/python/Reconstruction_cff.py
+    # from RecoTracker_cff.py to RecoTrackerPhase1PU140_cff.py
+
+    # remove all the tracking first
+    itIndex=process.globalreco.index(process.trackingGlobalReco)
+    grIndex=process.reconstruction.index(process.globalreco)
+
+    process.reconstruction.remove(process.globalreco)
+    process.globalreco.remove(process.iterTracking)
+    process.globalreco.remove(process.electronSeedsSeq)
+    process.reconstruction_fromRECO.remove(process.trackingGlobalReco)
+    del process.iterTracking
+    del process.ckftracks
+    del process.ckftracks_woBH
+    del process.ckftracks_wodEdX
+    del process.ckftracks_plus_pixelless
+    del process.trackingGlobalReco
+    del process.electronSeedsSeq
+    del process.InitialStep
+    del process.LowPtTripletStep
+    del process.PixelPairStep
+    del process.DetachedTripletStep
+    del process.MixedTripletStep
+    del process.PixelLessStep
+    del process.TobTecStep
+    del process.earlyGeneralTracks
+    del process.ConvStep
+    # add the correct tracking back in
+    process.load("RecoTracker.Configuration.RecoTrackerPhase1PU"+str(nPU)+"_cff")
+
+    process.globalreco.insert(itIndex,process.trackingGlobalReco)
+    process.reconstruction.insert(grIndex,process.globalreco)
+    #Note process.reconstruction_fromRECO is broken
+    
+    # End of new tracking configuration which can be removed if new Reconstruction is used.
+
+
+    process.reconstruction.remove(process.castorreco)
+    process.reconstruction.remove(process.CastorTowerReco)
+    process.reconstruction.remove(process.ak7BasicJets)
+    process.reconstruction.remove(process.ak7CastorJetID)
+
+    #the quadruplet merger configuration     
+    process.load("RecoPixelVertexing.PixelTriplets.quadrupletseedmerging_cff")
+    process.pixelseedmergerlayers.BPix.TTRHBuilder = cms.string("PixelTTRHBuilderWithoutAngle" )
+    process.pixelseedmergerlayers.BPix.HitProducer = cms.string("siPixelRecHits" )
+    process.pixelseedmergerlayers.FPix.TTRHBuilder = cms.string("PixelTTRHBuilderWithoutAngle" )
+    process.pixelseedmergerlayers.FPix.HitProducer = cms.string("siPixelRecHits" )    
+    
+    # Need these until pixel templates are used
+    process.load("SLHCUpgradeSimulations.Geometry.recoFromSimDigis_cff")
+    # PixelCPEGeneric #
+    process.PixelCPEGenericESProducer.Upgrade = cms.bool(True)
+    process.PixelCPEGenericESProducer.UseErrorsFromTemplates = cms.bool(False)
+    process.PixelCPEGenericESProducer.LoadTemplatesFromDB = cms.bool(False)
+    process.PixelCPEGenericESProducer.TruncatePixelCharge = cms.bool(False)
+    process.PixelCPEGenericESProducer.IrradiationBiasCorrection = False
+    process.PixelCPEGenericESProducer.DoCosmics = False
+    # CPE for other steps
+    process.siPixelRecHits.CPE = cms.string('PixelCPEGeneric')
+    # Turn of template use in tracking (iterative steps handled inside their configs)
+    process.mergedDuplicateTracks.TTRHBuilder = 'WithTrackAngle'
+    process.ctfWithMaterialTracks.TTRHBuilder = 'WithTrackAngle'
+    process.muonSeededSeedsInOut.TrackerRecHitBuilder=cms.string('WithTrackAngle')
+    process.muonSeededTracksInOut.TTRHBuilder=cms.string('WithTrackAngle')
+    process.muonSeededTracksOutIn.TTRHBuilder=cms.string('WithTrackAngle')
+    process.muons1stStep.TrackerKinkFinderParameters.TrackerRecHitBuilder=cms.string('WithTrackAngle')
+    process.regionalCosmicTracks.TTRHBuilder=cms.string('WithTrackAngle')
+    process.cosmicsVetoTracksRaw.TTRHBuilder=cms.string('WithTrackAngle')
+    # End of pixel template needed section
+    
+    # Make pixelTracks use quadruplets
+    process.pixelTracks.SeedMergerPSet = cms.PSet(
+        layerListName = cms.string('PixelSeedMergerQuadruplets'),
+        addRemainingTriplets = cms.bool(False),
+        mergeTriplets = cms.bool(True),
+        ttrhBuilderLabel = cms.string('PixelTTRHBuilderWithoutAngle')
+        )
+    process.pixelTracks.FilterPSet.chi2 = cms.double(50.0)
+    process.pixelTracks.FilterPSet.tipMax = cms.double(0.05)
+    process.pixelTracks.RegionFactoryPSet.RegionPSet.originRadius =  cms.double(0.02)
+
+
+
+    return process
diff --git a/SLHCUpgradeSimulations/Configuration/python/phase2TkCustomsBE5DPixel10D.py b/SLHCUpgradeSimulations/Configuration/python/phase2TkCustomsBE5DPixel10D.py
index 9667d82402656..092e8f22905cf 100644
--- a/SLHCUpgradeSimulations/Configuration/python/phase2TkCustomsBE5DPixel10D.py
+++ b/SLHCUpgradeSimulations/Configuration/python/phase2TkCustomsBE5DPixel10D.py
@@ -92,7 +92,7 @@ def customise_Reco(process,pileup):
                                                         'BPix1+FPix1_pos+FPix2_pos',
                                                         'BPix1+FPix1_neg+FPix2_neg',
                                                         'FPix1_pos+FPix2_pos+FPix3_pos',
-                                                        'FPix1_neg+FPix2_neg+FPix3_neg'
+                                                        'FPix1_neg+FPix2_neg+FPix3_neg',
                                                         # ale
                                                         'BPix1+FPix1_pos+FPix3_pos',
                                                         'BPix1+FPix1_neg+FPix3_neg',
diff --git a/SLHCUpgradeSimulations/Geometry/data/PhaseI/Pixel10D/EmptyPixelSkimmedGeometry.txt b/SLHCUpgradeSimulations/Geometry/data/PhaseI/Pixel10D/EmptyPixelSkimmedGeometry.txt
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/SLHCUpgradeSimulations/Geometry/data/PhaseI/Pixel10D/PixelSkimmedGeometry.txt b/SLHCUpgradeSimulations/Geometry/data/PhaseI/Pixel10D/PixelSkimmedGeometry.txt
new file mode 100644
index 0000000000000..99d6a26e35af8
--- /dev/null
+++ b/SLHCUpgradeSimulations/Geometry/data/PhaseI/Pixel10D/PixelSkimmedGeometry.txt
@@ -0,0 +1,3160 @@
+303042564 416 160
+303042568 416 160
+303042572 416 160
+303042576 416 160
+303042580 416 160
+303042584 416 160
+303042588 416 160
+303042592 416 160
+303046660 416 160
+303046664 416 160
+303046668 416 160
+303046672 416 160
+303046676 416 160
+303046680 416 160
+303046684 416 160
+303046688 416 160
+303050756 416 160
+303050760 416 160
+303050764 416 160
+303050768 416 160
+303050772 416 160
+303050776 416 160
+303050780 416 160
+303050784 416 160
+303054852 416 160
+303054856 416 160
+303054860 416 160
+303054864 416 160
+303054868 416 160
+303054872 416 160
+303054876 416 160
+303054880 416 160
+303058948 416 160
+303058952 416 160
+303058956 416 160
+303058960 416 160
+303058964 416 160
+303058968 416 160
+303058972 416 160
+303058976 416 160
+303063044 416 160
+303063048 416 160
+303063052 416 160
+303063056 416 160
+303063060 416 160
+303063064 416 160
+303063068 416 160
+303063072 416 160
+303067140 416 160
+303067144 416 160
+303067148 416 160
+303067152 416 160
+303067156 416 160
+303067160 416 160
+303067164 416 160
+303067168 416 160
+303071236 416 160
+303071240 416 160
+303071244 416 160
+303071248 416 160
+303071252 416 160
+303071256 416 160
+303071260 416 160
+303071264 416 160
+303075332 416 160
+303075336 416 160
+303075340 416 160
+303075344 416 160
+303075348 416 160
+303075352 416 160
+303075356 416 160
+303075360 416 160
+303079428 416 160
+303079432 416 160
+303079436 416 160
+303079440 416 160
+303079444 416 160
+303079448 416 160
+303079452 416 160
+303079456 416 160
+303083524 416 160
+303083528 416 160
+303083532 416 160
+303083536 416 160
+303083540 416 160
+303083544 416 160
+303083548 416 160
+303083552 416 160
+303087620 416 160
+303087624 416 160
+303087628 416 160
+303087632 416 160
+303087636 416 160
+303087640 416 160
+303087644 416 160
+303087648 416 160
+304091140 416 160
+304091144 416 160
+304091148 416 160
+304091152 416 160
+304091156 416 160
+304091160 416 160
+304091164 416 160
+304091168 416 160
+304095236 416 160
+304095240 416 160
+304095244 416 160
+304095248 416 160
+304095252 416 160
+304095256 416 160
+304095260 416 160
+304095264 416 160
+304099332 416 160
+304099336 416 160
+304099340 416 160
+304099344 416 160
+304099348 416 160
+304099352 416 160
+304099356 416 160
+304099360 416 160
+304103428 416 160
+304103432 416 160
+304103436 416 160
+304103440 416 160
+304103444 416 160
+304103448 416 160
+304103452 416 160
+304103456 416 160
+304107524 416 160
+304107528 416 160
+304107532 416 160
+304107536 416 160
+304107540 416 160
+304107544 416 160
+304107548 416 160
+304107552 416 160
+304111620 416 160
+304111624 416 160
+304111628 416 160
+304111632 416 160
+304111636 416 160
+304111640 416 160
+304111644 416 160
+304111648 416 160
+304115716 416 160
+304115720 416 160
+304115724 416 160
+304115728 416 160
+304115732 416 160
+304115736 416 160
+304115740 416 160
+304115744 416 160
+304119812 416 160
+304119816 416 160
+304119820 416 160
+304119824 416 160
+304119828 416 160
+304119832 416 160
+304119836 416 160
+304119840 416 160
+304123908 416 160
+304123912 416 160
+304123916 416 160
+304123920 416 160
+304123924 416 160
+304123928 416 160
+304123932 416 160
+304123936 416 160
+304128004 416 160
+304128008 416 160
+304128012 416 160
+304128016 416 160
+304128020 416 160
+304128024 416 160
+304128028 416 160
+304128032 416 160
+304132100 416 160
+304132104 416 160
+304132108 416 160
+304132112 416 160
+304132116 416 160
+304132120 416 160
+304132124 416 160
+304132128 416 160
+304136196 416 160
+304136200 416 160
+304136204 416 160
+304136208 416 160
+304136212 416 160
+304136216 416 160
+304136220 416 160
+304136224 416 160
+304140292 416 160
+304140296 416 160
+304140300 416 160
+304140304 416 160
+304140308 416 160
+304140312 416 160
+304140316 416 160
+304140320 416 160
+304144388 416 160
+304144392 416 160
+304144396 416 160
+304144400 416 160
+304144404 416 160
+304144408 416 160
+304144412 416 160
+304144416 416 160
+304148484 416 160
+304148488 416 160
+304148492 416 160
+304148496 416 160
+304148500 416 160
+304148504 416 160
+304148508 416 160
+304148512 416 160
+304152580 416 160
+304152584 416 160
+304152588 416 160
+304152592 416 160
+304152596 416 160
+304152600 416 160
+304152604 416 160
+304152608 416 160
+304156676 416 160
+304156680 416 160
+304156684 416 160
+304156688 416 160
+304156692 416 160
+304156696 416 160
+304156700 416 160
+304156704 416 160
+304160772 416 160
+304160776 416 160
+304160780 416 160
+304160784 416 160
+304160788 416 160
+304160792 416 160
+304160796 416 160
+304160800 416 160
+304164868 416 160
+304164872 416 160
+304164876 416 160
+304164880 416 160
+304164884 416 160
+304164888 416 160
+304164892 416 160
+304164896 416 160
+304168964 416 160
+304168968 416 160
+304168972 416 160
+304168976 416 160
+304168980 416 160
+304168984 416 160
+304168988 416 160
+304168992 416 160
+304173060 416 160
+304173064 416 160
+304173068 416 160
+304173072 416 160
+304173076 416 160
+304173080 416 160
+304173084 416 160
+304173088 416 160
+304177156 416 160
+304177160 416 160
+304177164 416 160
+304177168 416 160
+304177172 416 160
+304177176 416 160
+304177180 416 160
+304177184 416 160
+304181252 416 160
+304181256 416 160
+304181260 416 160
+304181264 416 160
+304181268 416 160
+304181272 416 160
+304181276 416 160
+304181280 416 160
+304185348 416 160
+304185352 416 160
+304185356 416 160
+304185360 416 160
+304185364 416 160
+304185368 416 160
+304185372 416 160
+304185376 416 160
+304189444 416 160
+304189448 416 160
+304189452 416 160
+304189456 416 160
+304189460 416 160
+304189464 416 160
+304189468 416 160
+304189472 416 160
+304193540 416 160
+304193544 416 160
+304193548 416 160
+304193552 416 160
+304193556 416 160
+304193560 416 160
+304193564 416 160
+304193568 416 160
+304197636 416 160
+304197640 416 160
+304197644 416 160
+304197648 416 160
+304197652 416 160
+304197656 416 160
+304197660 416 160
+304197664 416 160
+304201732 416 160
+304201736 416 160
+304201740 416 160
+304201744 416 160
+304201748 416 160
+304201752 416 160
+304201756 416 160
+304201760 416 160
+305139716 416 160
+305139720 416 160
+305139724 416 160
+305139728 416 160
+305139732 416 160
+305139736 416 160
+305139740 416 160
+305139744 416 160
+305143812 416 160
+305143816 416 160
+305143820 416 160
+305143824 416 160
+305143828 416 160
+305143832 416 160
+305143836 416 160
+305143840 416 160
+305147908 416 160
+305147912 416 160
+305147916 416 160
+305147920 416 160
+305147924 416 160
+305147928 416 160
+305147932 416 160
+305147936 416 160
+305152004 416 160
+305152008 416 160
+305152012 416 160
+305152016 416 160
+305152020 416 160
+305152024 416 160
+305152028 416 160
+305152032 416 160
+305156100 416 160
+305156104 416 160
+305156108 416 160
+305156112 416 160
+305156116 416 160
+305156120 416 160
+305156124 416 160
+305156128 416 160
+305160196 416 160
+305160200 416 160
+305160204 416 160
+305160208 416 160
+305160212 416 160
+305160216 416 160
+305160220 416 160
+305160224 416 160
+305164292 416 160
+305164296 416 160
+305164300 416 160
+305164304 416 160
+305164308 416 160
+305164312 416 160
+305164316 416 160
+305164320 416 160
+305168388 416 160
+305168392 416 160
+305168396 416 160
+305168400 416 160
+305168404 416 160
+305168408 416 160
+305168412 416 160
+305168416 416 160
+305172484 416 160
+305172488 416 160
+305172492 416 160
+305172496 416 160
+305172500 416 160
+305172504 416 160
+305172508 416 160
+305172512 416 160
+305176580 416 160
+305176584 416 160
+305176588 416 160
+305176592 416 160
+305176596 416 160
+305176600 416 160
+305176604 416 160
+305176608 416 160
+305180676 416 160
+305180680 416 160
+305180684 416 160
+305180688 416 160
+305180692 416 160
+305180696 416 160
+305180700 416 160
+305180704 416 160
+305184772 416 160
+305184776 416 160
+305184780 416 160
+305184784 416 160
+305184788 416 160
+305184792 416 160
+305184796 416 160
+305184800 416 160
+305188868 416 160
+305188872 416 160
+305188876 416 160
+305188880 416 160
+305188884 416 160
+305188888 416 160
+305188892 416 160
+305188896 416 160
+305192964 416 160
+305192968 416 160
+305192972 416 160
+305192976 416 160
+305192980 416 160
+305192984 416 160
+305192988 416 160
+305192992 416 160
+305197060 416 160
+305197064 416 160
+305197068 416 160
+305197072 416 160
+305197076 416 160
+305197080 416 160
+305197084 416 160
+305197088 416 160
+305201156 416 160
+305201160 416 160
+305201164 416 160
+305201168 416 160
+305201172 416 160
+305201176 416 160
+305201180 416 160
+305201184 416 160
+305205252 416 160
+305205256 416 160
+305205260 416 160
+305205264 416 160
+305205268 416 160
+305205272 416 160
+305205276 416 160
+305205280 416 160
+305209348 416 160
+305209352 416 160
+305209356 416 160
+305209360 416 160
+305209364 416 160
+305209368 416 160
+305209372 416 160
+305209376 416 160
+305213444 416 160
+305213448 416 160
+305213452 416 160
+305213456 416 160
+305213460 416 160
+305213464 416 160
+305213468 416 160
+305213472 416 160
+305217540 416 160
+305217544 416 160
+305217548 416 160
+305217552 416 160
+305217556 416 160
+305217560 416 160
+305217564 416 160
+305217568 416 160
+305221636 416 160
+305221640 416 160
+305221644 416 160
+305221648 416 160
+305221652 416 160
+305221656 416 160
+305221660 416 160
+305221664 416 160
+305225732 416 160
+305225736 416 160
+305225740 416 160
+305225744 416 160
+305225748 416 160
+305225752 416 160
+305225756 416 160
+305225760 416 160
+305229828 416 160
+305229832 416 160
+305229836 416 160
+305229840 416 160
+305229844 416 160
+305229848 416 160
+305229852 416 160
+305229856 416 160
+305233924 416 160
+305233928 416 160
+305233932 416 160
+305233936 416 160
+305233940 416 160
+305233944 416 160
+305233948 416 160
+305233952 416 160
+305238020 416 160
+305238024 416 160
+305238028 416 160
+305238032 416 160
+305238036 416 160
+305238040 416 160
+305238044 416 160
+305238048 416 160
+305242116 416 160
+305242120 416 160
+305242124 416 160
+305242128 416 160
+305242132 416 160
+305242136 416 160
+305242140 416 160
+305242144 416 160
+305246212 416 160
+305246216 416 160
+305246220 416 160
+305246224 416 160
+305246228 416 160
+305246232 416 160
+305246236 416 160
+305246240 416 160
+305250308 416 160
+305250312 416 160
+305250316 416 160
+305250320 416 160
+305250324 416 160
+305250328 416 160
+305250332 416 160
+305250336 416 160
+305254404 416 160
+305254408 416 160
+305254412 416 160
+305254416 416 160
+305254420 416 160
+305254424 416 160
+305254428 416 160
+305254432 416 160
+305258500 416 160
+305258504 416 160
+305258508 416 160
+305258512 416 160
+305258516 416 160
+305258520 416 160
+305258524 416 160
+305258528 416 160
+305262596 416 160
+305262600 416 160
+305262604 416 160
+305262608 416 160
+305262612 416 160
+305262616 416 160
+305262620 416 160
+305262624 416 160
+305266692 416 160
+305266696 416 160
+305266700 416 160
+305266704 416 160
+305266708 416 160
+305266712 416 160
+305266716 416 160
+305266720 416 160
+305270788 416 160
+305270792 416 160
+305270796 416 160
+305270800 416 160
+305270804 416 160
+305270808 416 160
+305270812 416 160
+305270816 416 160
+305274884 416 160
+305274888 416 160
+305274892 416 160
+305274896 416 160
+305274900 416 160
+305274904 416 160
+305274908 416 160
+305274912 416 160
+305278980 416 160
+305278984 416 160
+305278988 416 160
+305278992 416 160
+305278996 416 160
+305279000 416 160
+305279004 416 160
+305279008 416 160
+305283076 416 160
+305283080 416 160
+305283084 416 160
+305283088 416 160
+305283092 416 160
+305283096 416 160
+305283100 416 160
+305283104 416 160
+305287172 416 160
+305287176 416 160
+305287180 416 160
+305287184 416 160
+305287188 416 160
+305287192 416 160
+305287196 416 160
+305287200 416 160
+305291268 416 160
+305291272 416 160
+305291276 416 160
+305291280 416 160
+305291284 416 160
+305291288 416 160
+305291292 416 160
+305291296 416 160
+305295364 416 160
+305295368 416 160
+305295372 416 160
+305295376 416 160
+305295380 416 160
+305295384 416 160
+305295388 416 160
+305295392 416 160
+305299460 416 160
+305299464 416 160
+305299468 416 160
+305299472 416 160
+305299476 416 160
+305299480 416 160
+305299484 416 160
+305299488 416 160
+305303556 416 160
+305303560 416 160
+305303564 416 160
+305303568 416 160
+305303572 416 160
+305303576 416 160
+305303580 416 160
+305303584 416 160
+305307652 416 160
+305307656 416 160
+305307660 416 160
+305307664 416 160
+305307668 416 160
+305307672 416 160
+305307676 416 160
+305307680 416 160
+305311748 416 160
+305311752 416 160
+305311756 416 160
+305311760 416 160
+305311764 416 160
+305311768 416 160
+305311772 416 160
+305311776 416 160
+305315844 416 160
+305315848 416 160
+305315852 416 160
+305315856 416 160
+305315860 416 160
+305315864 416 160
+305315868 416 160
+305315872 416 160
+306188292 416 160
+306188296 416 160
+306188300 416 160
+306188304 416 160
+306188308 416 160
+306188312 416 160
+306188316 416 160
+306188320 416 160
+306192388 416 160
+306192392 416 160
+306192396 416 160
+306192400 416 160
+306192404 416 160
+306192408 416 160
+306192412 416 160
+306192416 416 160
+306196484 416 160
+306196488 416 160
+306196492 416 160
+306196496 416 160
+306196500 416 160
+306196504 416 160
+306196508 416 160
+306196512 416 160
+306200580 416 160
+306200584 416 160
+306200588 416 160
+306200592 416 160
+306200596 416 160
+306200600 416 160
+306200604 416 160
+306200608 416 160
+306204676 416 160
+306204680 416 160
+306204684 416 160
+306204688 416 160
+306204692 416 160
+306204696 416 160
+306204700 416 160
+306204704 416 160
+306208772 416 160
+306208776 416 160
+306208780 416 160
+306208784 416 160
+306208788 416 160
+306208792 416 160
+306208796 416 160
+306208800 416 160
+306212868 416 160
+306212872 416 160
+306212876 416 160
+306212880 416 160
+306212884 416 160
+306212888 416 160
+306212892 416 160
+306212896 416 160
+306216964 416 160
+306216968 416 160
+306216972 416 160
+306216976 416 160
+306216980 416 160
+306216984 416 160
+306216988 416 160
+306216992 416 160
+306221060 416 160
+306221064 416 160
+306221068 416 160
+306221072 416 160
+306221076 416 160
+306221080 416 160
+306221084 416 160
+306221088 416 160
+306225156 416 160
+306225160 416 160
+306225164 416 160
+306225168 416 160
+306225172 416 160
+306225176 416 160
+306225180 416 160
+306225184 416 160
+306229252 416 160
+306229256 416 160
+306229260 416 160
+306229264 416 160
+306229268 416 160
+306229272 416 160
+306229276 416 160
+306229280 416 160
+306233348 416 160
+306233352 416 160
+306233356 416 160
+306233360 416 160
+306233364 416 160
+306233368 416 160
+306233372 416 160
+306233376 416 160
+306237444 416 160
+306237448 416 160
+306237452 416 160
+306237456 416 160
+306237460 416 160
+306237464 416 160
+306237468 416 160
+306237472 416 160
+306241540 416 160
+306241544 416 160
+306241548 416 160
+306241552 416 160
+306241556 416 160
+306241560 416 160
+306241564 416 160
+306241568 416 160
+306245636 416 160
+306245640 416 160
+306245644 416 160
+306245648 416 160
+306245652 416 160
+306245656 416 160
+306245660 416 160
+306245664 416 160
+306249732 416 160
+306249736 416 160
+306249740 416 160
+306249744 416 160
+306249748 416 160
+306249752 416 160
+306249756 416 160
+306249760 416 160
+306253828 416 160
+306253832 416 160
+306253836 416 160
+306253840 416 160
+306253844 416 160
+306253848 416 160
+306253852 416 160
+306253856 416 160
+306257924 416 160
+306257928 416 160
+306257932 416 160
+306257936 416 160
+306257940 416 160
+306257944 416 160
+306257948 416 160
+306257952 416 160
+306262020 416 160
+306262024 416 160
+306262028 416 160
+306262032 416 160
+306262036 416 160
+306262040 416 160
+306262044 416 160
+306262048 416 160
+306266116 416 160
+306266120 416 160
+306266124 416 160
+306266128 416 160
+306266132 416 160
+306266136 416 160
+306266140 416 160
+306266144 416 160
+306270212 416 160
+306270216 416 160
+306270220 416 160
+306270224 416 160
+306270228 416 160
+306270232 416 160
+306270236 416 160
+306270240 416 160
+306274308 416 160
+306274312 416 160
+306274316 416 160
+306274320 416 160
+306274324 416 160
+306274328 416 160
+306274332 416 160
+306274336 416 160
+306278404 416 160
+306278408 416 160
+306278412 416 160
+306278416 416 160
+306278420 416 160
+306278424 416 160
+306278428 416 160
+306278432 416 160
+306282500 416 160
+306282504 416 160
+306282508 416 160
+306282512 416 160
+306282516 416 160
+306282520 416 160
+306282524 416 160
+306282528 416 160
+306286596 416 160
+306286600 416 160
+306286604 416 160
+306286608 416 160
+306286612 416 160
+306286616 416 160
+306286620 416 160
+306286624 416 160
+306290692 416 160
+306290696 416 160
+306290700 416 160
+306290704 416 160
+306290708 416 160
+306290712 416 160
+306290716 416 160
+306290720 416 160
+306294788 416 160
+306294792 416 160
+306294796 416 160
+306294800 416 160
+306294804 416 160
+306294808 416 160
+306294812 416 160
+306294816 416 160
+306298884 416 160
+306298888 416 160
+306298892 416 160
+306298896 416 160
+306298900 416 160
+306298904 416 160
+306298908 416 160
+306298912 416 160
+306302980 416 160
+306302984 416 160
+306302988 416 160
+306302992 416 160
+306302996 416 160
+306303000 416 160
+306303004 416 160
+306303008 416 160
+306307076 416 160
+306307080 416 160
+306307084 416 160
+306307088 416 160
+306307092 416 160
+306307096 416 160
+306307100 416 160
+306307104 416 160
+306311172 416 160
+306311176 416 160
+306311180 416 160
+306311184 416 160
+306311188 416 160
+306311192 416 160
+306311196 416 160
+306311200 416 160
+306315268 416 160
+306315272 416 160
+306315276 416 160
+306315280 416 160
+306315284 416 160
+306315288 416 160
+306315292 416 160
+306315296 416 160
+306319364 416 160
+306319368 416 160
+306319372 416 160
+306319376 416 160
+306319380 416 160
+306319384 416 160
+306319388 416 160
+306319392 416 160
+306323460 416 160
+306323464 416 160
+306323468 416 160
+306323472 416 160
+306323476 416 160
+306323480 416 160
+306323484 416 160
+306323488 416 160
+306327556 416 160
+306327560 416 160
+306327564 416 160
+306327568 416 160
+306327572 416 160
+306327576 416 160
+306327580 416 160
+306327584 416 160
+306331652 416 160
+306331656 416 160
+306331660 416 160
+306331664 416 160
+306331668 416 160
+306331672 416 160
+306331676 416 160
+306331680 416 160
+306335748 416 160
+306335752 416 160
+306335756 416 160
+306335760 416 160
+306335764 416 160
+306335768 416 160
+306335772 416 160
+306335776 416 160
+306339844 416 160
+306339848 416 160
+306339852 416 160
+306339856 416 160
+306339860 416 160
+306339864 416 160
+306339868 416 160
+306339872 416 160
+306343940 416 160
+306343944 416 160
+306343948 416 160
+306343952 416 160
+306343956 416 160
+306343960 416 160
+306343964 416 160
+306343968 416 160
+306348036 416 160
+306348040 416 160
+306348044 416 160
+306348048 416 160
+306348052 416 160
+306348056 416 160
+306348060 416 160
+306348064 416 160
+306352132 416 160
+306352136 416 160
+306352140 416 160
+306352144 416 160
+306352148 416 160
+306352152 416 160
+306352156 416 160
+306352160 416 160
+306356228 416 160
+306356232 416 160
+306356236 416 160
+306356240 416 160
+306356244 416 160
+306356248 416 160
+306356252 416 160
+306356256 416 160
+306360324 416 160
+306360328 416 160
+306360332 416 160
+306360336 416 160
+306360340 416 160
+306360344 416 160
+306360348 416 160
+306360352 416 160
+306364420 416 160
+306364424 416 160
+306364428 416 160
+306364432 416 160
+306364436 416 160
+306364440 416 160
+306364444 416 160
+306364448 416 160
+306368516 416 160
+306368520 416 160
+306368524 416 160
+306368528 416 160
+306368532 416 160
+306368536 416 160
+306368540 416 160
+306368544 416 160
+306372612 416 160
+306372616 416 160
+306372620 416 160
+306372624 416 160
+306372628 416 160
+306372632 416 160
+306372636 416 160
+306372640 416 160
+306376708 416 160
+306376712 416 160
+306376716 416 160
+306376720 416 160
+306376724 416 160
+306376728 416 160
+306376732 416 160
+306376736 416 160
+306380804 416 160
+306380808 416 160
+306380812 416 160
+306380816 416 160
+306380820 416 160
+306380824 416 160
+306380828 416 160
+306380832 416 160
+306384900 416 160
+306384904 416 160
+306384908 416 160
+306384912 416 160
+306384916 416 160
+306384920 416 160
+306384924 416 160
+306384928 416 160
+306388996 416 160
+306389000 416 160
+306389004 416 160
+306389008 416 160
+306389012 416 160
+306389016 416 160
+306389020 416 160
+306389024 416 160
+306393092 416 160
+306393096 416 160
+306393100 416 160
+306393104 416 160
+306393108 416 160
+306393112 416 160
+306393116 416 160
+306393120 416 160
+306397188 416 160
+306397192 416 160
+306397196 416 160
+306397200 416 160
+306397204 416 160
+306397208 416 160
+306397212 416 160
+306397216 416 160
+306401284 416 160
+306401288 416 160
+306401292 416 160
+306401296 416 160
+306401300 416 160
+306401304 416 160
+306401308 416 160
+306401312 416 160
+306405380 416 160
+306405384 416 160
+306405388 416 160
+306405392 416 160
+306405396 416 160
+306405400 416 160
+306405404 416 160
+306405408 416 160
+306409476 416 160
+306409480 416 160
+306409484 416 160
+306409488 416 160
+306409492 416 160
+306409496 416 160
+306409500 416 160
+306409504 416 160
+306413572 416 160
+306413576 416 160
+306413580 416 160
+306413584 416 160
+306413588 416 160
+306413592 416 160
+306413596 416 160
+306413600 416 160
+306417668 416 160
+306417672 416 160
+306417676 416 160
+306417680 416 160
+306417684 416 160
+306417688 416 160
+306417692 416 160
+306417696 416 160
+306421764 416 160
+306421768 416 160
+306421772 416 160
+306421776 416 160
+306421780 416 160
+306421784 416 160
+306421788 416 160
+306421792 416 160
+306425860 416 160
+306425864 416 160
+306425868 416 160
+306425872 416 160
+306425876 416 160
+306425880 416 160
+306425884 416 160
+306425888 416 160
+306429956 416 160
+306429960 416 160
+306429964 416 160
+306429968 416 160
+306429972 416 160
+306429976 416 160
+306429980 416 160
+306429984 416 160
+306434052 416 160
+306434056 416 160
+306434060 416 160
+306434064 416 160
+306434068 416 160
+306434072 416 160
+306434076 416 160
+306434080 416 160
+306438148 416 160
+306438152 416 160
+306438156 416 160
+306438160 416 160
+306438164 416 160
+306438168 416 160
+306438172 416 160
+306438176 416 160
+306442244 416 160
+306442248 416 160
+306442252 416 160
+306442256 416 160
+306442260 416 160
+306442264 416 160
+306442268 416 160
+306442272 416 160
+306446340 416 160
+306446344 416 160
+306446348 416 160
+306446352 416 160
+306446356 416 160
+306446360 416 160
+306446364 416 160
+306446368 416 160
+352588804 416 160
+352592900 416 160
+352596996 416 160
+352601092 416 160
+352605188 416 160
+352609284 416 160
+352613380 416 160
+352617476 416 160
+352621572 416 160
+352625668 416 160
+352629764 416 160
+352633860 416 160
+352637956 416 160
+352642052 416 160
+352646148 416 160
+352650244 416 160
+352654340 416 160
+352658436 416 160
+352662532 416 160
+352666628 416 160
+352670724 416 160
+352674820 416 160
+352678916 416 160
+352683012 416 160
+352687108 416 160
+352691204 416 160
+352695300 416 160
+352699396 416 160
+352703492 416 160
+352707588 416 160
+352711684 416 160
+352715780 416 160
+352719876 416 160
+352723972 416 160
+352728068 416 160
+352732164 416 160
+352736260 416 160
+352740356 416 160
+352744452 416 160
+352748548 416 160
+352752644 416 160
+352756740 416 160
+352760836 416 160
+352764932 416 160
+352769028 416 160
+352773124 416 160
+352777220 416 160
+352781316 416 160
+352785412 416 160
+352789508 416 160
+352793604 416 160
+352797700 416 160
+352801796 416 160
+352805892 416 160
+352809988 416 160
+352814084 416 160
+352589828 416 160
+352593924 416 160
+352598020 416 160
+352602116 416 160
+352606212 416 160
+352610308 416 160
+352614404 416 160
+352618500 416 160
+352622596 416 160
+352626692 416 160
+352630788 416 160
+352634884 416 160
+352638980 416 160
+352643076 416 160
+352647172 416 160
+352651268 416 160
+352655364 416 160
+352659460 416 160
+352663556 416 160
+352667652 416 160
+352671748 416 160
+352675844 416 160
+352679940 416 160
+352684036 416 160
+352688132 416 160
+352692228 416 160
+352696324 416 160
+352700420 416 160
+352704516 416 160
+352708612 416 160
+352712708 416 160
+352716804 416 160
+352720900 416 160
+352724996 416 160
+352729092 416 160
+352733188 416 160
+352737284 416 160
+352741380 416 160
+352745476 416 160
+352749572 416 160
+352753668 416 160
+352757764 416 160
+352761860 416 160
+352765956 416 160
+352770052 416 160
+352774148 416 160
+352778244 416 160
+352782340 416 160
+352786436 416 160
+352790532 416 160
+352794628 416 160
+352798724 416 160
+352802820 416 160
+352806916 416 160
+352811012 416 160
+352815108 416 160
+352850948 416 160
+352855044 416 160
+352859140 416 160
+352863236 416 160
+352867332 416 160
+352871428 416 160
+352875524 416 160
+352879620 416 160
+352883716 416 160
+352887812 416 160
+352891908 416 160
+352896004 416 160
+352900100 416 160
+352904196 416 160
+352908292 416 160
+352912388 416 160
+352916484 416 160
+352920580 416 160
+352924676 416 160
+352928772 416 160
+352932868 416 160
+352936964 416 160
+352941060 416 160
+352945156 416 160
+352949252 416 160
+352953348 416 160
+352957444 416 160
+352961540 416 160
+352965636 416 160
+352969732 416 160
+352973828 416 160
+352977924 416 160
+352982020 416 160
+352986116 416 160
+352990212 416 160
+352994308 416 160
+352998404 416 160
+353002500 416 160
+353006596 416 160
+353010692 416 160
+353014788 416 160
+353018884 416 160
+353022980 416 160
+353027076 416 160
+353031172 416 160
+353035268 416 160
+353039364 416 160
+353043460 416 160
+353047556 416 160
+353051652 416 160
+353055748 416 160
+353059844 416 160
+353063940 416 160
+353068036 416 160
+353072132 416 160
+353076228 416 160
+352851972 416 160
+352856068 416 160
+352860164 416 160
+352864260 416 160
+352868356 416 160
+352872452 416 160
+352876548 416 160
+352880644 416 160
+352884740 416 160
+352888836 416 160
+352892932 416 160
+352897028 416 160
+352901124 416 160
+352905220 416 160
+352909316 416 160
+352913412 416 160
+352917508 416 160
+352921604 416 160
+352925700 416 160
+352929796 416 160
+352933892 416 160
+352937988 416 160
+352942084 416 160
+352946180 416 160
+352950276 416 160
+352954372 416 160
+352958468 416 160
+352962564 416 160
+352966660 416 160
+352970756 416 160
+352974852 416 160
+352978948 416 160
+352983044 416 160
+352987140 416 160
+352991236 416 160
+352995332 416 160
+352999428 416 160
+353003524 416 160
+353007620 416 160
+353011716 416 160
+353015812 416 160
+353019908 416 160
+353024004 416 160
+353028100 416 160
+353032196 416 160
+353036292 416 160
+353040388 416 160
+353044484 416 160
+353048580 416 160
+353052676 416 160
+353056772 416 160
+353060868 416 160
+353064964 416 160
+353069060 416 160
+353073156 416 160
+353077252 416 160
+353113092 416 160
+353117188 416 160
+353121284 416 160
+353125380 416 160
+353129476 416 160
+353133572 416 160
+353137668 416 160
+353141764 416 160
+353145860 416 160
+353149956 416 160
+353154052 416 160
+353158148 416 160
+353162244 416 160
+353166340 416 160
+353170436 416 160
+353174532 416 160
+353178628 416 160
+353182724 416 160
+353186820 416 160
+353190916 416 160
+353195012 416 160
+353199108 416 160
+353203204 416 160
+353207300 416 160
+353211396 416 160
+353215492 416 160
+353219588 416 160
+353223684 416 160
+353227780 416 160
+353231876 416 160
+353235972 416 160
+353240068 416 160
+353244164 416 160
+353248260 416 160
+353252356 416 160
+353256452 416 160
+353260548 416 160
+353264644 416 160
+353268740 416 160
+353272836 416 160
+353276932 416 160
+353281028 416 160
+353285124 416 160
+353289220 416 160
+353293316 416 160
+353297412 416 160
+353301508 416 160
+353305604 416 160
+353309700 416 160
+353313796 416 160
+353317892 416 160
+353321988 416 160
+353326084 416 160
+353330180 416 160
+353334276 416 160
+353338372 416 160
+353114116 416 160
+353118212 416 160
+353122308 416 160
+353126404 416 160
+353130500 416 160
+353134596 416 160
+353138692 416 160
+353142788 416 160
+353146884 416 160
+353150980 416 160
+353155076 416 160
+353159172 416 160
+353163268 416 160
+353167364 416 160
+353171460 416 160
+353175556 416 160
+353179652 416 160
+353183748 416 160
+353187844 416 160
+353191940 416 160
+353196036 416 160
+353200132 416 160
+353204228 416 160
+353208324 416 160
+353212420 416 160
+353216516 416 160
+353220612 416 160
+353224708 416 160
+353228804 416 160
+353232900 416 160
+353236996 416 160
+353241092 416 160
+353245188 416 160
+353249284 416 160
+353253380 416 160
+353257476 416 160
+353261572 416 160
+353265668 416 160
+353269764 416 160
+353273860 416 160
+353277956 416 160
+353282052 416 160
+353286148 416 160
+353290244 416 160
+353294340 416 160
+353298436 416 160
+353302532 416 160
+353306628 416 160
+353310724 416 160
+353314820 416 160
+353318916 416 160
+353323012 416 160
+353327108 416 160
+353331204 416 160
+353335300 416 160
+353339396 416 160
+353375236 416 160
+353379332 416 160
+353383428 416 160
+353387524 416 160
+353391620 416 160
+353395716 416 160
+353399812 416 160
+353403908 416 160
+353408004 416 160
+353412100 416 160
+353416196 416 160
+353420292 416 160
+353424388 416 160
+353428484 416 160
+353432580 416 160
+353436676 416 160
+353440772 416 160
+353444868 416 160
+353448964 416 160
+353453060 416 160
+353457156 416 160
+353461252 416 160
+353465348 416 160
+353469444 416 160
+353473540 416 160
+353477636 416 160
+353481732 416 160
+353485828 416 160
+353489924 416 160
+353494020 416 160
+353498116 416 160
+353502212 416 160
+353506308 416 160
+353510404 416 160
+353514500 416 160
+353518596 416 160
+353522692 416 160
+353526788 416 160
+353530884 416 160
+353534980 416 160
+353539076 416 160
+353543172 416 160
+353547268 416 160
+353551364 416 160
+353555460 416 160
+353559556 416 160
+353563652 416 160
+353567748 416 160
+353571844 416 160
+353575940 416 160
+353580036 416 160
+353584132 416 160
+353588228 416 160
+353592324 416 160
+353596420 416 160
+353600516 416 160
+353376260 416 160
+353380356 416 160
+353384452 416 160
+353388548 416 160
+353392644 416 160
+353396740 416 160
+353400836 416 160
+353404932 416 160
+353409028 416 160
+353413124 416 160
+353417220 416 160
+353421316 416 160
+353425412 416 160
+353429508 416 160
+353433604 416 160
+353437700 416 160
+353441796 416 160
+353445892 416 160
+353449988 416 160
+353454084 416 160
+353458180 416 160
+353462276 416 160
+353466372 416 160
+353470468 416 160
+353474564 416 160
+353478660 416 160
+353482756 416 160
+353486852 416 160
+353490948 416 160
+353495044 416 160
+353499140 416 160
+353503236 416 160
+353507332 416 160
+353511428 416 160
+353515524 416 160
+353519620 416 160
+353523716 416 160
+353527812 416 160
+353531908 416 160
+353536004 416 160
+353540100 416 160
+353544196 416 160
+353548292 416 160
+353552388 416 160
+353556484 416 160
+353560580 416 160
+353564676 416 160
+353568772 416 160
+353572868 416 160
+353576964 416 160
+353581060 416 160
+353585156 416 160
+353589252 416 160
+353593348 416 160
+353597444 416 160
+353601540 416 160
+353637380 416 160
+353641476 416 160
+353645572 416 160
+353649668 416 160
+353653764 416 160
+353657860 416 160
+353661956 416 160
+353666052 416 160
+353670148 416 160
+353674244 416 160
+353678340 416 160
+353682436 416 160
+353686532 416 160
+353690628 416 160
+353694724 416 160
+353698820 416 160
+353702916 416 160
+353707012 416 160
+353711108 416 160
+353715204 416 160
+353719300 416 160
+353723396 416 160
+353727492 416 160
+353731588 416 160
+353735684 416 160
+353739780 416 160
+353743876 416 160
+353747972 416 160
+353752068 416 160
+353756164 416 160
+353760260 416 160
+353764356 416 160
+353768452 416 160
+353772548 416 160
+353776644 416 160
+353780740 416 160
+353784836 416 160
+353788932 416 160
+353793028 416 160
+353797124 416 160
+353801220 416 160
+353805316 416 160
+353809412 416 160
+353813508 416 160
+353817604 416 160
+353821700 416 160
+353825796 416 160
+353829892 416 160
+353833988 416 160
+353838084 416 160
+353842180 416 160
+353846276 416 160
+353850372 416 160
+353854468 416 160
+353858564 416 160
+353862660 416 160
+353638404 416 160
+353642500 416 160
+353646596 416 160
+353650692 416 160
+353654788 416 160
+353658884 416 160
+353662980 416 160
+353667076 416 160
+353671172 416 160
+353675268 416 160
+353679364 416 160
+353683460 416 160
+353687556 416 160
+353691652 416 160
+353695748 416 160
+353699844 416 160
+353703940 416 160
+353708036 416 160
+353712132 416 160
+353716228 416 160
+353720324 416 160
+353724420 416 160
+353728516 416 160
+353732612 416 160
+353736708 416 160
+353740804 416 160
+353744900 416 160
+353748996 416 160
+353753092 416 160
+353757188 416 160
+353761284 416 160
+353765380 416 160
+353769476 416 160
+353773572 416 160
+353777668 416 160
+353781764 416 160
+353785860 416 160
+353789956 416 160
+353794052 416 160
+353798148 416 160
+353802244 416 160
+353806340 416 160
+353810436 416 160
+353814532 416 160
+353818628 416 160
+353822724 416 160
+353826820 416 160
+353830916 416 160
+353835012 416 160
+353839108 416 160
+353843204 416 160
+353847300 416 160
+353851396 416 160
+353855492 416 160
+353859588 416 160
+353863684 416 160
+353899524 416 160
+353903620 416 160
+353907716 416 160
+353911812 416 160
+353915908 416 160
+353920004 416 160
+353924100 416 160
+353928196 416 160
+353932292 416 160
+353936388 416 160
+353940484 416 160
+353944580 416 160
+353948676 416 160
+353952772 416 160
+353956868 416 160
+353960964 416 160
+353965060 416 160
+353969156 416 160
+353973252 416 160
+353977348 416 160
+353981444 416 160
+353985540 416 160
+353989636 416 160
+353993732 416 160
+353997828 416 160
+354001924 416 160
+354006020 416 160
+354010116 416 160
+354014212 416 160
+354018308 416 160
+354022404 416 160
+354026500 416 160
+354030596 416 160
+354034692 416 160
+354038788 416 160
+354042884 416 160
+354046980 416 160
+354051076 416 160
+354055172 416 160
+354059268 416 160
+354063364 416 160
+354067460 416 160
+354071556 416 160
+354075652 416 160
+354079748 416 160
+354083844 416 160
+354087940 416 160
+354092036 416 160
+354096132 416 160
+354100228 416 160
+354104324 416 160
+354108420 416 160
+354112516 416 160
+354116612 416 160
+354120708 416 160
+354124804 416 160
+353900548 416 160
+353904644 416 160
+353908740 416 160
+353912836 416 160
+353916932 416 160
+353921028 416 160
+353925124 416 160
+353929220 416 160
+353933316 416 160
+353937412 416 160
+353941508 416 160
+353945604 416 160
+353949700 416 160
+353953796 416 160
+353957892 416 160
+353961988 416 160
+353966084 416 160
+353970180 416 160
+353974276 416 160
+353978372 416 160
+353982468 416 160
+353986564 416 160
+353990660 416 160
+353994756 416 160
+353998852 416 160
+354002948 416 160
+354007044 416 160
+354011140 416 160
+354015236 416 160
+354019332 416 160
+354023428 416 160
+354027524 416 160
+354031620 416 160
+354035716 416 160
+354039812 416 160
+354043908 416 160
+354048004 416 160
+354052100 416 160
+354056196 416 160
+354060292 416 160
+354064388 416 160
+354068484 416 160
+354072580 416 160
+354076676 416 160
+354080772 416 160
+354084868 416 160
+354088964 416 160
+354093060 416 160
+354097156 416 160
+354101252 416 160
+354105348 416 160
+354109444 416 160
+354113540 416 160
+354117636 416 160
+354121732 416 160
+354125828 416 160
+354161668 416 160
+354165764 416 160
+354169860 416 160
+354173956 416 160
+354178052 416 160
+354182148 416 160
+354186244 416 160
+354190340 416 160
+354194436 416 160
+354198532 416 160
+354202628 416 160
+354206724 416 160
+354210820 416 160
+354214916 416 160
+354219012 416 160
+354223108 416 160
+354227204 416 160
+354231300 416 160
+354235396 416 160
+354239492 416 160
+354243588 416 160
+354247684 416 160
+354251780 416 160
+354255876 416 160
+354259972 416 160
+354264068 416 160
+354268164 416 160
+354272260 416 160
+354276356 416 160
+354280452 416 160
+354284548 416 160
+354288644 416 160
+354292740 416 160
+354296836 416 160
+354300932 416 160
+354305028 416 160
+354309124 416 160
+354313220 416 160
+354317316 416 160
+354321412 416 160
+354325508 416 160
+354329604 416 160
+354333700 416 160
+354337796 416 160
+354341892 416 160
+354345988 416 160
+354350084 416 160
+354354180 416 160
+354358276 416 160
+354362372 416 160
+354366468 416 160
+354370564 416 160
+354374660 416 160
+354378756 416 160
+354382852 416 160
+354386948 416 160
+354162692 416 160
+354166788 416 160
+354170884 416 160
+354174980 416 160
+354179076 416 160
+354183172 416 160
+354187268 416 160
+354191364 416 160
+354195460 416 160
+354199556 416 160
+354203652 416 160
+354207748 416 160
+354211844 416 160
+354215940 416 160
+354220036 416 160
+354224132 416 160
+354228228 416 160
+354232324 416 160
+354236420 416 160
+354240516 416 160
+354244612 416 160
+354248708 416 160
+354252804 416 160
+354256900 416 160
+354260996 416 160
+354265092 416 160
+354269188 416 160
+354273284 416 160
+354277380 416 160
+354281476 416 160
+354285572 416 160
+354289668 416 160
+354293764 416 160
+354297860 416 160
+354301956 416 160
+354306052 416 160
+354310148 416 160
+354314244 416 160
+354318340 416 160
+354322436 416 160
+354326532 416 160
+354330628 416 160
+354334724 416 160
+354338820 416 160
+354342916 416 160
+354347012 416 160
+354351108 416 160
+354355204 416 160
+354359300 416 160
+354363396 416 160
+354367492 416 160
+354371588 416 160
+354375684 416 160
+354379780 416 160
+354383876 416 160
+354387972 416 160
+354423812 416 160
+354427908 416 160
+354432004 416 160
+354436100 416 160
+354440196 416 160
+354444292 416 160
+354448388 416 160
+354452484 416 160
+354456580 416 160
+354460676 416 160
+354464772 416 160
+354468868 416 160
+354472964 416 160
+354477060 416 160
+354481156 416 160
+354485252 416 160
+354489348 416 160
+354493444 416 160
+354497540 416 160
+354501636 416 160
+354505732 416 160
+354509828 416 160
+354513924 416 160
+354518020 416 160
+354522116 416 160
+354526212 416 160
+354530308 416 160
+354534404 416 160
+354538500 416 160
+354542596 416 160
+354546692 416 160
+354550788 416 160
+354554884 416 160
+354558980 416 160
+354424836 416 160
+354428932 416 160
+354433028 416 160
+354437124 416 160
+354441220 416 160
+354445316 416 160
+354449412 416 160
+354453508 416 160
+354457604 416 160
+354461700 416 160
+354465796 416 160
+354469892 416 160
+354473988 416 160
+354478084 416 160
+354482180 416 160
+354486276 416 160
+354490372 416 160
+354494468 416 160
+354498564 416 160
+354502660 416 160
+354506756 416 160
+354510852 416 160
+354514948 416 160
+354519044 416 160
+354523140 416 160
+354527236 416 160
+354531332 416 160
+354535428 416 160
+354539524 416 160
+354543620 416 160
+354547716 416 160
+354551812 416 160
+354555908 416 160
+354560004 416 160
+354685956 416 160
+354690052 416 160
+354694148 416 160
+354698244 416 160
+354702340 416 160
+354706436 416 160
+354710532 416 160
+354714628 416 160
+354718724 416 160
+354722820 416 160
+354726916 416 160
+354731012 416 160
+354735108 416 160
+354739204 416 160
+354743300 416 160
+354747396 416 160
+354751492 416 160
+354755588 416 160
+354759684 416 160
+354763780 416 160
+354767876 416 160
+354771972 416 160
+354776068 416 160
+354780164 416 160
+354784260 416 160
+354788356 416 160
+354792452 416 160
+354796548 416 160
+354800644 416 160
+354804740 416 160
+354808836 416 160
+354812932 416 160
+354817028 416 160
+354821124 416 160
+354686980 416 160
+354691076 416 160
+354695172 416 160
+354699268 416 160
+354703364 416 160
+354707460 416 160
+354711556 416 160
+354715652 416 160
+354719748 416 160
+354723844 416 160
+354727940 416 160
+354732036 416 160
+354736132 416 160
+354740228 416 160
+354744324 416 160
+354748420 416 160
+354752516 416 160
+354756612 416 160
+354760708 416 160
+354764804 416 160
+354768900 416 160
+354772996 416 160
+354777092 416 160
+354781188 416 160
+354785284 416 160
+354789380 416 160
+354793476 416 160
+354797572 416 160
+354801668 416 160
+354805764 416 160
+354809860 416 160
+354813956 416 160
+354818052 416 160
+354822148 416 160
+354948100 416 160
+354952196 416 160
+354956292 416 160
+354960388 416 160
+354964484 416 160
+354968580 416 160
+354972676 416 160
+354976772 416 160
+354980868 416 160
+354984964 416 160
+354989060 416 160
+354993156 416 160
+354997252 416 160
+355001348 416 160
+355005444 416 160
+355009540 416 160
+355013636 416 160
+355017732 416 160
+355021828 416 160
+355025924 416 160
+355030020 416 160
+355034116 416 160
+355038212 416 160
+355042308 416 160
+355046404 416 160
+355050500 416 160
+355054596 416 160
+355058692 416 160
+355062788 416 160
+355066884 416 160
+355070980 416 160
+355075076 416 160
+355079172 416 160
+355083268 416 160
+354949124 416 160
+354953220 416 160
+354957316 416 160
+354961412 416 160
+354965508 416 160
+354969604 416 160
+354973700 416 160
+354977796 416 160
+354981892 416 160
+354985988 416 160
+354990084 416 160
+354994180 416 160
+354998276 416 160
+355002372 416 160
+355006468 416 160
+355010564 416 160
+355014660 416 160
+355018756 416 160
+355022852 416 160
+355026948 416 160
+355031044 416 160
+355035140 416 160
+355039236 416 160
+355043332 416 160
+355047428 416 160
+355051524 416 160
+355055620 416 160
+355059716 416 160
+355063812 416 160
+355067908 416 160
+355072004 416 160
+355076100 416 160
+355080196 416 160
+355084292 416 160
+344200196 416 160
+344204292 416 160
+344208388 416 160
+344212484 416 160
+344216580 416 160
+344220676 416 160
+344224772 416 160
+344228868 416 160
+344232964 416 160
+344237060 416 160
+344241156 416 160
+344245252 416 160
+344249348 416 160
+344253444 416 160
+344257540 416 160
+344261636 416 160
+344265732 416 160
+344269828 416 160
+344273924 416 160
+344278020 416 160
+344282116 416 160
+344286212 416 160
+344290308 416 160
+344294404 416 160
+344298500 416 160
+344302596 416 160
+344306692 416 160
+344310788 416 160
+344314884 416 160
+344318980 416 160
+344323076 416 160
+344327172 416 160
+344331268 416 160
+344335364 416 160
+344339460 416 160
+344343556 416 160
+344347652 416 160
+344351748 416 160
+344355844 416 160
+344359940 416 160
+344364036 416 160
+344368132 416 160
+344372228 416 160
+344376324 416 160
+344380420 416 160
+344384516 416 160
+344388612 416 160
+344392708 416 160
+344396804 416 160
+344400900 416 160
+344404996 416 160
+344409092 416 160
+344413188 416 160
+344417284 416 160
+344421380 416 160
+344425476 416 160
+344201220 416 160
+344205316 416 160
+344209412 416 160
+344213508 416 160
+344217604 416 160
+344221700 416 160
+344225796 416 160
+344229892 416 160
+344233988 416 160
+344238084 416 160
+344242180 416 160
+344246276 416 160
+344250372 416 160
+344254468 416 160
+344258564 416 160
+344262660 416 160
+344266756 416 160
+344270852 416 160
+344274948 416 160
+344279044 416 160
+344283140 416 160
+344287236 416 160
+344291332 416 160
+344295428 416 160
+344299524 416 160
+344303620 416 160
+344307716 416 160
+344311812 416 160
+344315908 416 160
+344320004 416 160
+344324100 416 160
+344328196 416 160
+344332292 416 160
+344336388 416 160
+344340484 416 160
+344344580 416 160
+344348676 416 160
+344352772 416 160
+344356868 416 160
+344360964 416 160
+344365060 416 160
+344369156 416 160
+344373252 416 160
+344377348 416 160
+344381444 416 160
+344385540 416 160
+344389636 416 160
+344393732 416 160
+344397828 416 160
+344401924 416 160
+344406020 416 160
+344410116 416 160
+344414212 416 160
+344418308 416 160
+344422404 416 160
+344426500 416 160
+344462340 416 160
+344466436 416 160
+344470532 416 160
+344474628 416 160
+344478724 416 160
+344482820 416 160
+344486916 416 160
+344491012 416 160
+344495108 416 160
+344499204 416 160
+344503300 416 160
+344507396 416 160
+344511492 416 160
+344515588 416 160
+344519684 416 160
+344523780 416 160
+344527876 416 160
+344531972 416 160
+344536068 416 160
+344540164 416 160
+344544260 416 160
+344548356 416 160
+344552452 416 160
+344556548 416 160
+344560644 416 160
+344564740 416 160
+344568836 416 160
+344572932 416 160
+344577028 416 160
+344581124 416 160
+344585220 416 160
+344589316 416 160
+344593412 416 160
+344597508 416 160
+344601604 416 160
+344605700 416 160
+344609796 416 160
+344613892 416 160
+344617988 416 160
+344622084 416 160
+344626180 416 160
+344630276 416 160
+344634372 416 160
+344638468 416 160
+344642564 416 160
+344646660 416 160
+344650756 416 160
+344654852 416 160
+344658948 416 160
+344663044 416 160
+344667140 416 160
+344671236 416 160
+344675332 416 160
+344679428 416 160
+344683524 416 160
+344687620 416 160
+344463364 416 160
+344467460 416 160
+344471556 416 160
+344475652 416 160
+344479748 416 160
+344483844 416 160
+344487940 416 160
+344492036 416 160
+344496132 416 160
+344500228 416 160
+344504324 416 160
+344508420 416 160
+344512516 416 160
+344516612 416 160
+344520708 416 160
+344524804 416 160
+344528900 416 160
+344532996 416 160
+344537092 416 160
+344541188 416 160
+344545284 416 160
+344549380 416 160
+344553476 416 160
+344557572 416 160
+344561668 416 160
+344565764 416 160
+344569860 416 160
+344573956 416 160
+344578052 416 160
+344582148 416 160
+344586244 416 160
+344590340 416 160
+344594436 416 160
+344598532 416 160
+344602628 416 160
+344606724 416 160
+344610820 416 160
+344614916 416 160
+344619012 416 160
+344623108 416 160
+344627204 416 160
+344631300 416 160
+344635396 416 160
+344639492 416 160
+344643588 416 160
+344647684 416 160
+344651780 416 160
+344655876 416 160
+344659972 416 160
+344664068 416 160
+344668164 416 160
+344672260 416 160
+344676356 416 160
+344680452 416 160
+344684548 416 160
+344688644 416 160
+344724484 416 160
+344728580 416 160
+344732676 416 160
+344736772 416 160
+344740868 416 160
+344744964 416 160
+344749060 416 160
+344753156 416 160
+344757252 416 160
+344761348 416 160
+344765444 416 160
+344769540 416 160
+344773636 416 160
+344777732 416 160
+344781828 416 160
+344785924 416 160
+344790020 416 160
+344794116 416 160
+344798212 416 160
+344802308 416 160
+344806404 416 160
+344810500 416 160
+344814596 416 160
+344818692 416 160
+344822788 416 160
+344826884 416 160
+344830980 416 160
+344835076 416 160
+344839172 416 160
+344843268 416 160
+344847364 416 160
+344851460 416 160
+344855556 416 160
+344859652 416 160
+344863748 416 160
+344867844 416 160
+344871940 416 160
+344876036 416 160
+344880132 416 160
+344884228 416 160
+344888324 416 160
+344892420 416 160
+344896516 416 160
+344900612 416 160
+344904708 416 160
+344908804 416 160
+344912900 416 160
+344916996 416 160
+344921092 416 160
+344925188 416 160
+344929284 416 160
+344933380 416 160
+344937476 416 160
+344941572 416 160
+344945668 416 160
+344949764 416 160
+344725508 416 160
+344729604 416 160
+344733700 416 160
+344737796 416 160
+344741892 416 160
+344745988 416 160
+344750084 416 160
+344754180 416 160
+344758276 416 160
+344762372 416 160
+344766468 416 160
+344770564 416 160
+344774660 416 160
+344778756 416 160
+344782852 416 160
+344786948 416 160
+344791044 416 160
+344795140 416 160
+344799236 416 160
+344803332 416 160
+344807428 416 160
+344811524 416 160
+344815620 416 160
+344819716 416 160
+344823812 416 160
+344827908 416 160
+344832004 416 160
+344836100 416 160
+344840196 416 160
+344844292 416 160
+344848388 416 160
+344852484 416 160
+344856580 416 160
+344860676 416 160
+344864772 416 160
+344868868 416 160
+344872964 416 160
+344877060 416 160
+344881156 416 160
+344885252 416 160
+344889348 416 160
+344893444 416 160
+344897540 416 160
+344901636 416 160
+344905732 416 160
+344909828 416 160
+344913924 416 160
+344918020 416 160
+344922116 416 160
+344926212 416 160
+344930308 416 160
+344934404 416 160
+344938500 416 160
+344942596 416 160
+344946692 416 160
+344950788 416 160
+344986628 416 160
+344990724 416 160
+344994820 416 160
+344998916 416 160
+345003012 416 160
+345007108 416 160
+345011204 416 160
+345015300 416 160
+345019396 416 160
+345023492 416 160
+345027588 416 160
+345031684 416 160
+345035780 416 160
+345039876 416 160
+345043972 416 160
+345048068 416 160
+345052164 416 160
+345056260 416 160
+345060356 416 160
+345064452 416 160
+345068548 416 160
+345072644 416 160
+345076740 416 160
+345080836 416 160
+345084932 416 160
+345089028 416 160
+345093124 416 160
+345097220 416 160
+345101316 416 160
+345105412 416 160
+345109508 416 160
+345113604 416 160
+345117700 416 160
+345121796 416 160
+345125892 416 160
+345129988 416 160
+345134084 416 160
+345138180 416 160
+345142276 416 160
+345146372 416 160
+345150468 416 160
+345154564 416 160
+345158660 416 160
+345162756 416 160
+345166852 416 160
+345170948 416 160
+345175044 416 160
+345179140 416 160
+345183236 416 160
+345187332 416 160
+345191428 416 160
+345195524 416 160
+345199620 416 160
+345203716 416 160
+345207812 416 160
+345211908 416 160
+344987652 416 160
+344991748 416 160
+344995844 416 160
+344999940 416 160
+345004036 416 160
+345008132 416 160
+345012228 416 160
+345016324 416 160
+345020420 416 160
+345024516 416 160
+345028612 416 160
+345032708 416 160
+345036804 416 160
+345040900 416 160
+345044996 416 160
+345049092 416 160
+345053188 416 160
+345057284 416 160
+345061380 416 160
+345065476 416 160
+345069572 416 160
+345073668 416 160
+345077764 416 160
+345081860 416 160
+345085956 416 160
+345090052 416 160
+345094148 416 160
+345098244 416 160
+345102340 416 160
+345106436 416 160
+345110532 416 160
+345114628 416 160
+345118724 416 160
+345122820 416 160
+345126916 416 160
+345131012 416 160
+345135108 416 160
+345139204 416 160
+345143300 416 160
+345147396 416 160
+345151492 416 160
+345155588 416 160
+345159684 416 160
+345163780 416 160
+345167876 416 160
+345171972 416 160
+345176068 416 160
+345180164 416 160
+345184260 416 160
+345188356 416 160
+345192452 416 160
+345196548 416 160
+345200644 416 160
+345204740 416 160
+345208836 416 160
+345212932 416 160
+345248772 416 160
+345252868 416 160
+345256964 416 160
+345261060 416 160
+345265156 416 160
+345269252 416 160
+345273348 416 160
+345277444 416 160
+345281540 416 160
+345285636 416 160
+345289732 416 160
+345293828 416 160
+345297924 416 160
+345302020 416 160
+345306116 416 160
+345310212 416 160
+345314308 416 160
+345318404 416 160
+345322500 416 160
+345326596 416 160
+345330692 416 160
+345334788 416 160
+345338884 416 160
+345342980 416 160
+345347076 416 160
+345351172 416 160
+345355268 416 160
+345359364 416 160
+345363460 416 160
+345367556 416 160
+345371652 416 160
+345375748 416 160
+345379844 416 160
+345383940 416 160
+345388036 416 160
+345392132 416 160
+345396228 416 160
+345400324 416 160
+345404420 416 160
+345408516 416 160
+345412612 416 160
+345416708 416 160
+345420804 416 160
+345424900 416 160
+345428996 416 160
+345433092 416 160
+345437188 416 160
+345441284 416 160
+345445380 416 160
+345449476 416 160
+345453572 416 160
+345457668 416 160
+345461764 416 160
+345465860 416 160
+345469956 416 160
+345474052 416 160
+345249796 416 160
+345253892 416 160
+345257988 416 160
+345262084 416 160
+345266180 416 160
+345270276 416 160
+345274372 416 160
+345278468 416 160
+345282564 416 160
+345286660 416 160
+345290756 416 160
+345294852 416 160
+345298948 416 160
+345303044 416 160
+345307140 416 160
+345311236 416 160
+345315332 416 160
+345319428 416 160
+345323524 416 160
+345327620 416 160
+345331716 416 160
+345335812 416 160
+345339908 416 160
+345344004 416 160
+345348100 416 160
+345352196 416 160
+345356292 416 160
+345360388 416 160
+345364484 416 160
+345368580 416 160
+345372676 416 160
+345376772 416 160
+345380868 416 160
+345384964 416 160
+345389060 416 160
+345393156 416 160
+345397252 416 160
+345401348 416 160
+345405444 416 160
+345409540 416 160
+345413636 416 160
+345417732 416 160
+345421828 416 160
+345425924 416 160
+345430020 416 160
+345434116 416 160
+345438212 416 160
+345442308 416 160
+345446404 416 160
+345450500 416 160
+345454596 416 160
+345458692 416 160
+345462788 416 160
+345466884 416 160
+345470980 416 160
+345475076 416 160
+345510916 416 160
+345515012 416 160
+345519108 416 160
+345523204 416 160
+345527300 416 160
+345531396 416 160
+345535492 416 160
+345539588 416 160
+345543684 416 160
+345547780 416 160
+345551876 416 160
+345555972 416 160
+345560068 416 160
+345564164 416 160
+345568260 416 160
+345572356 416 160
+345576452 416 160
+345580548 416 160
+345584644 416 160
+345588740 416 160
+345592836 416 160
+345596932 416 160
+345601028 416 160
+345605124 416 160
+345609220 416 160
+345613316 416 160
+345617412 416 160
+345621508 416 160
+345625604 416 160
+345629700 416 160
+345633796 416 160
+345637892 416 160
+345641988 416 160
+345646084 416 160
+345650180 416 160
+345654276 416 160
+345658372 416 160
+345662468 416 160
+345666564 416 160
+345670660 416 160
+345674756 416 160
+345678852 416 160
+345682948 416 160
+345687044 416 160
+345691140 416 160
+345695236 416 160
+345699332 416 160
+345703428 416 160
+345707524 416 160
+345711620 416 160
+345715716 416 160
+345719812 416 160
+345723908 416 160
+345728004 416 160
+345732100 416 160
+345736196 416 160
+345511940 416 160
+345516036 416 160
+345520132 416 160
+345524228 416 160
+345528324 416 160
+345532420 416 160
+345536516 416 160
+345540612 416 160
+345544708 416 160
+345548804 416 160
+345552900 416 160
+345556996 416 160
+345561092 416 160
+345565188 416 160
+345569284 416 160
+345573380 416 160
+345577476 416 160
+345581572 416 160
+345585668 416 160
+345589764 416 160
+345593860 416 160
+345597956 416 160
+345602052 416 160
+345606148 416 160
+345610244 416 160
+345614340 416 160
+345618436 416 160
+345622532 416 160
+345626628 416 160
+345630724 416 160
+345634820 416 160
+345638916 416 160
+345643012 416 160
+345647108 416 160
+345651204 416 160
+345655300 416 160
+345659396 416 160
+345663492 416 160
+345667588 416 160
+345671684 416 160
+345675780 416 160
+345679876 416 160
+345683972 416 160
+345688068 416 160
+345692164 416 160
+345696260 416 160
+345700356 416 160
+345704452 416 160
+345708548 416 160
+345712644 416 160
+345716740 416 160
+345720836 416 160
+345724932 416 160
+345729028 416 160
+345733124 416 160
+345737220 416 160
+345773060 416 160
+345777156 416 160
+345781252 416 160
+345785348 416 160
+345789444 416 160
+345793540 416 160
+345797636 416 160
+345801732 416 160
+345805828 416 160
+345809924 416 160
+345814020 416 160
+345818116 416 160
+345822212 416 160
+345826308 416 160
+345830404 416 160
+345834500 416 160
+345838596 416 160
+345842692 416 160
+345846788 416 160
+345850884 416 160
+345854980 416 160
+345859076 416 160
+345863172 416 160
+345867268 416 160
+345871364 416 160
+345875460 416 160
+345879556 416 160
+345883652 416 160
+345887748 416 160
+345891844 416 160
+345895940 416 160
+345900036 416 160
+345904132 416 160
+345908228 416 160
+345912324 416 160
+345916420 416 160
+345920516 416 160
+345924612 416 160
+345928708 416 160
+345932804 416 160
+345936900 416 160
+345940996 416 160
+345945092 416 160
+345949188 416 160
+345953284 416 160
+345957380 416 160
+345961476 416 160
+345965572 416 160
+345969668 416 160
+345973764 416 160
+345977860 416 160
+345981956 416 160
+345986052 416 160
+345990148 416 160
+345994244 416 160
+345998340 416 160
+345774084 416 160
+345778180 416 160
+345782276 416 160
+345786372 416 160
+345790468 416 160
+345794564 416 160
+345798660 416 160
+345802756 416 160
+345806852 416 160
+345810948 416 160
+345815044 416 160
+345819140 416 160
+345823236 416 160
+345827332 416 160
+345831428 416 160
+345835524 416 160
+345839620 416 160
+345843716 416 160
+345847812 416 160
+345851908 416 160
+345856004 416 160
+345860100 416 160
+345864196 416 160
+345868292 416 160
+345872388 416 160
+345876484 416 160
+345880580 416 160
+345884676 416 160
+345888772 416 160
+345892868 416 160
+345896964 416 160
+345901060 416 160
+345905156 416 160
+345909252 416 160
+345913348 416 160
+345917444 416 160
+345921540 416 160
+345925636 416 160
+345929732 416 160
+345933828 416 160
+345937924 416 160
+345942020 416 160
+345946116 416 160
+345950212 416 160
+345954308 416 160
+345958404 416 160
+345962500 416 160
+345966596 416 160
+345970692 416 160
+345974788 416 160
+345978884 416 160
+345982980 416 160
+345987076 416 160
+345991172 416 160
+345995268 416 160
+345999364 416 160
+346035204 416 160
+346039300 416 160
+346043396 416 160
+346047492 416 160
+346051588 416 160
+346055684 416 160
+346059780 416 160
+346063876 416 160
+346067972 416 160
+346072068 416 160
+346076164 416 160
+346080260 416 160
+346084356 416 160
+346088452 416 160
+346092548 416 160
+346096644 416 160
+346100740 416 160
+346104836 416 160
+346108932 416 160
+346113028 416 160
+346117124 416 160
+346121220 416 160
+346125316 416 160
+346129412 416 160
+346133508 416 160
+346137604 416 160
+346141700 416 160
+346145796 416 160
+346149892 416 160
+346153988 416 160
+346158084 416 160
+346162180 416 160
+346166276 416 160
+346170372 416 160
+346036228 416 160
+346040324 416 160
+346044420 416 160
+346048516 416 160
+346052612 416 160
+346056708 416 160
+346060804 416 160
+346064900 416 160
+346068996 416 160
+346073092 416 160
+346077188 416 160
+346081284 416 160
+346085380 416 160
+346089476 416 160
+346093572 416 160
+346097668 416 160
+346101764 416 160
+346105860 416 160
+346109956 416 160
+346114052 416 160
+346118148 416 160
+346122244 416 160
+346126340 416 160
+346130436 416 160
+346134532 416 160
+346138628 416 160
+346142724 416 160
+346146820 416 160
+346150916 416 160
+346155012 416 160
+346159108 416 160
+346163204 416 160
+346167300 416 160
+346171396 416 160
+346297348 416 160
+346301444 416 160
+346305540 416 160
+346309636 416 160
+346313732 416 160
+346317828 416 160
+346321924 416 160
+346326020 416 160
+346330116 416 160
+346334212 416 160
+346338308 416 160
+346342404 416 160
+346346500 416 160
+346350596 416 160
+346354692 416 160
+346358788 416 160
+346362884 416 160
+346366980 416 160
+346371076 416 160
+346375172 416 160
+346379268 416 160
+346383364 416 160
+346387460 416 160
+346391556 416 160
+346395652 416 160
+346399748 416 160
+346403844 416 160
+346407940 416 160
+346412036 416 160
+346416132 416 160
+346420228 416 160
+346424324 416 160
+346428420 416 160
+346432516 416 160
+346298372 416 160
+346302468 416 160
+346306564 416 160
+346310660 416 160
+346314756 416 160
+346318852 416 160
+346322948 416 160
+346327044 416 160
+346331140 416 160
+346335236 416 160
+346339332 416 160
+346343428 416 160
+346347524 416 160
+346351620 416 160
+346355716 416 160
+346359812 416 160
+346363908 416 160
+346368004 416 160
+346372100 416 160
+346376196 416 160
+346380292 416 160
+346384388 416 160
+346388484 416 160
+346392580 416 160
+346396676 416 160
+346400772 416 160
+346404868 416 160
+346408964 416 160
+346413060 416 160
+346417156 416 160
+346421252 416 160
+346425348 416 160
+346429444 416 160
+346433540 416 160
+346559492 416 160
+346563588 416 160
+346567684 416 160
+346571780 416 160
+346575876 416 160
+346579972 416 160
+346584068 416 160
+346588164 416 160
+346592260 416 160
+346596356 416 160
+346600452 416 160
+346604548 416 160
+346608644 416 160
+346612740 416 160
+346616836 416 160
+346620932 416 160
+346625028 416 160
+346629124 416 160
+346633220 416 160
+346637316 416 160
+346641412 416 160
+346645508 416 160
+346649604 416 160
+346653700 416 160
+346657796 416 160
+346661892 416 160
+346665988 416 160
+346670084 416 160
+346674180 416 160
+346678276 416 160
+346682372 416 160
+346686468 416 160
+346690564 416 160
+346694660 416 160
+346560516 416 160
+346564612 416 160
+346568708 416 160
+346572804 416 160
+346576900 416 160
+346580996 416 160
+346585092 416 160
+346589188 416 160
+346593284 416 160
+346597380 416 160
+346601476 416 160
+346605572 416 160
+346609668 416 160
+346613764 416 160
+346617860 416 160
+346621956 416 160
+346626052 416 160
+346630148 416 160
+346634244 416 160
+346638340 416 160
+346642436 416 160
+346646532 416 160
+346650628 416 160
+346654724 416 160
+346658820 416 160
+346662916 416 160
+346667012 416 160
+346671108 416 160
+346675204 416 160
+346679300 416 160
+346683396 416 160
+346687492 416 160
+346691588 416 160
+346695684 416 160
diff --git a/SLHCUpgradeSimulations/Geometry/python/fakeConditions_Phase1Pixel10D_cff.py b/SLHCUpgradeSimulations/Geometry/python/fakeConditions_Phase1Pixel10D_cff.py
new file mode 100644
index 0000000000000..b070e61653fbe
--- /dev/null
+++ b/SLHCUpgradeSimulations/Geometry/python/fakeConditions_Phase1Pixel10D_cff.py
@@ -0,0 +1,46 @@
+import FWCore.ParameterSet.Config as cms
+
+siPixelFakeGainOfflineESSource = cms.ESSource("SiPixelFakeGainOfflineESSource",
+        file = 
+cms.FileInPath('SLHCUpgradeSimulations/Geometry/data/PhaseI/Pixel10D/EmptyPixelSkimmedGeometry.txt')
+        )
+es_prefer_fake_gain = cms.ESPrefer("SiPixelFakeGainOfflineESSource","siPixelFakeGainOfflineESSource")
+
+siPixelFakeLorentzAngleESSource = cms.ESSource("SiPixelFakeLorentzAngleESSource",
+        file = 
+cms.FileInPath('SLHCUpgradeSimulations/Geometry/data/PhaseI/Pixel10D/PixelSkimmedGeometry.txt')
+        )
+es_prefer_fake_lorentz = cms.ESPrefer("SiPixelFakeLorentzAngleESSource","siPixelFakeLorentzAngleESSource")
+
+from RecoVertex.BeamSpotProducer.BeamSpotFakeParameters_cfi import *
+BeamSpotFakeConditions.X0 = cms.double(0.0)
+BeamSpotFakeConditions.Y0 = cms.double(0.0)
+BeamSpotFakeConditions.Z0 = cms.double(0.0)
+BeamSpotFakeConditions.dxdz = cms.double(0.0)
+BeamSpotFakeConditions.dydz = cms.double(0.0)
+BeamSpotFakeConditions.sigmaZ = cms.double(5.3)
+BeamSpotFakeConditions.widthX = cms.double(0.015)
+BeamSpotFakeConditions.widthY = cms.double(0.015)
+BeamSpotFakeConditions.emittanceX = cms.double(0.)
+BeamSpotFakeConditions.emittanceY = cms.double(0.)
+BeamSpotFakeConditions.betaStar = cms.double(0.)
+BeamSpotFakeConditions.errorX0 = cms.double(0.00208)
+BeamSpotFakeConditions.errorY0 = cms.double(0.00208)
+BeamSpotFakeConditions.errorZ0 = cms.double(0.00508)
+BeamSpotFakeConditions.errordxdz = cms.double(0.0)
+BeamSpotFakeConditions.errordydz = cms.double(0.0)
+BeamSpotFakeConditions.errorSigmaZ = cms.double(0.060)
+BeamSpotFakeConditions.errorWidth = cms.double(0.0013)
+
+es_prefer_beamspot = cms.ESPrefer("BeamSpotFakeConditions","")
+
+from SimGeneral.TrackingAnalysis.trackingParticles_cfi import *
+mergedtruth.volumeRadius = cms.double(100.0)
+mergedtruth.volumeZ = cms.double(900.0)
+mergedtruth.discardOutVolume = cms.bool(True)
+
+
+#from Geometry.TrackerNumberingBuilder.pixelSLHCGeometryConstants_cfi import *
+from Geometry.TrackerGeometryBuilder.idealForDigiTrackerSLHCGeometry_cff import *
+
+
diff --git a/Validation/CheckOverlap/test/python/runShashlik_cfg.py b/Validation/CheckOverlap/test/python/runShashlik_cfg.py
index 0d28a72419a9d..d502ec08185e8 100644
--- a/Validation/CheckOverlap/test/python/runShashlik_cfg.py
+++ b/Validation/CheckOverlap/test/python/runShashlik_cfg.py
@@ -3,7 +3,7 @@
 process = cms.Process("PROD")
 process.load("SimGeneral.HepPDTESSource.pdt_cfi")
 
-process.load("Geometry.HGCalCommonData.shashlikCapsuleGeometryXML_cfi")
+process.load("Geometry.HGCalCommonData.testShashlikXML_cfi")
 
 process.load("SimG4Core.Application.g4SimHits_cfi")
 
@@ -59,6 +59,6 @@
 process.g4SimHits.Watchers = cms.VPSet(cms.PSet(
     type       = cms.string('CheckOverlap'),
     Resolution = cms.untracked.int32(1000),
-    NodeNames  = cms.untracked.vstring('ShashlikCapsule')
+    NodeNames  = cms.untracked.vstring('CALO')
 ))