Index: trunk/MagicSoft/Mars/mcalib/MCalibrationRelTimeCalc.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrationRelTimeCalc.cc	(revision 4710)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrationRelTimeCalc.cc	(revision 4723)
@@ -96,5 +96,5 @@
   SetRelTimeResolutionLimit();
   SetOutputPath();
-  SetOutputFile();
+  SetOutputFile("");
  
   Clear();
@@ -233,7 +233,11 @@
   // Re-direct the output to an ascii-file from now on:
   //
-  MLog asciilog;
-  asciilog.SetOutputFile(GetOutputFile(),kTRUE);
-  SetLogStream(&asciilog);
+  MLog *asciilog = fOutputFile.IsNull() ? 0 : new MLog;
+  if (asciilog)
+  {
+      asciilog->SetOutputFile(GetOutputFile(),kTRUE);
+      SetLogStream(asciilog);
+  }
+
   //
   // Finalize calibration statistics
@@ -254,5 +258,9 @@
                     "Pixels with unsuccesful Gauss fit to the times:   ");
 
-  SetLogStream(&gLog);
+  if (asciilog)
+  {
+      SetLogStream(&gLog);
+      delete asciilog;
+  }
 
   return kTRUE;
@@ -277,17 +285,10 @@
   const UInt_t nareas   = fGeom->GetNumAreas();
 
-  Float_t lowlim       [nareas];
-  Float_t upplim       [nareas];
-  Float_t areasum      [nareas];
+  TArrayF lowlim       (nareas);
+  TArrayF upplim       (nareas);
+  TArrayF areasum      (nareas);
   //  Float_t areasum2     [nareas];
-  Int_t   numareavalid [nareas];
-  Int_t   useunreliable[nareas];
-
-  memset(lowlim        ,0, nareas   * sizeof(Float_t));
-  memset(upplim        ,0, nareas   * sizeof(Float_t));
-  memset(areasum       ,0, nareas   * sizeof(Float_t));
-  //  memset(areasum2      ,0, nareas   * sizeof(Float_t));
-  memset(numareavalid  ,0, nareas   * sizeof(Int_t  ));
-  memset(useunreliable ,0, nareas   * sizeof(Int_t  ));
+  TArrayI numareavalid (nareas);
+  TArrayI useunreliable(nareas);
 
   //
@@ -312,5 +313,5 @@
       useunreliable[aidx] = 1;
 
-  memset(numareavalid  ,0, nareas   * sizeof(Int_t  ));
+  numareavalid.Reset();
   //
   // First loop: Get mean time resolution the RMS