From 5c3e77b0912eddb6a58a92219ca138da77168825 Mon Sep 17 00:00:00 2001
From: redford_s <sophie.redford@psi.ch>
Date: Wed, 20 Feb 2019 12:35:05 +0100
Subject: [PATCH] Removed cut on adc error from array filling. With the new
 range finding, this is now taken into account. Points with negative error
 will not be fit, since there will be an entry in the second array. Not having
 these points in the first array would change the range for the second array.

---
 BP_analysis.cpp | 4 ++--
 CS_analysis.cpp | 6 +++---
 DB_analysis.cpp | 4 ++--
 LP_analysis.cpp | 6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/BP_analysis.cpp b/BP_analysis.cpp
index 1d17ff3..c5c4620 100644
--- a/BP_analysis.cpp
+++ b/BP_analysis.cpp
@@ -326,13 +326,13 @@ int main(int argc, char* argv[]) {
 	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_g0avg != 0 && this_g0avger > 0) {
+	if (this_g0avg != 0) {
 	  r0_filter.push_back(xs[j]);
 	  r0_ferr.push_back(0.);
 	  r0_adc.push_back(this_g0avg);
 	  r0_adcerr.push_back(this_g0avger);
 	}	
-	if (this_g1avg != 0 && this_g1avger > 0) {
+	if (this_g1avg != 0) {
 	  r1_filter.push_back(xs[j]);
 	  r1_ferr.push_back(0.);
 	  r1_adc.push_back(this_g1avg);
diff --git a/CS_analysis.cpp b/CS_analysis.cpp
index 21136ae..52e9c87 100644
--- a/CS_analysis.cpp
+++ b/CS_analysis.cpp
@@ -953,19 +953,19 @@ int main(int argc, char* argv[]) {
 	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) {
+	if (this_g0avg != 0) {
 	  r0_filter.push_back(filter[m]);
 	  r0_ferr.push_back(0.);
 	  r0_adc.push_back(this_g0avg);
 	  r0_adcerr.push_back(this_g0avger);
 	}
-	if (this_g1avg != 0 && this_g1avger > 0) {
+	if (this_g1avg != 0) {
 	  r1_filter.push_back(filter[m]);
 	  r1_ferr.push_back(0.);
 	  r1_adc.push_back(this_g1avg);
 	  r1_adcerr.push_back(this_g1avger);
 	}
-	if (this_g2avg != 0 && this_g2avger > 0) {
+	if (this_g2avg != 0) {
 	  r2_filter.push_back(filter[m]);
 	  r2_ferr.push_back(0.);
 	  r2_adc.push_back(this_g2avg);
diff --git a/DB_analysis.cpp b/DB_analysis.cpp
index 98e57f1..155b017 100644
--- a/DB_analysis.cpp
+++ b/DB_analysis.cpp
@@ -400,13 +400,13 @@ int main(int argc, char* argv[]) {
       double this_g0avger = avg_adcer_g0_map[j]->GetBinContent((i%NC)+1,(i/NC)+1);
       double this_g1avger = avg_adcer_g1_map[j]->GetBinContent((i%NC)+1,(i/NC)+1);
 
-      if (this_g0avg != 0 && this_g0avger > 0) {
+      if (this_g0avg != 0) {
 	r0_filter.push_back(current);
 	r0_ferr.push_back(0);
 	r0_adc.push_back(this_g0avg);
 	r0_adcer.push_back(this_g0avger);
       }
-      if (this_g1avg != 0 && this_g1avger > 0) {
+      if (this_g1avg != 0) {
 	r1_filter.push_back(current);
 	r1_ferr.push_back(0);
 	r1_adc.push_back(this_g1avg);
diff --git a/LP_analysis.cpp b/LP_analysis.cpp
index 3402459..65c2a46 100644
--- a/LP_analysis.cpp
+++ b/LP_analysis.cpp
@@ -460,19 +460,19 @@ int main(int argc, char* argv[]) {
     double this_g1avger = adcer_avg_g1[i];
     double this_g2avger = adcer_avg_g2[i];
 
-    if (this_g0avg != 0 && this_g0avger > 0) {
+    if (this_g0avg != 0) {
       r0_filter.push_back(filter[i]);
       r0_ferr.push_back(0.);
       r0_adc.push_back(this_g0avg);
       r0_adcerr.push_back(this_g0avger);
     }
-    if (this_g1avg != 0 && this_g1avger > 0) {
+    if (this_g1avg != 0) {
       r1_filter.push_back(filter[i]);
       r1_ferr.push_back(0.);
       r1_adc.push_back(this_g1avg);
       r1_adcerr.push_back(this_g1avger);
     }
-    if (this_g2avg != 0 && this_g2avger > 0) {
+    if (this_g2avg != 0) {
       r2_filter.push_back(filter[i]);
       r2_ferr.push_back(0.);
       r2_adc.push_back(this_g2avg);