Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 3189)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 3190)
@@ -9,4 +9,11 @@
      - changed type of fTotalEntries from ULong_t to UInt_t 
      - fixed documentation of fTotalEntries
+
+   * manalysis/MPedCalcPedRun.h 
+     - changed type of fNumSamplesTot from ULong_t to UInt_t 
+    
+   * mcalib/MCalibrationConfig.h
+     - removed gkConversionHiLo and gkConversionHiLoErr which is now
+       directly in the class MCalibrationPix 
 
 
@@ -77,5 +84,4 @@
    * mcalib/MCalibrationCalc.cc, mcalib/MHCalibrationBlindPixel.cc:
      - fixed usage of logging stream output levels
-
 
 
Index: /trunk/MagicSoft/Mars/manalysis/MPedCalcPedRun.h
===================================================================
--- /trunk/MagicSoft/Mars/manalysis/MPedCalcPedRun.h	(revision 3189)
+++ /trunk/MagicSoft/Mars/manalysis/MPedCalcPedRun.h	(revision 3190)
@@ -24,5 +24,5 @@
     Byte_t   fNumHiGainSamples;
     UShort_t fNumPixels;
-    ULong_t  fNumSamplesTot;
+    UInt_t   fNumSamplesTot;
 
     MRawEvtData         *fRawEvt;     // raw event data (time slices)
@@ -43,5 +43,6 @@
 
     void Clear(const Option_t *o="");
-
+    void SetNumHiGainSamples(const Byte_t n)      { fNumHiGainSamples = n;   }
+    
     ClassDef(MPedCalcPedRun, 0)   // Task to calculate pedestals from pedestal runs raw data
 };
Index: /trunk/MagicSoft/Mars/manalysis/MPedestalCam.h
===================================================================
--- /trunk/MagicSoft/Mars/manalysis/MPedestalCam.h	(revision 3189)
+++ /trunk/MagicSoft/Mars/manalysis/MPedestalCam.h	(revision 3190)
@@ -18,6 +18,5 @@
 
   TClonesArray *fArray;  // FIXME: Change TClonesArray away from a pointer?
-  
-  UInt_t fTotalEntries;
+  UInt_t fTotalEntries;  // Total number of times, the Process was executed (to estimate the error of pedestal)
   
 public: