Index: /trunk/MagicSoft/Mars/mcalib/MExtractPINDiode.cc
===================================================================
--- /trunk/MagicSoft/Mars/mcalib/MExtractPINDiode.cc	(revision 3194)
+++ /trunk/MagicSoft/Mars/mcalib/MExtractPINDiode.cc	(revision 3195)
@@ -117,4 +117,18 @@
     }
 
+    const MPedestalPix &ped   = (*fPedestals)[fPINDiodeIdx]; 
+
+    if (&ped)
+      {
+        fPedestal = ped.GetPedestal();
+        fPedRms   = ped.GetPedestalRms();
+      }
+    else
+      {
+        *fLog << err << " Cannot find MPedestalPix of the PIN Diode (idx=" 
+              << fPINDiodeIdx << ")" << endl;
+        return kFALSE;
+      }
+
     return kTRUE;
 }
@@ -163,20 +177,4 @@
                sum, sum2, sat, max);
     
-    const MPedestalPix &ped   = (*fPedestals)[fPINDiodeIdx]; 
-
-    Float_t pedes  = -999.;
-    Float_t pedrms = -999.;
-
-    if (&ped)
-      {
-        pedes  = ped.GetPedestal();
-        pedrms = ped.GetPedestalRms();
-      }
-    else
-      {
-        *fLog << warn << " Cannot find MPedestalPix of the PIN Diode (idx=" 
-              << fPINDiodeIdx << ")" << endl;
-
-      }
 
     const Float_t var = ((Float_t)sum2 - (Float_t)sum*sum/fNumSamples)/(fNumSamples-1);
@@ -186,5 +184,5 @@
     // FIXME: The following formulae have to be revised!!
     //
-    fPINDiode->SetExtractedSignal(sum - pedes*fNumSamples, pedrms*fSqrtSamples);
+    fPINDiode->SetExtractedSignal(sum - fPedestal*fNumSamples, fPedRms*fSqrtSamples);
     fPINDiode->SetExtractedRms   (rms, rms/2./fSqrtSamples);
     fPINDiode->SetExtractedTime  (max, rms/fSqrtSamples);
Index: /trunk/MagicSoft/Mars/mcalib/MExtractPINDiode.h
===================================================================
--- /trunk/MagicSoft/Mars/mcalib/MExtractPINDiode.h	(revision 3194)
+++ /trunk/MagicSoft/Mars/mcalib/MExtractPINDiode.h	(revision 3195)
@@ -41,4 +41,7 @@
   Byte_t  fSaturationLimit;
   UInt_t  fPINDiodeIdx;
+
+  Float_t fPedestal;
+  Float_t fPedRms;
   
   void   FindSignal(Byte_t *ptr, Int_t size, UInt_t &sum, UInt_t &sum2, UInt_t &sat, UInt_t &max) const;