Changeset 4077

Timestamp:

05/15/04 17:32:02 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• msignal/MArrivalTimeCam.cc (modified) (1 diff)
• msignal/MArrivalTimePix.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -19 +19 @@
                                                  -*-*- END OF LINE -*-*-
 
+ 2004/05/15: Markus Gaug
+
+   * msignal/MArrivalTimePix.h
+   * msignal/MArrivalTimeCam.cc
+     - introduced functin GetHiGainSaturation() in MArrivalTimePix.h
+     - added type in GetPixelContent() whihc asks for Hi-Gain saturation
+       and return the hi-gain time or the low-gain time, correspondingly.
+
  2004/05/12: Markus Gaug
 
@@ -27 +35 @@
    * mjobs/MJExtractCalibTest.cc
      - fixed some errors in the storage of the rel. times.
+
+   * mjobs/MJExtractCalibTest.cc
+     - put the cosmics filter which was forgotten
 
    * mcalib/MCalibrate.h

trunk/MagicSoft/Mars/msignal/MArrivalTimeCam.cc

@@ -152 +152 @@
         val = (*this)[idx].GetArrivalTimeLoGainError();
         break;
+    case 4:
+        if ((*this)[idx].GetNumHiGainSaturated() > 0)
+            val = (*this)[idx].GetArrivalTimeLoGain();
+        else
+            val = (*this)[idx].GetArrivalTimeHiGain();
+        break;
     default:
         return kFALSE;

trunk/MagicSoft/Mars/msignal/MArrivalTimePix.h

@@ -35 +35 @@
     Float_t GetArrivalTimeLoGainError() const { return fArrivalTimeLoGainError; }
 
-    Byte_t GetNumLoGainSaturated()          const { return fNumLoGainSaturated; }
+    Byte_t GetNumHiGainSaturated()      const { return fNumHiGainSaturated; }
+    Byte_t GetNumLoGainSaturated()      const { return fNumLoGainSaturated; }
 
     Bool_t IsLoGainUsed() const { return fNumHiGainSaturated > 0; }