From d15407b5df765639113e16b513eed840c4e1fab5 Mon Sep 17 00:00:00 2001
From: Hall C Online Analyzer User <brad.hallc-online@swatter.net>
Date: Tue, 16 Jan 2018 03:19:23 -0500
Subject: [PATCH] Update more changes (#361)
---
DBASE/COIN/STD/standard.kinematics | 12 +++++++++++-
DBASE/SHMS/STD/standard.kinematics | 2 +-
MAPS/COIN/DETEC/TRIG/cointrig.map | 3 +--
MAPS/COIN/DETEC/coin.map | 3 +--
SCRIPTS/HMS/PRODUCTION/replay_production_hms_coin.C | 2 +-
.../SHMS/PRODUCTION/replay_production_shms_coin.C | 2 +-
6 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/DBASE/COIN/STD/standard.kinematics b/DBASE/COIN/STD/standard.kinematics
index 570db40a..9cfd2980 100644
--- a/DBASE/COIN/STD/standard.kinematics
+++ b/DBASE/COIN/STD/standard.kinematics
@@ -82,4 +82,14 @@ ptheta_lab = 25.0
gtargmass_amu = 26.98
1722
-gtargmass_amu = 1.00794
\ No newline at end of file
+gtargmass_amu = 1.00794
+
+1851-1855
+gpbeam = 6.405
+gtargmass_amu = 1.00794
+htheta_lab = -27.5
+ptheta_lab = 27.6
+hpcentral = 3.609
+ppcentral = 3.609
+hpartmass = 0.93827231
+ppartmass = 0.00051099
diff --git a/DBASE/SHMS/STD/standard.kinematics b/DBASE/SHMS/STD/standard.kinematics
index 1a1df5d7..ce64b61a 100644
--- a/DBASE/SHMS/STD/standard.kinematics
+++ b/DBASE/SHMS/STD/standard.kinematics
@@ -224,7 +224,7 @@ ptheta_lab =25.035
ppcentral = 1.4
-1843-1845
+1843-1849
gpbeam = 6.404
gtargmass_amu= 1.00794
ppartmass = 0.00051099
diff --git a/MAPS/COIN/DETEC/TRIG/cointrig.map b/MAPS/COIN/DETEC/TRIG/cointrig.map
index 6e26b424..f053837c 100644
--- a/MAPS/COIN/DETEC/TRIG/cointrig.map
+++ b/MAPS/COIN/DETEC/TRIG/cointrig.map
@@ -121,8 +121,7 @@ REFINDEX=3
0, 1, 10, 0 ! pAER
1, 1, 11, 0 ! pHGCER
2, 1, 12, 0 ! pNGCER
- 3, 1, 12, 0 ! pNGCER
- 4, 1, 13, 0 ! pPSHWR
+ 3, 1, 13, 0 ! pPSHWR
11, 1, 14, 0 ! pFADC_TREF_ROC2
! F250 module
diff --git a/MAPS/COIN/DETEC/coin.map b/MAPS/COIN/DETEC/coin.map
index 9a153d65..74a3cf06 100644
--- a/MAPS/COIN/DETEC/coin.map
+++ b/MAPS/COIN/DETEC/coin.map
@@ -3864,8 +3864,7 @@ REFINDEX=3
0, 1, 10, 0 ! pAER
1, 1, 11, 0 ! pHGCER
2, 1, 12, 0 ! pNGCER
- 3, 1, 12, 0 ! pNGCER
- 4, 1, 13, 0 ! pPSHWR
+ 3, 1, 13, 0 ! pPSHWR
11, 1, 14, 0 ! pFADC_TREF_ROC2
SLOT=20
diff --git a/SCRIPTS/HMS/PRODUCTION/replay_production_hms_coin.C b/SCRIPTS/HMS/PRODUCTION/replay_production_hms_coin.C
index 66220af9..b3e0d622 100644
--- a/SCRIPTS/HMS/PRODUCTION/replay_production_hms_coin.C
+++ b/SCRIPTS/HMS/PRODUCTION/replay_production_hms_coin.C
@@ -28,7 +28,7 @@ void replay_production_hms_coin(Int_t RunNumber=0, Int_t MaxEvent=0) {
//Load Global parameters
// Add variables to global list.
gHcParms->Define("gen_run_number", "Run Number", RunNumber);
- gHcParms->AddString("g_ctp_database_filename", "DBASE/HMS/STD/standard.database");
+ gHcParms->AddString("g_ctp_database_filename", "DBASE/COIN/STD/standard.database");
// Load varibles from files to global list.
gHcParms->Load(gHcParms->GetString("g_ctp_database_filename"), RunNumber);
// g_ctp_parm_filename and g_decode_map_filename should now be defined.
diff --git a/SCRIPTS/SHMS/PRODUCTION/replay_production_shms_coin.C b/SCRIPTS/SHMS/PRODUCTION/replay_production_shms_coin.C
index e79bf564..93b7a2ee 100644
--- a/SCRIPTS/SHMS/PRODUCTION/replay_production_shms_coin.C
+++ b/SCRIPTS/SHMS/PRODUCTION/replay_production_shms_coin.C
@@ -28,7 +28,7 @@ void replay_production_shms_coin (Int_t RunNumber = 0, Int_t MaxEvent = 0) {
// Load global parameters
// Add variables to global list.
gHcParms->Define("gen_run_number", "Run Number", RunNumber);
- gHcParms->AddString("g_ctp_database_filename", "DBASE/SHMS/STD/standard.database");
+ gHcParms->AddString("g_ctp_database_filename", "DBASE/COIN/STD/standard.database");
// Load varibles from files to global list.
gHcParms->Load(gHcParms->GetString("g_ctp_database_filename"), RunNumber);
// g_ctp_parm_filename and g_decode_map_filename should now be defined.
--
GitLab