From a9a1cae6ae76899cdeca458c19e93268e7a373cf Mon Sep 17 00:00:00 2001
From: Hall C Online Analyzer User <brad.hallc-online@swatter.net>
Date: Mon, 15 Jan 2018 20:35:30 -0500
Subject: [PATCH] Recent updates from hallc-online (#359)
---
DBASE/HMS/STD/standard.kinematics | 88 ++++++++++++++-
DBASE/SHMS/STD/standard.kinematics | 96 ++++++++++++++++-
PARAM/SHMS/GEN/pcana.param | 4 +-
TEMPLATES/HMS/SCALERS/hscalers.template | 101 ++++++++++++------
.../SHMS/PRODUCTION/shms_production.cfg | 4 +-
5 files changed, 252 insertions(+), 41 deletions(-)
diff --git a/DBASE/HMS/STD/standard.kinematics b/DBASE/HMS/STD/standard.kinematics
index 967b9858..5abd13d1 100644
--- a/DBASE/HMS/STD/standard.kinematics
+++ b/DBASE/HMS/STD/standard.kinematics
@@ -279,7 +279,7 @@ hpcentral = 2.1
# start the Jan 12 commissioning
-1289-1309
+1289-1311
gtargmass_amu=1.00794
htheta_lab = -15.
@@ -306,4 +306,88 @@ gtargmass_amu=2.014101
htheta_lab = -24.995
hpcentral = 1.4
hpartmass = 0.00051099
-gpbeam = 6.418
\ No newline at end of file
+gpbeam = 6.418
+
+# Q2 defocussed tune
+1327
+gpbeam = 6.418
+gtargmass_amu=1.00794
+hpartmass = 0.00051099
+htheta_lab = -24.995
+hpcentral = 3.0
+
+# ep elastics
+
+1329
+gpbeam = 6.418
+gtargmass_amu=1.00794
+hpartmass = 0.00051099
+htheta_lab = -15.0
+hpcentral = 5.205
+
+1330-1334
+gpbeam = 6.404
+gtargmass_amu=12.0107
+hpartmass = 0.00051099
+htheta_lab = -15.0
+hpcentral = 3.5
+
+#HMS/SHMS Angle and Position Matrix Optimization
+1335
+gpbeam = 6.404
+gtargmass_amu=12.0107
+hpartmass = 0.00051099
+htheta_lab = -15.0
+hpcentral = 3.5
+
+1336
+gpbeam = 6.404
+gtargmass_amu=12.0107
+hpartmass = 0.00051099
+htheta_lab = -23.0
+hpcentral = 3.5
+
+1337-1341
+gpbeam = 6.404
+gtargmass_amu=12.0107
+hpartmass = 0.00051099
+htheta_lab = -15.0
+hpcentral = 4.0
+
+1342-1343
+gpbeam = 6.404
+gtargmass_amu=12.0107
+hpartmass = 0.00051099
+htheta_lab = -22.005
+hpcentral = 3.2
+
+#Run Plan: Large Ytar: HMS/SHMS Angel and position Matrix Optimaization (01/15/18)
+
+1342-1352
+gpbeam = 6.404
+gtargmass_amu= 12.0107
+hpartmass = 0.00051099
+htheta_lab = -30.01
+hpcentral = 2.0
+
+1353-1358
+gpbeam = 6.404
+gtargmass_amu= 1.00794
+hpartmass = 0.00051099
+htheta_lab = -25.01
+hpcentral = 3.0
+
+1359-1377
+gpbeam = 6.404
+gtargmass_amu= 1.00794
+hpartmass = 0.00051099
+htheta_lab = -25.01
+hpcentral = 1.4
+
+
+1378-1381
+gpbeam = 6.404
+gtargmass_amu= 1.00794
+hpartmass = 0.00051099
+htheta_lab = -25.01
+hpcentral = 3.
diff --git a/DBASE/SHMS/STD/standard.kinematics b/DBASE/SHMS/STD/standard.kinematics
index 8aea072f..1a1df5d7 100644
--- a/DBASE/SHMS/STD/standard.kinematics
+++ b/DBASE/SHMS/STD/standard.kinematics
@@ -135,4 +135,98 @@ gpbeam = 6.418
gtargmass_amu=2.014101
ppartmass = 0.00051099
ptheta_lab = 25.015
-ppcentral = 1.4
\ No newline at end of file
+ppcentral = 1.4cd ..
+
+# Q2 defocussed tune
+1791
+gpbeam = 6.418
+gtargmass_amu=1.00794
+ppartmass = 0.00051099
+ptheta_lab = 25.015
+ppcentral = 3.0
+
+1793
+gpbeam = 6.404
+gtargmass_amu=1.00794
+ppartmass = 0.00051099
+ptheta_lab = 8.015
+ppcentral = 6.017
+
+1795
+gpbeam = 6.404
+gtargmass_amu=12.0107
+ppartmass = 0.00051099
+ptheta_lab = 8.015
+ppcentral = 6.017
+
+#SIEVE Slit
+
+1796-1804
+gpbeam = 6.404
+gtargmass_amu=12.0107
+ppartmass = 0.00051099
+ptheta_lab = 8.01
+ppcentral = 5.0
+
+#HMS/SHMS Angle and Position Matrix Optimization
+
+1805-1806
+gpbeam = 6.404
+gtargmass_amu=12.0107
+ppartmass = 0.00051099
+ptheta_lab = 15.0
+ppcentral = 3.5
+
+1807
+gpbeam = 6.404
+gtargmass_amu=12.0107
+ppartmass = 0.00051099
+ptheta_lab = 15
+ppcentral = 3.5
+
+1808-1812
+gpbeam = 6.404
+gtargmass_amu=12.0107
+ppartmass = 0.00051099
+ptheta_lab = 15.0
+ppcentral = 4.0
+
+
+
+1813-1814
+gpbeam = 6.404
+gtargmass_amu=12.0107
+ppartmass = 0.00051099
+ptheta_lab = 22.045
+ppcentral = 3.2
+
+#Run Plan: Large Ytar: HMS/SHMS Angel and position Matrix Optimization (01/15/18)
+
+1815-1823
+gpbeam = 6.404
+gtargmass_amu= 12.0107
+ppartmass = 0.00051099
+ptheta_lab =30.065
+ppcentral = 2.0
+
+1824-1828
+gpbeam = 6.404
+gtargmass_amu= 1.00794
+ppartmass = 0.00051099
+ptheta_lab =25.035
+ppcentral = 3.0
+
+1829-1842
+gpbeam = 6.404
+gtargmass_amu= 1.00794
+ppartmass = 0.00051099
+ptheta_lab =25.035
+ppcentral = 1.4
+
+
+1843-1845
+gpbeam = 6.404
+gtargmass_amu= 1.00794
+ppartmass = 0.00051099
+ptheta_lab =25.035
+ppcentral = 3.0
diff --git a/PARAM/SHMS/GEN/pcana.param b/PARAM/SHMS/GEN/pcana.param
index 2e4528cd..5f6937df 100644
--- a/PARAM/SHMS/GEN/pcana.param
+++ b/PARAM/SHMS/GEN/pcana.param
@@ -1,6 +1,6 @@
; Parameters we need to keep THcHallCSpectrometer Happy
-;p_recon_coeff_filename = "DATFILES/SHMS_fr3_rec__order_5.dat"
-p_recon_coeff_filename = "DATFILES/shms-2011-26cm-monte_q2_m015_rec.dat"
+p_recon_coeff_filename = "DATFILES/SHMS_fr3_rec__order_5.dat"
+;p_recon_coeff_filename = "DATFILES/shms-2011-26cm-monte_q2_m015_rec.dat"
diff --git a/TEMPLATES/HMS/SCALERS/hscalers.template b/TEMPLATES/HMS/SCALERS/hscalers.template
index 223c9b5b..771c6acf 100644
--- a/TEMPLATES/HMS/SCALERS/hscalers.template
+++ b/TEMPLATES/HMS/SCALERS/hscalers.template
@@ -40,63 +40,61 @@ Ps6_factor = {ghconfig_ti_ps_factors[5]}
* Triggers
***********
-=:=:=:=:=:=:=:=:
-= 3/4 Triggers
-=:=:=:=:=:=:=:=:
-
-HMS 3/4 Triggers : {H.hTRIG1.scaler} [ {H.hTRIG1.scaler/ghconfig_ti_ps_factors[0]} ]
-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_Pretrig.npassed}
+=:=:=:=:=:=:=:
+= 3/4 Trigger
+=:=:=:=:=:=:=:
-HMS Computer Live Time : {(TRIG1.npassed / H.hTRIG1.scaler)*100.0:%3.4f} % [ {(TRIG1.npassed / (H.hTRIG1.scaler/ghconfig_ti_ps_factors[0]))*100.0:%3.4f} % ]
-HMS Computer Dead Time : {100.0 - (TRIG1.npassed / H.hTRIG1.scaler)*100.0:%3.4f} % [ {100.0 - (TRIG1.npassed / (H.hTRIG1.scaler/ghconfig_ti_ps_factors[0]))*100.0:%3.4f} % ]
+Total HMS 3/4 Triggers : {H.hTRIG1.scaler}
+Pre-Scaled HMS 3/4 Triggers : {(H.hTRIG1.scaler/ghconfig_ti_ps_factors[0]):%.0f}
+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_Pretrig.npassed}
=:=:=:=:=:=:=:=:=:=:=:=:
= Physics 3/4 Triggers
=:=:=:=:=:=:=:=:=:=:=:=:
-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}
+Physics 3/4 Triggers : {H.hTRIG1.scaler - H.EDTM.scaler}
+Estimated Physics 3/4 Triggers : {(H.hTRIG1.scalerRate - H.EDTM.scalerRate)*(H.1Mhz.scaler/1000000.):%.0f}
+Physics 3/4 Trigger Rate : {(H.hTRIG1.scalerRate - H.EDTM.scalerRate)/1000.:%.3f} kHz
+Accepted Physics Triggers : {physics_accepted.npassed}
-=:=:=:=:=:=:=:=:
+=:=:=:=:=:=:=:=:
= HMS Triggers
-=:=:=:=:=:=:=:=:
+=:=:=:=:=:=:=:=:
hEL_LO_LO : {H.hEL_LO_LO.scaler} [ {(H.hEL_LO_LO.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
hEL_LO : {H.hEL_LO.scaler} [ {(H.hEL_LO.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
hEL_HI : {H.hEL_HI.scaler} [ {(H.hEL_HI.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
hEL_REAL : {H.hEL_REAL.scaler} [ {(H.hEL_REAL.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
hEL_CLEAN : {H.hEL_CLEAN.scaler} [ {(H.hEL_CLEAN.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
-hSTOF : {H.hSTOF.scaler} [ {(H.hSTOF.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+hSTOF : {H.hSTOF.scaler} [ {(H.hSTOF.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
hTRIG1 : {H.hTRIG1.scaler} [ {(H.hTRIG1.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
hTRIG2 : {H.hTRIG2.scaler} [ {(H.hTRIG2.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
hTRIG3 : {H.hTRIG3.scaler} [ {(H.hTRIG3.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
-hTRIG4 : {H.hTRIG4.scaler} [ {(H.hTRIG4.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+hTRIG4 : {H.hTRIG4.scaler} [ {(H.hTRIG4.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
hTRIG5 : {H.hTRIG5.scaler} [ {(H.hTRIG5.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
hTRIG6 : {H.hTRIG6.scaler} [ {(H.hTRIG6.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
-=:=:=:=:=:=:=:=:
-= SHMS Triggers
-=:=:=:=:=:=:=:=:
+=:=:=:=:=:=:=:=:
+= HMS Triggers
+=:=:=:=:=:=:=:=:
-pEL_LO_LO : {H.pEL_LO_LO.scaler} [ {(H.pEL_LO_LO.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
-pEL_LO : {H.pEL_LO.scaler} [ {(H.pEL_LO.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
-pEL_HI : {H.pEL_HI.scaler} [ {(H.pEL_HI.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
-pEL_REAL : {H.pEL_REAL.scaler} [ {(H.pEL_REAL.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
-pEL_CLEAN : {H.pEL_CLEAN.scaler} [ {(H.pEL_CLEAN.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
-pSTOF : {H.pSTOF.scaler} [ {(H.pSTOF.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+hEL_LO_LO : {H.hEL_LO_LO.scaler} [ {(H.hEL_LO_LO.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+hEL_LO : {H.hEL_LO.scaler} [ {(H.hEL_LO.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+hEL_HI : {H.hEL_HI.scaler} [ {(H.hEL_HI.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+hEL_REAL : {H.hEL_REAL.scaler} [ {(H.hEL_REAL.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+hEL_CLEAN : {H.hEL_CLEAN.scaler} [ {(H.hEL_CLEAN.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+pSTOF : {H.pSTOF.scaler} [ {(H.pSTOF.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
-pTRIG1 : {H.pTRIG1.scaler} [ {(H.pTRIG1.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
-pTRIG2 : {H.pTRIG2.scaler} [ {(H.pTRIG2.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
-pTRIG3 : {H.pTRIG3.scaler} [ {(H.pTRIG3.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
-pTRIG4 : {H.pTRIG4.scaler} [ {(H.pTRIG4.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
-pTRIG5 : {H.pTRIG5.scaler} [ {(H.pTRIG5.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
-pTRIG6 : {H.pTRIG6.scaler} [ {(H.pTRIG6.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+hTRIG1 : {H.hTRIG1.scaler} [ {(H.hTRIG1.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+hTRIG2 : {H.hTRIG2.scaler} [ {(H.hTRIG2.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+hTRIG3 : {H.hTRIG3.scaler} [ {(H.hTRIG3.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+hTRIG4 : {H.hTRIG4.scaler} [ {(H.hTRIG4.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+hTRIG5 : {H.hTRIG5.scaler} [ {(H.hTRIG5.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
+hTRIG6 : {H.hTRIG6.scaler} [ {(H.hTRIG6.scaler/H.1Mhz.scalerTime)/1000.:%.3f} kHz ]
=:=:=:=:
= EDTM
@@ -107,9 +105,44 @@ Estimated EDTM Triggers : {H.EDTM.scalerRate*(H.1Mhz.scaler/1000000.):%.0f}
EDTM Trigger Rate : {H.EDTM.scalerRate/1000.:%.3f} kHz
Accepted EDTM Triggers : {edtm_accepted.npassed}
+=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:
+= Live/Dead Time Calculations
+=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:=:
+
+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} %
+
+Pre-Scaled Ps1 HMS Computer Live Time : {(TRIG1.npassed / (H.hTRIG1.scaler/ghconfig_ti_ps_factors[0]))*100.0:%3.4f} %
+Pre-Scaled Ps1 HMS Computer Dead Time : {100.0 - (TRIG1.npassed / (H.hTRIG1.scaler/ghconfig_ti_ps_factors[0]))*100.0:%3.4f} %
+
+Pre-Scaled Ps2 HMS Computer Live Time : {(TRIG2.npassed / (H.hTRIG2.scaler/ghconfig_ti_ps_factors[1]))*100.0:%3.4f} %
+Pre-Scaled Ps2 HMS Computer Dead Time : {100.0 - (TRIG2.npassed / (H.hTRIG2.scaler/ghconfig_ti_ps_factors[1]))*100.0:%3.4f} %
+
+Pre-Scaled Ps3 HMS Computer Live Time : {(TRIG3.npassed / (H.hTRIG3.scaler/ghconfig_ti_ps_factors[2]))*100.0:%3.4f} %
+Pre-Scaled Ps3 HMS Computer Dead Time : {100.0 - (TRIG3.npassed / (H.hTRIG3.scaler/ghconfig_ti_ps_factors[2]))*100.0:%3.4f} %
+
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} %
+Pre-Scaled Ps1 Total Live Time (EDTM) : {(edtm_accepted.npassed / (H.EDTM.scaler/ghconfig_ti_ps_factors[0]))*100.0:%3.4f} %
+Pre-Scaled Ps1 Total Dead Time (EDTM) : {100.0 - (edtm_accepted.npassed / (H.EDTM.scaler/ghconfig_ti_ps_factors[0]))*100.0:%3.4f} %
+
+Pre-Scaled Ps2 Total Live Time (EDTM) : {(edtm_accepted.npassed / (H.EDTM.scaler/ghconfig_ti_ps_factors[1]))*100.0:%3.4f} %
+Pre-Scaled Ps2 Total Dead Time (EDTM) : {100.0 - (edtm_accepted.npassed / (H.EDTM.scaler/ghconfig_ti_ps_factors[1]))*100.0:%3.4f} %
+
+Pre-Scaled Ps3 Total Live Time (EDTM) : {(edtm_accepted.npassed / (H.EDTM.scaler/ghconfig_ti_ps_factors[2]))*100.0:%3.4f} %
+Pre-Scaled Ps3 Total Dead Time (EDTM) : {100.0 - (edtm_accepted.npassed / (H.EDTM.scaler/ghconfig_ti_ps_factors[2]))*100.0:%3.4f} %
+
+OG 6 GeV Electronic Live Time (100, 150) : {100.0 - ((H.pPRE100.scaler - H.pPRE150.scaler)/H.pPRE100.scaler):%3.4f} %
+OG 6 GeV Electronic Dead Time (100, 150) : {((H.pPRE100.scaler - H.pPRE150.scaler)/H.pPRE100.scaler):%3.4f} %
+
+OG 6 GeV Electronic Live Time (100, 200) : {100.0 - ((H.pPRE100.scaler - H.pPRE200.scaler)/H.pPRE100.scaler):%3.4f} %
+OG 6 GeV Electronic Dead Time (100, 200) : {((H.pPRE100.scaler - H.pPRE200.scaler)/H.pPRE100.scaler):%3.4f} %
+
+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} %
+
+
=:=:=:=:=:=:=:
= Hodoscopes
=:=:=:=:=:=:=:
diff --git a/onlineGUI/CONFIG/SHMS/PRODUCTION/shms_production.cfg b/onlineGUI/CONFIG/SHMS/PRODUCTION/shms_production.cfg
index b3c5d90f..cb843c69 100644
--- a/onlineGUI/CONFIG/SHMS/PRODUCTION/shms_production.cfg
+++ b/onlineGUI/CONFIG/SHMS/PRODUCTION/shms_production.cfg
@@ -156,8 +156,8 @@ ptrig_pFADC_TREF_ROC2_good_tdc -nostat
newpage 2 1
title SHMS Fast Raster
-pFRA_XvsY -nostat
-pFRB_XvsY -nostat
+pFRAraw_XvsY -nostat
+pFRBraw_XvsY -nostat
newpage 2 2
title SHMS Kinematics
--
GitLab