From 86fecad3d97434a89ad165e138ecc11c59130b5f Mon Sep 17 00:00:00 2001 From: Benjamin Linnik Date: Thu, 16 Mar 2017 12:52:28 +0100 Subject: [PATCH] Analyzer: Push sync --- MABS_run_analyzer/ChargeSpektrum.c | 7 +++++-- MABS_run_analyzer/Run.c | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/MABS_run_analyzer/ChargeSpektrum.c b/MABS_run_analyzer/ChargeSpektrum.c index 70f31f7..068b0a7 100644 --- a/MABS_run_analyzer/ChargeSpektrum.c +++ b/MABS_run_analyzer/ChargeSpektrum.c @@ -110,7 +110,10 @@ void ChargeSpektrum(TString runnumber = "") // compareHistogramClassVector2.push_back(runs[runi]->histogramthreshold); //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]->histogram->normalized->calibrated, runs[runi]->processed->fNoiseInfo.fPedestals, "", 1); + runs[runi]->plot1DHistogram(runs[runi]->histogram->normalized->calibrated, runs[runi]->histogram->normalized->calibrated->Seed, "landau", 1); + runs[runi]->plot1DHistogram(runs[runi]->histogram, runs[runi]->histogramwoRTS->pixeltimefiredsorted, "", 0); // 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); @@ -129,7 +132,7 @@ void ChargeSpektrum(TString runnumber = "") // // // RTS Hit analysis // runs[runi]->plot1DHistogram(runs[runi]->histogram, runs[runi]->histogramwoRTSthreshold->pixeltimefired, "", 0); -// // runs[runi]->plot1DHistogram(runs[runi]->histogram, runs[runi]->histogramwoRTSthreshold->pixeltimefiredsorted, "", 0); +// runs[runi]->plot1DHistogram(runs[runi]->histogram, runs[runi]->histogramwoRTSthreshold->pixeltimefiredsorted, "", 0); // // compareHistogramVector3.push_back(runs[runi]->histogramwoRTSthreshold->pixeltimefiredsorted); // compareHistogramVector6.push_back(runs[runi]->histogramwoRTSthreshold->calibrated->pixeltimefiredsorted); diff --git a/MABS_run_analyzer/Run.c b/MABS_run_analyzer/Run.c index 714d5ee..e97d715 100644 --- a/MABS_run_analyzer/Run.c +++ b/MABS_run_analyzer/Run.c @@ -995,8 +995,8 @@ void Run::updateDatabase() { } } if (histogramthreshold->normalized->calibrated != 0) - if (histogramfixedthreshold != 0) - constructUpdateString(&sqlupdatequery, "Sr90IntegralVal", histogramfixedthreshold->normalized->calibrated->sr90IntegralVal,1000000000); +// if (histogramfixedthreshold != 0) + constructUpdateString(&sqlupdatequery, "Sr90IntegralVal", histogramthreshold->normalized->calibrated->sr90IntegralVal,1000000000); if (sqlupdatequery.length()>0) { -- 2.43.0