Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 6037)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 6038)
@@ -29,4 +29,8 @@
      enabled the calibration of data with interlaced calibration events     
 
+   * msignal/MArrivalTime.[h,cc]
+   * mcalib/MCalibrateRelTime.cc
+     - removed Error of calibrated arrival time, as agreed on the last 
+       software calibration meeting yesterday
 
  2005/01/27 Thomas Bretz
@@ -39,5 +43,5 @@
 
    * star.rc:
-     - according to Daniel M. we have agreed to chenge the default
+     - according to Daniel M. we have agreed to change the default
        cleaning level to adapt it roughly to the new pedestal
 
Index: /trunk/MagicSoft/Mars/mcalib/MCalibrateRelTimes.cc
===================================================================
--- /trunk/MagicSoft/Mars/mcalib/MCalibrateRelTimes.cc	(revision 6037)
+++ /trunk/MagicSoft/Mars/mcalib/MCalibrateRelTimes.cc	(revision 6038)
@@ -160,27 +160,17 @@
 
         const Float_t offset    = pix.GetTimeOffset();
-        const Float_t precision = pix.GetTimePrecision();
 
         MArrivalTimePix &sig = (*fSignals)[pixidx];
 
         Float_t signal;
-        Float_t sigerr;
 
         if (sig.IsLoGainUsed())
-        {
-            signal = sig.GetArrivalTimeLoGain();
-            sigerr = sig.GetArrivalTimeLoGainError();
-        }
+	  signal = sig.GetArrivalTimeLoGain();
         else
-        {
-            signal = sig.GetArrivalTimeHiGain();
-            sigerr = sig.GetArrivalTimeHiGainError();
-        }
+	  signal = sig.GetArrivalTimeHiGain();
 
         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++) */
Index: /trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc
===================================================================
--- /trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc	(revision 6037)
+++ /trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc	(revision 6038)
@@ -61,4 +61,5 @@
 #include "MCalibrationChargePINDiode.h"
 #include "MCalibrationHiLoCam.h"
+#include "MCalibrationPatternDecode.h"
 
 #include "MCalibrationChargeCalc.h"
@@ -393,5 +394,6 @@
 
     // Check for interleaved events
-    MTriggerPatternDecode decode;
+    MCalibrationPatternDecode caldec;
+    MTriggerPatternDecode     decode;
 
     MFTriggerPattern ftp;
@@ -606,4 +608,5 @@
     MTaskList tlist2;
 
+    tlist2.AddToList(&caldec);
     tlist2.AddToList(&decode);
     tlist2.AddToList(&apply);
Index: /trunk/MagicSoft/Mars/msignal/MArrivalTime.cc
===================================================================
--- /trunk/MagicSoft/Mars/msignal/MArrivalTime.cc	(revision 6037)
+++ /trunk/MagicSoft/Mars/msignal/MArrivalTime.cc	(revision 6038)
@@ -64,5 +64,4 @@
 {
     fData.Reset(-1);
-    fDataErr.Reset(-1);
 }
 
@@ -70,5 +69,4 @@
 {
     fData.Set(i);
-    fDataErr.Set(i);
 }
 
@@ -82,13 +80,4 @@
 }
       
-
-// -------------------------------------------------------------------------
-// 
-// Set the arrival time error in one pixel
-//
-void MArrivalTime::SetTimeErr(const Int_t i, const Float_t t)
-{
-    fDataErr[i] = t;
-}
 
 void MArrivalTime::Print(Option_t *o) const
Index: /trunk/MagicSoft/Mars/msignal/MArrivalTime.h
===================================================================
--- /trunk/MagicSoft/Mars/msignal/MArrivalTime.h	(revision 6037)
+++ /trunk/MagicSoft/Mars/msignal/MArrivalTime.h	(revision 6038)
@@ -22,5 +22,4 @@
 private:
   TArrayF fData;     // Stores the calibrated arrival times
-  TArrayF fDataErr;  // Stores the calibrated arrival time errors
 
 public:
@@ -35,8 +34,6 @@
 
     void SetTime(const Int_t i, const Float_t time);
-    void SetTimeErr(const Int_t i, const Float_t timeerr);    
-    
+
     const TArrayF &GetData() const { return fData; }
-    const TArrayF &GetDataErr() const { return fDataErr; }
 
     Double_t operator[](int i)       { return fData[i]; }
@@ -52,5 +49,5 @@
     void DrawPixelContent(Int_t num) const;
 
-     ClassDef(MArrivalTime, 1)    // class for an event containing the arrival times
+     ClassDef(MArrivalTime, 2)    // class for an event containing the arrival times
 };