Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 2970)
+++ trunk/MagicSoft/Mars/Changelog	(revision 2971)
@@ -16,4 +16,10 @@
      - include storage of number of used FADC slices to compare later 
        the pedestal per slice ( and sigma per slice_
+
+   * mcalib/MCalibrationCalc.[h,cc]
+     - fBlindPixelId and fPINDiodeId now like in PedestalCam
+     - fill Blind Pixel with information about its fitted pedestal if 
+       available
+
 
  2004/01/29: Abelardo Moralejo
Index: trunk/MagicSoft/Mars/manalysis/MPedCalcPedRun.cc
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MPedCalcPedRun.cc	(revision 2970)
+++ trunk/MagicSoft/Mars/manalysis/MPedCalcPedRun.cc	(revision 2971)
@@ -230,6 +230,5 @@
             MExtractedSignalPix &sig =  (*fSignals)[idx];            
             const Float_t signal = sig.GetExtractedSignalHiGain();
-            const Float_t signalPerSlice = signal/(Float_t)fSignals->GetNumUsedFADCSlices();
-            (*fPedestals)[idx].FillHists(signalPerSlice);
+            (*fPedestals)[idx].FillHists(signal);
           }
     }
@@ -248,4 +247,5 @@
 Int_t MPedCalcPedRun::PostProcess()
 {
+
   // Compute pedestals and rms from the whole run
   const ULong_t n     = fNumSamplesTot;
@@ -278,4 +278,9 @@
     }
   
+  fPedestals->SetNumTotSlices(fNumSamplesTot);
+
+  if (fUseHists)
+    fPedestals->SetNumExtractSlices(fSignals->GetNumUsedHiGainFADCSlices());
+
   return kTRUE;
 }
Index: trunk/MagicSoft/Mars/mcalib/MCalibrationCalc.h
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrationCalc.h	(revision 2970)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrationCalc.h	(revision 2971)
@@ -39,4 +39,7 @@
 private:
 
+  static const Int_t fBlindPixelId;         // ID of the blind pixel
+  static const Int_t fPINDiodeId;           // ID of the PIN Diode
+  
   MPedestalCam             *fPedestals;    // Pedestals of all pixels in the camera
   MCalibrationCam          *fCalibrations; // Calibration events of all pixels in the camera
@@ -50,7 +53,4 @@
   MTime                    *fEvtTime;      // Time of the event
 
-  enum { kBlindPixelId = 559,               // ID of the blind pixel
-         kPINDiodeId = 9999};              // ID of the PIN Diode
-  
   Int_t fEvents;                           // Number of events  
   Int_t fCosmics;                          // Number of events due to supposed cosmics