From 882db5020e32379865dc03e5761604cfb7f19232 Mon Sep 17 00:00:00 2001 From: Benjamin Linnik Date: Mon, 18 Dec 2017 18:22:33 +0100 Subject: [PATCH] Analyzer: Leakage current fix, rts pixel are considered in leakage current calculation --- MABS_run_analyzer/ChargeSpektrum.c | 7 +++++-- MABS_run_analyzer/help.h | 3 +-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/MABS_run_analyzer/ChargeSpektrum.c b/MABS_run_analyzer/ChargeSpektrum.c index 2e734f8..2539522 100644 --- 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 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 e31691a..5608f7b 100644 --- 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); } -- 2.43.0