diff --git a/DEF-files/HMS/GEN/hstackana_report.def b/DEF-files/HMS/GEN/hstackana_report.def
index eca10a0084717137d5078003182a7e42492a2135..bcdf5938f1dd845a713f80bd67477e25acb9febc 100644
--- a/DEF-files/HMS/GEN/hstackana_report.def
+++ b/DEF-files/HMS/GEN/hstackana_report.def
@@ -11,6 +11,30 @@ block H.gtr.*
TH1F hev_typ " HMS evtype ' g.evtyp 200 0 200
+TH1F hcal_ene 'HMS Cal energy' H.cal.etot 1000 0. 5.
+TH1F hcal_xclusttrack 'HMS Cal X pos' H.cal.xclusttrack 200 -100. 100. H.cal.nclusttrack>-1
+TH1F hcal_xdiff 'HMS Cal X pos - X track' H.cal.xclusttrack-H.cal.xtrack 200 -20. 20. H.cal.nclusttrack>-1&&H.dc.ntrack>0
+TH2F hcal_xdiff_v_xtr 'HMS Cal X pos - X track v Xtr' H.cal.xtrack H.cal.xclusttrack-H.cal.xtrack 200 -100. 100. 200 -20. 20. H.cal.nclusttrack>-1&&H.dc.ntrack>0
+TH1F hcal_xtrack 'HMS Cal X pos of track' H.cal.xtrack 200 -100. 100. H.cal.nclusttrack>-1&&H.dc.ntrack>0
+TH1F hcal_xtrack1 'HMS Cal X pos of track no matching clust' H.cal.xtrack 200 -100. 100. H.cal.nclusttrack==-1&&H.gtr.dp>-8.&&H.gtr.dp<8.&&H.dc.ntrack>0
+TH1F hcal_xtrack2 'HMS Cal X pos of track no matching clust number of cluster=1' H.cal.xtrack 200 -100. 100. H.cal.nclusttrack==-1&&H.cal.nclust==0&&H.gtr.dp>-8.&&H.gtr.dp<8.&&H.dc.ntrack>0
+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.
+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
+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 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.
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.
@@ -22,14 +46,9 @@ 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
+TH2F htr_x_y_fp1 'HMS X Y focal plane; Y_fp (cm) ;X_fp (cm)' H.dc.y_fp H.dc.x_fp 80 -10. 10. 80 -10. 10. cer_elec
+TH1F htr_x_fp1 'HMS X_fp (cm)' H.dc.x_fp 80 -10. 10.
#
-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
diff --git a/DEF-files/HMS/GEN/hstackana_report_cuts.def b/DEF-files/HMS/GEN/hstackana_report_cuts.def
index 535972d6ec8ba20ccf27b24dd404cf9e1f765942..05ef8e2f822874ed3d576f7b01cec6195056560f 100644
--- a/DEF-files/HMS/GEN/hstackana_report_cuts.def
+++ b/DEF-files/HMS/GEN/hstackana_report_cuts.def
@@ -6,9 +6,12 @@ Block: RawDecode
Pedestal_event g.evtyp==4
scalar_event g.evtyp==0
HMS_event g.evtyp==1
-SHMS_event g.evtyp==1
+SHMS_event g.evtyp==2
coin_event g.evtyp==3
-misc_event g.evtyp>=5
+tr4_event g.evtyp==4
+tr5_event g.evtyp==5
+tr6_event g.evtyp==6
+misc_event g.evtyp>=10
hmscoin_event g.evtyp==1||g.evtyp==3
shmscoin_event g.evtyp==2||g.evtyp==3
all_event g.evtyp==1||g.evtyp==2||g.evtyp==3
@@ -24,8 +27,7 @@ all_trigs g.evtyp==1 || g.evtyp==2 || g.evtyp==3
hms_shms_trig g.evtyp==1 || g.evtyp==2
hms_coin_trig g.evtyp==1 || g.evtyp==3
-cer_pmt1_good H.cer.adc_hit[0]==1
-cer_pmt2_good H.cer.adc_hit[1]==1
+
hmsDC1Planes_large (H.dc.1x1.nhit+H.dc.1y1.nhit+H.dc.1u1.nhit+H.dc.1v1.nhit+H.dc.1x2.nhit+H.dc.1y2.nhit) >20
@@ -119,6 +121,10 @@ 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
HMSScinGood H.hod.goodscinhit == 1
diff --git a/DEF-files/SHMS/GEN/pstackana_report.def b/DEF-files/SHMS/GEN/pstackana_report.def
index c5f8360f5e3e43fa4eae3caeecae707ee457b24b..11705247d0a2186ac8046ee8d01e7c9b34ca6a17 100644
--- a/DEF-files/SHMS/GEN/pstackana_report.def
+++ b/DEF-files/SHMS/GEN/pstackana_report.def
@@ -10,6 +10,23 @@ block P.aero.*
block P.cal.*
block P.gtr.*
+TH1F pcal_ene 'SHMS Cal energy' P.cal.etot 1000 0. 5.
+TH1F pcal_xclusttrack 'SHMS Cal X pos' P.cal.xclusttrack 200 -100. 100. P.cal.nclusttrack>-1
+TH1F pcal_xdiff 'SHMS Cal X pos - X track' P.cal.xclusttrack-P.cal.xtrack 200 -20. 20. P.cal.nclusttrack>-1&&P.dc.ntrack>0
+TH2F pcal_xdiff_v_xtr 'SHMS Cal X pos - X track v Xtr' P.cal.xtrack P.cal.xclusttrack-P.cal.xtrack 200 -100. 100. 200 -20. 20. P.cal.nclusttrack>-1&&P.dc.ntrack>0
+TH1F pcal_xtrack 'SHMS Cal X pos of track' P.cal.xtrack 200 -100. 100. P.cal.nclusttrack>-1&&P.dc.ntrack>0
+TH1F pcal_xtrack1 'SHMS Cal X pos of track no matching clust' P.cal.xtrack 200 -100. 100. P.cal.nclusttrack==-1&&P.gtr.dp>-8.&&P.gtr.dp<8.&&P.dc.ntrack>0
+TH1F pcal_xtrack2 'SHMS Cal X pos of track no matching clust number of cluster=1' P.cal.xtrack 200 -100. 100. P.cal.nclusttrack==-1&&P.cal.nclust==0&&P.gtr.dp>-8.&&P.gtr.dp<8.&&P.dc.ntrack>0
+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.
+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
+
+
# 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
diff --git a/DEF-files/SHMS/GEN/pstackana_report_cuts.def b/DEF-files/SHMS/GEN/pstackana_report_cuts.def
index 20f2d916ab926fff1f7c35d266dcadcfaef3b15b..f1857e4b394586646f3128e6640b6976c2130a55 100644
--- a/DEF-files/SHMS/GEN/pstackana_report_cuts.def
+++ b/DEF-files/SHMS/GEN/pstackana_report_cuts.def
@@ -9,20 +9,19 @@ HMS_event g.evtyp==1
SHMS_event g.evtyp==1
coin_event g.evtyp==3
misc_event g.evtyp>=5
-hmscoin_event g.evtyp==1||g.evtyp==3
-shmscoin_event g.evtyp==2||g.evtyp==3
-all_event g.evtyp==1||g.evtyp==2||g.evtyp==3
+hmscoin_event HMS_event||coin_event
+shmscoin_event SHMS_event||coin_event
+all_event HMS_event||SHMS_event||coin_event
RawDecode_master 1
Block: Decode
-Decode_master HMS_event
+Decode_master SHMS_event
Block: CoarseTracking
-CoarseTracking_master HMS_event
+CoarseTracking_master SHMS_event
-all_trigs g.evtyp==1 || g.evtyp==2 || g.evtyp==3
-hms_shms_trig g.evtyp==1 || g.evtyp==2
-hms_coin_trig g.evtyp==1 || g.evtyp==3
+all_trigs HMS_event||SHMS_event||coin_event
+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
@@ -118,6 +117,17 @@ 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_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
+
+
shmsScinGood P.hod.goodscinhit == 1
shmsScinShould shmsScinGood && P.cal.etotnorm > 0.7 && P.hgcer.npesum > 2.0
@@ -161,6 +171,7 @@ realhdc2v1 goodHDC2v1 && ((P.dc.Ch1.spacepoints+P.dc.Ch2.spacepoints)
realhdc2v2 goodHDC2v2 && ((P.dc.Ch1.spacepoints+P.dc.Ch2.spacepoints)>0)
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
@@ -172,6 +183,11 @@ hCleanTrack P.gtr.index > -1
3hCleanTrack P.gtr.index == 2
4hCleanTrack 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
+
anyhs1x P.hod.1x.nhits > 0
anyhs1y P.hod.1y.nhits > 0
anyhs2x P.hod.2x.nhits > 0
diff --git a/PARAM/HMS/CAL/hcal.param b/PARAM/HMS/CAL/hcal.param
index 3a9150cb57a9658778fc254c3063429f70fe6fc1..78b490f157d7f69d8739ecb0d51102995784cefe 100644
--- a/PARAM/HMS/CAL/hcal.param
+++ b/PARAM/HMS/CAL/hcal.param
@@ -1,6 +1,15 @@
+; for now manually set hte FADC mode
+; 1 == Use the pulse int - pulse ped
+; 2 == Use the sample integral - known ped
+; 3 == Use the sample integral - sample ped
+; if not set then defaults to use the raw pulse integral
+hcal_ADCmode=1
+hcal_AdcTimeWindowMin=1000.
+hcal_AdcTimeWindowMax=2800.
+
; Slop in x position. Allowed distance between track and edge of block (in cm)
; too tight djm hcal_slop = 7.5
-hcal_slop = 7.5
+hcal_slop = 30.
;Turn on HMS cal. fiducial volume cut. 0="no cut"
;Default hcal_fv_test=0
@@ -45,14 +54,11 @@ hcal_neg_ped_limit =1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,
-hcal_pos_gain_cor=
-1./132.5, 1./240.3, 1./269.8, 1./187.4, 1./244.6, 1./280.3, 1./296.6, 1./168.7, 1./238.7, 1./169.2, 1./212.1, 1./227.8, 1./189.7,
-1./171.1, 1./242.0, 1./257.6, 1./174.1, 1./165.3, 1./216.3, 1./195.7, 1./165.0, 1./179.8, 1./199.1, 1./135.0, 1./169.3, 1./197.9,
-1./162.4, 1./237.2, 1./321.4, 1./184.6, 1./258.9, 1./251.6, 1./219.7, 1./193.6, 1./226.9, 1./185.3, 1./243.5, 1./187.4, 1./268.6,
-1./125.0, 1./305.5, 1./223.6, 1./258.0, 1./385.6, 1./341.6, 1./168.6, 1./470.3, 1./290.5, 1./216.9, 1./280.1, 1./226.9, 1./160.3,
-
-hcal_neg_gain_cor=
-1./157.8, 1./242.9, 1./209.3, 1./199.9, 1./263.5, 1./189.7, 1./141.7, 1./130.1, 1./200.2, 1./141.0, 1./200.2, 1./231.6, 1./219.4,
-1./172.8, 1./132.3, 1./189.2, 1./125.8, 1./177.7, 1./184.5, 1./168.5, 1./221.0, 1./184.6, 1./159.5, 1./167.3, 1./175.5, 1./221.7,
-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,
+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,
\ No newline at end of file
diff --git a/PARAM/HMS/GEN/htracking.param b/PARAM/HMS/GEN/htracking.param
index 3ee7a1eaf1c296febd6681be9e640cda25f78d2c..708467fcc4397620626f3cd74b94d1a5c17378f4 100644
--- a/PARAM/HMS/GEN/htracking.param
+++ b/PARAM/HMS/GEN/htracking.param
@@ -64,7 +64,7 @@ hstub_max_xpdiff = .05
; hsel_using_scin uses scintillator for track selection
hsel_using_scin = 0
; hsel_using_prune using prune
- hsel_using_prune = 0
+ hsel_using_prune = 1
; hstat_slop distance from center of scin. to count as expecting hit
hstat_slop = 2.
; hstat_mineff warning level for scin. effic.
diff --git a/PARAM/SHMS/CAL/pcal.param b/PARAM/SHMS/CAL/pcal.param
index cde530b52ab608486a774c20529016c9187cd72f..3ad2d08bdfb598d4c627fe765d4237372e27c709 100644
--- a/PARAM/SHMS/CAL/pcal.param
+++ b/PARAM/SHMS/CAL/pcal.param
@@ -1,3 +1,14 @@
+; for now manually set hte FADC mode
+; 1 == Use the pulse int - pulse ped
+; 2 == Use the sample integral - known ped
+; 3 == Use the sample integral - sample ped
+; if not set then defaults to use the raw pulse integral
+pcal_ADCmode=1
+pcal_AdcTimeWindowMin=1300.
+pcal_AdcTimeWindowMax=2300.
+pcal_arr_ADCmode=1
+pcal_arr_AdcTimeWindowMin=1200.
+pcal_arr_AdcTimeWindowMax=1800.
pcal_array = 1
pcal_layer_names = "pr fly"
@@ -6,17 +17,17 @@ pcal_num_layers = 1
pcal_arr_nrows = 16
pcal_arr_ncolumns = 14
-pcal_arr_front_x = 1.0
-pcal_arr_front_y = 1.0
-pcal_arr_front_z = 1.0
-pcal_arr_xstep = 1.0
-pcal_arr_ystep = 1.0
-pcal_arr_zsize = 1.0
-pcal_arr_ped_limit = 1.0
-pcal_arr_cal_const = 1.0
-pcal_arr_gain_cor = 1.0
-
+pcal_arr_front_x = 1.4
+pcal_arr_front_y = 0.
+pcal_arr_front_z = 306.44
+pcal_arr_xstep = 9.
+pcal_arr_ystep = 9.
+pcal_arr_zsize = 70.0
+pdbg_init_cal=0
+pdbg_decoded_cal=0
+pdbg_clusters_cal=0
+pdbg_tracks_cal=0
; Exclusion bandwidth for calorimeter fiducial volume.
pcal_fv_delta = 5
# Constants for the coordiante correction of the calorimeter energy depositions
@@ -31,7 +42,7 @@ pcal_slop = 7.5
pcal_pr_thick = 10.0
; Z Position of from of preshower
-pcal_pr_zpos = 200.0
+pcal_pr_zpos = 292.64
pcal_pr_left = 35.0
pcal_pr_right = -35.0
@@ -53,13 +64,35 @@ pcal_pos_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
pcal_neg_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
-pcal_pos_ped_limit=1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,
- 1000,1000,1000,1000
-pcal_neg_ped_limit=1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,
- 1000,1000,1000,1000
-
-pcal_pos_gain_cor=1.0/411.2, 1.0/378.6, 1.0/357.9, 1.0/254.8, 1.0/315.6, 1.0/331.0, 1.0/264.6, 1.0/305.4, 1.0/149.8, 1.0/380.6, 1.0/183.1, 1.0/206.5, 1.0/139.8, 1.0/163.
-pcal_neg_gain_cor=1.0/466.2, 1.0/514.7, 1.0/325.5, 1.0/247.8, 1.0/322.0, 1.0/176.2, 1.0/161.9, 1.0/197.7, 1.0/269.9, 1.0/241.6, 1.0/193.7, 1.0/337.5, 1.0/237.3, 1.0/82.0
-pcal_min_peds = 500
+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,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,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,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,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,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,
diff --git a/SCRIPTS/HMS/replay_hms_report.C b/SCRIPTS/HMS/replay_hms_report.C
index 249057d5bb21d8764a114dc25782ada33e9f9f30..659d060eb76504bd2f38cadac487168541a5d086 100644
--- a/SCRIPTS/HMS/replay_hms_report.C
+++ b/SCRIPTS/HMS/replay_hms_report.C
@@ -37,7 +37,7 @@ void replay_hms_report(Int_t RunNumber=0, Int_t MaxEvent=0) {
// Load the Hall C style detector map
gHcDetectorMap = new THcDetectorMap();
if ( RunNumber > 243) {
- gHcDetectorMap->Load("MAPS/HMS/DETEC/hms_stack_spring17_current_run.map");
+ gHcDetectorMap->Load("MAPS/HMS/DETEC/hms_stack.map");
} else {
gHcDetectorMap->Load("MAPS/HMS/DETEC/hms_stack_spring17_run_00001_00243.map");
}