Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 3200)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 3201)
@@ -14,4 +14,8 @@
    * mcalib/MExtractedSignalBlindPixel.[h,cc]
      - new container for the extracted signal of the BlindPixel
+
+   * mcalib/MCalibrationCalc.[h,cc]
+     - does not extract signal from Blind Pixel any more, searches 
+       for MExtractedSignalBlindPixel and fills the hists from there
 
    * manalysis/MPedestalCam.h 
Index: /trunk/MagicSoft/Mars/mcalib/MCalibrationCalc.h
===================================================================
--- /trunk/MagicSoft/Mars/mcalib/MCalibrationCalc.h	(revision 3200)
+++ /trunk/MagicSoft/Mars/mcalib/MCalibrationCalc.h	(revision 3201)
@@ -31,4 +31,5 @@
 class MCalibrationCam;
 class MExtractedSignalCam;
+class MExtractedSignalBlindPixel;
 
 class MTime;
@@ -38,14 +39,12 @@
 private:
 
-  static const UInt_t fgBlindPixelId;           // ID of the blind pixel
-  static const UInt_t fgPINDiodeId;             // ID of the PIN Diode
-  static const Byte_t fgSaturationLimit;        // Saturation of Hi Gain
-  static const Int_t  fgBlindPixelFirst;        // First FADC slice blind pixel
-  static const Int_t  fgBlindPixelLast;         // Last FADC slice blind pixel
-  static const Int_t  fgBlindPixelSinglePheCut; // FADC sum from which on an event is considered as a S.ph. one.
+  static const UInt_t fgBlindPixelIdx;          // ID of the blind pixel
+  static const UInt_t fgPINDiodeIdx;            // ID of the PIN Diode
+  static const UInt_t fgBlindPixelSinglePheCut; // FADC sum from which on an event is considered as a S.ph. one.
   
-  MPedestalCam             *fPedestals;         // Pedestals of all pixels in the camera
-  MCalibrationCam          *fCalibrations;      // Calibration events of all pixels in the camera
-  MExtractedSignalCam      *fSignals;           // Calibration events of all pixels in the camera
+  MPedestalCam               *fPedestals;         // Pedestals of all pixels in the camera
+  MCalibrationCam            *fCalibrations;      // Calibration events of all pixels in the camera
+  MExtractedSignalCam        *fSignals;           // Extracted signal of all pixels in the camera
+  MExtractedSignalBlindPixel *fBlindPixel;        // Extracted signal of the blind pixel  
 
   MRawEvtData              *fRawEvt;            // raw event data (time slices)
@@ -54,11 +53,12 @@
   MTime                    *fEvtTime;           // Time of the event
 
+  UInt_t fBlindPixelIdx;  
+  UInt_t fPINDiodeIdx;      
+  
   Byte_t  fNumHiGainSamples; 
   Byte_t  fNumLoGainSamples; 
   Float_t fSqrtHiGainSamples; 
   
-  Int_t   fBlindPixelFirst;
-  Int_t   fBlindPixelLast;
-  Int_t   fBlindPixelSinglePheCut;
+  UInt_t  fBlindPixelSinglePheCut;
 
   Int_t   fNumBlindPixelSinglePhe;
@@ -90,5 +90,4 @@
   Int_t PostProcess();
 
-  Bool_t CalcSignalBlindPixel(Byte_t *ptr, Float_t &signal) const;  
   
 public:
@@ -110,8 +109,10 @@
   void SetConversionHiLo(Float_t conv)         { fConversionHiLo = conv; }
 
-  void SetBlindPixelRange(Int_t first=fgBlindPixelFirst, Int_t last=fgBlindPixelLast);
-  void SetBlindPixelSinglePheCut(Int_t cut=fgBlindPixelSinglePheCut)    
+  void SetBlindPixelSinglePheCut(const Int_t cut=fgBlindPixelSinglePheCut)    
                                                { fBlindPixelSinglePheCut = cut;  }
-  
+
+  void SetPINDiodeIdx(const UInt_t idx=fgPINDiodeIdx)     {   fPINDiodeIdx   = idx; }
+  void SetBlindPixelIdx(const UInt_t idx=fgBlindPixelIdx)  {   fBlindPixelIdx = idx; }
+
   // Getters
   MCalibrationBlindPix *GetBlindPixel() const;
Index: /trunk/MagicSoft/Mars/mcalib/MExtractBlindPixel.cc
===================================================================
--- /trunk/MagicSoft/Mars/mcalib/MExtractBlindPixel.cc	(revision 3200)
+++ /trunk/MagicSoft/Mars/mcalib/MExtractBlindPixel.cc	(revision 3201)
@@ -105,5 +105,4 @@
     fBlindPixel->SetUsedFADCSlices(fFirst, fLast);
 
-
     return kTRUE;
 }
Index: /trunk/MagicSoft/Mars/mcalib/MExtractPINDiode.cc
===================================================================
--- /trunk/MagicSoft/Mars/mcalib/MExtractPINDiode.cc	(revision 3200)
+++ /trunk/MagicSoft/Mars/mcalib/MExtractPINDiode.cc	(revision 3201)
@@ -49,5 +49,5 @@
 using namespace std;
 
-const UInt_t MExtractPINDiode::fgPINDiodeIdx     = 999;
+const UInt_t MExtractPINDiode::fgPINDiodeIdx     = 1;
 const Byte_t MExtractPINDiode::fgSaturationLimit = 254;
 const Byte_t MExtractPINDiode::fgFirst =  1;