From 2ffe4293118b9f43234ce77c7d0e7f1c347497cf Mon Sep 17 00:00:00 2001
From: Eric Pooser <pooser@jlab.org>
Date: Wed, 19 Jul 2017 14:41:42 -0400
Subject: [PATCH] Pooser report file work (#176)
* Include trigger apparatus to scaler replay
* Add rate, live time, and dead time to scalers template
* Add rate, live time, and dead time to all template
* Rename ALL to PROD for production
* Move test stand DEF-files into TEST_STAND directory
---
DEF-files/SHMS/EPICS/epics_short.def | 3 +--
.../SHMS/{ALL => PROD}/AERO/paero_histos.def | 0
.../SHMS/{ALL => PROD}/BLOCK/pblock_vars.def | 0
DEF-files/SHMS/{ALL => PROD}/CAL/pcal_histos.def | 0
DEF-files/SHMS/{ALL => PROD}/DC/pdc_histos.def | 0
.../SHMS/{ALL => PROD}/EPICS/pepics_vars.def | 0
.../SHMS/{ALL => PROD}/HGCER/phgcer_histos.def | 0
.../SHMS/{ALL => PROD}/HODO/phodo_histos.def | 0
.../SHMS/{ALL => PROD}/NGCER/pngcer_histos.def | 0
.../SHMS/{ALL => PROD}/TRIG/ptrig_histos.def | 0
DEF-files/SHMS/{ALL => PROD}/merge_def_files.py | 0
DEF-files/SHMS/{ALL => PROD}/merge_list.txt | 0
DEF-files/SHMS/{ALL => PROD}/pstackana_all.def | 0
.../SHMS/{ALL => PROD}/pstackana_all_cuts.def | 0
.../SHMS/{ => TEST_STANDS}/AERO/paeroana.def | 0
.../{ => TEST_STANDS}/AERO/paeroana_cuts.def | 0
DEF-files/SHMS/{ => TEST_STANDS}/CAL/pcalana.def | 0
.../SHMS/{ => TEST_STANDS}/CAL/pcalana_cuts.def | 0
DEF-files/SHMS/{ => TEST_STANDS}/DC/pdcana.def | 0
.../SHMS/{ => TEST_STANDS}/DC/pdcana_cuts.def | 0
.../SHMS/{ => TEST_STANDS}/HGCER/phgcerana.def | 0
.../{ => TEST_STANDS}/HGCER/phgcerana_cuts.def | 0
.../SHMS/{ => TEST_STANDS}/HODO/phodoana.def | 0
.../{ => TEST_STANDS}/HODO/phodoana_cuts.def | 0
.../SHMS/{ => TEST_STANDS}/NGCER/pngcerana.def | 0
.../{ => TEST_STANDS}/NGCER/pngcerana_cuts.def | 0
.../SHMS/{ => TEST_STANDS}/TRIG/ptrigana.def | 0
.../{ => TEST_STANDS}/TRIG/ptrigana_cuts.def | 0
SCRIPTS/SHMS/SCALERS/replay_shms_scalers.C | 10 ++++++++++
.../SHMS/TEST_STANDS/replay_paero_test_stand.C | 4 ++--
.../SHMS/TEST_STANDS/replay_pcal_test_stand.C | 4 ++--
SCRIPTS/SHMS/TEST_STANDS/replay_pdc_test_stand.C | 4 ++--
.../SHMS/TEST_STANDS/replay_phgcer_test_stand.C | 4 ++--
.../SHMS/TEST_STANDS/replay_phodo_test_stand.C | 4 ++--
.../SHMS/TEST_STANDS/replay_pngcer_test_stand.C | 4 ++--
.../SHMS/TEST_STANDS/replay_ptrig_test_stand.C | 4 ++--
TEMPLATES/SHMS/ALL/pstackana_all.template | 16 ++++++++++------
TEMPLATES/SHMS/SCALERS/pscalers.template | 15 ++++++++++-----
38 files changed, 45 insertions(+), 27 deletions(-)
rename DEF-files/SHMS/{ALL => PROD}/AERO/paero_histos.def (100%)
rename DEF-files/SHMS/{ALL => PROD}/BLOCK/pblock_vars.def (100%)
rename DEF-files/SHMS/{ALL => PROD}/CAL/pcal_histos.def (100%)
rename DEF-files/SHMS/{ALL => PROD}/DC/pdc_histos.def (100%)
rename DEF-files/SHMS/{ALL => PROD}/EPICS/pepics_vars.def (100%)
rename DEF-files/SHMS/{ALL => PROD}/HGCER/phgcer_histos.def (100%)
rename DEF-files/SHMS/{ALL => PROD}/HODO/phodo_histos.def (100%)
rename DEF-files/SHMS/{ALL => PROD}/NGCER/pngcer_histos.def (100%)
rename DEF-files/SHMS/{ALL => PROD}/TRIG/ptrig_histos.def (100%)
rename DEF-files/SHMS/{ALL => PROD}/merge_def_files.py (100%)
rename DEF-files/SHMS/{ALL => PROD}/merge_list.txt (100%)
rename DEF-files/SHMS/{ALL => PROD}/pstackana_all.def (100%)
rename DEF-files/SHMS/{ALL => PROD}/pstackana_all_cuts.def (100%)
rename DEF-files/SHMS/{ => TEST_STANDS}/AERO/paeroana.def (100%)
rename DEF-files/SHMS/{ => TEST_STANDS}/AERO/paeroana_cuts.def (100%)
rename DEF-files/SHMS/{ => TEST_STANDS}/CAL/pcalana.def (100%)
rename DEF-files/SHMS/{ => TEST_STANDS}/CAL/pcalana_cuts.def (100%)
rename DEF-files/SHMS/{ => TEST_STANDS}/DC/pdcana.def (100%)
rename DEF-files/SHMS/{ => TEST_STANDS}/DC/pdcana_cuts.def (100%)
rename DEF-files/SHMS/{ => TEST_STANDS}/HGCER/phgcerana.def (100%)
rename DEF-files/SHMS/{ => TEST_STANDS}/HGCER/phgcerana_cuts.def (100%)
rename DEF-files/SHMS/{ => TEST_STANDS}/HODO/phodoana.def (100%)
rename DEF-files/SHMS/{ => TEST_STANDS}/HODO/phodoana_cuts.def (100%)
rename DEF-files/SHMS/{ => TEST_STANDS}/NGCER/pngcerana.def (100%)
rename DEF-files/SHMS/{ => TEST_STANDS}/NGCER/pngcerana_cuts.def (100%)
rename DEF-files/SHMS/{ => TEST_STANDS}/TRIG/ptrigana.def (100%)
rename DEF-files/SHMS/{ => TEST_STANDS}/TRIG/ptrigana_cuts.def (100%)
diff --git a/DEF-files/SHMS/EPICS/epics_short.def b/DEF-files/SHMS/EPICS/epics_short.def
index b1e773c1..82f6c982 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 67c5feb8..ac3d1785 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 fc1e21d9..572c21ff 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 43930535..ee903f4e 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 271ca28c..cb8a1afc 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 6e5f31ef..d21a487b 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 eafbafda..500f8563 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 986ba4aa..312d157b 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 62854cfc..96d5a5e4 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 68a6952b..8a84c311 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 15680c58..44fe4f23 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} %
--
GitLab