Updating code to work with load-library features

JeffersonLab · May 2, 2019 · a50ef86 · a50ef86
1 parent 7c28038
commit a50ef86
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/rootScripts/aggregator/anaInt.cfg b/rootScripts/aggregator/anaInt.cfg
@@ -24,8 +24,9 @@ definecut bcmds_cut (-1*bcm_ds>1)
 
 newpage 2 5
 	title CAMGUIN Test
+  loadlib camguin_C.so
   macro ./camguin.C("draw","evt","bcm_an_ds3","hw_sum","defaultCuts",0,"clean")
-  macro ./camguin.C("meanRms","mul","yield_sam1","hw_sum","defaultCuts",0,"defaultHist")
+  loadmacro camguin_C.so ./camguin.C("meanRms","mul","yield_sam1","hw_sum","defaultCuts",0,"defaultHist")
   macro ./camguin.C("int","evt","bcm_an_us","hw_sum","defaultCuts",0,"defaultHist")
   macro ./camguin.C("redraw","evt","bcm_an_us","hw_sum","defaultCuts",0,"defaultHist")
   macro ./camguin.C("intloop","evt","bcm_an_ds","hw_sum","defaultCuts",0,"clean")

diff --git a/rootScripts/aggregator/camAna.hh b/rootScripts/aggregator/camAna.hh
@@ -36,9 +36,7 @@ void writeMean_Loop_h(TString tree = "mul", TString branch = "asym_vqwk_04_0ch0"
   TString channel = tree + "_" + branch + "_" + leaf;
   // Make an instance of the relevant data source 
   TLeaf   *Leaf   = getLeaf_h(tree,branch,leaf,runNumber,nRuns);
-  if (!Leaf){
-    return;
-  }
+  if (Leaf){
   TBranch *Branch = Leaf->GetBranch();
   TTree   *Tree   = Branch->GetTree();
   Int_t    numEntries = Tree->GetEntries();
@@ -56,6 +54,7 @@ void writeMean_Loop_h(TString tree = "mul", TString branch = "asym_vqwk_04_0ch0"
   }
   data_mean = data/(1.0*n_data);
   writeFile_h(analysis,data_mean,runNumber,nRuns);
+  }
 }
 
 void writeInt_loop_h(TString tree = "mul", TString branch = "asym_vqwk_04_0ch0", TString leaf = "hw_sum", TString cut = "defaultCut", Int_t runNumber = 0, Int_t nRuns = -1){

diff --git a/rootScripts/aggregator/camguin.hh b/rootScripts/aggregator/camguin.hh
@@ -18,6 +18,12 @@
 #include <string>
 #include <stdlib.h>
 #include <dirent.h>
+#include <TROOT.h>
+#include <TSystem.h>
+#include <TChain.h>
+#include <TLeaf.h>
+#include <TH1.h>
+#include <TFile.h>
 using namespace std;
 
 int debug = 0;