Changeset 8565 for trunk/MagicSoft/Mars/mpedestal/MPedestalSubtract.cc

Timestamp:

06/16/07 23:10:47 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mpedestal/MPedestalSubtract.cc (modified) (7 diffs)

trunk/MagicSoft/Mars/mpedestal/MPedestalSubtract.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MPedestalSubtract.cc,v 1.5 2007-05-14 09:53:15 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MPedestalSubtract.cc,v 1.6 2007-06-16 22:05:27 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -129 +129 @@
 }
 
+void MPedestalSubtract::Memcpy(void *dest, Int_t offset, void *src, Int_t cnt) const
+{
+        memcpy(dest+offset, src, cnt);
+/*
+    if (fRawEvt->GetNumBytesPerSample()==2)
+        memcpy((UShort_t*)dest+offset, src, cnt*2);
+    else
+    {
+        const Byte_t *b = (Byte_t*)src+offset;
+        for (USample_t *ptr=(USample_t*)dest; ptr<(USample_t*)dest+cnt; ptr++)
+            *ptr = *b++;
+    }
+ */
+}
+
 // --------------------------------------------------------------------------
 //
@@ -137 +152 @@
     const Int_t numh = fRawEvt->GetNumHiGainSamples();
     const Int_t numl = fRawEvt->GetNumLoGainSamples();
+
+    const UInt_t scale = fRawEvt->GetScale();
 
     // initialize fSignal
@@ -154 +171 @@
         }
         // Get pointer were to store merged raw data
-        Byte_t *sample = fSignal->GetSamplesRaw(pixidx);
+        USample_t *sample = fSignal->GetSamplesRaw(pixidx);
 
         // copy hi- and lo-gains samples together
-        memcpy(sample,      pixel.GetHiGainSamples(), numh);
-        memcpy(sample+numh, pixel.GetLoGainSamples(), numl);
+        Memcpy(sample, 0,    pixel.GetHiGainSamples(), numh);
+        Memcpy(sample, numh, pixel.GetLoGainSamples(), numl);
 
         // start of destination array, end of hi-gain destination array
@@ -165 +182 @@
         Float_t *end = beg + fSignal->GetNumSamples();
 
-        const Byte_t *src = sample;
+        const USample_t *src = sample;
 
         // if no pedestals are given just convert the data into
@@ -172 +189 @@
         {
             while (beg<end)
-                *beg++ = *src++;
+                *beg++ = *src;//Float_t(*src++)/scale;
             continue;
         }
@@ -191 +208 @@
         // FIXME: Shell we really subtract the pedestal from saturating slices???
         for (Float_t *ptr=beg; ptr<end; ptr++)
-            *ptr = (Float_t)*src++ - mean[(ptr-beg)&1];
+            *ptr = Float_t(*src++)/scale - mean[(ptr-beg)&1];
     }