From 6f3855916392e86962f0e90293f45fa50f8bccb6 Mon Sep 17 00:00:00 2001
From: Hall C Online Analyzer User <brad.hallc-online@swatter.net>
Date: Sat, 10 Feb 2018 13:26:09 -0500
Subject: [PATCH] Spring 2018 ver15 (#397)
* Update template files
* Updates to kinematics DB
---
DBASE/HMS/STD/standard.kinematics | 2 +-
DBASE/SHMS/STD/standard.kinematics | 9 +++++++--
.../HMS/PRODUCTION/hstackana_production.template | 11 +++++++++++
TEMPLATES/HMS/SCALERS/hscalers.template | 10 ++++++++++
.../SHMS/PRODUCTION/pstackana_production.template | 9 +++++++++
TEMPLATES/SHMS/SCALERS/pscalers.template | 11 +++++++++++
6 files changed, 49 insertions(+), 3 deletions(-)
diff --git a/DBASE/HMS/STD/standard.kinematics b/DBASE/HMS/STD/standard.kinematics
index 61599bb7..5da66f69 100644
--- a/DBASE/HMS/STD/standard.kinematics
+++ b/DBASE/HMS/STD/standard.kinematics
@@ -306,7 +306,7 @@ gtargmass_amu=2.014101
htheta_lab = -24.995
hpcentral = 1.4
hpartmass = 0.00051099
-gpbeam = 6.430
+gpbeam = 6.43
# Q2 defocussed tune
1327
diff --git a/DBASE/SHMS/STD/standard.kinematics b/DBASE/SHMS/STD/standard.kinematics
index b36f5d25..881eae3e 100644
--- a/DBASE/SHMS/STD/standard.kinematics
+++ b/DBASE/SHMS/STD/standard.kinematics
@@ -107,7 +107,12 @@ ppcentral = 2.50971
# start the Jan 12 commissioning
-
+1751
+gpbeam = 6.43
+gtargmass_amu=1.00794
+ppartmass = 0.00051099
+ptheta_lab = 8.0
+ppcentral = 3.0
1754-1778
gpbeam = 6.430
@@ -135,7 +140,7 @@ gpbeam = 6.430
gtargmass_amu=2.014101
ppartmass = 0.00051099
ptheta_lab = 25.015
-ppcentral = 1.4cd ..
+ppcentral = 1.4
# Q2 defocussed tune
1791
diff --git a/TEMPLATES/HMS/PRODUCTION/hstackana_production.template b/TEMPLATES/HMS/PRODUCTION/hstackana_production.template
index abd3e29a..a5aba047 100644
--- a/TEMPLATES/HMS/PRODUCTION/hstackana_production.template
+++ b/TEMPLATES/HMS/PRODUCTION/hstackana_production.template
@@ -154,6 +154,17 @@ Pre-Scaled Ps2 Total Dead Time (EDTM) : {100.0 - (hcut_edtm_accepted.npassed / (
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} %
+
+3/4 Pre-Trigger 50 ns Gate : {H.hTRIG1.scalerRate/1000.:%.3f} kHz
+EL-REAL Pre-Trigger 50 ns Gate : {H.hTRIG2.scalerRate/1000.:%.3f} kHz
+EL-CLEAN Pre-Trigger 50 ns Gate : {H.hTRIG3.scalerRate/1000.:%.3f} kHz
+
+3/4 Pre-Trigger 100 ns Gate : {H.hPRE100.scalerRate/1000.:%.3f} kHz
+
+3/4 Pre-Trigger 150 ns Gate : {H.hPRE150.scalerRate/1000.:%.3f} kHz
+
+3/4 Pre-Trigger 200 ns Gate : {H.hPRE200.scalerRate/1000.:%.3f} kHz
+
=:=:=:=:=:=:=:
= Hodoscopes
=:=:=:=:=:=:=:
diff --git a/TEMPLATES/HMS/SCALERS/hscalers.template b/TEMPLATES/HMS/SCALERS/hscalers.template
index 237062a4..9d764a9a 100644
--- a/TEMPLATES/HMS/SCALERS/hscalers.template
+++ b/TEMPLATES/HMS/SCALERS/hscalers.template
@@ -191,6 +191,16 @@ OG 6 GeV Electronic Dead Time (100, 200) : {((H.pPRE100.scaler - H.pPRE200.scale
OG 6 GeV Electronic Live Time (150, 200) : {100.0 - ((H.pPRE150.scaler - H.pPRE200.scaler)/H.pPRE150.scaler):%3.4f} %
OG 6 GeV Electronic Dead Time (150, 200) : {((H.pPRE150.scaler - H.pPRE200.scaler)/H.pPRE150.scaler):%3.4f} %
+3/4 Pre-Trigger 50 ns Gate : {H.hTRIG1.scalerRate/1000.:%.3f} kHz
+EL-REAL Pre-Trigger 50 ns Gate : {H.hTRIG2.scalerRate/1000.:%.3f} kHz
+EL-CLEAN Pre-Trigger 50 ns Gate : {H.hTRIG3.scalerRate/1000.:%.3f} kHz
+
+3/4 Pre-Trigger 100 ns Gate : {H.hPRE100.scalerRate/1000.:%.3f} kHz
+
+3/4 Pre-Trigger 150 ns Gate : {H.hPRE150.scalerRate/1000.:%.3f} kHz
+
+3/4 Pre-Trigger 200 ns Gate : {H.hPRE200.scalerRate/1000.:%.3f} kHz
+
=:=:=:=:=:=:=:
= Hodoscopes
diff --git a/TEMPLATES/SHMS/PRODUCTION/pstackana_production.template b/TEMPLATES/SHMS/PRODUCTION/pstackana_production.template
index e62db3f3..654c97b0 100644
--- a/TEMPLATES/SHMS/PRODUCTION/pstackana_production.template
+++ b/TEMPLATES/SHMS/PRODUCTION/pstackana_production.template
@@ -155,6 +155,15 @@ Pre-Scaled Ps2 Total Dead Time (EDTM) : {100.0 - (pcut_edtm_accepted.npassed / (
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} %
+3/4 Pre-Trigger 50 ns Gate : {P.pTRIG1.scalerRate/1000.:%.3f} kHz
+EL-REAL Pre-Trigger 50 ns Gate : {P.pTRIG2.scalerRate/1000.:%.3f} kHz
+EL-CLEAN Pre-Trigger 50 ns Gate : {P.pTRIG3.scalerRate/1000.:%.3f} kHz
+
+3/4 Pre-Trigger 100 ns Gate : {P.pPRE100.scalerRate/1000.:%.3f} kHz
+
+3/4 Pre-Trigger 150 ns Gate : {P.pPRE150.scalerRate/1000.:%.3f} kHz
+
+3/4 Pre-Trigger 200 ns Gate : {P.pPRE200.scalerRate/1000.:%.3f} kHz
=:=:=:=:=:=:=:
= Hodoscopes
=:=:=:=:=:=:=:
diff --git a/TEMPLATES/SHMS/SCALERS/pscalers.template b/TEMPLATES/SHMS/SCALERS/pscalers.template
index 5911ee47..1973c005 100644
--- a/TEMPLATES/SHMS/SCALERS/pscalers.template
+++ b/TEMPLATES/SHMS/SCALERS/pscalers.template
@@ -194,6 +194,17 @@ OG 6 GeV Electronic Dead Time (100, 200) : {((P.pPRE100.scaler - P.pPRE200.scale
OG 6 GeV Electronic Live Time (150, 200) : {100.0 - ((P.pPRE150.scaler - P.pPRE200.scaler)/P.pPRE150.scaler):%3.4f} %
OG 6 GeV Electronic Dead Time (150, 200) : {((P.pPRE150.scaler - P.pPRE200.scaler)/P.pPRE150.scaler):%3.4f} %
+
+3/4 Pre-Trigger 50 ns Gate : {P.pTRIG1.scalerRate/1000.:%.3f} kHz
+EL-REAL Pre-Trigger 50 ns Gate : {P.pTRIG2.scalerRate/1000.:%.3f} kHz
+EL-CLEAN Pre-Trigger 50 ns Gate : {P.pTRIG3.scalerRate/1000.:%.3f} kHz
+
+3/4 Pre-Trigger 100 ns Gate : {P.pPRE100.scalerRate/1000.:%.3f} kHz
+
+3/4 Pre-Trigger 150 ns Gate : {P.pPRE150.scalerRate/1000.:%.3f} kHz
+
+3/4 Pre-Trigger 200 ns Gate : {P.pPRE200.scalerRate/1000.:%.3f} kHz
+
=:=:=:=:=:=:=:
= Hodoscopes
=:=:=:=:=:=:=:
--
GitLab