From 89d1932c1a0997ab989551ed3252b93de8b5cdeb Mon Sep 17 00:00:00 2001
From: Eric Pooser <pooser@jlab.org>
Date: Wed, 19 Jul 2017 15:30:20 -0400
Subject: [PATCH] Pooser report file work (#178)
* 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
* Change from PROD to PRODUCTION to be consistant
---
.../{PROD => PRODUCTION}/AERO/paero_histos.def | 0
.../{PROD => PRODUCTION}/BLOCK/pblock_vars.def | 0
.../SHMS/{PROD => PRODUCTION}/CAL/pcal_histos.def | 0
.../SHMS/{PROD => PRODUCTION}/DC/pdc_histos.def | 0
.../{PROD => PRODUCTION}/EPICS/pepics_vars.def | 0
.../{PROD => PRODUCTION}/HGCER/phgcer_histos.def | 0
.../{PROD => PRODUCTION}/HODO/phodo_histos.def | 0
.../{PROD => PRODUCTION}/NGCER/pngcer_histos.def | 0
.../{PROD => PRODUCTION}/TRIG/ptrig_histos.def | 0
.../SHMS/{PROD => PRODUCTION}/merge_def_files.py | 0
DEF-files/SHMS/{PROD => PRODUCTION}/merge_list.txt | 0
.../pstackana_production.def} | 0
.../pstackana_production_cuts.def} | 0
.../replay_production_shms.C} | 14 +++++++-------
.../pstackana_production.template} | 0
15 files changed, 7 insertions(+), 7 deletions(-)
rename DEF-files/SHMS/{PROD => PRODUCTION}/AERO/paero_histos.def (100%)
rename DEF-files/SHMS/{PROD => PRODUCTION}/BLOCK/pblock_vars.def (100%)
rename DEF-files/SHMS/{PROD => PRODUCTION}/CAL/pcal_histos.def (100%)
rename DEF-files/SHMS/{PROD => PRODUCTION}/DC/pdc_histos.def (100%)
rename DEF-files/SHMS/{PROD => PRODUCTION}/EPICS/pepics_vars.def (100%)
rename DEF-files/SHMS/{PROD => PRODUCTION}/HGCER/phgcer_histos.def (100%)
rename DEF-files/SHMS/{PROD => PRODUCTION}/HODO/phodo_histos.def (100%)
rename DEF-files/SHMS/{PROD => PRODUCTION}/NGCER/pngcer_histos.def (100%)
rename DEF-files/SHMS/{PROD => PRODUCTION}/TRIG/ptrig_histos.def (100%)
rename DEF-files/SHMS/{PROD => PRODUCTION}/merge_def_files.py (100%)
rename DEF-files/SHMS/{PROD => PRODUCTION}/merge_list.txt (100%)
rename DEF-files/SHMS/{PROD/pstackana_all.def => PRODUCTION/pstackana_production.def} (100%)
rename DEF-files/SHMS/{PROD/pstackana_all_cuts.def => PRODUCTION/pstackana_production_cuts.def} (100%)
rename SCRIPTS/SHMS/{ALL/replay_all_shms.C => PRODUCTION/replay_production_shms.C} (88%)
rename TEMPLATES/SHMS/{ALL/pstackana_all.template => PRODUCTION/pstackana_production.template} (100%)
diff --git a/DEF-files/SHMS/PROD/AERO/paero_histos.def b/DEF-files/SHMS/PRODUCTION/AERO/paero_histos.def
similarity index 100%
rename from DEF-files/SHMS/PROD/AERO/paero_histos.def
rename to DEF-files/SHMS/PRODUCTION/AERO/paero_histos.def
diff --git a/DEF-files/SHMS/PROD/BLOCK/pblock_vars.def b/DEF-files/SHMS/PRODUCTION/BLOCK/pblock_vars.def
similarity index 100%
rename from DEF-files/SHMS/PROD/BLOCK/pblock_vars.def
rename to DEF-files/SHMS/PRODUCTION/BLOCK/pblock_vars.def
diff --git a/DEF-files/SHMS/PROD/CAL/pcal_histos.def b/DEF-files/SHMS/PRODUCTION/CAL/pcal_histos.def
similarity index 100%
rename from DEF-files/SHMS/PROD/CAL/pcal_histos.def
rename to DEF-files/SHMS/PRODUCTION/CAL/pcal_histos.def
diff --git a/DEF-files/SHMS/PROD/DC/pdc_histos.def b/DEF-files/SHMS/PRODUCTION/DC/pdc_histos.def
similarity index 100%
rename from DEF-files/SHMS/PROD/DC/pdc_histos.def
rename to DEF-files/SHMS/PRODUCTION/DC/pdc_histos.def
diff --git a/DEF-files/SHMS/PROD/EPICS/pepics_vars.def b/DEF-files/SHMS/PRODUCTION/EPICS/pepics_vars.def
similarity index 100%
rename from DEF-files/SHMS/PROD/EPICS/pepics_vars.def
rename to DEF-files/SHMS/PRODUCTION/EPICS/pepics_vars.def
diff --git a/DEF-files/SHMS/PROD/HGCER/phgcer_histos.def b/DEF-files/SHMS/PRODUCTION/HGCER/phgcer_histos.def
similarity index 100%
rename from DEF-files/SHMS/PROD/HGCER/phgcer_histos.def
rename to DEF-files/SHMS/PRODUCTION/HGCER/phgcer_histos.def
diff --git a/DEF-files/SHMS/PROD/HODO/phodo_histos.def b/DEF-files/SHMS/PRODUCTION/HODO/phodo_histos.def
similarity index 100%
rename from DEF-files/SHMS/PROD/HODO/phodo_histos.def
rename to DEF-files/SHMS/PRODUCTION/HODO/phodo_histos.def
diff --git a/DEF-files/SHMS/PROD/NGCER/pngcer_histos.def b/DEF-files/SHMS/PRODUCTION/NGCER/pngcer_histos.def
similarity index 100%
rename from DEF-files/SHMS/PROD/NGCER/pngcer_histos.def
rename to DEF-files/SHMS/PRODUCTION/NGCER/pngcer_histos.def
diff --git a/DEF-files/SHMS/PROD/TRIG/ptrig_histos.def b/DEF-files/SHMS/PRODUCTION/TRIG/ptrig_histos.def
similarity index 100%
rename from DEF-files/SHMS/PROD/TRIG/ptrig_histos.def
rename to DEF-files/SHMS/PRODUCTION/TRIG/ptrig_histos.def
diff --git a/DEF-files/SHMS/PROD/merge_def_files.py b/DEF-files/SHMS/PRODUCTION/merge_def_files.py
similarity index 100%
rename from DEF-files/SHMS/PROD/merge_def_files.py
rename to DEF-files/SHMS/PRODUCTION/merge_def_files.py
diff --git a/DEF-files/SHMS/PROD/merge_list.txt b/DEF-files/SHMS/PRODUCTION/merge_list.txt
similarity index 100%
rename from DEF-files/SHMS/PROD/merge_list.txt
rename to DEF-files/SHMS/PRODUCTION/merge_list.txt
diff --git a/DEF-files/SHMS/PROD/pstackana_all.def b/DEF-files/SHMS/PRODUCTION/pstackana_production.def
similarity index 100%
rename from DEF-files/SHMS/PROD/pstackana_all.def
rename to DEF-files/SHMS/PRODUCTION/pstackana_production.def
diff --git a/DEF-files/SHMS/PROD/pstackana_all_cuts.def b/DEF-files/SHMS/PRODUCTION/pstackana_production_cuts.def
similarity index 100%
rename from DEF-files/SHMS/PROD/pstackana_all_cuts.def
rename to DEF-files/SHMS/PRODUCTION/pstackana_production_cuts.def
diff --git a/SCRIPTS/SHMS/ALL/replay_all_shms.C b/SCRIPTS/SHMS/PRODUCTION/replay_production_shms.C
similarity index 88%
rename from SCRIPTS/SHMS/ALL/replay_all_shms.C
rename to SCRIPTS/SHMS/PRODUCTION/replay_production_shms.C
index a2d28fa4..0285c213 100644
--- a/SCRIPTS/SHMS/ALL/replay_all_shms.C
+++ b/SCRIPTS/SHMS/PRODUCTION/replay_production_shms.C
@@ -1,4 +1,4 @@
-void replay_all_shms (Int_t RunNumber = 0, Int_t MaxEvent = 0) {
+void replay_production_shms (Int_t RunNumber = 0, Int_t MaxEvent = 0) {
// Get RunNumber and MaxEvent if not provided.
if(RunNumber == 0) {
@@ -17,7 +17,7 @@ void replay_all_shms (Int_t RunNumber = 0, Int_t MaxEvent = 0) {
// Create file name patterns.
const char* RunFileNamePattern = "raw/shms_all_%05d.dat";
- const char* ROOTFileNamePattern = "ROOTfiles/shms_replay_all_%d_%d.root";
+ const char* ROOTFileNamePattern = "ROOTfiles/shms_replay_production_%d_%d.root";
// Load global parameters
// Add variables to global list.
@@ -120,15 +120,15 @@ void replay_all_shms (Int_t RunNumber = 0, Int_t MaxEvent = 0) {
// Define output ROOT file
analyzer->SetOutFile(ROOTFileName.Data());
// Define DEF-file
- analyzer->SetOdefFile("DEF-files/SHMS/ALL/pstackana_all.def");
+ analyzer->SetOdefFile("DEF-files/SHMS/PRODUCTION/pstackana_production.def");
// Define cuts file
- analyzer->SetCutFile("DEF-files/SHMS/ALL/pstackana_all_cuts.def"); // optional
+ analyzer->SetCutFile("DEF-files/SHMS/PRODUCTION/pstackana_production_cuts.def"); // optional
// File to record accounting information for cuts
- analyzer->SetSummaryFile(Form("REPORT_OUTPUT/SHMS/ALL/summary_all_%d_%d.report", RunNumber, MaxEvent)); // optional
+ analyzer->SetSummaryFile(Form("REPORT_OUTPUT/SHMS/PRODUCTION/summary_production_%d_%d.report", RunNumber, MaxEvent)); // optional
// Start the actual analysis.
analyzer->Process(run);
// Create report file from template
- analyzer->PrintReport("TEMPLATES/SHMS/ALL/pstackana_all.template",
- Form("REPORT_OUTPUT/SHMS/ALL/replay_shms_all_%d_%d.report", RunNumber, MaxEvent)); // optional
+ analyzer->PrintReport("TEMPLATES/SHMS/PRODUCTION/pstackana_production.template",
+ Form("REPORT_OUTPUT/SHMS/PRODUCTION/replay_shms_production_%d_%d.report", RunNumber, MaxEvent)); // optional
}
diff --git a/TEMPLATES/SHMS/ALL/pstackana_all.template b/TEMPLATES/SHMS/PRODUCTION/pstackana_production.template
similarity index 100%
rename from TEMPLATES/SHMS/ALL/pstackana_all.template
rename to TEMPLATES/SHMS/PRODUCTION/pstackana_production.template
--
GitLab