Changeset 8573 for trunk

Timestamp:

06/17/07 21:50:58 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mpedestal/MHPedestalCor.cc (modified) (3 diffs)
• msignal/MSignalCalc.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -43 +43 @@
        flexible daza format
      - removed a lot of old, obsolete and unsused member functions
+
+   * msignal/MSignalCalc.cc:
+     - changed to use USample_t instead of Byte_t
+     - ToBeFIXED! The saturation limits are still around 2^8
 
 

trunk/MagicSoft/Mars/mpedestal/MHPedestalCor.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MHPedestalCor.cc,v 1.2 2006-12-11 11:43:32 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MHPedestalCor.cc,v 1.3 2007-06-17 20:50:58 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -124 +124 @@
     Int_t fExtractWinLast  = ns;
 
-    Float_t fMaxSignalVar = 40;
+    Float_t fMaxSignalVar =  40;
+    Float_t fMaxSignalAbs = 250;
 
     for (int k=0; k<np; k++)
     {
         // This is the fast workaround to put hi- and lo-gains together
-        Byte_t *slices = evt->GetSamplesRaw(k);//pixel.GetSamples();
-
-        UShort_t max = 0;
-        UShort_t min = (UShort_t)-1;
+        USample_t *slices = evt->GetSamplesRaw(k);//pixel.GetSamples();
+
+        USample_t max = 0;
+        USample_t min = (USample_t)-1;
 
         // Find the maximum and minimum signal per slice in the high gain window
-        for (Byte_t *slice=slices+fCheckWinFirst; slice<slices+fCheckWinLast; slice++)
+        for (USample_t *slice=slices+fCheckWinFirst; slice<slices+fCheckWinLast; slice++)
         {
             if (*slice > max)
@@ -144 +145 @@
 
         // If the maximum in the high gain window is smaller than
-        if (max-min>=fMaxSignalVar || max>=250)
+        if (max-min>=fMaxSignalVar || max>=fMaxSignalAbs)
             continue;
 

trunk/MagicSoft/Mars/msignal/MSignalCalc.cc

@@ -134 +134 @@
     for (int i=0; i<npix; i++)
     {
-        Byte_t *raw = fRawEvt->GetSamplesRaw(i);
-
-        Byte_t *ptr   = raw;
-        Byte_t *max   = ptr+fRawEvt->GetMaxPos(i, 0, nhi);
-        Byte_t *end   = ptr+nhi;
-        Byte_t *first = max-fBefore;
-        Byte_t *last  = max+fAfter;
+        USample_t *raw = fRawEvt->GetSamplesRaw(i);
+
+        USample_t *ptr   = raw;
+        USample_t *max   = ptr+fRawEvt->GetMaxPos(i, 0, nhi);
+        USample_t *end   = ptr+nhi;
+        USample_t *first = max-fBefore;
+        USample_t *last  = max+fAfter;
 
         ULong_t sumb  = 0;   // sum background
@@ -152 +152 @@
         Int_t nsb  = 0;
 
-        if (*max==255)
+        if (*max==255)  // FIXME!!!!
             sat++;
 
@@ -201 +201 @@
             max = ptr+fRawEvt->GetMaxPos(i, nhi, nhi+nlo);
 
-            if (*max>250)
+            if (*max>250) // FIXME!!!!
             {
                 fSkip++;