diff --git a/CS_analysis.cpp b/CS_analysis.cpp
index 417df4a..36fb203 100644
--- a/CS_analysis.cpp
+++ b/CS_analysis.cpp
@@ -50,6 +50,17 @@ double highestFullySwitchedPoint(const vector<double> &lower_filter, const vecto
   return highest_fully_switched_val;
 }
 
+double checkRangeMinForRCEffect(double range_min) {
+
+  // check that the range minimum is at least 2 us, to avoid non-linearity of RC effect
+  if (range_min < 2.0) {
+    return 2.0;
+  } else {
+    return range_min;
+  }
+
+}
+
 int main(int argc, char* argv[]) {
 
   jungfrauStyle();
@@ -786,12 +797,7 @@ int main(int argc, char* argv[]) {
   TH1F *g0hist = new TH1F("g0hist","",100,10000,50000);
   TH1F *g0erhist = new TH1F("g0erhist","",100,0,200);
 
-  TH1F *g1hist = 0;
-  if (module_str == "032") {
-    g1hist = new TH1F("g1hist","",100,-12000,-4000);
-  } else {
-    g1hist = new TH1F("g1hist","",100,-3000,0);
-  }
+  TH1F *g1hist = new TH1F("g1hist","",100,-3000,0);
   TH1F *g1erhist = new TH1F("g1erhist","",100,0,50);
 
   TH1F *g2hist = 0;
@@ -994,17 +1000,90 @@ int main(int argc, char* argv[]) {
       double rangemin_g2 = 0;
       double rangemax_g2 = 0;
 
+      // define graphs
+      if (r0_adc.size() > 1) {
+	grap_g0 = new TGraphErrors(r0_adc.size(),&(r0_filter[0]),&(r0_adc[0]),&(r0_ferr[0]),&(r0_adcerr[0]));
+	grap_g0->SetMarkerStyle(20);
+	grap_g0->SetMarkerColor(kBlue);
+	grap_g0->SetLineColor(kBlue);
+      }
+      
+      if (r1_adc.size() > 1) {
+	grap_g1 = new TGraphErrors(r1_adc.size(),&(r1_filter[0]),&(r1_adc[0]),&(r1_ferr[0]),&(r1_adcerr[0]));
+	grap_g1->SetMarkerStyle(20);
+	grap_g1->SetMarkerColor(kGreen+2);
+	grap_g1->SetLineColor(kGreen+2);
+      }
+
+      if (r2_adc.size() > 1) {
+	grap_g2 = new TGraphErrors(r2_adc.size(),&(r2_filter[0]),&(r2_adc[0]),&(r2_ferr[0]),&(r2_adcerr[0]));
+	grap_g2->SetMarkerStyle(20);
+	grap_g2->SetMarkerColor(kRed);
+	grap_g2->SetLineColor(kRed);
+      }
+
+      // plot the datapoints
+      if (r1_adc.size() > 1) {
+
+      	if ((i >= 58000 && i < 58000+10) || // bulk
+      	    (i >= 10 && i < 10+10) || // edge
+      	    (i >= 1024+10 && i < 1024+10+10) || // inner edge
+      	    (i >= (256*1024)+10 && i < (256*1024)+10+10) || // double
+      	    (i >= (257*1024)+10 && i < (257*1024)+10+10) || // next to double
+      	    (i == (255*1024)+255) // quad
+      	    ) {
+	  
+      	  string pixel_type = "x";
+      	  if (i >= 58000 && i < 58000+10) {
+      	    pixel_type = "b";
+      	  } else if (i >= 10 && i < 10+10) {
+      	    pixel_type = "e";
+      	  } else if (i >= 1024+10 && i < 1024+10+10) {
+      	    pixel_type = "ie";
+      	  } else if (i >= (256*1024)+10 && i < (256*1024)+10+10) {
+      	    pixel_type = "d";
+      	  } else if (i >= (257*1024)+10 && i < (257*1024)+10+10) {
+      	    pixel_type = "ntd";
+      	  } else if (i == (255*1024)+255) {
+      	    pixel_type = "q";
+      	  }
+
+      	  if (find(scan_v6.begin(), scan_v6.end(), module_str) != scan_v6.end()) {
+      	    grap_g1->GetXaxis()->SetLimits(0.009,5E2);
+      	  } else if (find(scan_v1.begin(), scan_v1.end(), module_str) != scan_v1.end()) {
+	    grap_g1->GetXaxis()->SetLimits(0.09,1.1E3);
+	  } else {
+      	    grap_g1->GetXaxis()->SetLimits(0.009,1.1E2);
+      	  }
+      	  grap_g1->SetMinimum(0);
+      	  grap_g1->SetMaximum(16000);
+      	  grap_g1->GetXaxis()->SetTitle("Integration time [#mus]");
+      	  grap_g1->GetYaxis()->SetTitle("ADC [ADU]");
+      	  grap_g1->GetYaxis()->SetTitleOffset(0.9);
+      	  grap_g1->Draw("AP");
+	  if (r2_adc.size() > 1) {
+	    grap_g2->Draw("P");
+	  }
+	  if (r0_adc.size() > 1) {
+	    grap_g0->Draw("P");
+	  }
+      	  mapcanvas->SetLogx();
+      	  sprintf(savename,"plots/M%s/CurrentSource/pixel_%s_%d_M%s.png", module_str.c_str(), pixel_type.c_str(), i, module_str.c_str());
+      	  mapcanvas->SaveAs((const char *)(savename));
+      	  mapcanvas->SetLogx(0);
+
+      	}
+      }
+
+      // define fit ranges and fit
       if (r0_adc.size() > 1) {
 
-	if (module_str == "003") {
-	  rangemin_g0 = 2.0;
-	} else {
-	  rangemin_g0 = 0.15;
-	}
+	rangemin_g0 = *min_element(r0_filter.begin(),r0_filter.end());
+	rangemin_g0 = checkRangeMinForRCEffect(rangemin_g0);
+
 	rangemax_g0 = highestFullySwitchedPoint(r0_filter, r1_filter);
 
 	if (rangemax_g0 > rangemin_g0) {
-	  grap_g0 = new TGraphErrors(r0_adc.size(),&(r0_filter[0]),&(r0_adc[0]),&(r0_ferr[0]),&(r0_adcerr[0]));
 
 	  fit_g0 = new TF1("fit_g0","[0]+[1]*x",rangemin_g0, rangemax_g0);
 	  fit_g0->SetParameter(0, 3000.);
@@ -1042,15 +1121,12 @@ int main(int argc, char* argv[]) {
 	      pixel_type = "q";
 	    }
 	  
-	    grap_g0->SetMarkerStyle(20);
-	    grap_g0->SetMarkerColor(kBlue);
-	    grap_g0->SetLineColor(kBlue);
-	  
 	    grap_g0->SetMinimum(0);
 	    grap_g0->SetMaximum(16000);
 	    grap_g0->GetXaxis()->SetTitle("Integration time [#mus]");
 	    grap_g0->GetYaxis()->SetTitle("ADC [ADU]");
 	    grap_g0->GetYaxis()->SetTitleOffset(0.9);
+	    grap_g0->GetXaxis()->SetLimits(*min_element(r0_filter.begin(),r0_filter.end()),*max_element(r0_filter.begin(),r0_filter.end()));
 	    grap_g0->Draw("AP");
 	    fit_g0->Draw("same");
 	    mapcanvas->Update();
@@ -1081,7 +1157,7 @@ int main(int argc, char* argv[]) {
 	    norm_g0->GetXaxis()->SetTitle("Integration time [#mus]");
 	    norm_g0->GetYaxis()->SetTitle("Normalised ADC [ADU]");
 	    norm_g0->GetYaxis()->SetTitleOffset(0.9);
-	    norm_g0->GetXaxis()->SetRangeUser(*min_element(r0_filter.begin(),r0_filter.end()),*max_element(r0_filter.begin(),r0_filter.end()));
+	    norm_g0->GetXaxis()->SetLimits(*min_element(r0_filter.begin(),r0_filter.end()),*max_element(r0_filter.begin(),r0_filter.end()));
 	    norm_g0->SetMinimum(-100);
 	    norm_g0->SetMaximum(100);
 	    norm_g0->Draw("AP");
@@ -1097,16 +1173,12 @@ int main(int argc, char* argv[]) {
 
       if (r1_adc.size() > 1) {
 
-      	rangemin_g1 = 2.;
-      	if (module_str == "032") {
-      	  rangemin_g1 = 0.75;
-      	} else if (module_str == "003" || module_str == "008" || module_str == "040" || module_str == "044") {
-	  rangemin_g1 = lowestFullySwitchedPoint(r1_filter, r0_filter);
-      	}
+	rangemin_g1 = lowestFullySwitchedPoint(r1_filter, r0_filter);
+	rangemin_g1 = checkRangeMinForRCEffect(rangemin_g1);
+
 	rangemax_g1 = highestFullySwitchedPoint(r1_filter, r2_filter);
 
 	if (rangemax_g1 > rangemin_g1) {
-	  grap_g1 = new TGraphErrors(r1_adc.size(),&(r1_filter[0]),&(r1_adc[0]),&(r1_ferr[0]),&(r1_adcerr[0]));
 
 	  fit_g1 = new TF1("fit_g1","[0]+[1]*x",rangemin_g1,rangemax_g1);
 	  fit_g1->SetParameter(0, 10000.);
@@ -1144,15 +1216,12 @@ int main(int argc, char* argv[]) {
 	      pixel_type = "q";
 	    }
 	  
-	    grap_g1->SetMarkerStyle(20);
-	    grap_g1->SetMarkerColor(kGreen+2);
-	    grap_g1->SetLineColor(kGreen+2);
-	  
 	    grap_g1->SetMinimum(0);
 	    grap_g1->SetMaximum(16000);
 	    grap_g1->GetXaxis()->SetTitle("Integration time [#mus]");
 	    grap_g1->GetYaxis()->SetTitle("ADC [ADU]");
 	    grap_g1->GetYaxis()->SetTitleOffset(0.9);
+	    grap_g1->GetXaxis()->SetLimits(*min_element(r1_filter.begin(),r1_filter.end()),*max_element(r1_filter.begin(),r1_filter.end()));
 	    grap_g1->Draw("AP");
 	    fit_g1->Draw("same");
 	    mapcanvas->Update();
@@ -1203,7 +1272,7 @@ int main(int argc, char* argv[]) {
 	    norm_g1->GetXaxis()->SetTitle("Integration time [#mus]");
 	    norm_g1->GetYaxis()->SetTitle("Normalised ADC [ADU]");
 	    norm_g1->GetYaxis()->SetTitleOffset(0.9);
-	    norm_g1->GetXaxis()->SetRangeUser(*min_element(r1_filter.begin(),r1_filter.end()),*max_element(r1_filter.begin(),r1_filter.end()));
+	    norm_g1->GetXaxis()->SetLimits(*min_element(r1_filter.begin(),r1_filter.end()),*max_element(r1_filter.begin(),r1_filter.end()));
 	    norm_g1->SetMinimum(1.5*lin_g1_m05pc->Eval(rangemin_g1));
 	    norm_g1->SetMaximum(1.5*lin_g1_p05pc->Eval(rangemin_g1));
 	    norm_g1->Draw("AP");
@@ -1224,16 +1293,12 @@ int main(int argc, char* argv[]) {
 
       if (r2_adc.size() > 1) {
 
-      	rangemin_g2 = 0;
-      	if (module_str == "032") {
-      	  rangemin_g2 = 5;
-      	} else {
-	  rangemin_g2 = lowestFullySwitchedPoint(r2_filter, r1_filter);
-      	}
+	rangemin_g2 = lowestFullySwitchedPoint(r2_filter, r1_filter);
+	rangemin_g2 = checkRangeMinForRCEffect(rangemin_g2);
+
       	rangemax_g2 = *max_element(r2_filter.begin(),r2_filter.end());
 
 	if (rangemax_g2 > rangemin_g2) {
-	  grap_g2 = new TGraphErrors(r2_adc.size(),&(r2_filter[0]),&(r2_adc[0]),&(r2_ferr[0]),&(r2_adcerr[0]));
 
 	  fit_g2 = new TF1("fit_g2","[0]+[1]*x",rangemin_g2, rangemax_g2);
 	  fit_g2->SetParameter(0, 10000.);
@@ -1270,16 +1335,13 @@ int main(int argc, char* argv[]) {
 	    } else if (i == (255*1024)+255) {
 	      pixel_type = "q";
 	    }
-	  
-	    grap_g2->SetMarkerStyle(20);
-	    grap_g2->SetMarkerColor(kRed);
-	    grap_g2->SetLineColor(kRed);
-	  
+	    
 	    grap_g2->SetMinimum(0);
 	    grap_g2->SetMaximum(16000);
 	    grap_g2->GetXaxis()->SetTitle("Integration time [#mus]");
 	    grap_g2->GetYaxis()->SetTitle("ADC [ADU]");
 	    grap_g2->GetYaxis()->SetTitleOffset(0.9);
+	    grap_g2->GetXaxis()->SetLimits(*min_element(r2_filter.begin(),r2_filter.end()),*max_element(r2_filter.begin(),r2_filter.end()));
 	    grap_g2->Draw("AP");
 	    fit_g2->Draw("same");
 	    mapcanvas->Update();
@@ -1330,7 +1392,7 @@ int main(int argc, char* argv[]) {
 	    norm_g2->GetXaxis()->SetTitle("Integration time [#mus]");
 	    norm_g2->GetYaxis()->SetTitle("Normalised ADC [ADU]");
 	    norm_g2->GetYaxis()->SetTitleOffset(0.9);
-	    norm_g2->GetXaxis()->SetRangeUser(*min_element(r2_filter.begin(),r2_filter.end()),*max_element(r2_filter.begin(),r2_filter.end()));
+	    norm_g2->GetXaxis()->SetLimits(*min_element(r2_filter.begin(),r2_filter.end()),*max_element(r2_filter.begin(),r2_filter.end()));
 	    norm_g2->SetMinimum(1.5*lin_g2_m05pc->Eval(rangemin_g2));
 	    norm_g2->SetMaximum(1.5*lin_g2_p05pc->Eval(rangemin_g2));
 	    norm_g2->Draw("AP");
@@ -1349,6 +1411,7 @@ int main(int argc, char* argv[]) {
 	}
       }
 
+      // get ratio measurements
       if (rangemax_g0 > rangemin_g0 && rangemax_g1 > rangemin_g1) {
 
       	g0overg1hist->Fill(fit_g0->GetParameter(1) / fit_g1->GetParameter(1));
@@ -1404,81 +1467,6 @@ int main(int argc, char* argv[]) {
       	}
       }
 
-      if ((rangemax_g0 > rangemin_g0 && rangemax_g1 > rangemin_g1) || 
-	  (rangemax_g1 > rangemin_g1 && rangemax_g2 > rangemin_g2)) {
-
-      	if ((i >= 58000 && i < 58000+10) || // bulk
-      	    (i >= 10 && i < 10+10) || // edge
-      	    (i >= 1024+10 && i < 1024+10+10) || // inner edge
-      	    (i >= (256*1024)+10 && i < (256*1024)+10+10) || // double
-      	    (i >= (257*1024)+10 && i < (257*1024)+10+10) || // next to double
-      	    (i == (255*1024)+255) // quad
-      	    ) {
-	  
-      	  string pixel_type = "x";
-      	  if (i >= 58000 && i < 58000+10) {
-      	    pixel_type = "b";
-      	  } else if (i >= 10 && i < 10+10) {
-      	    pixel_type = "e";
-      	  } else if (i >= 1024+10 && i < 1024+10+10) {
-      	    pixel_type = "ie";
-      	  } else if (i >= (256*1024)+10 && i < (256*1024)+10+10) {
-      	    pixel_type = "d";
-      	  } else if (i >= (257*1024)+10 && i < (257*1024)+10+10) {
-      	    pixel_type = "ntd";
-      	  } else if (i == (255*1024)+255) {
-      	    pixel_type = "q";
-      	  }
-	  
-	  if (rangemax_g0 > rangemin_g0) {
-	    grap_g0->SetMarkerStyle(20);
-	    grap_g0->SetMarkerColor(kBlue);
-	    grap_g0->SetLineColor(kBlue);
-	    grap_g0->GetFunction("fit_g0")->Delete();
-	    grap_g0->FindObject("stats")->Delete();
-	  }
-
-      	  grap_g1->SetMarkerStyle(20);
-      	  grap_g1->SetMarkerColor(kGreen+2);
-      	  grap_g1->SetLineColor(kGreen+2);
-	  grap_g1->GetFunction("fit_g1")->Delete();
-	  grap_g1->FindObject("stats")->Delete();
-
-	  if (rangemax_g2 > rangemin_g2) {
-	    grap_g2->SetMarkerStyle(20);
-	    grap_g2->SetMarkerColor(kRed);
-	    grap_g2->SetLineColor(kRed);
-	    grap_g2->GetFunction("fit_g2")->Delete();
-	    grap_g2->FindObject("stats")->Delete();
-	  }
-
-      	  if (find(scan_v6.begin(), scan_v6.end(), module_str) != scan_v6.end()) {
-      	    grap_g1->GetXaxis()->SetLimits(0.009,5E2);
-      	  } else if (find(scan_v1.begin(), scan_v1.end(), module_str) != scan_v1.end()) {
-	    grap_g1->GetXaxis()->SetLimits(0.09,1.1E3);
-	  } else {
-      	    grap_g1->GetXaxis()->SetLimits(0.009,1.1E2);
-      	  }
-      	  grap_g1->SetMinimum(0);
-      	  grap_g1->SetMaximum(16000);
-      	  grap_g1->GetXaxis()->SetTitle("Integration time [#mus]");
-      	  grap_g1->GetYaxis()->SetTitle("ADC [ADU]");
-      	  grap_g1->GetYaxis()->SetTitleOffset(0.9);
-      	  grap_g1->Draw("AP");
-	  if (rangemax_g2 > rangemin_g2) {
-	    grap_g2->Draw("P");
-	  }
-	  if (rangemax_g0 > rangemin_g0) {
-	    grap_g0->Draw("P");
-	  }
-      	  mapcanvas->SetLogx();
-      	  sprintf(savename,"plots/M%s/CurrentSource/pixel_%s_%d_M%s.png", module_str.c_str(), pixel_type.c_str(), i, module_str.c_str());
-      	  mapcanvas->SaveAs((const char *)(savename));
-      	  mapcanvas->SetLogx(0);
-
-      	}
-      }
-
       delete fit_g0;
       delete fit_g1;
       delete fit_g2;
@@ -1500,304 +1488,324 @@ int main(int argc, char* argv[]) {
   pave->SetTextSize(0.06);
   pave->SetTextAlign(32);
 
-  g0hist->GetXaxis()->SetTitle("G0 gradient");
-  g0hist->GetXaxis()->SetTitleOffset(1.1);
-  g0hist->GetYaxis()->SetTitleOffset(1.5);
-  g0hist->Draw();
-  sprintf(savename,"plots/M%s/CurrentSource/g0hist_M%s.png", module_str.c_str(), module_str.c_str());
-  c1->SaveAs((const char *)(savename));
+  if (g0hist->GetEntries() > 0) {
+    g0hist->GetXaxis()->SetTitle("G0 gradient");
+    g0hist->GetXaxis()->SetTitleOffset(1.1);
+    g0hist->GetYaxis()->SetTitleOffset(1.5);
+    g0hist->Draw();
+    sprintf(savename,"plots/M%s/CurrentSource/g0hist_M%s.png", module_str.c_str(), module_str.c_str());
+    c1->SaveAs((const char *)(savename));
 
-  g1hist->GetXaxis()->SetTitle("G1 gradient");
-  g1hist->GetXaxis()->SetTitleOffset(1.1);
-  g1hist->GetYaxis()->SetTitleOffset(1.5);
-  g1hist->Draw();
-  sprintf(savename,"plots/M%s/CurrentSource/g1hist_M%s.png", module_str.c_str(), module_str.c_str());
-  c1->SaveAs((const char *)(savename));
+    g0erhist->GetXaxis()->SetTitle("Fitted G0 uncert");
+    g0erhist->GetXaxis()->SetTitleOffset(1.1);
+    g0erhist->GetYaxis()->SetTitleOffset(1.5);
+    g0erhist->Draw();
+    sprintf(savename,"plots/M%s/CurrentSource/g0erhist_M%s.png", module_str.c_str(), module_str.c_str());
+    c1->SaveAs((const char *)(savename));
+  }
 
-  g2hist->GetXaxis()->SetTitle("G2 gradient");
-  g2hist->GetXaxis()->SetTitleOffset(1.1);
-  g2hist->GetYaxis()->SetTitleOffset(1.5);
-  g2hist->Draw();
-  sprintf(savename,"plots/M%s/CurrentSource/g2hist_M%s.png", module_str.c_str(), module_str.c_str());
-  c1->SaveAs((const char *)(savename));
+  if (g1hist->GetEntries() > 0) {
+    g1hist->GetXaxis()->SetTitle("G1 gradient");
+    g1hist->GetXaxis()->SetTitleOffset(1.1);
+    g1hist->GetYaxis()->SetTitleOffset(1.5);
+    g1hist->Draw();
+    sprintf(savename,"plots/M%s/CurrentSource/g1hist_M%s.png", module_str.c_str(), module_str.c_str());
+    c1->SaveAs((const char *)(savename));
 
-  g0overg1hist->GetXaxis()->SetTitle("G0 / G1");
-  g0overg1hist->GetXaxis()->SetTitleOffset(1.1);
-  g0overg1hist->GetYaxis()->SetTitleOffset(1.5);
-  g0overg1hist->Draw();
-  sprintf(savename,"plots/M%s/CurrentSource/g0overg1hist_M%s.png", module_str.c_str(), module_str.c_str());
-  c1->SaveAs((const char *)(savename));
+    g1erhist->GetXaxis()->SetTitle("Fitted G1 uncert");
+    g1erhist->GetXaxis()->SetTitleOffset(1.1);
+    g1erhist->GetYaxis()->SetTitleOffset(1.5);
+    g1erhist->Draw();
+    sprintf(savename,"plots/M%s/CurrentSource/g1erhist_M%s.png", module_str.c_str(), module_str.c_str());
+    c1->SaveAs((const char *)(savename));
+  }
 
-  TPaveText *pave2 = new TPaveText(0.6,0.8,0.94,0.94,"blNDC");
-  pave2->SetBorderSize(0);
-  pave2->SetFillStyle(0);
-  pave2->SetTextSize(0.04);
-  pave2->SetTextAlign(32);
-  g0overg1hist->Fit("gaus");
-  g0overg1hist->Draw();
-  c1->Update();
-  TF1* g0overg1hist_gaus = g0overg1hist->GetFunction("gaus");
-  if (g0overg1hist_gaus) {
+  if (g2hist->GetEntries() > 0) {
+    g2hist->GetXaxis()->SetTitle("G2 gradient");
+    g2hist->GetXaxis()->SetTitleOffset(1.1);
+    g2hist->GetYaxis()->SetTitleOffset(1.5);
+    g2hist->Draw();
+    sprintf(savename,"plots/M%s/CurrentSource/g2hist_M%s.png", module_str.c_str(), module_str.c_str());
+    c1->SaveAs((const char *)(savename));
+
+    g2erhist->GetXaxis()->SetTitle("Fitted G2 uncert");
+    g2erhist->GetXaxis()->SetTitleOffset(1.1);
+    g2erhist->GetYaxis()->SetTitleOffset(1.5);
+    g2erhist->Draw();
+    sprintf(savename,"plots/M%s/CurrentSource/g2erhist_M%s.png", module_str.c_str(), module_str.c_str());
+    c1->SaveAs((const char *)(savename));
+  }
+
+  if (g0overg1hist->GetEntries() > 0) {
+    g0overg1hist->GetXaxis()->SetTitle("G0 / G1");
+    g0overg1hist->GetXaxis()->SetTitleOffset(1.1);
+    g0overg1hist->GetYaxis()->SetTitleOffset(1.5);
+    g0overg1hist->Draw();
+    sprintf(savename,"plots/M%s/CurrentSource/g0overg1hist_M%s.png", module_str.c_str(), module_str.c_str());
+    c1->SaveAs((const char *)(savename));
+
+    TPaveText *pave2 = new TPaveText(0.6,0.8,0.94,0.94,"blNDC");
+    pave2->SetBorderSize(0);
+    pave2->SetFillStyle(0);
+    pave2->SetTextSize(0.04);
+    pave2->SetTextAlign(32);
+    g0overg1hist->Fit("gaus");
+    g0overg1hist->Draw();
+    c1->Update();
+    TF1* g0overg1hist_gaus = g0overg1hist->GetFunction("gaus");
     sprintf(savename,"Mean %0.4f #pm %0.4f", g0overg1hist_gaus->GetParameter(1), g0overg1hist_gaus->GetParError(1));
     pave2->AddText((const char *)(savename));
     sprintf(savename,"Sigma %0.4f #pm %0.4f", g0overg1hist_gaus->GetParameter(2), g0overg1hist_gaus->GetParError(2));
     pave2->AddText((const char *)(savename));
     pave2->Draw();
+    g0overg1hist->SetStats(kFALSE);
+    sprintf(savename,"plots/M%s/CurrentSource/g0overg1hist_fit_M%s.png", module_str.c_str(), module_str.c_str());
+    c1->SaveAs((const char *)(savename));
+
+    g0overg1erhist->GetXaxis()->SetTitle("G0 / G1 uncert");
+    g0overg1erhist->GetXaxis()->SetTitleOffset(1.1);
+    g0overg1erhist->GetYaxis()->SetTitleOffset(1.5);
+    g0overg1erhist->Draw();
+    sprintf(savename,"plots/M%s/CurrentSource/g0overg1erhist_M%s.png", module_str.c_str(), module_str.c_str());
+    c1->SaveAs((const char *)(savename));
+
+    g0overg1_isEdge->SetLineColor(kBlue);
+    g0overg1_isInnerEdge->SetLineColor(kCyan);
+    g0overg1_isDouble->SetLineColor(kGreen+2);
+    g0overg1_isNextToDouble->SetLineColor(kRed);
+    g0overg1_isQuad->SetLineColor(kOrange);
+
+    g0overg1_isEdge->Scale(1./g0overg1_isEdge->GetEntries());
+    g0overg1_isInnerEdge->Scale(1./g0overg1_isInnerEdge->GetEntries());
+    g0overg1_isDouble->Scale(1./g0overg1_isDouble->GetEntries());
+    g0overg1_isNextToDouble->Scale(1./g0overg1_isNextToDouble->GetEntries());
+    g0overg1_isQuad->Scale(1./g0overg1_isQuad->GetEntries());
+    g0overg1_isBulk->Scale(1./g0overg1_isBulk->GetEntries());
+
+    TLegend *leg1 = new TLegend(0.62,0.6,0.93,0.93);
+    leg1->AddEntry(g0overg1_isBulk, "Normal", "l");
+    leg1->AddEntry(g0overg1_isDouble, "Double", "l");
+    leg1->AddEntry(g0overg1_isNextToDouble, "Next to D", "l");
+    leg1->AddEntry(g0overg1_isEdge, "Edge", "l");
+    leg1->AddEntry(g0overg1_isInnerEdge, "Inner E", "l");
+    
+    g0overg1_isDouble->GetXaxis()->SetTitle("G0 / G1");
+    g0overg1_isDouble->GetYaxis()->SetTitle("Normalised");
+    g0overg1_isDouble->GetYaxis()->SetTitleOffset(1.3);
+    g0overg1_isDouble->SetMinimum(0.0);
+    g0overg1_isDouble->SetMaximum(0.16);
+    g0overg1_isDouble->Draw();
+    g0overg1_isEdge->Draw("same");
+    g0overg1_isInnerEdge->Draw("same");
+    g0overg1_isNextToDouble->Draw("same");
+    g0overg1_isBulk->Draw("same");
+    leg1->Draw("same");
+    sprintf(savename,"plots/M%s/CurrentSource/g0overg1_perType_M%s.png", module_str.c_str(), module_str.c_str());
+    c1->SaveAs((const char *)(savename));
   }
-  g0overg1hist->SetStats(kFALSE);
-  sprintf(savename,"plots/M%s/CurrentSource/g0overg1hist_fit_M%s.png", module_str.c_str(), module_str.c_str());
-  c1->SaveAs((const char *)(savename));
 
-  g0overg1erhist->GetXaxis()->SetTitle("G0 / G1 uncert");
-  g0overg1erhist->GetXaxis()->SetTitleOffset(1.1);
-  g0overg1erhist->GetYaxis()->SetTitleOffset(1.5);
-  g0overg1erhist->Draw();
-  sprintf(savename,"plots/M%s/CurrentSource/g0overg1erhist_M%s.png", module_str.c_str(), module_str.c_str());
-  c1->SaveAs((const char *)(savename));
+  if (g1overg2hist->GetEntries() > 0) {
+    g1overg2hist->GetXaxis()->SetTitle("G1 / G2");
+    g1overg2hist->GetXaxis()->SetTitleOffset(1.1);
+    g1overg2hist->GetYaxis()->SetTitleOffset(1.5);
+    g1overg2hist->Draw();
+    sprintf(savename,"plots/M%s/CurrentSource/g1overg2hist_M%s.png", module_str.c_str(), module_str.c_str());
+    c1->SaveAs((const char *)(savename));
 
-  g1overg2hist->GetXaxis()->SetTitle("G1 / G2");
-  g1overg2hist->GetXaxis()->SetTitleOffset(1.1);
-  g1overg2hist->GetYaxis()->SetTitleOffset(1.5);
-  g1overg2hist->Draw();
-  sprintf(savename,"plots/M%s/CurrentSource/g1overg2hist_M%s.png", module_str.c_str(), module_str.c_str());
-  c1->SaveAs((const char *)(savename));
+    TPaveText *pave2 = new TPaveText(0.6,0.8,0.94,0.94,"blNDC");
+    pave2->SetBorderSize(0);
+    pave2->SetFillStyle(0);
+    pave2->SetTextSize(0.04);
+    pave2->SetTextAlign(32);
+    g1overg2hist->Fit("gaus");
+    g1overg2hist->Draw();
+    c1->Update();
+    TF1* g1overg2hist_gaus = g1overg2hist->GetFunction("gaus");
+    sprintf(savename,"Mean %0.4f #pm %0.4f", g1overg2hist_gaus->GetParameter(1), g1overg2hist_gaus->GetParError(1));
+    pave2->AddText((const char *)(savename));
+    sprintf(savename,"Sigma %0.4f #pm %0.4f", g1overg2hist_gaus->GetParameter(2), g1overg2hist_gaus->GetParError(2));
+    pave2->AddText((const char *)(savename));
+    pave2->Draw();
+    g1overg2hist->SetStats(kFALSE);
+    sprintf(savename,"plots/M%s/CurrentSource/g1overg2hist_fit_M%s.png", module_str.c_str(), module_str.c_str());
+    c1->SaveAs((const char *)(savename));
 
-  g1overg2hist->Fit("gaus");
-  g1overg2hist->Draw();
-  c1->Update();
-  pave2->Clear();
-  TF1* g1overg2hist_gaus = g1overg2hist->GetFunction("gaus");
-  sprintf(savename,"Mean %0.4f #pm %0.4f", g1overg2hist_gaus->GetParameter(1), g1overg2hist_gaus->GetParError(1));
-  pave2->AddText((const char *)(savename));
-  sprintf(savename,"Sigma %0.4f #pm %0.4f", g1overg2hist_gaus->GetParameter(2), g1overg2hist_gaus->GetParError(2));
-  pave2->AddText((const char *)(savename));
-  pave2->Draw();
-  g1overg2hist->SetStats(kFALSE);
-  sprintf(savename,"plots/M%s/CurrentSource/g1overg2hist_fit_M%s.png", module_str.c_str(), module_str.c_str());
-  c1->SaveAs((const char *)(savename));
-
-  g1overg2erhist->GetXaxis()->SetTitle("G1 / G2 uncert");
-  g1overg2erhist->GetXaxis()->SetTitleOffset(1.1);
-  g1overg2erhist->GetYaxis()->SetTitleOffset(1.5);
-  g1overg2erhist->Draw();
-  sprintf(savename,"plots/M%s/CurrentSource/g1overg2erhist_M%s.png", module_str.c_str(), module_str.c_str());
-  c1->SaveAs((const char *)(savename));
-
-  g0erhist->GetXaxis()->SetTitle("Fitted G0 uncert");
-  g0erhist->GetXaxis()->SetTitleOffset(1.1);
-  g0erhist->GetYaxis()->SetTitleOffset(1.5);
-  g0erhist->Draw();
-  sprintf(savename,"plots/M%s/CurrentSource/g0erhist_M%s.png", module_str.c_str(), module_str.c_str());
-  c1->SaveAs((const char *)(savename));
-
-  g1erhist->GetXaxis()->SetTitle("Fitted G1 uncert");
-  g1erhist->GetXaxis()->SetTitleOffset(1.1);
-  g1erhist->GetYaxis()->SetTitleOffset(1.5);
-  g1erhist->Draw();
-  sprintf(savename,"plots/M%s/CurrentSource/g1erhist_M%s.png", module_str.c_str(), module_str.c_str());
-  c1->SaveAs((const char *)(savename));
-
-  g2erhist->GetXaxis()->SetTitle("Fitted G2 uncert");
-  g2erhist->GetXaxis()->SetTitleOffset(1.1);
-  g2erhist->GetYaxis()->SetTitleOffset(1.5);
-  g2erhist->Draw();
-  sprintf(savename,"plots/M%s/CurrentSource/g2erhist_M%s.png", module_str.c_str(), module_str.c_str());
-  c1->SaveAs((const char *)(savename));
-
-  g0overg1_isEdge->SetLineColor(kBlue);
-  g0overg1_isInnerEdge->SetLineColor(kCyan);
-  g0overg1_isDouble->SetLineColor(kGreen+2);
-  g0overg1_isNextToDouble->SetLineColor(kRed);
-  g0overg1_isQuad->SetLineColor(kOrange);
-
-  g0overg1_isEdge->Scale(1./g0overg1_isEdge->GetEntries());
-  g0overg1_isInnerEdge->Scale(1./g0overg1_isInnerEdge->GetEntries());
-  g0overg1_isDouble->Scale(1./g0overg1_isDouble->GetEntries());
-  g0overg1_isNextToDouble->Scale(1./g0overg1_isNextToDouble->GetEntries());
-  g0overg1_isQuad->Scale(1./g0overg1_isQuad->GetEntries());
-  g0overg1_isBulk->Scale(1./g0overg1_isBulk->GetEntries());
-
-  TLegend *leg1 = new TLegend(0.62,0.6,0.93,0.93);
-  leg1->AddEntry(g0overg1_isBulk, "Normal", "l");
-  leg1->AddEntry(g0overg1_isDouble, "Double", "l");
-  leg1->AddEntry(g0overg1_isNextToDouble, "Next to D", "l");
-  leg1->AddEntry(g0overg1_isEdge, "Edge", "l");
-  leg1->AddEntry(g0overg1_isInnerEdge, "Inner E", "l");
-
-  g0overg1_isDouble->GetXaxis()->SetTitle("G0 / G1");
-  g0overg1_isDouble->GetYaxis()->SetTitle("Normalised");
-  g0overg1_isDouble->GetYaxis()->SetTitleOffset(1.3);
-  g0overg1_isDouble->SetMinimum(0.0);
-  g0overg1_isDouble->SetMaximum(0.16);
-  g0overg1_isDouble->Draw();
-  g0overg1_isEdge->Draw("same");
-  g0overg1_isInnerEdge->Draw("same");
-  g0overg1_isNextToDouble->Draw("same");
-  g0overg1_isBulk->Draw("same");
-  leg1->Draw("same");
-  sprintf(savename,"plots/M%s/CurrentSource/g0overg1_perType_M%s.png", module_str.c_str(), module_str.c_str());
-  c1->SaveAs((const char *)(savename));
-
-  g1overg2_isEdge->SetLineColor(kBlue);
-  g1overg2_isInnerEdge->SetLineColor(kCyan);
-  g1overg2_isDouble->SetLineColor(kGreen+2);
-  g1overg2_isNextToDouble->SetLineColor(kRed);
-  g1overg2_isQuad->SetLineColor(kOrange);
-
-  g1overg2_isEdge->Scale(1./g1overg2_isEdge->GetEntries());
-  g1overg2_isInnerEdge->Scale(1./g1overg2_isInnerEdge->GetEntries());
-  g1overg2_isDouble->Scale(1./g1overg2_isDouble->GetEntries());
-  g1overg2_isNextToDouble->Scale(1./g1overg2_isNextToDouble->GetEntries());
-  g1overg2_isQuad->Scale(1./g1overg2_isQuad->GetEntries());
-  g1overg2_isBulk->Scale(1./g1overg2_isBulk->GetEntries());
-
-  TLegend *leg = new TLegend(0.62,0.6,0.93,0.93);
-  leg->AddEntry(g1overg2_isBulk, "Normal", "l");
-  leg->AddEntry(g1overg2_isDouble, "Double", "l");
-  leg->AddEntry(g1overg2_isNextToDouble, "Next to D", "l");
-  leg->AddEntry(g1overg2_isEdge, "Edge", "l");
-  leg->AddEntry(g1overg2_isInnerEdge, "Inner E", "l");
-
-  g1overg2_isDouble->GetXaxis()->SetTitle("G1 / G2");
-  g1overg2_isDouble->GetYaxis()->SetTitle("Normalised");
-  g1overg2_isDouble->GetYaxis()->SetTitleOffset(1.3);
-  g1overg2_isDouble->SetMinimum(0.0);
-  g1overg2_isDouble->SetMaximum(0.16);
-  g1overg2_isDouble->Draw();
-  g1overg2_isEdge->Draw("same");
-  g1overg2_isInnerEdge->Draw("same");
-  g1overg2_isNextToDouble->Draw("same");
-  g1overg2_isBulk->Draw("same");
-  leg->Draw("same");
-  sprintf(savename,"plots/M%s/CurrentSource/g1overg2_perType_M%s.png", module_str.c_str(), module_str.c_str());
-  c1->SaveAs((const char *)(savename));
+    g1overg2erhist->GetXaxis()->SetTitle("G1 / G2 uncert");
+    g1overg2erhist->GetXaxis()->SetTitleOffset(1.1);
+    g1overg2erhist->GetYaxis()->SetTitleOffset(1.5);
+    g1overg2erhist->Draw();
+    sprintf(savename,"plots/M%s/CurrentSource/g1overg2erhist_M%s.png", module_str.c_str(), module_str.c_str());
+    c1->SaveAs((const char *)(savename));
+    
+    g1overg2_isEdge->SetLineColor(kBlue);
+    g1overg2_isInnerEdge->SetLineColor(kCyan);
+    g1overg2_isDouble->SetLineColor(kGreen+2);
+    g1overg2_isNextToDouble->SetLineColor(kRed);
+    g1overg2_isQuad->SetLineColor(kOrange);
+    
+    g1overg2_isEdge->Scale(1./g1overg2_isEdge->GetEntries());
+    g1overg2_isInnerEdge->Scale(1./g1overg2_isInnerEdge->GetEntries());
+    g1overg2_isDouble->Scale(1./g1overg2_isDouble->GetEntries());
+    g1overg2_isNextToDouble->Scale(1./g1overg2_isNextToDouble->GetEntries());
+    g1overg2_isQuad->Scale(1./g1overg2_isQuad->GetEntries());
+    g1overg2_isBulk->Scale(1./g1overg2_isBulk->GetEntries());
+    
+    TLegend *leg = new TLegend(0.62,0.6,0.93,0.93);
+    leg->AddEntry(g1overg2_isBulk, "Normal", "l");
+    leg->AddEntry(g1overg2_isDouble, "Double", "l");
+    leg->AddEntry(g1overg2_isNextToDouble, "Next to D", "l");
+    leg->AddEntry(g1overg2_isEdge, "Edge", "l");
+    leg->AddEntry(g1overg2_isInnerEdge, "Inner E", "l");
+    
+    g1overg2_isDouble->GetXaxis()->SetTitle("G1 / G2");
+    g1overg2_isDouble->GetYaxis()->SetTitle("Normalised");
+    g1overg2_isDouble->GetYaxis()->SetTitleOffset(1.3);
+    g1overg2_isDouble->SetMinimum(0.0);
+    g1overg2_isDouble->SetMaximum(0.16);
+    g1overg2_isDouble->Draw();
+    g1overg2_isEdge->Draw("same");
+    g1overg2_isInnerEdge->Draw("same");
+    g1overg2_isNextToDouble->Draw("same");
+    g1overg2_isBulk->Draw("same");
+    leg->Draw("same");
+    sprintf(savename,"plots/M%s/CurrentSource/g1overg2_perType_M%s.png", module_str.c_str(), module_str.c_str());
+    c1->SaveAs((const char *)(savename));
+  }
 
   mapcanvas->cd();
 
-  g0map->GetXaxis()->SetTitle("Column");
-  g0map->GetYaxis()->SetTitle("Row");
-  g0map->GetYaxis()->SetTitleOffset(0.7);
-  g0map->GetZaxis()->SetRangeUser(20000,40000);
-  g0map->Draw("colz");
-  pave->AddText("G0 [ADU/#mus]");
-  pave->Draw();
-  sprintf(savename,"plots/M%s/CurrentSource/g0map_M%s.png", module_str.c_str(), module_str.c_str());
-  mapcanvas->SaveAs((const char *)(savename));
+  if (g0map->GetEntries() > 0) {
+    g0map->GetXaxis()->SetTitle("Column");
+    g0map->GetYaxis()->SetTitle("Row");
+    g0map->GetYaxis()->SetTitleOffset(0.7);
+    g0map->GetZaxis()->SetRangeUser(20000,40000);
+    g0map->Draw("colz");
+    pave->AddText("G0 [ADU/#mus]");
+    pave->Draw();
+    sprintf(savename,"plots/M%s/CurrentSource/g0map_M%s.png", module_str.c_str(), module_str.c_str());
+    mapcanvas->SaveAs((const char *)(savename));
 
-  g1map->GetXaxis()->SetTitle("Column");
-  g1map->GetYaxis()->SetTitle("Row");
-  g1map->GetYaxis()->SetTitleOffset(0.7);
-  if (module_str == "032") {
-    g1map->GetZaxis()->SetRangeUser(-12000,-4000);
-  } else if (module_str == "002") {
-    g1map->GetZaxis()->SetRangeUser(-400,-100);
-  } else {
-    g1map->GetZaxis()->SetRangeUser(-3000,0);
+    g0ermap->GetXaxis()->SetTitle("Column");
+    g0ermap->GetYaxis()->SetTitle("Row");
+    g0ermap->GetYaxis()->SetTitleOffset(0.7);
+    g0ermap->Draw("colz");
+    pave->Clear();
+    pave->AddText("#sigma_{G0}");
+    pave->Draw();
+    g0ermap->GetZaxis()->SetRangeUser(0,200);
+    sprintf(savename,"plots/M%s/CurrentSource/g0ermap_M%s.png", module_str.c_str(), module_str.c_str());
+    mapcanvas->SaveAs((const char *)(savename));
   }
-  g1map->Draw("colz");
-  pave->Clear();
-  pave->AddText("G1 [ADU/#mus]");
-  pave->Draw();
-  sprintf(savename,"plots/M%s/CurrentSource/g1map_M%s.png", module_str.c_str(), module_str.c_str());
-  mapcanvas->SaveAs((const char *)(savename));
 
-  g2map->GetXaxis()->SetTitle("Column");
-  g2map->GetYaxis()->SetTitle("Row");
-  g2map->GetYaxis()->SetTitleOffset(0.7);
-  if (module_str == "032") {
-    g2map->GetZaxis()->SetRangeUser(-800,-400);
-  } else if (module_str == "002") {
-    g2map->GetZaxis()->SetRangeUser(-35,-10);
-  } else {
-    g2map->GetZaxis()->SetRangeUser(-200,-50);
+  if (g1map->GetEntries() > 0) {
+    g1map->GetXaxis()->SetTitle("Column");
+    g1map->GetYaxis()->SetTitle("Row");
+    g1map->GetYaxis()->SetTitleOffset(0.7);
+    if (module_str == "002") {
+      g1map->GetZaxis()->SetRangeUser(-400,-100);
+    } else {
+      g1map->GetZaxis()->SetRangeUser(-3000,0);
+    }
+    g1map->Draw("colz");
+    pave->Clear();
+    pave->AddText("G1 [ADU/#mus]");
+    pave->Draw();
+    sprintf(savename,"plots/M%s/CurrentSource/g1map_M%s.png", module_str.c_str(), module_str.c_str());
+    mapcanvas->SaveAs((const char *)(savename));
+
+    g1ermap->GetXaxis()->SetTitle("Column");
+    g1ermap->GetYaxis()->SetTitle("Row");
+    g1ermap->GetYaxis()->SetTitleOffset(0.7);
+    g1ermap->Draw("colz");
+    pave->Clear();
+    pave->AddText("#sigma_{G1}");
+    pave->Draw();
+    g1ermap->GetZaxis()->SetRangeUser(0,50);
+    sprintf(savename,"plots/M%s/CurrentSource/g1ermap_M%s.png", module_str.c_str(), module_str.c_str());
+    mapcanvas->SaveAs((const char *)(savename));
   }
-  g2map->Draw("colz");
-  pave->Clear();
-  pave->AddText("G2 [ADU/#mus]");
-  pave->Draw();
-  sprintf(savename,"plots/M%s/CurrentSource/g2map_M%s.png", module_str.c_str(), module_str.c_str());
-  mapcanvas->SaveAs((const char *)(savename));
 
-  g0overg1map->GetXaxis()->SetTitle("Column");
-  g0overg1map->GetYaxis()->SetTitle("Row");
-  g0overg1map->GetYaxis()->SetTitleOffset(0.7);
-  if (module_str == "003") {
-    g0overg1map->GetZaxis()->SetRangeUser(-35,-30);
-  } else {
-    g0overg1map->GetZaxis()->SetRangeUser(-50,0);
+  if (g1map->GetEntries() > 0) {
+    g2map->GetXaxis()->SetTitle("Column");
+    g2map->GetYaxis()->SetTitle("Row");
+    g2map->GetYaxis()->SetTitleOffset(0.7);
+    if (module_str == "032") {
+      g2map->GetZaxis()->SetRangeUser(-800,-400);
+    } else if (module_str == "002") {
+      g2map->GetZaxis()->SetRangeUser(-35,-10);
+    } else {
+      g2map->GetZaxis()->SetRangeUser(-200,-50);
+    }
+    g2map->Draw("colz");
+    pave->Clear();
+    pave->AddText("G2 [ADU/#mus]");
+    pave->Draw();
+    sprintf(savename,"plots/M%s/CurrentSource/g2map_M%s.png", module_str.c_str(), module_str.c_str());
+    mapcanvas->SaveAs((const char *)(savename));
+
+    g2ermap->GetXaxis()->SetTitle("Column");
+    g2ermap->GetYaxis()->SetTitle("Row");
+    g2ermap->GetYaxis()->SetTitleOffset(0.7);
+    g2ermap->Draw("colz");
+    pave->Clear();
+    pave->AddText("#sigma_{G2}");
+    pave->Draw();
+    g2ermap->GetZaxis()->SetRangeUser(0,5);
+    sprintf(savename,"plots/M%s/CurrentSource/g2ermap_M%s.png", module_str.c_str(), module_str.c_str());
+    mapcanvas->SaveAs((const char *)(savename));
   }
-  g0overg1map->Draw("colz");
-  pave->Clear();
-  pave->AddText("G0/G1");
-  pave->Draw();
-  sprintf(savename,"plots/M%s/CurrentSource/g0overg1map_M%s.png", module_str.c_str(), module_str.c_str());
-  mapcanvas->SaveAs((const char *)(savename));
 
-  g0overg1ermap->GetXaxis()->SetTitle("Column");
-  g0overg1ermap->GetYaxis()->SetTitle("Row");
-  g0overg1ermap->GetYaxis()->SetTitleOffset(0.7);
-  g0overg1ermap->GetZaxis()->SetRangeUser(0,0.5);
-  g0overg1ermap->Draw("colz");
-  pave->Clear();
-  pave->AddText("#sigma_{G0/G1}");
-  pave->Draw();
-  sprintf(savename,"plots/M%s/CurrentSource/g0overg1ermap_M%s.png", module_str.c_str(), module_str.c_str());
-  mapcanvas->SaveAs((const char *)(savename));
+  if (g0overg1map->GetEntries()) {
+    g0overg1map->GetXaxis()->SetTitle("Column");
+    g0overg1map->GetYaxis()->SetTitle("Row");
+    g0overg1map->GetYaxis()->SetTitleOffset(0.7);
+    if (module_str == "003") {
+      g0overg1map->GetZaxis()->SetRangeUser(-35,-30);
+    } else {
+      g0overg1map->GetZaxis()->SetRangeUser(-50,0);
+    }
+    g0overg1map->Draw("colz");
+    pave->Clear();
+    pave->AddText("G0/G1");
+    pave->Draw();
+    sprintf(savename,"plots/M%s/CurrentSource/g0overg1map_M%s.png", module_str.c_str(), module_str.c_str());
+    mapcanvas->SaveAs((const char *)(savename));
 
-  g1overg2map->GetXaxis()->SetTitle("Column");
-  g1overg2map->GetYaxis()->SetTitle("Row");
-  g1overg2map->GetYaxis()->SetTitleOffset(0.7);
-  g1overg2map->GetZaxis()->SetRangeUser(12,13.2);
-  g1overg2map->Draw("colz");
-  pave->Clear();
-  pave->AddText("G1/G2");
-  pave->Draw();
-  sprintf(savename,"plots/M%s/CurrentSource/g1overg2map_M%s.png", module_str.c_str(), module_str.c_str());
-  mapcanvas->SaveAs((const char *)(savename));
+    g0overg1ermap->GetXaxis()->SetTitle("Column");
+    g0overg1ermap->GetYaxis()->SetTitle("Row");
+    g0overg1ermap->GetYaxis()->SetTitleOffset(0.7);
+    g0overg1ermap->GetZaxis()->SetRangeUser(0,0.5);
+    g0overg1ermap->Draw("colz");
+    pave->Clear();
+    pave->AddText("#sigma_{G0/G1}");
+    pave->Draw();
+    sprintf(savename,"plots/M%s/CurrentSource/g0overg1ermap_M%s.png", module_str.c_str(), module_str.c_str());
+    mapcanvas->SaveAs((const char *)(savename));
+  }
 
-  g1overg2ermap->GetXaxis()->SetTitle("Column");
-  g1overg2ermap->GetYaxis()->SetTitle("Row");
-  g1overg2ermap->GetYaxis()->SetTitleOffset(0.7);
-  g1overg2ermap->GetZaxis()->SetRangeUser(0,0.5);
-  g1overg2ermap->Draw("colz");
-  pave->Clear();
-  pave->AddText("#sigma_{G1/G2}");
-  pave->Draw();
-  sprintf(savename,"plots/M%s/CurrentSource/g1overg2ermap_M%s.png", module_str.c_str(), module_str.c_str());
-  mapcanvas->SaveAs((const char *)(savename));
-
-  g0ermap->GetXaxis()->SetTitle("Column");
-  g0ermap->GetYaxis()->SetTitle("Row");
-  g0ermap->GetYaxis()->SetTitleOffset(0.7);
-  g0ermap->Draw("colz");
-  pave->Clear();
-  pave->AddText("#sigma_{G0}");
-  pave->Draw();
-  g0ermap->GetZaxis()->SetRangeUser(0,200);
-  sprintf(savename,"plots/M%s/CurrentSource/g0ermap_M%s.png", module_str.c_str(), module_str.c_str());
-  mapcanvas->SaveAs((const char *)(savename));
-
-  g1ermap->GetXaxis()->SetTitle("Column");
-  g1ermap->GetYaxis()->SetTitle("Row");
-  g1ermap->GetYaxis()->SetTitleOffset(0.7);
-  g1ermap->Draw("colz");
-  pave->Clear();
-  pave->AddText("#sigma_{G1}");
-  pave->Draw();
-  g1ermap->GetZaxis()->SetRangeUser(0,50);
-  sprintf(savename,"plots/M%s/CurrentSource/g1ermap_M%s.png", module_str.c_str(), module_str.c_str());
-  mapcanvas->SaveAs((const char *)(savename));
-
-  g2ermap->GetXaxis()->SetTitle("Column");
-  g2ermap->GetYaxis()->SetTitle("Row");
-  g2ermap->GetYaxis()->SetTitleOffset(0.7);
-  g2ermap->Draw("colz");
-  pave->Clear();
-  pave->AddText("#sigma_{G2}");
-  pave->Draw();
-  g2ermap->GetZaxis()->SetRangeUser(0,5);
-  sprintf(savename,"plots/M%s/CurrentSource/g2ermap_M%s.png", module_str.c_str(), module_str.c_str());
-  mapcanvas->SaveAs((const char *)(savename));
+  if (g1overg2map->GetEntries()) {
+    g1overg2map->GetXaxis()->SetTitle("Column");
+    g1overg2map->GetYaxis()->SetTitle("Row");
+    g1overg2map->GetYaxis()->SetTitleOffset(0.7);
+    g1overg2map->GetZaxis()->SetRangeUser(12,13.2);
+    g1overg2map->Draw("colz");
+    pave->Clear();
+    pave->AddText("G1/G2");
+    pave->Draw();
+    sprintf(savename,"plots/M%s/CurrentSource/g1overg2map_M%s.png", module_str.c_str(), module_str.c_str());
+    mapcanvas->SaveAs((const char *)(savename));
+    
+    g1overg2ermap->GetXaxis()->SetTitle("Column");
+    g1overg2ermap->GetYaxis()->SetTitle("Row");
+    g1overg2ermap->GetYaxis()->SetTitleOffset(0.7);
+    g1overg2ermap->GetZaxis()->SetRangeUser(0,0.5);
+    g1overg2ermap->Draw("colz");
+    pave->Clear();
+    pave->AddText("#sigma_{G1/G2}");
+    pave->Draw();
+    sprintf(savename,"plots/M%s/CurrentSource/g1overg2ermap_M%s.png", module_str.c_str(), module_str.c_str());
+    mapcanvas->SaveAs((const char *)(savename));
+  }
 
   sprintf(savename,"data/M%s/CS_ratio_M%s.root", module_str.c_str(), module_str.c_str());
   TFile* saved_file2 = new TFile((const char *)(savename),"RECREATE");