diff --git a/JFMC_CurrentSourceScan.cpp b/JFMC_CurrentSourceScan.cpp
index 4e00d54..7316fde 100644
--- a/JFMC_CurrentSourceScan.cpp
+++ b/JFMC_CurrentSourceScan.cpp
@@ -71,6 +71,8 @@ int main(int argc, char* argv[]) {
     pixelMaskObject->maskChip(6, pixel_mask);
     pixelMaskObject->maskSupercolumn(4,1, pixel_mask);
     pixelMaskObject->maskSupercolumn(4,2, pixel_mask);
+  } else if (module_str == "040") {
+    pixelMaskObject->maskSupercolumn(4,2, pixel_mask);
   }
 
   for (int i = 0; i < 640; i++) {
@@ -170,7 +172,7 @@ int main(int argc, char* argv[]) {
   pedeRMSG1->GetYaxis()->SetTitleOffset(0.7);
   if (module_str == "006") {
     pedeRMSG1->GetZaxis()->SetRangeUser(0,400);
-  } else if (module_str == "008" || module_str == "021" || module_str == "022" || module_str == "032" || module_str == "044") {
+  } else if (module_str == "008" || module_str == "021" || module_str == "022" || module_str == "032" || module_str == "040" || module_str == "044") {
     pedeRMSG1->GetZaxis()->SetRangeUser(0,15);
   }
   pedeRMSG1->Draw("colz");
@@ -182,7 +184,7 @@ int main(int argc, char* argv[]) {
   pedeRMSG2->GetYaxis()->SetTitleOffset(0.7);
   if (module_str == "006") {
     pedeRMSG2->GetZaxis()->SetRangeUser(0,400);
-  } else if (module_str == "008" || module_str == "021" || module_str == "022" || module_str == "032" || module_str == "044") {
+  } else if (module_str == "008" || module_str == "021" || module_str == "022" || module_str == "032" || module_str == "040" || module_str == "044") {
     pedeRMSG2->GetZaxis()->SetRangeUser(0,15);
   }
   pedeRMSG2->Draw("colz");
@@ -245,7 +247,7 @@ int main(int argc, char* argv[]) {
     int nfiles = 0;
     if (module_str == "032" || module_str == "021" || module_str == "022") {
       nfiles = 2;
-    } else if (module_str == "006" || module_str == "008" || module_str == "044") {
+    } else if (module_str == "006" || module_str == "008" || module_str == "040" || module_str == "044") {
       nfiles = 3;
     }
 
@@ -339,6 +341,8 @@ int main(int argc, char* argv[]) {
 	  last_frame = 19199;
 	} else if (module_str == "006" || module_str == "008" || module_str == "044") {
 	  last_frame = 24319;
+	} else if (module_str == "040") {
+	  last_frame = 21759;
 	}
 
 	if (j%640 == 0 || j == last_frame) {
@@ -493,7 +497,7 @@ int main(int argc, char* argv[]) {
   TH1F *g1hist = 0;
   if (module_str == "032") {
     g1hist = new TH1F("g1hist","",100,-12000,-4000);
-  } else if (module_str == "022" || module_str == "021" || module_str == "006" || module_str == "008" || module_str == "044") {
+  } else if (module_str == "022" || module_str == "021" || module_str == "006" || module_str == "008" || module_str == "040" || module_str == "044") {
     g1hist = new TH1F("g1hist","",100,-3000,0);
   }
   TH1F *g1erhist = new TH1F("g1erhist","",100,0,50);
@@ -501,7 +505,7 @@ int main(int argc, char* argv[]) {
   TH1F *g2hist = 0;
   if (module_str == "032") {
     g2hist = new TH1F("g2hist","",100,-1000,-200);
-  } else if (module_str == "022" || module_str == "021" || module_str == "006" || module_str == "008" || module_str == "044") {
+  } else if (module_str == "022" || module_str == "021" || module_str == "006" || module_str == "008" || module_str == "040" || module_str == "044") {
     g2hist = new TH1F("g2hist","",100,-300,0);
   }
   TH1F *g2erhist = new TH1F("g2erhist","",100,0,10);
@@ -520,7 +524,7 @@ int main(int argc, char* argv[]) {
   TH1F *g1overg2_isBulk = new TH1F("g1overg2_isBulk","",100,11,15);
 
   double filter[35];
-  if (module_str == "044") {
+  if (module_str == "040" || module_str == "044") {
     for (int i = 0; i < 5; i++) {
       filter[i] = 0.05+(i*0.05);
     }
@@ -560,7 +564,7 @@ int main(int argc, char* argv[]) {
 
       // filter out points at zero and points with 0 error (mean taken from one entry in hist)
       int m_max = 0;
-      if (module_str == "032" || module_str == "021" || module_str == "022" || module_str == "044") {
+      if (module_str == "032" || module_str == "021" || module_str == "022" || module_str == "040" || module_str == "044") {
 	m_max = 27;
       } else if (module_str == "006" || module_str == "008") {
 	m_max = 35;
@@ -598,10 +602,10 @@ int main(int argc, char* argv[]) {
 	  rangemin2 = 0.75;
 	} else if (module_str == "006") {
 	  rangemin2 = 0.075;
-	} else if (module_str == "008" || module_str == "021" || module_str == "022" || module_str == "044") {
+	} else if (module_str == "008" || module_str == "021" || module_str == "022" || module_str == "040" || module_str == "044") {
 	  rangemin2 = *min_element(r1_filter.begin(),r1_filter.end());
 	}
-	double rangemax2 = *max_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);
@@ -629,7 +633,7 @@ int main(int argc, char* argv[]) {
 	double rangemin3 = 0;
 	if (module_str == "032") {
 	  rangemin3 = 5;
-	} else if (module_str == "006" || module_str == "008" || module_str == "021" || module_str == "022" || module_str == "044") {
+	} else if (module_str == "006" || module_str == "008" || module_str == "021" || module_str == "022" || module_str == "040" || module_str == "044") {
 	  rangemin3 = *min_element(r3_filter.begin(),r3_filter.end());
 	}
 	double rangemax3 = *max_element(r3_filter.begin(),r3_filter.end());
@@ -702,6 +706,7 @@ int main(int argc, char* argv[]) {
 	    pixel_type = "q";
 	  }
 	  
+	  mapcanvas->cd();
 	  mapcanvas->SetLeftMargin(0.13);
 	  mapcanvas->SetRightMargin(0.05);
 	  
@@ -885,7 +890,7 @@ int main(int argc, char* argv[]) {
   g1map->GetYaxis()->SetTitleOffset(0.7);
   if (module_str == "032") {
     g1map->GetZaxis()->SetRangeUser(-12000,-4000);
-  } else if (module_str == "022" || module_str == "021" || module_str == "006" || module_str == "008" || module_str == "044") {
+  } else if (module_str == "022" || module_str == "021" || module_str == "006" || module_str == "008" || module_str == "040" || module_str == "044") {
     g1map->GetZaxis()->SetRangeUser(-3000,0);
   }
   g1map->Draw("colz");
@@ -897,7 +902,7 @@ int main(int argc, char* argv[]) {
   g2map->GetYaxis()->SetTitleOffset(0.7);
   if (module_str == "032") {
     g2map->GetZaxis()->SetRangeUser(-800,-400);
-  } else if (module_str == "022" || module_str == "021" || module_str == "006" || module_str == "008" || module_str == "044") {
+  } else if (module_str == "022" || module_str == "021" || module_str == "006" || module_str == "008" || module_str == "040" || module_str == "044") {
     g2map->GetZaxis()->SetRangeUser(-200,-50);
   }
   g2map->Draw("colz");