detectors/JFCalibration
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Consistent construction of the data arrays per pixel.

Browse Source
This commit is contained in:
redford_s
2019-02-08 15:29:57 +01:00
parent de0ef22d58
commit 556cd7bb4f
2 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
BP_analysis.cpp
View File

@ -313,24 +313,22 @@ int main(int argc, char* argv[]) {
for (int j = 0; j < 220; j++) { for (int j = 0; j < 220; j++) {
double this_avgG0 = avg_adcG0_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_avgG0er = avg_adcG0er_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) { if (this_g0avg != 0 && this_g0avger > 0) {
r0_adc.push_back(this_avgG0);
r0_filter.push_back(xs[j]); r0_filter.push_back(xs[j]);
r0_adcerr.push_back(this_avgG0er);
r0_ferr.push_back(0.); r0_ferr.push_back(0.);
r0_adc.push_back(this_g0avg);
r0_adcerr.push_back(this_g0avger);
} }
if (this_g1avg != 0 && this_g1avger > 0) {
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);
r1_filter.push_back(xs[j]); r1_filter.push_back(xs[j]);
r1_adcerr.push_back(this_avgG1er);
r1_ferr.push_back(0.); r1_ferr.push_back(0.);
r1_adc.push_back(this_g1avg);
r1_adcerr.push_back(this_g1avger);
} }
} }

25
CS_analysis.cpp
View File

@ -933,23 +933,30 @@ int main(int argc, char* argv[]) {
for (int m = 0; m < m_max; m++) { 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) { double this_g0avg = adcmap_avg_g0[m]->GetBinContent((i%NC)+1,(i/NC)+1);
r0_adc.push_back(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_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_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) { if (this_g1avg != 0 && this_g1avger > 0) {
r1_adc.push_back(adcmap_avg_g1[m]->GetBinContent((i%NC)+1,(i/NC)+1));
r1_filter.push_back(filter[m]); 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_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) { if (this_g2avg != 0 && this_g2avger > 0) {
r2_adc.push_back(adcmap_avg_g2[m]->GetBinContent((i%NC)+1,(i/NC)+1));
r2_filter.push_back(filter[m]); 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_ferr.push_back(0.);
r2_adc.push_back(this_g2avg);
r2_adcerr.push_back(this_g2avger);
} }
} }