diff --git a/DBASE/SHMS/STD/standard.kinematics b/DBASE/SHMS/STD/standard.kinematics
index adf234387d920f90bf2a49d80b1280ddd05b39a2..145a05405db912f7b43f311400a3a0bbd8ca01ec 100644
--- a/DBASE/SHMS/STD/standard.kinematics
+++ b/DBASE/SHMS/STD/standard.kinematics
@@ -6,7 +6,7 @@
#
0-99999
-gpbeam = 2.215
+gpbeam = 2.218
gtargmass_amu=12.0107
ppartmass = 0.00051099
ptheta_lab = 25.02
diff --git a/DEF-files/SHMS/PRODUCTION/RASTER/praster_histos.def b/DEF-files/SHMS/PRODUCTION/RASTER/praster_histos.def
index 60cf1fac485dab3c470d487efcb619ceb7d836ba..e6df06dc0400b8ddec9d30f2fa8d4fb08639f8f0 100644
--- a/DEF-files/SHMS/PRODUCTION/RASTER/praster_histos.def
+++ b/DEF-files/SHMS/PRODUCTION/RASTER/praster_histos.def
@@ -5,18 +5,38 @@
# Assume FADC range is set to 1V and the integration is 25 channels
# Offset in the FADC is about 0.122V or 500 channels.
-formula FRXA_V P.rb.raster.frxaRawAdc*(1./4096.)/25.
-formula FRXB_V P.rb.raster.frxbRawAdc*(1./4096.)/25.
-formula FRYA_V P.rb.raster.fryaRawAdc*(1./4096.)/25.
-formula FRYB_V P.rb.raster.frybRawAdc*(1./4096.)/25.
-
-TH1F pFRXA 'SHMS FRXA; FRXA RAW ADC (chan); Counts' P.rb.raster.frxaRawAdc 1000 0 100000
-TH1F pFRXA_V 'SHMS FRXA; FRXA RAW ADC (Volts); Counts' FRXA_V 1000 0 1.0
-TH1F pFRXB 'SHMS FRXB; FRXB RAW ADC (chan); Counts' P.rb.raster.frxbRawAdc 1000 0 100000
-TH1F pFRXB_V 'SHMS FRXB; FRXB RAW ADC (Volts); Counts' FRXB_V 1000 0 1.0
-TH1F pFRYA 'SHMS FRYA; FRYA RAW ADC (chan); Counts' P.rb.raster.fryaRawAdc 1000 0 100000
-TH1F pFRYA_V 'SHMS FRYA; FRYA RAW ADC (Volts); Counts' FRYA_V 1000 0 1.0
-TH1F pFRYB 'SHMS FRYB; FRYB RAW ADC (chan); Counts' P.rb.raster.frybRawAdc 1000 0 100000
-TH1F pFRYB_V 'SHMS FRYB; FRYB RAW ADC (Volts); Counts' FRYB_V 1000 0 1.0
-TH2F pFRA_XvsY 'SHMS FRA X vs Y; FRXA RAW ADC (Volts); FRYA RAW ADC (Volts)' FRXA_V FRYA_V 1000 0 1.0 1000 0 1.0
-TH2F pFRB_XvsY 'SHMS FRB X vs Y; FRXB RAW ADC (Volts); FRYB RAW ADC (Volts)' FRXB_V FRYB_V 1000 0 1.0 1000 0 1.0
+formula FRXAraw_V P.rb.raster.frxaRawAdc*(1./4096.)/25.
+formula FRXBraw_V P.rb.raster.frxbRawAdc*(1./4096.)/25.
+formula FRYAraw_V P.rb.raster.fryaRawAdc*(1./4096.)/25.
+formula FRYBraw_V P.rb.raster.frybRawAdc*(1./4096.)/25.
+
+formula FRXApos P.rb.raster.fr_xa
+formula FRXBpos P.rb.raster.fr_xb
+formula FRYApos P.rb.raster.fr_ya
+formula FRYBpos P.rb.raster.fr_yb
+
+TH1F pFRXAraw 'SHMS FRXA Raw; FRXA RAW ADC (chan); Counts' P.rb.raster.frxaRawAdc 100 0 100000 P.dc.ntrack>0
+TH1F pFRXAraw_V 'SHMS FRXA Raw; FRXA RAW ADC (Volts); Counts' FRXAraw_V 100 0 1.0 P.dc.ntrack>0
+TH1F pFRXBraw 'SHMS FRXB Raw; FRXB RAW ADC (chan); Counts' P.rb.raster.frxbRawAdc 100 0 100000 P.dc.ntrack>0
+TH1F pFRXBraw_V 'SHMS FRXB Raw; FRXB RAW ADC (Volts); Counts' FRXBraw_V 100 0 1.0 P.dc.ntrack>0
+TH1F pFRYAraw 'SHMS FRYA Raw; FRYA RAW ADC (chan); Counts' P.rb.raster.fryaRawAdc 100 0 100000 P.dc.ntrack>0
+TH1F pFRYAraw_V 'SHMS FRYA Raw; FRYA RAW ADC (Volts); Counts' FRYAraw_V 100 0 1.0 P.dc.ntrack>0
+TH1F pFRYBraw 'SHMS FRYB Raw; FRYB RAW ADC (chan); Counts' P.rb.raster.frybRawAdc 100 0 100000 P.dc.ntrack>0
+TH1F pFRYBraw_V 'SHMS FRYB Raw; FRYB RAW ADC (Volts); Counts' FRYBraw_V 100 0 1.0 P.dc.ntrack>0
+
+TH1F pFRXA 'SHMS FRXA; FRXA ADC (chan); Counts' P.rb.raster.frxa_adc 100 -50000 50000 P.dc.ntrack>0
+TH1F pFRXB 'SHMS FRXB; FRXB ADC (chan); Counts' P.rb.raster.frxb_adc 100 -50000 50000 P.dc.ntrack>0
+TH1F pFRYA 'SHMS FRYA; FRYA ADC (chan); Counts' P.rb.raster.frya_adc 100 -50000 50000 P.dc.ntrack>0
+TH1F pFRYB 'SHMS FRYB; FRYB ADC (chan); Counts' P.rb.raster.fryb_adc 100 -50000 50000 P.dc.ntrack>0
+
+TH1F pFRXApos 'SHMS FRXApos; FRXA POS (CM); Counts' P.rb.raster.fr_xa 100 -0.5 0.5 P.dc.ntrack>0
+TH1F pFRXBpos 'SHMS FRXBpos; FRXB POS (CM); Counts' P.rb.raster.fr_xb 100 -0.5 0.5 P.dc.ntrack>0
+TH1F pFRYApos 'SHMS FRYApos; FRYA POS (CM); Counts' P.rb.raster.fr_ya 100 -0.5 0.5 P.dc.ntrack>0
+TH1F pFRYBpos 'SHMS FRYBpos; FRYB POS (CM); Counts' P.rb.raster.fr_yb 100 -0.5 0.5 P.dc.ntrack>0
+
+
+TH2F pFRAraw_XvsY 'SHMS FRA Raw X vs Y; FRXA RAW ADC (Volts); FRYA RAW ADC (Volts)' FRXAraw_V FRYAraw_V 100 0 1.0 100 0 1.0 P.dc.ntrack>0
+TH2F pFRBraw_XvsY 'SHMS FRB Raw X vs Y; FRXB RAW ADC (Volts); FRYB RAW ADC (Volts)' FRXBraw_V FRYBraw_V 100 0 1.0 100 0 1.0 P.dc.ntrack>0
+
+TH2F pFRApos_XvsY 'SHMS FRA X vs Y; FRXA POS (CM); FRYA POS (CM)' P.rb.raster.fr_xa P.rb.raster.fr_ya 100 -0.5 0.5 100 -0.5 0.5 P.dc.ntrack>0
+TH2F pFRBpos_XvsY 'SHMS FRB X vs Y; FRXB POS (CM); FRYB POS (CM)' P.rb.raster.fr_xb P.rb.raster.fr_yb 100 -0.5 0.5 100 -0.5 0.5 P.dc.ntrack>0
diff --git a/DEF-files/SHMS/RASTER/shms_raster_simple.def b/DEF-files/SHMS/RASTER/shms_raster_simple.def
index 99eb5ebafe56bd9521a072b3d26cdc15d4c73fec..897066b946804959411d665e41f8e3966a152efd 100644
--- a/DEF-files/SHMS/RASTER/shms_raster_simple.def
+++ b/DEF-files/SHMS/RASTER/shms_raster_simple.def
@@ -11,15 +11,25 @@ formula FRYA_V P.rb.raster.fryaRawAdc*(1./4096.)/25.
formula FRYB_V P.rb.raster.frybRawAdc*(1./4096.)/25.
TH1F pFRXA 'SHMS FRXA; FRXA RAW ADC (chan); Counts' P.rb.raster.frxaRawAdc 1000 0 100000
+
TH1F pFRXA_V 'SHMS FRXA; FRXA RAW ADC (Volts); Counts' FRXA_V 1000 0 1.0
+
TH1F pFRXB 'SHMS FRXB; FRXB RAW ADC (chan); Counts' P.rb.raster.frxbRawAdc 1000 0 100000
+
TH1F pFRXB_V 'SHMS FRXB; FRXB RAW ADC (Volts); Counts' FRXB_V 1000 0 1.0
+
TH1F pFRYA 'SHMS FRYA; FRYA RAW ADC (chan); Counts' P.rb.raster.fryaRawAdc 1000 0 100000
+
TH1F pFRYA_V 'SHMS FRYA; FRYA RAW ADC (Volts); Counts' FRYA_V 1000 0 1.0
+
TH1F pFRYB 'SHMS FRYB; FRYB RAW ADC (chan); Counts' P.rb.raster.frybRawAdc 1000 0 100000
+
TH1F pFRYB_V 'SHMS FRYB; FRYB RAW ADC (Volts); Counts' FRYB_V 1000 0 1.0
+
TH2F pFRA_XvsY 'SHMS FRA X vs Y; FRXA RAW ADC (Volts); FRYA RAW ADC (Volts)' FRXA_V FRYA_V 1000 0 1.0 1000 0 1.0
+
TH2F pFRB_XvsY 'SHMS FRB X vs Y; FRXB RAW ADC (Volts); FRYB RAW ADC (Volts)' FRXB_V FRYB_V 1000 0 1.0 1000 0 1.0
+
#******************
# EPICS VARIABLES *
#******************
@@ -53,4 +63,4 @@ IPM3H07C.XSOF
IPM3H07C.YSOF
-end epics
\ No newline at end of file
+end epics
diff --git a/PARAM/GEN/gbeam.param b/PARAM/GEN/gbeam.param
index 49d2b4edd1d8d2da46cf01bab90052c8509a4f9e..22f2039d8052aa9cfecb8a2e926cb618e1ac6f06 100644
--- a/PARAM/GEN/gbeam.param
+++ b/PARAM/GEN/gbeam.param
@@ -4,7 +4,7 @@
; average beam positions:
; Use the Hall C EPICS BPM values in units of cm
- gbeam_x = +0.00
+ gbeam_x = +0.00
gbeam_xp = +0.00
gbeam_y = +0.00
gbeam_yp = +0.00
@@ -22,18 +22,30 @@ calculating beam position
; Various fast raster quantities: gUse* are flags
- gfr_cal_mom = 6.4 ; = beam momnetum during calibration run
-
+ ; gfr_cal_mom = 6.4 ; = beam momnetum during calibration run
+ gfr_cal_mom = 2.218 ; = beam momentum during Winter '17 run
- gfrxa_adcpercm = 97666.7;
- gfrxb_adcpercm = 97333.3;
- gfrya_adcpercm = 113667;
- gfryb_adcpercm = 114333;
-
- gfrxa_adc_zero_offset = 67800;
- gfrxb_adc_zero_offset = 69050;
- gfrya_adc_zero_offset = 67700;
- gfryb_adc_zero_offset = 67000;
+ ; gfrxa_adcpercm = 97666.7;
+ ; gfrxb_adcpercm = 97333.3;
+ ; gfrya_adcpercm = 113667;
+ ; gfryb_adcpercm = 114333;
+
+ ; gfrxa_adc_zero_offset = 67800;
+ ; gfrxb_adc_zero_offset = 69050;
+ ; gfrya_adc_zero_offset = 67700;
+ ; gfryb_adc_zero_offset = 67000;
+
+ ; raster constants from Winter '17 Commissioning shms run 1565
+
+ gfrya_adcpercm = 56333.3;
+ gfryb_adcpercm = 56000;
+ gfrxa_adcpercm = 67000.0;
+ gfrxb_adcpercm = 62666.6;
+
+ gfrya_adc_zero_offset = 67200;
+ gfryb_adc_zero_offset = 65650;
+ gfrxa_adc_zero_offset = 65200;
+ gfrxb_adc_zero_offset = 67050;
; positions of FR magnets relative to target
gfrx_dist = 1375 ; cm