diff --git a/DEF-files/SHMS/PRODUCTION/CAL/pcal_histos.def b/DEF-files/SHMS/PRODUCTION/CAL/pcal_histos.def
index 4b5291ab17d00ca432e7f90a9b275922a334d3ce..f6c5a42dba46b6e16180c54c67149d79bda827ac 100644
--- a/DEF-files/SHMS/PRODUCTION/CAL/pcal_histos.def
+++ b/DEF-files/SHMS/PRODUCTION/CAL/pcal_histos.def
@@ -55,6 +55,9 @@ TH1F pcal_ytrack      'SHMS Cal Track y; Track y (cm); Entries / 0.2 cm' P.cal.y
 TH1F pcal_ytrack1     'SHMS Cal Track y pos with no matching clust; Track y (cm); Entries / 0.2 cm' P.cal.ytrack 1000 -100. 100. P.cal.nclusttrack==-1&&P.gtr.dp>-8.&&P.gtr.dp<8.&&P.dc.ntrack>0
 TH1F pcal_ytrack2     'SHMS Cal Track y pos with no matching clust number of cluster=1; Track y (cm); Entries / 0.2 cm' P.cal.ytrack 1000 -100. 100. P.cal.nclusttrack==-1&&P.cal.nclust==0&&P.gtr.dp>-8.&&P.gtr.dp<8.&&P.dc.ntrack>0
 
+TH2F pcal_xytrack      'SHMS Cal Track X vs Track Y; Track Y / 1 cm; Track X / 1 cm' P.cal.ytrack P.cal.xtrack 200 -100 100 200 -100 100 P.dc.ntrack>0
+TH2F pcal_xyclusttrack 'SHMS Cal Cluster X vs Cluster Y; Cluster Y / 1 cm; Cluster X / 1 cm' P.cal.yclusttrack P.cal.xclusttrack 200 -100 100 200 -100 100 P.cal.nclusttrack>-1&&P.dc.ntrack>0
+
 TH2F pcal_xtrack_vs_etrack 'SHMS Calorimeter xtrack vs total track energy; Track Energy Deposition (Gev) / 0.1 GeV; X Track (cm) / 1 cm' P.cal.etrack P.cal.xtrack 100 0 10 200 -100 100 pCleanTrack
 TH2F pcal_ytrack_vs_etrack 'SHMS Calorimeter ytrack vs total track energy; Track Energy Deposition (Gev) / 0.1 GeV; Y Track (cm) / 1 cm' P.cal.etrack P.cal.ytrack 100 0 10 200 -100 100 pCleanTrack
 TH2F pcal_xtrack_vs_etrack_elec 'SHMS Calorimeter xtrack vs total track energy; Track Energy Deposition (Gev) / 0.1 GeV; X Track (cm) / 1 cm' P.cal.etrack P.cal.xtrack 100 0 10 200 -100 100 pCleanTrack&&elec_all
diff --git a/DEF-files/SHMS/PRODUCTION/TRIG/ptrig_histos.def b/DEF-files/SHMS/PRODUCTION/TRIG/ptrig_histos.def
index 552e5bee7d97a5abb37d902f6a2cd18d1d84649c..0cbf099d94a11959274220f73a363e8582b8b5d5 100644
--- a/DEF-files/SHMS/PRODUCTION/TRIG/ptrig_histos.def
+++ b/DEF-files/SHMS/PRODUCTION/TRIG/ptrig_histos.def
@@ -10,9 +10,11 @@ TH1F ptrig_p2y_tdc_mult 'SHMS p2y TDC Multiplicity; Raw TDC Multiplicity; Counts
 TH1F ptrig_p1T_tdc_mult 'SHMS p1x/p1y Coincidence TDC Multiplicity; Raw TDC Multiplicity; Counts / 10' T.shms.p1T_tdcMultiplicity 11 0 11
 TH1F ptrig_p2T_tdc_mult 'SHMS p2x/p2y Coincidence TDC Multiplicity; Raw TDC Multiplicity; Counts / 10' T.shms.p2T_tdcMultiplicity 11 0 11
 
-TH1F ptrig_pT1_tdc_mult 'SHMS p1x/p1y/p2x/p2y Coincidence TDC Multiplicity (Slot 20, Channel 15); Raw TDC Multiplicity; Counts / 10' T.shms.pT1_tdcMultiplicity 11 0 11
-TH1F ptrig_pT2_tdc_mult 'SHMS p1x/p1y/p2x/p2y Coincidence TDC Multiplicity (Slot 19, Channel 31); Raw TDC Multiplicity; Counts / 10' T.shms.pT2_tdcMultiplicity 11 0 11
-TH1F ptrig_pT3_tdc_mult 'SHMS p1x/p1y/p2x/p2y Coincidence TDC Multiplicity (Slot 19, Channel 38); Raw TDC Multiplicity; Counts / 10' T.shms.pT3_tdcMultiplicity 11 0 11
+TH1F ptrig_pT1_tdc_mult 'SHMS pT1 TDC Multiplicity (Slot 20, Channel 15); Raw TDC Multiplicity; Counts / 10' T.shms.pT1_tdcMultiplicity 11 0 11
+TH1F ptrig_pT2_tdc_mult 'SHMS pT2 TDC Multiplicity (Slot 19, Channel 31); Raw TDC Multiplicity; Counts / 10' T.shms.pT2_tdcMultiplicity 11 0 11
+TH1F ptrig_pT3_tdc_mult 'SHMS pT3 TDC Multiplicity (Slot 19, Channel 38); Raw TDC Multiplicity; Counts / 10' T.shms.pT3_tdcMultiplicity 11 0 11
+
+TH1F ptrig_pFADC_TREF_ROC2_ptime_mult 'SHMS pFADC_TREF_ROC2 ADC Multiplicity; ADC Multiplicity; Counts / 10' T.shms.pFADC_TREF_ROC2_adcMultiplicity 11 0 11
 
 TH1F ptrig_p1x_good_tdc 'SHMS p1x Good TDC Time; Good Raw TDC Time (ns); Counts / 1 ns' T.shms.p1X_tdcTime 800 0 800 T.shms.p1X_tdcMultiplicity==1
 TH1F ptrig_p1y_good_tdc 'SHMS p1y Good TDC Time; Good Raw TDC Time (ns); Counts / 1 ns' T.shms.p1Y_tdcTime 800 0 800 T.shms.p1Y_tdcMultiplicity==1
@@ -22,9 +24,11 @@ TH1F ptrig_p2y_good_tdc 'SHMS p2y Good TDC Time; Good Raw TDC Time (ns); Counts
 TH1F ptrig_p1T_good_tdc 'SHMS p1x/p1y Coincidence Good TDC Time; Good Raw TDC Time (ns); Counts / 1 ns' T.shms.p1T_tdcTime 800 0 800 T.shms.p1T_tdcMultiplicity==1
 TH1F ptrig_p2T_good_tdc 'SHMS p2x/p2y Coincidence Good TDC Time; Good Raw TDC Time (ns); Counts / 1 ns' T.shms.p2T_tdcTime 800 0 800 T.shms.p2T_tdcMultiplicity==1
 
-TH1F ptrig_pT1_good_tdc 'SHMS p1x/p1y/p2x/p2y Coincidence Good TDC Time (Slot 20, Channel 15); Good Raw TDC Time (ns); Counts / 1 ns' T.shms.pT1_tdcTime 800 0 800 T.shms.pT1_tdcMultiplicity==1
-TH1F ptrig_pT2_good_tdc 'SHMS p1x/p1y/p2x/p2y Coincidence Good TDC Time (Slot 19, Channel 31); Good Raw TDC Time (ns); Counts / 1 ns' T.shms.pT2_tdcTime 800 0 800 T.shms.pT2_tdcMultiplicity==1
-TH1F ptrig_pT3_good_tdc 'SHMS p1x/p1y/p2x/p2y Coincidence Good TDC Time (Slot 19, Channel 38); Good Raw TDC Time (ns); Counts / 1 ns' T.shms.pT3_tdcTime 800 0 800 T.shms.pT3_tdcMultiplicity==1
+TH1F ptrig_pT1_good_tdc 'SHMS pT1 Good TDC Time (Slot 20, Channel 15); Good Raw TDC Time (ns); Counts / 1 ns' T.shms.pT1_tdcTime 800 0 800 T.shms.pT1_tdcMultiplicity==1
+TH1F ptrig_pT2_good_tdc 'SHMS pT2 Good TDC Time (Slot 19, Channel 31); Good Raw TDC Time (ns); Counts / 1 ns' T.shms.pT2_tdcTime 800 0 800 T.shms.pT2_tdcMultiplicity==1
+TH1F ptrig_pT3_good_tdc 'SHMS pT3 Good TDC Time (Slot 19, Channel 38); Good Raw TDC Time (ns); Counts / 1 ns' T.shms.pT3_tdcTime 800 0 800 T.shms.pT3_tdcMultiplicity==1
+
+TH1F ptrig_pFADC_TREF_ROC2_good_tdc 'SHMS pFADC_TREF_ROC2 Good Pulse Time; Good Pulse Time (ns); Counts / 1 ns' T.shms.pFADC_TREF_ROC2_adcPulseTime 800 0 800 T.shms.pFADC_TREF_ROC2_adcMultiplicity==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
diff --git a/DEF-files/SHMS/TEST_STANDS/CAL/pcalana.def b/DEF-files/SHMS/TEST_STANDS/CAL/pcalana.def
index 2d5a47b2ad013a25faf68a0f2385db1599503c77..b9feb62ffd1c6cff0cd79e73b62d1be0bfb9236b 100644
--- a/DEF-files/SHMS/TEST_STANDS/CAL/pcalana.def
+++ b/DEF-files/SHMS/TEST_STANDS/CAL/pcalana.def
@@ -1,7 +1,6 @@
 # See $ANALYZER/examples/output_example.def for examples
 #
 block P.cal.*
-block T.shms.*
 
 #SHMS PRE-SHOWER HISTOGRAMS
 
diff --git a/DEF-files/SHMS/TEST_STANDS/TRIG/ptrigana.def b/DEF-files/SHMS/TEST_STANDS/TRIG/ptrigana.def
index c1b8d6f47563830ec49ba54aa367152bb4a574b1..cbf5e61fcfbbdb29bf4b0886b0d317c617df400f 100644
--- a/DEF-files/SHMS/TEST_STANDS/TRIG/ptrigana.def
+++ b/DEF-files/SHMS/TEST_STANDS/TRIG/ptrigana.def
@@ -29,14 +29,16 @@ TH1F ptrig_p2T_tdc 'SHMS p2x/p2y Coincidence TDC Time; TDC Time (ns); Counts / 1
 #--------------
 # SHMS TRIGGER
 #--------------
-TH1F ptrig_pT1_tdc_raw 'SHMS p1x/p1y/p2x/p2y Coincidence Raw TDC Time (Slot 20, Channel 15); Raw TDC Time (TDC Units); Counts / 1 TDC Units;' T.shms.pT1_tdcTimeRaw 4000 0 4000
-TH1F ptrig_pT2_tdc_raw 'SHMS p1x/p1y/p2x/p2y Coincidence Raw TDC Time (Slot 19, Channel 31); Raw TDC Time (TDC Units); Counts / 1 TDC Units;' T.shms.pT2_tdcTimeRaw 4000 0 4000
-TH1F ptrig_pT3_tdc_raw 'SHMS p1x/p1y/p2x/p2y Coincidence Raw TDC Time (Slot 19, Channel 38); Raw TDC Time (TDC Units); Counts / 1 TDC Units;' T.shms.pT3_tdcTimeRaw 4000 0 4000
+TH1F ptrig_pT1_tdc_raw 'SHMS pT1 Raw TDC Time (Slot 20, Channel 15); Raw TDC Time (TDC Units); Counts / 1 TDC Units;' T.shms.pT1_tdcTimeRaw 4000 0 4000
+TH1F ptrig_pT2_tdc_raw 'SHMS pT2 Raw TDC Time (Slot 19, Channel 31); Raw TDC Time (TDC Units); Counts / 1 TDC Units;' T.shms.pT2_tdcTimeRaw 4000 0 4000
+TH1F ptrig_pT3_tdc_raw 'SHMS pT3 Raw TDC Time (Slot 19, Channel 38); Raw TDC Time (TDC Units); Counts / 1 TDC Units;' T.shms.pT3_tdcTimeRaw 4000 0 4000
 
-TH1F ptrig_pT1_tdc 'SHMS p1x/p1y/p2x/p2y Coincidence TDC Time (Slot 20, Channel 15); TDC Time (ns); Counts / 1 ns;' T.shms.pT1_tdcTime 800 0 800
-TH1F ptrig_pT2_tdc 'SHMS p1x/p1y/p2x/p2y Coincidence TDC Time (Slot 19, Channel 31); TDC Time (ns); Counts / 1 ns;' T.shms.pT2_tdcTime 800 0 800
-TH1F ptrig_pT3_tdc 'SHMS p1x/p1y/p2x/p2y Coincidence TDC Time (Slot 19, Channel 38); TDC Time (ns); Counts / 1 ns;' T.shms.pT3_tdcTime 800 0 800
+TH1F ptrig_pT1_tdc 'SHMS pT1 TDC Time (Slot 20, Channel 15); TDC Time (ns); Counts / 1 ns;' T.shms.pT1_tdcTime 800 0 800
+TH1F ptrig_pT2_tdc 'SHMS pT2 TDC Time (Slot 19, Channel 31); TDC Time (ns); Counts / 1 ns;' T.shms.pT2_tdcTime 800 0 800
+TH1F ptrig_pT3_tdc 'SHMS pT3 TDC Time (Slot 19, Channel 38); TDC Time (ns); Counts / 1 ns;' T.shms.pT3_tdcTime 800 0 800
 
+TH1F ptrig_pFADC_TREF_ROC2_ptime     'SHMS pFADC_TREF_ROC2 Pulse Time; Pulse Time (ns); Counts / 1 ns;' T.shms.pFADC_TREF_ROC2_adcPulseTime 800 0 800
+TH1F ptrig_pFADC_TREF_ROC2_ptime_raw 'SHMS pFADC_TREF_ROC2 Raw Pulse Time; Raw Pulse Time (ADC Units); Counts / 1 ADC Unit;' T.shms.pFADC_TREF_ROC2_adcPulseTimeRaw 4000 0 4000
 
 #---------
 # SHMS DC
diff --git a/SCRIPTS/SHMS/SCALERS/replay_shms_scalers.C b/SCRIPTS/SHMS/SCALERS/replay_shms_scalers.C
index d9d1435bda686e22cab6a49c87741ef814073bb0..db39970b88b627a226bc5ae88dfbc93a5c0f0cf0 100644
--- a/SCRIPTS/SHMS/SCALERS/replay_shms_scalers.C
+++ b/SCRIPTS/SHMS/SCALERS/replay_shms_scalers.C
@@ -54,7 +54,7 @@ void replay_shms_scalers (Int_t RunNumber = 0, Int_t MaxEvent = 0) {
   gHaEvtHandlers->Add(hcepics);
   // Add handler for scaler events
   THcScalerEvtHandler *pscaler = new THcScalerEvtHandler("P","Hall C scaler event type 1");
-  pscaler->AddEvtType(129);
+  pscaler->AddEvtType(1);
   pscaler->SetUseFirstEvent(kTRUE);
   gHaEvtHandlers->Add(pscaler);
   // Add event handler for DAQ configuration event
diff --git a/SCRIPTS/SHMS/TEST_STANDS/replay_paero_test_stand.C b/SCRIPTS/SHMS/TEST_STANDS/replay_paero_test_stand.C
index 69a8db21ef4f76f114a40c309ac5eada4bcf85fe..5b0d9f8339cc38b8ff0b00a2c9261e55c0c7d032 100644
--- a/SCRIPTS/SHMS/TEST_STANDS/replay_paero_test_stand.C
+++ b/SCRIPTS/SHMS/TEST_STANDS/replay_paero_test_stand.C
@@ -35,7 +35,7 @@ void replay_paero_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
   gHcParms->Load(gHcParms->GetString("g_ctp_kinematics_filename"), RunNumber);
   gHcParms->Load(gHcParms->GetString("g_ctp_parm_filename"));
   gHcParms->Load(gHcParms->GetString("g_ctp_calib_filename"));
-  // Load params for HMS trigger configuration
+  // Load params for SHMS trigger configuration
   gHcParms->Load("PARAM/TRIG/tshms.param");
 
   // Load the Hall C style detector map
@@ -46,7 +46,7 @@ void replay_paero_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
   // Set up the equipment to be analyzed.
   THaApparatus* SHMS = new THcHallCSpectrometer("P", "SHMS");
   gHaApps->Add(SHMS);
-  // Add aeroscope to HMS apparatus
+  // Add aeroscope to SHMS apparatus
   THcAerogel* aero = new THcAerogel("aero", "Aerogel");
   SHMS->AddDetector(aero);
 
diff --git a/SCRIPTS/SHMS/TEST_STANDS/replay_pdc_test_stand.C b/SCRIPTS/SHMS/TEST_STANDS/replay_pdc_test_stand.C
index a336c89f7dc02060deaeefec6fe5d261a05dc9d4..87aba8f95daf5b72806935e38c9c6b6dac8a11e3 100644
--- a/SCRIPTS/SHMS/TEST_STANDS/replay_pdc_test_stand.C
+++ b/SCRIPTS/SHMS/TEST_STANDS/replay_pdc_test_stand.C
@@ -36,7 +36,7 @@ void replay_pdc_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
   gHcParms->Load(gHcParms->GetString("g_ctp_parm_filename"));
   gHcParms->Load(gHcParms->GetString("g_ctp_calib_filename"));
   
-  // Load params for HMS DC test stand configuration
+  // Load params for SHMS DC test stand configuration
   //gHcParms->Load("PARAM/SHMS/DC/pdc_test_stand.param");
 
   // Load the Hall C style detector map
diff --git a/SCRIPTS/SHMS/TEST_STANDS/replay_phgcer_test_stand.C b/SCRIPTS/SHMS/TEST_STANDS/replay_phgcer_test_stand.C
index bbe3121b4080c9e14efba6dfe1525a6f2a3f7461..fbbc1864f246b56440d328ced7a60ff728d85fe2 100644
--- a/SCRIPTS/SHMS/TEST_STANDS/replay_phgcer_test_stand.C
+++ b/SCRIPTS/SHMS/TEST_STANDS/replay_phgcer_test_stand.C
@@ -35,7 +35,7 @@ void replay_phgcer_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
   gHcParms->Load(gHcParms->GetString("g_ctp_kinematics_filename"), RunNumber);
   gHcParms->Load(gHcParms->GetString("g_ctp_parm_filename"));
   gHcParms->Load(gHcParms->GetString("g_ctp_calib_filename"));
-  // Load params for HMS trigger configuration
+  // Load params for SHMS trigger configuration
   gHcParms->Load("PARAM/TRIG/tshms.param");
   gHcParms->Load("PARAM/SHMS/GEN/p_fadc_debug.param");
   // Load the Hall C style detector map
@@ -45,7 +45,7 @@ void replay_phgcer_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
   // Set up the equipment to be analyzed.
   THaApparatus* SHMS = new THcHallCSpectrometer("P", "SHMS");
   gHaApps->Add(SHMS);
-  // Add Cherenkov to HMS apparatus
+  // Add Cherenkov to SHMS apparatus
   THcCherenkov* hgcer = new THcCherenkov("hgcer", "Heavy Gas Cherenkov");
   SHMS->AddDetector(hgcer);
 
diff --git a/SCRIPTS/SHMS/TEST_STANDS/replay_phodo_test_stand.C b/SCRIPTS/SHMS/TEST_STANDS/replay_phodo_test_stand.C
index cdf1dfc16c0db09959f218be18293ef38bd6e439..42a20f194cc7f2a83e89952cb470c13afda0bd05 100644
--- a/SCRIPTS/SHMS/TEST_STANDS/replay_phodo_test_stand.C
+++ b/SCRIPTS/SHMS/TEST_STANDS/replay_phodo_test_stand.C
@@ -33,7 +33,7 @@ void replay_phodo_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
   gHcParms->Load(gHcParms->GetString("g_ctp_kinematics_filename"), RunNumber);
   gHcParms->Load(gHcParms->GetString("g_ctp_parm_filename"));
   gHcParms->Load(gHcParms->GetString("g_ctp_calib_filename"));
-  // Load params for HMS trigger configuration
+  // Load params for SHMS trigger configuration
   gHcParms->Load("PARAM/TRIG/tshms.param");
 
   // Load the Hall C style detector map
@@ -44,7 +44,7 @@ void replay_phodo_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
   // Set up the equipment to be analyzed.
   THaApparatus* SHMS = new THcHallCSpectrometer("P", "SHMS");
   gHaApps->Add(SHMS);
-  // Add hodoscope to HMS apparatus
+  // Add hodoscope to SHMS apparatus
   THcHodoscope* hod = new THcHodoscope("hod", "Hodoscope");
   SHMS->AddDetector(hod);
 
diff --git a/SCRIPTS/SHMS/TEST_STANDS/replay_pngcer_test_stand.C b/SCRIPTS/SHMS/TEST_STANDS/replay_pngcer_test_stand.C
index 78b2194cfb098f7310fe0704aec41d5147c13655..ce1cab5f2d3d2454ae065b3b8536c2db09f64e80 100644
--- a/SCRIPTS/SHMS/TEST_STANDS/replay_pngcer_test_stand.C
+++ b/SCRIPTS/SHMS/TEST_STANDS/replay_pngcer_test_stand.C
@@ -45,7 +45,7 @@ void replay_pngcer_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
   // Set up the equipment to be analyzed.
   THaApparatus* SHMS = new THcHallCSpectrometer("P", "SHMS");
   gHaApps->Add(SHMS);
-  // Add hodoscope to HMS apparatus
+  // Add hodoscope to SHMS apparatus
   THcCherenkov* ngcer = new THcCherenkov("ngcer", "Noble Gas Cherenkov");
   SHMS->AddDetector(ngcer);
 
diff --git a/SCRIPTS/SHMS/TEST_STANDS/replay_ptrig_test_stand.C b/SCRIPTS/SHMS/TEST_STANDS/replay_ptrig_test_stand.C
index 31eb132bb0bc54635fa75c5712718cd9ef4e000a..bbae4b17593267a78413c0957355f1b02cce684c 100644
--- a/SCRIPTS/SHMS/TEST_STANDS/replay_ptrig_test_stand.C
+++ b/SCRIPTS/SHMS/TEST_STANDS/replay_ptrig_test_stand.C
@@ -35,7 +35,7 @@ void replay_ptrig_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
   gHcParms->Load(gHcParms->GetString("g_ctp_kinematics_filename"), RunNumber);
   gHcParms->Load(gHcParms->GetString("g_ctp_parm_filename"));
   gHcParms->Load(gHcParms->GetString("g_ctp_calib_filename"));
-  // Load params for HMS DC test stand configuration
+  // Load params for SHMS test stand configuration
   gHcParms->Load("PARAM/TRIG/tshms.param");
 
   // Load the Hall C style detector map
diff --git a/onlineGUI/CONFIG/SHMS/GEN/shms_production.cfg b/onlineGUI/CONFIG/SHMS/GEN/shms_production.cfg
index 1130bca69fbddf23ee2034667e76e69c0b247c83..40dc134238afd9fb5653fc2dc0bda8edafa31f72 100644
--- a/onlineGUI/CONFIG/SHMS/GEN/shms_production.cfg
+++ b/onlineGUI/CONFIG/SHMS/GEN/shms_production.cfg
@@ -165,14 +165,12 @@ pkin_w -nostat
 pkin_omega -nostat
 pkin_theta -nostat
 
-newpage 4 2 logz
+newpage 3 2 logz
 title SHMS Tracked Variables
-pcal_xtrack -nostat
-pcal_xclusttrack -nostat
+pcal_xytrack -nostat
 pcal_xdiff -nostat
 pcal_xdiff_v_xtr -nostat
-pcal_ytrack -nostat
-pcal_yclusttrack -nostat
+pcal_xyclusttrack -nostat
 pcal_ydiff -nostat
 pcal_ydiff_v_ytr -nostat