Index: trunk/MagicSoft/Mars/mcalib/MCalibrateRelTimes.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrateRelTimes.cc	(revision 5302)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrateRelTimes.cc	(revision 5307)
@@ -138,65 +138,54 @@
 Int_t MCalibrateRelTimes::Process()
 {
+    /*
+     if (fCalibrations->GetNumPixels() != (UInt_t)fSignals->GetSize())
+     {
+     // FIXME: MArrivalTime must be of variable size -
+     //        like MCerPhotEvt - because we must be able
+     //        to reduce size by zero supression
+     //        For the moment this check could be done in ReInit...
+     *fLog << err << "MArrivalTime and MCalibrationCam have different sizes... abort." << endl;
+     return kFALSE;
+     }
+     */
 
-  /*
-    if (fCalibrations->GetNumPixels() != (UInt_t)fSignals->GetSize())
+    const UInt_t npix = fSignals->GetSize();
+
+    for (UInt_t pixidx=0; pixidx<npix; pixidx++)
     {
-        // FIXME: MArrivalTime must be of variable size -
-        //        like MCerPhotEvt - because we must be able
-        //        to reduce size by zero supression
-        //        For the moment this check could be done in ReInit...
-        *fLog << err << "MArrivalTime and MCalibrationCam have different sizes... abort." << endl;
-        return kFALSE;
-    }
-  */
+        MCalibrationRelTimePix &pix = (MCalibrationRelTimePix&)(*fCalibrations)[pixidx];
 
-  UInt_t npix = fSignals->GetSize();
+        if (fBadPixels && (*fBadPixels)[pixidx].IsUnsuitable())
+            continue;
 
-  Float_t offset    = 0.;
-  Float_t precision = 0.;
-  
-  for (UInt_t pixidx=0; pixidx<npix; pixidx++)
-    {
+        const Float_t offset    = pix.GetTimeOffset();
+        const Float_t precision = pix.GetTimePrecision();
 
-      MCalibrationRelTimePix &pix = (MCalibrationRelTimePix&)(*fCalibrations)[pixidx];
-      
-      if (fBadPixels)
+        MArrivalTimePix &sig = (*fSignals)[pixidx];
+
+        Float_t signal;
+        Float_t sigerr;
+
+        if (sig.IsLoGainUsed())
         {
-          MBadPixelsPix          &bad = (*fBadPixels)[pixidx];
-          if (bad.IsUnsuitable(MBadPixelsPix::kUnsuitableRun))
-            continue;
+            signal = sig.GetArrivalTimeLoGain();
+            sigerr = sig.GetArrivalTimeLoGainError();
         }
-      
-      offset     = pix.GetTimeOffset();
-      precision  = pix.GetTimePrecision();
-      
-      MArrivalTimePix &sig =  (*fSignals)[pixidx];
-      
-      Float_t signal;
-      Float_t sigerr;
-            
-      if (sig.IsLoGainUsed())
+        else
         {
-          signal = sig.GetArrivalTimeLoGain();
-          sigerr = sig.GetArrivalTimeLoGainError();
+            signal = sig.GetArrivalTimeHiGain();
+            sigerr = sig.GetArrivalTimeHiGainError();
         }
-      else
-        {
-          signal = sig.GetArrivalTimeHiGain();
-          sigerr = sig.GetArrivalTimeHiGainError();
-        }
-      
-      const Float_t time = signal - offset;
-      Float_t err        = sigerr*sigerr + precision*precision;
-      if (err > 0)
-        err = TMath::Sqrt(err);
 
-      fArrivalTime->SetTime(pixidx,time);
-      fArrivalTime->SetTimeErr(pixidx,err);
+        const Float_t time = signal - offset;
+        const Float_t err  = sigerr*sigerr + precision*precision;
+
+        fArrivalTime->SetTime(pixidx, time);
+        fArrivalTime->SetTimeErr(pixidx, err>0 ? TMath::Sqrt(err) : 0);
 
     } /* for (UInt_t pixidx=0; pixidx<npix; pixidx++) */
-  
-  fArrivalTime->SetReadyToSave();
-  
-  return kTRUE;
+
+    fArrivalTime->SetReadyToSave();
+
+    return kTRUE;
 }