diff --git a/SCRIPTS/COIN/MONITOR/coin_monitor_calc.C b/SCRIPTS/COIN/MONITOR/coin_monitor_calc.C
index e74d818ebf69086a2c3193c6025ee3b10fd1eaa2..7644c3e39b5b171eb6e85a8dbab368dbba54387a 100644
--- a/SCRIPTS/COIN/MONITOR/coin_monitor_calc.C
+++ b/SCRIPTS/COIN/MONITOR/coin_monitor_calc.C
@@ -120,7 +120,7 @@ void coin_monitor_calc(Int_t RunNumber = 0, Int_t TargetType = 0, Int_t Kinemati
// Open old data, copy to new tree.
// We skip if an old datum's run number matches the one the user specified.
- TFile* newYieldF = new TFile("SCRIPTS/COIN/MONITOR/coin_monitor_new.root", "RECREATE");
+ TFile* newYieldF = new TFile("ROOTfiles/coin_monitor_new.root", "RECREATE");
TTree* TY_new = new TTree("Y","coin_monitor tree");
int run_new, tgt_new, kin_new, pN_trig_new, hN_trig_new;
double pYpc_new, hYpc_new, pQ_new, hQ_new;
@@ -143,7 +143,7 @@ void coin_monitor_calc(Int_t RunNumber = 0, Int_t TargetType = 0, Int_t Kinemati
TY_new->Branch("h3of4Eff",&h3of4Eff_new);
TY_new->Branch("roc2PS6liveTime",&roc2PS6liveTime_new);
- TFile* yieldF = new TFile("SCRIPTS/COIN/MONITOR/coin_monitor.root","READ");
+ TFile* yieldF = new TFile("ROOTfiles/coin_monitor.root","READ");
TTree* TY_old = (TTree*)yieldF->Get("Y");
int run_old, tgt_old, kin_old, pN_trig_old, hN_trig_old;
@@ -219,5 +219,5 @@ void coin_monitor_calc(Int_t RunNumber = 0, Int_t TargetType = 0, Int_t Kinemati
// Rename new root file to old one
newYieldF->Write();
newYieldF->Close();
- gSystem->Exec("mv SCRIPTS/COIN/MONITOR/coin_monitor_new.root SCRIPTS/COIN/MONITOR/coin_monitor.root");
+ gSystem->Exec("mv ROOTfiles/coin_monitor_new.root ROOTfiles/coin_monitor.root");
}
diff --git a/SCRIPTS/COIN/MONITOR/coin_monitor_calc_batch.sh b/SCRIPTS/COIN/MONITOR/coin_monitor_calc_batch.sh
index e3b1f8293355d1b628cb4850052ebce8e6e7a025..ce0e053a756719e8cf5bdea9d6a89e8efd2c8f28 100755
--- a/SCRIPTS/COIN/MONITOR/coin_monitor_calc_batch.sh
+++ b/SCRIPTS/COIN/MONITOR/coin_monitor_calc_batch.sh
@@ -1,23 +1,49 @@
#!/bin/bash
+echo Creating blank coin_monitor.root
./hcana -q "SCRIPTS/COIN/MONITOR/coin_monitor_init.C"
-./hcana -q "SCRIPTS/COIN/MONITOR/coin_monitor_calc.C(2023,1,1)"
-./hcana -q "SCRIPTS/COIN/MONITOR/coin_monitor_calc.C(2046,1,1)"
-./hcana -q "SCRIPTS/COIN/MONITOR/coin_monitor_calc.C(2047,1,1)"
-./hcana -q "SCRIPTS/COIN/MONITOR/coin_monitor_calc.C(2048,1,1)"
-#./hcana -q "SCRIPTS/COIN/MONITOR/coin_monitor_calc.C(2049,1,1)"
-./hcana -q "SCRIPTS/COIN/MONITOR/coin_monitor_calc.C(2050,1,1)"
-./hcana -q "SCRIPTS/COIN/MONITOR/coin_monitor_calc.C(2051,1,1)"
-./hcana -q "SCRIPTS/COIN/MONITOR/coin_monitor_calc.C(2052,1,1)"
-./hcana -q "SCRIPTS/COIN/MONITOR/coin_monitor_calc.C(2054,1,1)"
-./hcana -q "SCRIPTS/COIN/MONITOR/coin_monitor_calc.C(2055,3,1)"
-./hcana -q "SCRIPTS/COIN/MONITOR/coin_monitor_calc.C(2056,2,1)"
-./hcana -q "SCRIPTS/COIN/MONITOR/coin_monitor_calc.C(2062,2,1)"
-./hcana -q "SCRIPTS/COIN/MONITOR/coin_monitor_calc.C(2064,2,1)"
-./hcana -q "SCRIPTS/COIN/MONITOR/coin_monitor_calc.C(2065,2,1)"
-./hcana -q "SCRIPTS/COIN/MONITOR/coin_monitor_calc.C(2066,1,1)"
-./hcana -q "SCRIPTS/COIN/MONITOR/coin_monitor_calc.C(2067,3,1)"
-./hcana -q "SCRIPTS/COIN/MONITOR/coin_monitor_calc.C(2068,3,1)"
-./hcana -q "SCRIPTS/COIN/MONITOR/coin_monitor_calc.C(2187,2,1)"
-./hcana -q "SCRIPTS/COIN/MONITOR/coin_monitor_calc.C(2188,2,1)"
-./hcana -q "SCRIPTS/COIN/MONITOR/coin_monitor_calc.C(2189,2,1)"
-./hcana -q "SCRIPTS/COIN/MONITOR/coin_monitor_calc.C(2190,2,1)"
+
+# Hydrogen
+./hcana -q "SCRIPTS/COIN/MONITOR/coin_monitor_calc.C(2278,1)"
+./hcana -q "SCRIPTS/COIN/MONITOR/coin_monitor_calc.C(2279,1)"
+./hcana -q "SCRIPTS/COIN/MONITOR/coin_monitor_calc.C(2280,1)"
+./hcana -q "SCRIPTS/COIN/MONITOR/coin_monitor_calc.C(2281,1)"
+./hcana -q "SCRIPTS/COIN/MONITOR/coin_monitor_calc.C(2283,1)"
+
+# Carbon
+./hcana -q "SCRIPTS/COIN/MONITOR/coin_monitor_calc.C(2284,2)"
+./hcana -q "SCRIPTS/COIN/MONITOR/coin_monitor_calc.C(2285,2)"
+./hcana -q "SCRIPTS/COIN/MONITOR/coin_monitor_calc.C(2286,2)"
+./hcana -q "SCRIPTS/COIN/MONITOR/coin_monitor_calc.C(2290,2)"
+./hcana -q "SCRIPTS/COIN/MONITOR/coin_monitor_calc.C(2291,2)"
+./hcana -q "SCRIPTS/COIN/MONITOR/coin_monitor_calc.C(2292,2)"
+./hcana -q "SCRIPTS/COIN/MONITOR/coin_monitor_calc.C(2293,2)"
+./hcana -q "SCRIPTS/COIN/MONITOR/coin_monitor_calc.C(2294,2)"
+./hcana -q "SCRIPTS/COIN/MONITOR/coin_monitor_calc.C(2295,2)"
+./hcana -q "SCRIPTS/COIN/MONITOR/coin_monitor_calc.C(2296,2)"
+./hcana -q "SCRIPTS/COIN/MONITOR/coin_monitor_calc.C(2297,2)"
+./hcana -q "SCRIPTS/COIN/MONITOR/coin_monitor_calc.C(2298,2)"
+./hcana -q "SCRIPTS/COIN/MONITOR/coin_monitor_calc.C(2299,2)"
+./hcana -q "SCRIPTS/COIN/MONITOR/coin_monitor_calc.C(2300,2)"
+./hcana -q "SCRIPTS/COIN/MONITOR/coin_monitor_calc.C(2301,2)"
+./hcana -q "SCRIPTS/COIN/MONITOR/coin_monitor_calc.C(2303,2)"
+./hcana -q "SCRIPTS/COIN/MONITOR/coin_monitor_calc.C(2304,2)"
+./hcana -q "SCRIPTS/COIN/MONITOR/coin_monitor_calc.C(2305,2)"
+./hcana -q "SCRIPTS/COIN/MONITOR/coin_monitor_calc.C(2306,2)"
+./hcana -q "SCRIPTS/COIN/MONITOR/coin_monitor_calc.C(2308,2)"
+./hcana -q "SCRIPTS/COIN/MONITOR/coin_monitor_calc.C(2309,2)"
+./hcana -q "SCRIPTS/COIN/MONITOR/coin_monitor_calc.C(2310,2)"
+./hcana -q "SCRIPTS/COIN/MONITOR/coin_monitor_calc.C(2311,2)"
+./hcana -q "SCRIPTS/COIN/MONITOR/coin_monitor_calc.C(2312,2)"
+./hcana -q "SCRIPTS/COIN/MONITOR/coin_monitor_calc.C(2313,2)"
+./hcana -q "SCRIPTS/COIN/MONITOR/coin_monitor_calc.C(2314,2)"
+./hcana -q "SCRIPTS/COIN/MONITOR/coin_monitor_calc.C(2315,2)"
+./hcana -q "SCRIPTS/COIN/MONITOR/coin_monitor_calc.C(2316,2)"
+./hcana -q "SCRIPTS/COIN/MONITOR/coin_monitor_calc.C(2317,2)"
+./hcana -q "SCRIPTS/COIN/MONITOR/coin_monitor_calc.C(2318,2)"
+./hcana -q "SCRIPTS/COIN/MONITOR/coin_monitor_calc.C(2319,2)"
+./hcana -q "SCRIPTS/COIN/MONITOR/coin_monitor_calc.C(2320,2)"
+./hcana -q "SCRIPTS/COIN/MONITOR/coin_monitor_calc.C(2321,2)"
+./hcana -q "SCRIPTS/COIN/MONITOR/coin_monitor_calc.C(2322,2)"
+./hcana -q "SCRIPTS/COIN/MONITOR/coin_monitor_calc.C(2323,2)"
+./hcana -q "SCRIPTS/COIN/MONITOR/coin_monitor_calc.C(2324,2)"
+./hcana -q "SCRIPTS/COIN/MONITOR/coin_monitor_calc.C(2325,2)"
diff --git a/SCRIPTS/COIN/MONITOR/coin_monitor_graph.C b/SCRIPTS/COIN/MONITOR/coin_monitor_graph.C
index cae6103df0ebe042223ce6214fc43de2b69d924b..d3885af23f1234c4bfc3545e6a919b593bbf7f2f 100644
--- a/SCRIPTS/COIN/MONITOR/coin_monitor_graph.C
+++ b/SCRIPTS/COIN/MONITOR/coin_monitor_graph.C
@@ -1,5 +1,5 @@
void coin_monitor_graph(int runMin = -1, int runMax = -1) {
- TFile* yieldF = new TFile("SCRIPTS/COIN/MONITOR/coin_monitor.root","READ");
+ TFile* yieldF = new TFile("ROOTfiles/coin_monitor.root","READ");
TTree* TY=(TTree*)yieldF->Get("Y");
//gStyle->SetOptTitle(kFALSE);
diff --git a/SCRIPTS/COIN/MONITOR/coin_monitor_init.C b/SCRIPTS/COIN/MONITOR/coin_monitor_init.C
index 5c84adff139970406f27a977d2a650f4fdfa7933..cea6d96ec0f26092186ce973972b83a79bfe6903 100644
--- a/SCRIPTS/COIN/MONITOR/coin_monitor_init.C
+++ b/SCRIPTS/COIN/MONITOR/coin_monitor_init.C
@@ -1,6 +1,6 @@
{
- TFile* newYieldF = new TFile("SCRIPTS/COIN/MONITOR/coin_monitor.root", "RECREATE");
- TTree* TY_new = new TTree("Y","SCRIPTS/COIN/MONITOR/coin_monitor tree");
+ TFile* newYieldF = new TFile("ROOTfiles/coin_monitor.root", "RECREATE");
+ TTree* TY_new = new TTree("Y","coin_monitor tree");
int run_new, tgt_new, kin_new, pN_trig_new, hN_trig_new;
double pYpc_new, hYpc_new, pQ_new, hQ_new;
double pHadTrackEff_new, pHadTrackEffErr_new, hElecTrackEff_new, hElecTrackEffErr_new;