Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 3172)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 3173)
@@ -14,4 +14,7 @@
    * mcalib/MExtractedSignalPINDiode.[h,cc]
      - new container for the extracted signal of the PIN Diode
+
+   * mcalib/MCalibrationCalc.[h,cc]
+     - remove the PIN Diode signal extraction 
 
    * manalysis/MHPedestalPix.[h,cc]
Index: /trunk/MagicSoft/Mars/mcalib/CalibLinkDef.h
===================================================================
--- /trunk/MagicSoft/Mars/mcalib/CalibLinkDef.h	(revision 3172)
+++ /trunk/MagicSoft/Mars/mcalib/CalibLinkDef.h	(revision 3173)
@@ -14,10 +14,13 @@
 #pragma link C++ class MCalibrationCalc+;
 
+#pragma link C++ class MHCalibrationPINDiode+;
 #pragma link C++ class MHCalibrationBlindPixel+;
-#pragma link C++ class MHCalibrationPINDiode+;
 #pragma link C++ class MHCalibrationPixel+;
 
 #pragma link C++ class MMcCalibrationCalc++;
 
+#pragma link C++ class MExtractPINDiode++;
+#pragma link C++ class MExtractedSignalPINDiode++;
+
 #pragma link C++ class MHGausEvents++;
 
Index: /trunk/MagicSoft/Mars/mcalib/MCalibrationCalc.h
===================================================================
--- /trunk/MagicSoft/Mars/mcalib/MCalibrationCalc.h	(revision 3172)
+++ /trunk/MagicSoft/Mars/mcalib/MCalibrationCalc.h	(revision 3173)
@@ -38,6 +38,6 @@
 private:
 
-  static const UInt_t fBlindPixelId;            // ID of the blind pixel
-  static const UInt_t fPINDiodeId;              // ID of the PIN Diode
+  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
@@ -72,5 +72,4 @@
 
   enum  { kUseBlindPixelFit, 
-          kUsePinDiodeFit,
           kUseQualityChecks,
           kHiLoGainCalibration,
@@ -101,6 +100,4 @@
   void SkipBlindPixelFit(Bool_t b=kTRUE)
       {b ? CLRBIT(fFlags, kUseBlindPixelFit)    : SETBIT(fFlags, kUseBlindPixelFit);}
-  void SkipPinDiodeFit(Bool_t b=kTRUE)
-      {b ? CLRBIT(fFlags, kUsePinDiodeFit)      : SETBIT(fFlags, kUsePinDiodeFit);}
   void SkipQualityChecks(Bool_t b=kTRUE)
       {b ? CLRBIT(fFlags, kUseQualityChecks)    : SETBIT(fFlags, kUseQualityChecks);}
@@ -119,5 +116,4 @@
   // Getters
   MCalibrationBlindPix *GetBlindPixel() const;
-  MCalibrationPINDiode *GetPINDiode()   const;
 
   // Exclude pixels from configuration file
Index: /trunk/MagicSoft/Mars/mcalib/MHCalibrationPINDiode.cc
===================================================================
--- /trunk/MagicSoft/Mars/mcalib/MHCalibrationPINDiode.cc	(revision 3172)
+++ /trunk/MagicSoft/Mars/mcalib/MHCalibrationPINDiode.cc	(revision 3173)
@@ -132,10 +132,10 @@
   Int_t nbins = 20;
 
-  CutEdges(fHPINDiodeCharge,nbins);
+  StripZeros(fHPINDiodeCharge,nbins);
 
   fChargeFirstHiGain = fHPINDiodeCharge->GetBinLowEdge(fHPINDiodeCharge->GetXaxis()->GetFirst());
   fChargeLastHiGain  = fHPINDiodeCharge->GetBinLowEdge(fHPINDiodeCharge->GetXaxis()->GetLast())
                       +fHPINDiodeCharge->GetBinWidth(0);
-  CutEdges(fHPINDiodeChargevsN,0);
+  StripZeros(fHPINDiodeChargevsN,0);
 
 }
Index: /trunk/MagicSoft/Mars/mcalib/Makefile
===================================================================
--- /trunk/MagicSoft/Mars/mcalib/Makefile	(revision 3172)
+++ /trunk/MagicSoft/Mars/mcalib/Makefile	(revision 3173)
@@ -48,4 +48,6 @@
            MHCalibrationPixel.cc \
 	   MMcCalibrationCalc.cc \
+	   MExtractPINDiode.cc \
+	   MExtractedSignalPINDiode.cc \
 	   MHGausEvents.cc