Commit in LCDetectors/detectors on MAIN
clic_sid_cdr/clic_sid_cdr_pandora.xml+6-61.7 -> 1.8
sidloi_opt_scint/sidloi_opt_scint_pandora.xml+226-2251.10 -> 1.11
+232-231
2 modified files

LCDetectors/detectors/clic_sid_cdr
clic_sid_cdr_pandora.xml 1.7 -> 1.8
diff -u -r1.7 -r1.8
--- clic_sid_cdr_pandora.xml	4 May 2011 10:15:13 -0000	1.7
+++ clic_sid_cdr_pandora.xml	9 May 2012 21:28:26 -0000	1.8
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <pandoraSetup>
   <calorimeters>
-    <calorimeter type="EM_ENDCAP" innerR="210.0" innerZ="1657.0" innerPhi="0.5235987755982988" innerSymmetryOrder="12.0" outerR="1250.0" outerZ="1795.5" outerPhi="0.5235987755982988" outerSymmetryOrder="12.0" collection="EcalEndcapHits" cellSizeU="3.5" cellSizeV="3.5" mipEnergy="0.000096" mipSigma="0.000012" mipCut="0.00006" timeCut="100" digital="false">
+    <calorimeter type="EM_ENDCAP" innerR="210.0" innerZ="1657.0" innerPhi="0.5235987755982988" innerSymmetryOrder="12.0" outerR="1294.0952255126037" outerZ="1795.5" outerPhi="0.5235987755982988" outerSymmetryOrder="12.0" collection="EcalEndcapHits" cellSizeU="3.5" cellSizeV="3.5" mipEnergy="0.000096" mipSigma="0.000012" mipCut="0.00006" timeCut="100" digital="false">
       <id>
         <field name="system" length="6" start="0" signed="false" />
         <field name="barrel" length="3" start="6" signed="false" />
@@ -45,7 +45,7 @@
         <layer radLen="1.35883528" intLen="0.04892878" distanceToIp="1794.66" cellThickness="6.25" samplingFraction="0.00845302" emSamplingFraction="0.00845302" hadSamplingFraction="0.00907127" />
       </layers>
     </calorimeter>
-    <calorimeter type="HAD_BARREL" innerR="1419.0" innerZ="-1765.0" innerPhi="0.5235987755982988" innerSymmetryOrder="12.0" outerR="2656.5" outerZ="1765.0" outerPhi="0.5235987755982988" outerSymmetryOrder="12.0" collection="HcalBarrelHits" cellSizeU="30.0" cellSizeV="30.0" mipEnergy="0.00085" mipSigma="0.000081" mipCut="0.0006" timeCut="100" digital="false">
+    <calorimeter type="HAD_BARREL" innerR="1419.0" innerZ="-1765.0" innerPhi="0.5235987755982988" innerSymmetryOrder="12.0" outerR="2750.2111732593858" outerZ="1765.0" outerPhi="0.5235987755982988" outerSymmetryOrder="12.0" collection="HcalBarrelHits" cellSizeU="30.0" cellSizeV="30.0" mipEnergy="0.00085" mipSigma="0.000081" mipCut="0.0006" timeCut="100" digital="false">
       <id>
         <field name="system" length="6" start="0" signed="false" />
         <field name="barrel" length="3" start="6" signed="false" />
@@ -133,7 +133,7 @@
         <layer radLen="2.72336257" intLen="0.10619064" distanceToIp="2652.5" cellThickness="16.5" samplingFraction="0.04605009" emSamplingFraction="0.04850168" hadSamplingFraction="0.04605009" />
       </layers>
     </calorimeter>
-    <calorimeter type="MUON_BARREL" innerR="3581.2111732593858" innerZ="-3575.0" innerPhi="0.7853981633974483" innerSymmetryOrder="8.0" outerR="6251.211173259386" outerZ="3575.0" outerPhi="0.7853981633974483" outerSymmetryOrder="8.0" collection="MuonBarrelHits" cellSizeU="30.0" cellSizeV="30.0" mipEnergy="0.00085" mipSigma="0.000081" mipCut="0" timeCut="100" digital="true">
+    <calorimeter type="MUON_BARREL" innerR="3581.2111732593858" innerZ="-3575.0" innerPhi="0.7853981633974483" innerSymmetryOrder="8.0" outerR="6766.262216316624" outerZ="3575.0" outerPhi="0.7853981633974483" outerSymmetryOrder="8.0" collection="MuonBarrelHits" cellSizeU="30.0" cellSizeV="30.0" mipEnergy="0.00085" mipSigma="0.000081" mipCut="0" timeCut="100" digital="true">
       <id>
         <field name="system" length="8" start="0" signed="false" />
         <field name="barrel" length="3" start="8" signed="false" />
@@ -164,7 +164,7 @@
         <layer radLen="11.46520559" intLen="1.20022601" distanceToIp="6018.711173" cellThickness="240" samplingFraction="1" emSamplingFraction="1" hadSamplingFraction="1" />
       </layers>
     </calorimeter>
-    <calorimeter type="HAD_ENDCAP" innerR="500.0" innerZ="1805.0" innerPhi="0.5235987755982988" innerSymmetryOrder="12.0" outerR="2656.5" outerZ="3395.0" outerPhi="0.5235987755982988" outerSymmetryOrder="12.0" collection="HcalEndcapHits" cellSizeU="30.0" cellSizeV="30.0" mipEnergy="0.00085" mipSigma="0.000081" mipCut="0.0006" timeCut="100" digital="false">
+    <calorimeter type="HAD_ENDCAP" innerR="500.0" innerZ="1805.0" innerPhi="0.5235987755982988" innerSymmetryOrder="12.0" outerR="2750.2111732593858" outerZ="3395.0" outerPhi="0.5235987755982988" outerSymmetryOrder="12.0" collection="HcalEndcapHits" cellSizeU="30.0" cellSizeV="30.0" mipEnergy="0.00085" mipSigma="0.000081" mipCut="0.0006" timeCut="100" digital="false">
       <id>
         <field name="system" length="6" start="0" signed="false" />
         <field name="barrel" length="3" start="6" signed="false" />
@@ -237,7 +237,7 @@
         <layer radLen="1.15733587" intLen="0.12920782" distanceToIp="3391" cellThickness="26.5" samplingFraction="0.03496144" emSamplingFraction="0.0333915" hadSamplingFraction="0.03496144" />
       </layers>
     </calorimeter>
-    <calorimeter type="MUON_ENDCAP" innerR="690.0" innerZ="3675.0" innerPhi="0.7853981633974483" innerSymmetryOrder="8.0" outerR="6251.211173259386" outerZ="6195.0" outerPhi="0.7853981633974483" outerSymmetryOrder="8.0" collection="MuonEndcapHits" cellSizeU="30.0" cellSizeV="30.0" mipEnergy="0.00085" mipSigma="0.000081" mipCut="0" timeCut="100" digital="true">
+    <calorimeter type="MUON_ENDCAP" innerR="690.0" innerZ="3675.0" innerPhi="0.7853981633974483" innerSymmetryOrder="8.0" outerR="6766.262216316624" outerZ="6195.0" outerPhi="0.7853981633974483" outerSymmetryOrder="8.0" collection="MuonEndcapHits" cellSizeU="30.0" cellSizeV="30.0" mipEnergy="0.00085" mipSigma="0.000081" mipCut="0" timeCut="100" digital="true">
       <id>
         <field name="system" length="8" start="0" signed="false" />
         <field name="barrel" length="3" start="8" signed="false" />
@@ -268,7 +268,7 @@
         <layer radLen="5.77527278" intLen="0.6105686" distanceToIp="6162.5" cellThickness="140" samplingFraction="1" emSamplingFraction="1" hadSamplingFraction="1" />
       </layers>
     </calorimeter>
-    <calorimeter type="EM_BARREL" innerR="1265.0" innerZ="-1765.0" innerPhi="0.5235987755982988" innerSymmetryOrder="12.0" outerR="1403.5" outerZ="1765.0" outerPhi="0.5235987755982988" outerSymmetryOrder="12.0" collection="EcalBarrelHits" cellSizeU="3.5" cellSizeV="3.5" mipEnergy="0.000096" mipSigma="0.000012" mipCut="0.00006" timeCut="100" digital="false">
+    <calorimeter type="EM_BARREL" innerR="1265.0" innerZ="-1765.0" innerPhi="0.5235987755982988" innerSymmetryOrder="12.0" outerR="1453.0101192055515" outerZ="1765.0" outerPhi="0.5235987755982988" outerSymmetryOrder="12.0" collection="EcalBarrelHits" cellSizeU="3.5" cellSizeV="3.5" mipEnergy="0.000096" mipSigma="0.000012" mipCut="0.00006" timeCut="100" digital="false">
       <id>
         <field name="system" length="6" start="0" signed="false" />
         <field name="barrel" length="3" start="6" signed="false" />

LCDetectors/detectors/sidloi_opt_scint
sidloi_opt_scint_pandora.xml 1.10 -> 1.11
diff -u -r1.10 -r1.11
--- sidloi_opt_scint_pandora.xml	27 Jul 2010 23:17:40 -0000	1.10
+++ sidloi_opt_scint_pandora.xml	9 May 2012 21:28:26 -0000	1.11
@@ -1,21 +1,124 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <pandoraSetup>
   <calorimeters>
-    <calorimeter type="MUON_ENDCAP" innerR="200.0" innerZ="3500.0" innerPhi="0.0" innerSymmetryOrder="8.0" outerR="6005.216961323364" outerZ="3501.0" outerPhi="0.0" outerSymmetryOrder="8.0" collection="MuonEndcapHits" cellSizeU="30.0" cellSizeV="30.0" mipEnergy="0.00085" mipSigma="0.000081" mipCut="0" timeCut="100" digital="true">
+    <calorimeter type="EM_ENDCAP" innerR="200.0" innerZ="1657.0" innerPhi="0.5235987755982988" innerSymmetryOrder="12.0" outerR="1309.0" outerZ="1795.5" outerPhi="0.5235987755982988" outerSymmetryOrder="12.0" collection="EcalEndcapHits" cellSizeU="3.5" cellSizeV="3.5" mipEnergy="0.000095" mipSigma="0.000012" mipCut="0.00006" timeCut="100" digital="false">
       <id>
-        <field name="system" length="8" start="0" signed="false" />
-        <field name="barrel" length="3" start="8" signed="false" />
-        <field name="module" length="4" start="11" signed="false" />
-        <field name="layer" length="8" start="15" signed="false" />
-        <field name="slice" length="5" start="23" signed="false" />
+        <field name="system" length="6" start="0" signed="false" />
+        <field name="barrel" length="3" start="6" signed="false" />
+        <field name="module" length="4" start="9" signed="false" />
+        <field name="layer" length="6" start="13" signed="false" />
+        <field name="slice" length="5" start="19" signed="false" />
         <field name="x" length="16" start="32" signed="true" />
         <field name="y" length="16" start="48" signed="true" />
       </id>
-      <layers nlayers="1">
-        <layer radLen="0.02729665" intLen="0.01129335" distanceToIp="3500" cellThickness="0" samplingFraction="1" emSamplingFraction="1" hadSamplingFraction="1" />
+      <layers nlayers="31">
+        <layer radLen="0.00787212" intLen="0.00153933" distanceToIp="1657.16" cellThickness="1" samplingFraction="1" emSamplingFraction="1" hadSamplingFraction="1" />
+        <layer radLen="0.68335411" intLen="0.02523423" distanceToIp="1660.91" cellThickness="3.75" samplingFraction="0.01703319" emSamplingFraction="0.01703319" hadSamplingFraction="0.01416876" />
+        <layer radLen="0.68335411" intLen="0.02523423" distanceToIp="1664.66" cellThickness="3.75" samplingFraction="0.01703319" emSamplingFraction="0.01703319" hadSamplingFraction="0.01416876" />
+        <layer radLen="0.68335411" intLen="0.02523423" distanceToIp="1668.41" cellThickness="3.75" samplingFraction="0.01703319" emSamplingFraction="0.01703319" hadSamplingFraction="0.01416876" />
+        <layer radLen="0.68335411" intLen="0.02523423" distanceToIp="1672.16" cellThickness="3.75" samplingFraction="0.01703319" emSamplingFraction="0.01703319" hadSamplingFraction="0.01416876" />
+        <layer radLen="0.68335411" intLen="0.02523423" distanceToIp="1675.91" cellThickness="3.75" samplingFraction="0.01703319" emSamplingFraction="0.01703319" hadSamplingFraction="0.01416876" />
+        <layer radLen="0.68335411" intLen="0.02523423" distanceToIp="1679.66" cellThickness="3.75" samplingFraction="0.01703319" emSamplingFraction="0.01703319" hadSamplingFraction="0.01416876" />
+        <layer radLen="0.68335411" intLen="0.02523423" distanceToIp="1683.41" cellThickness="3.75" samplingFraction="0.01703319" emSamplingFraction="0.01703319" hadSamplingFraction="0.01416876" />
+        <layer radLen="0.68335411" intLen="0.02523423" distanceToIp="1687.16" cellThickness="3.75" samplingFraction="0.01703319" emSamplingFraction="0.01703319" hadSamplingFraction="0.01416876" />
+        <layer radLen="0.68335411" intLen="0.02523423" distanceToIp="1690.91" cellThickness="3.75" samplingFraction="0.01703319" emSamplingFraction="0.01703319" hadSamplingFraction="0.01416876" />
+        <layer radLen="0.68335411" intLen="0.02523423" distanceToIp="1694.66" cellThickness="3.75" samplingFraction="0.01703319" emSamplingFraction="0.01703319" hadSamplingFraction="0.01416876" />
+        <layer radLen="0.68335411" intLen="0.02523423" distanceToIp="1698.41" cellThickness="3.75" samplingFraction="0.01703319" emSamplingFraction="0.01703319" hadSamplingFraction="0.01416876" />
+        <layer radLen="0.68335411" intLen="0.02523423" distanceToIp="1702.16" cellThickness="3.75" samplingFraction="0.01703319" emSamplingFraction="0.01703319" hadSamplingFraction="0.01416876" />
+        <layer radLen="0.68335411" intLen="0.02523423" distanceToIp="1705.91" cellThickness="3.75" samplingFraction="0.01703319" emSamplingFraction="0.01703319" hadSamplingFraction="0.01416876" />
+        <layer radLen="0.68335411" intLen="0.02523423" distanceToIp="1709.66" cellThickness="3.75" samplingFraction="0.01703319" emSamplingFraction="0.01703319" hadSamplingFraction="0.01416876" />
+        <layer radLen="0.68335411" intLen="0.02523423" distanceToIp="1713.41" cellThickness="3.75" samplingFraction="0.01703319" emSamplingFraction="0.01703319" hadSamplingFraction="0.01416876" />
+        <layer radLen="0.68335411" intLen="0.02523423" distanceToIp="1717.16" cellThickness="3.75" samplingFraction="0.01703319" emSamplingFraction="0.01703319" hadSamplingFraction="0.01416876" />
+        <layer radLen="0.68335411" intLen="0.02523423" distanceToIp="1720.91" cellThickness="3.75" samplingFraction="0.01703319" emSamplingFraction="0.01703319" hadSamplingFraction="0.01416876" />
+        <layer radLen="0.68335411" intLen="0.02523423" distanceToIp="1724.66" cellThickness="3.75" samplingFraction="0.01703319" emSamplingFraction="0.01703319" hadSamplingFraction="0.01416876" />
+        <layer radLen="0.68335411" intLen="0.02523423" distanceToIp="1728.41" cellThickness="3.75" samplingFraction="0.01703319" emSamplingFraction="0.01703319" hadSamplingFraction="0.01416876" />
+        <layer radLen="0.68335411" intLen="0.02523423" distanceToIp="1732.16" cellThickness="3.75" samplingFraction="0.01703319" emSamplingFraction="0.01703319" hadSamplingFraction="0.01416876" />
+        <layer radLen="1.35883528" intLen="0.04892878" distanceToIp="1738.41" cellThickness="6.25" samplingFraction="0.00848287" emSamplingFraction="0.00848287" hadSamplingFraction="0.0081618" />
+        <layer radLen="1.35883528" intLen="0.04892878" distanceToIp="1744.66" cellThickness="6.25" samplingFraction="0.00848287" emSamplingFraction="0.00848287" hadSamplingFraction="0.0081618" />
+        <layer radLen="1.35883528" intLen="0.04892878" distanceToIp="1750.91" cellThickness="6.25" samplingFraction="0.00848287" emSamplingFraction="0.00848287" hadSamplingFraction="0.0081618" />
+        <layer radLen="1.35883528" intLen="0.04892878" distanceToIp="1757.16" cellThickness="6.25" samplingFraction="0.00848287" emSamplingFraction="0.00848287" hadSamplingFraction="0.0081618" />
+        <layer radLen="1.35883528" intLen="0.04892878" distanceToIp="1763.41" cellThickness="6.25" samplingFraction="0.00848287" emSamplingFraction="0.00848287" hadSamplingFraction="0.0081618" />
+        <layer radLen="1.35883528" intLen="0.04892878" distanceToIp="1769.66" cellThickness="6.25" samplingFraction="0.00848287" emSamplingFraction="0.00848287" hadSamplingFraction="0.0081618" />
+        <layer radLen="1.35883528" intLen="0.04892878" distanceToIp="1775.91" cellThickness="6.25" samplingFraction="0.00848287" emSamplingFraction="0.00848287" hadSamplingFraction="0.0081618" />
+        <layer radLen="1.35883528" intLen="0.04892878" distanceToIp="1782.16" cellThickness="6.25" samplingFraction="0.00848287" emSamplingFraction="0.00848287" hadSamplingFraction="0.0081618" />
+        <layer radLen="1.35883528" intLen="0.04892878" distanceToIp="1788.41" cellThickness="6.25" samplingFraction="0.00848287" emSamplingFraction="0.00848287" hadSamplingFraction="0.0081618" />
+        <layer radLen="1.35883528" intLen="0.04892878" distanceToIp="1794.66" cellThickness="6.25" samplingFraction="0.00848287" emSamplingFraction="0.00848287" hadSamplingFraction="0.0081618" />
+      </layers>
+    </calorimeter>
+    <calorimeter type="HAD_BARREL" innerR="1404.0" innerZ="-3478.0" innerPhi="0.5235987755982988" innerSymmetryOrder="12.0" outerR="2938.113800003817" outerZ="3478.0" outerPhi="0.5235987755982988" outerSymmetryOrder="12.0" collection="HcalBarrelHits" cellSizeU="10.0" cellSizeV="10.0" mipEnergy="0.00051" mipSigma="0.000048" mipCut="0.00036" timeCut="100" digital="false">
+      <id>
+        <field name="system" length="6" start="0" signed="false" />
+        <field name="barrel" length="3" start="6" signed="false" />
+        <field name="module" length="4" start="9" signed="false" />
+        <field name="layer" length="6" start="13" signed="false" />
+        <field name="slice" length="5" start="19" signed="false" />
+        <field name="x" length="16" start="32" signed="true" />
+        <field name="y" length="16" start="48" signed="true" />
+      </id>
+      <layers nlayers="60">
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="1424.4" cellThickness="23.9" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="1448.3" cellThickness="23.9" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="1472.2" cellThickness="23.9" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="1496.1" cellThickness="23.9" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="1520" cellThickness="23.9" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="1543.9" cellThickness="23.9" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="1567.8" cellThickness="23.9" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="1591.7" cellThickness="23.9" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="1615.6" cellThickness="23.9" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="1639.5" cellThickness="23.9" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="1663.4" cellThickness="23.9" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="1687.3" cellThickness="23.9" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="1711.2" cellThickness="23.9" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="1735.1" cellThickness="23.9" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="1759" cellThickness="23.9" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="1782.9" cellThickness="23.9" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="1806.8" cellThickness="23.9" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="1830.7" cellThickness="23.9" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="1854.6" cellThickness="23.9" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="1878.5" cellThickness="23.9" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="1902.4" cellThickness="23.9" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="1926.3" cellThickness="23.9" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="1950.2" cellThickness="23.9" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="1974.1" cellThickness="23.9" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="1998" cellThickness="23.9" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="2021.9" cellThickness="23.9" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="2045.8" cellThickness="23.9" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="2069.7" cellThickness="23.9" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="2093.6" cellThickness="23.9" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="2117.5" cellThickness="23.9" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="2141.4" cellThickness="23.9" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="2165.3" cellThickness="23.9" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="2189.2" cellThickness="23.9" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="2213.1" cellThickness="23.9" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="2237" cellThickness="23.9" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="2260.9" cellThickness="23.9" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="2284.8" cellThickness="23.9" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="2308.7" cellThickness="23.9" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="2332.6" cellThickness="23.9" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="2356.5" cellThickness="23.9" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="2380.4" cellThickness="23.9" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="2404.3" cellThickness="23.9" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="2428.2" cellThickness="23.9" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="2452.1" cellThickness="23.9" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="2476" cellThickness="23.9" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="2499.9" cellThickness="23.9" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="2523.8" cellThickness="23.9" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="2547.7" cellThickness="23.9" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="2571.6" cellThickness="23.9" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="2595.5" cellThickness="23.9" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="2619.4" cellThickness="23.9" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="2643.3" cellThickness="23.9" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="2667.2" cellThickness="23.9" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="2691.1" cellThickness="23.9" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="2715" cellThickness="23.9" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="2738.9" cellThickness="23.9" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="2762.8" cellThickness="23.9" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="2786.7" cellThickness="23.9" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="2810.6" cellThickness="23.9" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="2834.5" cellThickness="23.9" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
       </layers>
     </calorimeter>
-    <calorimeter type="MUON_BARREL" innerR="4000.0" innerZ="-1500.0" innerPhi="0.0" innerSymmetryOrder="8.0" outerR="4001.0" outerZ="1500.0" outerPhi="0.0" outerSymmetryOrder="8.0" collection="MuonBarrelHits" cellSizeU="30.0" cellSizeV="30.0" mipEnergy="0.00085" mipSigma="0.000081" mipCut="0" timeCut="100" digital="true">
+    <calorimeter type="MUON_BARREL" innerR="4000.0" innerZ="-1500.0" innerPhi="0.7853981633974483" innerSymmetryOrder="8.0" outerR="4330.651193369868" outerZ="1500.0" outerPhi="0.7853981633974483" outerSymmetryOrder="8.0" collection="MuonBarrelHits" cellSizeU="30.0" cellSizeV="30.0" mipEnergy="0.00085" mipSigma="0.000081" mipCut="0" timeCut="100" digital="true">
       <id>
         <field name="system" length="8" start="0" signed="false" />
         <field name="barrel" length="3" start="8" signed="false" />
@@ -26,10 +129,10 @@
         <field name="y" length="16" start="48" signed="true" />
       </id>
       <layers nlayers="1">
-        <layer radLen="0.02729665" intLen="0.01129335" distanceToIp="4000" cellThickness="0" samplingFraction="1" emSamplingFraction="1" hadSamplingFraction="1" />
+        <layer radLen="0.00000332" intLen="0.00000141" distanceToIp="4000" cellThickness="1" samplingFraction="1" emSamplingFraction="1" hadSamplingFraction="1" />
       </layers>
     </calorimeter>
-    <calorimeter type="HAD_ENDCAP" innerR="200.0" innerZ="1805.0" innerPhi="0.0" innerSymmetryOrder="12.0" outerR="1403.4902255980162" outerZ="3478.000000000002" outerPhi="0.0" outerSymmetryOrder="12.0" collection="HcalEndcapHits" cellSizeU="10.0" cellSizeV="10.0" mipEnergy="0.00051" mipSigma="0.000048" mipCut="0.00036" timeCut="100" digital="false">
+    <calorimeter type="HAD_ENDCAP" innerR="200.0" innerZ="1805.0" innerPhi="0.5235987755982988" innerSymmetryOrder="12.0" outerR="1453.0" outerZ="3478.000000000002" outerPhi="0.5235987755982988" outerSymmetryOrder="12.0" collection="HcalEndcapHits" cellSizeU="10.0" cellSizeV="10.0" mipEnergy="0.00051" mipSigma="0.000048" mipCut="0.00036" timeCut="100" digital="false">
       <id>
         <field name="system" length="6" start="0" signed="false" />
         <field name="barrel" length="3" start="6" signed="false" />
@@ -40,196 +143,93 @@
         <field name="y" length="16" start="48" signed="true" />
       </id>
       <layers nlayers="70">
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="1825.4" cellThickness="3" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="1849.3" cellThickness="3" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="1873.2" cellThickness="3" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="1897.1" cellThickness="3" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="1921" cellThickness="3" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="1944.9" cellThickness="3" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="1968.8" cellThickness="3" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="1992.7" cellThickness="3" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="2016.6" cellThickness="3" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="2040.5" cellThickness="3" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="2064.4" cellThickness="3" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="2088.3" cellThickness="3" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="2112.2" cellThickness="3" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="2136.1" cellThickness="3" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="2160" cellThickness="3" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="2183.9" cellThickness="3" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="2207.8" cellThickness="3" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="2231.7" cellThickness="3" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="2255.6" cellThickness="3" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="2279.5" cellThickness="3" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="2303.4" cellThickness="3" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="2327.3" cellThickness="3" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="2351.2" cellThickness="3" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="2375.1" cellThickness="3" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="2399" cellThickness="3" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="2422.9" cellThickness="3" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="2446.8" cellThickness="3" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="2470.7" cellThickness="3" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="2494.6" cellThickness="3" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="2518.5" cellThickness="3" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="2542.4" cellThickness="3" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="2566.3" cellThickness="3" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="2590.2" cellThickness="3" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="2614.1" cellThickness="3" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="2638" cellThickness="3" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="2661.9" cellThickness="3" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="2685.8" cellThickness="3" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="2709.7" cellThickness="3" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="2733.6" cellThickness="3" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="2757.5" cellThickness="3" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="2781.4" cellThickness="3" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="2805.3" cellThickness="3" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="2829.2" cellThickness="3" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="2853.1" cellThickness="3" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="2877" cellThickness="3" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="2900.9" cellThickness="3" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="2924.8" cellThickness="3" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="2948.7" cellThickness="3" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="2972.6" cellThickness="3" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="2996.5" cellThickness="3" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="3020.4" cellThickness="3" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="3044.3" cellThickness="3" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="3068.2" cellThickness="3" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="3092.1" cellThickness="3" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="3116" cellThickness="3" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="3139.9" cellThickness="3" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="3163.8" cellThickness="3" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="3187.7" cellThickness="3" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="3211.6" cellThickness="3" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="3235.5" cellThickness="3" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="3259.4" cellThickness="3" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="3283.3" cellThickness="3" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="3307.2" cellThickness="3" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="3331.1" cellThickness="3" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="3355" cellThickness="3" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="3378.9" cellThickness="3" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="3402.8" cellThickness="3" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="3426.7" cellThickness="3" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="3450.6" cellThickness="3" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="3474.5" cellThickness="3" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="1825.4" cellThickness="23.9" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="1849.3" cellThickness="23.9" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="1873.2" cellThickness="23.9" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="1897.1" cellThickness="23.9" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="1921" cellThickness="23.9" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="1944.9" cellThickness="23.9" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="1968.8" cellThickness="23.9" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="1992.7" cellThickness="23.9" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="2016.6" cellThickness="23.9" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="2040.5" cellThickness="23.9" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="2064.4" cellThickness="23.9" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="2088.3" cellThickness="23.9" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="2112.2" cellThickness="23.9" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="2136.1" cellThickness="23.9" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="2160" cellThickness="23.9" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="2183.9" cellThickness="23.9" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="2207.8" cellThickness="23.9" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="2231.7" cellThickness="23.9" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="2255.6" cellThickness="23.9" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="2279.5" cellThickness="23.9" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="2303.4" cellThickness="23.9" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="2327.3" cellThickness="23.9" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="2351.2" cellThickness="23.9" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="2375.1" cellThickness="23.9" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="2399" cellThickness="23.9" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="2422.9" cellThickness="23.9" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="2446.8" cellThickness="23.9" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="2470.7" cellThickness="23.9" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="2494.6" cellThickness="23.9" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="2518.5" cellThickness="23.9" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="2542.4" cellThickness="23.9" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="2566.3" cellThickness="23.9" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="2590.2" cellThickness="23.9" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="2614.1" cellThickness="23.9" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="2638" cellThickness="23.9" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="2661.9" cellThickness="23.9" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="2685.8" cellThickness="23.9" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="2709.7" cellThickness="23.9" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="2733.6" cellThickness="23.9" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="2757.5" cellThickness="23.9" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="2781.4" cellThickness="23.9" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="2805.3" cellThickness="23.9" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="2829.2" cellThickness="23.9" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="2853.1" cellThickness="23.9" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="2877" cellThickness="23.9" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="2900.9" cellThickness="23.9" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="2924.8" cellThickness="23.9" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="2948.7" cellThickness="23.9" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="2972.6" cellThickness="23.9" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="2996.5" cellThickness="23.9" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="3020.4" cellThickness="23.9" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="3044.3" cellThickness="23.9" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="3068.2" cellThickness="23.9" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="3092.1" cellThickness="23.9" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="3116" cellThickness="23.9" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="3139.9" cellThickness="23.9" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="3163.8" cellThickness="23.9" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="3187.7" cellThickness="23.9" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="3211.6" cellThickness="23.9" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="3235.5" cellThickness="23.9" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="3259.4" cellThickness="23.9" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="3283.3" cellThickness="23.9" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="3307.2" cellThickness="23.9" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="3331.1" cellThickness="23.9" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="3355" cellThickness="23.9" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="3378.9" cellThickness="23.9" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="3402.8" cellThickness="23.9" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="3426.7" cellThickness="23.9" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="3450.6" cellThickness="23.9" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
+        <layer radLen="1.09474235" intLen="0.12013662" distanceToIp="3474.5" cellThickness="23.9" samplingFraction="0.02145334" emSamplingFraction="0.02226584" hadSamplingFraction="0.02145334" />
       </layers>
     </calorimeter>
-    <calorimeter type="EM_BARREL" innerR="1265.0" innerZ="-1800.0" innerPhi="0.0" innerSymmetryOrder="12.0" outerR="1403.5" outerZ="1800.0" outerPhi="0.0" outerSymmetryOrder="12.0" collection="EcalBarrelHits" cellSizeU="3.5" cellSizeV="3.5" mipEnergy="0.000095" mipSigma="0.000012" mipCut="0.00006" timeCut="100" digital="false">
+    <calorimeter type="MUON_ENDCAP" innerR="200.0" innerZ="3500.0" innerPhi="0.7853981633974483" innerSymmetryOrder="8.0" outerR="6500.0" outerZ="3501.0" outerPhi="0.7853981633974483" outerSymmetryOrder="8.0" collection="MuonEndcapHits" cellSizeU="30.0" cellSizeV="30.0" mipEnergy="0.00085" mipSigma="0.000081" mipCut="0" timeCut="100" digital="true">
       <id>
-        <field name="system" length="6" start="0" signed="false" />
-        <field name="barrel" length="3" start="6" signed="false" />
-        <field name="module" length="4" start="9" signed="false" />
-        <field name="layer" length="6" start="13" signed="false" />
-        <field name="slice" length="5" start="19" signed="false" />
-        <field name="x" length="16" start="32" signed="true" />
-        <field name="y" length="16" start="48" signed="true" />
-      </id>
-      <layers nlayers="31">
-        <layer radLen="0.03495195" intLen="0.01066232" distanceToIp="1265.16" cellThickness="0.32" samplingFraction="1" emSamplingFraction="1" hadSamplingFraction="1" />
-        <layer radLen="0.39921198" intLen="0.02743834" distanceToIp="1268.91" cellThickness="0.32" samplingFraction="0.01672472" emSamplingFraction="0.01672472" hadSamplingFraction="0.01500321" />
-        <layer radLen="0.39921198" intLen="0.02743834" distanceToIp="1272.66" cellThickness="0.32" samplingFraction="0.01672472" emSamplingFraction="0.01672472" hadSamplingFraction="0.01500321" />
-        <layer radLen="0.39921198" intLen="0.02743834" distanceToIp="1276.41" cellThickness="0.32" samplingFraction="0.01672472" emSamplingFraction="0.01672472" hadSamplingFraction="0.01500321" />
-        <layer radLen="0.39921198" intLen="0.02743834" distanceToIp="1280.16" cellThickness="0.32" samplingFraction="0.01672472" emSamplingFraction="0.01672472" hadSamplingFraction="0.01500321" />
-        <layer radLen="0.39921198" intLen="0.02743834" distanceToIp="1283.91" cellThickness="0.32" samplingFraction="0.01672472" emSamplingFraction="0.01672472" hadSamplingFraction="0.01500321" />
-        <layer radLen="0.39921198" intLen="0.02743834" distanceToIp="1287.66" cellThickness="0.32" samplingFraction="0.01672472" emSamplingFraction="0.01672472" hadSamplingFraction="0.01500321" />
-        <layer radLen="0.39921198" intLen="0.02743834" distanceToIp="1291.41" cellThickness="0.32" samplingFraction="0.01672472" emSamplingFraction="0.01672472" hadSamplingFraction="0.01500321" />
-        <layer radLen="0.39921198" intLen="0.02743834" distanceToIp="1295.16" cellThickness="0.32" samplingFraction="0.01672472" emSamplingFraction="0.01672472" hadSamplingFraction="0.01500321" />
-        <layer radLen="0.39921198" intLen="0.02743834" distanceToIp="1298.91" cellThickness="0.32" samplingFraction="0.01672472" emSamplingFraction="0.01672472" hadSamplingFraction="0.01500321" />
-        <layer radLen="0.39921198" intLen="0.02743834" distanceToIp="1302.66" cellThickness="0.32" samplingFraction="0.01672472" emSamplingFraction="0.01672472" hadSamplingFraction="0.01500321" />
-        <layer radLen="0.39921198" intLen="0.02743834" distanceToIp="1306.41" cellThickness="0.32" samplingFraction="0.01672472" emSamplingFraction="0.01672472" hadSamplingFraction="0.01500321" />
-        <layer radLen="0.39921198" intLen="0.02743834" distanceToIp="1310.16" cellThickness="0.32" samplingFraction="0.01672472" emSamplingFraction="0.01672472" hadSamplingFraction="0.01500321" />
-        <layer radLen="0.39921198" intLen="0.02743834" distanceToIp="1313.91" cellThickness="0.32" samplingFraction="0.01672472" emSamplingFraction="0.01672472" hadSamplingFraction="0.01500321" />
-        <layer radLen="0.39921198" intLen="0.02743834" distanceToIp="1317.66" cellThickness="0.32" samplingFraction="0.01672472" emSamplingFraction="0.01672472" hadSamplingFraction="0.01500321" />
-        <layer radLen="0.39921198" intLen="0.02743834" distanceToIp="1321.41" cellThickness="0.32" samplingFraction="0.01672472" emSamplingFraction="0.01672472" hadSamplingFraction="0.01500321" />
-        <layer radLen="0.39921198" intLen="0.02743834" distanceToIp="1325.16" cellThickness="0.32" samplingFraction="0.01672472" emSamplingFraction="0.01672472" hadSamplingFraction="0.01500321" />
-        <layer radLen="0.39921198" intLen="0.02743834" distanceToIp="1328.91" cellThickness="0.32" samplingFraction="0.01672472" emSamplingFraction="0.01672472" hadSamplingFraction="0.01500321" />
-        <layer radLen="0.39921198" intLen="0.02743834" distanceToIp="1332.66" cellThickness="0.32" samplingFraction="0.01672472" emSamplingFraction="0.01672472" hadSamplingFraction="0.01500321" />
-        <layer radLen="0.39921198" intLen="0.02743834" distanceToIp="1336.41" cellThickness="0.32" samplingFraction="0.01672472" emSamplingFraction="0.01672472" hadSamplingFraction="0.01500321" />
-        <layer radLen="0.39921198" intLen="0.02743834" distanceToIp="1340.16" cellThickness="0.32" samplingFraction="0.01672472" emSamplingFraction="0.01672472" hadSamplingFraction="0.01500321" />
-        <layer radLen="0.75664785" intLen="0.04139102" distanceToIp="1346.41" cellThickness="0.32" samplingFraction="0.00818708" emSamplingFraction="0.00818708" hadSamplingFraction="0.00811056" />
-        <layer radLen="0.75664785" intLen="0.04139102" distanceToIp="1352.66" cellThickness="0.32" samplingFraction="0.00818708" emSamplingFraction="0.00818708" hadSamplingFraction="0.00811056" />
-        <layer radLen="0.75664785" intLen="0.04139102" distanceToIp="1358.91" cellThickness="0.32" samplingFraction="0.00818708" emSamplingFraction="0.00818708" hadSamplingFraction="0.00811056" />
-        <layer radLen="0.75664785" intLen="0.04139102" distanceToIp="1365.16" cellThickness="0.32" samplingFraction="0.00818708" emSamplingFraction="0.00818708" hadSamplingFraction="0.00811056" />
-        <layer radLen="0.75664785" intLen="0.04139102" distanceToIp="1371.41" cellThickness="0.32" samplingFraction="0.00818708" emSamplingFraction="0.00818708" hadSamplingFraction="0.00811056" />
-        <layer radLen="0.75664785" intLen="0.04139102" distanceToIp="1377.66" cellThickness="0.32" samplingFraction="0.00818708" emSamplingFraction="0.00818708" hadSamplingFraction="0.00811056" />
-        <layer radLen="0.75664785" intLen="0.04139102" distanceToIp="1383.91" cellThickness="0.32" samplingFraction="0.00818708" emSamplingFraction="0.00818708" hadSamplingFraction="0.00811056" />
-        <layer radLen="0.75664785" intLen="0.04139102" distanceToIp="1390.16" cellThickness="0.32" samplingFraction="0.00818708" emSamplingFraction="0.00818708" hadSamplingFraction="0.00811056" />
-        <layer radLen="0.75664785" intLen="0.04139102" distanceToIp="1396.41" cellThickness="0.32" samplingFraction="0.00818708" emSamplingFraction="0.00818708" hadSamplingFraction="0.00811056" />
-        <layer radLen="0.75664785" intLen="0.04139102" distanceToIp="1402.66" cellThickness="0.32" samplingFraction="0.00818708" emSamplingFraction="0.00818708" hadSamplingFraction="0.00811056" />
-      </layers>
-    </calorimeter>
-    <calorimeter type="HAD_BARREL" innerR="1404.0" innerZ="-3478.0" innerPhi="0.0" innerSymmetryOrder="12.0" outerR="2838.000000000001" outerZ="3478.0" outerPhi="0.0" outerSymmetryOrder="12.0" collection="HcalBarrelHits" cellSizeU="10.0" cellSizeV="10.0" mipEnergy="0.00051" mipSigma="0.000048" mipCut="0.00036" timeCut="100" digital="false">
-      <id>
-        <field name="system" length="6" start="0" signed="false" />
-        <field name="barrel" length="3" start="6" signed="false" />
-        <field name="module" length="4" start="9" signed="false" />
-        <field name="layer" length="6" start="13" signed="false" />
-        <field name="slice" length="5" start="19" signed="false" />
+        <field name="system" length="8" start="0" signed="false" />
+        <field name="barrel" length="3" start="8" signed="false" />
+        <field name="module" length="4" start="11" signed="false" />
+        <field name="layer" length="8" start="15" signed="false" />
+        <field name="slice" length="5" start="23" signed="false" />
         <field name="x" length="16" start="32" signed="true" />
         <field name="y" length="16" start="48" signed="true" />
       </id>
-      <layers nlayers="60">
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="1424.4" cellThickness="3" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="1448.3" cellThickness="3" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="1472.2" cellThickness="3" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="1496.1" cellThickness="3" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="1520" cellThickness="3" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="1543.9" cellThickness="3" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="1567.8" cellThickness="3" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="1591.7" cellThickness="3" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="1615.6" cellThickness="3" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="1639.5" cellThickness="3" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="1663.4" cellThickness="3" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="1687.3" cellThickness="3" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="1711.2" cellThickness="3" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="1735.1" cellThickness="3" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="1759" cellThickness="3" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="1782.9" cellThickness="3" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="1806.8" cellThickness="3" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="1830.7" cellThickness="3" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="1854.6" cellThickness="3" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="1878.5" cellThickness="3" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="1902.4" cellThickness="3" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="1926.3" cellThickness="3" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="1950.2" cellThickness="3" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="1974.1" cellThickness="3" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="1998" cellThickness="3" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="2021.9" cellThickness="3" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="2045.8" cellThickness="3" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="2069.7" cellThickness="3" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="2093.6" cellThickness="3" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="2117.5" cellThickness="3" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="2141.4" cellThickness="3" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="2165.3" cellThickness="3" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="2189.2" cellThickness="3" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="2213.1" cellThickness="3" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="2237" cellThickness="3" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="2260.9" cellThickness="3" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="2284.8" cellThickness="3" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="2308.7" cellThickness="3" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="2332.6" cellThickness="3" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="2356.5" cellThickness="3" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="2380.4" cellThickness="3" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="2404.3" cellThickness="3" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="2428.2" cellThickness="3" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="2452.1" cellThickness="3" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="2476" cellThickness="3" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="2499.9" cellThickness="3" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="2523.8" cellThickness="3" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="2547.7" cellThickness="3" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="2571.6" cellThickness="3" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="2595.5" cellThickness="3" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="2619.4" cellThickness="3" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="2643.3" cellThickness="3" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="2667.2" cellThickness="3" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="2691.1" cellThickness="3" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="2715" cellThickness="3" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="2738.9" cellThickness="3" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="2762.8" cellThickness="3" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="2786.7" cellThickness="3" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="2810.6" cellThickness="3" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
-        <layer radLen="1.50486843" intLen="0.20376116" distanceToIp="2834.5" cellThickness="3" samplingFraction="0.02443622" emSamplingFraction="0.02690994" hadSamplingFraction="0.02443622" />
+      <layers nlayers="1">
+        <layer radLen="0.00000332" intLen="0.00000141" distanceToIp="3500" cellThickness="1" samplingFraction="1" emSamplingFraction="1" hadSamplingFraction="1" />
       </layers>
     </calorimeter>
-    <calorimeter type="EM_ENDCAP" innerR="200.0" innerZ="1657.0" innerPhi="0.0" innerSymmetryOrder="12.0" outerR="1264.3969066123905" outerZ="1795.5" outerPhi="0.0" outerSymmetryOrder="12.0" collection="EcalEndcapHits" cellSizeU="3.5" cellSizeV="3.5" mipEnergy="0.000095" mipSigma="0.000012" mipCut="0.00006" timeCut="100" digital="false">
+    <calorimeter type="EM_BARREL" innerR="1265.0" innerZ="-1800.0" innerPhi="0.5235987755982988" innerSymmetryOrder="12.0" outerR="1453.0101192055515" outerZ="1800.0" outerPhi="0.5235987755982988" outerSymmetryOrder="12.0" collection="EcalBarrelHits" cellSizeU="3.5" cellSizeV="3.5" mipEnergy="0.000095" mipSigma="0.000012" mipCut="0.00006" timeCut="100" digital="false">
       <id>
         <field name="system" length="6" start="0" signed="false" />
         <field name="barrel" length="3" start="6" signed="false" />
@@ -240,41 +240,42 @@
         <field name="y" length="16" start="48" signed="true" />
       </id>
       <layers nlayers="31">
-        <layer radLen="0.03495195" intLen="0.01066232" distanceToIp="1657.16" cellThickness="0.32" samplingFraction="1" emSamplingFraction="1" hadSamplingFraction="1" />
-        <layer radLen="0.39921198" intLen="0.02743834" distanceToIp="1660.91" cellThickness="0.32" samplingFraction="0.01703319" emSamplingFraction="0.01703319" hadSamplingFraction="0.01416876" />
-        <layer radLen="0.39921198" intLen="0.02743834" distanceToIp="1664.66" cellThickness="0.32" samplingFraction="0.01703319" emSamplingFraction="0.01703319" hadSamplingFraction="0.01416876" />
-        <layer radLen="0.39921198" intLen="0.02743834" distanceToIp="1668.41" cellThickness="0.32" samplingFraction="0.01703319" emSamplingFraction="0.01703319" hadSamplingFraction="0.01416876" />
-        <layer radLen="0.39921198" intLen="0.02743834" distanceToIp="1672.16" cellThickness="0.32" samplingFraction="0.01703319" emSamplingFraction="0.01703319" hadSamplingFraction="0.01416876" />
-        <layer radLen="0.39921198" intLen="0.02743834" distanceToIp="1675.91" cellThickness="0.32" samplingFraction="0.01703319" emSamplingFraction="0.01703319" hadSamplingFraction="0.01416876" />
-        <layer radLen="0.39921198" intLen="0.02743834" distanceToIp="1679.66" cellThickness="0.32" samplingFraction="0.01703319" emSamplingFraction="0.01703319" hadSamplingFraction="0.01416876" />
-        <layer radLen="0.39921198" intLen="0.02743834" distanceToIp="1683.41" cellThickness="0.32" samplingFraction="0.01703319" emSamplingFraction="0.01703319" hadSamplingFraction="0.01416876" />
-        <layer radLen="0.39921198" intLen="0.02743834" distanceToIp="1687.16" cellThickness="0.32" samplingFraction="0.01703319" emSamplingFraction="0.01703319" hadSamplingFraction="0.01416876" />
-        <layer radLen="0.39921198" intLen="0.02743834" distanceToIp="1690.91" cellThickness="0.32" samplingFraction="0.01703319" emSamplingFraction="0.01703319" hadSamplingFraction="0.01416876" />
-        <layer radLen="0.39921198" intLen="0.02743834" distanceToIp="1694.66" cellThickness="0.32" samplingFraction="0.01703319" emSamplingFraction="0.01703319" hadSamplingFraction="0.01416876" />
-        <layer radLen="0.39921198" intLen="0.02743834" distanceToIp="1698.41" cellThickness="0.32" samplingFraction="0.01703319" emSamplingFraction="0.01703319" hadSamplingFraction="0.01416876" />
-        <layer radLen="0.39921198" intLen="0.02743834" distanceToIp="1702.16" cellThickness="0.32" samplingFraction="0.01703319" emSamplingFraction="0.01703319" hadSamplingFraction="0.01416876" />
-        <layer radLen="0.39921198" intLen="0.02743834" distanceToIp="1705.91" cellThickness="0.32" samplingFraction="0.01703319" emSamplingFraction="0.01703319" hadSamplingFraction="0.01416876" />
-        <layer radLen="0.39921198" intLen="0.02743834" distanceToIp="1709.66" cellThickness="0.32" samplingFraction="0.01703319" emSamplingFraction="0.01703319" hadSamplingFraction="0.01416876" />
-        <layer radLen="0.39921198" intLen="0.02743834" distanceToIp="1713.41" cellThickness="0.32" samplingFraction="0.01703319" emSamplingFraction="0.01703319" hadSamplingFraction="0.01416876" />
-        <layer radLen="0.39921198" intLen="0.02743834" distanceToIp="1717.16" cellThickness="0.32" samplingFraction="0.01703319" emSamplingFraction="0.01703319" hadSamplingFraction="0.01416876" />
-        <layer radLen="0.39921198" intLen="0.02743834" distanceToIp="1720.91" cellThickness="0.32" samplingFraction="0.01703319" emSamplingFraction="0.01703319" hadSamplingFraction="0.01416876" />
-        <layer radLen="0.39921198" intLen="0.02743834" distanceToIp="1724.66" cellThickness="0.32" samplingFraction="0.01703319" emSamplingFraction="0.01703319" hadSamplingFraction="0.01416876" />
-        <layer radLen="0.39921198" intLen="0.02743834" distanceToIp="1728.41" cellThickness="0.32" samplingFraction="0.01703319" emSamplingFraction="0.01703319" hadSamplingFraction="0.01416876" />
-        <layer radLen="0.39921198" intLen="0.02743834" distanceToIp="1732.16" cellThickness="0.32" samplingFraction="0.01703319" emSamplingFraction="0.01703319" hadSamplingFraction="0.01416876" />
-        <layer radLen="0.75664785" intLen="0.04139102" distanceToIp="1738.41" cellThickness="0.32" samplingFraction="0.00848287" emSamplingFraction="0.00848287" hadSamplingFraction="0.0081618" />
-        <layer radLen="0.75664785" intLen="0.04139102" distanceToIp="1744.66" cellThickness="0.32" samplingFraction="0.00848287" emSamplingFraction="0.00848287" hadSamplingFraction="0.0081618" />
-        <layer radLen="0.75664785" intLen="0.04139102" distanceToIp="1750.91" cellThickness="0.32" samplingFraction="0.00848287" emSamplingFraction="0.00848287" hadSamplingFraction="0.0081618" />
-        <layer radLen="0.75664785" intLen="0.04139102" distanceToIp="1757.16" cellThickness="0.32" samplingFraction="0.00848287" emSamplingFraction="0.00848287" hadSamplingFraction="0.0081618" />
-        <layer radLen="0.75664785" intLen="0.04139102" distanceToIp="1763.41" cellThickness="0.32" samplingFraction="0.00848287" emSamplingFraction="0.00848287" hadSamplingFraction="0.0081618" />
-        <layer radLen="0.75664785" intLen="0.04139102" distanceToIp="1769.66" cellThickness="0.32" samplingFraction="0.00848287" emSamplingFraction="0.00848287" hadSamplingFraction="0.0081618" />
-        <layer radLen="0.75664785" intLen="0.04139102" distanceToIp="1775.91" cellThickness="0.32" samplingFraction="0.00848287" emSamplingFraction="0.00848287" hadSamplingFraction="0.0081618" />
-        <layer radLen="0.75664785" intLen="0.04139102" distanceToIp="1782.16" cellThickness="0.32" samplingFraction="0.00848287" emSamplingFraction="0.00848287" hadSamplingFraction="0.0081618" />
-        <layer radLen="0.75664785" intLen="0.04139102" distanceToIp="1788.41" cellThickness="0.32" samplingFraction="0.00848287" emSamplingFraction="0.00848287" hadSamplingFraction="0.0081618" />
-        <layer radLen="0.75664785" intLen="0.04139102" distanceToIp="1794.66" cellThickness="0.32" samplingFraction="0.00848287" emSamplingFraction="0.00848287" hadSamplingFraction="0.0081618" />
+        <layer radLen="0.00787212" intLen="0.00153933" distanceToIp="1265.16" cellThickness="1" samplingFraction="1" emSamplingFraction="1" hadSamplingFraction="1" />
+        <layer radLen="0.68335411" intLen="0.02523423" distanceToIp="1268.91" cellThickness="3.75" samplingFraction="0.01672472" emSamplingFraction="0.01672472" hadSamplingFraction="0.01500321" />
+        <layer radLen="0.68335411" intLen="0.02523423" distanceToIp="1272.66" cellThickness="3.75" samplingFraction="0.01672472" emSamplingFraction="0.01672472" hadSamplingFraction="0.01500321" />
+        <layer radLen="0.68335411" intLen="0.02523423" distanceToIp="1276.41" cellThickness="3.75" samplingFraction="0.01672472" emSamplingFraction="0.01672472" hadSamplingFraction="0.01500321" />
+        <layer radLen="0.68335411" intLen="0.02523423" distanceToIp="1280.16" cellThickness="3.75" samplingFraction="0.01672472" emSamplingFraction="0.01672472" hadSamplingFraction="0.01500321" />
+        <layer radLen="0.68335411" intLen="0.02523423" distanceToIp="1283.91" cellThickness="3.75" samplingFraction="0.01672472" emSamplingFraction="0.01672472" hadSamplingFraction="0.01500321" />
+        <layer radLen="0.68335411" intLen="0.02523423" distanceToIp="1287.66" cellThickness="3.75" samplingFraction="0.01672472" emSamplingFraction="0.01672472" hadSamplingFraction="0.01500321" />
+        <layer radLen="0.68335411" intLen="0.02523423" distanceToIp="1291.41" cellThickness="3.75" samplingFraction="0.01672472" emSamplingFraction="0.01672472" hadSamplingFraction="0.01500321" />
+        <layer radLen="0.68335411" intLen="0.02523423" distanceToIp="1295.16" cellThickness="3.75" samplingFraction="0.01672472" emSamplingFraction="0.01672472" hadSamplingFraction="0.01500321" />
+        <layer radLen="0.68335411" intLen="0.02523423" distanceToIp="1298.91" cellThickness="3.75" samplingFraction="0.01672472" emSamplingFraction="0.01672472" hadSamplingFraction="0.01500321" />
+        <layer radLen="0.68335411" intLen="0.02523423" distanceToIp="1302.66" cellThickness="3.75" samplingFraction="0.01672472" emSamplingFraction="0.01672472" hadSamplingFraction="0.01500321" />
+        <layer radLen="0.68335411" intLen="0.02523423" distanceToIp="1306.41" cellThickness="3.75" samplingFraction="0.01672472" emSamplingFraction="0.01672472" hadSamplingFraction="0.01500321" />
+        <layer radLen="0.68335411" intLen="0.02523423" distanceToIp="1310.16" cellThickness="3.75" samplingFraction="0.01672472" emSamplingFraction="0.01672472" hadSamplingFraction="0.01500321" />
+        <layer radLen="0.68335411" intLen="0.02523423" distanceToIp="1313.91" cellThickness="3.75" samplingFraction="0.01672472" emSamplingFraction="0.01672472" hadSamplingFraction="0.01500321" />
+        <layer radLen="0.68335411" intLen="0.02523423" distanceToIp="1317.66" cellThickness="3.75" samplingFraction="0.01672472" emSamplingFraction="0.01672472" hadSamplingFraction="0.01500321" />
+        <layer radLen="0.68335411" intLen="0.02523423" distanceToIp="1321.41" cellThickness="3.75" samplingFraction="0.01672472" emSamplingFraction="0.01672472" hadSamplingFraction="0.01500321" />
+        <layer radLen="0.68335411" intLen="0.02523423" distanceToIp="1325.16" cellThickness="3.75" samplingFraction="0.01672472" emSamplingFraction="0.01672472" hadSamplingFraction="0.01500321" />
+        <layer radLen="0.68335411" intLen="0.02523423" distanceToIp="1328.91" cellThickness="3.75" samplingFraction="0.01672472" emSamplingFraction="0.01672472" hadSamplingFraction="0.01500321" />
+        <layer radLen="0.68335411" intLen="0.02523423" distanceToIp="1332.66" cellThickness="3.75" samplingFraction="0.01672472" emSamplingFraction="0.01672472" hadSamplingFraction="0.01500321" />
+        <layer radLen="0.68335411" intLen="0.02523423" distanceToIp="1336.41" cellThickness="3.75" samplingFraction="0.01672472" emSamplingFraction="0.01672472" hadSamplingFraction="0.01500321" />
+        <layer radLen="0.68335411" intLen="0.02523423" distanceToIp="1340.16" cellThickness="3.75" samplingFraction="0.01672472" emSamplingFraction="0.01672472" hadSamplingFraction="0.01500321" />
+        <layer radLen="1.35883528" intLen="0.04892878" distanceToIp="1346.41" cellThickness="6.25" samplingFraction="0.00818708" emSamplingFraction="0.00818708" hadSamplingFraction="0.00811056" />
+        <layer radLen="1.35883528" intLen="0.04892878" distanceToIp="1352.66" cellThickness="6.25" samplingFraction="0.00818708" emSamplingFraction="0.00818708" hadSamplingFraction="0.00811056" />
+        <layer radLen="1.35883528" intLen="0.04892878" distanceToIp="1358.91" cellThickness="6.25" samplingFraction="0.00818708" emSamplingFraction="0.00818708" hadSamplingFraction="0.00811056" />
+        <layer radLen="1.35883528" intLen="0.04892878" distanceToIp="1365.16" cellThickness="6.25" samplingFraction="0.00818708" emSamplingFraction="0.00818708" hadSamplingFraction="0.00811056" />
+        <layer radLen="1.35883528" intLen="0.04892878" distanceToIp="1371.41" cellThickness="6.25" samplingFraction="0.00818708" emSamplingFraction="0.00818708" hadSamplingFraction="0.00811056" />
+        <layer radLen="1.35883528" intLen="0.04892878" distanceToIp="1377.66" cellThickness="6.25" samplingFraction="0.00818708" emSamplingFraction="0.00818708" hadSamplingFraction="0.00811056" />
+        <layer radLen="1.35883528" intLen="0.04892878" distanceToIp="1383.91" cellThickness="6.25" samplingFraction="0.00818708" emSamplingFraction="0.00818708" hadSamplingFraction="0.00811056" />
+        <layer radLen="1.35883528" intLen="0.04892878" distanceToIp="1390.16" cellThickness="6.25" samplingFraction="0.00818708" emSamplingFraction="0.00818708" hadSamplingFraction="0.00811056" />
+        <layer radLen="1.35883528" intLen="0.04892878" distanceToIp="1396.41" cellThickness="6.25" samplingFraction="0.00818708" emSamplingFraction="0.00818708" hadSamplingFraction="0.00811056" />
+        <layer radLen="1.35883528" intLen="0.04892878" distanceToIp="1402.66" cellThickness="6.25" samplingFraction="0.00818708" emSamplingFraction="0.00818708" hadSamplingFraction="0.00811056" />
       </layers>
     </calorimeter>
   </calorimeters>
-  <coil bfield="5.0" innerR="0.0" z="1000.0" outerR="3150.0" />
+  <detector name="sidloi_opt_scint" />
+  <coil radLen="0" intLen="0" innerR="0.0" outerR="0.0" z="1000.0" bfield="5.0" />
   <tracking innerR="0.0" outerR="1264.0" z="1656.0" />
 </pandoraSetup>
 
CVSspam 0.2.12


Use REPLY-ALL to reply to list

To unsubscribe from the LCD-CVS list, click the following link:
https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=LCD-CVS&A=1