From 20408c5987df4c68aaacffe3510bfa1da917881b Mon Sep 17 00:00:00 2001 From: Benjamin Linnik Date: Mon, 18 Dec 2017 17:56:41 +0100 Subject: [PATCH] Analyzer: Leakage current fix, rts pixel are considered in leakage current calculation --- MABS_run_analyzer/Run.cpp | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/MABS_run_analyzer/Run.cpp b/MABS_run_analyzer/Run.cpp index 84356b0..2d28e81 100644 --- a/MABS_run_analyzer/Run.cpp +++ b/MABS_run_analyzer/Run.cpp @@ -1062,19 +1062,21 @@ void Run::updateDatabase() { constructUpdateString(&sqlupdatequery, "Avg.NoiseADC", histogramclassToUseForDB->normalized->avgNoise, 2, 0 , 1000); constructUpdateString(&sqlupdatequery, "Avg.NoiseADC+", histogramclassToUseForDB->normalized->avgNoisePlus, 2, 0 , 1000); constructUpdateString(&sqlupdatequery, "Avg.NoiseADC-", histogramclassToUseForDB->normalized->avgNoiseMinus, 2, 0 , 1000); + constructUpdateString(&sqlupdatequery, "LeakageCurMedADC", histogram->medianLeakageCurrent); + constructUpdateString(&sqlupdatequery, "LeakageCurAvgADC", histogram->avgLeakageCurrentInChip); constructUpdateString(&sqlupdatequery, "Frames_found", frames_found, 100000000); + if (histogram->calibrated != 0) { + constructUpdateString(&sqlupdatequery, "LeakageCurAvgE", histogram->calibrated->avgLeakageCurrentInChip); + constructUpdateString(&sqlupdatequery, "LeakageCurfA", histogram->calibrated->medianLeakageCurrent); + constructUpdateString(&sqlupdatequery, "LeakageCurfA+", histogram->calibrated->medianLeakageCurrentPlus); + constructUpdateString(&sqlupdatequery, "LeakageCurfA-", histogram->calibrated->medianLeakageCurrentMinus); + } + if (Fe55run.posVeto > 0) { + constructUpdateString(&sqlupdatequery, "CalibrationPeak", Fe55run.posVeto, 4, -1, 1000); + } if (histogramwoRTS != 0) { constructUpdateString(&sqlupdatequery, "RTSpixel", histogramwoRTS->normalized->RTSpixel.size()); constructUpdateString(&sqlupdatequery, "RTSpixel_percentage", histogramwoRTS->normalized->percentageofRTSpixel); - constructUpdateString(&sqlupdatequery, "LeakageCurMedADC", histogram->medianLeakageCurrent); - constructUpdateString(&sqlupdatequery, "LeakageCurAvgADC", histogram->avgLeakageCurrentInChip); - if (histogramwoRTS->calibrated != 0) { - 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); - } } if (histogramclassToUseForDB->normalized->calibrated != 0) if (labbook.source.Contains("Sr") && histogramclassToUseForDB->normalized->calibrated->sr90IntegralVal > 0) -- 2.43.0