From decd7d2f5d595310c24dbb3074a013de5a45518d Mon Sep 17 00:00:00 2001
From: redford_s <sophie.redford@psi.ch>
Date: Fri, 25 Aug 2017 17:29:40 +0200
Subject: [PATCH] Updated module 006 data. One chip might have gone funny, but
 the range is much better in this measurement.

---
 JFMC_CurrentSourceScan.cpp    | 22 ++++++++++++----------
 run_JFModuleCalib_CuFBDCS.txt |  2 +-
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/JFMC_CurrentSourceScan.cpp b/JFMC_CurrentSourceScan.cpp
index a0a35dc..9c0400f 100644
--- a/JFMC_CurrentSourceScan.cpp
+++ b/JFMC_CurrentSourceScan.cpp
@@ -169,7 +169,11 @@ int main(int argc, char* argv[]) {
   pedeRMSG0->GetXaxis()->SetTitle("Column");
   pedeRMSG0->GetYaxis()->SetTitle("Row");
   pedeRMSG0->GetYaxis()->SetTitleOffset(0.7);
-  pedeRMSG0->GetZaxis()->SetRangeUser(0,25);
+  if (module_str == "006") {
+    pedeRMSG0->GetZaxis()->SetRangeUser(0,50);
+  } else if (module_str == "008" || module_str == "021" || module_str == "022" || module_str == "032" || module_str == "040" || module_str == "044" || module_str == "045") {
+    pedeRMSG0->GetZaxis()->SetRangeUser(0,25);
+  }
   pedeRMSG0->Draw("colz");
   sprintf(savename,"plots/M%s/CurrentSource/pedeRMSG0.png", module_str.c_str());
   mapcanvas->SaveAs((const char *)(savename));
@@ -254,9 +258,9 @@ int main(int argc, char* argv[]) {
     int nfiles = 0;
     if (module_str == "032" || module_str == "021") {
       nfiles = 2;
-    } else if (module_str == "006" || module_str == "008" || module_str == "040" || module_str == "044") {
+    } else if (module_str == "008" || module_str == "040" || module_str == "044") {
       nfiles = 3;
-    } else if (module_str == "045" || module_str == "022") {
+    } else if (module_str == "006" || module_str == "045" || module_str == "022") {
       nfiles = 4;
     }
 
@@ -351,7 +355,7 @@ int main(int argc, char* argv[]) {
 	int last_frame = 0;
 	if (module_str == "032" || module_str == "021") {
 	  last_frame = 19199;
-	} else if (module_str == "006" || module_str == "008" || module_str == "044") {
+	} else if (module_str == "008" || module_str == "044") {
 	  last_frame = 24319;
 	} else if (module_str == "040") {
 	  last_frame = 21759;
@@ -546,7 +550,7 @@ int main(int argc, char* argv[]) {
     for (int i = 0; i < 17; i++) {
       filter[i+5+9] = 5.+(i*2.5);
     }
-  } else if (module_str == "045" || module_str == "022") {
+  } else if (module_str == "006" || module_str == "045" || module_str == "022") {
     for (int i = 0; i < 9; i++) {
       filter[i] = 0.05+(i*0.05);
     }
@@ -591,9 +595,9 @@ int main(int argc, char* argv[]) {
       int m_max = 0;
       if (module_str == "032" || module_str == "021" || module_str == "040" || module_str == "044") {
 	m_max = 27;
-      } else if (module_str == "006" || module_str == "008") {
+      } else if (module_str == "008") {
 	m_max = 35;
-      } else if (module_str == "045" || module_str == "022") {
+      } else if (module_str == "006" || module_str == "045" || module_str == "022") {
 	m_max = 51;
       }
 
@@ -627,11 +631,9 @@ int main(int argc, char* argv[]) {
 	double rangemin2 = 0;
 	if (module_str == "032") {
 	  rangemin2 = 0.75;
-	} else if (module_str == "006") {
-	  rangemin2 = 0.075;
 	} else if (module_str == "008" || module_str == "021" || module_str == "040" || module_str == "044") {
 	  rangemin2 = *min_element(r1_filter.begin(),r1_filter.end());
-	} else if (module_str == "022" || module_str == "045") {
+	} else if (module_str == "006" || module_str == "022" || module_str == "045") {
 	  rangemin2 = 2.;
 	}
 	double rangemax2 = *max_element(r1_filter.begin(),r1_filter.end());
diff --git a/run_JFModuleCalib_CuFBDCS.txt b/run_JFModuleCalib_CuFBDCS.txt
index dc390d3..3abdfbf 100644
--- a/run_JFModuleCalib_CuFBDCS.txt
+++ b/run_JFModuleCalib_CuFBDCS.txt
@@ -5,7 +5,7 @@ Module 006 - ESRF
 ./JFMC_CuFluoPeak 006 /mnt/pcmoench_jungfrau_data/Module_006_161116 10us_500Hz_QS_allgain_pede 10us_500Hz_QS_G0_Cu
 ./JFMC_CuFluoPeakFit 006
 ./JFMC_DirectBeamScan 006 /mnt/pcmoench_jungfrau_data/Module_006_161116 100us_500Hz_QS_allgain_pede_1055 100us_500Hz_QS_beam_scan_a
-./JFMC_CurrentSourceScan 006 /mnt/pcmoench_jungfrau_data1_ib/Module_006_161116 Current_source_scan_a
+./JFMC_CurrentSourceScan 006 /mnt/pcmoench_jungfrau_data1_ib/Module_006_2017-08-21_CSBaselineTest CurrentSource_scan12
 ./JFMC_CalibWriter 006