diff --git a/DEF-files/SHMS/EPICS/epics_short.def b/DEF-files/SHMS/EPICS/epics_short.def
index b1e773c18746eb72e62fd1ba406f3b7e2342a6dd..82f6c982308ff0454cdd277751e82e6edd5c36c0 100644
--- a/DEF-files/SHMS/EPICS/epics_short.def
+++ b/DEF-files/SHMS/EPICS/epics_short.def
@@ -1,5 +1,4 @@
-# See $ANALYZER/examples/output_example.def for examples
-
+block T.shms.*
 
 begin epics
 IBC3H00CRCUR4
diff --git a/DEF-files/SHMS/ALL/AERO/paero_histos.def b/DEF-files/SHMS/PROD/AERO/paero_histos.def
similarity index 100%
rename from DEF-files/SHMS/ALL/AERO/paero_histos.def
rename to DEF-files/SHMS/PROD/AERO/paero_histos.def
diff --git a/DEF-files/SHMS/ALL/BLOCK/pblock_vars.def b/DEF-files/SHMS/PROD/BLOCK/pblock_vars.def
similarity index 100%
rename from DEF-files/SHMS/ALL/BLOCK/pblock_vars.def
rename to DEF-files/SHMS/PROD/BLOCK/pblock_vars.def
diff --git a/DEF-files/SHMS/ALL/CAL/pcal_histos.def b/DEF-files/SHMS/PROD/CAL/pcal_histos.def
similarity index 100%
rename from DEF-files/SHMS/ALL/CAL/pcal_histos.def
rename to DEF-files/SHMS/PROD/CAL/pcal_histos.def
diff --git a/DEF-files/SHMS/ALL/DC/pdc_histos.def b/DEF-files/SHMS/PROD/DC/pdc_histos.def
similarity index 100%
rename from DEF-files/SHMS/ALL/DC/pdc_histos.def
rename to DEF-files/SHMS/PROD/DC/pdc_histos.def
diff --git a/DEF-files/SHMS/ALL/EPICS/pepics_vars.def b/DEF-files/SHMS/PROD/EPICS/pepics_vars.def
similarity index 100%
rename from DEF-files/SHMS/ALL/EPICS/pepics_vars.def
rename to DEF-files/SHMS/PROD/EPICS/pepics_vars.def
diff --git a/DEF-files/SHMS/ALL/HGCER/phgcer_histos.def b/DEF-files/SHMS/PROD/HGCER/phgcer_histos.def
similarity index 100%
rename from DEF-files/SHMS/ALL/HGCER/phgcer_histos.def
rename to DEF-files/SHMS/PROD/HGCER/phgcer_histos.def
diff --git a/DEF-files/SHMS/ALL/HODO/phodo_histos.def b/DEF-files/SHMS/PROD/HODO/phodo_histos.def
similarity index 100%
rename from DEF-files/SHMS/ALL/HODO/phodo_histos.def
rename to DEF-files/SHMS/PROD/HODO/phodo_histos.def
diff --git a/DEF-files/SHMS/ALL/NGCER/pngcer_histos.def b/DEF-files/SHMS/PROD/NGCER/pngcer_histos.def
similarity index 100%
rename from DEF-files/SHMS/ALL/NGCER/pngcer_histos.def
rename to DEF-files/SHMS/PROD/NGCER/pngcer_histos.def
diff --git a/DEF-files/SHMS/ALL/TRIG/ptrig_histos.def b/DEF-files/SHMS/PROD/TRIG/ptrig_histos.def
similarity index 100%
rename from DEF-files/SHMS/ALL/TRIG/ptrig_histos.def
rename to DEF-files/SHMS/PROD/TRIG/ptrig_histos.def
diff --git a/DEF-files/SHMS/ALL/merge_def_files.py b/DEF-files/SHMS/PROD/merge_def_files.py
similarity index 100%
rename from DEF-files/SHMS/ALL/merge_def_files.py
rename to DEF-files/SHMS/PROD/merge_def_files.py
diff --git a/DEF-files/SHMS/ALL/merge_list.txt b/DEF-files/SHMS/PROD/merge_list.txt
similarity index 100%
rename from DEF-files/SHMS/ALL/merge_list.txt
rename to DEF-files/SHMS/PROD/merge_list.txt
diff --git a/DEF-files/SHMS/ALL/pstackana_all.def b/DEF-files/SHMS/PROD/pstackana_all.def
similarity index 100%
rename from DEF-files/SHMS/ALL/pstackana_all.def
rename to DEF-files/SHMS/PROD/pstackana_all.def
diff --git a/DEF-files/SHMS/ALL/pstackana_all_cuts.def b/DEF-files/SHMS/PROD/pstackana_all_cuts.def
similarity index 100%
rename from DEF-files/SHMS/ALL/pstackana_all_cuts.def
rename to DEF-files/SHMS/PROD/pstackana_all_cuts.def
diff --git a/DEF-files/SHMS/AERO/paeroana.def b/DEF-files/SHMS/TEST_STANDS/AERO/paeroana.def
similarity index 100%
rename from DEF-files/SHMS/AERO/paeroana.def
rename to DEF-files/SHMS/TEST_STANDS/AERO/paeroana.def
diff --git a/DEF-files/SHMS/AERO/paeroana_cuts.def b/DEF-files/SHMS/TEST_STANDS/AERO/paeroana_cuts.def
similarity index 100%
rename from DEF-files/SHMS/AERO/paeroana_cuts.def
rename to DEF-files/SHMS/TEST_STANDS/AERO/paeroana_cuts.def
diff --git a/DEF-files/SHMS/CAL/pcalana.def b/DEF-files/SHMS/TEST_STANDS/CAL/pcalana.def
similarity index 100%
rename from DEF-files/SHMS/CAL/pcalana.def
rename to DEF-files/SHMS/TEST_STANDS/CAL/pcalana.def
diff --git a/DEF-files/SHMS/CAL/pcalana_cuts.def b/DEF-files/SHMS/TEST_STANDS/CAL/pcalana_cuts.def
similarity index 100%
rename from DEF-files/SHMS/CAL/pcalana_cuts.def
rename to DEF-files/SHMS/TEST_STANDS/CAL/pcalana_cuts.def
diff --git a/DEF-files/SHMS/DC/pdcana.def b/DEF-files/SHMS/TEST_STANDS/DC/pdcana.def
similarity index 100%
rename from DEF-files/SHMS/DC/pdcana.def
rename to DEF-files/SHMS/TEST_STANDS/DC/pdcana.def
diff --git a/DEF-files/SHMS/DC/pdcana_cuts.def b/DEF-files/SHMS/TEST_STANDS/DC/pdcana_cuts.def
similarity index 100%
rename from DEF-files/SHMS/DC/pdcana_cuts.def
rename to DEF-files/SHMS/TEST_STANDS/DC/pdcana_cuts.def
diff --git a/DEF-files/SHMS/HGCER/phgcerana.def b/DEF-files/SHMS/TEST_STANDS/HGCER/phgcerana.def
similarity index 100%
rename from DEF-files/SHMS/HGCER/phgcerana.def
rename to DEF-files/SHMS/TEST_STANDS/HGCER/phgcerana.def
diff --git a/DEF-files/SHMS/HGCER/phgcerana_cuts.def b/DEF-files/SHMS/TEST_STANDS/HGCER/phgcerana_cuts.def
similarity index 100%
rename from DEF-files/SHMS/HGCER/phgcerana_cuts.def
rename to DEF-files/SHMS/TEST_STANDS/HGCER/phgcerana_cuts.def
diff --git a/DEF-files/SHMS/HODO/phodoana.def b/DEF-files/SHMS/TEST_STANDS/HODO/phodoana.def
similarity index 100%
rename from DEF-files/SHMS/HODO/phodoana.def
rename to DEF-files/SHMS/TEST_STANDS/HODO/phodoana.def
diff --git a/DEF-files/SHMS/HODO/phodoana_cuts.def b/DEF-files/SHMS/TEST_STANDS/HODO/phodoana_cuts.def
similarity index 100%
rename from DEF-files/SHMS/HODO/phodoana_cuts.def
rename to DEF-files/SHMS/TEST_STANDS/HODO/phodoana_cuts.def
diff --git a/DEF-files/SHMS/NGCER/pngcerana.def b/DEF-files/SHMS/TEST_STANDS/NGCER/pngcerana.def
similarity index 100%
rename from DEF-files/SHMS/NGCER/pngcerana.def
rename to DEF-files/SHMS/TEST_STANDS/NGCER/pngcerana.def
diff --git a/DEF-files/SHMS/NGCER/pngcerana_cuts.def b/DEF-files/SHMS/TEST_STANDS/NGCER/pngcerana_cuts.def
similarity index 100%
rename from DEF-files/SHMS/NGCER/pngcerana_cuts.def
rename to DEF-files/SHMS/TEST_STANDS/NGCER/pngcerana_cuts.def
diff --git a/DEF-files/SHMS/TRIG/ptrigana.def b/DEF-files/SHMS/TEST_STANDS/TRIG/ptrigana.def
similarity index 100%
rename from DEF-files/SHMS/TRIG/ptrigana.def
rename to DEF-files/SHMS/TEST_STANDS/TRIG/ptrigana.def
diff --git a/DEF-files/SHMS/TRIG/ptrigana_cuts.def b/DEF-files/SHMS/TEST_STANDS/TRIG/ptrigana_cuts.def
similarity index 100%
rename from DEF-files/SHMS/TRIG/ptrigana_cuts.def
rename to DEF-files/SHMS/TEST_STANDS/TRIG/ptrigana_cuts.def
diff --git a/SCRIPTS/SHMS/SCALERS/replay_shms_scalers.C b/SCRIPTS/SHMS/SCALERS/replay_shms_scalers.C
index 67c5feb8e6ffd0d3a1150c1aaf658f26d8ce3de8..ac3d1785571236a3e4025ff9d6e04844d5dfce24 100644
--- a/SCRIPTS/SHMS/SCALERS/replay_shms_scalers.C
+++ b/SCRIPTS/SHMS/SCALERS/replay_shms_scalers.C
@@ -29,10 +29,20 @@ void replay_shms_scalers (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 SHMS trigger configuration
+  gHcParms->Load("PARAM/TRIG/tshms.param");
+
   // Load the Hall C detector map
   gHcDetectorMap = new THcDetectorMap();
   gHcDetectorMap->Load("MAPS/SHMS/DETEC/STACK/shms_stack.map");
 
+  // 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);
+
   // Add handler for EPICS events
   THaEpicsEvtHandler *hcepics = new THaEpicsEvtHandler("epics", "HC EPICS event type 180");
   gHaEvtHandlers->Add(hcepics);
diff --git a/SCRIPTS/SHMS/TEST_STANDS/replay_paero_test_stand.C b/SCRIPTS/SHMS/TEST_STANDS/replay_paero_test_stand.C
index fc1e21d97cee1a0061befe9ee63d54e362e6c376..572c21ff27ed440013987eb3c8bbfac2c0c2850d 100644
--- a/SCRIPTS/SHMS/TEST_STANDS/replay_paero_test_stand.C
+++ b/SCRIPTS/SHMS/TEST_STANDS/replay_paero_test_stand.C
@@ -89,8 +89,8 @@ void replay_paero_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
  analyzer->SetEvent(event);
  analyzer->SetCrateMapFileName("MAPS/db_cratemap.dat");
  analyzer->SetOutFile(ROOTFileName.Data());
- analyzer->SetOdefFile("DEF-files/SHMS/AERO/paeroana.def");
- analyzer->SetCutFile("DEF-files/SHMS/AERO/paeroana_cuts.def");    // optional
+ analyzer->SetOdefFile("DEF-files/SHMS/TEST_STANDS/AERO/paeroana.def");
+ analyzer->SetCutFile("DEF-files/SHMS/TEST_STANDS/AERO/paeroana_cuts.def");    // optional
 
  // File to record cuts accounting information
  //analyzer->SetSummaryFile("summary_example.log");    // optional
diff --git a/SCRIPTS/SHMS/TEST_STANDS/replay_pcal_test_stand.C b/SCRIPTS/SHMS/TEST_STANDS/replay_pcal_test_stand.C
index 439305355a754ad4db09e121fa2ee27e0dbe6e32..ee903f4e10a2f207090c67e676cc3ad86b9f03b7 100644
--- a/SCRIPTS/SHMS/TEST_STANDS/replay_pcal_test_stand.C
+++ b/SCRIPTS/SHMS/TEST_STANDS/replay_pcal_test_stand.C
@@ -79,8 +79,8 @@ void replay_pcal_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
  analyzer->SetEvent(event);
  analyzer->SetCrateMapFileName("MAPS/db_cratemap.dat");
  analyzer->SetOutFile(ROOTFileName.Data());
- analyzer->SetOdefFile("DEF-files/SHMS/CAL/pcalana.def");
- analyzer->SetCutFile("DEF-files/SHMS/CAL/pcalana_cuts.def");    // optional
+ analyzer->SetOdefFile("DEF-files/SHMS/TEST_STANDS/CAL/pcalana.def");
+ analyzer->SetCutFile("DEF-files/SHMS/TEST_STANDS/CAL/pcalana_cuts.def");    // optional
 
  // File to record cuts accounting information
  //analyzer->SetSummaryFile("summary_example.log");    // optional
diff --git a/SCRIPTS/SHMS/TEST_STANDS/replay_pdc_test_stand.C b/SCRIPTS/SHMS/TEST_STANDS/replay_pdc_test_stand.C
index 271ca28cd4fb8699692260c9785ab12a511840f5..cb8a1afc9c622ea37f0632849f4e024be481c7c0 100644
--- a/SCRIPTS/SHMS/TEST_STANDS/replay_pdc_test_stand.C
+++ b/SCRIPTS/SHMS/TEST_STANDS/replay_pdc_test_stand.C
@@ -93,8 +93,8 @@ void replay_pdc_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
  analyzer->SetEvent(event);
  analyzer->SetCrateMapFileName("MAPS/db_cratemap.dat");
  analyzer->SetOutFile(ROOTFileName.Data());
- analyzer->SetOdefFile("DEF-files/SHMS/DC/pdcana.def");
- analyzer->SetCutFile("DEF-files/SHMS/DC/pdcana_cuts.def");    // optional
+ analyzer->SetOdefFile("DEF-files/SHMS/TEST_STANDS/DC/pdcana.def");
+ analyzer->SetCutFile("DEF-files/SHMS/TEST_STANDS/DC/pdcana_cuts.def");    // optional
 
  // File to record cuts accounting information
  //analyzer->SetSummaryFile("summary_example.log");    // optional
diff --git a/SCRIPTS/SHMS/TEST_STANDS/replay_phgcer_test_stand.C b/SCRIPTS/SHMS/TEST_STANDS/replay_phgcer_test_stand.C
index 6e5f31ef811b3d61f8b356a60f828e98ef4b4ba9..d21a487b1eccd579be30fa444e49584e9fbac868 100644
--- a/SCRIPTS/SHMS/TEST_STANDS/replay_phgcer_test_stand.C
+++ b/SCRIPTS/SHMS/TEST_STANDS/replay_phgcer_test_stand.C
@@ -88,8 +88,8 @@ void replay_phgcer_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
  analyzer->SetEvent(event);
  analyzer->SetCrateMapFileName("MAPS/db_cratemap.dat");
  analyzer->SetOutFile(ROOTFileName.Data());
- analyzer->SetOdefFile("DEF-files/SHMS/HGCER/phgcerana.def");
- analyzer->SetCutFile("DEF-files/SHMS/HGCER/phgcerana_cuts.def");    // optional
+ analyzer->SetOdefFile("DEF-files/SHMS/TEST_STANDS/HGCER/phgcerana.def");
+ analyzer->SetCutFile("DEF-files/SHMS/TEST_STANDS/HGCER/phgcerana_cuts.def");    // optional
 
  // File to record cuts accounting information
  //analyzer->SetSummaryFile("summary_example.log");    // optional
diff --git a/SCRIPTS/SHMS/TEST_STANDS/replay_phodo_test_stand.C b/SCRIPTS/SHMS/TEST_STANDS/replay_phodo_test_stand.C
index eafbafda18f4350ad226df12a663487e2da0d7af..500f8563159e12672176770e5a3bfcb71b3f32a2 100644
--- a/SCRIPTS/SHMS/TEST_STANDS/replay_phodo_test_stand.C
+++ b/SCRIPTS/SHMS/TEST_STANDS/replay_phodo_test_stand.C
@@ -91,8 +91,8 @@ void replay_phodo_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
  analyzer->SetEvent(event);
  analyzer->SetCrateMapFileName("MAPS/db_cratemap.dat");
  analyzer->SetOutFile(ROOTFileName.Data());
- analyzer->SetOdefFile("DEF-files/SHMS/HODO/phodoana.def");
- analyzer->SetCutFile("DEF-files/SHMS/HODO/phodoana_cuts.def");    // optional
+ analyzer->SetOdefFile("DEF-files/SHMS/TEST_STANDS/HODO/phodoana.def");
+ analyzer->SetCutFile("DEF-files/SHMS/TEST_STANDS/HODO/phodoana_cuts.def");    // optional
 
  // File to record cuts accounting information
  //analyzer->SetSummaryFile("summary_example.log");    // optional
diff --git a/SCRIPTS/SHMS/TEST_STANDS/replay_pngcer_test_stand.C b/SCRIPTS/SHMS/TEST_STANDS/replay_pngcer_test_stand.C
index 986ba4aa275272cbcde454876ca6a4e2eb4fb44c..312d157bbed566268be9fbbb2bfbfbe1808b9f5f 100644
--- a/SCRIPTS/SHMS/TEST_STANDS/replay_pngcer_test_stand.C
+++ b/SCRIPTS/SHMS/TEST_STANDS/replay_pngcer_test_stand.C
@@ -88,8 +88,8 @@ void replay_pngcer_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
  analyzer->SetEvent(event);
  analyzer->SetCrateMapFileName("MAPS/db_cratemap.dat");
  analyzer->SetOutFile(ROOTFileName.Data());
- analyzer->SetOdefFile("DEF-files/SHMS/NGCER/pngcerana.def");
- analyzer->SetCutFile("DEF-files/SHMS/NGCER/pngcerana_cuts.def");    // optional
+ analyzer->SetOdefFile("DEF-files/SHMS/TEST_STANDS/NGCER/pngcerana.def");
+ analyzer->SetCutFile("DEF-files/SHMS/TEST_STANDS/NGCER/pngcerana_cuts.def");    // optional
 
  // File to record cuts accounting information
  //analyzer->SetSummaryFile("summary_example.log");    // optional
diff --git a/SCRIPTS/SHMS/TEST_STANDS/replay_ptrig_test_stand.C b/SCRIPTS/SHMS/TEST_STANDS/replay_ptrig_test_stand.C
index 62854cfcc0b352b516f8417f055fc42527d19bf2..96d5a5e4186e0517c0d849d94555d0531df86069 100644
--- a/SCRIPTS/SHMS/TEST_STANDS/replay_ptrig_test_stand.C
+++ b/SCRIPTS/SHMS/TEST_STANDS/replay_ptrig_test_stand.C
@@ -81,8 +81,8 @@ void replay_ptrig_test_stand(Int_t RunNumber=0, Int_t MaxEvent=0) {
  analyzer->SetEvent(event);
  analyzer->SetCrateMapFileName("MAPS/db_cratemap.dat");
  analyzer->SetOutFile(ROOTFileName.Data());
- analyzer->SetOdefFile("DEF-files/SHMS/TRIG/ptrigana.def");
- analyzer->SetCutFile("DEF-files/SHMS/TRIG/ptrigana_cuts.def");    // optional
+ analyzer->SetOdefFile("DEF-files/SHMS/TEST_STANDS/TRIG/ptrigana.def");
+ analyzer->SetCutFile("DEF-files/SHMS/TEST_STANDS/TRIG/ptrigana_cuts.def");    // optional
 
  // File to record cuts accounting information
  //analyzer->SetSummaryFile("summary_example.log");    // optional
diff --git a/TEMPLATES/SHMS/ALL/pstackana_all.template b/TEMPLATES/SHMS/ALL/pstackana_all.template
index 68a6952bd4786b744e7f6d2b91cacb998286cb65..8a84c311e7099535c7bfcff7a95f2b09aae99a75 100644
--- a/TEMPLATES/SHMS/ALL/pstackana_all.template
+++ b/TEMPLATES/SHMS/ALL/pstackana_all.template
@@ -1,13 +1,17 @@
+Run #: {gen_run_number}
 
-Run #{gen_run_number}
+Run Time  : {PS1Mhz}  {PS1Mhz/1000000.} sec
 
-Run Time: {PS1Mhz}  {PS1Mhz/1000000.} sec
+BCM1  : {(PSBCM1r-250000)/(4673):%3.3f} uA      Total charge = {(PSBCM1r-250000) / (4673)*PS1Mhz/1000000.:%7.3f} uC
+BCM2  : {(PSBCM2r-250000)/(3954):%3.3f} uA      Total charge = {(PSBCM2r-250000) / (3954)*PS1Mhz/1000000.:%7.3f} uC 
+Unser : {(PSUnserr-393000)/(4000):%3.3f} uA     Total charge = {(PSUnserr-393000) / (4000)*PS1Mhz/1000000.:%7.3f} uC
 
-BCM1  : {(PSBCM1r-250000)/(4673)} uA      Total charge = {(PSBCM1r-250000) / (4673)*PS1Mhz/1000000.} uC
-BCM2  : {(PSBCM2r-250000)/(3954)} uA      Total charge = {(PSBCM2r-250000) / (3954)*PS1Mhz/1000000.} uC 
-Unser : {(PSUnserr-393000)/(4000)} uA     Total charge = {(PSUnserr-393000) / (4000)*PS1Mhz/1000000.} uC
+All triggers  :  {all_trigs.npassed}
 
-All triggers:  {all_trigs.npassed}
+Rate  :  {PSsTrigr/1000.:%7.3f} kHz
+
+Live Time : {(all_trigs.npassed / PSsTrig)*100.0:%3.2f} %
+Dead Time : {100.0 - (all_trigs.npassed / PSsTrig)*100.0:%3.2f} %
 
 good_S1_time         Counts: {good_S1_time.npassed}     / all_trigs : {good_S1_time.npassed / all_trigs.npassed}       
 good_S2X_time        Counts: {good_S2X_time.npassed}    / all_trigs : {good_S2X_time.npassed / all_trigs.npassed}    
diff --git a/TEMPLATES/SHMS/SCALERS/pscalers.template b/TEMPLATES/SHMS/SCALERS/pscalers.template
index 15680c58fb26dd5adce792b91d8dbe659834da06..44fe4f2315798c79b49dfc07a5a6047f6d765629 100644
--- a/TEMPLATES/SHMS/SCALERS/pscalers.template
+++ b/TEMPLATES/SHMS/SCALERS/pscalers.template
@@ -1,9 +1,14 @@
-Run #{gen_run_number}
+Run #: {gen_run_number}
 
 Run Time  : {PS1Mhz}  {PS1Mhz/1000000.} sec
 
-BCM1  : {(PSBCM1r-250000)/(4673)} uA      Total charge = {(PSBCM1r-250000) / (4673)*PS1Mhz/1000000.} uC
-BCM2  : {(PSBCM2r-250000)/(3954)} uA      Total charge = {(PSBCM2r-250000) / (3954)*PS1Mhz/1000000.} uC 
-Unser : {(PSUnserr-393000)/(4000)} uA     Total charge = {(PSUnserr-393000) / (4000)*PS1Mhz/1000000.} uC
+BCM1  : {(PSBCM1r-250000)/(4673):%3.3f} uA      Total charge = {(PSBCM1r-250000) / (4673)*PS1Mhz/1000000.:%7.3f} uC
+BCM2  : {(PSBCM2r-250000)/(3954):%3.3f} uA      Total charge = {(PSBCM2r-250000) / (3954)*PS1Mhz/1000000.:%7.3f} uC 
+Unser : {(PSUnserr-393000)/(4000):%3.3f} uA     Total charge = {(PSUnserr-393000) / (4000)*PS1Mhz/1000000.:%7.3f} uC
 
-All triggers  :  {all_trigs.npassed}
\ No newline at end of file
+All triggers  :  {all_trigs.npassed}
+
+Rate  :  {PSsTrigr/1000.:%7.3f} kHz
+
+Live Time : {(all_trigs.npassed / PSsTrig)*100.0:%3.2f} %
+Dead Time : {100.0 - (all_trigs.npassed / PSsTrig)*100.0:%3.2f} %