From 5aa2a26ed7eb50b938ce071afcb499473e9d73a5 Mon Sep 17 00:00:00 2001
From: redford_s <sophie.redford@psi.ch>
Date: Tue, 4 Apr 2017 12:20:20 +0200
Subject: [PATCH] Better fitting ranges. Often no reason to limit the fit. This
 does change the results abit but should be better.

---
 JFMC_CurrentSourceScan.cpp | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/JFMC_CurrentSourceScan.cpp b/JFMC_CurrentSourceScan.cpp
index e745d6e..54a62b6 100644
--- a/JFMC_CurrentSourceScan.cpp
+++ b/JFMC_CurrentSourceScan.cpp
@@ -448,14 +448,14 @@ int main(int argc, char* argv[]) {
 	TGraphErrors *grap_g2 = new TGraphErrors(r3_adc.size(),&(r3_filter[0]),&(r3_adc[0]),&(r3_ferr[0]),&(r3_adcerr[0]));
 
 	double rangemin2 = 0;
-	double rangemax2 = 0;
 	if (module_str == "032") {
 	  rangemin2 = 0.75;
-	  rangemax2 = *max_element(r1_filter.begin(),r1_filter.end());
-	} else if (module_str == "022" || module_str == "021" || module_str == "006" || module_str == "008" || module_str == "044") {
+	} else if (module_str == "006") {
 	  rangemin2 = 0.075;
-	  rangemax2 = 2.5;
+	} else if (module_str == "008" || module_str == "021" || module_str == "022" || module_str == "044") {
+	  rangemin2 = *min_element(r1_filter.begin(),r1_filter.end());
 	}
+	double rangemax2 = *max_element(r1_filter.begin(),r1_filter.end());	
 	TF1 *fit2 = new TF1("fit2","[0]+[1]*x",rangemin2,rangemax2);
 	fit2->SetParameter(0, 10000.);
 	fit2->SetParameter(1, -0.1);
@@ -481,14 +481,12 @@ int main(int argc, char* argv[]) {
 	diffFromLinG1map->Fill(i%NC,i/NC,g1residsum/g1residn);
       
 	double rangemin3 = 0;
-	double rangemax3 = 0;
-	if (module_str == "032" || module_str == "022" || module_str == "021") {
+	if (module_str == "032") {
 	  rangemin3 = 5;
-	  rangemax3 = *max_element(r3_filter.begin(),r3_filter.end());
-	} else if (module_str == "006" || module_str == "008" || module_str == "044") {
-	  rangemin3 = 7.5;
-	  rangemax3 = *max_element(r3_filter.begin(),r3_filter.end());
+	} else if (module_str == "006" || module_str == "008" || module_str == "021" || module_str == "022" || module_str == "044") {
+	  rangemin3 = *min_element(r3_filter.begin(),r3_filter.end());
 	}
+	double rangemax3 = *max_element(r3_filter.begin(),r3_filter.end());
 	TF1 *fit3 = new TF1("fit3","[0]+[1]*x",rangemin3, rangemax3);
 	fit3->SetParameter(0, 10000.);
 	fit3->SetParameter(1, -0.01);
@@ -720,7 +718,7 @@ int main(int argc, char* argv[]) {
   leg->AddEntry(g1overg2_isEdge, "Edge", "l");
   leg->AddEntry(g1overg2_isInnerEdge, "Inner E", "l");
 
-  g1overg2_isDouble->GetXaxis()->SetTitle("G0 / G1");
+  g1overg2_isDouble->GetXaxis()->SetTitle("G1 / G2");
   g1overg2_isDouble->GetYaxis()->SetTitle("Normalised");
   g1overg2_isDouble->GetYaxis()->SetTitleOffset(1.3);
   g1overg2_isDouble->SetMinimum(0.0);