From a1b1368baab08aadd3eb072254c4f8f990f75e47 Mon Sep 17 00:00:00 2001
From: Mark Jones <jones@jlab.org>
Date: Mon, 11 Dec 2017 01:15:50 -0500
Subject: [PATCH] Changes to TEMPLATES and cuts files
Live time calculation was using the wrong scaler.
---
.../PRODUCTION/hstackana_production_cuts.def | 15 +++++----
.../PRODUCTION/pstackana_production_cuts.def | 8 ++++-
.../PRODUCTION/hstackana_production.template | 33 +++++++++++++++++--
TEMPLATES/HMS/SCALERS/hscalers.template | 18 +++++-----
.../PRODUCTION/pstackana_production.template | 33 ++++++++++++++++---
TEMPLATES/SHMS/SCALERS/pscalers.template | 20 +++++------
6 files changed, 93 insertions(+), 34 deletions(-)
diff --git a/DEF-files/HMS/PRODUCTION/hstackana_production_cuts.def b/DEF-files/HMS/PRODUCTION/hstackana_production_cuts.def
index 7a87d0e4..0ed8d95f 100644
--- a/DEF-files/HMS/PRODUCTION/hstackana_production_cuts.def
+++ b/DEF-files/HMS/PRODUCTION/hstackana_production_cuts.def
@@ -4,13 +4,14 @@ Block: RawDecode
Pedestal_event g.evtyp == 99
-HMS_trig_1_event g.evtyp == 1
-HMS_trig_2_event g.evtyp == 2
-HMS_trig_3_event g.evtyp == 3
-HMS_trig_4_event g.evtyp == 4
-HMS_trig_5_event g.evtyp == 5
-HMS_trig_6_event g.evtyp == 6
-HMS_event HMS_trig_1_event || HMS_trig_2_event || HMS_trig_3_event || HMS_trig_4_event || HMS_trig_5_event || HMS_trig_6_event
+HMS_event g.evtyp == 2
+SHMS_event g.evtyp == 1
+COIN_event g.evtyp == 4
+TRIG1 T.hms.hTRIG1_tdcTimeRaw>0
+TRIG2 T.hms.hTRIG2_tdcTimeRaw>0
+TRIG3 T.hms.hTRIG3_tdcTimeRaw>0
+HMS_Pretrig TRIG1||TRIG2||TRIG3
+
RawDecode_master 1
diff --git a/DEF-files/SHMS/PRODUCTION/pstackana_production_cuts.def b/DEF-files/SHMS/PRODUCTION/pstackana_production_cuts.def
index fb9287e0..b2c81270 100644
--- a/DEF-files/SHMS/PRODUCTION/pstackana_production_cuts.def
+++ b/DEF-files/SHMS/PRODUCTION/pstackana_production_cuts.def
@@ -3,7 +3,13 @@
Block: RawDecode
Pedestal_event g.evtyp == 99
-SHMS_event g.evtyp == 1
+SHMS_event g.evtyp == 1
+ HMS_event g.evtyp == 2
+COIN_event g.evtyp == 4
+TRIG1 T.shms.pTRIG1_tdcTimeRaw>0
+TRIG2 T.shms.pTRIG2_tdcTimeRaw>0
+TRIG3 T.shms.pTRIG3_tdcTimeRaw>0
+SHMS_Pretrig TRIG1||TRIG2||TRIG3
RawDecode_master 1
diff --git a/TEMPLATES/HMS/PRODUCTION/hstackana_production.template b/TEMPLATES/HMS/PRODUCTION/hstackana_production.template
index bd074824..8709218c 100644
--- a/TEMPLATES/HMS/PRODUCTION/hstackana_production.template
+++ b/TEMPLATES/HMS/PRODUCTION/hstackana_production.template
@@ -32,9 +32,36 @@ Chamber 1: {hdc_zpos[0]:%6.2f} {hdc_zpos[1]:%6.2f} {hdc_zpos[2]:%6.2f}
Chamber 2: {hdc_zpos[6]:%6.2f} {hdc_zpos[7]:%6.2f} {hdc_zpos[8]:%6.2f}
{hdc_zpos[9]:%6.2f} {hdc_zpos[10]:%6.2f} {hdc_zpos[11]:%6.2f}
-Rate : {H.Trig.scalerRate/1000.:%7.3f} kHz
-Live Time : {(hms_trigs.npassed / H.Trig.scaler)*100.0:%3.2f} %
-Dead Time : {100.0 - (hms_trigs.npassed / H.Trig.scaler)*100.0:%3.2f} %
+********************
+* DAQ Configuration
+********************
+
+Ps1_value = {ghconfig_ti_ps[0]}
+Ps2_value = {ghconfig_ti_ps[1]}
+Ps3_value = {ghconfig_ti_ps[2]}
+Ps4_value = {ghconfig_ti_ps[3]}
+Ps5_value = {ghconfig_ti_ps[4]}
+Ps6_value = {ghconfig_ti_ps[5]}
+
+Ps1_factor = {floor(2**(ghconfig_ti_ps[0] - 1) + 1):%d}
+Ps2_factor = {floor(2**(ghconfig_ti_ps[1] - 1) + 1):%d}
+Ps3_factor = {floor(2**(ghconfig_ti_ps[2] - 1) + 1):%d}
+Ps4_factor = {floor(2**(ghconfig_ti_ps[3] - 1) + 1):%d}
+Ps5_factor = {floor(2**(ghconfig_ti_ps[4] - 1) + 1):%d}
+Ps6_factor = {floor(2**(ghconfig_ti_ps[5] - 1) + 1):%d}
+
+***********
+* Triggers
+***********
+
+HMS 3/4 Triggers : {H.hTRIG1.scaler}
+Estimated HMS 3/4 Triggers : {H.hTRIG1.scalerRate*(H.1Mhz.scaler/1000000.):%.0f}
+HMS 3/4 Trigger Rate : {H.hTRIG1.scalerRate/1000.:%.3f} kHz
+Accepted HMS Triggers : {TRIG1.npassed}
+HMS Event Types : {HMS_events.npassed}
+
+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} %
hmsDC1Planes_large Counts:{hmsDC1Planes_large.npassed} /hms_trigs : {hmsDC1Planes_large.npassed/hms_trigs.npassed}
hmsDC2Planes_large Counts:{hmsDC2Planes_large.npassed} /hms_trigs : {hmsDC2Planes_large.npassed/hms_trigs.npassed}
diff --git a/TEMPLATES/HMS/SCALERS/hscalers.template b/TEMPLATES/HMS/SCALERS/hscalers.template
index 8b1096a7..284940d0 100644
--- a/TEMPLATES/HMS/SCALERS/hscalers.template
+++ b/TEMPLATES/HMS/SCALERS/hscalers.template
@@ -46,14 +46,14 @@ Ps6_factor = {floor(2**(ghconfig_ti_ps[5] - 1) + 1):%d}
* Triggers
***********
-HMS Triggers : {H.hTREF1.scaler}
-Estimated HMS Triggers : {H.hTREF1.scalerRate*(H.1Mhz.scaler/1000000.):%.0f}
-HMS Trigger Rate : {H.hTREF1.scalerRate/1000.:%.3f} kHz
+HMS 3/4 Triggers : {H.hTRIG1.scaler}
+Estimated HMS 3/4 Triggers : {H.hTRIG1.scalerRate*(H.1Mhz.scaler/1000000.):%.0f}
+HMS 3/4 Trigger Rate : {H.hTRIG1.scalerRate/1000.:%.3f} kHz
Accepted HMS Triggers : {triggers_accepted.npassed}
HMS Event Types : {hms_trigs.npassed}
-HMS Computer Live Time : {(hms_trigs.npassed / H.hTREF1.scaler)*100.0:%3.4f} %
-HMS Computer Dead Time : {100.0 - (hms_trigs.npassed / H.hTREF1.scaler)*100.0:%3.4f} %
+HMS Computer Live Time : {(hms_trigs.npassed / H.hTRIG1.scaler)*100.0:%3.4f} %
+HMS Computer Dead Time : {100.0 - (hms_trigs.npassed / H.hTRIG1.scaler)*100.0:%3.4f} %
*******
* EDTM
@@ -68,12 +68,12 @@ 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} %
*******************
-* Physics Triggers
+* Physics 3/4 Triggers
*******************
-Physics Triggers : {H.hTREF1.scaler - H.EDTM.scaler}
-Estimated Physics Triggers : {(H.hTREF1.scalerRate - H.EDTM.scalerRate)*(H.1Mhz.scaler/1000000.):%.0f}
-Physics Trigger Rate : {(H.hTREF1.scalerRate - H.EDTM.scalerRate)/1000.:%.3f} kHz
+Physics Triggers : {H.hTRIG1.scaler - H.EDTM.scaler}
+Estimated Physics Triggers : {(H.hTRIG1.scalerRate - H.EDTM.scalerRate)*(H.1Mhz.scaler/1000000.):%.0f}
+Physics Trigger Rate : {(H.hTRIG1.scalerRate - H.EDTM.scalerRate)/1000.:%.3f} kHz
Accepted Physics Triggers : {physics_accepted.npassed}
*******************
diff --git a/TEMPLATES/SHMS/PRODUCTION/pstackana_production.template b/TEMPLATES/SHMS/PRODUCTION/pstackana_production.template
index 985c280e..f9080e18 100644
--- a/TEMPLATES/SHMS/PRODUCTION/pstackana_production.template
+++ b/TEMPLATES/SHMS/PRODUCTION/pstackana_production.template
@@ -21,11 +21,36 @@ BCM1 Counts: {P.BCM1.scalerCut} Total Charge: {P.BCM1.scalerChargeCut:%.3f} uC
BCM2 Counts: {P.BCM2.scalerCut} Total Charge: {P.BCM2.scalerChargeCut:%.3f} uC
Unser Counts: {P.Unser.scalerCut} Total Charge: {P.Unser.scalerChargeCut:%.3f} uC
-SHMS triggers : {shms_trigs.npassed}
+********************
+* DAQ Configuration
+********************
+
+Ps1_value = {gpconfig_ti_ps[0]}
+Ps2_value = {gpconfig_ti_ps[1]}
+Ps3_value = {gpconfig_ti_ps[2]}
+Ps4_value = {gpconfig_ti_ps[3]}
+Ps5_value = {gpconfig_ti_ps[4]}
+Ps6_value = {gpconfig_ti_ps[5]}
+
+Ps1_factor = {floor(2**(gpconfig_ti_ps[0] - 1) + 1):%d}
+Ps2_factor = {floor(2**(gpconfig_ti_ps[1] - 1) + 1):%d}
+Ps3_factor = {floor(2**(gpconfig_ti_ps[2] - 1) + 1):%d}
+Ps4_factor = {floor(2**(gpconfig_ti_ps[3] - 1) + 1):%d}
+Ps5_factor = {floor(2**(gpconfig_ti_ps[4] - 1) + 1):%d}
+Ps6_factor = {floor(2**(gpconfig_ti_ps[5] - 1) + 1):%d}
+
+***********
+* 3/4 Triggers
+***********
+
+SHMS 3/4 Triggers : {P.pTRIG1.scaler}
+Estimated SHMS 3/4 Triggers : {P.pTRIG1.scalerRate*(P.1Mhz.scaler/1000000.):%.0f}
+SHMS 3/4 Trigger Rate : {P.pTRIG1.scalerRate/1000.:%.3f} kHz
+Accepted SHMS Triggers : {TRIG1.npassed}
+SHMS Event Types : {SHMS_Pretrig.npassed}
-Rate : {P.pTREF3.scalerRate/1000.:%7.3f} kHz
-Live Time : {(shms_trigs.npassed / P.pTREF3.scaler)*100.0:%3.2f} %
-Dead Time : {100.0 - (shms_trigs.npassed / P.pTREF3.scaler)*100.0:%3.2f} %
+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} %
***** Hodoscope Efficiency ********
diff --git a/TEMPLATES/SHMS/SCALERS/pscalers.template b/TEMPLATES/SHMS/SCALERS/pscalers.template
index 5a2ff7a3..6c62c440 100644
--- a/TEMPLATES/SHMS/SCALERS/pscalers.template
+++ b/TEMPLATES/SHMS/SCALERS/pscalers.template
@@ -44,17 +44,17 @@ Ps5_factor = {floor(2**(gpconfig_ti_ps[4] - 1) + 1):%d}
Ps6_factor = {floor(2**(gpconfig_ti_ps[5] - 1) + 1):%d}
***********
-* Triggers
+* 3/4 Triggers
***********
-SHMS Triggers : {P.pTREF3.scaler}
-Estimated SHMS Triggers : {P.pTREF3.scalerRate*(P.1Mhz.scaler/1000000.):%.0f}
-SHMS Trigger Rate : {P.pTREF3.scalerRate/1000.:%.3f} kHz
+SHMS 3/4 Triggers : {P.pTRIG1.scaler}
+Estimated SHMS 3/4 Triggers : {P.pTRIG1.scalerRate*(P.1Mhz.scaler/1000000.):%.0f}
+SHMS 3/4 Trigger Rate : {P.pTRIG1.scalerRate/1000.:%.3f} kHz
Accepted SHMS Triggers : {triggers_accepted.npassed}
SHMS Event Types : {shms_trigs.npassed}
-SHMS Computer Live Time : {(shms_trigs.npassed / P.pTREF3.scaler)*100.0:%3.4f} %
-SHMS Computer Dead Time : {100.0 - (shms_trigs.npassed / P.pTREF3.scaler)*100.0:%3.4f} %
+SHMS Computer Live Time : {(shms_trigs.npassed / P.pTRIG1.scaler)*100.0:%3.4f} %
+SHMS Computer Dead Time : {100.0 - (shms_trigs.npassed / P.pTRIG1.scaler)*100.0:%3.4f} %
*******
* EDTM
@@ -69,12 +69,12 @@ 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} %
*******************
-* Physics Triggers
+* Physics 3/4 Triggers
*******************
-Physics Triggers : {P.pTREF3.scaler - P.EDTM.scaler}
-Estimated Physics Triggers : {(P.pTREF3.scalerRate - P.EDTM.scalerRate)*(P.1Mhz.scaler/1000000.):%.0f}
-Physics Trigger Rate : {(P.pTREF3.scalerRate - P.EDTM.scalerRate)/1000.:%.3f} kHz
+Physics 3/4 Triggers : {P.pTRIG1.scaler - P.EDTM.scaler}
+Estimated Physics 3/4 Triggers : {(P.pTRIG1.scalerRate - P.EDTM.scalerRate)*(P.1Mhz.scaler/1000000.):%.0f}
+Physics 3/4 Trigger Rate : {(P.pTRIG1.scalerRate - P.EDTM.scalerRate)/1000.:%.3f} kHz
Accepted Physics Triggers : {physics_accepted.npassed}
*******************
--
GitLab