diff --git a/DBASE/COIN/STD/standard.kinematics b/DBASE/COIN/STD/standard.kinematics
index 8d3f616464d5538c8ad9487e5829238626b25cb3..119e29631b65e2d72a815fef4297d0cb4625a0c7 100644
--- a/DBASE/COIN/STD/standard.kinematics
+++ b/DBASE/COIN/STD/standard.kinematics
@@ -347,8 +347,8 @@ ppcentral = 5.122*0.985
 ppartmass = 0.93827231
 hpartmass = 0.0005109
 
-#CT Experiment (E12-06-107)
-2186-9999
+#Ct Experiment (E12-06-107)
+2186-2277
 gpbeam = 6.405
 gtargmass_amu =  12.0107
 htheta_lab = -45.145
@@ -357,3 +357,14 @@ hpcentral = 2.131
 ppcentral = 5.122*0.985
 ppartmass = 0.93827231
 hpartmass = 0.0005109
+
+#Ct Experiment (E12-06-107)
+2278-9999
+gpbeam = 10.600
+gtargmass_amu =  1.00794
+htheta_lab = -23.186
+ptheta_lab = 21.625
+hpcentral = 5.539
+ppcentral = 5.925*0.985
+ppartmass = 0.93827231
+hpartmass = 0.0005109
\ No newline at end of file
diff --git a/DBASE/HMS/STD/standard.kinematics b/DBASE/HMS/STD/standard.kinematics
index c34f08d21e07be767d1b308c71f0818ed5bd22c4..30f9fdb08b5e7534e0133a7d056b81f38a6de942 100644
--- a/DBASE/HMS/STD/standard.kinematics
+++ b/DBASE/HMS/STD/standard.kinematics
@@ -436,14 +436,77 @@ hpcentral = 1.0
 
 1481-1492
 gpbeam = 6.404 
-gtargmass_amu= 26.98
+gtargmass_amu=26.98
 hpartmass = 0.00051099
 htheta_lab = -64.99
 hpcentral = 1.0
 
-1493-1497
+1493-1504
+gpbeam = 6.404 
+gtargmass_amu= 1.00794
+hpartmass = 0.00051099
+htheta_lab = -65.0
+hpcentral = 1.0	
+
+1505-1505
+gpbeam = 6.404 
+gtargmass_amu= 26.98
+hpartmass = 0.00051099
+htheta_lab = -65.0
+hpcentral = 1.0	
+
+1506-1508
 gpbeam = 6.404 
 gtargmass_amu= 1.00794
 hpartmass = 0.00051099
 htheta_lab = -65.0
-hpcentral = 1.0
\ No newline at end of file
+hpcentral = 1.0	
+
+1509-9999
+gpbeam = 6.404 
+gtargmass_amu=26.98 
+hpartmass = 0.00051099
+htheta_lab = -65.0
+hpcentral = 1.0	
+
+1510-1510
+gpbeam = 6.404 
+gtargmass_amu=12.0107 
+hpartmass = 0.00051099
+htheta_lab = -65.0
+hpcentral = 2.0	
+
+1511-1513
+gpbeam = 6.404 
+gtargmass_amu=12.0107 
+hpartmass = 0.00051099
+htheta_lab = 30.01
+hpcentral = 2.0	
+
+1519-1526
+gpbeam = 10.59 
+gtargmass_amu=1.00794 
+hpartmass = 0.00051099
+htheta_lab = 18.50
+hpcentral = 5.816
+
+1527-1528
+gpbeam = 10.59 
+gtargmass_amu=12.0107 
+hpartmass = 0.00051099
+htheta_lab = 18.50
+hpcentral = 5.816
+
+1529-1530
+gpbeam = 10.59 
+gtargmass_amu=1.00794 
+hpartmass = 0.00051099
+htheta_lab = 18.50
+hpcentral = 5.816
+
+1531-1532
+gpbeam = 10.59 
+gtargmass_amu=12.0107
+hpartmass = 0.00051099
+htheta_lab = 18.50
+hpcentral = 5.816
diff --git a/DBASE/SHMS/STD/standard.kinematics b/DBASE/SHMS/STD/standard.kinematics
index 9e8a6fd556aa0d9fc119ad523ffc450886560ab9..58b5809c555ef1fec20f7b4d83319ae96dc6c23c 100644
--- a/DBASE/SHMS/STD/standard.kinematics
+++ b/DBASE/SHMS/STD/standard.kinematics
@@ -330,9 +330,116 @@ ppartmass =  0.00051099
 ptheta_lab =25.0
 ppcentral = 3.911
 
-2221-2225
+2221-2229
 gpbeam = 6.404
 gtargmass_amu= 1.00794
 ppartmass =  0.00051099
 ptheta_lab =25.0
-ppcentral = 3.911
\ No newline at end of file
+ppcentral = 3.911
+
+2230-2231
+gpbeam = 6.404
+gtargmass_amu= 1.00794
+ppartmass =  0.00051099
+ptheta_lab =25.0
+ppcentral = 3.6
+
+2231-2231
+gpbeam = 6.404
+gtargmass_amu= 1.00794
+ppartmass =  0.00051099
+ptheta_lab =25.0
+ppcentral = 3.349
+
+2232-2232
+gpbeam = 6.404
+gtargmass_amu= 1.00794
+ppartmass =  0.00051099
+ptheta_lab =30.005
+ppcentral = 3.349
+
+2233-2234
+gpbeam = 6.404
+gtargmass_amu= 12.0107
+ppartmass =  0.00051099
+ptheta_lab =22.0
+ppcentral = 3.2
+
+2235-2239
+gpbeam = 6.404
+gtargmass_amu= 12.0107
+ppartmass =  0.00051099
+ptheta_lab =30.0
+ppcentral = 2
+
+#2241 -2247 are junk runs on LH2
+2241-2247
+gpbeam = 10.59
+gtargmass_amu= 1.00794
+ppartmass =  0.00051099
+ptheta_lab =7.50
+ppcentral = 2
+
+#2248 is junk a run on CA-6%
+2248
+gpbeam = 10.59
+gtargmass_amu= 12.0107
+ppartmass =  0.00051099
+ptheta_lab =7.50
+ppcentral = 2
+
+2249-2253
+gpbeam = 10.59
+gtargmass_amu= 12.0107
+ppartmass =  0.00051099
+ptheta_lab =8.50
+ppcentral = 9.43
+
+2255-2255
+gpbeam = 10.59
+gtargmass_amu= 1.00794
+ppartmass =  0.00051099
+ptheta_lab =8.49
+ppcentral = 9.43
+
+2256-2256
+gpbeam = 10.59
+gtargmass_amu= 1.00794
+ppartmass =  0.00051099
+ptheta_lab =8.49
+ppcentral = 7.3
+
+2257-2258
+gpbeam = 10.59
+gtargmass_amu= 12.0107
+ppartmass =  0.00051099
+ptheta_lab =8.49
+ppcentral = 7.3
+
+2259-2259
+gpbeam = 10.59
+gtargmass_amu= 1.00794
+ppartmass =  0.00051099
+ptheta_lab =16.49
+ppcentral = 7.234
+
+2260-2262
+gpbeam = 10.59
+gtargmass_amu= 1.00794
+ppartmass =  0.00051099
+ptheta_lab =16.49
+ppcentral = 5.5
+
+2263-2264
+gpbeam = 10.59
+gtargmass_amu= 12.0107
+ppartmass =  0.00051099
+ptheta_lab =16.49
+ppcentral = 5.5
+
+2265-2265
+gpbeam = 10.59
+gtargmass_amu= 12.0107
+ppartmass =  0.00051099
+ptheta_lab =25.00
+ppcentral = 5.5
diff --git a/DEF-files/HMS/PRODUCTION/hstackana_production_cuts.def b/DEF-files/HMS/PRODUCTION/hstackana_production_cuts.def
index 44c9aa05fc2288ceca2200bc50eb30f955b6ebf9..1ad919a2c5d2d11743675fed0482cf46bf69b9ce 100644
--- a/DEF-files/HMS/PRODUCTION/hstackana_production_cuts.def
+++ b/DEF-files/HMS/PRODUCTION/hstackana_production_cuts.def
@@ -48,6 +48,7 @@ hcut_time_cut12                           H.dc.2x2.time > 0 && H.dc.2x2.time < 2
 
 hmsDC1Planes_large  (H.dc.1x1.nhit+H.dc.1v2.nhit+H.dc.1u1.nhit+H.dc.1v1.nhit+H.dc.1x2.nhit+H.dc.1u2.nhit) >20
 hmsDC2Planes_large  (H.dc.2x1.nhit+H.dc.2v2.nhit+H.dc.2u1.nhit+H.dc.2v1.nhit+H.dc.2x2.nhit+H.dc.2u2.nhit) >20
+hmsDC1or2Pln_large hmsDC1Planes_large || hmsDC2Planes_large 
 
 hmsDC1_1hit_x1                H.dc.1x1.nhit == 1
 hmsDC1_1hit_v2                H.dc.1v2.nhit == 1
@@ -135,6 +136,8 @@ hcut_cer_elec       	  H.cer.npeSum>.5
 hcut_cer_pi       	  H.cer.npeSum<.5
 
 HMSScinGood           H.hod.goodscinhit == 1
+HMSGoodBetanotrk      H.hod.betanotrack > 0.5
+
 
 HMSScinShould         HMSScinGood 
 HMSScinShoulde        HMSScinGood && H.cal.etotnorm > 0.6&& H.cal.etotnorm < 2.0&& H.cer.npeSum > 0.5
diff --git a/SCRIPTS/COIN/MONITOR/Bean_counter.C b/SCRIPTS/COIN/MONITOR/Bean_counter.C
index f0e9f8f4ea61bd4d9e8853d56ad6f054435d4756..e44439ce4d147765c09aefdb15c1c8cb2d86b922 100644
--- a/SCRIPTS/COIN/MONITOR/Bean_counter.C
+++ b/SCRIPTS/COIN/MONITOR/Bean_counter.C
@@ -16,11 +16,11 @@ void Bean_counter(Int_t runNumber, Int_t targ){
   int nentriesD = tt->GetEntries();
   cout<<"Entries:\t"<<nentriesD<<endl;
   TString fileO;
-   fileO += "/net/cdaq/cdaql3data/cdaq/hallc-online/run_"; //read the root file from data
+   fileO += "HISTOGRAMS/COIN/ROOT/run_"; //read the root file from data
    fileO += runNumber; //read the root file from data
    fileO += "_hists_coin.root"; //read the root file from data
 
-  TFile *fout = new TFile(fileO,"RECREATE");
+   //TFile *fout = new TFile(fileO,"RECREATE");
 
   gROOT->SetBatch(kTRUE);
 
@@ -133,7 +133,7 @@ void Bean_counter(Int_t runNumber, Int_t targ){
   Double_t HhodoStartTimeMean = h1HhodoStartTime->GetMean();                     
 
  
-  Double_t pOffset = 3.0; //9.5 + 10;  // in ns                                  
+  Double_t pOffset = 1.5; //9.5 + 10;  // in ns                                  
   Double_t hOffset = 335;                                                        
   Double_t speedOfLight = 29.9792; // in cm/ns                                   
   Double_t SHMScentralPathLen = 18.1*100;  // SHMS Target to focal plane path length converted to cm  
@@ -251,7 +251,7 @@ void Bean_counter(Int_t runNumber, Int_t targ){
 
   // can2->SaveAs("tmp.pdf");
 
-  fout->Write();
+  //fout->Write();
   //  fout->Close();
   cout << "-------------------------------------------------------------------------------------------------------" << endl;
   cout << "NOTE:>>>>  " << cnts <<"  <<<<<  GOOD EVENTS have passed all cuts (update the white board and excel sheet)" << endl;
diff --git a/SCRIPTS/COIN/MONITOR/Bean_counter_carbon.C b/SCRIPTS/COIN/MONITOR/Bean_counter_carbon.C
index b48402a3b59707a78a305b74eef74da3a4637bd6..a19eaee7661600e9a4c039b33c24dd07feac7fe0 100644
--- a/SCRIPTS/COIN/MONITOR/Bean_counter_carbon.C
+++ b/SCRIPTS/COIN/MONITOR/Bean_counter_carbon.C
@@ -16,11 +16,11 @@ void Bean_counter_carbon(Int_t runNumber){
   int nentriesD = tt->GetEntries();
   cout<<"Entries:\t"<<nentriesD<<endl;
   TString fileO;
-   fileO += "/net/cdaq/cdaql3data/cdaq/hallc-online/run_"; //read the root file from data
+   fileO += "HISTOGRAMS/COIN/ROOT/run_"; //read the root file from data
    fileO += runNumber; //read the root file from data
    fileO += "_hists_coin.root"; //read the root file from data
 
-  TFile *fout = new TFile(fileO,"RECREATE");
+   //TFile *fout = new TFile(fileO,"RECREATE");
 
   gROOT->SetBatch(kTRUE);
 
@@ -221,7 +221,7 @@ void Bean_counter_carbon(Int_t runNumber){
 
   // can2->SaveAs("tmp.pdf");
 
-  fout->Write();
+  //fout->Write();
   //  fout->Close();
   cout << "-------------------------------------------------------------------------------------------------------" << endl;
   cout << "NOTE:>>>>  " << cnts <<"  <<<<<  GOOD EVENTS have passed all cuts (update the white board and excel sheet)" << endl;
diff --git a/SCRIPTS/COIN/MONITOR/coin_monitor.root b/SCRIPTS/COIN/MONITOR/coin_monitor.root
index 53529423655263fbbc212491eb28adb57add778a..fb2268045b3ed6a56c4dbbeed0d9451376b088bc 100644
Binary files a/SCRIPTS/COIN/MONITOR/coin_monitor.root and b/SCRIPTS/COIN/MONITOR/coin_monitor.root differ
diff --git a/SCRIPTS/HMS/PRODUCTION/replay_production_all_hms.C b/SCRIPTS/HMS/PRODUCTION/replay_production_all_hms.C
index e018003be303f95efd406a7755adeb7baa04ff42..c68a7deeaca237c737a8525fbbee972a04e414bf 100644
--- a/SCRIPTS/HMS/PRODUCTION/replay_production_all_hms.C
+++ b/SCRIPTS/HMS/PRODUCTION/replay_production_all_hms.C
@@ -18,12 +18,12 @@ void replay_production_all_hms(Int_t RunNumber=0, Int_t MaxEvent=0) {
   // Create file name patterns.
   const char* RunFileNamePattern = "hms_all_%05d.dat";
   vector<TString> pathList;
-    pathList.push_back(".");
-    pathList.push_back("./raw");
-    pathList.push_back("./raw/../raw.copiedtotape");
-    pathList.push_back("./cache");
+  pathList.push_back(".");
+  pathList.push_back("./raw");
+  pathList.push_back("./raw/../raw.copiedtotape");
+  pathList.push_back("./cache");
 
-  const char* ROOTFileNamePattern = "ROOTfiles/hms_replay_production_%d_%d.root";
+  const char* ROOTFileNamePattern = "ROOTfiles/hms_replay_production_all_%d_%d.root";
 
   //Load Global parameters
   // Add variables to global list.
@@ -72,20 +72,21 @@ void replay_production_all_hms(Int_t RunNumber=0, Int_t MaxEvent=0) {
   // Include golden track information
   THaGoldenTrack* gtr = new THaGoldenTrack("H.gtr", "HMS Golden Track", "H");
   gHaPhysics->Add(gtr);
-// Add Rastered Beam Apparatus
+  // Add Rastered Beam Apparatus
   THaApparatus* beam = new THcRasteredBeam("H.rb", "Rastered Beamline");
   gHaApps->Add(beam);  
-  THaReactionPoint* hrp= new THaReactionPoint("H.react"," HMS reaction point","H","H.rb");
+  THaReactionPoint* hrp= new THaReactionPoint("H.react", "HMS reaction point", "H", "H.rb");
   gHaPhysics->Add(hrp);
-  THcExtTarCor* hext = new THcExtTarCor("H.extcor"," HMS extended target corrections","H","H.react");
+  THcExtTarCor* hext = new THcExtTarCor("H.extcor", "HMS extended target corrections", "H", "H.react");
   gHaPhysics->Add(hext);
-// Add Ideal Beam Apparatus
- // THaApparatus* beam = new THaIdealBeam("IB", "Ideal Beamline");
- // gHaApps->Add(beam);
-  // Add Physics Module to calculate primary (scattered) beam kinematics
+  // Add Ideal Beam Apparatus
+  // THaApparatus* beam = new THaIdealBeam("IB", "Ideal Beamline");
+  // gHaApps->Add(beam);
+  // Add physics module to calculate primary (scattered) beam kinematics
   THcPrimaryKine* hkin = new THcPrimaryKine("H.kin", "HMS Single Arm Kinematics", "H", "H.rb");
   gHaPhysics->Add(hkin);
-  THcHodoEff* heff = new THcHodoEff("hhodeff"," HMS hodo efficiency","H.hod");
+  // Add physics module to calculate the hodoscope efficiencies
+  THcHodoEff* heff = new THcHodoEff("hhodeff", "HMS hodo efficiency", "H.hod");
   gHaPhysics->Add(heff);
 
   // Add handler for prestart event 125.
@@ -137,23 +138,23 @@ void replay_production_all_hms(Int_t RunNumber=0, Int_t MaxEvent=0) {
   analyzer->SetCountMode(2);    // 0 = counter is # of physics triggers
                                 // 1 = counter is # of all decode reads
                                 // 2 = counter is event number
- analyzer->SetEvent(event);
- // Set EPICS event type
- analyzer->SetEpicsEvtType(180);
- // Define crate map
- analyzer->SetCrateMapFileName("MAPS/db_cratemap.dat");
- // Define output ROOT file
- analyzer->SetOutFile(ROOTFileName.Data());
- // Define output DEF-file 
- analyzer->SetOdefFile("DEF-files/HMS/PRODUCTION/hstackana_production_all.def");
- // Define cuts file
- analyzer->SetCutFile("DEF-files/HMS/PRODUCTION/hstackana_production_cuts.def");    // optional
- // File to record cuts accounting information for cuts
- analyzer->SetSummaryFile(Form("REPORT_OUTPUT/HMS/PRODUCTION/summary_production_%d_%d.report", RunNumber, MaxEvent));    // optional
- // Start the actual analysis.
- analyzer->Process(run);
- // Create report file from template.
- analyzer->PrintReport("TEMPLATES/HMS/PRODUCTION/hstackana_production.template",
-		       Form("REPORT_OUTPUT/HMS/PRODUCTION/replay_hms_production_%d_%d.report", RunNumber, MaxEvent));
+  analyzer->SetEvent(event);
+  // Set EPICS event type
+  analyzer->SetEpicsEvtType(180);
+  // Define crate map
+  analyzer->SetCrateMapFileName("MAPS/db_cratemap.dat");
+  // Define output ROOT file
+  analyzer->SetOutFile(ROOTFileName.Data());
+  // Define output DEF-file 
+  analyzer->SetOdefFile("DEF-files/HMS/PRODUCTION/hstackana_production_all.def");
+  // Define cuts file
+  analyzer->SetCutFile("DEF-files/HMS/PRODUCTION/hstackana_production_cuts.def");    // optional
+  // File to record cuts accounting information for cuts
+  analyzer->SetSummaryFile(Form("REPORT_OUTPUT/HMS/PRODUCTION/summary_production_%d_%d.report", RunNumber, MaxEvent));    // optional
+  // Start the actual analysis.
+  analyzer->Process(run);
+  // Create report file from template.
+  analyzer->PrintReport("TEMPLATES/HMS/PRODUCTION/hstackana_production.template",
+			Form("REPORT_OUTPUT/HMS/PRODUCTION/replay_hms_production_%d_%d.report", RunNumber, MaxEvent));
 
 }
diff --git a/SCRIPTS/SHMS/PRODUCTION/replay_production_all_shms.C b/SCRIPTS/SHMS/PRODUCTION/replay_production_all_shms.C
index b078e434caf5b2eeef5580eb10e8e5954f1e7607..8190e7142ed11e603a2b25a89d373ed664663831 100644
--- a/SCRIPTS/SHMS/PRODUCTION/replay_production_all_shms.C
+++ b/SCRIPTS/SHMS/PRODUCTION/replay_production_all_shms.C
@@ -18,12 +18,12 @@ void replay_production_all_shms (Int_t RunNumber = 0, Int_t MaxEvent = 0) {
   // Create file name patterns.
   const char* RunFileNamePattern = "shms_all_%05d.dat";
   vector<TString> pathList;
-    pathList.push_back(".");
-    pathList.push_back("./raw");
-    pathList.push_back("./raw/../raw.copiedtotape");
-    pathList.push_back("./cache");
+  pathList.push_back(".");
+  pathList.push_back("./raw");
+  pathList.push_back("./raw/../raw.copiedtotape");
+  pathList.push_back("./cache");
 
-  const char* ROOTFileNamePattern = "ROOTfiles/shms_replay_production_%d_%d.root";
+  const char* ROOTFileNamePattern = "ROOTfiles/shms_replay_production_all_%d_%d.root";
   
   // Load global parameters
   // Add variables to global list.
@@ -46,8 +46,6 @@ void replay_production_all_shms (Int_t RunNumber = 0, Int_t MaxEvent = 0) {
   // Add trigger apparatus
   THaApparatus* TRG = new THcTrigApp("T", "TRG");
   gHaApps->Add(TRG);
-
-  
   // Add trigger detector to trigger apparatus
   THcTrigDet* shms = new THcTrigDet("shms", "SHMS Trigger Information");
   TRG->AddDetector(shms);
@@ -81,18 +79,17 @@ void replay_production_all_shms (Int_t RunNumber = 0, Int_t MaxEvent = 0) {
   // Add Rastered Beam Apparatus
   THaApparatus* beam = new THcRasteredBeam("P.rb", "Rastered Beamline");
   gHaApps->Add(beam);
-  THaReactionPoint* prp= new THaReactionPoint("P.react"," SHMS reaction point","P","P.rb");
+  THaReactionPoint* prp= new THaReactionPoint("P.react", "SHMS reaction point", "P", "P.rb");
   gHaPhysics->Add(prp);
-  THcExtTarCor* pext = new THcExtTarCor("P.extcor"," HMS extended target corrections","P","P.react");
+  THcExtTarCor* pext = new THcExtTarCor("P.extcor", "HMS extended target corrections", "P", "P.react");
   gHaPhysics->Add(pext);
   // Add Physics Module to calculate primary (scattered beam - usually electrons) kinematics
   THcPrimaryKine* kin = new THcPrimaryKine("P.kin", "SHMS Single Arm Kinematics", "P", "P.rb");
   gHaPhysics->Add(kin);
- THcHodoEff* peff = new THcHodoEff("phodeff"," SHMS hodo efficiency","P.hod");
+  // Add physics module to calculate the hodoscope efficiencies
+  THcHodoEff* peff = new THcHodoEff("phodeff", "SHMS hodo efficiency", "P.hod");
   gHaPhysics->Add(peff);
 
-   
-
   // Add event handler for prestart event 125.
   THcConfigEvtHandler* ev125 = new THcConfigEvtHandler("HC", "Config Event type 125");
   gHaEvtHandlers->Add(ev125);
diff --git a/TEMPLATES/HMS/PRODUCTION/hstackana_production.template b/TEMPLATES/HMS/PRODUCTION/hstackana_production.template
index 060c70cf953f30b7aab762d6bd761e66f29d92e2..abd3e29a39e7eb55aa6670e9a489325d64516d47 100644
--- a/TEMPLATES/HMS/PRODUCTION/hstackana_production.template
+++ b/TEMPLATES/HMS/PRODUCTION/hstackana_production.template
@@ -130,30 +130,29 @@ Total Dead Time (EDTM) : {100.0 - (hcut_edtm_accepted.npassed / H.EDTM.scaler)*1
 = Live/Dead Time Calculations
 =:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:
 
-HMS Computer Live Time : {(TRIG1.npassed / H.hTRIG1.scaler)*100.0:%3.4f} % 
-HMS Computer Dead Time : {100.0 - (TRIG1.npassed / H.hTRIG1.scaler)*100.0:%3.4f} % 
+HMS Computer Live Time : {(hcut_TRIG1.npassed / H.hTRIG1.scaler)*100.0:%3.4f} % 
+HMS Computer Dead Time : {100.0 - (hcut_TRIG1.npassed / H.hTRIG1.scaler)*100.0:%3.4f} % 
 
-Pre-Scaled Ps1 HMS Computer Live Time : {(TRIG1.npassed / (H.hTRIG1.scaler/ghconfig_ti_ps_factors[0]))*100.0:%3.4f} %
-Pre-Scaled Ps1 HMS Computer Dead Time : {100.0 - (TRIG1.npassed / (H.hTRIG1.scaler/ghconfig_ti_ps_factors[0]))*100.0:%3.4f} %
+Pre-Scaled Ps1 HMS Computer Live Time : {(hcut_TRIG1.npassed / (H.hTRIG1.scaler/ghconfig_ti_ps_factors[0]))*100.0:%3.4f} %
+Pre-Scaled Ps1 HMS Computer Dead Time : {100.0 - (hcut_TRIG1.npassed / (H.hTRIG1.scaler/ghconfig_ti_ps_factors[0]))*100.0:%3.4f} %
 
-Pre-Scaled Ps2 HMS Computer Live Time : {(TRIG2.npassed / (H.hTRIG2.scaler/ghconfig_ti_ps_factors[1]))*100.0:%3.4f} %
-Pre-Scaled Ps2 HMS Computer Dead Time : {100.0 - (TRIG2.npassed / (H.hTRIG2.scaler/ghconfig_ti_ps_factors[1]))*100.0:%3.4f} %
+Pre-Scaled Ps2 HMS Computer Live Time : {(hcut_TRIG2.npassed / (H.hTRIG2.scaler/ghconfig_ti_ps_factors[1]))*100.0:%3.4f} %
+Pre-Scaled Ps2 HMS Computer Dead Time : {100.0 - (hcut_TRIG2.npassed / (H.hTRIG2.scaler/ghconfig_ti_ps_factors[1]))*100.0:%3.4f} %
 
-Pre-Scaled Ps3 HMS Computer Live Time : {(TRIG3.npassed / (H.hTRIG3.scaler/ghconfig_ti_ps_factors[2]))*100.0:%3.4f} %
-Pre-Scaled Ps3 HMS Computer Dead Time : {100.0 - (TRIG3.npassed / (H.hTRIG3.scaler/ghconfig_ti_ps_factors[2]))*100.0:%3.4f} %
+Pre-Scaled Ps3 HMS Computer Live Time : {(hcut_TRIG3.npassed / (H.hTRIG3.scaler/ghconfig_ti_ps_factors[2]))*100.0:%3.4f} %
+Pre-Scaled Ps3 HMS Computer Dead Time : {100.0 - (hcut_TRIG3.npassed / (H.hTRIG3.scaler/ghconfig_ti_ps_factors[2]))*100.0:%3.4f} %
 
-Total Live Time (EDTM) : {(edtm_accepted.npassed / H.EDTM.scaler)*100.0:%3.4f} %
-Total Dead Time (EDTM) : {100.0 - (edtm_accepted.npassed / H.EDTM.scaler)*100.0:%3.4f} %
-
-Pre-Scaled Ps1 Total Live Time (EDTM) : {(edtm_accepted.npassed / (H.EDTM.scaler/ghconfig_ti_ps_factors[0]))*100.0:%3.4f} %
-Pre-Scaled Ps1 Total Dead Time (EDTM) : {100.0 - (edtm_accepted.npassed / (H.EDTM.scaler/ghconfig_ti_ps_factors[0]))*100.0:%3.4f} %
+Total Live Time (EDTM) : {(hcut_edtm_accepted.npassed / H.EDTM.scaler)*100.0:%3.4f} %
+Total Dead Time (EDTM) : {100.0 - (hcut_edtm_accepted.npassed / H.EDTM.scaler)*100.0:%3.4f} %
 
-Pre-Scaled Ps2 Total Live Time (EDTM) : {(edtm_accepted.npassed / (H.EDTM.scaler/ghconfig_ti_ps_factors[1]))*100.0:%3.4f} %
-Pre-Scaled Ps2 Total Dead Time (EDTM) : {100.0 - (edtm_accepted.npassed / (H.EDTM.scaler/ghconfig_ti_ps_factors[1]))*100.0:%3.4f} %
+Pre-Scaled Ps1 Total Live Time (EDTM) : {(hcut_edtm_accepted.npassed / (H.EDTM.scaler/ghconfig_ti_ps_factors[0]))*100.0:%3.4f} %
+Pre-Scaled Ps1 Total Dead Time (EDTM) : {100.0 - (hcut_edtm_accepted.npassed / (H.EDTM.scaler/ghconfig_ti_ps_factors[0]))*100.0:%3.4f} %
 
-Pre-Scaled Ps3 Total Live Time (EDTM) : {(edtm_accepted.npassed / (H.EDTM.scaler/ghconfig_ti_ps_factors[2]))*100.0:%3.4f} %
-Pre-Scaled Ps3 Total Dead Time (EDTM) : {100.0 - (edtm_accepted.npassed / (H.EDTM.scaler/ghconfig_ti_ps_factors[2]))*100.0:%3.4f} %
+Pre-Scaled Ps2 Total Live Time (EDTM) : {(hcut_edtm_accepted.npassed / (H.EDTM.scaler/ghconfig_ti_ps_factors[1]))*100.0:%3.4f} %
+Pre-Scaled Ps2 Total Dead Time (EDTM) : {100.0 - (hcut_edtm_accepted.npassed / (H.EDTM.scaler/ghconfig_ti_ps_factors[1]))*100.0:%3.4f} %
 
+Pre-Scaled Ps3 Total Live Time (EDTM) : {(hcut_edtm_accepted.npassed / (H.EDTM.scaler/ghconfig_ti_ps_factors[2]))*100.0:%3.4f} %
+Pre-Scaled Ps3 Total Dead Time (EDTM) : {100.0 - (hcut_edtm_accepted.npassed / (H.EDTM.scaler/ghconfig_ti_ps_factors[2]))*100.0:%3.4f} %
 
 =:=:=:=:=:=:=:
 = Hodoscopes
diff --git a/TEMPLATES/SHMS/PRODUCTION/pstackana_production.template b/TEMPLATES/SHMS/PRODUCTION/pstackana_production.template
index 3c4dcb4f06567e5e95b162a1cf5df8946462f970..e62db3f329c447d4b7f2bd3df52c271d32cf4ac5 100644
--- a/TEMPLATES/SHMS/PRODUCTION/pstackana_production.template
+++ b/TEMPLATES/SHMS/PRODUCTION/pstackana_production.template
@@ -131,29 +131,29 @@ Total Dead Time (EDTM) : {100.0 - (pcut_edtm_accepted.npassed / P.EDTM.scaler)*1
 = Live/Dead Time Calculations
 =:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:
 
-SHMS Computer Live Time : {(TRIG1.npassed / P.pTRIG1.scaler)*100.0:%3.4f} % 
-SHMS Computer Dead Time : {100.0 - (TRIG1.npassed / P.pTRIG1.scaler)*100.0:%3.4f} % 
+SHMS Computer Live Time : {(pcut_TRIG1.npassed / P.pTRIG1.scaler)*100.0:%3.4f} % 
+SHMS Computer Dead Time : {100.0 - (pcut_TRIG1.npassed / P.pTRIG1.scaler)*100.0:%3.4f} % 
 
-Pre-Scaled Ps1 SHMS Computer Live Time : {(TRIG1.npassed / (P.pTRIG1.scaler/gpconfig_ti_ps_factors[0]))*100.0:%3.4f} %
-Pre-Scaled Ps1 SHMS Computer Dead Time : {100.0 - (TRIG1.npassed / (P.pTRIG1.scaler/gpconfig_ti_ps_factors[0]))*100.0:%3.4f} %
+Pre-Scaled Ps1 SHMS Computer Live Time : {(pcut_TRIG1.npassed / (P.pTRIG1.scaler/gpconfig_ti_ps_factors[0]))*100.0:%3.4f} %
+Pre-Scaled Ps1 SHMS Computer Dead Time : {100.0 - (pcut_TRIG1.npassed / (P.pTRIG1.scaler/gpconfig_ti_ps_factors[0]))*100.0:%3.4f} %
 
-Pre-Scaled Ps2 SHMS Computer Live Time : {(TRIG2.npassed / (P.pTRIG2.scaler/gpconfig_ti_ps_factors[1]))*100.0:%3.4f} %
-Pre-Scaled Ps2 SHMS Computer Dead Time : {100.0 - (TRIG2.npassed / (P.pTRIG2.scaler/gpconfig_ti_ps_factors[1]))*100.0:%3.4f} %
+Pre-Scaled Ps2 SHMS Computer Live Time : {(pcut_TRIG2.npassed / (P.pTRIG2.scaler/gpconfig_ti_ps_factors[1]))*100.0:%3.4f} %
+Pre-Scaled Ps2 SHMS Computer Dead Time : {100.0 - (pcut_TRIG2.npassed / (P.pTRIG2.scaler/gpconfig_ti_ps_factors[1]))*100.0:%3.4f} %
 
-Pre-Scaled Ps3 SHMS Computer Live Time : {(TRIG3.npassed / (P.pTRIG3.scaler/gpconfig_ti_ps_factors[2]))*100.0:%3.4f} %
-Pre-Scaled Ps3 SHMS Computer Dead Time : {100.0 - (TRIG3.npassed / (P.pTRIG3.scaler/gpconfig_ti_ps_factors[2]))*100.0:%3.4f} %
+Pre-Scaled Ps3 SHMS Computer Live Time : {(pcut_TRIG3.npassed / (P.pTRIG3.scaler/gpconfig_ti_ps_factors[2]))*100.0:%3.4f} %
+Pre-Scaled Ps3 SHMS Computer Dead Time : {100.0 - (pcut_TRIG3.npassed / (P.pTRIG3.scaler/gpconfig_ti_ps_factors[2]))*100.0:%3.4f} %
 
-Total Live Time (EDTM) : {(edtm_accepted.npassed / P.EDTM.scaler)*100.0:%3.4f} %
-Total Dead Time (EDTM) : {100.0 - (edtm_accepted.npassed / P.EDTM.scaler)*100.0:%3.4f} %
+Total Live Time (EDTM) : {(pcut_edtm_accepted.npassed / P.EDTM.scaler)*100.0:%3.4f} %
+Total Dead Time (EDTM) : {100.0 - (pcut_edtm_accepted.npassed / P.EDTM.scaler)*100.0:%3.4f} %
 
-Pre-Scaled Ps1 Total Live Time (EDTM) : {(edtm_accepted.npassed / (P.EDTM.scaler/gpconfig_ti_ps_factors[0]))*100.0:%3.4f} %
-Pre-Scaled Ps1 Total Dead Time (EDTM) : {100.0 - (edtm_accepted.npassed / (P.EDTM.scaler/gpconfig_ti_ps_factors[0]))*100.0:%3.4f} %
+Pre-Scaled Ps1 Total Live Time (EDTM) : {(pcut_edtm_accepted.npassed / (P.EDTM.scaler/gpconfig_ti_ps_factors[0]))*100.0:%3.4f} %
+Pre-Scaled Ps1 Total Dead Time (EDTM) : {100.0 - (pcut_edtm_accepted.npassed / (P.EDTM.scaler/gpconfig_ti_ps_factors[0]))*100.0:%3.4f} %
 
-Pre-Scaled Ps2 Total Live Time (EDTM) : {(edtm_accepted.npassed / (P.EDTM.scaler/gpconfig_ti_ps_factors[1]))*100.0:%3.4f} %
-Pre-Scaled Ps2 Total Dead Time (EDTM) : {100.0 - (edtm_accepted.npassed / (P.EDTM.scaler/gpconfig_ti_ps_factors[1]))*100.0:%3.4f} %
+Pre-Scaled Ps2 Total Live Time (EDTM) : {(pcut_edtm_accepted.npassed / (P.EDTM.scaler/gpconfig_ti_ps_factors[1]))*100.0:%3.4f} %
+Pre-Scaled Ps2 Total Dead Time (EDTM) : {100.0 - (pcut_edtm_accepted.npassed / (P.EDTM.scaler/gpconfig_ti_ps_factors[1]))*100.0:%3.4f} %
 
-Pre-Scaled Ps3 Total Live Time (EDTM) : {(edtm_accepted.npassed / (P.EDTM.scaler/gpconfig_ti_ps_factors[2]))*100.0:%3.4f} %
-Pre-Scaled Ps3 Total Dead Time (EDTM) : {100.0 - (edtm_accepted.npassed / (P.EDTM.scaler/gpconfig_ti_ps_factors[2]))*100.0:%3.4f} %
+Pre-Scaled Ps3 Total Live Time (EDTM) : {(pcut_edtm_accepted.npassed / (P.EDTM.scaler/gpconfig_ti_ps_factors[2]))*100.0:%3.4f} %
+Pre-Scaled Ps3 Total Dead Time (EDTM) : {100.0 - (pcut_edtm_accepted.npassed / (P.EDTM.scaler/gpconfig_ti_ps_factors[2]))*100.0:%3.4f} %
 
 =:=:=:=:=:=:=:
 = Hodoscopes
@@ -166,7 +166,6 @@ P2Y : {P.S2Y.scaler} [ {(P.S2Y.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ] AND b
 
 P1XP1Y : {P.S1XS1Y.scaler} [ {(P.S1XS1Y.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ] AND between P1X and P1Y planes 
 P2XP2Y : {P.S2XS2Y.scaler} [ {(P.S2XS2Y.scaler/P.1Mhz.scalerTime)/1000.:%.3f} kHz ] AND between P2X and P2Y planes                                        
-
 =:=:=:=:=:=:=:=:=:=:=:=:=
 = Aerogel, HGC, NGC, CAL
 =:=:=:=:=:=:=:=:=:=:=:=:=