From 82d014746efe9f449693b736160c1a421a05d27d Mon Sep 17 00:00:00 2001
From: Cdaq User <cdaq@jlab.org>
Date: Sat, 27 Oct 2018 22:15:02 -0400
Subject: [PATCH] Updating repo...
---
.gitignore | 1 +
DBASE/COIN/standard.database | 10 +-
DBASE/COIN/standard.kinematics | 115 +++++++++++++++++-
MAPS/COIN/DETEC/coin.map | 1 +
MAPS/COIN/DETEC/coin_fall18.map | 1 +
PARAM/TRIG/tcoin.param | 4 +-
PARAM/TRIG/tcoin_fall18.param | 4 +-
.../COIN/PRODUCTION/coin_production.template | 16 +++
UTIL_KAONLT | 1 -
UTIL_SIDIS | 2 +-
run_full_sidis.sh | 5 +-
11 files changed, 150 insertions(+), 10 deletions(-)
delete mode 160000 UTIL_KAONLT
diff --git a/.gitignore b/.gitignore
index 96a060c7..595a154a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,7 @@
*.root
# Directories
+OUTPUT
REPORT_OUTPUT
HISTOGRAMS
MON_OUTPUT
diff --git a/DBASE/COIN/standard.database b/DBASE/COIN/standard.database
index 0b15e342..47badda1 100644
--- a/DBASE/COIN/standard.database
+++ b/DBASE/COIN/standard.database
@@ -1,3 +1,11 @@
0-99999
g_ctp_parm_filename = "DBASE/COIN/general.param"
-g_ctp_kinematics_filename = "DBASE/COIN/standard.kinematics"
\ No newline at end of file
+g_ctp_kinematics_filename = "DBASE/COIN/standard.kinematics"
+0-5417
+g_ctp_map_filename = "MAPS/COIN/DETEC/coin.map"
+5418-99999
+g_ctp_map_filename = "MAPS/COIN/DETEC/coin_fall18.map"
+0-5417
+g_ctp_trigdet_filename = "PARAM/TRIG/tcoin.param"
+5418-99999
+g_ctp_trigdet_filename = "PARAM/TRIG/tcoin_fall18.param"
diff --git a/DBASE/COIN/standard.kinematics b/DBASE/COIN/standard.kinematics
index 07889321..d25c16d8 100644
--- a/DBASE/COIN/standard.kinematics
+++ b/DBASE/COIN/standard.kinematics
@@ -5185,7 +5185,7 @@ ppcentral = 4.800
ppartmass = 0.1395706
hpartmass = 0.0005109
-5409-9999
+5409-5436
pbeam = 10.585
gtargmass_amu = 2.014101
htheta_lab = -16.305
@@ -5193,4 +5193,115 @@ ptheta_lab = 15.99
hpcentral = 5.270
ppcentral = 3.44
ppartmass = 0.1395706
-hpartmass = 0.0005109
\ No newline at end of file
+hpartmass = 0.0005109
+
+5437-5446
+pbeam = 10.585
+gtargmass_amu = 2.014101
+htheta_lab = -16.305
+ptheta_lab = 14.005
+hpcentral = 5.270
+ppcentral = 3.44
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+5447-5456
+pbeam = 10.585
+gtargmass_amu = 2.014101
+htheta_lab = -16.305
+ptheta_lab = 12.000
+hpcentral = 5.270
+ppcentral = 3.44
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+5457-5466
+pbeam = 10.585
+gtargmass_amu = 2.014101
+htheta_lab = -16.305
+ptheta_lab = 18.005
+hpcentral = 5.270
+ppcentral = 3.44
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+5467-5474
+pbeam = 10.585
+gtargmass_amu = 2.014101
+htheta_lab = -16.305
+ptheta_lab = 20.000
+hpcentral = 5.270
+ppcentral = 3.44
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+5475-5485
+pbeam = 10.585
+gtargmass_amu = 2.014101
+htheta_lab = -16.305
+ptheta_lab = 10.000
+hpcentral = 5.270
+ppcentral = 3.44
+ppartmas= 0.1395706
+hpartmass = 0.0005109
+
+5486-5495
+pbeam = 10.585
+gtargmass_amu = 2.014101
+htheta_lab = -16.305
+ptheta_lab = 10.000
+hpcentral = 5.270
+ppcentral = 2.58
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+5496-5504
+pbeam = 10.585
+gtargmass_amu = 2.014101
+htheta_lab = -16.305
+ptheta_lab = 12.000
+hpcentral = 5.270
+ppcentral = 2.58
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+5505-5513
+pbeam = 10.585
+gtargmass_amu = 2.014101
+htheta_lab = -16.305
+ptheta_lab = 14.005
+hpcentral = 5.270
+ppcentral = 2.58
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+5514-5523
+pbeam = 10.585
+gtargmass_amu = 2.014101
+htheta_lab = -16.305
+ptheta_lab = 16.005
+hpcentral = 5.270
+ppcentral = 2.58
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+5524-5532
+pbeam = 10.585
+gtargmass_amu = 2.014101
+htheta_lab = -16.305
+ptheta_lab = 18.005
+hpcentral = 5.270
+ppcentral = 2.58
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
+5533-9999
+pbeam = 10.585
+gtargmass_amu = 2.014101
+htheta_lab = -16.305
+ptheta_lab = 20.00
+hpcentral = 5.270
+ppcentral = 2.58
+ppartmass = 0.1395706
+hpartmass = 0.0005109
+
diff --git a/MAPS/COIN/DETEC/coin.map b/MAPS/COIN/DETEC/coin.map
index 35244aae..6355fd18 100644
--- a/MAPS/COIN/DETEC/coin.map
+++ b/MAPS/COIN/DETEC/coin.map
@@ -3926,6 +3926,7 @@ REFINDEX=0
75, 2, 80, 1 ! hEL_HI_ROC2
76, 2, 81, 1 ! hEL_REAL_ROC2
77, 2, 82, 1 ! hEL_CLEAN_ROC2
+ 79, 2, 113, 1 ! pRF_ROC2
80, 2, 103, 1 ! pPRE40_ROC2
81, 2, 104, 1 ! pPRE100_ROC2
82, 2, 105, 1 ! pPRE150_ROC2
diff --git a/MAPS/COIN/DETEC/coin_fall18.map b/MAPS/COIN/DETEC/coin_fall18.map
index 10a0f004..4c281dab 100644
--- a/MAPS/COIN/DETEC/coin_fall18.map
+++ b/MAPS/COIN/DETEC/coin_fall18.map
@@ -3930,6 +3930,7 @@ REFINDEX=0
74, 2, 79, 1 ! hEL_LO_ROC2
75, 2, 80, 1 ! hEL_HI_ROC2
76, 2, 81, 1 ! hEL_REAL_ROC2
+ 79, 2, 113, 1 ! pRF_ROC2
77, 2, 82, 1 ! hEL_CLEAN_ROC2
80, 2, 103, 1 ! pPRE40_ROC2
81, 2, 104, 1 ! pPRE100_ROC2
diff --git a/PARAM/TRIG/tcoin.param b/PARAM/TRIG/tcoin.param
index 9804603c..72a997f4 100644
--- a/PARAM/TRIG/tcoin.param
+++ b/PARAM/TRIG/tcoin.param
@@ -1,5 +1,5 @@
t_coin_numAdc = 19
-t_coin_numTdc = 112
+t_coin_numTdc = 113
t_coin_tdcoffset = 300.
t_coin_adc_tdc_offset = 200.
t_coin_tdcchanperns = 0.09766
@@ -13,4 +13,4 @@ eHadCoinTime_Offset = 0.
t_coin_adcNames = "hASUM hBSUM hCSUM hDSUM hPSHWR hSHWR hAER hCER hFADC_TREF_ROC1 pAER pHGCER pNGCER pPSHWR pFADC_TREF_ROC2 pHGCER_MOD pNGCER_MOD pHEL_NEG pHEL_POS pHEL_MPS"
; bar num: 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112
-t_coin_tdcNames = "h1X h1Y h2X h2Y h1T h2T hT1 hASUM hBSUM hCSUM hDSUM hPRLO hPRHI hSHWR hEDTM hCER hT2 hDCREF1 hDCREF2 hDCREF3 hDCREF4 hTRIG1_ROC1 hTRIG2_ROC1 hTRIG3_ROC1 hTRIG4_ROC1 hTRIG5_ROC1 hTRIG6_ROC1 pTRIG1_ROC1 pTRIG2_ROC1 pTRIG3_ROC1 pTRIG4_ROC1 pTRIG5_ROC1 pTRIG6_ROC1 pT1 pT2 p1X p1Y p2X p2Y p1T p2T pT3 pAER pHGCER pNGCER pDCREF1 pDCREF2 pDCREF3 pDCREF4 pDCREF5 pDCREF6 pDCREF7 pDCREF8 pDCREF9 pDCREF10 pEDTM pPRLO pPRHI pTRIG1_ROC2 pTRIG2_ROC2 pTRIG3_ROC2 pTRIG4_ROC2 pTRIG5_ROC2 pTRIG6_ROC2 hTRIG1_ROC2 hTRIG2_ROC2 hTRIG3_ROC2 hTRIG4_ROC2 hTRIG5_ROC2 hTRIG6_ROC2 pSTOF_ROC2 pEL_LO_LO_ROC2 pEL_LO_ROC2 pEL_HI_ROC2 pEL_REAL_ROC2 pEL_CLEAN_ROC2 hSTOF_ROC2 hEL_LO_LO_ROC2 hEL_LO_ROC2 hEL_HI_ROC2 hEL_REAL_ROC2 hEL_CLEAN_ROC2 pSTOF_ROC1 pEL_LO_LO_ROC1 pEL_LO_ROC1 pEL_HI_ROC1 pEL_REAL_ROC1 pEL_CLEAN_ROC1 hSTOF_ROC1 hEL_LO_LO_ROC1 hEL_LO_ROC1 hEL_HI_ROC1 hEL_REAL_ROC1 hEL_CLEAN_ROC1 pPRE40_ROC1 pPRE100_ROC1 pPRE150_ROC1 pPRE200_ROC1 hPRE40_ROC1 hPRE100_ROC1 hPRE150_ROC1 hPRE200_ROC1 pPRE40_ROC2 pPRE100_ROC2 pPRE150_ROC2 pPRE200_ROC2 hPRE40_ROC2 hPRE100_ROC2 hPRE150_ROC2 hPRE200_ROC2 hDCREF5 hT3"
+t_coin_tdcNames = "h1X h1Y h2X h2Y h1T h2T hT1 hASUM hBSUM hCSUM hDSUM hPRLO hPRHI hSHWR hEDTM hCER hT2 hDCREF1 hDCREF2 hDCREF3 hDCREF4 hTRIG1_ROC1 hTRIG2_ROC1 hTRIG3_ROC1 hTRIG4_ROC1 hTRIG5_ROC1 hTRIG6_ROC1 pTRIG1_ROC1 pTRIG2_ROC1 pTRIG3_ROC1 pTRIG4_ROC1 pTRIG5_ROC1 pTRIG6_ROC1 pT1 pT2 p1X p1Y p2X p2Y p1T p2T pT3 pAER pHGCER pNGCER pDCREF1 pDCREF2 pDCREF3 pDCREF4 pDCREF5 pDCREF6 pDCREF7 pDCREF8 pDCREF9 pDCREF10 pEDTM pPRLO pPRHI pTRIG1_ROC2 pTRIG2_ROC2 pTRIG3_ROC2 pTRIG4_ROC2 pTRIG5_ROC2 pTRIG6_ROC2 hTRIG1_ROC2 hTRIG2_ROC2 hTRIG3_ROC2 hTRIG4_ROC2 hTRIG5_ROC2 hTRIG6_ROC2 pSTOF_ROC2 pEL_LO_LO_ROC2 pEL_LO_ROC2 pEL_HI_ROC2 pEL_REAL_ROC2 pEL_CLEAN_ROC2 hSTOF_ROC2 hEL_LO_LO_ROC2 hEL_LO_ROC2 hEL_HI_ROC2 hEL_REAL_ROC2 hEL_CLEAN_ROC2 pSTOF_ROC1 pEL_LO_LO_ROC1 pEL_LO_ROC1 pEL_HI_ROC1 pEL_REAL_ROC1 pEL_CLEAN_ROC1 hSTOF_ROC1 hEL_LO_LO_ROC1 hEL_LO_ROC1 hEL_HI_ROC1 hEL_REAL_ROC1 hEL_CLEAN_ROC1 pPRE40_ROC1 pPRE100_ROC1 pPRE150_ROC1 pPRE200_ROC1 hPRE40_ROC1 hPRE100_ROC1 hPRE150_ROC1 hPRE200_ROC1 pPRE40_ROC2 pPRE100_ROC2 pPRE150_ROC2 pPRE200_ROC2 hPRE40_ROC2 hPRE100_ROC2 hPRE150_ROC2 hPRE200_ROC2 hDCREF5 hT3 pRF"
diff --git a/PARAM/TRIG/tcoin_fall18.param b/PARAM/TRIG/tcoin_fall18.param
index d11c6b49..a3b3bfb4 100644
--- a/PARAM/TRIG/tcoin_fall18.param
+++ b/PARAM/TRIG/tcoin_fall18.param
@@ -1,5 +1,5 @@
t_coin_numAdc = 24
-t_coin_numTdc = 112
+t_coin_numTdc = 113
t_coin_tdcoffset = 300.
t_coin_adc_tdc_offset = 200.
t_coin_tdcchanperns = 0.09766
@@ -13,4 +13,4 @@ eHadCoinTime_Offset = 0.
t_coin_adcNames = "hASUM hBSUM hCSUM hDSUM hPSHWR hSHWR hAER hCER hFADC_TREF_ROC1 pAER pHGCER pNGCER pPSHWR pFADC_TREF_ROC2 pHGCER_MOD pNGCER_MOD pHEL_NEG pHEL_POS pHEL_MPS pHEL_QRT hHEL_NEG hHEL_POS hHEL_MPS hHEL_QRT"
; bar num: 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112
-t_coin_tdcNames = "h1X h1Y h2X h2Y h1T h2T hT1 hASUM hBSUM hCSUM hDSUM hPRLO hPRHI hSHWR hEDTM hCER hT2 hDCREF1 hDCREF2 hDCREF3 hDCREF4 hTRIG1_ROC1 hTRIG2_ROC1 hTRIG3_ROC1 hTRIG4_ROC1 hTRIG5_ROC1 hTRIG6_ROC1 pTRIG1_ROC1 pTRIG2_ROC1 pTRIG3_ROC1 pTRIG4_ROC1 pTRIG5_ROC1 pTRIG6_ROC1 pT1 pT2 p1X p1Y p2X p2Y p1T p2T pT3 pAER pHGCER pNGCER pDCREF1 pDCREF2 pDCREF3 pDCREF4 pDCREF5 pDCREF6 pDCREF7 pDCREF8 pDCREF9 pDCREF10 pEDTM pPRLO pPRHI pTRIG1_ROC2 pTRIG2_ROC2 pTRIG3_ROC2 pTRIG4_ROC2 pTRIG5_ROC2 pTRIG6_ROC2 hTRIG1_ROC2 hTRIG2_ROC2 hTRIG3_ROC2 hTRIG4_ROC2 hTRIG5_ROC2 hTRIG6_ROC2 pSTOF_ROC2 pEL_LO_LO_ROC2 pEL_LO_ROC2 pEL_HI_ROC2 pEL_REAL_ROC2 pEL_CLEAN_ROC2 hSTOF_ROC2 hEL_LO_LO_ROC2 hEL_LO_ROC2 hEL_HI_ROC2 hEL_REAL_ROC2 hEL_CLEAN_ROC2 pSTOF_ROC1 pEL_LO_LO_ROC1 pEL_LO_ROC1 pEL_HI_ROC1 pEL_REAL_ROC1 pEL_CLEAN_ROC1 hSTOF_ROC1 hEL_LO_LO_ROC1 hEL_LO_ROC1 hEL_HI_ROC1 hEL_REAL_ROC1 hEL_CLEAN_ROC1 pPRE40_ROC1 pPRE100_ROC1 pPRE150_ROC1 pPRE200_ROC1 hPRE40_ROC1 hPRE100_ROC1 hPRE150_ROC1 hPRE200_ROC1 pPRE40_ROC2 pPRE100_ROC2 pPRE150_ROC2 pPRE200_ROC2 hPRE40_ROC2 hPRE100_ROC2 hPRE150_ROC2 hPRE200_ROC2 hDCREF5 hT3"
+t_coin_tdcNames = "h1X h1Y h2X h2Y h1T h2T hT1 hASUM hBSUM hCSUM hDSUM hPRLO hPRHI hSHWR hEDTM hCER hT2 hDCREF1 hDCREF2 hDCREF3 hDCREF4 hTRIG1_ROC1 hTRIG2_ROC1 hTRIG3_ROC1 hTRIG4_ROC1 hTRIG5_ROC1 hTRIG6_ROC1 pTRIG1_ROC1 pTRIG2_ROC1 pTRIG3_ROC1 pTRIG4_ROC1 pTRIG5_ROC1 pTRIG6_ROC1 pT1 pT2 p1X p1Y p2X p2Y p1T p2T pT3 pAER pHGCER pNGCER pDCREF1 pDCREF2 pDCREF3 pDCREF4 pDCREF5 pDCREF6 pDCREF7 pDCREF8 pDCREF9 pDCREF10 pEDTM pPRLO pPRHI pTRIG1_ROC2 pTRIG2_ROC2 pTRIG3_ROC2 pTRIG4_ROC2 pTRIG5_ROC2 pTRIG6_ROC2 hTRIG1_ROC2 hTRIG2_ROC2 hTRIG3_ROC2 hTRIG4_ROC2 hTRIG5_ROC2 hTRIG6_ROC2 pSTOF_ROC2 pEL_LO_LO_ROC2 pEL_LO_ROC2 pEL_HI_ROC2 pEL_REAL_ROC2 pEL_CLEAN_ROC2 hSTOF_ROC2 hEL_LO_LO_ROC2 hEL_LO_ROC2 hEL_HI_ROC2 hEL_REAL_ROC2 hEL_CLEAN_ROC2 pSTOF_ROC1 pEL_LO_LO_ROC1 pEL_LO_ROC1 pEL_HI_ROC1 pEL_REAL_ROC1 pEL_CLEAN_ROC1 hSTOF_ROC1 hEL_LO_LO_ROC1 hEL_LO_ROC1 hEL_HI_ROC1 hEL_REAL_ROC1 hEL_CLEAN_ROC1 pPRE40_ROC1 pPRE100_ROC1 pPRE150_ROC1 pPRE200_ROC1 hPRE40_ROC1 hPRE100_ROC1 hPRE150_ROC1 hPRE200_ROC1 pPRE40_ROC2 pPRE100_ROC2 pPRE150_ROC2 pPRE200_ROC2 hPRE40_ROC2 hPRE100_ROC2 hPRE150_ROC2 hPRE200_ROC2 hDCREF5 hT3 pRF"
diff --git a/TEMPLATES/COIN/PRODUCTION/coin_production.template b/TEMPLATES/COIN/PRODUCTION/coin_production.template
index 81ab5274..950c231d 100644
--- a/TEMPLATES/COIN/PRODUCTION/coin_production.template
+++ b/TEMPLATES/COIN/PRODUCTION/coin_production.template
@@ -81,6 +81,22 @@ SHMS BCM4A Beam Cut Charge: {P.BCM4A.scalerChargeCut/1000.:%.3f} mC
SHMS BCM4B Beam Cut Charge: {P.BCM4B.scalerChargeCut/1000.:%.3f} mC
SHMS BCM4C Beam Cut Charge: {P.BCM4C.scalerChargeCut/1000.:%.3f} mC
SHMS Unser Beam Cut Charge: {P.Unser.scalerChargeCut/1000.:%.3f} mC
+
+
+****** Trig rates with current cut *********
+TRIG1 Rate Cut Current : {P.pTRIG1.scalerCut/P.1MHz.scalerTimeCut}
+TRIG2 Rate Cut Current : {P.pTRIG2.scalerCut/P.1MHz.scalerTimeCut}
+TRIG3 Rate Cut Current : {P.pTRIG3.scalerCut/P.1MHz.scalerTimeCut}
+TRIG4 Rate Cut Current : {P.pTRIG4.scalerCut/P.1MHz.scalerTimeCut}
+TRIG5 Rate Cut Current : {P.pTRIG5.scalerCut/P.1MHz.scalerTimeCut}
+
+**** Trig counts/uC *****
+TRIG1 Counts/uC Cut Current : {P.pTRIG1.scalerCut/P.BCM4B.scalerChargeCut}
+TRIG2 Counts/uC Cut Current : {P.pTRIG2.scalerCut/P.BCM4B.scalerChargeCut}
+TRIG3 Counts/uC Cut Current : {P.pTRIG3.scalerCut/P.BCM4B.scalerChargeCut}
+TRIG4 Counts/uC Cut Current : {P.pTRIG4.scalerCut/P.BCM4B.scalerChargeCut}
+TRIG5 Counts/uC Cut Current : {P.pTRIG5.scalerCut/P.BCM4B.scalerChargeCut}
+
********************
diff --git a/UTIL_KAONLT b/UTIL_KAONLT
deleted file mode 160000
index bcff131f..00000000
--- a/UTIL_KAONLT
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit bcff131ff80520694848bc9337e3551d4ecf6545
diff --git a/UTIL_SIDIS b/UTIL_SIDIS
index 1c293486..1f590487 160000
--- a/UTIL_SIDIS
+++ b/UTIL_SIDIS
@@ -1 +1 @@
-Subproject commit 1c29348640e5117e20b67781c2805fc23ea52c9d
+Subproject commit 1f590487513709119f8442ccce970d41f6932134
diff --git a/run_full_sidis.sh b/run_full_sidis.sh
index ca165b20..03112037 100755
--- a/run_full_sidis.sh
+++ b/run_full_sidis.sh
@@ -21,7 +21,10 @@ if [ -z "$runNum" ]; then
fi
# How many events to analyze.
-numEvents=-1
+numEvents=$2
+if [ -z "$numEvents" ]; then
+ numEvents=-1
+fi
# Which scripts to run.
script="./UTIL_SIDIS/scripts/replay/replay_production_coin_sidis.C"
--
GitLab