Resolve "Parameterized Detector Structure"

Closes #37 (closed)

compact/definitions.xml

@@ -403,7 +403,7 @@
 	    
     <comment> EM Barrel N Layer; same number of layers for EcalThin and EcalThick</comment>
     <constant name="EcalBarrelLayers" 
-	    value="floor((EcalBarrelAvailTotalThickness - EcalFirstLayerThickness) / (EcalThinOneLayerThickness + EcalThickOneLayerThickness))"/>
+	    value="floor((EcalBarrel_TotalThickness - EcalFirstLayerThickness) / (EcalThinOneLayerThickness + EcalThickOneLayerThickness))"/>
     <constant name="EcalBarrelThinLayers"       value="EcalBarrelLayers"/>
     <constant name="EcalBarrelThickLayers"      value="EcalBarrelLayers"/>
     <comment> EM Barrel Thickness </comment>
@@ -412,13 +412,21 @@
     <constant name="EcalBarrel_rmax"            value="EcalBarrel_rmin + EcalBarrelThickness"/>
 
     <comment> EM Endcap N Layer; same number of layers for EcalThin and EcalThick </comment>
-    <constant name="EcalEndcapLayers" 
-	    value="floor((EcalEndcapAvailTotalThickness - EcalFirstLayerThickness) / (EcalThinOneLayerThickness + EcalThickOneLayerThickness))"/>
-    <constant name="EcalEndcapThinLayers"       value="EcalEndcapLayers"/>
-    <constant name="EcalEndcapThickLayers"      value="EcalEndcapLayers"/>
+    <constant name="EcalEndcapPLayers" 
+	    value="floor((EcalEndcapP_TotalThickness - EcalFirstLayerThickness) / (EcalThinOneLayerThickness + EcalThickOneLayerThickness))"/>
+    <constant name="EcalEndcapNLayers" 
+	    value="floor((EcalEndcapN_TotalThickness - EcalFirstLayerThickness) / (EcalThinOneLayerThickness + EcalThickOneLayerThickness))"/>
+    <constant name="EcalEndcapP_NThinLayers"       value="EcalEndcapPLayers"/>
+    <constant name="EcalEndcapP_NThickLayers"      value="EcalEndcapPLayers"/>
+    <constant name="EcalEndcapN_NThinLayers"       value="EcalEndcapNLayers"/>
+    <constant name="EcalEndcapN_NThickLayers"      value="EcalEndcapNLayers"/>
+
     <comment> EM Endcap Thickness </comment>
-    <constant name="EcalEndcapThickness"        
-	    value="EcalFirstLayerThickness + (EcalEndcapThinLayers * EcalThinOneLayerThickness) + (EcalEndcapThickLayers * EcalThickOneLayerThickness)"/>
+    <constant name="EcalEndcapPThickness"        
+	    value="EcalFirstLayerThickness + (EcalEndcapP_NThinLayers * EcalThinOneLayerThickness) + (EcalEndcapP_NThickLayers * EcalThickOneLayerThickness)"/>
+    <constant name="EcalEndcapNThickness"        
+	    value="EcalFirstLayerThickness + (EcalEndcapN_NThinLayers * EcalThinOneLayerThickness) + (EcalEndcapN_NThickLayers * EcalThickOneLayerThickness)"/>
+
 
     <comment>
       -------------------------------