Resolve "Adjust ecal parameterization with max number of layers"

Closes #26

topside/ecal.xml

@@ -23,25 +23,15 @@
   <display>
   </display>
 
-  <detectors>
+  <include ref="ecal_barrel.xml"/>
 
+  <detectors>
     <comment>
     -------------------
     Dummy Plane Tracker
     -------------------
     Plane tracker that gives momentum of incident particles before crystal endcap calorimeter (backward)
     </comment>
-    <!--
-    <detector 
-      id = "100" 
-      name = "DummyPlaneTracker" 
-      type = "PlaneTracker" 
-      readout ="PlaneTrackerHits" 
-      vis = "GreenVis">
-      <dimensions x = "700.0*mm" y = "700.0*mm" z= "1.0*mm" rmin= "VertexTrackerInnerRadius+5.0*mm" rmax="EcalEndcapN_rmin+10.0*mm"/>
-      <position x ="0.0*m" y ="0.0*m" z="CrystalEndcap_z_pos/2.0 + 10.0*mm"/>
-    </detector>
-    -->
 
     <comment>
       -------------------
@@ -59,46 +49,6 @@
       <dimensions rmin="CrystalEndcap_rmin" rmax="CrystalEndcap_rmax" x="CrystalBox_x_length" y="CrystalBox_y_length" z="CrystalBox_z_length" delta="CrystalBox_offset"/>
     </detector>
 
-    <comment>
-      ---------------------
-      Barrel EM Calorimeter
-      ---------------------
-      A layered EM calorimeter with tungsten and silicon (or scintillator) strips
-    </comment>
-    <detector 
-      id="ECalBarrel_ID"
-      name="EcalBarrel"
-      type="DD4hep_EcalBarrel"
-      readout="EcalBarrelHits"
-      calorimeterType="EM_BARREL">
-      <dimensions 
-        numsides="CaloSides" 
-        rmin="EcalBarrel_rmin" 
-        z="EcalBarrelLength"/>
-      <staves vis="EcalBarrelVis"/>
-      <layer repeat="1">
-        <slice material="Silicon" thickness="EcalSiliconThickness" sensitive="yes" limits="cal_limits"/>
-        <slice material="Copper" thickness="EcalCopperThickness"/>
-        <slice material="Kapton" thickness="EcalKaptonThickness"/>
-        <slice material="Air" thickness="EcalAir1Thickness"/>
-      </layer>
-      <layer repeat="EcalBarrelThinLayers">
-        <slice material="TungstenDens24" thickness="EcalThinTungstenThickness"/>
-        <slice material="Air" thickness="EcalAir2Thickness"/>
-        <slice material="Silicon" thickness="EcalSiliconThickness" sensitive="yes" limits="cal_limits"/>
-        <slice material="Copper" thickness="EcalCopperThickness"/>
-        <slice material="Kapton" thickness="EcalKaptonThickness"/>
-        <slice material="Air" thickness="EcalAir1Thickness"/>
-      </layer>
-      <layer repeat="EcalBarrelThickLayers">
-        <slice material="TungstenDens24" thickness="EcalThickTungstenThickness"/>
-        <slice material="Air" thickness="EcalAir2Thickness"/>
-        <slice material="Silicon" thickness="EcalSiliconThickness" sensitive="yes" limits="cal_limits"/>
-        <slice material="Copper" thickness="EcalCopperThickness"/>
-        <slice material="Kapton" thickness="EcalKaptonThickness"/>
-        <slice material="Air" thickness="EcalAir1Thickness"/>
-      </layer>
-    </detector>
 
     <comment>
       -----------------------------
@@ -198,10 +148,6 @@
       <segmentation type="CartesianGridXY" grid_size_x="CrystalBox_x_length" grid_size_y="CrystalBox_y_length" />
       <id>system:8,sector:4,module:20,x:48:-8,y:-8</id>
     </readout>
-    <readout name="EcalBarrelHits">
-      <segmentation type="CartesianGridXY" grid_size_x="3.5 * mm" grid_size_y="3.5 * mm"/>
-      <id>system:8,barrel:3,module:4,layer:6,slice:5,x:32:-16,y:-16</id>
-    </readout>
     <readout name="EcalEndcapHits">
       <segmentation type="CartesianGridXY" grid_size_x="3.5 * mm" grid_size_y="3.5 * mm"/>
       <id>system:8,barrel:3,module:4,layer:6,slice:5,x:32:-16,y:-16</id>