Index: trunk/MagicSoft/Mars/mpedestal/MExtractPedestal.h
===================================================================
--- trunk/MagicSoft/Mars/mpedestal/MExtractPedestal.h	(revision 8565)
+++ trunk/MagicSoft/Mars/mpedestal/MExtractPedestal.h	(revision 8571)
@@ -24,6 +24,5 @@
 class MRawEvtPixelIter;
 
-//typedef UShort_t USample_t;
-typedef Byte_t USample_t;
+typedef UShort_t USample_t;
 
 class MExtractPedestal : public MTask
Index: trunk/MagicSoft/Mars/mpedestal/MPedestalSubtract.cc
===================================================================
--- trunk/MagicSoft/Mars/mpedestal/MPedestalSubtract.cc	(revision 8565)
+++ trunk/MagicSoft/Mars/mpedestal/MPedestalSubtract.cc	(revision 8571)
@@ -1,4 +1,4 @@
 /* ======================================================================== *\
-! $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,6 +131,4 @@
 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,5 +139,4 @@
             *ptr = *b++;
     }
- */
 }
 
Index: trunk/MagicSoft/Mars/mpedestal/MPedestalSubtractedEvt.h
===================================================================
--- trunk/MagicSoft/Mars/mpedestal/MPedestalSubtractedEvt.h	(revision 8565)
+++ trunk/MagicSoft/Mars/mpedestal/MPedestalSubtractedEvt.h	(revision 8571)
@@ -15,6 +15,5 @@
 #endif
 
-//typedef UShort_t USample_t;
-typedef Byte_t USample_t;
+typedef UShort_t USample_t;
 
 class MPedestalSubtractedEvt : public MParContainer, public MCamEvent
@@ -22,6 +21,5 @@
 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