Changeset 9212 for trunk/MagicSoft/Mars/mraw/MRawEvtData.cc

Timestamp:

01/06/09 13:07:00 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mraw/MRawEvtData.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/mraw/MRawEvtData.cc

@@ -91 +91 @@
 #include "MArrayS.h"
 #include "MArrayB.h"
+#include "MArrayI.h"
 #include "MGeomCam.h"
 
@@ -396 +397 @@
 //  The parameters are the pixelnumber and the FADC_SLICES values of ADCs
 //
-void MRawEvtData::AddPixel(UShort_t nOfPixel, TArrayC *data)
+void MRawEvtData::AddPixel(UShort_t nOfPixel, const TArrayC &data)
 {
     const Int_t n = fRunHeader->GetNumSamples();
-    if (data->GetSize()!=n)
+    if (data.GetSize()!=n)
     {
         *fLog << err << "RawEvtData::AddPixel: Error, number of samples in ";
-        *fLog << "TArrayC " << data->GetSize() << " doesn't match current number " << n << endl;
+        *fLog << "TArrayC " << data.GetSize() << " doesn't match current number " << n << endl;
         return;
     }
@@ -424 +425 @@
     // add the new slices as last entries to array
     //
-    fHiGainFadcSamples->AddAt((Byte_t*)data->GetArray(), fHiGainFadcSamples->GetSize()-n, n);
-}
+    fHiGainFadcSamples->AddAt((Byte_t*)data.GetArray(), fHiGainFadcSamples->GetSize()-n, n);
+}
+
+// --------------------------------------------------------------------------
+//
+// Add the contents of the MArrayI to the fHiGainFadcSamples
+// One Integer is added to one sample in the array.
+//
+void MRawEvtData::Set(const MArrayI &data)
+{
+    const UInt_t n = fRunHeader->GetNumSamples()*fConnectedPixels;
+
+    Byte_t *dest = fHiGainFadcSamples->GetArray();
+
+    UInt_t *src  = reinterpret_cast<UInt_t*>(data.GetArray());
+    UInt_t *end  = reinterpret_cast<UInt_t*>(data.GetArray()) + n;
+
+    switch (fNumBytesPerSample)
+    {
+    case 1:
+        {
+            Byte_t *ptr = reinterpret_cast<Byte_t*>(dest);
+            while (src<end)
+                *ptr++ = *src++;
+        }
+        return;
+
+    case 2:
+        {
+            UShort_t *ptr = reinterpret_cast<UShort_t*>(dest);
+            while (src<end)
+                *ptr++ = *src++;
+        }
+        return;
+
+    case 4:
+        memcpy(dest, data.GetArray(), n*4);
+        return;
+    }
+}
+
 /*
 void MRawEvtData::AddPixel(UShort_t nOfPixel, TArrayC *data, Bool_t lflag)