Move region paramters out of tracking paramter files and into cherenkov parameter files

Add correct region paramters for Cherenkovs

PARAM/HMS/CER/hcer.param

@@ -3,25 +3,33 @@ hcer_tot_pmts = 2
 
 hcer_adc_to_npe = 1/323., 1/327.
 
-hcer_chi2max = 50.
+hcer_red_chi2_min = 0.0
+hcer_red_chi2_max = 25.0
 
-hcer_beta_min = 0.8
+hcer_beta_min = 0.0
 hcer_beta_max = 1.2
 
-hcer_et_min = 0.95
-hcer_et_max = 5.0
+hcer_enorm_min = 0.0
+hcer_enorm_max = 1.5
 
 hcer_mirror_zpos = 230.0
 
 hcer_adcTimeWindowMin = 1500.
 hcer_adcTimeWindowMax = 3500.
 
+; Threshold for good hit (for measureing effic.)
+hcer_npe_thresh = 0.5
+
+hcer_num_regions = 3 ; This value is from the 6 GeV era
+
 ; hcer_region: 8 values for each region (1 per mirror + sum)
 ; central x,y,dx,dy values and x,y,dx,dy half widths.
-hcer_region =   30,  -30,    0,    0,    
-	    	 0,    0,    0,    0,
-		 0,    0,    0,    0,
-                20,   20,   60,   30, 
-                30,   30,   .1,   .1,  
-		.1,   .1,   .1,   .1
+hcer_region =    30,  -30,   0,
+                  0,    0,   0,
+                  0,    0,   0,
+                  0,    0,   0,
+                 20,   20,  60,
+                 30,   30,  30,
+                 .1,   .1,  .1,
+		 .1,   .1,  .1
 	       

PARAM/HMS/GEN/htracking.param

@@ -75,8 +75,6 @@ hstub_max_xpdiff = .05
   hstat_cal_slop = 2.
 ; hcer_min_eff            warning level for cerenkov effic.
   hcer_min_eff = .98
-; hcer_threshold          threshold for good hit (for measureing effic.)
-  hcer_threshold = 0.5
 ; hdc_min_eff             warning level for dc raw effic.(1 per plane)
   hdc_min_eff = .96,.98,.96,.98,.98,.94
                 .96,.98,.98,.98,.98,.96

PARAM/SHMS/GEN/ptracking.param

@@ -71,12 +71,8 @@ pntracks_max_fp = 10
   pstat_cal_slop = 2.
 ; phgcer_min_eff            warning level for cerenkov effic.
   phgcer_min_eff = .98
-; phgcer_threshold          threshold for good hit (for measureing effic.)
-  phgcer_threshold = 0.5
 ; pngcer_min_eff            warning level for cerenkov effic.
   pngcer_min_eff = .98
-; pngcer_threshold          threshold for good hit (for measureing effic.)
-  pngcer_threshold = 0.5
 ; pdc_min_eff             warning level for dc raw effic.(1 per plane)
   pdc_min_eff = .96,.98,.96,.98,.98,.94
                 .96,.98,.98,.98,.98,.96

PARAM/SHMS/HGCER/phgcer.param

@@ -4,25 +4,36 @@ phgcer_tot_pmts = 4
 ; Garth H. gain calibration from run 486, March 9 2017
 phgcer_adc_to_npe = 1/436., 1/393., 1/364., 1/372.
 
-phgcer_chi2max = 50.
+phgcer_red_chi2_min = 0.0
+phgcer_red_chi2_max = 25.0
 
-phgcer_beta_min = 0.8
+phgcer_beta_min = 0.0
 phgcer_beta_max = 1.2
 
-phgcer_et_min = 0.95
-phgcer_et_max = 5.0
+phgcer_enorm_min = 0.0
+phgcer_enorm_max = 1.5
 
 phgcer_adcTimeWindowMin = 500.
 phgcer_adcTimeWindowMax = 2500.
 
+; Threshold for good hit (for measureing effic.)
+phgcer_npe_thresh = 0.5
+
 ; Guess from Dwg. 67165-E-00001 R0
 phgcer_mirror_zpos = 175.1
 
+phgcer_num_regions = 4;
+
 ; phgcer_region: 8 values for each region (1 per mirror + sum)
 ; central x,y,dx,dy values and x,y,dx,dy half widths.
-phgcer_region =   30,  -30,   0,   0,    
-	      	   0,    0,   0,   0,
-		   0,    0,   0,   0,
-                  20,   20,  60,  30, 
-		  30,   30,  .1,  .1,
-		  .1,   .1,  .1,  .1
+; Defined in clomuns, region 1, region 2, region 3, region 4...
+; Assumes rectangular volume with x = 55 cm and y = 50 cm
+; FIX ME! Waiting for numbers from detector
+phgcer_region =   27.5,    27.5,  -27.5,  -27.5,   
+                  25.0,   -25.0,   25.0,  -25.0,
+                   0.0,     0.0,    0.0,    0.0,
\ No newline at end of file
+                   0.0,     0.0,    0.0,    0.0,
+                  27.5,    27.5,   27.5,   27.5,
+                  25.0,    25.0,   25.0,   25.0,
+	          0.15,    0.15,   0.15,   0.15,
+	           0.1,     0.1,    0.1,    0.1
\ No newline at end of file

PARAM/SHMS/NGCER/pngcer.param

@@ -3,25 +3,35 @@ pngcer_tot_pmts = 4
 
 pngcer_adc_to_npe = 1/1000., 1/1000., 1/1000., 1/1000.
 
-pngcer_chi2max = 50.
+pngcer_red_chi2_min = 0.0
+pngcer_red_chi2_max = 25.0
 
-pngcer_beta_min = 0.8
+pngcer_beta_min = 0.0
 pngcer_beta_max = 1.2
 
-pngcer_et_min = 0.95
-pngcer_et_max = 5.0
+pngcer_enorm_min = 0.0
+pngcer_enorm_max = 1.5
 
 pngcer_adcTimeWindowMin = 500.
 pngcer_adcTimeWindowMax = 2500.
 
+; Threshold for good hit (for measureing effic.)
+pngcer_npe_thresh = 0.5
+
 ; Guess from Dwg. 67165-E-00001 R0
 pngcer_mirror_zpos = -89.1 
 
+pngcer_num_regions = 4;
+
 ; pngcer_region: 8 values for each region (1 per mirror + sum)
 ; central x,y,dx,dy values and x,y,dx,dy half widths.
-pngcer_region =   30,  -30,   0,   0,    
-	      	   0,    0,   0,   0,
-		   0,    0,   0,   0,
-                  20,   20,  60,  30, 
-		  30,   30,  .1,  .1,
-		  .1,   .1,  .1,  .1
+; Defined in clomuns, region 1, region 2, region 3, region 4...
+; Assumes rectangular volume with x = 43 cm and y = 43 cm
+pngcer_region =   21.5,    21.5,  -21.5,  -21.5,   
+                  21.5,   -21.5,   21.5,  -21.5,
+                   0.0,     0.0,    0.0,    0.0,
+                   0.0,     0.0,    0.0,    0.0,
\ No newline at end of file
+                  21.5,    21.5,   21.5,   21.5,
+                  21.5,    21.5,   21.5,   21.5,
+	          0.15,    0.15,   0.15,   0.15,
+	           0.1,     0.1,    0.1,    0.1
\ No newline at end of file