diff --git a/macros/CCEScan/Hamburg b/macros/CCEScan/Hamburg
index 64aebe9..53b5991 100755
--- a/macros/CCEScan/Hamburg
+++ b/macros/CCEScan/Hamburg
Binary files differ
diff --git a/macros/CCEScan/Hamburg.C b/macros/CCEScan/Hamburg.C
index 459727d..e034d79 100755
--- a/macros/CCEScan/Hamburg.C
+++ b/macros/CCEScan/Hamburg.C
@@ -197,6 +197,11 @@
   TVectorD v_temp2       = *vp_temp2;
   TVectorD v_time1       = *vp_time1;
   TVectorD v_time2       = *vp_time2;
+
+  double v_time1_max = v_time1.Max();
+  double v_time2_max = v_time2.Max();
+  double v_fillTime_max = v_fillTime.Max();
+  Info("Hamburg", "temp1, temp2 and lumi vectors finish at %f, %f, %f", v_time1_max, v_time2_max, v_fillTime_max);
   
   // Extract information about the flux in the corresponding layer
   TString vn_sector("v_sector_");
@@ -331,7 +336,16 @@
   
   double tStart = 1262325600;  // 1-1-2010
   // double tStop  = 1372654800;  // 1-7-2013
-  double tStop = 1448928000; // 1-12-2015
+  // double tStop = 1448928000; // 1-12-2015
+  double tStop = 1577750400; // 31-12-2019
+
+  std::vector<double> endTimes;
+  endTimes.push_back(tStop);
+  endTimes.push_back(v_time1_max);
+  endTimes.push_back(v_time2_max);
+  endTimes.push_back(v_fillTime_max);
+  TVectorD v_endTimes(endTimes.size(), &endTimes[0]);
+  tStop = v_endTimes.Min();
 
   double tRun   = tStart;
   double tFillEnd = tStart;
@@ -346,6 +360,9 @@
   Info("Hamburg","Steps are %6.2f sec",tStep);
   Info("Hamburg","Start running");
   
+  int print_interval = 0;
+  int print_freq = 200;
+  
   // Run between the start and the stop time and check if the index for temperature and luminosity needs to be increased
   while (tRun<tStop) {
     double temp   = 273.15;
@@ -416,13 +433,16 @@
     v_low.push_back(TMath::Max(0.0,v_deltaV[0]-v_temp[(int)(0.158*v_temp.size())]));
     v_hig.push_back(TMath::Max(0.0,v_temp[(int)(0.842*v_temp.size())]-v_deltaV[0]));
     
-    Printf("Delta V = (%6.2f+%6.2f/-%6.2f) V",
-           v_deltaV[0],
-           TMath::Max(0.0,v_temp[(int)(0.842*v_temp.size())]-v_deltaV[0]),
-           TMath::Max(0.0,v_deltaV[0]-v_temp[(int)(0.158*v_temp.size())]));
+    if (print_interval%print_freq == 0) Printf("Delta V = (%6.2f+%6.2f/-%6.2f) V",
+                                       v_deltaV[0],
+                                       TMath::Max(0.0,v_temp[(int)(0.842*v_temp.size())]-v_deltaV[0]),
+                                       TMath::Max(0.0,v_deltaV[0]-v_temp[(int)(0.158*v_temp.size())]));
+
     tRun+=tStep;
     time_t raw_tRun = (long)tRun;
-    Info("Hamburg","Date/Time:  %s",ctime(&raw_tRun));
+
+    print_interval += 1;
+    if (print_interval%print_freq == 0) Info("Hamburg","Date/Time:  %s",ctime(&raw_tRun));
     
   }
   
@@ -436,9 +456,9 @@
   std::vector<double> v_low_red;
   
   int redFac = (int)(86400/tStep);
-  Printf("%d",v_val.size());
+  // Printf("%d",v_val.size());
   for (int i=0; i<v_val.size(); i++) {
-    Printf("%d",i);
+    // Printf("%d",i);
     if(i%redFac==0){
       v_val_red.push_back(v_val[i]);
       v_time_red.push_back(v_time[i]);