diff --git a/DEF-files/HMS/GEN/hstackana_report.def b/DEF-files/HMS/GEN/hstackana_report.def
index 8581137348ac1393ea9acbfc357212dff6311398..4c8cbc0fd09e605e73111b6da204e47807cfd460 100644
--- a/DEF-files/HMS/GEN/hstackana_report.def
+++ b/DEF-files/HMS/GEN/hstackana_report.def
@@ -118,6 +118,13 @@ TH2F hgcer_ped_vs_cntr 'HMS Cherenkov Pulse Pedestal; PMT Number; Pulse Pedestal
 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
 
+#
+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
+
+
 # Pre-Shower
 TH1F hcal_hA_pos_occu 'HMS hA+ ADC Occupancy; Block Number; Number of ADC Hits' H.cal.1pr.posAdcCounter 13 0.5 13.5
 TH2F hcal_hA_pos_ped_blk 'HMS hA+ Pulse Pedestal vs. Block Number; Block Number; Pulse Pedestal / 1 ADC Units' H.cal.1pr.posAdcCounter H.cal.1pr.posAdcPed 13 0.5 13.5 1000 0 1000
diff --git a/DEF-files/HMS/GEN/hstackana_report_cuts.def b/DEF-files/HMS/GEN/hstackana_report_cuts.def
index dd003ff56a39f09030c0bde72846c7b6f51d1eb3..535972d6ec8ba20ccf27b24dd404cf9e1f765942 100644
--- a/DEF-files/HMS/GEN/hstackana_report_cuts.def
+++ b/DEF-files/HMS/GEN/hstackana_report_cuts.def
@@ -24,6 +24,9 @@ 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
 hmsDC2Planes_large  (H.dc.2x1.nhit+H.dc.2y1.nhit+H.dc.2u1.nhit+H.dc.2v1.nhit+H.dc.2x2.nhit+H.dc.2y2.nhit) >20
diff --git a/PARAM/HMS/CER/hcer.param b/PARAM/HMS/CER/hcer.param
index a23df2e88a63dadc8da5b0eb0ab04e0f557acb6c..14db2ac6ad0eea4060581924ac7eb460549fcb78 100644
--- a/PARAM/HMS/CER/hcer.param
+++ b/PARAM/HMS/CER/hcer.param
@@ -1,6 +1,6 @@
 hcer_width = 50, 50
 
-hcer_adc_to_npe = 1/145.0, 1/122.0
+hcer_adc_to_npe = 1/6353., 1/8116.
 
 
 hcer_chi2max = 50.
diff --git a/PARAM/SHMS/AERO/paero.param b/PARAM/SHMS/AERO/paero.param
index c162227444eba76f32b8eed4744af16c56283150..a469a7b9f022881d453d1f721a692046dbcceb74 100644
--- a/PARAM/SHMS/AERO/paero.param
+++ b/PARAM/SHMS/AERO/paero.param
@@ -1,7 +1,8 @@
-     paero_pos_gain   = 1./168.3, 1./233.9, 1./181.3, 1./169.2, 1./177.6, 1./155.0, 1./169.5, 1./149.7,
 
-     paero_neg_gain   = 1./248.8, 1./186.4, 1./236.4, 1./172.0,
-                        1./205.3, 1./198.1, 1./227.9, 1./229.2,
+
+paero_pos_gain = 1./496.7, 1./467.5, 1./554.3, 1./766.1, 1./412.1, 1./517.9, 1./435.6, 1./500.,
+
+paero_neg_gain = 1./586.8, 1./536.5, 1./690.5, 1./563.1, 1./574.4, 1./432.7, 1./601.5, 1./500.,
 
      paero_pos_ped_limit =  1000., 1000., 1000., 1000.,
                             1000., 1000., 1000., 1000.,
diff --git a/PARAM/SHMS/CAL/pcal.param b/PARAM/SHMS/CAL/pcal.param
index de0a7f572dd3c3f2f7eb71500798716aec710b77..cde530b52ab608486a774c20529016c9187cd72f 100644
--- a/PARAM/SHMS/CAL/pcal.param
+++ b/PARAM/SHMS/CAL/pcal.param
@@ -57,8 +57,9 @@ 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,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0
-pcal_neg_gain_cor=1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0
+
+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