From 556cd7bb4fad661b09569dd119f7ffe3b776cad2 Mon Sep 17 00:00:00 2001 From: redford_s Date: Fri, 8 Feb 2019 15:29:57 +0100 Subject: [PATCH] Consistent construction of the data arrays per pixel. --- BP_analysis.cpp | 22 ++++++++++------------ CS_analysis.cpp | 25 ++++++++++++++++--------- 2 files changed, 26 insertions(+), 21 deletions(-) diff --git a/BP_analysis.cpp b/BP_analysis.cpp index c4cc81f..084e940 100644 --- a/BP_analysis.cpp +++ b/BP_analysis.cpp @@ -313,24 +313,22 @@ int main(int argc, char* argv[]) { for (int j = 0; j < 220; j++) { - double this_avgG0 = avg_adcG0_map[j]->GetBinContent((i%NC)+1,(i/NC)+1); - double this_avgG0er = avg_adcG0er_map[j]->GetBinContent((i%NC)+1,(i/NC)+1); + double this_g0avg = avg_adcG0_map[j]->GetBinContent((i%NC)+1,(i/NC)+1); + double this_g1avg = avg_adcG1_map[j]->GetBinContent((i%NC)+1,(i/NC)+1); + double this_g0avger = avg_adcG0er_map[j]->GetBinContent((i%NC)+1,(i/NC)+1); + double this_g1avger = avg_adcG1er_map[j]->GetBinContent((i%NC)+1,(i/NC)+1); - if (this_avgG0 != 0 && this_avgG0er > 0) { - r0_adc.push_back(this_avgG0); + if (this_g0avg != 0 && this_g0avger > 0) { r0_filter.push_back(xs[j]); - r0_adcerr.push_back(this_avgG0er); r0_ferr.push_back(0.); + r0_adc.push_back(this_g0avg); + r0_adcerr.push_back(this_g0avger); } - - double this_avgG1 = avg_adcG1_map[j]->GetBinContent((i%NC)+1,(i/NC)+1); - double this_avgG1er = avg_adcG1er_map[j]->GetBinContent((i%NC)+1,(i/NC)+1); - - if (this_avgG1 != 0 && this_avgG1er > 0) { - r1_adc.push_back(this_avgG1); + if (this_g1avg != 0 && this_g1avger > 0) { r1_filter.push_back(xs[j]); - r1_adcerr.push_back(this_avgG1er); r1_ferr.push_back(0.); + r1_adc.push_back(this_g1avg); + r1_adcerr.push_back(this_g1avger); } } diff --git a/CS_analysis.cpp b/CS_analysis.cpp index d675426..4a3d436 100644 --- a/CS_analysis.cpp +++ b/CS_analysis.cpp @@ -933,23 +933,30 @@ int main(int argc, char* argv[]) { for (int m = 0; m < m_max; m++) { - if (adcmap_avg_g0[m]->GetBinContent((i%NC)+1,(i/NC)+1) != 0 && adcermap_avg_g0[m]->GetBinContent((i%NC)+1,(i/NC)+1) > 0) { - r0_adc.push_back(adcmap_avg_g0[m]->GetBinContent((i%NC)+1,(i/NC)+1)); + double this_g0avg = adcmap_avg_g0[m]->GetBinContent((i%NC)+1,(i/NC)+1); + double this_g1avg = adcmap_avg_g1[m]->GetBinContent((i%NC)+1,(i/NC)+1); + double this_g2avg = adcmap_avg_g2[m]->GetBinContent((i%NC)+1,(i/NC)+1); + double this_g0avger = adcermap_avg_g0[m]->GetBinContent((i%NC)+1,(i/NC)+1); + double this_g1avger = adcermap_avg_g1[m]->GetBinContent((i%NC)+1,(i/NC)+1); + double this_g2avger = adcermap_avg_g2[m]->GetBinContent((i%NC)+1,(i/NC)+1); + + if (this_g0avg != 0 && this_g0avger > 0) { r0_filter.push_back(filter[m]); - r0_adcerr.push_back(adcermap_avg_g0[m]->GetBinContent((i%NC)+1,(i/NC)+1)); r0_ferr.push_back(0.); + r0_adc.push_back(this_g0avg); + r0_adcerr.push_back(this_g0avger); } - if (adcmap_avg_g1[m]->GetBinContent((i%NC)+1,(i/NC)+1) != 0 && adcermap_avg_g1[m]->GetBinContent((i%NC)+1,(i/NC)+1) > 0) { - r1_adc.push_back(adcmap_avg_g1[m]->GetBinContent((i%NC)+1,(i/NC)+1)); + if (this_g1avg != 0 && this_g1avger > 0) { r1_filter.push_back(filter[m]); - r1_adcerr.push_back(adcermap_avg_g1[m]->GetBinContent((i%NC)+1,(i/NC)+1)); r1_ferr.push_back(0.); + r1_adc.push_back(this_g1avg); + r1_adcerr.push_back(this_g1avger); } - if (adcmap_avg_g2[m]->GetBinContent((i%NC)+1,(i/NC)+1) != 0 && adcermap_avg_g2[m]->GetBinContent((i%NC)+1,(i/NC)+1) > 0) { - r2_adc.push_back(adcmap_avg_g2[m]->GetBinContent((i%NC)+1,(i/NC)+1)); + if (this_g2avg != 0 && this_g2avger > 0) { r2_filter.push_back(filter[m]); - r2_adcerr.push_back(adcermap_avg_g2[m]->GetBinContent((i%NC)+1,(i/NC)+1)); r2_ferr.push_back(0.); + r2_adc.push_back(this_g2avg); + r2_adcerr.push_back(this_g2avger); } }