Analyzer: Leakage current fix, rts pixel are considered in leakage current calculation

diff --git a/MABS_run_analyzer/ChargeSpektrum.c b/MABS_run_analyzer/ChargeSpektrum.c
index 2e734f83eb8680f304cce48523fab393d307f9e0..25395222462503cdca9900d3af8ba4161ec08279 100644 (file)
--- a/MABS_run_analyzer/ChargeSpektrum.c
+++ b/MABS_run_analyzer/ChargeSpektrum.c
@@ -9,6 +9,7 @@
  *
  *
  */
+Bool_t isBatch = kFALSE;
 
 #include "help.h"
 #include "Run.h"
@@ -27,6 +28,8 @@ Int_t numberRuns;
 void ChargeSpektrum(TString runnumber = "")
 {
     cout << endl << endl;
+    if (gROOT->IsBatch())
+        isBatch = kTRUE;
     
     numberRuns=0;
     std::vector<int> runList;
@@ -150,7 +153,7 @@ void ChargeSpektrum(TString runnumber = "")
                         compareHistogramClassVectorMABSBot.push_back(runs[runi]->histogramwoRTS);
                         
                         //         gROOT->SetBatch(kTRUE);
-                        if (!(gROOT->IsBatch()))
+                        if (!isBatch)
                             gROOT->SetBatch(kFALSE);
                         
                         // ****************************************************************
@@ -467,7 +470,7 @@ void ChargeSpektrum(TString runnumber = "")
                     
                     // DEBUGGING                    
                     // runs[runi]->histogramwoRTS->FindNoisethresholdborder(runs[runi]->histogramwoRTS->Veto, false, true);
-                    runs[runi]->plot1DHistogram( runs[runi]->histogram->Veto, "GaussTail", true, false, false, runs[runi]->histogram->noisethresholdborder);
+//                     runs[runi]->plot1DHistogram( runs[runi]->histogram->Veto, "GaussTail", true, false, false, runs[runi]->histogram->noisethresholdborder);
 //                     runs[runi]->plot1DHistogram( runs[runi]->histogramwoRTS->a_Sum25[22], "gaus", true, false, false, runs[runi]->histogramwoRTS->noisethresholdborder);
                     
                     //cout << runs[runi]->histogram

diff --git a/MABS_run_analyzer/help.h b/MABS_run_analyzer/help.h
index e31691abef99aa5ede1605b956a6e58d40f4a223..5608f7b6d821a3a832f9d135bc41dfcd4baf96fa 100644 (file)
--- a/MABS_run_analyzer/help.h
+++ b/MABS_run_analyzer/help.h
@@ -32,7 +32,6 @@
 #define MAXHITS          1000000
 #define MAXPIXELS 100000
 
-
 using namespace std;
 
 
@@ -365,7 +364,7 @@ void MSaveBigPNG(TCanvas* old_canv, TString filename="", double scale=1) {
     gStyle->SetFuncWidth(orig_lt);
 
     
-    if (!(gROOT->IsBatch())) {
+    if (!isBatch) {
 //         gROOT->ForceStyle(kFALSE);
         gROOT->SetBatch(kFALSE);
     }