Changeset 8250 for trunk/MagicSoft

Timestamp:

01/15/07 12:06:22 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mpedestal/MPedestalSubtract.cc (modified) (3 diffs)
• mpedestal/MPedestalSubtractedEvt.cc (modified) (3 diffs)
• mpedestal/MPedestalSubtractedEvt.h (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2007/01/15 Thomas Bretz
+
+   * mpedestal/MPedestalSubtract.cc:
+     - added a sanity check tomake sure that the pixel array has the
+       correct size when filled
+     - made sure the the number of pixels in the camera nd not the 
+       number of connected pixels is used to initialize the size of
+       the arrays.
+
+   * mpedestal/MPedestalSubtractedEvt.[h,cc]:
+     - allow the initialization of nuber of pixels and samples
+       independanly.
+
 
  2007/01/15 Daniela Dorner

trunk/MagicSoft/Mars/mpedestal/MPedestalSubtract.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MPedestalSubtract.cc,v 1.3 2006-10-24 12:39:00 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MPedestalSubtract.cc,v 1.4 2007-01-15 12:06:15 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -128 +128 @@
 
     // initialize fSignal
-    fSignal->InitSamples(fRawEvt->GetNumPixels(), numh+numl);
+    fSignal->InitSamples(numh+numl);//, fRawEvt->GetNumPixels(), numh+numl);
 
     // iterate over all pixels
@@ -137 +137 @@
         const Int_t pixidx = pixel.GetPixelId();
 
+        if (pixidx>=fSignal->GetNumPixels())
+        {
+            *fLog << err << "ERROR - Pixel index " << pixidx << " out of bounds... abort." << endl;
+            return kERROR;
+        }
         // Get pointer were to store merged raw data
         Byte_t *sample = fSignal->GetSamplesRaw(pixidx);

trunk/MagicSoft/Mars/mpedestal/MPedestalSubtractedEvt.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MPedestalSubtractedEvt.cc,v 1.1 2006-10-24 08:22:41 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MPedestalSubtractedEvt.cc,v 1.2 2007-01-15 12:06:15 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -47 +47 @@
 // And reset its contents to 0.
 //
-void MPedestalSubtractedEvt::InitSamples(UInt_t pixels, UInt_t samples)
+void MPedestalSubtractedEvt::InitSamples(UInt_t samples, UInt_t pixels)
 {
     fNumSamples = samples;
-    fNumPixels  = pixels;
-
-    fSamples.Set(pixels*samples);
-    fSamplesRaw.Set(pixels*samples);
+
+    if (pixels>0)
+        fNumPixels = pixels;
+
+    fSamples.Set(fNumPixels*fNumSamples);
+    fSamplesRaw.Set(fNumPixels*fNumSamples);
 
     fSamples.Reset();
@@ -169 +171 @@
 }
 
+/*
+#include <TSpline.h>
+#include "MArrayD.h"
+void  MPedestalSubtractedEvt::InterpolateSaturation(const Int_t idx, Int_t limit, Int_t first, Int_t last) const
+{
+    MArrayD x(GetNumSamples());
+    MArrayD y(GetNumSamples());
+
+    Float_t *s = GetSamples(idx);
+
+    Int_t n = 0;
+    for (unsigned int i=0; i<GetNumSamples(); i++)
+    {
+        if (s[i]>limit)
+            continue;
+        x[n] = i;
+        y[n] = s[i];
+        n++;
+    }
+
+    TSpline5 sp("", x.GetArray(), y.GetArray(), n);
+
+    for (unsigned int i=0; i<GetNumSamples(); i++)
+    {
+        if (s[i]>limit)
+            s[i] = sp.Eval(i);
+    }
+}
+*/

trunk/MagicSoft/Mars/mpedestal/MPedestalSubtractedEvt.h

@@ -30 +30 @@
     }
 
-    void InitSamples(UInt_t pixels, UInt_t samples);
+    void InitSize(const UInt_t i) { fNumPixels=i; }
+    void InitSamples(UInt_t samples, UInt_t pixels=0);
 
     Float_t *GetSamples(UInt_t pixel) const;
@@ -39 +40 @@
 
     Int_t GetSaturation(const Int_t idx, Int_t limit, Int_t &first, Int_t &last) const;
+    //void  InterpolateSaturation(const Int_t idx, Int_t limit, Int_t first, Int_t last) const;
     Int_t GetMax(const Int_t pixidx, const Int_t first, const Int_t last, Int_t &val) const;
     Int_t GetMax(const Int_t pixidx, const Int_t first, const Int_t last) const