From: Benjamin Linnik Date: Tue, 1 Nov 2016 16:21:01 +0000 (+0100) Subject: Analyzer: Merged with Tobi X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=8ae111912265fc8f9095c0e360aa0e7e0036db9e;p=radhard.git Analyzer: Merged with Tobi --- 8ae111912265fc8f9095c0e360aa0e7e0036db9e diff --cc MABS_run_analyzer/ChargeSpektrum.c index b9852dc,fa6146d..0bfaf84 --- a/MABS_run_analyzer/ChargeSpektrum.c +++ b/MABS_run_analyzer/ChargeSpektrum.c @@@ -101,10 -101,15 +101,12 @@@ void ChargeSpektrum(TString runnumber gROOT->SetBatch(kFALSE); // Uncomment below to do classical analysis withour RTS -// compareHistogramClassVector2.push_back(runs[runi]->histogramwoRTS->normalized->calibrated); - - runs[runi]->plotAllHistograms(runs[runi]->histogram); - //compareHistogramClassVector.push_back(runs[runi]->histogram->normalized->calibrated); - //compareHistogramClassVector2.push_back(runs[runi]->histogram->normalized); + compareHistogramClassVector2.push_back(runs[runi]->histogram->normalized->calibrated); + compareHistogramClassVector.push_back(runs[runi]->histogram->normalized); // compareHistogramClassVector2.push_back(runs[runi]->histogramthreshold); - // compareHistogramVector2.push_back(runs[runi]->histogramwoRTS->normalized->calibrated->Seed); - compareHistogramVector.push_back(runs[runi]->histogram->normalized->calibrated->Seed); ++ /*compareHistogramVector*/.push_back(runs[runi]->histogram->normalized->calibrated->Seed); + compareHistogramVector2.push_back(runs[runi]->histogram->normalized->Seed); + //runs[runi]->plot1DHistogram(runs[runi]->histogram->normalized->calibrated, runs[runi]->histogram->normalized->calibrated->Seed, "landau", 1); // runs[runi]->plot1DHistogram(runs[runi]->histogramwoRTS->normalized->calibrated, runs[runi]->histogramwoRTS->normalized->calibrated->Seed, "landau", true); // runs[runi]->plot1DHistogram(runs[runi]->histogramwoRTS->normalized->calibrated, runs[runi]->histogramwoRTS->normalized->calibrated->Sum, "gaus", true); diff --cc MABS_run_analyzer/ChargeSpektrumFunctions.c index b7928c0,7e1b426..561d2d3 --- a/MABS_run_analyzer/ChargeSpektrumFunctions.c +++ b/MABS_run_analyzer/ChargeSpektrumFunctions.c @@@ -669,18 -669,18 +669,19 @@@ Bool_t plotAllRuns(vectorGetTitle()); leg2->AddEntry(curhistogramclone, legendEntry, "l"); leg2->Draw("SAME"); -// hs->Add(leg1); + // hs->Add(leg1); curhistogramclone->SetAxisRange(0,lastbin2*1.1,"X"); curhistogramclone->SetAxisRange(0,heighestval2*1.1,"Y"); -// heighestval2 = (curhistogramclone->GetMaximum()>heighestval2?curhistogramclone->GetMaximum():heighestval2); + // heighestval2 = (curhistogramclone->GetMaximum()>heighestval2?curhistogramclone->GetMaximum():heighestval2); curhistogramclone->GetYaxis()->SetRangeUser(1,heighestval2*1.2); curhistogramclone->Draw("SAME"); -// gPad->SetLogy(1); - gPad->SetGrid(1); - gPad->SetGridy(1); + // gPad->SetLogy(1); + gPad->SetGrid(1); + gPad->SetGridy(1); ++ owntitle2->Clear(); owntitle2->AddText(trimRunnumberAtBegin(curhistogramclone->GetName())); -// hs->Add(owntitle2); + // hs->Add(owntitle2); owntitle2->Draw("SAME"); canvas->cd(3);