From b7cdd929ddf13f416104aa6f523738fe5ea1bffe Mon Sep 17 00:00:00 2001
From: hallc-online <hallconline@gmail.com>
Date: Mon, 29 Jan 2018 10:30:04 -0500
Subject: [PATCH] Updates

---
 DBASE/HMS/STD/standard.kinematics                  | 14 ++++++++++++++
 DBASE/SHMS/STD/standard.kinematics                 | 14 ++++++++++++++
 DEF-files/HMS/PRODUCTION/hstackana_production.def  |  2 +-
 .../HMS/PRODUCTION/hstackana_production.def.bck    |  8 --------
 DEF-files/SHMS/PRODUCTION/pstackana_production.def |  4 ++--
 .../SHMS/PRODUCTION/pstackana_production.def.bck   | 10 ----------
 hallc_replay_gui.py                                |  2 +-
 7 files changed, 32 insertions(+), 22 deletions(-)

diff --git a/DBASE/HMS/STD/standard.kinematics b/DBASE/HMS/STD/standard.kinematics
index 52b28456..767e9e44 100644
--- a/DBASE/HMS/STD/standard.kinematics
+++ b/DBASE/HMS/STD/standard.kinematics
@@ -433,3 +433,17 @@ gtargmass_amu= 1.00794
 hpartmass = 0.00051099
 htheta_lab = -65.0
 hpcentral = 1.0
+
+1481-1492
+gpbeam = 6.404 
+gtargmass_amu= 26.98
+hpartmass = 0.00051099
+htheta_lab = -64.99
+hpcentral = 1.0
+
+1493-1495
+gpbeam = 6.404 
+gtargmass_amu= 1.00794
+hpartmass = 0.00051099
+htheta_lab = -65.0
+hpcentral = 1.0
\ No newline at end of file
diff --git a/DBASE/SHMS/STD/standard.kinematics b/DBASE/SHMS/STD/standard.kinematics
index a2b52b38..cc5071ff 100644
--- a/DBASE/SHMS/STD/standard.kinematics
+++ b/DBASE/SHMS/STD/standard.kinematics
@@ -322,3 +322,17 @@ gtargmass_amu= 1.00794
 ppartmass =  0.00051099
 ptheta_lab =35.06
 ppcentral = 2.869
+
+2214-2220
+gpbeam = 6.404
+gtargmass_amu= 26.98
+ppartmass =  0.00051099
+ptheta_lab =25.0
+ppcentral = 3.911
+
+2221-2223
+gpbeam = 6.404
+gtargmass_amu= 1.00794
+ppartmass =  0.00051099
+ptheta_lab =25.0
+ppcentral = 3.911
\ No newline at end of file
diff --git a/DEF-files/HMS/PRODUCTION/hstackana_production.def b/DEF-files/HMS/PRODUCTION/hstackana_production.def
index cb40f2a3..d35c0656 100644
--- a/DEF-files/HMS/PRODUCTION/hstackana_production.def
+++ b/DEF-files/HMS/PRODUCTION/hstackana_production.def
@@ -6,6 +6,6 @@
 #include "DEF-files/HMS/PRODUCTION/GTR/hgtr_histos.def"
 #include "DEF-files/HMS/PRODUCTION/RASTER/hraster_histos.def"
 #include "DEF-files/HMS/PRODUCTION/TRIG/htrig_histos.def"
-#include "DEF-files/HMS/PRODUCTION/EPICS/hepics_histos.def"
+#include "DEF-files/HMS/PRODUCTION/EPICS/hepics_vars.def"
 #include "DEF-files/HMS/PRODUCTION/REACT/hreact_histos.def"
 #include "DEF-files/HMS/PRODUCTION/PID/hpid_histos.def"
diff --git a/DEF-files/HMS/PRODUCTION/hstackana_production.def.bck b/DEF-files/HMS/PRODUCTION/hstackana_production.def.bck
index cda0f9e0..cb40f2a3 100644
--- a/DEF-files/HMS/PRODUCTION/hstackana_production.def.bck
+++ b/DEF-files/HMS/PRODUCTION/hstackana_production.def.bck
@@ -1,11 +1,3 @@
-#include "DEF-files/HMS/PRODUCTION/BLOCK/hblock_vars.def"
-
-#include "DEF-files/HMS/TEST_STANDS/CER/hcerana_histos.def"
-#include "DEF-files/HMS/TEST_STANDS/DC/hdcana_histos.def"
-#include "DEF-files/HMS/TEST_STANDS/HODO/hhodoana_histos.def"
-#include "DEF-files/HMS/TEST_STANDS/CAL/hcalana_histos.def"
-#include "DEF-files/HMS/TEST_STANDS/TRIG/htrigana_histos.def"
-
 #include "DEF-files/HMS/PRODUCTION/CAL/hcal_histos.def"
 #include "DEF-files/HMS/PRODUCTION/CER/hcer_histos.def"
 #include "DEF-files/HMS/PRODUCTION/DC/hdc_histos.def"
diff --git a/DEF-files/SHMS/PRODUCTION/pstackana_production.def b/DEF-files/SHMS/PRODUCTION/pstackana_production.def
index 776d4296..a1e03b97 100644
--- a/DEF-files/SHMS/PRODUCTION/pstackana_production.def
+++ b/DEF-files/SHMS/PRODUCTION/pstackana_production.def
@@ -1,8 +1,8 @@
 #include "DEF-files/SHMS/PRODUCTION/AERO/paero_histos.def"
 #include "DEF-files/SHMS/PRODUCTION/CAL/pcal_histos.def"
 #include "DEF-files/SHMS/PRODUCTION/DC/pdc_histos.def"
-#include "DEF-files/SHMS/PRODUCTION/EPICS/pepics_histos.def"
-#include "DEF-files/SHMS/PRODUCTION/GTR/hgtr_histos.def"
+#include "DEF-files/SHMS/PRODUCTION/EPICS/pepics_vars.def"
+#include "DEF-files/SHMS/PRODUCTION/GTR/pgtr_histos.def"
 #include "DEF-files/SHMS/PRODUCTION/HGCER/phgcer_histos.def"
 #include "DEF-files/SHMS/PRODUCTION/HODO/phodo_histos.def"
 #include "DEF-files/SHMS/PRODUCTION/KIN/pkin_histos.def"
diff --git a/DEF-files/SHMS/PRODUCTION/pstackana_production.def.bck b/DEF-files/SHMS/PRODUCTION/pstackana_production.def.bck
index 9f0b280d..776d4296 100644
--- a/DEF-files/SHMS/PRODUCTION/pstackana_production.def.bck
+++ b/DEF-files/SHMS/PRODUCTION/pstackana_production.def.bck
@@ -1,13 +1,3 @@
-#include "DEF-files/SHMS/PRODUCTION/BLOCK/pblock_vars.def"
-
-#include "DEF-files/SHMS/TEST_STANDS/AERO/paeroana_histos.def"
-#include "DEF-files/SHMS/TEST_STANDS/CAL/pcalana_histos.def"
-#include "DEF-files/SHMS/TEST_STANDS/DC/pdcana_histos.def"
-#include "DEF-files/SHMS/TEST_STANDS/HGCER/pgcerana_histos.def"
-#include "DEF-files/SHMS/TEST_STANDS/HODO/phodoana_histos.def"
-#include "DEF-files/SHMS/TEST_STANDS/NGCER/pngcerana_histos.def"
-#include "DEF-files/SHMS/TEST_STANDS/TRIG/ptrigana_histos.def"
-
 #include "DEF-files/SHMS/PRODUCTION/AERO/paero_histos.def"
 #include "DEF-files/SHMS/PRODUCTION/CAL/pcal_histos.def"
 #include "DEF-files/SHMS/PRODUCTION/DC/pdc_histos.def"
diff --git a/hallc_replay_gui.py b/hallc_replay_gui.py
index 4c185acb..2dc39576 100755
--- a/hallc_replay_gui.py
+++ b/hallc_replay_gui.py
@@ -1,4 +1,4 @@
-#!/usr/local/bin/python
+#!/apps/python/python-2.7.1/bin/python
 
 import sys
 
-- 
GitLab