Index: trunk/MagicSoft/Mars/macros/calibration.C
===================================================================
--- trunk/MagicSoft/Mars/macros/calibration.C	(revision 5346)
+++ trunk/MagicSoft/Mars/macros/calibration.C	(revision 5411)
@@ -97,14 +97,13 @@
 // the default pedestal run for the calibration
 //
-static const Int_t   pedrun  = 31741;
+static const Int_t   pedrun  = 31756;
 //
 // the default start calibration run 
 //
-static const Int_t   calrun1 = 31742;
+static const Int_t   calrun1 = 31755;
 //
 // the default last calibration run (if 0, only one run is taken, otherwise consecutive runs 
 // between calrun1 and calrun2)
 //
-//static  const Int_t calrun2 = 31754;
 static  const Int_t calrun2 = 0;
 //
@@ -143,5 +142,5 @@
 // Tell if you want to use MPedCalcFromLogain for the pedestal calculation
 //
-static Bool_t usedata      = kTRUE;
+static Bool_t usedata      = kFALSE;
 //
 // Tell if you want to store and read the F0 and F1- files
@@ -243,5 +242,6 @@
 
   MJPedestal pedloop;
-  pedloop.SetUseData(usedata);
+  if (usedata)
+   pedloop.SetUseData();
   pedloop.SetNoStorage(!usestorage);
   pedloop.SetEnvDebug(debug);