Changeset 6038 for trunk/MagicSoft/Mars

Timestamp:

01/27/05 10:44:51 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• mcalib/MCalibrateRelTimes.cc (modified) (1 diff)
• mjobs/MJCalibrateSignal.cc (modified) (3 diffs)
• msignal/MArrivalTime.cc (modified) (3 diffs)
• msignal/MArrivalTime.h (modified) (3 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -29 +29 @@
      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 +43 @@
 
    * 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
 

trunk/MagicSoft/Mars/mcalib/MCalibrateRelTimes.cc

@@ -160 +160 @@
 
         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++) */

trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc

@@ -61 +61 @@
 #include "MCalibrationChargePINDiode.h"
 #include "MCalibrationHiLoCam.h"
+#include "MCalibrationPatternDecode.h"
 
 #include "MCalibrationChargeCalc.h"
@@ -393 +394 @@
 
     // Check for interleaved events
-    MTriggerPatternDecode decode;
+    MCalibrationPatternDecode caldec;
+    MTriggerPatternDecode     decode;
 
     MFTriggerPattern ftp;
@@ -606 +608 @@
     MTaskList tlist2;
 
+    tlist2.AddToList(&caldec);
     tlist2.AddToList(&decode);
     tlist2.AddToList(&apply);

trunk/MagicSoft/Mars/msignal/MArrivalTime.cc

@@ -64 +64 @@
 {
     fData.Reset(-1);
-    fDataErr.Reset(-1);
 }
 
@@ -70 +69 @@
 {
     fData.Set(i);
-    fDataErr.Set(i);
 }
 
@@ -82 +80 @@
 }
       
-
-// -------------------------------------------------------------------------
-// 
-// 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

trunk/MagicSoft/Mars/msignal/MArrivalTime.h

@@ -22 +22 @@
 private:
   TArrayF fData;     // Stores the calibrated arrival times
-  TArrayF fDataErr;  // Stores the calibrated arrival time errors
 
 public:
@@ -35 +34 @@
 
     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 +49 @@
     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
 };