Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 2933)
+++ trunk/MagicSoft/Mars/Changelog	(revision 2934)
@@ -13,7 +13,11 @@
      - include CheckBounds, also in operator[]
 
-   * manalysis/MCalibrationCam.[h,cc]
+   * mcalib/MCalibrationCam.[h,cc]
      - apparently, there was a reference to InitSize(UInt_t i) instead 
        of InitSize(Int_t i), where compiler complained, now changed
+ 
+   * mcalib/MHCalibration*
+   * mcalib/MCalibration*
+     - fixed all Clear()'s, Reset()'s, direct intializers
 
 
Index: trunk/MagicSoft/Mars/mcalib/MCalibrationPix.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrationPix.cc	(revision 2933)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrationPix.cc	(revision 2934)
@@ -56,35 +56,12 @@
 MCalibrationPix::MCalibrationPix(const char *name, const char *title)
     : fPixId(-1),
-      fCharge(-1.),
-      fErrCharge(-1.),
-      fSigmaCharge(-1.),
-      fErrSigmaCharge(-1.),
-      fRSigmaSquare(-1.),
-      fChargeProb(-1.),
-      fPed(-1.),
-      fPedRms(-1.),
-      fErrPedRms(0.),
       fElectronicPedRms(1.5),
       fErrElectronicPedRms(0.3),
-      fTime(-1.),
-      fSigmaTime(-1.),
-      fTimeChiSquare(-1.),
       fFactor(1.32),
       fFactorError(0.04),
-      fPheFFactorMethod(-1.),
-      fPheFFactorMethodError(-1.),
-      fConversionFFactorMethod(-1.),
-      fConversionBlindPixelMethod(-1.),
-      fConversionPINDiodeMethod(-1.),
-      fConversionErrorFFactorMethod(-1.),
-      fConversionErrorBlindPixelMethod(-1.),
-      fConversionErrorPINDiodeMethod(-1.),
-      fConversionSigmaFFactorMethod(-1.),
-      fConversionSigmaBlindPixelMethod(-1.),
-      fConversionSigmaPINDiodeMethod(-1.),
-      fFlags(0),
       fChargeLimit(3.),
       fChargeErrLimit(0.),
-      fChargeRelErrLimit(1.)
+      fChargeRelErrLimit(1.),
+      fFlags(0)
 {
 
@@ -103,4 +80,22 @@
   if (!fHist)
     *fLog << warn << dbginf << " Could not create MHCalibrationPixel " << endl;
+
+  Clear();
+}
+
+MCalibrationPix::~MCalibrationPix() 
+{
+  delete fHist;
+}
+
+
+// ------------------------------------------------------------------------
+//
+// Invalidate values
+//
+void MCalibrationPix::Clear(Option_t *o)
+{
+
+  fHist->Reset();
 
   CLRBIT(fFlags, kHiGainSaturation);
@@ -112,12 +107,29 @@
   CLRBIT(fFlags, kPINDiodeMethodValid);
 
-}
-
-MCalibrationPix::~MCalibrationPix() 
-{
-  delete fHist;
-}
-
-
+  fCharge                           =  -1.;
+  fErrCharge                        =  -1.;
+  fSigmaCharge                      =  -1.;
+  fErrSigmaCharge                   =  -1.;
+  fRSigmaSquare                     =  -1.;
+  fChargeProb                       =  -1.;
+  fPed                              =  -1.;
+  fPedRms                           =  -1.;
+  fErrPedRms                        =   0.;
+  fTime                             =  -1.;
+  fSigmaTime                        =  -1.;
+  fTimeChiSquare                    =  -1.;
+  fPheFFactorMethod                 =  -1.;
+  fPheFFactorMethodError            =  -1.;
+  fConversionFFactorMethod          =  -1.;
+  fConversionBlindPixelMethod       =  -1.;
+  fConversionPINDiodeMethod         =  -1.;
+  fConversionErrorFFactorMethod     =  -1.;
+  fConversionErrorBlindPixelMethod  =  -1.;
+  fConversionErrorPINDiodeMethod    =  -1.;
+  fConversionSigmaFFactorMethod     =  -1.;
+  fConversionSigmaBlindPixelMethod  =  -1.;
+  fConversionSigmaPINDiodeMethod    =  -1.;
+
+}
 
 
@@ -130,23 +142,4 @@
 }
 
-
-// ------------------------------------------------------------------------
-//
-// Invalidate values
-//
-void MCalibrationPix::Clear(Option_t *o)
-{
-
-  fHist->Reset();
-
-  CLRBIT(fFlags, kHiGainSaturation);
-  CLRBIT(fFlags, kExcluded);
-  CLRBIT(fFlags, kFitValid);
-  CLRBIT(fFlags, kFitted);
-  CLRBIT(fFlags, kBlindPixelMethodValid);
-  CLRBIT(fFlags, kFFactorMethodValid);
-  CLRBIT(fFlags, kPINDiodeMethodValid);
-
-}
 
 // --------------------------------------------------------------------------
@@ -554,6 +547,6 @@
   if (fCharge < fChargeRelErrLimit*fErrCharge) 
     {
-      *fLog << warn << "WARNING: Error of Fitted Charge is greater than "
-            << fChargeRelErrLimit << "* Fitted Charges itself in Pixel " << fPixId << endl;
+      *fLog << warn << "WARNING: Fitted Charge is smaller than "
+            << fChargeRelErrLimit << "* its error in Pixel " << fPixId << endl;
       return kFALSE;
     }
Index: trunk/MagicSoft/Mars/mcalib/MHCalibrationPixel.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MHCalibrationPixel.cc	(revision 2933)
+++ trunk/MagicSoft/Mars/mcalib/MHCalibrationPixel.cc	(revision 2934)
@@ -63,4 +63,5 @@
         fTimeLast(15.75),
 	fHivsLoGain(NULL),
+        fHPSD(NULL),
         fChargeGausFit(NULL),
 	fTimeGausFit(NULL), 
@@ -166,4 +167,5 @@
   fChargeProb              = -1.;
   fChargeNdf               = -1;
+
   fTimeChisquare           = -1.;
   fTimeProb                = -1.;
@@ -178,5 +180,5 @@
 
   fOffset = 0.;
-  fSlope  = 0;
+  fSlope  = 0.;
 
   if (fChargeGausFit)
Index: trunk/MagicSoft/Mars/mcalib/MHCalibrationPixel.h
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MHCalibrationPixel.h	(revision 2933)
+++ trunk/MagicSoft/Mars/mcalib/MHCalibrationPixel.h	(revision 2934)
@@ -182,5 +182,5 @@
   virtual void CutAllEdges();
 
-  ClassDef(MHCalibrationPixel, 0)     // Histograms for each calibrated pixel
+  ClassDef(MHCalibrationPixel, 1)     // Histograms for each calibrated pixel
 };