Index: trunk/MagicSoft/Mars/macros/calibration.C
===================================================================
--- trunk/MagicSoft/Mars/macros/calibration.C	(revision 3735)
+++ trunk/MagicSoft/Mars/macros/calibration.C	(revision 3740)
@@ -28,14 +28,11 @@
   const MCalibrationCam::PulserColor_t color = MCalibrationCam::kGREEN;
 
-  //  const TString inpath = "/mnt/Data/rootdata/CrabNebula/2004_01_27/";
-  const TString inpath = "/mnt/Data/rootdata/Miscellaneous/2004_03_03/";
-  //  const TString inpath = "/home/rootdata/BlindPixel/";
+  const TString inpath = "/home/rootdata/Calib/2004_04_08/";
 
   MRunIter pruns;
   MRunIter cruns;
 
-  pruns.AddRun(20132,inpath);
-  cruns.AddRun(20134,inpath);
-  //  cruns.AddRun(16774,inpath);
+  pruns.AddRun(22254,inpath);
+  cruns.AddRun(22253,inpath);
 
   gStyle->SetOptStat(1111);
@@ -82,9 +79,17 @@
   static_cast<MRead&>(read).AddFiles(pruns);
 
-  // 
-  // Now the short version: 
-  //
   MJCalibration calloop;
   calloop.SetColor(color);
+
+  //
+  // If you want only the most necessary plots, choose:
+  // calloop.SetDataCheck();
+  // 
+  // For everything, you ever dreamed of, choose:
+  // calloop.SetFullDisplay();
+
+  //
+  // If you want to calibrate the times as well, choose:
+  //  calloop.SetRelTimeCalibration();
   calloop.SetInput(&cruns);
   calloop.SetDisplay(display);
@@ -93,4 +98,6 @@
   if (!calloop.Process(pedloop.GetPedestalCam()))
     return;
+
+
 
 #if 0
@@ -157,4 +164,5 @@
   MArrivalTimeCalc2      timecalc;
   MCalibrationChargeCalc calcalc;
+  calcalc.SetPulserColor(color);
   MGeomApply             geomapl;
   
@@ -163,10 +171,4 @@
   MFillH fillblind("MHCalibrationChargeBlindPix", "MExtractedSignalBlindPixel");
   MFillH fillcam  ("MHCalibrationChargeCam"     , "MExtractedSignalCam");
-  
-  //
-  // As long, as we don't have digital modules,
-  // we have to set the color of the pulser LED by hand
-  //
-  calcalc.SetPulserColor(MCalibrationCam::kCT1);
   
   //