Disabled HCAL and made ECAL take 100% of available space

.gitignore

@@ -10,3 +10,15 @@ build/*
 .DAWN*
 */*.pyc
 **.pyc
+
+images/*
+doc/*
+
+accelerator
+eic_ip6
+eic
+ip6_build
+ip6
+
+*.swp
+*.history

compact/definitions.xml

@@ -417,12 +417,12 @@
     <constant name="SolenoidYokeEndcapN_zmin"  value="Solenoid_length/2.0 - Solenoid_offset+ExtraHcalEndcapN_length"/>
 
     <constant name="EcalBarrel_rmin"            value="SiliconTrackerOuterRadius + BarrelExtraPIDThickness + 5.0 * mm"/>
-    <constant name="HcalBarrel_rmax"            value="Solenoid_rmin - 10.0 *cm "/>
-    <constant name="Barrel_TotalCalThickness"   value="HcalBarrel_rmax - EcalBarrel_rmin"/>
-    <constant name="CalBarrelDivider"           value="0.5"/> <comment> Ecal and Hcal have the same thickness </comment>
+    <constant name="EcalBarrel_rmax"            value="Solenoid_rmin - 10.0 *cm "/>
+    <constant name="Barrel_TotalCalThickness"   value="EcalBarrel_rmax - EcalBarrel_rmin"/>
+    <constant name="CalBarrelDivider"           value="1.0"/> <comment> Ecal only (but option to add HCAL inside of solenoid</comment>
 
     <constant name="EcalBarrel_TotalThickness"  value="Barrel_TotalCalThickness * CalBarrelDivider"/>
-    <constant name="HcalBarrel_TotalThickness"  value="Barrel_TotalCalThickness * (1.0 - CalBarrelDivider)"/>
+    <!--constant name="HcalBarrel_TotalThickness"  value="Barrel_TotalCalThickness * (1.0 - CalBarrelDivider)"/-->
 
     <constant name="EcalBarrelLength"           value="CentralTracking_length + BackwardPIDLength"/>
     <constant name="EcalBarrel_offset"          value="(CentralTracking_length -(CentralTracking_length+BackwardPIDLength))/2.0"/>
@@ -436,14 +436,14 @@
     <constant name="EndcapPTotalCal_length"  value="(SolenoidYokeEndcapP_zmin - 0.0 * mm) - (EcalEndcapP_zmin + 20.0 * mm)"/>
     <constant name="EndcapNTotalCal_length"  value="(SolenoidYokeEndcapN_zmin - 0.0 * mm) - (EcalEndcapN_zmin + 20.0 * mm)"/>
 
-    <constant name="EndcapP_CalDivide"          value="0.5"/> <comment> 0.5 means Ecal and Hcal have the same thickness </comment>
-    <constant name="EndcapN_CalDivide"          value="0.5"/> <comment> 0.5 means Ecal and Hcal have the same thickness </comment>
+    <constant name="EndcapP_CalDivide"          value="1.0"/> <comment> 100% ECAL inside the endcap, HCAL at back of endcap </comment>
+    <constant name="EndcapN_CalDivide"          value="1.0"/> <comment> 100% ECAL (assuming HCAL behind the endcap </comment>
 
     <constant name="EcalEndcapP_length" value="EndcapPTotalCal_length * EndcapP_CalDivide"/>
     <constant name="EcalEndcapN_length" value="EndcapNTotalCal_length * EndcapN_CalDivide"/>
 
-    <constant name="HcalEndcapP_length" value="EndcapPTotalCal_length * (1.0 - EndcapP_CalDivide)"/>
-    <constant name="HcalEndcapN_length" value="EndcapNTotalCal_length * (1.0 - EndcapN_CalDivide)"/>
+    <!--constant name="HcalEndcapP_length" value="EndcapPTotalCal_length * (1.0 - EndcapP_CalDivide)"/-->
+    <!--constant name="HcalEndcapN_length" value="EndcapNTotalCal_length * (1.0 - EndcapN_CalDivide)"/-->
 
     <comment> These need to be set in sync with the forward and backward  detectors </comment>
     <constant name="EcalEndcapP_rmin"                      value="200.0*mm"/>
@@ -520,6 +520,7 @@
       Hadronic Calorimeter Parameters
       -------------------------------
     </comment>
+    <!--
     <constant name="HcalBarrel_rmin"          value="EcalBarrel_rmax"/>
     <constant name="HcalBarrelAvailThickness" value="HcalBarrel_rmax - HcalBarrel_rmin"/>
     <constant name="HcalBarrelLength"         value="Solenoid_length + ExtraHcalEndcapP_length + ExtraHcalEndcapN_length- HcalEndcapP_length- HcalEndcapN_length - 10*cm"/>
@@ -548,6 +549,7 @@
     <constant name="HcalEndcapP_thickness" value="HcalEndcapPLayer_NRepeat * HcalSingleLayerThickness"/>
     <constant name="HcalEndcapN_thickness" value="HcalEndcapNLayer_NRepeat * HcalSingleLayerThickness"/>
 
+    -->
     <comment>
       ----------------------
       Zero Degree Parameters

reference_detector.xml

@@ -120,7 +120,7 @@
   <include ref="compact/far_forward_detectors.xml"/>
   <include ref="compact/ce_mrich.xml"/>
   <include ref="compact/ce_GEM.xml"/>
-  <include ref="compact/hcal.xml"/>
+  <!--include ref="compact/hcal.xml"/-->
   <include ref="compact/forward_trd.xml"/>
   <include ref="compact/B0_tracker.xml"/>
   <include ref="compact/forward_romanpot.xml"/>

scripts/view1/.DAWN_1.history

-1.34392e+07
-90
-180
-0
-0
-0
-0
-1
-1
-0.001
-0
-1
-1
-1
-0.5
-0.5
-0.5
-19
-71
-0.001
-0.001
-0.001
-3
-71
-0.001
-0
-0
-1
-evince
-0
-0