From e0612b699d9f3c395844997c455372e02e8483a4 Mon Sep 17 00:00:00 2001 From: Benjamin Linnik Date: Mon, 18 Dec 2017 17:49:31 +0100 Subject: [PATCH] Analyzer: Leakage current fix, rts pixel are considered in leakage current calculation --- MABS_run_analyzer/ChargeSpektrum.c | 4 ++-- MABS_run_analyzer/Run.cpp | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/MABS_run_analyzer/ChargeSpektrum.c b/MABS_run_analyzer/ChargeSpektrum.c index 8d09813..1880506 100644 --- a/MABS_run_analyzer/ChargeSpektrum.c +++ b/MABS_run_analyzer/ChargeSpektrum.c @@ -265,8 +265,8 @@ void ChargeSpektrum(TString runnumber = "") compareHistogramVectorRTSSeed.push_back(runs[runi]->histogramwoRTS->normalized->Seed); compareHistogramVectorRTSSum.push_back(*(runs[runi]->histogramwoRTS->normalized->Sum)); - runs[runi]->plot1DHistogram(runs[runi]->histogramwoRTS->pixeltimefiredDistrib, "gaus", false, true); - runs[runi]->plot1DHistogram(runs[runi]->histogramwoRTS->LeakageCurrentInPixelSorted); + runs[runi]->plot1DHistogram(runs[runi]->histogram->pixeltimefiredDistrib, "gaus", false, true); + runs[runi]->plot1DHistogram(runs[runi]->histogram->LeakageCurrentInPixelSorted); if (runi+1 == numberRuns) { compareHistogramVectorVector.push_back(compareHistogramVectorRTSSeed); diff --git a/MABS_run_analyzer/Run.cpp b/MABS_run_analyzer/Run.cpp index 347b872..84356b0 100644 --- a/MABS_run_analyzer/Run.cpp +++ b/MABS_run_analyzer/Run.cpp @@ -1066,13 +1066,13 @@ void Run::updateDatabase() { if (histogramwoRTS != 0) { constructUpdateString(&sqlupdatequery, "RTSpixel", histogramwoRTS->normalized->RTSpixel.size()); constructUpdateString(&sqlupdatequery, "RTSpixel_percentage", histogramwoRTS->normalized->percentageofRTSpixel); - constructUpdateString(&sqlupdatequery, "LeakageCurMedADC", histogramwoRTS->medianLeakageCurrent); - constructUpdateString(&sqlupdatequery, "LeakageCurAvgADC", histogramwoRTS->avgLeakageCurrentInChip); + constructUpdateString(&sqlupdatequery, "LeakageCurMedADC", histogram->medianLeakageCurrent); + constructUpdateString(&sqlupdatequery, "LeakageCurAvgADC", histogram->avgLeakageCurrentInChip); if (histogramwoRTS->calibrated != 0) { - constructUpdateString(&sqlupdatequery, "LeakageCurAvgE", histogramwoRTS->calibrated->avgLeakageCurrentInChip); - constructUpdateString(&sqlupdatequery, "LeakageCurfA", histogramwoRTS->calibrated->medianLeakageCurrent); - constructUpdateString(&sqlupdatequery, "LeakageCurfA+", histogramwoRTS->calibrated->medianLeakageCurrentPlus); - constructUpdateString(&sqlupdatequery, "LeakageCurfA-", histogramwoRTS->calibrated->medianLeakageCurrentMinus); + constructUpdateString(&sqlupdatequery, "LeakageCurAvgE", histogram->calibrated->avgLeakageCurrentInChip); + constructUpdateString(&sqlupdatequery, "LeakageCurfA", histogram->calibrated->medianLeakageCurrent); + constructUpdateString(&sqlupdatequery, "LeakageCurfA+", histogram->calibrated->medianLeakageCurrentPlus); + constructUpdateString(&sqlupdatequery, "LeakageCurfA-", histogram->calibrated->medianLeakageCurrentMinus); constructUpdateString(&sqlupdatequery, "CalibrationPeak", Fe55run.posVeto, 4, -1, 1000); } } -- 2.43.0