From b4aad3da6cf0ecdf48a32755c97925e46a64ffe8 Mon Sep 17 00:00:00 2001
From: Hall C Online Analyzer User <brad.hallc-online@swatter.net>
Date: Tue, 20 Feb 2018 11:51:36 -0500
Subject: [PATCH] Spring 2018 ver18 (#407)

* Fix bug in cuts file to ensure no decoding of EDTM events

* Update submodules

* Update kinematics files
---
 DBASE/HMS/standard.kinematics                 | 36 +++++++++++++++++++
 DBASE/SHMS/standard.kinematics                | 15 +++++---
 .../CUTS/hstackana_production_cuts.def        |  2 +-
 UTIL_CT                                       |  2 +-
 UTIL_F2_XEM                                   |  2 +-
 UTIL_OL                                       |  2 +-
 6 files changed, 51 insertions(+), 8 deletions(-)

diff --git a/DBASE/HMS/standard.kinematics b/DBASE/HMS/standard.kinematics
index 5da66f69..eb88f11f 100644
--- a/DBASE/HMS/standard.kinematics
+++ b/DBASE/HMS/standard.kinematics
@@ -510,3 +510,39 @@ gtargmass_amu=12.0107
 hpartmass = 0.00051099
 htheta_lab = 18.50
 hpcentral = 5.816
+
+ 
+1553-1555
+gpbeam = 10.59 
+gtargmass_amu=1.00794
+hpartmass = 0.00051099
+htheta_lab = -21.00
+hpcentral = 6.2
+
+1556-1559
+gpbeam = 10.59 
+gtargmass_amu=1.00794
+hpartmass = 0.00051099
+htheta_lab = -21.00
+hpcentral = 5.9
+
+1560-1561
+gpbeam = 10.59 
+gtargmass_amu=26.98
+hpartmass = 0.00051099
+htheta_lab = -21.00
+hpcentral = 5.7
+
+1562-1572
+gpbeam = 10.59 
+gtargmass_amu=1.00794
+hpartmass = 0.00051099
+htheta_lab = -21.00
+hpcentral = 5.7
+
+1573-9999
+gpbeam = 10.59 
+gtargmass_amu=26.98
+hpartmass = 0.00051099
+htheta_lab = -21.00
+hpcentral = 5.7
\ No newline at end of file
diff --git a/DBASE/SHMS/standard.kinematics b/DBASE/SHMS/standard.kinematics
index 881eae3e..fefe2306 100644
--- a/DBASE/SHMS/standard.kinematics
+++ b/DBASE/SHMS/standard.kinematics
@@ -442,9 +442,16 @@ ppartmass =  0.00051099
 ptheta_lab =16.49
 ppcentral = 5.5
 
-2265-2265
+2265-2488
 gpbeam = 10.59
-gtargmass_amu= 12.0107
+gtargmass_amu= 1.00794
 ppartmass =  0.00051099
-ptheta_lab =25.00
-ppcentral = 5.5
+ptheta_lab =21.035
+ppcentral = 5.1
+
+2489-9999
+gpbeam = 10.59
+gtargmass_amu= 26.98
+ppartmass =  0.00051099
+ptheta_lab =21.035
+ppcentral = 5.1
diff --git a/DEF-files/HMS/PRODUCTION/CUTS/hstackana_production_cuts.def b/DEF-files/HMS/PRODUCTION/CUTS/hstackana_production_cuts.def
index d7177b14..ab00374d 100644
--- a/DEF-files/HMS/PRODUCTION/CUTS/hstackana_production_cuts.def
+++ b/DEF-files/HMS/PRODUCTION/CUTS/hstackana_production_cuts.def
@@ -10,7 +10,7 @@ Decode_master          ALL_HMS_NO_EDTM
 
 Block: CoarseTracking
 #include "DEF-files/HMS/PRODUCTION/CUTS/hstackana_coarsetracking_cuts.def"
-CoarseTracking_master ALL_HMS_events
+CoarseTracking_master ALL_HMS_NO_events
 
 Block: CoarseReconstruct
 CoarseReconstruct_master ALL_HMS_NO_EDTM
diff --git a/UTIL_CT b/UTIL_CT
index 74f7d43d..edf47c5f 160000
--- a/UTIL_CT
+++ b/UTIL_CT
@@ -1 +1 @@
-Subproject commit 74f7d43d6536fe55f5beed7e564368be11281e80
+Subproject commit edf47c5f739eca07cf6566bb70eb5c7033df2f82
diff --git a/UTIL_F2_XEM b/UTIL_F2_XEM
index e73b9002..2d0da17f 160000
--- a/UTIL_F2_XEM
+++ b/UTIL_F2_XEM
@@ -1 +1 @@
-Subproject commit e73b90022cff24a862ddab0faec273fd944be411
+Subproject commit 2d0da17fe7ded5495c4f7d90788ae099da517e74
diff --git a/UTIL_OL b/UTIL_OL
index ab978be7..71bab262 160000
--- a/UTIL_OL
+++ b/UTIL_OL
@@ -1 +1 @@
-Subproject commit ab978be7640cc3c19aa96228fc0d805ce030d8cc
+Subproject commit 71bab262e7764fca745c4e33005f9d1e9d0aab2c
-- 
GitLab