Merge pull request #90 from MarkKJones/cher

Modified SHMS Gas Cherenkov parameters files

DEF-files/SHMS/GEN/pstackana_report.def

@@ -16,6 +16,15 @@ TH2F pngcer_ped_vs_cntr 'SHMS Noble Gas Cherenkov Pulse Pedestal vs. Counter Num
 TH2F pngcer_pi_vs_cntr 'SHMS Noble Gas Cherenkov Pulse Integral vs. Counter Number; Counter Number;  Pulse Integral / 10 ADC Units' P.ngcer.adcCounter P.ngcer.adcPulseInt 4 0.5 4.5 4000 0 40000
 TH2F pngcer_amp_vs_cntr 'SHMS Noble Gas Cherenkov Pulse Amplitude vs. Counter Number; Counter Number;  Pulse Amplitude / 1 ADC Unit' P.ngcer.adcCounter P.ngcer.adcPulseAmp 4 0.5 4.5 4100 0 4100
 
+TH1F pngcer_pmt1_adc  'SHMS NG Cherenkov PMT 1 ; ADC (chan) ; Counts' P.ngcer.adc_p[0] 1000 0. 100000. P.ngcer.adc_hit[0]==1
+TH1F pngcer_pmt2_adc  'SHMS NG Cherenkov PMT 2 ; ADC (chan) ; Counts' P.ngcer.adc_p[1] 1000 0. 100000. P.ngcer.adc_hit[1]==1
+TH1F pngcer_pmt3_adc  'SHMS NG Cherenkov PMT 3 ; ADC (chan) ; Counts' P.ngcer.adc_p[2] 1000 0. 100000. P.ngcer.adc_hit[2]==1
+TH1F pngcer_pmt4_adc  'SHMS NG Cherenkov PMT 4 ; ADC (chan) ; Counts' P.ngcer.adc_p[3] 1000 0. 100000. P.ngcer.adc_hit[3]==1
+TH1F pngcer_pmt1_nphe 'SHMS NG Cherenkov PMT 1 ; N_Phe ; Counts' P.ngcer.npe[0] 500 0. 100. P.ngcer.adc_hit[0]==1
+TH1F pngcer_pmt2_nphe 'SHMS NG Cherenkov PMT 2 ; N_Phe ; Counts' P.ngcer.npe[1] 500 0. 100. P.ngcer.adc_hit[1]==1
+TH1F pngcer_pmt3_nphe 'SHMS NG Cherenkov PMT 3 ; N_Phe ; Counts' P.ngcer.npe[2] 500 0. 100. P.ngcer.adc_hit[2]==1
+TH1F pngcer_pmt4_nphe 'SHMS NG Cherenkov PMT 4 ; N_Phe ; Counts' P.ngcer.npe[3] 500 0. 100. P.ngcer.adc_hit[3]==1
+
 # Drift Chambers
 TH1F pdc_ref1  'SHMS DC Reference Time Slot 6 Channel 79; Raw TDC Time (TDC Clicks); Counts / 10 TDC Clicks;' T.shms.pDCREF1_tdcTime  200 12000 14000
 TH1F pdc_ref2  'SHMS DC Reference Time Slot 7 Channel 79; Raw TDC Time (TDC Clicks); Counts / 10 TDC Clicks;' T.shms.pDCREF2_tdcTime  200 12000 14000
@@ -131,6 +140,15 @@ TH2F phgcer_ped_vs_cntr 'SHMS Heavy Gas Cherenkov Pulse Pedestal vs. Counter Num
 TH2F phgcer_pi_vs_cntr 'SHMS Heavy Gas Cherenkov Pulse Integral vs. Counter Number; Counter Number;  Pulse Integral / 10 ADC Units' P.hgcer.adcCounter P.hgcer.adcPulseInt 4 0.5 4.5 4000 0 40000
 TH2F phgcer_amp_vs_cntr 'SHMS Heavy Gas Cherenkov Pulse Amplitude vs. Counter Number; Counter Number;  Pulse Amplitude / 1 ADC Unit' P.hgcer.adcCounter P.hgcer.adcPulseAmp 4 0.5 4.5 4100 0 4100
 
+TH1F phgcer_pmt1_adc  'SHMS HG Cherenkov PMT 1 ; ADC (chan) ; Counts' P.hgcer.adc_p[0] 1000 0. 100000. P.hgcer.adc_hit[0]==1
+TH1F phgcer_pmt2_adc  'SHMS HG Cherenkov PMT 2 ; ADC (chan) ; Counts' P.hgcer.adc_p[1] 1000 0. 100000. P.hgcer.adc_hit[1]==1
+TH1F phgcer_pmt3_adc  'SHMS HG Cherenkov PMT 3 ; ADC (chan) ; Counts' P.hgcer.adc_p[2] 1000 0. 100000. P.hgcer.adc_hit[2]==1
+TH1F phgcer_pmt4_adc  'SHMS HG Cherenkov PMT 4 ; ADC (chan) ; Counts' P.hgcer.adc_p[3] 1000 0. 100000. P.hgcer.adc_hit[3]==1
+TH1F phgcer_pmt1_nphe 'SHMS HG Cherenkov PMT 1 ; N_Phe ; Counts' P.hgcer.npe[0] 500 0. 100. P.hgcer.adc_hit[0]==1
+TH1F phgcer_pmt2_nphe 'SHMS HG Cherenkov PMT 2 ; N_Phe ; Counts' P.hgcer.npe[1] 500 0. 100. P.hgcer.adc_hit[1]==1
+TH1F phgcer_pmt3_nphe 'SHMS HG Cherenkov PMT 3 ; N_Phe ; Counts' P.hgcer.npe[2] 500 0. 100. P.hgcer.adc_hit[2]==1
+TH1F phgcer_pmt4_nphe 'SHMS HG Cherenkov PMT 4 ; N_Phe ; Counts' P.hgcer.npe[3] 500 0. 100. P.hgcer.adc_hit[3]==1
+
 # Aerogel
 TH1F paero_pos_occu 'SHMS Aero+ Occupancy; Counter Number; Number of Entries' P.aero.posAdcCounter 7 0.5 7.5
 TH2F paero_pos_ped_vs_cntr 'SHMS Aero+ Pulse Pedestal vs. Counter Number; Counter Number;  Pulse Pedestal / 1 ADC Unit' P.aero.posAdcCounter P.aero.posAdcPed 7 0.5 7.5 1000 0 1000

DEF-files/SHMS/GEN/pstackana_report_cuts.def

@@ -110,13 +110,13 @@ hTest2                hSpacePoints && (!hStubLT)
 
 
 Block: CoarseReconstruct
-CoarseReconstruct_master shms_event
+CoarseReconstruct_master SHMS_event
 
 Block: Tracking
-Tracking_master  shms_event
+Tracking_master  SHMS_event
 
 Block: Reconstruct
-Reconstruct_master shms_event
+Reconstruct_master SHMS_event
 
 shmsScinGood           P.hod.goodscinhit == 1
 
@@ -186,4 +186,4 @@ goodhs2               goodhs2x && goodhs2y
 goodhs1s2             goodhs1 && goodhs2
 
 Block: Physics
-Physics_master shms_event
+Physics_master SHMS_event

PARAM/SHMS/AERO/paero.param

+; Number of aerogel pairs of pmt's
+paero_num_pairs = 7
 
 
 paero_pos_gain = 1./496.7, 1./467.5, 1./554.3, 1./766.1, 1./412.1, 1./517.9, 1./435.6, 1./500.,

PARAM/SHMS/GEN/pcana.param

 ; Parameters we need to keep THcHallCSpectrometer Happy
 p_recon_coeff_filename = "DATFILES/SHMS_fr3_rec__order_5.dat"
 
-ppartmass = 0.139
 
-; Scintillator parameters
-pref_npaddles = 6
-pref_nsperchan = 0.1
-pref_offset = 0.0
 
-; Number of aerogel pairs of pmt's
-paero_num_pairs = 7
 
-; Number of heavy gas Cherenkov PMT's
-phgcer_tot_pmts = 4
-
-; Number of noble gas Cherenkov PMT's
-pngcer_tot_pmts = 4

PARAM/SHMS/HGCER/phgcer.param

-phgcer_width = 50, 50
+; Number of heavy gas Cherenkov PMT's
+phgcer_tot_pmts = 4
 
-phgcer_adc_to_npe = 1/145.0, 1/122.0
+phgcer_width = 50, 50,50, 50
+
+phgcer_adc_to_npe = 1/8895., 1/5293.,1/8000., 1/10000.
 
 
 phgcer_chi2max = 50.
@@ -20,5 +23,5 @@ phgcer_region =   30,  -30,   0,
                 .1,   .1,  .1,
                 .1,   .1,  .1
 
-phgcer_ped_limit =  1000,1000
+phgcer_ped_limit =  1000,1000, 1000,1000
 	       

PARAM/SHMS/NGCER/pngcer.param

-pngcer_width = 50, 50
+; Number of noble gas Cherenkov PMT's
+pngcer_tot_pmts = 4
 
-pngcer_adc_to_npe = 1/145.0, 1/122.0
+pngcer_width = 50, 50,50, 50
+
+pngcer_adc_to_npe = 1/5000., 1/5000., 1/5000., 1/5000.
 
 
 pngcer_chi2max = 50.
@@ -20,5 +23,5 @@ pngcer_region =   30,  -30,   0,
                 .1,   .1,  .1,
                 .1,   .1,  .1
 
-pngcer_ped_limit =  1000,1000
+pngcer_ped_limit =  1000,1000, 1000,1000