Resolve "Parameterized Detector Structure"

Closes #37 (closed)

compact/definitions.xml

@@ -403,19 +403,19 @@
 	    
     <comment> EM Barrel N Layer; same number of layers for EcalThin and EcalThick</comment>
     <constant name="EcalBarrelLayers" 
-	    value="floor((EcalBarrel_TotalThickness - 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>
     <constant name="EcalBarrelThickness"
-	    value="EcalFirstLayerThickness + (EcalBarrelThinLayers * EcalThinOneLayerThickness) + (EcalBarrelThickLayers * EcalThickOneLayerThickness)"/>
+	      value="EcalFirstLayerThickness + (EcalBarrelThinLayers * EcalThinOneLayerThickness) + (EcalBarrelThickLayers * EcalThickOneLayerThickness)"/>
     <constant name="EcalBarrel_rmax"            value="EcalBarrel_rmin + EcalBarrelThickness"/>
 
     <comment> EM Endcap N Layer; same number of layers for EcalThin and EcalThick </comment>
     <constant name="EcalEndcapPLayers" 
-	    value="floor((EcalEndcapP_TotalThickness - EcalFirstLayerThickness) / (EcalThinOneLayerThickness + EcalThickOneLayerThickness))"/>
+	      value="floor((EcalEndcapP_TotalThickness - EcalFirstLayerThickness) / (EcalThinOneLayerThickness + EcalThickOneLayerThickness))"/>
     <constant name="EcalEndcapNLayers" 
-	    value="floor((EcalEndcapN_TotalThickness - EcalFirstLayerThickness) / (EcalThinOneLayerThickness + EcalThickOneLayerThickness))"/>
+	      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"/>
@@ -423,9 +423,9 @@
 
     <comment> EM Endcap Thickness </comment>
     <constant name="EcalEndcapPThickness"        
-	    value="EcalFirstLayerThickness + (EcalEndcapP_NThinLayers * EcalThinOneLayerThickness) + (EcalEndcapP_NThickLayers * EcalThickOneLayerThickness)"/>
+	      value="EcalFirstLayerThickness + (EcalEndcapP_NThinLayers * EcalThinOneLayerThickness) + (EcalEndcapP_NThickLayers * EcalThickOneLayerThickness)"/>
     <constant name="EcalEndcapNThickness"        
-	    value="EcalFirstLayerThickness + (EcalEndcapN_NThinLayers * EcalThinOneLayerThickness) + (EcalEndcapN_NThickLayers * EcalThickOneLayerThickness)"/>
+	      value="EcalFirstLayerThickness + (EcalEndcapN_NThinLayers * EcalThinOneLayerThickness) + (EcalEndcapN_NThickLayers * EcalThickOneLayerThickness)"/>
 
 
     <comment>
@@ -435,7 +435,7 @@
     </comment>
     <constant name="HcalBarrel_rmin"          value="EcalBarrel_rmax+10.0*mm"/>
     <constant name="HcalBarrelAvailThickness" value="HcalBarrel_rmax - HcalBarrel_rmin"/>
-    <constant name="HcalBarrelLength"         value="EcalBarrelLength+2.0*EcalEndcapThickness + 10.0*mm "/>
+    <constant name="HcalBarrelLength"         value="EcalBarrelLength+EcalEndcapP_TotalThickness + EcalEndcapN_TotalThickness   + 10.0*mm "/>
     <constant name="HcalEndcap_zmin"          value="HcalBarrelLength/2.0"/>
     <constant name="HcalEndcapAvailThickness" value="(SolenoidYokeEndcap_zmin - 10.0 * mm) - HcalEndcap_zmin"/>