Changeset 8571 for trunk/MagicSoft/Mars/mpedestal

Timestamp:

06/17/07 15:51:55 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mpedestal

Files:

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

trunk/MagicSoft/Mars/mpedestal/MExtractPedestal.h ¶

@@ -24 +24 @@
 class MRawEvtPixelIter;
 
-//typedef UShort_t USample_t;
-typedef Byte_t USample_t;
+typedef UShort_t USample_t;
 
 class MExtractPedestal : public MTask

trunk/MagicSoft/Mars/mpedestal/MPedestalSubtract.cc ¶

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MPedestalSubtract.cc,v 1.6 2007-06-16 22:05:27 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MPedestalSubtract.cc,v 1.7 2007-06-17 14:51:55 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -131 +131 @@
 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);
@@ -141 +139 @@
             *ptr = *b++;
     }
- */
 }
 

trunk/MagicSoft/Mars/mpedestal/MPedestalSubtractedEvt.h ¶

@@ -15 +15 @@
 #endif
 
-//typedef UShort_t USample_t;
-typedef Byte_t USample_t;
+typedef UShort_t USample_t;
 
 class MPedestalSubtractedEvt : public MParContainer, public MCamEvent
@@ -22 +21 @@
 private:
     MArrayF fSamples;        // list of all samples with pedestal subtracted
-    MArrayB fSamplesRaw;     // list of all samples (raw)
-//    MArrayS fSamplesRaw;     // list of all samples (raw)
+    MArrayS fSamplesRaw;     // list of all samples (raw)
 
     UInt_t fNumSamples;      // number of samples per pixel