diff --git a/DEF-files/HMS/GEN/hstackana_report.def b/DEF-files/HMS/GEN/hstackana_report.def
index 4c8cbc0fd09e605e73111b6da204e47807cfd460..eca10a0084717137d5078003182a7e42492a2135 100644
--- a/DEF-files/HMS/GEN/hstackana_report.def
+++ b/DEF-files/HMS/GEN/hstackana_report.def
@@ -9,6 +9,27 @@ block H.cer.*
 block H.cal.*
 block H.gtr.*
 
+TH1F hev_typ " HMS evtype ' g.evtyp 200 0 200
+
+TH1F htr_x 'HMS x' H.tr.x 80 -40. 40.
+TH1F hgtr_dp 'HMS Gold track delta' H.gtr.dp 120 -15. 15.
+TH1F hgtr_x 'HMS Gold track x_tg' H.gtr.x 80 -40. 40.
+TH1F hgtr_y 'HMS Gold track y_tg (cm)' H.gtr.y 80 -40. 40.
+TH1F hgtr_xp 'HMS Gold track xp_tg' H.gtr.th 80 -.1 .1
+TH1F hgtr_yp 'HMS Gold track yp_tg' H.gtr.ph 80 -.1 .1
+TH1F htr_x_fp 'HMS X_fp (cm)' H.dc.x_fp 80 -60. 60.
+TH1F htr_y_fp 'HMS Y_fp (cm)' H.dc.y_fp 80 -40. 40.
+TH1F htr_xp_fp 'HMS Xp_fp (radians)' H.dc.xp_fp 80 -.1 .1
+TH1F htr_yp_fp 'HMS Yp_fp (radians)' H.dc.yp_fp 80 -.1 .1
+TH2F htr_x_y_fp 'HMS X Y focal plane; Y_fp (cm) ;X_fp (cm)' H.dc.y_fp H.dc.x_fp  80 -40. 40. 80 -60. 60.  cer_elec
+#
+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 
+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.
 # Drift Chambers
 TH1F hdc_ref1 'HMS DC Reference Time Slot 5 Channel 111; TDC Time (Clicks); Number of Entries / 1 click' T.hms.hDCREF1_tdcTime 3000 12000 15000 
 TH1F hdc_ref2 'HMS DC Reference Time Slot 8 Channel 127; TDC Time (Clicks); Number of Entries / 1 click' T.hms.hDCREF2_tdcTime 3000 12000 15000
@@ -43,19 +64,35 @@ TH2F hdc2v1_wirenum_vs_tdc 'HMS DC 2V1 Wire Number vs. TDC; Wire Number; TDC Tim
 TH2F hdc2y2_wirenum_vs_tdc 'HMS DC 2Y2 Wire Number vs. TDC; Wire Number; TDC Time (ns)' H.dc.2y2.wirenum H.dc.2y2.time 52  0.5  52.5 2000 -500 1500
 TH2F hdc2x2_wirenum_vs_tdc 'HMS DC 2X2 Wire Number vs. TDC; Wire Number; TDC Time (ns)' H.dc.2x2.wirenum H.dc.2x2.time 113 0.5 113.5 2000 -500 1500
 
-TH2F hdc1x1_wirenum_vs_resid 'HMS DC 1X1 Wire Number vs. Residuals; Wire Number; Residuals (mm)' H.dc.1x1.wirenum H.dc.residual[0] 113 0.5 113.5 200 -1.0 1.0
-TH2F hdc1y1_wirenum_vs_resid 'HMS DC 1Y1 Wire Number vs. Residuals; Wire Number; Residuals (mm)' H.dc.1y1.wirenum H.dc.residual[1] 52  0.5  52.5 200 -1.0 1.0
-TH2F hdc1u1_wirenum_vs_resid 'HMS DC 1U1 Wire Number vs. Residuals; Wire Number; Residuals (mm)' H.dc.1u1.wirenum H.dc.residual[2] 107 0.5 107.5 200 -1.0 1.0
-TH2F hdc1v1_wirenum_vs_resid 'HMS DC 1V1 Wire Number vs. Residuals; Wire Number; Residuals (mm)' H.dc.1v1.wirenum H.dc.residual[3] 107 0.5 107.5 200 -1.0 1.0
-TH2F hdc1y2_wirenum_vs_resid 'HMS DC 1Y2 Wire Number vs. Residuals; Wire Number; Residuals (mm)' H.dc.1y2.wirenum H.dc.residual[4] 52  0.5  52.5 200 -1.0 1.0
-TH2F hdc1x2_wirenum_vs_resid 'HMS DC 1X2 Wire Number vs. Residuals; Wire Number; Residuals (mm)' H.dc.1x2.wirenum H.dc.residual[5] 113 0.5 113.5 200 -1.0 1.0
-
-TH2F hdc2x1_wirenum_vs_resid 'HMS DC 2X1 Wire Number vs. Residuals; Wire Number; Residuals (mm)' H.dc.2x1.wirenum H.dc.residual[6] 113 0.5 113.5 200 -1.0 1.0
-TH2F hdc2y1_wirenum_vs_resid 'HMS DC 2Y1 Wire Number vs. Residuals; Wire Number; Residuals (mm)' H.dc.2y1.wirenum H.dc.residual[7] 52  0.5  52.5 200 -1.0 1.0
-TH2F hdc2u1_wirenum_vs_resid 'HMS DC 2U1 Wire Number vs. Residuals; Wire Number; Residuals (mm)' H.dc.2u1.wirenum H.dc.residual[8] 107 0.5 107.5 200 -1.0 1.0
-TH2F hdc2v1_wirenum_vs_resid 'HMS DC 2V1 Wire Number vs. Residuals; Wire Number; Residuals (mm)' H.dc.2v1.wirenum H.dc.residual[9] 107 0.5 107.5 200 -1.0 1.0
-TH2F hdc2y2_wirenum_vs_resid 'HMS DC 2Y2 Wire Number vs. Residuals; Wire Number; Residuals (mm)' H.dc.2y2.wirenum H.dc.residual[10] 52  0.5  52.5 200 -1.0 1.0
-TH2F hdc2x2_wirenum_vs_resid 'HMS DC 2X2 Wire Number vs. Residuals; Wire Number; Residuals (mm)' H.dc.2x2.wirenum H.dc.residual[11] 113 0.5 113.5 200 -1.0 1.0
+TH1F hdc1x1_resid 'HMS DC 1X1 Residuals; Residuals (cm)'  H.dc.residual[0]  200 -.3 .3  cer_elec
+TH1F hdc1y1_resid 'HMS DC 1Y1 Residuals; Residuals (cm)'  H.dc.residual[1]  200 -.3 .3 cer_elec
+TH1F hdc1u1_resid 'HMS DC 1U1 Residuals; Residuals (cm)'  H.dc.residual[2]  200 -.3 .3 cer_elec
+TH1F hdc1v1_resid 'HMS DC 1V1 Residuals; Residuals (cm)'  H.dc.residual[3]  200 -.3 .3 cer_elec
+TH1F hdc1y2_resid 'HMS DC 1Y2 Residuals; Residuals (cm)'  H.dc.residual[4]  200 -.3 .3 cer_elec
+TH1F hdc1x2_resid 'HMS DC 1X2 Residuals; Residuals (cm)'  H.dc.residual[5]  200 -.3 .3 cer_elec
+
+TH2F hdc1y1_y2_resid 'HMS DC Residuals ;  Y1 wire ;Y1 resid - Y2 Residuals (cm)' H.dc.1y1.wirenum H.dc.residual[1]-H.dc.residual[4] 52  0.5  52.5  200 -.3 .3  cer_elec
+
+TH1F hdc2x1_resid 'HMS DC 2X1 Residuals; Residuals (cm)'  H.dc.residual[6]  200 -.3 .3 cer_elec
+TH1F hdc2y1_resid 'HMS DC 2Y1 Residuals; Residuals (cm)'  H.dc.residual[7]  200 -.3 .3 cer_elec
+TH1F hdc2u1_resid 'HMS DC 2U1 Residuals; Residuals (cm)'  H.dc.residual[8]  200 -.3 .3 cer_elec
+TH1F hdc2v1_resid 'HMS DC 2V1 Residuals; Residuals (cm)'  H.dc.residual[9]  200 -.3 .3 cer_elec
+TH1F hdc2y2_resid 'HMS DC 2Y2 Residuals; Residuals (cm)'  H.dc.residual[10] 200 -.3 .3 cer_elec
+TH1F hdc2x2_resid 'HMS DC 2X2 Residuals; Residuals (cm)'  H.dc.residual[11] 200 -.3 .3 cer_elec
+
+TH2F hdc1x1_wirenum_vs_resid 'HMS DC 1X1 Wire Number vs. Residuals; Wire Number; Residuals (cm)' H.dc.1x1.wirenum H.dc.residual[0] 113 0.5 113.5 200 -.3 .3  cer_elec
+TH2F hdc1y1_wirenum_vs_resid 'HMS DC 1Y1 Wire Number vs. Residuals; Wire Number; Residuals (cm)' H.dc.1y1.wirenum H.dc.residual[1] 52  0.5  52.5 200 -.3 .3 cer_elec
+TH2F hdc1u1_wirenum_vs_resid 'HMS DC 1U1 Wire Number vs. Residuals; Wire Number; Residuals (cm)' H.dc.1u1.wirenum H.dc.residual[2] 107 0.5 107.5 200 -.3 .3 cer_elec
+TH2F hdc1v1_wirenum_vs_resid 'HMS DC 1V1 Wire Number vs. Residuals; Wire Number; Residuals (cm)' H.dc.1v1.wirenum H.dc.residual[3] 107 0.5 107.5 200 -.3 .3 cer_elec
+TH2F hdc1y2_wirenum_vs_resid 'HMS DC 1Y2 Wire Number vs. Residuals; Wire Number; Residuals (cm)' H.dc.1y2.wirenum H.dc.residual[4] 52  0.5  52.5 200 -.3 .3 cer_elec
+TH2F hdc1x2_wirenum_vs_resid 'HMS DC 1X2 Wire Number vs. Residuals; Wire Number; Residuals (cm)' H.dc.1x2.wirenum H.dc.residual[5] 113 0.5 113.5 200 -.3 .3 cer_elec
+
+TH2F hdc2x1_wirenum_vs_resid 'HMS DC 2X1 Wire Number vs. Residuals; Wire Number; Residuals (cm)' H.dc.2x1.wirenum H.dc.residual[6] 113 0.5 113.5 200 -.3 .3 cer_elec
+TH2F hdc2y1_wirenum_vs_resid 'HMS DC 2Y1 Wire Number vs. Residuals; Wire Number; Residuals (cm)' H.dc.2y1.wirenum H.dc.residual[7] 52  0.5  52.5 200 -.3 .3 cer_elec
+TH2F hdc2u1_wirenum_vs_resid 'HMS DC 2U1 Wire Number vs. Residuals; Wire Number; Residuals (cm)' H.dc.2u1.wirenum H.dc.residual[8] 107 0.5 107.5 200 -.3 .3 cer_elec
+TH2F hdc2v1_wirenum_vs_resid 'HMS DC 2V1 Wire Number vs. Residuals; Wire Number; Residuals (cm)' H.dc.2v1.wirenum H.dc.residual[9] 107 0.5 107.5 200 -.3 .3 cer_elec
+TH2F hdc2y2_wirenum_vs_resid 'HMS DC 2Y2 Wire Number vs. Residuals; Wire Number; Residuals (cm)' H.dc.2y2.wirenum H.dc.residual[10] 52  0.5  52.5 200 -.3 .3 cer_elec
+TH2F hdc2x2_wirenum_vs_resid 'HMS DC 2X2 Wire Number vs. Residuals; Wire Number; Residuals (cm)' H.dc.2x2.wirenum H.dc.residual[11] 113 0.5 113.5 200 -.3 .3 cer_elec
 
 TH2F hdc_xfp_vs_yxp 'HMS DC Xfp vs Yxp; Yfp (cm) / 1 cm; Xfp (cm) / 1 cm' H.dc.y H.dc.x 100 -50 50 100 -50 50
 TH2F hdc_xfpp_vs_yxpp 'HMS DC Xfpp vs Yxpp; Yfpp; Xfpp' H.dc.yp H.dc.xp 100 -1 1 100 -1 1
@@ -156,6 +193,27 @@ TH1F hcal_hD_occu 'HMS hD+ ADC Occupancy; Block Number; Number of ADC Hits' H.ca
 TH2F hcal_hD_ped_blk 'HMS hD+ Pulse Pedestal vs. Block Number; Block Number; Pulse Pedestal / 1 ADC Units' H.cal.4ta.posAdcCounter H.cal.4ta.posAdcPed 13 0.5 13.5 1000 0 1000
 TH2F hcal_hD_pi_blk 'HMS hD+ Pulse Integral vs. Block Number; Block Number; Pulse Integral / 10 ADC Units' H.cal.4ta.posAdcCounter H.cal.4ta.posAdcPulseInt 13 0.5 13.5 4000 0 40000
 TH2F hcal_hD_pamp_blk 'HMS hD+ Pulse Amplitude vs. Block Number; Block Number; Pulse Amplitude / 1 ADC Units' H.cal.4ta.posAdcCounter H.cal.4ta.posAdcPulseAmp 13 0.5 13.5 4100 0 4100
+TH1F htrig_multhodo_ch1xy 'HMS Hodoscope Trig Mult 1X and 1Y ' T.hms.h1T_tdcMultiplicity 11 0 11 
+TH1F htrig_multhodo_ch1x 'HMS Hodoscope Trig Mult 1X ' T.hms.h1X_tdcMultiplicity 11 0 11 
+TH1F htrig_multhodo_ch1y 'HMS Hodoscope Trig Mult 1Y ' T.hms.h1Y_tdcMultiplicity 11 0 11
+TH1F htrig_multhodo_ch2xy 'HMS Hodoscope Trig Mult 2X and 2Y ' T.hms.h2T_tdcMultiplicity 11 0 11 
+TH1F htrig_multhodo_ch2x 'HMS Hodoscope Trig Mult 2X ' T.hms.h2X_tdcMultiplicity 11 0 11 
+TH1F htrig_multhodo_ch2y 'HMS Hodoscope Trig Mult 2Y ' T.hms.h2Y_tdcMultiplicity 11 0 11 
+
+TH1F htrig_hodo_ch1xy 'HMS Hodoscope Trig 1X and 1Y (ns)' T.hms.h1T_tdcTime 200 0 400 T.hms.h1T_tdcMultiplicity==1
+TH1F htrig_hodo_ch1x 'HMS Hodoscope Trig 1X (ns)' T.hms.h1X_tdcTime 200 0 400 T.hms.h1X_tdcMultiplicity==1
+TH1F htrig_hodo_ch1y 'HMS Hodoscope Trig 1Y (ns)' T.hms.h1Y_tdcTime 200 0 400 T.hms.h1Y_tdcMultiplicity==1
+TH1F htrig_hodo_ch2xy 'HMS Hodoscope Trig 2X and 2Y (ns)' T.hms.h2T_tdcTime 200 0 400 T.hms.h2T_tdcMultiplicity==1
+TH1F htrig_hodo_ch2x 'HMS Hodoscope Trig 2X (ns)' T.hms.h2X_tdcTime 200 0 400 T.hms.h2X_tdcMultiplicity==1
+TH1F htrig_hodo_ch2y 'HMS Hodoscope Trig 2Y (ns)' T.hms.h2Y_tdcTime 200 0 400 T.hms.h2Y_tdcMultiplicity==1
+
+TH2F htrig_ch1xy_ch2xy 'HMS Hodo Trig; 1X1Y Trig (ns); 2X2Y Trig (ns)' T.hms.h1T_tdcTime  T.hms.h2T_tdcTime 200 200 350 200 200 350 T.hms.h2T_tdcMultiplicity==1&&T.hms.h1T_tdcMultiplicity==1
+TH2F htrig_ch1x_ch2x 'hms Hodo Trig ;Trig 1X (ns);Trig 2X (ns)' T.hms.h1X_tdcTime  T.hms.h2X_tdcTime 200 200 350 200 200 350 T.hms.h2X_tdcMultiplicity==1&&T.hms.h1X_tdcMultiplicity==1
+TH2F htrig_ch1x_ch2y 'hms Hodo Trig ;Trig 1X (ns);Trig 2Y (ns)' T.hms.h1X_tdcTime  T.hms.h2Y_tdcTime 200 200 350 200 200 350 T.hms.h2Y_tdcMultiplicity==1&&T.hms.h1X_tdcMultiplicity==1
+TH2F htrig_ch1y_ch1x 'hms Hodo Trig ;Trig 1X (ns);Trig 1Y (ns)' T.hms.h1X_tdcTime  T.hms.h1Y_tdcTime 200 200 350 200 200 350 T.hms.h1Y_tdcMultiplicity==1&&T.hms.h1X_tdcMultiplicity==1
+TH2F htrig_ch1y_ch2x 'hms Hodo Trig; 1Y Trig (ns); 2X Trig (ns)' T.hms.h1Y_tdcTime  T.hms.h2X_tdcTime 200 200 350 200 200 350 T.hms.h2X_tdcMultiplicity==1&&T.hms.h1Y_tdcMultiplicity==1
+TH2F htrig_ch1y_ch2y 'hms Hodo Trig; 1Y Trig (ns); 2Y Trig (ns)' T.hms.h1Y_tdcTime  T.hms.h2Y_tdcTime 200 200 350 200 200 350 T.hms.h2Y_tdcMultiplicity==1&&T.hms.h1Y_tdcMultiplicity==1
+TH2F htrig_ch2y_ch2x 'HMS Hodo Trig; 2Y Trig (ns); 2X Trig (ns)' T.hms.h2Y_tdcTime  T.hms.h2X_tdcTime 200 200 350 200 200 350 T.hms.h2X_tdcMultiplicity==1&&T.hms.h2Y_tdcMultiplicity==1
 
 # Trigger Apparatus
 TH1F htrig_hCERsum_pped 'HMS Cherenkov Sum Pulse Pedestal; Pulse Pedestal; Number of Entries / 1 ADC Unit' T.hms.hCERSUM_adcPed 1000 0 1000
diff --git a/DEF-files/SHMS/GEN/pstackana_report.def b/DEF-files/SHMS/GEN/pstackana_report.def
index 8eb0a8a1885d09f541c15ff03aa4aada7b98e0e9..c5f8360f5e3e43fa4eae3caeecae707ee457b24b 100644
--- a/DEF-files/SHMS/GEN/pstackana_report.def
+++ b/DEF-files/SHMS/GEN/pstackana_report.def
@@ -16,16 +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. 50000. P.ngcer.adc_hit[0]==1&&P.gtr.beta>0.5
-TH1F pngcer_pmt2_adc  'SHMS NG Cherenkov PMT 2 ; ADC (chan) ; Counts' P.ngcer.adc_p[1] 1000 0. 50000. P.ngcer.adc_hit[1]==1&&P.gtr.beta>0.5
-TH1F pngcer_pmt3_adc  'SHMS NG Cherenkov PMT 3 ; ADC (chan) ; Counts' P.ngcer.adc_p[2] 1000 0. 50000. P.ngcer.adc_hit[2]==1&&P.gtr.beta>0.5
-TH1F pngcer_pmt4_adc  'SHMS NG Cherenkov PMT 4 ; ADC (chan) ; Counts' P.ngcer.adc_p[3] 1000 0. 50000. P.ngcer.adc_hit[3]==1&&P.gtr.beta>0.5
-TH1F pngcer_pmt1_nphe 'SHMS NG Cherenkov PMT 1 ; N_Phe ; Counts' P.ngcer.npe[0] 50 0. 50. P.ngcer.adc_hit[0]==1&&P.gtr.beta>0.5
-TH1F pngcer_pmt2_nphe 'SHMS NG Cherenkov PMT 2 ; N_Phe ; Counts' P.ngcer.npe[1] 50 0. 50. P.ngcer.adc_hit[1]==1&&P.gtr.beta>0.5
-TH1F pngcer_pmt3_nphe 'SHMS NG Cherenkov PMT 3 ; N_Phe ; Counts' P.ngcer.npe[2] 50 0. 50. P.ngcer.adc_hit[2]==1&&P.gtr.beta>0.5
-TH1F pngcer_pmt4_nphe 'SHMS NG Cherenkov PMT 4 ; N_Phe ; Counts' P.ngcer.npe[3] 50 0. 50. P.ngcer.adc_hit[3]==1&&P.gtr.beta>0.5
-
-TH1F pngcer_nphe  'SHMS NG Cherenkov ; N_Phe ; Counts' P.ngcer.npe 50 0. 50. P.ngcer.adc_hit[3]==1&&P.gtr.beta>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
 
 # 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
@@ -67,22 +66,40 @@ TH2F pdc2x1_wirenum_vs_tdc 'SHMS DC 2X1 Wire Number vs. TDC; Wire Number; TDC Ti
 TH2F pdc2u2_wirenum_vs_tdc 'SHMS DC 2U2 Wire Number vs. TDC; Wire Number; TDC Time (ns) / 1 ns' P.dc.2u2.wirenum P.dc.2u2.time 107 0.5 107.5 500 0 500
 TH2F pdc2u1_wirenum_vs_tdc 'SHMS DC 2U1 Wire Number vs. TDC; Wire Number; TDC Time (ns) / 1 ns' P.dc.2u1.wirenum P.dc.2u1.time 107 0.5 107.5 500 0 500
 
-TH2F pdc1u1_wirenum_vs_resid 'SHMS 1U1 DC Wire Number vs. Residuals; Wire Number; Residuals (mm)' P.dc.1u1.wirenum P.dc.residual[0] 107 0.5 107.5 200 -1.0 1.0
-TH2F pdc1u2_wirenum_vs_resid 'SHMS 1U2 DC Wire Number vs. Residuals; Wire Number; Residuals (mm)' P.dc.1u2.wirenum P.dc.residual[1] 107 0.5 107.5 200 -1.0 1.0
-TH2F pdc1x1_wirenum_vs_resid 'SHMS 1X1 DC Wire Number vs. Residuals; Wire Number; Residuals (mm)' P.dc.1x1.wirenum P.dc.residual[2] 79 0.5  79.5 200 -1.0 1.0
-TH2F pdc1x2_wirenum_vs_resid 'SHMS 1X2 DC Wire Number vs. Residuals; Wire Number; Residuals (mm)' P.dc.1x2.wirenum P.dc.residual[3] 79 0.5  79.5 200 -1.0 1.0
-TH2F pdc1v1_wirenum_vs_resid 'SHMS 1V1 DC Wire Number vs. Residuals; Wire Number; Residuals (mm)' P.dc.1v1.wirenum P.dc.residual[4] 107 0.5 107.5 200 -1.0 1.0
-TH2F pdc1v2_wirenum_vs_resid 'SHMS 1V2 DC Wire Number vs. Residuals; Wire Number; Residuals (mm)' P.dc.1v2.wirenum P.dc.residual[5] 107 0.5 107.5 200 -1.0 1.0
-
-TH2F pdc2v2_wirenum_vs_resid 'SHMS 2V2 DC Wire Number vs. Residuals; Wire Number; Residuals (mm)' P.dc.2v2.wirenum P.dc.residual[6] 107 0.5 107.5 200 -1.0 1.0
-TH2F pdc2v1_wirenum_vs_resid 'SHMS 2V1 DC Wire Number vs. Residuals; Wire Number; Residuals (mm)' P.dc.2v1.wirenum P.dc.residual[7] 107 0.5 107.5 200 -1.0 1.0
-TH2F pdc2x2_wirenum_vs_resid 'SHMS 2X2 DC Wire Number vs. Residuals; Wire Number; Residuals (mm)' P.dc.2x2.wirenum P.dc.residual[8] 79 0.5  79.5 200 -1.0 1.0
-TH2F pdc2x1_wirenum_vs_resid 'SHMS 2X1 DC Wire Number vs. Residuals; Wire Number; Residuals (mm)' P.dc.2x1.wirenum P.dc.residual[9] 79 0.5  79.5 200 -1.0 1.0
-TH2F pdc2u2_wirenum_vs_resid 'SHMS 2U2 DC Wire Number vs. Residuals; Wire Number; Residuals (mm)' P.dc.2u2.wirenum P.dc.residual[10] 107 0.5 107.5 200 -1.0 1.0
-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 200 -1.0 1.0
+TH1F pdc1u1_resid 'SHMS 1U1 DC Residual ; Residuals (cm)' P.dc.residual[0] 600 -.3 .3
+TH1F pdc1u2_resid 'SHMS 1U2 DC Residual ; Residuals (cm)' P.dc.residual[1] 600 -.3 .3
+TH1F pdc1x1_resid 'SHMS 1X1 DC Residual ; Residuals (cm)' P.dc.residual[2] 600 -.3 .3
+TH1F pdc1x2_resid 'SHMS 1X2 DC Residual ; Residuals (cm)' P.dc.residual[3] 600 -.3 .3
+TH1F pdc1v1_resid 'SHMS 1V1 DC Residual ; Residuals (cm)' P.dc.residual[4] 600 -.3 .3
+TH1F pdc1v2_resid 'SHMS 1V2 DC Residual ; Residuals (cm)' P.dc.residual[5] 600 -.3 .3
+
+TH1F pdc2u1_resid 'SHMS 2U1 DC Residual ; Residuals (cm)' P.dc.residual[6] 600 -.3 .3
+TH1F pdc2u2_resid 'SHMS 2U2 DC Residual ; Residuals (cm)' P.dc.residual[7] 600 -.3 .3
+TH1F pdc2x1_resid 'SHMS 2X1 DC Residual ; Residuals (cm)' P.dc.residual[8] 600 -.3 .3
+TH1F pdc2x2_resid 'SHMS 2X2 DC Residual ; Residuals (cm)' P.dc.residual[9] 600 -.3 .3
+TH1F pdc2v1_resid 'SHMS 2V1 DC Residual ; Residuals (cm)' P.dc.residual[10] 600 -.3 .3
+TH1F pdc2v2_resid 'SHMS 2V2 DC Residual ; Residuals (cm)' P.dc.residual[11] 600 -.3 .3
+
+TH2F pdc1u1_wirenum_vs_resid 'SHMS 1U1 DC Wire Number vs. Residuals; Wire Number; Residuals (mm)' P.dc.1u1.wirenum P.dc.residual[0] 107 0.5 107.5 600 -.3 .3
+TH2F pdc1u2_wirenum_vs_resid 'SHMS 1U2 DC Wire Number vs. Residuals; Wire Number; Residuals (mm)' P.dc.1u2.wirenum P.dc.residual[1] 107 0.5 107.5 600 -.3 .3
+TH2F pdc1x1_wirenum_vs_resid 'SHMS 1X1 DC Wire Number vs. Residuals; Wire Number; Residuals (mm)' P.dc.1x1.wirenum P.dc.residual[2] 79 0.5  79.5 600 -.3 .3
+TH2F pdc1x2_wirenum_vs_resid 'SHMS 1X2 DC Wire Number vs. Residuals; Wire Number; Residuals (mm)' P.dc.1x2.wirenum P.dc.residual[3] 79 0.5  79.5 600 -.3 .3
+TH2F pdc1v1_wirenum_vs_resid 'SHMS 1V1 DC Wire Number vs. Residuals; Wire Number; Residuals (mm)' P.dc.1v1.wirenum P.dc.residual[4] 107 0.5 107.5 600 -.3 .3
+TH2F pdc1v2_wirenum_vs_resid 'SHMS 1V2 DC Wire Number vs. Residuals; Wire Number; Residuals (mm)' P.dc.1v2.wirenum P.dc.residual[5] 107 0.5 107.5 600 -.3 .3
+
+TH2F pdc2v2_wirenum_vs_resid 'SHMS 2V2 DC Wire Number vs. Residuals; Wire Number; Residuals (mm)' P.dc.2v2.wirenum P.dc.residual[6] 107 0.5 107.5 600 -.3 .3
+TH2F pdc2v1_wirenum_vs_resid 'SHMS 2V1 DC Wire Number vs. Residuals; Wire Number; Residuals (mm)' P.dc.2v1.wirenum P.dc.residual[7] 107 0.5 107.5 600 -.3 .3
+TH2F pdc2x2_wirenum_vs_resid 'SHMS 2X2 DC Wire Number vs. Residuals; Wire Number; Residuals (mm)' P.dc.2x2.wirenum P.dc.residual[8] 79 0.5  79.5 600 -.3 .3
+TH2F pdc2x1_wirenum_vs_resid 'SHMS 2X1 DC Wire Number vs. Residuals; Wire Number; Residuals (mm)' P.dc.2x1.wirenum P.dc.residual[9] 79 0.5  79.5 600 -.3 .3
+TH2F pdc2u2_wirenum_vs_resid 'SHMS 2U2 DC Wire Number vs. Residuals; Wire Number; Residuals (mm)' P.dc.2u2.wirenum P.dc.residual[10] 107 0.5 107.5 600 -.3 .3
+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 
 
 # 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
@@ -93,6 +110,22 @@ TH1F phodo_1x_pos_tdc_occu 'SHMS Hodoscope 1X+ TDC Occupancy; Paddle Number; Num
 TH1F phodo_1y_pos_tdc_occu 'SHMS Hodoscope 1Y+ TDC Occupancy; Paddle Number; Number of Hits' P.hod.1y.posTdcCounter 13 0.5 13.5 
 TH1F phodo_2x_pos_tdc_occu 'SHMS Hodoscope 2X+ TDC Occupancy; Paddle Number; Number of Hits' P.hod.2x.posTdcCounter 14 0.5 14.5
 TH1F phodo_2y_pos_tdc_occu 'SHMS Hodoscope 2Y+ TDC Occupancy; Paddle Number; Number of Hits' P.hod.2y.posTdcCounter 21 0.5 21.5
+TH1F phodo_1x_pos_adctrack 'SHMS Hodoscope 1X+ ADC Occupancy; Paddle Number; Number of Hits' P.hod.1x.posAdcCounter 13 0.5 13.5 P.tr.n>0
+TH1F phodo_1y_pos_adctrack 'SHMS Hodoscope 1Y+ ADC Occupancy; Paddle Number; Number of Hits' P.hod.1y.posAdcCounter 13 0.5 13.5  P.tr.n>0
+TH1F phodo_2x_pos_adctrack 'SHMS Hodoscope 2X+ ADC Occupancy; Paddle Number; Number of Hits' P.hod.2x.posAdcCounter 14 0.5 14.5 P.tr.n>0
+TH1F phodo_2y_pos_adctrack 'SHMS Hodoscope 2Y+ ADC Occupancy; Paddle Number; Number of Hits' P.hod.2y.posAdcCounter 21 0.5 21.5 P.tr.n>0
+TH1F phodo_1x_pos_tdctrack 'SHMS Hodoscope 1X+ TDC Occupancy; Paddle Number; Number of Hits' P.hod.1x.posTdcCounter 13 0.5 13.5 P.tr.n>0
+TH1F phodo_1y_pos_tdctrack 'SHMS Hodoscope 1Y+ TDC Occupancy; Paddle Number; Number of Hits' P.hod.1y.posTdcCounter 13 0.5 13.5  P.tr.n>0
+TH1F phodo_2x_pos_tdctrack 'SHMS Hodoscope 2X+ TDC Occupancy; Paddle Number; Number of Hits' P.hod.2x.posTdcCounter 14 0.5 14.5 P.tr.n>0
+TH1F phodo_2y_pos_tdctrack 'SHMS Hodoscope 2Y+ TDC Occupancy; Paddle Number; Number of Hits' P.hod.2y.posTdcCounter 21 0.5 21.5 P.tr.n>0
+TH1F phodo_1x_pos_adc__notrack 'SHMS Hodoscope 1X+ ADC Occupancy; Paddle Number; Number of Hits' P.hod.1x.posAdcCounter 13 0.5 13.5 P.tr.n==0
+TH1F phodo_1y_pos_adc__notrack 'SHMS Hodoscope 1Y+ ADC Occupancy; Paddle Number; Number of Hits' P.hod.1y.posAdcCounter 13 0.5 13.5  P.tr.n==0
+TH1F phodo_2x_pos_adc__notrack 'SHMS Hodoscope 2X+ ADC Occupancy; Paddle Number; Number of Hits' P.hod.2x.posAdcCounter 14 0.5 14.5 P.tr.n==0
+TH1F phodo_2y_pos_adc__notrack 'SHMS Hodoscope 2Y+ ADC Occupancy; Paddle Number; Number of Hits' P.hod.2y.posAdcCounter 21 0.5 21.5 P.tr.n==0
+TH1F phodo_1x_pos_tdc__notrack 'SHMS Hodoscope 1X+ TDC Occupancy; Paddle Number; Number of Hits' P.hod.1x.posTdcCounter 13 0.5 13.5 P.tr.n==0
+TH1F phodo_1y_pos_tdc__notrack 'SHMS Hodoscope 1Y+ TDC Occupancy; Paddle Number; Number of Hits' P.hod.1y.posTdcCounter 13 0.5 13.5  P.tr.n==0
+TH1F phodo_2x_pos_tdc__notrack 'SHMS Hodoscope 2X+ TDC Occupancy; Paddle Number; Number of Hits' P.hod.2x.posTdcCounter 14 0.5 14.5 P.tr.n==0
+TH1F phodo_2y_pos_tdc__notrack 'SHMS Hodoscope 2Y+ TDC Occupancy; Paddle Number; Number of Hits' P.hod.2y.posTdcCounter 21 0.5 21.5 P.tr.n==0
 TH2F phodo_1x_pos_ped_vs_pad 'SHMS Hodoscope 1X+ Pulse Pedestal vs. Paddle Number; Paddle Number; Pulse Pedestal / 1 ADC Unit' P.hod.1x.posAdcCounter  P.hod.1x.posAdcPed 13 0.5 13.5 1000 0 1000
 TH2F phodo_1y_pos_ped_vs_pad 'SHMS Hodoscope 1Y+ Pulse Pedestal vs. Paddle Number; Paddle Number; Pulse Pedestal / 1 ADC Unit' P.hod.1y.posAdcCounter  P.hod.1y.posAdcPed 13 0.5 13.5 1000 0 1000
 TH2F phodo_2x_pos_ped_vs_pad 'SHMS Hodoscope 2X+ Pulse Pedestal vs. Paddle Number; Paddle Number; Pulse Pedestal / 1 ADC Unit' P.hod.2x.posAdcCounter  P.hod.2x.posAdcPed 14 0.5 14.5 1000 0 1000
@@ -142,14 +175,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&&P.gtr.beta>0.5
-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&&P.gtr.beta>0.5
-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&&P.gtr.beta>0.5
-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&&P.gtr.beta>0.5
-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&&P.gtr.beta>0.5
-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&&P.gtr.beta>0.5
-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&&P.gtr.beta>0.5
-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&&P.gtr.beta>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_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. 
 
 # Aerogel
 TH1F paero_pos_occu 'SHMS Aero+ Occupancy; Counter Number; Number of Entries' P.aero.posAdcCounter 7 0.5 7.5
@@ -177,6 +211,23 @@ TH2F pcal_shwr_ped_blk 'SHMS Shower Pulse Pedestal vs. Block Number; Block Numbe
 TH2F pcal_shwr_pi_blk 'SHMS Shower Pulse Integral vs. Block Number; Block Number; Pulse Integral / 10 ADC Units' P.cal.fly.adcCounter P.cal.fly.adcPulseInt 224 0.5 224.5 4000 0 40000
 TH2F pcal_shwr_amp_blk 'SHMS Shower Pulse Amplitude vs. Block Number; Block Number; Pulse Amplitude / 1 ADC Unit' P.cal.fly.adcCounter P.cal.fly.adcPulseAmp 224 0.5 224.5 4100 0 4100 
 
+TH1F ptrig_multhodo_ch1xy 'SHMS Hodoscope Trig Mult 1X and 1Y ' T.shms.p1T_tdcMultiplicity 11 0 11 
+TH1F ptrig_multhodo_ch1x 'SHMS Hodoscope Trig Mult 1X ' T.shms.p1X_tdcMultiplicity 11 0 11 
+TH1F ptrig_multhodo_ch1y 'SHMS Hodoscope Trig Mult 1Y ' T.shms.p1Y_tdcMultiplicity 11 0 11
+TH1F ptrig_multhodo_ch2xy 'SHMS Hodoscope Trig Mult 2X and 2Y ' T.shms.p2T_tdcMultiplicity 11 0 11 
+TH1F ptrig_multhodo_ch2x 'SHMS Hodoscope Trig Mult 2X ' T.shms.p2X_tdcMultiplicity 11 0 11 
+TH1F ptrig_multhodo_ch2y 'SHMS Hodoscope Trig Mult 2Y ' T.shms.p2Y_tdcMultiplicity 11 0 11 
+
+TH1F ptrig_hodo_ch1xy 'SHMS Hodoscope Trig 1X and 1Y (ns)' T.shms.p1T_tdcTime 200 100 300 T.shms.p1T_tdcMultiplicity==1
+TH1F ptrig_hodo_ch1x 'SHMS Hodoscope Trig 1X (ns)' T.shms.p1X_tdcTime 200 100 300 T.shms.p1X_tdcMultiplicity==1
+TH1F ptrig_hodo_ch1y 'SHMS Hodoscope Trig 1Y (ns)' T.shms.p1Y_tdcTime 200 100 300 T.shms.p1Y_tdcMultiplicity==1
+TH1F ptrig_hodo_ch2xy 'SHMS Hodoscope Trig 2X and 2Y (ns)' T.shms.p2T_tdcTime 200 100 300 T.shms.p2T_tdcMultiplicity==1
+TH1F ptrig_hodo_ch2x 'SHMS Hodoscope Trig 2X (ns)' T.shms.p2X_tdcTime 200 100 300 T.shms.p2X_tdcMultiplicity==1
+TH1F ptrig_hodo_ch2y 'SHMS Hodoscope Trig 2Y (ns)' T.shms.p2Y_tdcTime 200 100 300 T.shms.p2Y_tdcMultiplicity==1
+TH2F ptrig_ch1xy_ch2x 'SHMS Hodo Trig; 1X1Y Trig (ns); 2X Trig (ns)' T.shms.p1T_tdcTime  T.shms.p2X_tdcTime 200 100 300 200 100 300 T.shms.p2X_tdcMultiplicity==1&&T.shms.p1T_tdcMultiplicity==1
+TH2F ptrig_ch1x_ch2x 'SHMS Hodo Trig; 1X Trig (ns); 2X Trig (ns)' T.shms.p1X_tdcTime  T.shms.p2X_tdcTime 200 100 300 200 100 300 T.shms.p2X_tdcMultiplicity==1&&T.shms.p1X_tdcMultiplicity==1
+TH2F ptrig_ch1y_ch2x 'SHMS Hodo Trig; 1Y Trig (ns); 2X Trig (ns)' T.shms.p1Y_tdcTime  T.shms.p2X_tdcTime 200 100 300 200 100 300 T.shms.p2X_tdcMultiplicity==1&&T.shms.p1Y_tdcMultiplicity==1
+TH2F ptrig_ch1ych1x 'SHMS Hodo Trig ;Trig 1X (ns);Trig 1Y (ns)' T.shms.p1X_tdcTime  T.shms.p1Y_tdcTime 200 100 300 250 100 300 T.shms.p1Y_tdcMultiplicity==1&&T.shms.p1X_tdcMultiplicity==1
 # Trigger Apparatus
 TH1F ptrig_pngc_sum_pped 'SHMS Noble Gas Sum FADC Pulse Pedestal; Pulse Pedestal; Number of Entries / 1 ADC Units' T.shms.pNGCSUM_adcPed 2000 0 2000
 TH1F ptrig_pngc_sum_pint 'SHMS Noble Gas Sum FADC Pulse Integral; Pulse Integral; Number of Entries / 10 ADC Units' T.shms.pNGCSUM_adcPulseInt 4000 0 40000
diff --git a/MAPS/HMS/DETEC/hms_stack.map b/MAPS/HMS/DETEC/hms_stack.map
index 484095f2ea1688ea18e6b72f185d823e8b66fc3f..d404a1b0bd03b37a93a3113bb91cc3207a6c5395 100644
--- a/MAPS/HMS/DETEC/hms_stack.map
+++ b/MAPS/HMS/DETEC/hms_stack.map
@@ -20,13 +20,14 @@ SLOT=17
   15,   1,   8,   0  ! hCERSUM
 
 SLOT=2
+REFINDEX=0
    0,   2,   1,   1  ! h1X
    1,   2,   2,   1  ! h1Y
    2,   2,   3,   1  ! h2X
    3,   2,   4,   1  ! h2Y
    4,   2,   5,   1  ! h1T
    5,   2,   6,   1  ! h2T
-   6,   2,   7,   1  ! hT1
+   6,   1000,   0,   0  ! hTref
    7,   2,   8,   1  ! hASUM
    8,   2,   9,   1  ! hBSUM
    9,   2,  10,   1  ! hCSUM
diff --git a/MAPS/HMS/DETEC/htrig.map b/MAPS/HMS/DETEC/htrig.map
index 679c33f761d052f496c60630ef2a7a3db1ac93fd..50b44a0ab438e5b7168cb2289e3929e37badc856 100644
--- a/MAPS/HMS/DETEC/htrig.map
+++ b/MAPS/HMS/DETEC/htrig.map
@@ -22,6 +22,7 @@ SLOT=17
 
 !CAEN1190 module
 SLOT=2
+REFINDEX=0
 ! A0
 ! chan    plane     bar    sig
      0,       2,      1,     1!  h1X
@@ -30,7 +31,7 @@ SLOT=2
      3,       2,      4,     1!  h2Y
      4,       2,      5,     1!  h1T
      5,       2,      6,     1!  h2T
-     6,       2,      7,     1!  hT1
+     6,   1000,   0,   0  ! hTref
      7,       2,      8,     1!  hASUM
      8,       2,      9,     1!  hBSUM
      9,       2,     10,     1!  hCSUM
diff --git a/MAPS/SHMS/DETEC/ptrig.map b/MAPS/SHMS/DETEC/ptrig.map
index 22a6a97ea0f53bb2719e5cf099ff0f094f414fa6..fff13ccadf3bb8260fff8567166e72e2a7c15d9c 100644
--- a/MAPS/SHMS/DETEC/ptrig.map
+++ b/MAPS/SHMS/DETEC/ptrig.map
@@ -14,7 +14,8 @@ SLOT=20
   15,   2,   1,   1  ! pT1
 
 SLOT=19
-  31,   2,   2,   1  ! pT2
+REFINDEX=0
+  31,   1000,   0,   0  ! pTRef
   32,   2,   3,   1  ! p1X
   33,   2,   4,   1  ! p1Y
   34,   2,   5,   1  ! p2X
diff --git a/MAPS/SHMS/DETEC/shms_stack.map b/MAPS/SHMS/DETEC/shms_stack.map
index c30415fcccd5ea536cb6814246603d22ebdf7442..8add18248125767adb6a2d06b1b2bf6cecba4b35 100644
--- a/MAPS/SHMS/DETEC/shms_stack.map
+++ b/MAPS/SHMS/DETEC/shms_stack.map
@@ -20,7 +20,8 @@ SLOT=20
   15,   2,   1,   1  ! pT1
 
 SLOT=19
-  31,   2,   2,   1  ! pT2
+REFINDEX=0
+  31,   1000,   0,   0  ! pTRef
   32,   2,   3,   1  ! p1X
   33,   2,   4,   1  ! p1Y
   34,   2,   5,   1  ! p2X
diff --git a/PARAM/HMS/HODO/hhodo.param b/PARAM/HMS/HODO/hhodo.param
index 27b0e24fbbaa971e09ed321c1d160abcd427086b..8343971eb1e233c1856a1a535af20026f2322851 100644
--- a/PARAM/HMS/HODO/hhodo.param
+++ b/PARAM/HMS/HODO/hhodo.param
@@ -1,4 +1,4 @@
-hcosmicflag=1
+hcosmicflag=0
 ; for now manually set hte FADC mode
 ;  1 == Use the pulse int - pulse ped
 ;  2 == Use the sample integral - known ped
diff --git a/PARAM/TRIG/thms.param b/PARAM/TRIG/thms.param
index 8bfc69517853d75fec71202aa78385f60692d58c..715959a507f0ea3eecc0beca3b8d18a40103c788 100644
--- a/PARAM/TRIG/thms.param
+++ b/PARAM/TRIG/thms.param
@@ -1,5 +1,7 @@
 t_hms_numAdc = 8
 t_hms_numTdc = 21
+t_hms_tdcoffset=-300.
+t_hms_tdcchanperns=0.1
 
 ; bar num:                1     2     3     4     5      6     7       8
 t_hms_adcNames = "hASUM hBSUM hCSUM hDSUM hPSHWR hSHWR hAERSUM hCERSUM"
diff --git a/PARAM/TRIG/tshms.param b/PARAM/TRIG/tshms.param
index d30f2aca4242fc798921629daa3b670c768bfd63..691173ddf1f52c0c111e87917fb6e82f7dcaad78 100644
--- a/PARAM/TRIG/tshms.param
+++ b/PARAM/TRIG/tshms.param
@@ -1,5 +1,7 @@
 t_shms_numAdc = 3
 t_shms_numTdc = 22
+t_shms_tdcoffset=-300.
+t_shms_tdcchanperns=0.1
 
 ; bar num:            1       2       3
 t_shms_adcNames = "pAERSUM pHGCSUM pNGCSUM"