diff --git a/.gitignore b/.gitignore
index fc9aaa797d8e539dc53e68a3cdd90477b6392a40..fcdfe5c402494534d9b198c9d6d7864dfd1d34c0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,4 +15,15 @@ log/*
full_hms.sh
full_shms.sh
onlineGUI/Config/kpp_*
-run_*
\ No newline at end of file
+run_*
+*.d
+*.so
+*Auto*
+CALIBRATION/shms_cal_calib/pcal.param*
+CALIBRATION/hms_cal_calib/hcal.param*
+CALIBRATION/shms_cal_calib/calibrated.deb
+CALIBRATION/hms_cal_calib/calibrated.deb
+CALIBRATION/hms_cal_calib/hcal_calib_cpp_ACLiC_dict_rdict.pcm
+CALIBRATION/shms_cal_calib/pcal_calib_cpp_ACLiC_dict_rdict.pcm
+
+
diff --git a/CALIBRATION/hms_cal_calib/.rootrc b/CALIBRATION/hms_cal_calib/.rootrc
new file mode 100644
index 0000000000000000000000000000000000000000..313d262d4d4a9ca6b2a1757855d04c67b8aedaba
--- /dev/null
+++ b/CALIBRATION/hms_cal_calib/.rootrc
@@ -0,0 +1 @@
+Rint.History: .root_history
diff --git a/CALIBRATION/hms_cal_calib/howto.txt b/CALIBRATION/hms_cal_calib/howto.txt
index 764d780cda0d1da05adae45a1cdc0a473c2c4860..249e126cbee4111b019f334e350912238cdf2a94 100644
--- a/CALIBRATION/hms_cal_calib/howto.txt
+++ b/CALIBRATION/hms_cal_calib/howto.txt
@@ -19,7 +19,7 @@ run hcal_calib under hcana, by issuing command
For instance, for calibration on hms_replay_303.root file in
ROOTfiles, the correct commad would be
-.x pcal_calib.cpp+("303") .
+.x hcal_calib.cpp+("303") .
Upon calibration, a canvas with representative plots will pop up. The
calibration constants will be written in output file
diff --git a/CALIBRATION/shms_cal_calib/.rootrc b/CALIBRATION/shms_cal_calib/.rootrc
new file mode 100644
index 0000000000000000000000000000000000000000..313d262d4d4a9ca6b2a1757855d04c67b8aedaba
--- /dev/null
+++ b/CALIBRATION/shms_cal_calib/.rootrc
@@ -0,0 +1 @@
+Rint.History: .root_history
diff --git a/CALIBRATION/shms_cal_calib/ROOTfiles b/CALIBRATION/shms_cal_calib/ROOTfiles
deleted file mode 120000
index 431cd2c92c0de8a3bae4131fc34816f3af0c523b..0000000000000000000000000000000000000000
--- a/CALIBRATION/shms_cal_calib/ROOTfiles
+++ /dev/null
@@ -1 +0,0 @@
-/net/cdaq/cdaql3data/cdaq/hallc-online/ROOTfiles
\ No newline at end of file
diff --git a/CALIBRATION/shms_cal_calib/pcal_calib.cpp b/CALIBRATION/shms_cal_calib/pcal_calib.cpp
index df917354358bacf3a139690d53b0338acbc6bdf6..008e7b1eea8966ea4af6baa453c6db6e73a2e9e4 100644
--- a/CALIBRATION/shms_cal_calib/pcal_calib.cpp
+++ b/CALIBRATION/shms_cal_calib/pcal_calib.cpp
@@ -41,7 +41,7 @@ void pcal_calib(string RunNumber) {
theShowerCalib.hEuncSel->DrawCopy("same");
Canvas->cd(2);
- theShowerCalib.hESHvsEPR->Draw();
+ theShowerCalib.hESHvsEPR->Draw("colz");
// Normalized energy deposition after calibration.
@@ -56,7 +56,7 @@ void pcal_calib(string RunNumber) {
// SHMS delta(P) versus the calibrated energy deposition.
Canvas->cd(4);
- theShowerCalib.hDPvsEcal->Draw();
+ theShowerCalib.hDPvsEcal->Draw("colz");
// Calculate the analysis rate
t = clock() - t;
diff --git a/DEF-files/HMS/GEN/hstackana_report.def b/DEF-files/HMS/GEN/hstackana_report.def
index bcdf5938f1dd845a713f80bd67477e25acb9febc..8c4aee4ac3bc1270aab7af5c297e8dfb09419ff2 100644
--- a/DEF-files/HMS/GEN/hstackana_report.def
+++ b/DEF-files/HMS/GEN/hstackana_report.def
@@ -21,18 +21,18 @@ TH1F hcal_xtrack2 'HMS Cal X pos of track no matching clust number of cluster=1'
TH1F hcal_enenorm 'HMS Cal energy normalized by Central MOM' H.cal.etotnorm 300 0. 1.5
TH1F hcal_ene_track 'HMS Cal energy (best track)' H.cal.etrack 1000 0. 5. H.dc.ntrack>0
TH1F hcal_enenorm_track 'HMS Cal energy normalized by best track mom' H.cal.etracknorm 1000 0. 1.5 H.dc.ntrack>0
-TH1F hcal_enenorm_track_elec 'HMS Cal energy/p (npesum > .5 && abs(del)<8)' H.cal.etracknorm 300 0. 1.5 H.dc.ntrack>0&&H.cer.npesum>.5&&H.gtr.dp>-8.&&H.gtr.dp<8.
-TH1F hcal_enenorm_track_pion 'HMS Cal energy/p (npesum <.5 && abs(del)<8)' H.cal.etracknorm 300 0. 1.5 H.dc.ntrack>0&&H.cer.npesum<.5&&H.gtr.dp>-8.&&H.gtr.dp<8.
+TH1F hcal_enenorm_track_elec 'HMS Cal energy/p (npeSum > .5 && abs(del)<8)' H.cal.etracknorm 300 0. 1.5 H.dc.ntrack>0&&H.cer.npeSum>.5&&H.gtr.dp>-8.&&H.gtr.dp<8.
+TH1F hcal_enenorm_track_pion 'HMS Cal energy/p (npeSum <.5 && abs(del)<8)' H.cal.etracknorm 300 0. 1.5 H.dc.ntrack>0&&H.cer.npeSum<.5&&H.gtr.dp>-8.&&H.gtr.dp<8.
TH2F hcal_ene_2dtrack 'HMS Cal energy v energy track' H.cal.etrack H.cal.etot 1000 0. 5. 1000 0. 5. H.dc.ntrack>0
TH2F hcal_delta_etrack 'HMS Delta v Cal energy/p ' H.cal.etracknorm H.gtr.dp 300 0. 1.5 600 -15. 15. H.dc.ntrack>0
-TH2F hcal_npe_etrack 'HMS Cer Npe v Cal energy/p' H.cal.etracknorm H.cer.npesum 300 0. 1.5 60 0. 15. H.dc.ntrack>0
-TH1F hcer_pmt1 'HMS GAS Cher PMT1; ADC ; Counts' H.cer.adc_p[0] 200 0 10000
-TH1F hcer_pmt2 'HMS GAS Cher PMT2; ADC ; Counts' H.cer.adc_p[1] 200 0 10000
+TH2F hcal_npe_etrack 'HMS Cer Npe v Cal energy/p' H.cal.etracknorm H.cer.npeSum 300 0. 1.5 60 0. 15. H.dc.ntrack>0
+TH1F hcer_pmt1 'HMS GAS Cher PMT1; ADC ; Counts' H.cer.goodAdcPulseInt[0] 200 0 10000
+TH1F hcer_pmt2 'HMS GAS Cher PMT2; ADC ; Counts' H.cer.goodAdcPulseInt[1] 200 0 10000
TH1F hcer_pmt1_nphe 'HMS GAS Cher PMT1; Number of PE ; Counts' H.cer.npe[0] 80 0 20
TH1F hcer_pmt2_nphe 'HMS GAS Cher PMT2; Number of PE ; Counts' H.cer.npe[1] 80 0 20
-TH1F hcer_sum_nphe 'HMS GAS Cher; Total Number of PE ; Counts' H.cer.npesum 80 0 20
-TH2F hcer_sum_nphe_x 'HMS GAS Cher; Total Number of PE ; X_fp' H.cer.npesum H.dc.x_fp 80 0 20 80 -60. 60.
-TH2F hcer_sum_nphe_dp 'HMS GAS Cher; Total Number of PE ; Delta (%) ' H.cer.npesum H.gtr.dp 80 0 20 120 -15. 20.
+TH1F hcer_sum_nphe 'HMS GAS Cher; Total Number of PE ; Counts' H.cer.npeSum 80 0 20
+TH2F hcer_sum_nphe_x 'HMS GAS Cher; Total Number of PE ; X_fp' H.cer.npeSum H.dc.x_fp 80 0 20 80 -60. 60.
+TH2F hcer_sum_nphe_dp 'HMS GAS Cher; Total Number of PE ; Delta (%) ' H.cer.npeSum H.gtr.dp 80 0 20 120 -15. 20.
TH1F hbeta 'HMS beta' H.hod.beta 240 -1.2 1.2
TH1F hbetanotrack 'HMS beta' H.hod.betanotrack 240 -1.2 1.2
TH1F htr_x 'HMS x' H.tr.x 80 -40. 40.
@@ -170,15 +170,15 @@ TH2F hhodo_2y_neg_tdc_time_vs_pad 'HMS Hodoscope 2Y- TDC Time vs. Paddle Number;
# Cherenkov
TH1F hgcer_occu 'HMS Cherenkov ADC Occupancy; PMT Number; Number of ADC Hits' H.cer.adcCounter 2 0.5 2.5
-TH2F hgcer_ped_vs_cntr 'HMS Cherenkov Pulse Pedestal; PMT Number; Pulse Pedestal / 1 ADC Units' H.cer.adcCounter H.cer.adcPed 2 0.5 2.5 1000 0 1000
-TH2F hgcer_pi_vs_cntr 'HMS Cherenkov Pulse Integral; PMT Number; Pulse Pedestal / 10 ADC Units' H.cer.adcCounter H.cer.adcPulseInt 2 0.5 2.5 4000 0 40000
-TH2F hgcer_pamp_vs_cntr 'HMS Cherenkov Pulse Amplitude; PMT Number; Pulse Pedestal / 1 ADC Units' H.cer.adcCounter H.cer.adcPulseAmp 2 0.5 2.5 4100 0 4100
+TH2F hgcer_ped_vs_cntr 'HMS Cherenkov Pulse Pedestal; PMT Number; Pulse Pedestal / 1 ADC Units' [I] H.cer.goodAdcPed 3 0 3 1000 0 1000
+TH2F hgcer_pi_vs_cntr 'HMS Cherenkov Pulse Integral; PMT Number; Pulse Pedestal / 10 ADC Units' [I] H.cer.goodAdcPulseInt 3 0 3 4000 0 40000
+TH2F hgcer_pamp_vs_cntr 'HMS Cherenkov Pulse Amplitude; PMT Number; Pulse Pedestal / 1 ADC Units' [I] H.cer.goodAdcPulseAmp 3 0 3 4100 0 4100
#
-TH1F hgcer_pmt1_adc 'HMS Cherenkov PMT 1 ; ADC (chan) ; Counts' H.cer.adc_p[0] 1000 0. 100000. H.cer.adc_hit[0]==1
-TH1F hgcer_pmt2_adc 'HMS Cherenkov PMT 2 ; ADC (chan) ; Counts' H.cer.adc_p[1] 1000 0. 100000. H.cer.adc_hit[1]==1
-TH1F hgcer_pmt1_nphe 'HMS Cherenkov PMT 1 ; N_Phe ; Counts' H.cer.npe[0] 500 0. 100. H.cer.adc_hit[0]==1
-TH1F hgcer_pmt2_nphe 'HMS Cherenkov PMT 2 ; N_Phe ; Counts' H.cer.npe[1] 500 0. 100. H.cer.adc_hit[1]==1
+TH1F hgcer_pmt1_adc 'HMS Cherenkov PMT 1 ; ADC (chan) ; Counts' H.cer.goodAdcPulseInt[0] 1000 0. 100000.
+TH1F hgcer_pmt2_adc 'HMS Cherenkov PMT 2 ; ADC (chan) ; Counts' H.cer.goodAdcPulseInt[1] 1000 0. 100000.
+TH1F hgcer_pmt1_nphe 'HMS Cherenkov PMT 1 ; N_Phe ; Counts' H.cer.npe[0] 500 0. 100.
+TH1F hgcer_pmt2_nphe 'HMS Cherenkov PMT 2 ; N_Phe ; Counts' H.cer.npe[1] 500 0. 100.
# Pre-Shower
diff --git a/DEF-files/HMS/GEN/hstackana_report_cuts.def b/DEF-files/HMS/GEN/hstackana_report_cuts.def
index 05ef8e2f822874ed3d576f7b01cec6195056560f..62e2a6e6139d3f20e6bec0b0ac623b72242ef599 100644
--- a/DEF-files/HMS/GEN/hstackana_report_cuts.def
+++ b/DEF-files/HMS/GEN/hstackana_report_cuts.def
@@ -121,16 +121,16 @@ Tracking_master HMS_event
Block: Reconstruct
Reconstruct_master HMS_event
-cer_pmt1_elec H.cer.npe[0]>.25
-cer_pmt2_elec H.cer.npe[0]>.25
-cer_elec H.cer.npesum>.25
-cer_pi H.cer.npesum<.25
+cer_pmt1_elec H.cer.npe[0]>.5
+cer_pmt2_elec H.cer.npe[0]>.5
+cer_elec H.cer.npeSum>.5
+cer_pi H.cer.npeSum<.5
HMSScinGood H.hod.goodscinhit == 1
-HMSScinShould HMSScinGood && H.cal.etotnorm > 0.7 && H.cer.npesum > 2.0
-HMSScinShoulde HMSScinGood && H.cer.npesum > 2.0
-HMSScinShouldh H.hod.goodscinhit == 1 && g.evtyp == 1
+HMSScinShould HMSScinGood
+HMSScinShoulde HMSScinGood && H.cal.etotnorm > 0.6&& H.cal.etotnorm < 2.0&& H.cer.npeSum > 0.5
+HMSScinShouldh HMSScinGood && H.cal.etotnorm <0.6&& H.cal.etotnorm>0.0&& H.cer.npeSum < 0.5
HMSScinDid HMSScinShould && H.dc.ntrack > 0
HMSScinDide HMSScinShoulde && H.dc.ntrack > 0
diff --git a/DEF-files/SHMS/AERO/paeroana.def b/DEF-files/SHMS/AERO/paeroana.def
index 9cff8d08cc4cf1e803e7bbff3c1cb9d170298b88..837ecf30e40b597d92e05fff7b7d03dbd85a228c 100644
--- a/DEF-files/SHMS/AERO/paeroana.def
+++ b/DEF-files/SHMS/AERO/paeroana.def
@@ -6,20 +6,16 @@ block T.shms.*
TH1F paero_neg_occu 'SHMS Aero- Occupancy; Counter Number; Number of Entries' P.aero.negAdcCounter 7 0.5 7.5
TH1F paero_pos_occu 'SHMS Aero+ Occupancy; Counter Number; Number of Entries' P.aero.posAdcCounter 7 0.5 7.5
-TH2F paero_neg_rawped_vs_cntr 'SHMS Aero- Raw Pulse Pedestal vs. Counter Number; Counter Number; Raw Pulse Pedestal / 10 ADC Units' P.aero.negAdcCounter P.aero.negAdcPedRaw 7 0.5 7.5 1000 0 10000
-TH2F paero_neg_rawpi_vs_cntr 'SHMS Aero- Raw Pulse Integral vs. Counter Number; Counter Number; Raw Pulse Integral / 10 ADC Units' P.aero.negAdcCounter P.aero.negAdcPulseIntRaw 7 0.5 7.5 4000 0 40000
-TH2F paero_neg_rawamp_vs_cntr 'SHMS Aero- Raw Pulse Amplitude vs. Counter Number; Counter Number; Raw Pulse Amplitude / 10 ADC Units' P.aero.negAdcCounter P.aero.negAdcPulseAmpRaw 7 0.5 7.5 410 0 4100
-TH2F paero_neg_rawptime_vs_cntr 'SHMS Aero- Raw Pulse Time vs. Counter Number; Counter Number; Raw Pulse Time / 10 ADC Units' P.aero.negAdcCounter P.aero.negAdcPulseTimeRaw 7 0.5 7.5 1000 0 10000
+TH2F paero_neg_rawamp_vs_cntr 'SHMS Aero- Raw Pulse Amplitude vs. Counter Number; Counter Number; Raw Pulse Amplitude / 10 ADC Units' [I] P.aero.goodNegAdcPulseAmpRaw 7 -0.5 7.5 410 0 4100
+TH2F paero_neg_ped_vs_cntr 'SHMS Aero- Pulse Pedestal vs. Counter Number; Counter Number; Pulse Pedestal / 10 ADC Units' [I] P.aero.goodNegAdcPed 7 -0.5 7.5 1000 0 10000
+TH2F paero_neg_rawpi_vs_cntr 'SHMS Aero- Raw Pulse Integral vs. Counter Number; Counter Number; Raw Pulse Integral / 10 ADC Units' [I] P.aero.goodNegAdcPulseIntRaw 7 -0.5 7.5 4000 0 40000
+TH2F paero_neg_pi_vs_cntr 'SHMS Aero- Pulse Integral vs. Counter Number; Counter Number; Pulse Integral / 10 ADC Units' [I] P.aero.goodNegAdcPulseInt 7 -0.5 7.5 4000 0 40000
+TH2F paero_neg_amp_vs_cntr 'SHMS Aero- Pulse Amplitude vs. Counter Number; Counter Number; Pulse Amplitude / 10 ADC Units' [I] P.aero.goodNegAdcPulseAmp 7 -0.5 7.5 410 0 4100
+TH2F paero_neg_rawptime_vs_cntr 'SHMS Aero- Pulse Time vs. Counter Number; Counter Number; Raw Pulse Time / 10 ADC Units' [I] P.aero.negAdcPulseTime 7 -0.5 7.5 1000 0 10000
-TH2F paero_pos_rawped_vs_cntr 'SHMS Aero+ Raw Pulse Pedestal vs. Counter Number; Counter Number; Raw Pulse Pedestal / 10 ADC Units' P.aero.posAdcCounter P.aero.posAdcPedRaw 7 0.5 7.5 1000 0 10000
-TH2F paero_pos_rawpi_vs_cntr 'SHMS Aero+ Raw Pulse Integral vs. Counter Number; Counter Number; Raw Pulse Integral / 10 ADC Units' P.aero.posAdcCounter P.aero.posAdcPulseIntRaw 7 0.5 7.5 4000 0 40000
-TH2F paero_pos_rawamp_vs_cntr 'SHMS Aero+ Raw Pulse Amplitude vs. Counter Number; Counter Number; Raw Pulse Amplitude / 10 ADC Units' P.aero.posAdcCounter P.aero.posAdcPulseAmpRaw 7 0.5 7.5 410 0 4100
-TH2F paero_pos_rawptime_vs_cntr 'SHMS Aero+ Raw Pulse Time vs. Counter Number; Counter Number; Raw Pulse Time / 10 ADC Units' P.aero.negAdcCounter P.aero.negAdcPulseTimeRaw 7 0.5 7.5 1000 0 10000
-TH2F paero_neg_ped_vs_cntr 'SHMS Aero- Pulse Pedestal vs. Counter Number; Counter Number; Pulse Pedestal / 10 ADC Units' P.aero.negAdcCounter P.aero.negAdcPed 7 0.5 7.5 1000 0 10000
-TH2F paero_neg_pi_vs_cntr 'SHMS Aero- Pulse Integral vs. Counter Number; Counter Number; Pulse Integral / 10 ADC Units' P.aero.negAdcCounter P.aero.negAdcPulseInt 7 0.5 7.5 4000 0 40000
-TH2F paero_neg_amp_vs_cntr 'SHMS Aero- Pulse Amplitude vs. Counter Number; Counter Number; Pulse Amplitude / 10 ADC Units' P.aero.negAdcCounter P.aero.negAdcPulseAmp 7 0.5 7.5 410 0 4100
-
-TH2F paero_pos_ped_vs_cntr 'SHMS Aero+ Pulse Pedestal vs. Counter Number; Counter Number; Pulse Pedestal / 10 ADC Units' P.aero.posAdcCounter P.aero.posAdcPed 7 0.5 7.5 1000 0 10000
-TH2F paero_pos_pi_vs_cntr 'SHMS Aero+ Pulse Integral vs. Counter Number; Counter Number; Pulse Integral / 10 ADC Units' P.aero.posAdcCounter P.aero.posAdcPulseInt 7 0.5 7.5 4000 0 40000
-TH2F paero_pos_amp_vs_cntr 'SHMS Aero+ Pulse Amplitude vs. Counter Number; Counter Number; Pulse Amplitude / 10 ADC Units' P.aero.posAdcCounter P.aero.posAdcPulseAmp 7 0.5 7.5 410 0 4100
+TH2F paero_pos_ped_vs_cntr 'SHMS Aero+ Pulse Pedestal vs. Counter Number; Counter Number; Pulse Pedestal / 10 ADC Units' [I] P.aero.goodPosAdcPed 7 -0.5 7.5 1000 0 10000
+TH2F paero_pos_rawpi_vs_cntr 'SHMS Aero+ Raw Pulse Integral vs. Counter Number; Counter Number; Raw Pulse Integral / 10 ADC Units' [I] P.aero.goodPosAdcPulseIntRaw 7 -0.5 7.5 4000 0 40000
+TH2F paero_pos_pi_vs_cntr 'SHMS Aero+ Pulse Integral vs. Counter Number; Counter Number; Pulse Integral / 10 ADC Units' [I] P.aero.goodPosAdcPulseInt 7 -0.5 7.5 4000 0 40000
+TH2F paero_pos_amp_vs_cntr 'SHMS Aero+ Pulse Amplitude vs. Counter Number; Counter Number; Pulse Amplitude / 10 ADC Units' [I] P.aero.goodPosAdcPulseAmp 7 -0.5 7.5 410 0 4100
+TH2F paero_pos_rawptime_vs_cntr 'SHMS Aero+ Raw Pulse Time vs. Counter Number; Counter Number; Raw Pulse Time / 10 ADC Units' [I] P.aero.goodNegAdcPulseTime 7 -0.5 7.5 1000 0 10000
diff --git a/DEF-files/SHMS/GEN/pstackana.def b/DEF-files/SHMS/GEN/pstackana.def
index b09264d388aa8492643bb5a693fac44614b1883b..585a69f0dc64f4d0950b13bd3c60d940b7dc4b37 100644
--- a/DEF-files/SHMS/GEN/pstackana.def
+++ b/DEF-files/SHMS/GEN/pstackana.def
@@ -12,17 +12,17 @@ block P.cal.*
# Noble Gas Cherenkov
TH1F pngcer_occu 'SHMS Noble Gas Cherenkov Occupancy; Counter Number; Number of Entries' P.ngcer.adcCounter 4 0.5 4.5
-TH2F pngcer_ped_vs_cntr 'SHMS Noble Gas Cherenkov Pulse Pedestal vs. Counter Number; Counter Number; Pulse Pedestal / 1 ADC Unit' P.ngcer.adcCounter P.ngcer.adcPed 4 0.5 4.5 1000 0 1000
-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] 2000 0. 20000. P.ngcer.adc_hit[0]==1
-TH1F pngcer_pmt2_adc 'SHMS NG Cherenkov PMT 2 ; ADC (chan) ; Counts' P.ngcer.adc_p[1] 2000 0. 20000. P.ngcer.adc_hit[1]==1
-TH1F pngcer_pmt3_adc 'SHMS NG Cherenkov PMT 3 ; ADC (chan) ; Counts' P.ngcer.adc_p[2] 2000 0. 20000. P.ngcer.adc_hit[2]==1
-TH1F pngcer_pmt4_adc 'SHMS NG Cherenkov PMT 4 ; ADC (chan) ; Counts' P.ngcer.adc_p[3] 2000 0. 20000. P.ngcer.adc_hit[3]==1
-TH1F pngcer_pmt1_nphe 'SHMS NG Cherenkov PMT 1 ; N_Phe ; Counts' P.ngcer.npe[0] 80 0. 40. P.ngcer.adc_hit[0]==1
-TH1F pngcer_pmt2_nphe 'SHMS NG Cherenkov PMT 2 ; N_Phe ; Counts' P.ngcer.npe[1] 80 0. 40. P.ngcer.adc_hit[1]==1
-TH1F pngcer_pmt3_nphe 'SHMS NG Cherenkov PMT 3 ; N_Phe ; Counts' P.ngcer.npe[2] 80 0. 40. P.ngcer.adc_hit[2]==1
-TH1F pngcer_pmt4_nphe 'SHMS NG Cherenkov PMT 4 ; N_Phe ; Counts' P.ngcer.npe[3] 80 0. 40. P.ngcer.adc_hit[3]==1
+TH2F pngcer_ped_vs_cntr 'SHMS Noble Gas Cherenkov Pulse Pedestal vs. Counter Number; Counter Number; Pulse Pedestal / 1 ADC Unit' [I] P.ngcer.goodAdcPed 4 0 4 1000 0 1000
+TH2F pngcer_pi_vs_cntr 'SHMS Noble Gas Cherenkov Pulse Integral vs. Counter Number; Counter Number; Pulse Integral / 10 ADC Units' [I] P.ngcer.goodAdcPulseInt 4 0 4 4000 0 40000
+TH2F pngcer_amp_vs_cntr 'SHMS Noble Gas Cherenkov Pulse Amplitude vs. Counter Number; Counter Number; Pulse Amplitude / 1 ADC Unit' [I] P.ngcer.goodAdcPulseAmp 4 0 4 4100 0 4100
+TH1F pngcer_pmt1_adc 'SHMS NG Cherenkov PMT 1 ; ADC (chan) ; Counts' P.ngcer.goodAdcPulseInt[0] 2000 0. 20000.
+TH1F pngcer_pmt2_adc 'SHMS NG Cherenkov PMT 2 ; ADC (chan) ; Counts' P.ngcer.goodAdcPulseInt[1] 2000 0. 20000.
+TH1F pngcer_pmt3_adc 'SHMS NG Cherenkov PMT 3 ; ADC (chan) ; Counts' P.ngcer.goodAdcPulseInt[2] 2000 0. 20000.
+TH1F pngcer_pmt4_adc 'SHMS NG Cherenkov PMT 4 ; ADC (chan) ; Counts' P.ngcer.goodAdcPulseInt[3] 2000 0. 20000.
+TH1F pngcer_pmt1_nphe 'SHMS NG Cherenkov PMT 1 ; N_Phe ; Counts' P.ngcer.npe[0] 80 0. 40.
+TH1F pngcer_pmt2_nphe 'SHMS NG Cherenkov PMT 2 ; N_Phe ; Counts' P.ngcer.npe[1] 80 0. 40.
+TH1F pngcer_pmt3_nphe 'SHMS NG Cherenkov PMT 3 ; N_Phe ; Counts' P.ngcer.npe[2] 80 0. 40.
+TH1F pngcer_pmt4_nphe 'SHMS NG Cherenkov PMT 4 ; N_Phe ; Counts' P.ngcer.npe[3] 80 0. 40.
# 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
@@ -151,29 +151,29 @@ TH2F phodo_2y_neg_tdc_time_vs_pad 'SHMS Hodoscope 2Y- TDC Time vs. Paddle Number
# Heavy Gas Cherenkov
TH1F phgcer_occu 'SHMS Heavy Gas Cherenkov Occupancy; Counter Number; Number of Entries' P.hgcer.adcCounter 4 0.5 4.5
-TH2F phgcer_ped_vs_cntr 'SHMS Heavy Gas Cherenkov Pulse Pedestal vs. Counter Number; Counter Number; Pulse Pedestal / 1 ADC Unit' P.hgcer.adcCounter P.hgcer.adcPed 4 0.5 4.5 1000 0 1000
-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] 2000 0. 20000. P.hgcer.adc_hit[0]==1
-TH1F phgcer_pmt2_adc 'SHMS HG Cherenkov PMT 2 ; ADC (chan) ; Counts' P.hgcer.adc_p[1] 2000 0. 20000. P.hgcer.adc_hit[1]==1
-TH1F phgcer_pmt3_adc 'SHMS HG Cherenkov PMT 3 ; ADC (chan) ; Counts' P.hgcer.adc_p[2] 2000 0. 20000. P.hgcer.adc_hit[2]==1
-TH1F phgcer_pmt4_adc 'SHMS HG Cherenkov PMT 4 ; ADC (chan) ; Counts' P.hgcer.adc_p[3] 2000 0. 20000. P.hgcer.adc_hit[3]==1
-TH1F phgcer_pmt1_nphe 'SHMS HG Cherenkov PMT 1 ; N_Phe ; Counts' P.hgcer.npe[0] 80 0. 40. P.hgcer.adc_hit[0]==1
-TH1F phgcer_pmt2_nphe 'SHMS HG Cherenkov PMT 2 ; N_Phe ; Counts' P.hgcer.npe[1] 80 0. 40. P.hgcer.adc_hit[1]==1
-TH1F phgcer_pmt3_nphe 'SHMS HG Cherenkov PMT 3 ; N_Phe ; Counts' P.hgcer.npe[2] 80 0. 40. P.hgcer.adc_hit[2]==1
-TH1F phgcer_pmt4_nphe 'SHMS HG Cherenkov PMT 4 ; N_Phe ; Counts' P.hgcer.npe[3] 80 0. 40. P.hgcer.adc_hit[3]==1
-TH1F phgcer_nphe 'SHMS HG Cherenkov Sum ; N_Phe ; Counts' P.hgcer.npe[3] 80 0. 40. P.hgcer.adc_hit[0]==1||P.hgcer.adc_hit[1]==1||P.hgcer.adc_hit[2]==1||P.hgcer.adc_hit[3]==1
+TH2F phgcer_ped_vs_cntr 'SHMS Heavy Gas Cherenkov Pulse Pedestal vs. Counter Number; Counter Number; Pulse Pedestal / 1 ADC Unit' [I] P.hgcer.goodAdcPed 4 0 4 1000 0 1000
+TH2F phgcer_pi_vs_cntr 'SHMS Heavy Gas Cherenkov Pulse Integral vs. Counter Number; Counter Number; Pulse Integral / 10 ADC Units' [I] P.hgcer.goodAdcPulseInt 4 0 4 4000 0 40000
+TH2F phgcer_amp_vs_cntr 'SHMS Heavy Gas Cherenkov Pulse Amplitude vs. Counter Number; Counter Number; Pulse Amplitude / 1 ADC Unit' [I] P.hgcer.goodAdcPulseAmp 4 0 4 4100 0 4100
+
+TH1F phgcer_pmt1_adc 'SHMS HG Cherenkov PMT 1 ; ADC (chan) ; Counts' P.hgcer.goodAdcPulseInt[0] 2000 0. 20000.
+TH1F phgcer_pmt2_adc 'SHMS HG Cherenkov PMT 2 ; ADC (chan) ; Counts' P.hgcer.goodAdcPulseInt[1] 2000 0. 20000.
+TH1F phgcer_pmt3_adc 'SHMS HG Cherenkov PMT 3 ; ADC (chan) ; Counts' P.hgcer.goodAdcPulseInt[2] 2000 0. 20000.
+TH1F phgcer_pmt4_adc 'SHMS HG Cherenkov PMT 4 ; ADC (chan) ; Counts' P.hgcer.goodAdcPulseInt[3] 2000 0. 20000.
+TH1F phgcer_pmt1_nphe 'SHMS HG Cherenkov PMT 1 ; N_Phe ; Counts' P.hgcer.npe[0] 80 0. 40.
+TH1F phgcer_pmt2_nphe 'SHMS HG Cherenkov PMT 2 ; N_Phe ; Counts' P.hgcer.npe[1] 80 0. 40.
+TH1F phgcer_pmt3_nphe 'SHMS HG Cherenkov PMT 3 ; N_Phe ; Counts' P.hgcer.npe[2] 80 0. 40.
+TH1F phgcer_pmt4_nphe 'SHMS HG Cherenkov PMT 4 ; N_Phe ; Counts' P.hgcer.npe[3] 80 0. 40.
+TH1F phgcer_nphe 'SHMS HG Cherenkov Sum ; N_Phe ; Counts' P.hgcer.npeSum 80 0. 40.
# 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
-TH2F paero_pos_pi_vs_cntr 'SHMS Aero+ Pulse Integral vs. Counter Number; Counter Number; Pulse Integral / 10 ADC Units' P.aero.posAdcCounter P.aero.posAdcPulseInt 7 0.5 7.5 4000 0 40000
-TH2F paero_pos_amp_vs_cntr 'SHMS Aero+ Pulse Amplitude vs. Counter Number; Counter Number; Pulse Amplitude / 1 ADC Unit' P.aero.posAdcCounter P.aero.posAdcPulseAmp 7 0.5 7.5 4100 0 4100
+TH2F paero_pos_ped_vs_cntr 'SHMS Aero+ Pulse Pedestal vs. Counter Number; Counter Number; Pulse Pedestal / 1 ADC Unit' [I] P.aero.goodPosAdcPed 7 0 7 1000 0 1000
+TH2F paero_pos_pi_vs_cntr 'SHMS Aero+ Pulse Integral vs. Counter Number; Counter Number; Pulse Integral / 10 ADC Units' [I] P.aero.goodPosAdcPulseInt 7 0 7 4000 0 40000
+TH2F paero_pos_amp_vs_cntr 'SHMS Aero+ Pulse Amplitude vs. Counter Number; Counter Number; Pulse Amplitude / 1 ADC Unit' [I] P.aero.goodPosAdcPulseAmp 7 0 7 4100 0 4100
TH1F paero_neg_occu 'SHMS Aero- Occupancy; Counter Number; Number of Entries' P.aero.negAdcCounter 7 0.5 7.5
-TH2F paero_neg_ped_vs_cntr 'SHMS Aero- Pulse Pedestal vs. Counter Number; Counter Number; Pulse Pedestal / 1 ADC Unit' P.aero.negAdcCounter P.aero.negAdcPed 7 0.5 7.5 1000 0 1000
-TH2F paero_neg_pi_vs_cntr 'SHMS Aero- Pulse Integral vs. Counter Number; Counter Number; Pulse Integral / 10 ADC Units' P.aero.negAdcCounter P.aero.negAdcPulseInt 7 0.5 7.5 4000 0 40000
-TH2F paero_neg_amp_vs_cntr 'SHMS Aero- Pulse Amplitude vs. Counter Number; Counter Number; Pulse Amplitude / 1 ADC Unit' P.aero.negAdcCounter P.aero.negAdcPulseAmp 7 0.5 7.5 4100 0 4100
+TH2F paero_neg_ped_vs_cntr 'SHMS Aero- Pulse Pedestal vs. Counter Number; Counter Number; Pulse Pedestal / 1 ADC Unit' [I] P.aero.goodNegAdcPed 7 0 7 1000 0 1000
+TH2F paero_neg_pi_vs_cntr 'SHMS Aero- Pulse Integral vs. Counter Number; Counter Number; Pulse Integral / 10 ADC Units' [I] P.aero.goodNegAdcPulseInt 7 0 7 4000 0 40000
+TH2F paero_neg_amp_vs_cntr 'SHMS Aero- Pulse Amplitude vs. Counter Number; Counter Number; Pulse Amplitude / 1 ADC Unit' [I] P.aero.goodNegAdcPulseAmp 7 0 7 4100 0 4100
# Pre-Shower Calorimeter
TH1F pcal_prshwr_pos_occu 'SHMS Preshower+ Occupancy; Block Number; Number of Entries' P.cal.pr.posAdcCounter 14 0.5 14.5
diff --git a/DEF-files/SHMS/GEN/pstackana_report.def b/DEF-files/SHMS/GEN/pstackana_report.def
index 11705247d0a2186ac8046ee8d01e7c9b34ca6a17..da0db367eb6259a5388bb6800d72f048c3679915 100644
--- a/DEF-files/SHMS/GEN/pstackana_report.def
+++ b/DEF-files/SHMS/GEN/pstackana_report.def
@@ -20,28 +20,27 @@ TH1F pcal_xtrack2 'SHMS Cal X pos of track no matching clust number of cluster=1
TH1F pcal_enenorm 'SHMS Cal energy normalized by Central MOM' P.cal.etotnorm 300 0. 1.5
TH1F pcal_ene_track 'SHMS Cal energy (best track)' P.cal.etrack 1000 0. 5. P.dc.ntrack>0
TH1F pcal_enenorm_track 'SHMS Cal energy normalized by best track mom' P.cal.etracknorm 1000 0. 1.5 P.dc.ntrack>0
-TH1F pcal_enenorm_track_elec 'SHMS Cal energy/p (npesum > .5 && abs(del)<8)' P.cal.etracknorm 300 0. 1.5 P.dc.ntrack>0&&P.ngcer.npesum>.5&&P.hgcer.npesum>.5&&P.gtr.dp>-8.&&P.gtr.dp<8.
-TH1F pcal_enenorm_track_pion 'SHMS Cal energy/p (npesum <.5 && abs(del)<8)' P.cal.etracknorm 300 0. 1.5 P.dc.ntrack>0&&P.ngcer.npesum<.5&&P.hgcer.npesum<.5&&P.gtr.dp>-8.&&P.gtr.dp<8.
+TH1F pcal_enenorm_track_elec 'SHMS Cal energy/p (npeSum > .5 && abs(del)<8)' P.cal.etracknorm 300 0. 1.5 P.dc.ntrack>0&&P.ngcer.npeSum>.5&&P.hgcer.npeSum>.5&&P.gtr.dp>-8.&&P.gtr.dp<8.
+TH1F pcal_enenorm_track_pion 'SHMS Cal energy/p (npeSum <.5 && abs(del)<8)' P.cal.etracknorm 300 0. 1.5 P.dc.ntrack>0&&P.ngcer.npeSum<.5&&P.hgcer.npeSum<.5&&P.gtr.dp>-8.&&P.gtr.dp<8.
TH2F pcal_ene_2dtrack 'SHMS Cal energy v energy track' P.cal.etrack P.cal.etot 1000 0. 5. 1000 0. 5. P.dc.ntrack>0
-TH2F pcal_delta_etrack 'SHMS Delta v Cal energy/p ' P.cal.etracknorm P.gtr.dp 300 0. 1.5 600 -15. 15. P.dc.ntrack>0
-TH2F pcal_npe_etrack 'SHMS Cer Npe v Cal energy/p' P.cal.etracknorm P.cer.npesum 300 0. 1.5 60 0. 15. P.dc.ntrack>0
+TH2F pcal_delta_etrack 'SHMS Delta v Cal energy/p ' P.cal.etracknorm P.gtr.dp 60 0. 1.5 80 -15. 25. P.dc.ntrack>0
+TH2F pcal_ngnpe_etrack 'SHMS NG Cer Npe v Cal energy/p' P.cal.etracknorm P.ngcer.npeSum 300 0. 1.5 60 0. 15. P.dc.ntrack>0
+TH2F pcal_hgnpe_etrack 'SHMS HG Cer Npe v Cal energy/p' P.cal.etracknorm P.hgcer.npeSum 300 0. 1.5 60 0. 15. P.dc.ntrack>0
# Noble Gas Cherenkov
TH1F pngcer_occu 'SHMS Noble Gas Cherenkov Occupancy; Counter Number; Number of Entries' P.ngcer.adcCounter 4 0.5 4.5
-TH2F pngcer_ped_vs_cntr 'SHMS Noble Gas Cherenkov Pulse Pedestal vs. Counter Number; Counter Number; Pulse Pedestal / 1 ADC Unit' P.ngcer.adcCounter P.ngcer.adcPed 4 0.5 4.5 1000 0 1000
-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_occu_elec 'SHMS Noble Gas Cherenkov Occupancy ( cut sum npe ; Counter Number; Number of Entries' P.ngcer.adcCounter 4 0.5 4.5 P.ngcer.npeSum>0.5
-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] 80 0. 20. P.ngcer.adc_hit[0]==1
-TH1F pngcer_pmt2_nphe 'SHMS NG Cherenkov PMT 2 ; N_Phe ; Counts' P.ngcer.npe[1] 80 0. 20. P.ngcer.adc_hit[1]==1
-TH1F pngcer_pmt3_nphe 'SHMS NG Cherenkov PMT 3 ; N_Phe ; Counts' P.ngcer.npe[2] 80 0. 20. P.ngcer.adc_hit[2]==1
-TH1F pngcer_pmt4_nphe 'SHMS NG Cherenkov PMT 4 ; N_Phe ; Counts' P.ngcer.npe[3] 80 0. 20. P.ngcer.adc_hit[3]==1
-TH1F pngcer_ nphe 'SHMS NG Cherenkov Sum ; N_Phe ; Counts' P.ngcer.npesum 80 0. 20. P.ngcer.adc_hit[3]==1
+TH1F pngcer_pmt1_adc 'SHMS NG Cherenkov PMT 1 ; ADC (chan) ; Counts' P.ngcer.goodAdcPulseInt[0] 1000 0. 100000.
+TH1F pngcer_pmt2_adc 'SHMS NG Cherenkov PMT 2 ; ADC (chan) ; Counts' P.ngcer.goodAdcPulseInt[1] 1000 0. 100000.
+TH1F pngcer_pmt3_adc 'SHMS NG Cherenkov PMT 3 ; ADC (chan) ; Counts' P.ngcer.goodAdcPulseInt[2] 1000 0. 100000.
+TH1F pngcer_pmt4_adc 'SHMS NG Cherenkov PMT 4 ; ADC (chan) ; Counts' P.ngcer.goodAdcPulseInt[3] 1000 0. 100000.
+TH1F pngcer_pmt1_nphe 'SHMS NG Cherenkov PMT 1 ; N_Phe ; Counts' P.ngcer.npe[0] 80 0. 20.
+TH1F pngcer_pmt2_nphe 'SHMS NG Cherenkov PMT 2 ; N_Phe ; Counts' P.ngcer.npe[1] 80 0. 20.
+TH1F pngcer_pmt3_nphe 'SHMS NG Cherenkov PMT 3 ; N_Phe ; Counts' P.ngcer.npe[2] 80 0. 20.
+TH1F pngcer_pmt4_nphe 'SHMS NG Cherenkov PMT 4 ; N_Phe ; Counts' P.ngcer.npe[3] 80 0. 20.
+TH1F pngcer_sumnphe 'SHMS NG Cherenkov; Sum of N_Phe ; Counts' P.ngcer.npeSum 80 0. 20.
# 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
@@ -112,11 +111,9 @@ TH2F pdc2u2_wirenum_vs_resid 'SHMS 2U2 DC Wire Number vs. Residuals; Wire Number
TH2F pdc2u1_wirenum_vs_resid 'SHMS 2U1 DC Wire Number vs. Residuals; Wire Number; Residuals (mm)' P.dc.2u1.wirenum P.dc.residual[11] 107 0.5 107.5 600 -.3 .3
TH2F pdc_xfp_vs_yxp 'SHMS DC Xfp vs Yxp; Yfp (cm) / 1 cm; Xfp (cm) / 1 cm' P.dc.y P.dc.x 100 -50 50 100 -50 50
-TH2F pdc_xfpp_vs_yxpp 'SHMS DC Xfpp vs Yxpp; Yfpp; Xfpp' P.dc.yp P.dc.xp 100 -1 1 100 -1 1
-TH2F pdc_xfp_vs_yxp_1 'SHMS DC Y_fp vs X_fp; Xfp (cm); Yfp (cm)' P.dc.y_fp P.dc.x_fp 100 -50 50 100 -50 50
-TH2F pdc_xfpp_vs_yxpp_1 'SHMS DC Yp_fp vs Xp_fp; Xp_fp (radians); Yp_fp (radians)' P.dc.yp_fp P.dc.xp_fp 100 -1 1 100 -1 1
-TH2F pdc_xfp_vs_yxp_1 'SHMS DC Yp_fp vs X_fp; Xfp (cm); Yp_fp (radians)' P.dc.x_fp P.dc.yp_fp 100 -50 50 100 .1 .1
-TH2F pdc_xfpp_vs_yxpp_1 'SHMS DC Xp_fp vs X_fp; X_fp (radians); Xp_fp (radians)' P.dc.x_fp P.dc.xp_fp 100 -1 1 100 -.1 .1
+TH2F pdc_xpfp_vs_ypfp 'SHMS DC Xp_fp vs Yp_xp; Yp_fp; Xp_fp' P.dc.yp P.dc.xp 100 -1 1 100 -1 1
+TH2F pdc_xfp_vs_ypfp 'SHMS DC Yp_fp vs X_fp; Xfp (cm); Yp_fp (radians)' P.dc.x_fp P.dc.yp_fp 100 -50 50 100 .1 .1
+TH2F pdc_xfp_vs_xpfp_1 'SHMS DC Xp_fp vs X_fp; X_fp (cm); Xp_fp (radians)' P.dc.x_fp P.dc.xp_fp 100 -1 1 100 -.1 .1
# Hodoscopes (Positive/Left)
TH1F phodo_1x_pos_adc_occu 'SHMS Hodoscope 1X+ ADC Occupancy; Paddle Number; Number of Hits' P.hod.1x.posAdcCounter 13 0.5 13.5
@@ -188,29 +185,18 @@ TH2F phodo_2y_neg_tdc_time_vs_pad 'SHMS Hodoscope 2Y- TDC Time vs. Paddle Number
# Heavy Gas Cherenkov
TH1F phgcer_occu 'SHMS Heavy Gas Cherenkov Occupancy; Counter Number; Number of Entries' P.hgcer.adcCounter 4 0.5 4.5
-TH2F phgcer_ped_vs_cntr 'SHMS Heavy Gas Cherenkov Pulse Pedestal vs. Counter Number; Counter Number; Pulse Pedestal / 1 ADC Unit' P.hgcer.adcCounter P.hgcer.adcPed 4 0.5 4.5 1000 0 10000
-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_occu_elec 'SHMS Heavy Gas Cherenkov Occupancy (sum npe>0.5); Counter Number; Number of Entries' P.hgcer.adcCounter 4 0.5 4.5 P.hgcer.npeSum>0.5
-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_adc 'SHMS HG Cherenkov PMT 1 ; ADC (chan) ; Counts' P.hgcer.goodAdcPulseInt[0] 1000 0. 100000.
+TH1F phgcer_pmt2_adc 'SHMS HG Cherenkov PMT 2 ; ADC (chan) ; Counts' P.hgcer.goodAdcPulseInt[1] 1000 0. 100000.
+TH1F phgcer_pmt3_adc 'SHMS HG Cherenkov PMT 3 ; ADC (chan) ; Counts' P.hgcer.goodAdcPulseInt[2] 1000 0. 100000.
+TH1F phgcer_pmt4_adc 'SHMS HG Cherenkov PMT 4 ; ADC (chan) ; Counts' P.hgcer.goodAdcPulseInt[3] 1000 0. 100000.
TH1F phgcer_pmt1_nphe 'SHMS HG Cherenkov PMT 1 ; N_Phe ; Counts' P.hgcer.npe[0] 80 0. 20.
TH1F phgcer_pmt2_nphe 'SHMS HG Cherenkov PMT 2 ; N_Phe ; Counts' P.hgcer.npe[1] 80 0. 20.
TH1F phgcer_pmt3_nphe 'SHMS HG Cherenkov PMT 3 ; N_Phe ; Counts' P.hgcer.npe[2] 80 0. 20.
TH1F phgcer_pmt4_nphe 'SHMS HG Cherenkov PMT 4 ; N_Phe ; Counts' P.hgcer.npe[3] 80 0. 20.
-TH1F phgcer_sum_nphe 'SHMS HG Cherenkov Sum ; N_Phe ; Counts' P.hgcer.npesum 40 0. 40.
+TH1F phgcer_sum_nphe 'SHMS HG Cherenkov Sum ; N_Phe ; Counts' P.hgcer.npeSum 40 0. 40.
-# 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
-TH2F paero_pos_pi_vs_cntr 'SHMS Aero+ Pulse Integral vs. Counter Number; Counter Number; Pulse Integral / 10 ADC Units' P.aero.posAdcCounter P.aero.posAdcPulseInt 7 0.5 7.5 4000 0 40000
-TH2F paero_pos_amp_vs_cntr 'SHMS Aero+ Pulse Amplitude vs. Counter Number; Counter Number; Pulse Amplitude / 1 ADC Unit' P.aero.posAdcCounter P.aero.posAdcPulseAmp 7 0.5 7.5 4100 0 4100
-TH1F paero_neg_occu 'SHMS Aero- Occupancy; Counter Number; Number of Entries' P.aero.negAdcCounter 7 0.5 7.5
-TH2F paero_neg_ped_vs_cntr 'SHMS Aero- Pulse Pedestal vs. Counter Number; Counter Number; Pulse Pedestal / 1 ADC Unit' P.aero.negAdcCounter P.aero.negAdcPed 7 0.5 7.5 1000 0 1000
-TH2F paero_neg_pi_vs_cntr 'SHMS Aero- Pulse Integral vs. Counter Number; Counter Number; Pulse Integral / 10 ADC Units' P.aero.negAdcCounter P.aero.negAdcPulseInt 7 0.5 7.5 4000 0 40000
-TH2F paero_neg_amp_vs_cntr 'SHMS Aero- Pulse Amplitude vs. Counter Number; Counter Number; Pulse Amplitude / 1 ADC Unit' P.aero.negAdcCounter P.aero.negAdcPulseAmp 7 0.5 7.5 4100 0 4100
# Pre-Shower Calorimeter
TH1F pcal_prshwr_pos_occu 'SHMS Preshower+ Occupancy; Block Number; Number of Entries' P.cal.pr.posAdcCounter 14 0.5 14.5
diff --git a/DEF-files/SHMS/GEN/pstackana_report_cuts.def b/DEF-files/SHMS/GEN/pstackana_report_cuts.def
index f1857e4b394586646f3128e6640b6976c2130a55..3102b3e34a3687e58d1b383f965b7b74470492f1 100644
--- a/DEF-files/SHMS/GEN/pstackana_report_cuts.def
+++ b/DEF-files/SHMS/GEN/pstackana_report_cuts.def
@@ -27,6 +27,16 @@ shms_coin_trig SHMS_event||coin_event
shmsDC1Planes_large (P.dc.1x1.nhit+P.dc.1u2.nhit+P.dc.1u1.nhit+P.dc.1v1.nhit+P.dc.1x2.nhit+P.dc.1v2.nhit) >20
shmsDC2Planes_large (P.dc.2x1.nhit+P.dc.2u2.nhit+P.dc.2u1.nhit+P.dc.2v1.nhit+P.dc.2x2.nhit+P.dc.2v2.nhit) >20
+shms_ch1_gt0 P.dc.Ch1.nhit>0
+shms_ch2_gt0 P.dc.Ch2.nhit>0
+shms_ch_gt0 P.dc.Ch2.nhit>0&&P.dc.Ch1.nhit>0
+shms_ch_gt4 P.dc.Ch2.nhit>3&&P.dc.Ch1.nhit>3
+shms_ch2_gt0_noch1 P.dc.Ch2.nhit>0&&P.dc.Ch1.nhit==0
+shms_ch1_gt0_noch2 P.dc.Ch1.nhit>0&&P.dc.Ch2.nhit==0
+shms_noch1_noch2 P.dc.Ch1.nhit==0&&P.dc.Ch2.nhit==0
+shms_ch_gt0_track shms_ch_gt0&&P.dc.ntrack>0
+shms_ch_gt4_track shms_ch_gt4&&P.dc.ntrack>0
+
shmsDC1_1hit_x1 P.dc.1x1.nhit == 1
shmsDC1_1hit_u1 P.dc.1u1.nhit == 1
shmsDC1_1hit_u2 P.dc.1u2.nhit == 1
@@ -41,47 +51,47 @@ shmsDC2_1hit_v1 P.dc.2v1.nhit == 1
shmsDC2_1hit_v2 P.dc.2v2.nhit == 1
shmsDC2_1hit_x2 P.dc.2x2.nhit == 1
-h1hit1 P.dc.1x1.nhit >= 1
-h1hit2 P.dc.1u1.nhit >= 1
-h1hit3 P.dc.1u2.nhit >= 1
-h1hit4 P.dc.1v1.nhit >= 1
-h1hit5 P.dc.1v2.nhit >= 1
-h1hit6 P.dc.1x2.nhit >= 1
+p1hit1 P.dc.1x1.nhit >= 1
+p1hit2 P.dc.1u1.nhit >= 1
+p1hit3 P.dc.1u2.nhit >= 1
+p1hit4 P.dc.1v1.nhit >= 1
+p1hit5 P.dc.1v2.nhit >= 1
+p1hit6 P.dc.1x2.nhit >= 1
-h2hit1 P.dc.2x1.nhit >= 1
-h2hit2 P.dc.2u1.nhit >= 1
-h2hit3 P.dc.2u2.nhit >= 1
-h2hit4 P.dc.2v1.nhit >= 1
-h2hit5 P.dc.2v2.nhit >= 1
-h2hit6 P.dc.2x2.nhit >= 1
+p2hit1 P.dc.2x1.nhit >= 1
+p2hit2 P.dc.2u1.nhit >= 1
+p2hit3 P.dc.2u2.nhit >= 1
+p2hit4 P.dc.2v1.nhit >= 1
+p2hit5 P.dc.2v2.nhit >= 1
+p2hit6 P.dc.2x2.nhit >= 1
shmsDC1Planes6hits shmsDC1_1hit_x1&&shmsDC1_1hit_u1&&shmsDC1_1hit_u2&&shmsDC1_1hit_x2&&shmsDC1_1hit_v1&&shmsDC1_1hit_v2
shmsDC2Planes6hits shmsDC2_1hit_x1&&shmsDC2_1hit_u1&&shmsDC2_1hit_u2&&shmsDC2_1hit_x2&&shmsDC2_1hit_v1&&shmsDC2_1hit_v2
shmsDC1_5hits_x1 shmsDC1_1hit_u1&&shmsDC1_1hit_u2&&shmsDC1_1hit_x2&&shmsDC1_1hit_v1&&shmsDC1_1hit_v2
-shmsDC1_6hits_x1 h1hit1&&shmsDC1_1hit_u1&&shmsDC1_1hit_u2&&shmsDC1_1hit_x2&&shmsDC1_1hit_v1&&shmsDC1_1hit_v2
+shmsDC1_6hits_x1 p1hit1&&shmsDC1_1hit_u1&&shmsDC1_1hit_u2&&shmsDC1_1hit_x2&&shmsDC1_1hit_v1&&shmsDC1_1hit_v2
shmsDC1_5hits_u1 shmsDC1_1hit_x1&&shmsDC1_1hit_u2&&shmsDC1_1hit_x2&&shmsDC1_1hit_v1&&shmsDC1_1hit_v2
-shmsDC1_6hits_u1 h1hit2&&shmsDC1_1hit_x1&&shmsDC1_1hit_u2&&shmsDC1_1hit_x2&&shmsDC1_1hit_v1&&shmsDC1_1hit_v2
+shmsDC1_6hits_u1 p1hit2&&shmsDC1_1hit_x1&&shmsDC1_1hit_u2&&shmsDC1_1hit_x2&&shmsDC1_1hit_v1&&shmsDC1_1hit_v2
shmsDC1_5hits_u2 shmsDC1_1hit_x1&&shmsDC1_1hit_u1&&shmsDC1_1hit_x2&&shmsDC1_1hit_v1&&shmsDC1_1hit_v2
-shmsDC1_6hits_u2 h1hit3&&shmsDC1_1hit_x1&&shmsDC1_1hit_u1&&shmsDC1_1hit_x2&&shmsDC1_1hit_v1&&shmsDC1_1hit_v2
+shmsDC1_6hits_u2 p1hit3&&shmsDC1_1hit_x1&&shmsDC1_1hit_u1&&shmsDC1_1hit_x2&&shmsDC1_1hit_v1&&shmsDC1_1hit_v2
shmsDC1_5hits_v1 shmsDC1_1hit_x1&&shmsDC1_1hit_u1&&shmsDC1_1hit_x2&&shmsDC1_1hit_u2&&shmsDC1_1hit_v2
-shmsDC1_6hits_v1 h1hit4&&shmsDC1_1hit_x1&&shmsDC1_1hit_u1&&shmsDC1_1hit_x2&&shmsDC1_1hit_u2&&shmsDC1_1hit_v2
+shmsDC1_6hits_v1 p1hit4&&shmsDC1_1hit_x1&&shmsDC1_1hit_u1&&shmsDC1_1hit_x2&&shmsDC1_1hit_u2&&shmsDC1_1hit_v2
shmsDC1_5hits_v2 shmsDC1_1hit_x1&&shmsDC1_1hit_u1&&shmsDC1_1hit_x2&&shmsDC1_1hit_u2&&shmsDC1_1hit_v1
-shmsDC1_6hits_v2 h1hit5&&shmsDC1_1hit_x1&&shmsDC1_1hit_u1&&shmsDC1_1hit_x2&&shmsDC1_1hit_u2&&shmsDC1_1hit_v1
+shmsDC1_6hits_v2 p1hit5&&shmsDC1_1hit_x1&&shmsDC1_1hit_u1&&shmsDC1_1hit_x2&&shmsDC1_1hit_u2&&shmsDC1_1hit_v1
shmsDC1_5hits_x2 shmsDC1_1hit_x1&&shmsDC1_1hit_u1&&shmsDC1_1hit_v1&&shmsDC1_1hit_u2&&shmsDC1_1hit_v2
-shmsDC1_6hits_x2 h1hit6&&shmsDC1_1hit_x1&&shmsDC1_1hit_u1&&shmsDC1_1hit_v1&&shmsDC1_1hit_u2&&shmsDC1_1hit_v2
+shmsDC1_6hits_x2 p1hit6&&shmsDC1_1hit_x1&&shmsDC1_1hit_u1&&shmsDC1_1hit_v1&&shmsDC1_1hit_u2&&shmsDC1_1hit_v2
shmsDC2_5hits_x1 shmsDC2_1hit_u1&&shmsDC2_1hit_u2&&shmsDC2_1hit_x2&&shmsDC2_1hit_v1&&shmsDC2_1hit_v2
-shmsDC2_6hits_x1 h2hit1&&shmsDC2_1hit_u1&&shmsDC2_1hit_u2&&shmsDC2_1hit_x2&&shmsDC2_1hit_v1&&shmsDC2_1hit_v2
+shmsDC2_6hits_x1 p2hit1&&shmsDC2_1hit_u1&&shmsDC2_1hit_u2&&shmsDC2_1hit_x2&&shmsDC2_1hit_v1&&shmsDC2_1hit_v2
shmsDC2_5hits_u1 shmsDC2_1hit_x1&&shmsDC2_1hit_u2&&shmsDC2_1hit_x2&&shmsDC2_1hit_v1&&shmsDC2_1hit_v2
-shmsDC2_6hits_u1 h2hit2&&shmsDC2_1hit_x1&&shmsDC2_1hit_u2&&shmsDC2_1hit_x2&&shmsDC2_1hit_v1&&shmsDC2_1hit_v2
+shmsDC2_6hits_u1 p2hit2&&shmsDC2_1hit_x1&&shmsDC2_1hit_u2&&shmsDC2_1hit_x2&&shmsDC2_1hit_v1&&shmsDC2_1hit_v2
shmsDC2_5hits_u2 shmsDC2_1hit_x1&&shmsDC2_1hit_u1&&shmsDC2_1hit_x2&&shmsDC2_1hit_v1&&shmsDC2_1hit_v2
-shmsDC2_6hits_u2 h2hit3&&shmsDC2_1hit_x1&&shmsDC2_1hit_u1&&shmsDC2_1hit_x2&&shmsDC2_1hit_v1&&shmsDC2_1hit_v2
+shmsDC2_6hits_u2 p2hit3&&shmsDC2_1hit_x1&&shmsDC2_1hit_u1&&shmsDC2_1hit_x2&&shmsDC2_1hit_v1&&shmsDC2_1hit_v2
shmsDC2_5hits_v1 shmsDC2_1hit_x1&&shmsDC2_1hit_u1&&shmsDC2_1hit_x2&&shmsDC2_1hit_u2&&shmsDC2_1hit_v2
-shmsDC2_6hits_v1 h2hit4&&shmsDC2_1hit_x1&&shmsDC2_1hit_u1&&shmsDC2_1hit_x2&&shmsDC2_1hit_u2&&shmsDC2_1hit_v2
+shmsDC2_6hits_v1 p2hit4&&shmsDC2_1hit_x1&&shmsDC2_1hit_u1&&shmsDC2_1hit_x2&&shmsDC2_1hit_u2&&shmsDC2_1hit_v2
shmsDC2_5hits_v2 shmsDC2_1hit_x1&&shmsDC2_1hit_u1&&shmsDC2_1hit_x2&&shmsDC2_1hit_u2&&shmsDC2_1hit_v1
-shmsDC2_6hits_v2 h2hit5&&shmsDC2_1hit_x1&&shmsDC2_1hit_u1&&shmsDC2_1hit_x2&&shmsDC2_1hit_u2&&shmsDC2_1hit_v1
+shmsDC2_6hits_v2 p2hit5&&shmsDC2_1hit_x1&&shmsDC2_1hit_u1&&shmsDC2_1hit_x2&&shmsDC2_1hit_u2&&shmsDC2_1hit_v1
shmsDC2_5hits_x2 shmsDC2_1hit_x1&&shmsDC2_1hit_u1&&shmsDC2_1hit_v1&&shmsDC2_1hit_u2&&shmsDC2_1hit_v2
-shmsDC2_6hits_x2 h2hit6&&shmsDC2_1hit_x1&&shmsDC2_1hit_u1&&shmsDC2_1hit_v1&&shmsDC2_1hit_u2&&shmsDC2_1hit_v2
+shmsDC2_6hits_x2 p2hit6&&shmsDC2_1hit_x1&&shmsDC2_1hit_u1&&shmsDC2_1hit_v1&&shmsDC2_1hit_u2&&shmsDC2_1hit_v2
@@ -90,18 +100,18 @@ shmsDC2_6hits_x2 h2hit6&&shmsDC2_1hit_x1&&shmsDC2_1hit_u1&&shmsDC2_1hit_v1&&
shms1HitsLt P.dc.Ch1.nhit <= P.dc.Ch1.maxhits && g.evtyp==1
shms2HitsLt P.dc.Ch2.nhit <= P.dc.Ch2.maxhits && g.evtyp==1
shmsHitsLt P.dc.Ch1.nhit <= P.dc.Ch1.maxhits && P.dc.Ch2.nhit <= P.dc.Ch2.maxhits && g.evtyp==1
-shmsDC1PlanesGT (h1hit1 + h1hit2 + h1hit3 + h1hit4 + h1hit5 + h1hit6 )>=5
-shmsDC2PlanesGT (h2hit1 + h2hit2 + h2hit3 + h2hit4 + h2hit5 + h2hit6 )>=5
+shmsDC1PlanesGT (p1hit1 + p1hit2 + p1hit3 + p1hit4 + p1hit5 + p1hit6 )>=5
+shmsDC2PlanesGT (p2hit1 + p2hit2 + p2hit3 + p2hit4 + p2hit5 + p2hit6 )>=5
shmsPlanesGT shmsDC1PlanesGT && shmsDC2PlanesGT
-shmsHitsPlanes (P.dc.Ch1.nhit <= P.dc.Ch1.maxhits) && (P.dc.Ch2.nhit <= P.dc.Ch2.maxhits) && shmsPlanesGT
-hSpacePoints P.dc.Ch1.spacepoints >= 1 && P.dc.Ch2.spacepoints >=1
-hSpacePointsStub P.dc.stubtest==1 && P.dc.Ch1.spacepoints >=1 && P.dc.Ch2.spacepoints >=1
-hFoundTrack P.dc.ntrack>0
-hStubLT P.dc.stubtest==1
-f1HSpacePoints shms1HitsLt && shmsDC1PlanesGT && P.dc.Ch1.spacepoints==0 && g.evtyp==1
-f2HSpacePoints shms2HitsLt && shmsDC2PlanesGT && P.dc.Ch2.spacepoints==0 && g.evtyp==1
-hTest1 shmsHitsPlanes && (!hSpacePoints)
-hTest2 hSpacePoints && (!hStubLT)
+shmsHitsPlanes (P.dc.Ch1.nhit <= 6) && (P.dc.Ch2.nhit <= 6) && shmsPlanesGT
+pSpacePoints P.dc.Ch1.spacepoints >= 1 && P.dc.Ch2.spacepoints >=1
+pSpacePointsStub P.dc.stubtest==1 && P.dc.Ch1.spacepoints >=1 && P.dc.Ch2.spacepoints >=1
+pFoundTrack P.dc.ntrack>0
+pStubLT P.dc.stubtest==1
+f1PSpacePoints shms1HitsLt && shmsDC1PlanesGT && P.dc.Ch1.spacepoints==0 && g.evtyp==1
+f2PSpacePoints shms2HitsLt && shmsDC2PlanesGT && P.dc.Ch2.spacepoints==0 && g.evtyp==1
+pTest1 shmsHitsPlanes && (!pSpacePoints)
+pTest2 pSpacePoints && (!pStubLT)
@@ -117,22 +127,22 @@ Tracking_master SHMS_event
Block: Reconstruct
Reconstruct_master SHMS_event
-cer_ng_elec P.ngcer.npesum>0.5
-cer_ng_pi P.ngcer.npesum<0.5
-cer_hg_elec P.hgcer.npesum>0.5
-cer_hg_pi P.hgcer.npesum<0.5
+cer_ng_elec P.ngcer.npeSum>0.5
+cer_ng_pi P.ngcer.npeSum<=0.5
+cer_hg_elec P.hgcer.npeSum>0.5
+cer_hg_pi P.hgcer.npeSum<=0.5
cer_pi_both cer_ng_pi&&cer_hg_pi
cer_elec_both cer_ng_elec&&cer_hg_elec
-cal_elec P.cal.fly.nhits>=2
-cal_pi P.cal.fly.nhits<2
-cer_elec_all cer_ng_elec&&cer_hg_elec&&cal_elec
-
+cal_elec P.cal.etracknorm > 0.6&& P.cal.etracknorm < 1.6
+cal_pi P.cal.etracknorm <=0.6&& P.cal.etracknorm >0.
+elec_all cer_ng_elec&&cer_hg_elec&&cal_elec
+pi_all cer_ng_pi&&cer_hg_pi&&cal_pi
shmsScinGood P.hod.goodscinhit == 1
-shmsScinShould shmsScinGood && P.cal.etotnorm > 0.7 && P.hgcer.npesum > 2.0
-shmsScinShoulde shmsScinGood && P.hgcer.npesum > 2.0
-shmsScinShouldh P.hod.goodscinhit == 1 && g.evtyp == 1
+shmsScinShould shmsScinGood
+shmsScinShoulde shmsScinGood && P.cal.etotnorm >0.6&& P.cal.etotnorm <1.6 && P.hgcer.npeSum > 0.5
+shmsScinShouldh shmsScinGood && P.cal.etotnorm <=0.6&& P.cal.etotnorm >0. && P.hgcer.npeSum < 0.5
shmsScinDid shmsScinShould && P.dc.ntrack > 0
shmsScinDide shmsScinShoulde && P.dc.ntrack > 0
@@ -163,7 +173,7 @@ realhdc1u2 goodHDC1u2 && ((P.dc.Ch1.spacepoints+P.dc.Ch2.spacepoints)
realhdc1u1 goodHDC1u1 && ((P.dc.Ch1.spacepoints+P.dc.Ch2.spacepoints)>0)
realhdc1v1 goodHDC1v1 && ((P.dc.Ch1.spacepoints+P.dc.Ch2.spacepoints)>0)
realhdc1v2 goodHDC1v2 && ((P.dc.Ch1.spacepoints+P.dc.Ch2.spacepoints)>0)
-realhdc2x2 goodHDC1x2 && ((P.dc.Ch1.spacepoints+P.dc.Ch2.spacepoints)>0)
+realhdc1x2 goodHDC1x2 && ((P.dc.Ch1.spacepoints+P.dc.Ch2.spacepoints)>0)
realhdc2x1 goodHDC2x1 && ((P.dc.Ch1.spacepoints+P.dc.Ch2.spacepoints)>0)
realhdc2u2 goodHDC2u2 && ((P.dc.Ch1.spacepoints+P.dc.Ch2.spacepoints)>0)
realhdc2u1 goodHDC2u1 && ((P.dc.Ch1.spacepoints+P.dc.Ch2.spacepoints)>0)
@@ -172,34 +182,34 @@ realhdc2v2 goodHDC2v2 && ((P.dc.Ch1.spacepoints+P.dc.Ch2.spacepoints)
realhdc2x2 goodHDC2x2 && ((P.dc.Ch1.spacepoints+P.dc.Ch2.spacepoints)>0)
-hFound1Track P.dc.ntrack == 1
-hFound2Track P.dc.ntrack == 2
-hFound3Track P.dc.ntrack == 3
-hFound4Track P.dc.ntrack == 4
+pFound1Track P.dc.ntrack == 1
+pFound2Track P.dc.ntrack == 2
+pFound3Track P.dc.ntrack == 3
+pFound4Track P.dc.ntrack == 4
-hCleanTrack P.gtr.index > -1
-1hCleanTrack P.gtr.index == 0
-2hCleanTrack P.gtr.index == 1
-3hCleanTrack P.gtr.index == 2
-4hCleanTrack P.gtr.index == 3
+pCleanTrack P.gtr.index > -1
+1pCleanTrack P.gtr.index == 0
+2pCleanTrack P.gtr.index == 1
+3pCleanTrack P.gtr.index == 2
+4pCleanTrack P.gtr.index == 3
-hCleanTrack_cer_elec (P.gtr.index>-1)&&cer_elec_both
-h1hit1_cer_elec h1hit1&&cer_elec_both
-hCleanTrack_cal_elec (P.gtr.index>-1)&&cal_elec
-h1hit1_cal_elec h1hit1&&cal_elec
+pCleanTrack_cer_elec (P.gtr.index>-1)&&cer_elec_both
+p1hit1_cer_elec p1hit1&&cer_elec_both
+pCleanTrack_cal_elec (P.gtr.index>-1)&&cal_elec
+p1hit1_cal_elec p1hit1&&cal_elec
anyhs1x P.hod.1x.nhits > 0
anyhs1y P.hod.1y.nhits > 0
anyhs2x P.hod.2x.nhits > 0
anyhs2y P.hod.2y.nhits > 0
-goodhs1x P.hod.1x.nhits > 0 && P.hod.1x.nhits < 3
-goodhs1y P.hod.1y.nhits > 0 && P.hod.1y.nhits < 3
-goodhs1 goodhs1x && goodhs1y
-goodhs2x P.hod.2x.nhits > 0 && P.hod.2x.nhits < 3
-goodhs2y P.hod.2y.nhits > 0 && P.hod.2y.nhits < 3
-goodhs2 goodhs2x && goodhs2y
-goodhs1s2 goodhs1 && goodhs2
+goodps1x P.hod.1x.nhits > 0 && P.hod.1x.nhits < 3
+goodps1y P.hod.1y.nhits > 0 && P.hod.1y.nhits < 3
+goodps1 goodps1x && goodps1y
+goodps2x P.hod.2x.nhits > 0 && P.hod.2x.nhits < 3
+goodps2y P.hod.2y.nhits > 0 && P.hod.2y.nhits < 3
+goodps2 goodps2x && goodps2y
+goodps1s2 goodps1 && goodps2
Block: Physics
Physics_master SHMS_event
diff --git a/PARAM/HMS/CAL/hcal.param b/PARAM/HMS/CAL/hcal.param
index 88cc67b47ef420a4279d9361e6117aa6895d401c..8f077361b7cb8fa640edccd929abbe5d80eec197 100644
--- a/PARAM/HMS/CAL/hcal.param
+++ b/PARAM/HMS/CAL/hcal.param
@@ -6,6 +6,10 @@
hcal_ADCmode=1
hcal_AdcTimeWindowMin=1000.
hcal_AdcTimeWindowMax=2800.
+; threshold on selecting good adc is dynamic pedestal+pcal_AdcNegThreshold
+hcal_AdcNegThreshold=0.
+; threshold on selecting good adc is dynamic pedestal+pcal_AdcPosThreshold
+hcal_AdcPosThreshold=0.
; Slop in x position. Allowed distance between track and edge of block (in cm)
; too tight djm hcal_slop = 7.5
@@ -53,12 +57,14 @@ hcal_neg_ped_limit =1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,
1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000
-hcal_pos_gain_cor= 0.217, 0.133, 0.135, 0.238, 0.168, 0.147, 0.146, 0.281, 0.154, 0.269, 0.224, 0.186, 0.186,
-0.216, 0.151, 0.127, 0.231, 0.187, 0.145, 0.174, 0.202, 0.175, 0.199, 0.290, 0.243, 0.140,
-0.552, 0.334, 0.238, 0.435, 0.302, 0.308, 0.378, 0.418, 0.344, 0.427, 0.313, 0.444, 0.284,
-1.059, 0.308, 0.469, 0.398, 0.265, 0.299, 0.749, 0.217, 0.362, 0.497, 0.380, 0.467, 0.580,
-hcal_neg_gain_cor= 0.434, 0.195, 0.196, 0.215, 0.138, 0.189, 0.294, 0.433, 0.214, 0.300, 0.162, 0.151, 0.202,
-0.265, 0.364, 0.235, 0.317, 0.279, 0.268, 0.276, 0.229, 0.257, 0.279, 0.296, 0.223, 0.228,
-0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000,
-0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000,
+; Calibration constants for run 303, 77272 events processed
+
+hcal_pos_gain_cor= 0.272, 0.156, 0.139, 0.229, 0.185, 0.152, 0.146, 0.276, 0.146, 0.268, 0.218, 0.200, 0.150,
+ 0.162, 0.145, 0.125, 0.235, 0.005, 0.152, 0.173, 0.195, 0.181, 0.192, 0.302, 0.235, 0.185,
+ 0.584, 0.334, 0.241, 0.434, 0.302, 0.303, 0.379, 0.422, 0.342, 0.424, 0.314, 0.448, 0.270,
+ 1.073, 0.306, 0.463, 0.402, 0.273, 0.300, 0.744, 0.216, 0.365, 0.497, 0.374, 0.459, 0.572,
+hcal_neg_gain_cor= 0.401, 0.174, 0.190, 0.223, 0.127, 0.183, 0.296, 0.437, 0.224, 0.300, 0.167, 0.139, 0.232,
+ 0.302, 0.378, 0.238, 0.313, 0.427, 0.262, 0.278, 0.234, 0.253, 0.288, 0.290, 0.229, 0.192,
+ 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000,
+ 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000,
diff --git a/PARAM/SHMS/CAL/pcal.param b/PARAM/SHMS/CAL/pcal.param
index 3ad2d08bdfb598d4c627fe765d4237372e27c709..dd9fc209851b4ad74ab92e0d66a10d11463d78f7 100644
--- a/PARAM/SHMS/CAL/pcal.param
+++ b/PARAM/SHMS/CAL/pcal.param
@@ -6,9 +6,15 @@
pcal_ADCmode=1
pcal_AdcTimeWindowMin=1300.
pcal_AdcTimeWindowMax=2300.
+; threshold on selecting good adc is dynamic pedestal+pcal_AdcNegThreshold
+pcal_AdcNegThreshold=0.
+; threshold on selecting good adc is dynamic pedestal+pcal_AdcPosThreshold
+pcal_AdcPosThreshold=0.
pcal_arr_ADCmode=1
pcal_arr_AdcTimeWindowMin=1200.
pcal_arr_AdcTimeWindowMax=1800.
+; threshold on selecting good adc is dynamic pedestal+pcal_arr_AdcThreshold
+pcal_arr_AdcThreshold=0.0
pcal_array = 1
pcal_layer_names = "pr fly"
@@ -80,19 +86,21 @@ pcal_arr_cal_const = 0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001
0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,
0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001,0.001
-pcal_neg_gain_cor = 0.348, 0.330, 0.234, 0.286, 0.214, 0.361, 0.467, 0.373, 0.249, 0.315, 0.341, 0.215, 0.399, 1.391,
-pcal_pos_gain_cor = 0.953, 0.270, 0.213, 0.281, 0.237, 0.228, 0.287, 0.232, 0.479, 0.195, 0.379, 0.361, 1.120, 0.818,
-pcal_arr_gain_cor = 0.500, 0.500, 9.643, 1.141, 1.028, 4.324, 2.220, 0.500, 0.500, 0.500, 0.500, 0.500, 0.500, 0.500, 0.500, 0.500,
- 7.682, 0.766, 0.684, 0.636, 0.936, 0.224, 1.119, 7.360, 3.829, 0.500, 0.500,12.236, 0.500, 0.500, 0.500, 0.500,
- 0.109, 0.619, 0.816, 0.763, 1.321, 1.324, 1.501, 0.260, 1.025, 1.412,-1.287, 0.500, 1.070, 0.500, 0.500, 0.500,
- 1.712, 1.301, 0.713, 0.934, 0.782, 0.674, 1.829, 1.798, 1.291, 3.425, 1.195, 1.413, 1.202, 1.125, 1.686, 1.016,
- 0.512, 0.601, 0.587, 0.562, 1.287, 1.114, 0.924, 0.646, 0.977, 2.128, 1.074, 0.760, 0.752, 1.371,0.126,0.209,
- 2.525, 0.729, 0.611, 1.400, 0.370, 0.830, 0.895, 1.125, 1.495, 0.936, 0.948, 1.031, 1.438, 0.363,0.568, 9.438,
- 5.551, 1.074, 1.004, 0.903, 0.511, 0.842, 1.145, 0.894, 0.826, 0.785, 0.681, 0.463, 0.823, 0.733, 1.425, 0.500,
- 1.020, 0.457, 0.324, 0.278, 0.372, 0.268, 0.371, 0.448, 0.234, 0.367, 0.533, 0.420, 0.573, 0.337, 0.306, 1.150,
- 1.344, 0.301, 0.618, 0.682, 0.958, 0.905, 0.537, 0.939, 1.666, 1.419, 0.551, 1.294, 0.565, 0.550, 0.966, 9.156,
- 1.694, 1.000, 0.371, 0.868, 0.512, 1.248, 1.029, 2.959, 1.273, 1.370, 0.839, 0.781, 1.099, 0.686, 0.242, 2.156,
- 4.110, 0.440, 1.665, 0.945, 0.932, 0.779, 0.477, 1.301, 7.128, 0.992, 0.906, 0.843, 0.734, 0.535, 0.355, 0.368,
- 1.903, 1.284, 0.384, 0.630, 0.545, 3.970, 2.031, 0.453, 0.500, 2.897, 2.876, 0.878, 1.423, 0.226, 7.682,0.422,
- 1.057,-0.214, 0.325, 1.645, 1.197, 9.934, 0.519, 0.500, 0.500, 3.957, 2.916, 0.500, 7.729, 2.306, 0.500, 2.709,
- 0.999,0.314, 1.743, 2.926, 0.500, 4.606, 0.474, 0.500, 2.459, 0.500, 0.500, 0.500, 6.992, 0.500, 2.196, 0.500,
+; Calibration constants for run report_464, 66161 events processed
+
+pcal_neg_gain_cor = 0.3, 0.281, 0.242, 0.295, 0.218, 0.370, 0.474, 0.379, 0.249, 0.316, 0.339, 0.215, 0.490, 0.3,
+pcal_pos_gain_cor = 0.307, 0.216, 0.211, 0.282, 0.238, 0.228, 0.287, 0.228, 0.472, 0.194, 0.377, 0.360, 0.633, 0.3,
+pcal_arr_gain_cor = 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000,
+ 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000,
+ 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000,
+ 1.000, 1.000, 0.750, 0.890, 0.805, 0.591, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000,
+ 1.000, 0.651, 0.586, 0.559, 1.262, 1.123, 0.940, 0.598, 1.000, 1.000, 1.000, 0.772, 0.752, 1.446, 1.000, 1.000,
+ 1.000, 0.719, 0.623, 1.394, 0.366, 0.826, 0.892, 1.124, 1.468, 0.669, 0.947, 1.030, 1.429, 0.353, 1.000, 1.000,
+ 1.000, 0.571, 1.019, 0.888, 0.508, 0.832, 1.136, 0.885, 0.819, 0.791, 0.670, 0.456, 0.817, 0.752, 1.000, 1.000,
+ 1.000, 0.198, 0.311, 0.270, 0.363, 0.262, 0.362, 0.439, 0.229, 0.365, 0.529, 0.418, 0.568, 0.341, 0.231, 1.000,
+ 1.000, 1.000, 0.614, 0.664, 0.945, 0.897, 0.520, 0.922, 1.258, 1.413, 0.550, 1.286, 0.563, 0.546, 1.000, 1.000,
+ 1.000, 1.000, 0.389, 0.826, 0.508, 1.221, 0.966, 1.000, 1.000, 1.000, 0.821, 0.782, 1.091, 0.683, 0.489, 1.000,
+ 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 0.713, 0.742, 0.541, 1.000, 1.000,
+ 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000,
+ 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000,
+ 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000, 1.000,
diff --git a/TEMPLATES/pstackana.template b/TEMPLATES/pstackana.template
index e1ce7848f3b03301aabc69293bc725454900147d..8b8b6f89d2826348d110ef5bcb7cf995c17ad8aa 100644
--- a/TEMPLATES/pstackana.template
+++ b/TEMPLATES/pstackana.template
@@ -1,6 +1,6 @@
Run #{gen_run_number}
Standalone drift chamber analysis report template
-The names of the HMS drift chamber planes are:
+The names of the SHMS drift chamber planes are:
{pdc_plane_names}
Horizontal drift chamber z positions:
Chamber 1: {pdc_zpos[0]:%6.2f} {pdc_zpos[1]:%6.2f} {pdc_zpos[2]:%6.2f}
@@ -9,7 +9,17 @@ Chamber 2: {pdc_zpos[6]:%6.2f} {pdc_zpos[7]:%6.2f} {pdc_zpos[8]:%6.2f}
{pdc_zpos[9]:%6.2f} {pdc_zpos[10]:%6.2f} {pdc_zpos[11]:%6.2f}
All triggers: {all_trigs.npassed}
-
+
+Chamber 1 hits > 0 Counts: {shms_ch1_gt0.npassed} /all_trigs : {shms_ch1_gt0.npassed/all_trigs.npassed}
+Chamber 2 hits > 0 Counts: {shms_ch2_gt0.npassed} /all_trigs : { shms_ch2_gt0.npassed/all_trigs.npassed}
+Chamber 2 hits > 0 & Ch 1 hits =0 Counts: {shms_ch2_gt0_noch1.npassed} /all_trigs : { shms_ch2_gt0_noch1.npassed/all_trigs.npassed}
+Chamber 1 hits > 0 & Ch 2 hits =0 Counts: {shms_ch1_gt0_noch2.npassed} /all_trigs : {shms_ch1_gt0_noch2.npassed/all_trigs.npassed}
+Chamber 1 hits=0 & Ch 2 hits =0 Counts: {shms_noch1_noch2.npassed} /all_trigs : {shms_noch1_noch2.npassed/all_trigs.npassed}
+Chamber 1 > 0 & Ch 2 hits > 0 Counts: {shms_ch_gt0.npassed} /all_trigs : { shms_ch_gt0.npassed/all_trigs.npassed}
+Ch 1 hits > 0 &Ch 2 hits > 0 & track Counts: {shms_ch_gt0_track.npassed} /all_trigs : { shms_ch_gt0_track.npassed/all_trigs.npassed}
+ Chamber 1 > 3 & Ch 2 hits > 3 Counts: {shms_ch_gt4.npassed} /all_trigs : { shms_ch_gt4.npassed/all_trigs.npassed}
+Ch 1 hits > 3 &Ch 2 hits > 3 & track Counts: {shms_ch_gt4_track.npassed} /all_trigs : { shms_ch_gt4_track.npassed/all_trigs.npassed}
+
shmsDC1Planes_large Counts: {shmsDC1Planes_large.npassed} /all_trigs : {shmsDC1Planes_large.npassed/all_trigs.npassed}
shmsDC2Planes_large Counts: {shmsDC2Planes_large.npassed} /all_trigs : {shmsDC2Planes_large.npassed/all_trigs.npassed}
@@ -36,29 +46,29 @@ shmsDC2x2Planes5 Counts: {shmsDC2_5hits_x2.npassed} eff : {shmsDC2_6hits_x2.np
*****************************
*shms TRACKING EFFICIENCIES *
*****************************
-htrig : {shmscoin_event.npassed}
-hhitslt = passed hits/cham : {shmsHitsLt.npassed}
-hhitsplanes = +planes >= 5/6 : {shmsHitsPlanes.npassed}
-hhitsplanessps = + sps : {hSpacePoints.npassed}
-hhitsplanesspsstubs +stub : {hSpacePointsStub.npassed}
-hsfoundtrack : {hFoundTrack.npassed}
-hscleantrack : {hCleanTrack.npassed}
-hstublt = passed stub tests : {hStubLT.npassed}
-h1hitslt : {shms1HitsLt.npassed}
-h2hitslt : {shms2HitsLt.npassed}
-h1planesgt : {shmsDC1PlanesGT.npassed}
-h2planesgt : {shmsDC2PlanesGT.npassed}
-hplanesgt = gt 5 planes/cham : {shmsPlanesGT.npassed}
-f1hspacepoints : {f1HSpacePoints.npassed}
-f2hspacepoints : {f2HSpacePoints.npassed}
-htest1=p hits/planes, f sp : {hTest1.npassed}
-htest2=p sp, f stubs : {hTest2.npassed}
-hdid : {shmsScinDid.npassed}
-hdide : {shmsScinDide.npassed}
-hdidh : {shmsScinDidh.npassed}
-hscinshould : {shmsScinShould.npassed}
-hscinshoulde : {shmsScinShoulde.npassed}
-hscinshouldh : {shmsScinShouldh.npassed}
+ptrig : {shmscoin_event.npassed}
+phitslt = passed hits/cham : {shmsHitsLt.npassed}
+phitsplanes = +planes >= 5/6 : {shmsHitsPlanes.npassed}
+phitsplanessps = + sps : {pSpacePoints.npassed}
+phitsplanesspsstubs +stub : {pSpacePointsStub.npassed}
+psfoundtrack : {pFoundTrack.npassed}
+pscleantrack : {pCleanTrack.npassed}
+pstublt = passed stub tests : {pStubLT.npassed}
+p1hitslt : {shms1HitsLt.npassed}
+p2hitslt : {shms2HitsLt.npassed}
+p1planesgt : {shmsDC1PlanesGT.npassed}
+p2planesgt : {shmsDC2PlanesGT.npassed}
+pplanesgt = gt 5 planes/cham : {shmsPlanesGT.npassed}
+f1pspacepoints : {f1PSpacePoints.npassed}
+f2pspacepoints : {f2PSpacePoints.npassed}
+ptest1=p hits/planes, f sp : {pTest1.npassed}
+ptest2=p sp, f stubs : {pTest2.npassed}
+pdid : {shmsScinDid.npassed}
+pdide : {shmsScinDide.npassed}
+pdidh : {shmsScinDidh.npassed}
+pscinshould : {shmsScinShould.npassed}
+pscinshoulde : {shmsScinShoulde.npassed}
+pscinshouldh : {shmsScinShouldh.npassed}
SING FID TRACK EFFIC : {shmsScinDid.npassed/(shmsScinShould.npassed+0.0001):%8.4f} +- {(sqrt(shmsScinShould.npassed-shmsScinDid.npassed)/(shmsScinShould.npassed+.0001)):%8.4f}
E SING FID TRACK EFFIC : {shmsScinDide.npassed/(shmsScinShoulde.npassed+0.0001):%8.4f} +- {(sqrt(shmsScinShoulde.npassed-shmsScinDide.npassed)/(shmsScinShoulde.npassed+.0001)):%8.4f}
HADRON SING FID TRACK EFFIC : {shmsScinDidh.npassed/(shmsScinShouldh.npassed+0.0001):%8.4f} +- {(sqrt(shmsScinShouldh.npassed-shmsScinDidh.npassed)/(shmsScinShouldh.npassed+.0001)):%8.4f}