Index: trunk/MagicSoft/Mars/mjobs/MJPedestal.cc
===================================================================
--- trunk/MagicSoft/Mars/mjobs/MJPedestal.cc	(revision 5841)
+++ trunk/MagicSoft/Mars/mjobs/MJPedestal.cc	(revision 5842)
@@ -947,9 +947,4 @@
             }
         }
-        else
-        {
-            pedcalc.SetExtractor((MExtractTimeAndCharge*)fExtractor);
-            pedlogain.SetExtractor((MExtractTimeAndCharge*)fExtractor);
-        }
 
         if (fExtractionType!=kFundamental)
@@ -957,4 +952,7 @@
             pedcalc.SetRandomCalculation(fExtractionType==kWithExtractorRndm);
             pedlogain.SetRandomCalculation(fExtractionType==kWithExtractorRndm);
+
+            pedcalc.SetExtractor((MExtractTimeAndCharge*)fExtractor);
+            pedlogain.SetExtractor((MExtractTimeAndCharge*)fExtractor);
         }
     }
Index: trunk/MagicSoft/Mars/mjobs/MJPedestal.h
===================================================================
--- trunk/MagicSoft/Mars/mjobs/MJPedestal.h	(revision 5841)
+++ trunk/MagicSoft/Mars/mjobs/MJPedestal.h	(revision 5842)
@@ -67,6 +67,4 @@
     //Bool_t WriteEventloop(MEvtLoop &evtloop) const;
 
-    Bool_t SetupExtractor(MParList &plist, MExtractPedestal &extped);
-
     void   DisplayResult(MParList &plist);
     void   DisplayReferenceLines(MHCamera *cam, const Int_t what) const;