Changeset 7354 for trunk/MagicSoft

Timestamp:

09/16/05 12:04:53 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (3 diffs)
• NEWS (modified) (1 diff)
• msignal/MSignalPix.h (modified) (5 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -26 +26 @@
        interpolation but was never used
 
-   * mcalib/MCalibrateData.cc:
+   * mcalib/MCalibrateData.cc :
      - removed an obsolete calibConv=-1 in case the pixel is unsuitable
        (UpdateConversionFactors)
@@ -40 +40 @@
        depending on the flag IsLoGainUsed()
 
+   * msignal/MSignalPix.h:
+     - removed '!' from fRing data member to allow the status unmapped
+       to be stored after the badpixel treatment
+     - increased version number
+     - removed some obsolete comments
+     - added Copy() member function
+
 
 
@@ -65 +72 @@
 
    * mbase/MStatusDisplay.[h,cc]:
-     - a simple improvement to teh usage of DrawClonePad.
+     - a simple improvement to the usage of DrawClonePad.
 
    * mgui/MCamEvent.[h,cc]:

trunk/MagicSoft/Mars/NEWS

@@ -3 +3 @@
  *** Version <cvs>
 
-   * general: added new tutorial macro macros/tutorials/threshold.C:
+   - general: added new tutorial macro macros/tutorials/threshold.C:
      how to calculate the threshold
 
-   * general: added a new game. Start it from the interpreter with
-        MagicJam j;
-
-   * callisto: MBadPixelsCalc now raises an error instead of simply stopping
+   - general: added a new game. Start it from the interpreter with
+        MagicJam j; (other games are: MineSweeper, MagicSnake, MagicDomino
+                     and MagicReversi)
+
+   - callisto: MBadPixelsCalc now raises an error instead of simply stopping
      the eventloop if something went wrong. This is necessary for the
      automatic processing
 
-   * callisto: Fixed a bug in the treatment of times in the bad pixel
+   - callisto: Fixed a bug in the treatment of times in the bad pixel
      treatment. No neighbors have been taken into account, the new
      arrival time was always calculated by the pixels 0 to 5.
 
-   * callisto: Fixed a bug which caused the random and peak-search pedestal
+   - callisto: The status "unmapped" (for pixel which cannot be interpolated)
+     got lost when the events were stored by the calibration... fixed.
+
+   - callisto: Fixed a bug which caused the random and peak-search pedestal
      extracted with an extractor to be exchanged for the first (roughly)
-     500 events. (The were simple exchanged in callisto.cc) This bug might
+     500 events. (They were simply exchanged in callisto.cc) This bug might
      have been introduced in Mars 0.9.4 when the order of calculation of the
      two types of pedestal in callisto got exchanged. The bug only effects

trunk/MagicSoft/Mars/msignal/MSignalPix.h

@@ -13 +13 @@
 private:
     Bool_t   fIsCore;        //! the pixel is a Core pixel -> kTRUE
-    Short_t  fRing;          //! NT: number of analyzed rings around the core pixels, fRing>0 means: used, fRing= 0 means: unused, fRing= -1 means: unmapped (no possible to use in the calculation of the image parameters)
+    Short_t  fRing;          //  NT: number of analyzed rings around the core pixels, fRing>0 means: used, fRing= 0 means: unused, fRing= -1 means: unmapped (no possible to use in the calculation of the image parameters)
     Short_t  fIdxIsland;     //! the pixel is a Core pixel -> kTRUE
 
@@ -19 +19 @@
     Float_t  fErrPhot;       // the error of fPhot
     Float_t  fArrivalTime;   // Calibrated Arrival Time
-    // FIXME: arrival time t, and it's error sigma t
 
 public:
-    MSignalPix(/*Int_t pix=-1,*/ Float_t phot=0, Float_t errphot=0);
+    MSignalPix(Float_t phot=0, Float_t errphot=0);
 
     void Clear(Option_t *o=0);
+    void Copy(TObject &obj) const
+    {
+        MSignalPix &pix = (MSignalPix&)obj;
+        pix.fIsCore     = fIsCore;
+        pix.fRing       = fRing;
+        pix.fIdxIsland  = fIdxIsland;
+        pix.fPhot       = fPhot;
+        pix.fErrPhot    = fErrPhot;
+    }
 
     Float_t GetNumPhotons() const       { return fPhot;    }
@@ -32 +40 @@
     Bool_t  IsPixelUsed() const         { return fRing>0; }
     Bool_t  IsPixelUnmapped() const     { return fRing==-1; }
-    void    SetPixelUnused()            { fRing=0; }
-    void    SetPixelUsed()              { fRing=1; }
-    void    SetPixelUnmapped()          { fRing=-1;}
+    void    SetPixelUnused()            { fRing=0;  }
+    void    SetPixelUsed()              { fRing=1;  }
+    void    SetPixelUnmapped()          { fRing=-1; }
     void    SetIdxIsland(Short_t num)   { fIdxIsland=num; }
     Short_t GetIdxIsland() const        { return fIdxIsland; }
@@ -44 +52 @@
     Bool_t  IsPixelCore() const         { return fIsCore;  }
 
-    void    SetNumPhotons(Float_t f)    { MMath::ReducePrecision(f); fPhot     = f; }
+    void    SetNumPhotons(Float_t f)    { MMath::ReducePrecision(f); fPhot    = f; }
     void    SetErrorPhot(Float_t f)     { MMath::ReducePrecision(f); fErrPhot = f; }
     void    Set(Float_t np, Float_t ep) { MMath::ReducePrecision(np); MMath::ReducePrecision(ep);  fPhot = np; fErrPhot = ep; }
@@ -56 +64 @@
     Bool_t  IsSortable() const { return kTRUE; }
 
-    ClassDef(MSignalPix, 6)  // class containing information about the Cerenkov Photons in a pixel
+    ClassDef(MSignalPix, 7)  // class containing information about the Cerenkov Photons in a pixel
 };