Changeset 8633 for trunk/MagicSoft/Mars/mpedestal

Timestamp:

07/14/07 01:07:05 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mpedestal

Files:

• MExtractPedestal.cc (modified) (3 diffs)
• MPedestalSubtract.cc (modified) (3 diffs)
• MPedestalSubtract.h (modified) (1 diff)

trunk/MagicSoft/Mars/mpedestal/MExtractPedestal.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MExtractPedestal.cc,v 1.33 2007-06-19 09:25:39 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MExtractPedestal.cc,v 1.34 2007-07-14 00:02:24 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -714 +714 @@
         CalcSums(pixel, offset, ab[0], ab[1]);
 
-    fNumEventsUsed[idx]++;
-
     if (fIntermediateStorage)
         (*fPedestalsInter)[idx].Set(sum, 0, 0, fNumEventsUsed[idx]);
@@ -723 +721 @@
     fSumx[idx]  += sum;
     fSumx2[idx] += sqrsum;
+
+    fNumEventsUsed[idx]++;
 
     if (!fExtractor && pixel.IsABFlagValid())

trunk/MagicSoft/Mars/mpedestal/MPedestalSubtract.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MPedestalSubtract.cc,v 1.7 2007-06-17 14:51:55 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MPedestalSubtract.cc,v 1.8 2007-07-14 00:02:24 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -129 +129 @@
 }
 
-void MPedestalSubtract::Memcpy(void *dest, Int_t offset, void *src, Int_t cnt) const
+void MPedestalSubtract::Memcpy(void *dest, void *src, Int_t cnt) const
 {
     if (fRawEvt->GetNumBytesPerSample()==2)
-        memcpy((UShort_t*)dest+offset, src, cnt*2);
+        memcpy((UShort_t*)dest, src, cnt*2);
     else
     {
-        const Byte_t *b = (Byte_t*)src+offset;
+        const Byte_t *b = (Byte_t*)src;
         for (USample_t *ptr=(USample_t*)dest; ptr<(USample_t*)dest+cnt; ptr++)
             *ptr = *b++;
@@ -171 +171 @@
 
         // copy hi- and lo-gains samples together
-        Memcpy(sample, 0,    pixel.GetHiGainSamples(), numh);
-        Memcpy(sample, numh, pixel.GetLoGainSamples(), numl);
+        Memcpy(sample,      pixel.GetHiGainSamples(), numh);
+        Memcpy(sample+numh, pixel.GetLoGainSamples(), numl);
 
         // start of destination array, end of hi-gain destination array

trunk/MagicSoft/Mars/mpedestal/MPedestalSubtract.h

@@ -26 +26 @@
     Int_t  Process();
 
-    void Memcpy(void *sample, Int_t offset, void *ptr, Int_t cnt) const;
+    void Memcpy(void *sample, void *ptr, Int_t cnt) const;
 
 public: