Index: trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc
===================================================================
--- trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc	(revision 5692)
+++ trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc	(revision 5732)
@@ -279,4 +279,7 @@
     plist.AddToList(&calibcont);
 
+    pedcamab.SetName("MPedestalFundamental");
+    plist.AddToList(&pedcamab);
+
     // Setup Tasklist
     MTaskList tlist;
@@ -355,5 +358,6 @@
     else
     {
-        calib.SetPedestalCamMean(&pedcamab);
+        calib.AddPedestal("MPedestalCam", "MPedPhotFromExtractorRndm");
+        calib.AddPedestal("Fundamental");
         calib.SetPedestalFlag(MCalibrateData::kEvent);
     }
@@ -383,5 +387,5 @@
     MFillH fill2(&evt2, "MExtractedSignalCam", "FillExtracted");
     MFillH fill3(&evt3, "MPedPhotCam",         "FillPedPhot");
-    MFillH fill4(&evt4, "MPedPhotCam",         "FillPedRMS");
+    MFillH fill4(&evt4, "MPedPhotFromExtractorRndm", "FillPedRMS");
     MFillH fill5(&evt5, "MCerPhotEvt",         "FillInterpolated");
     MFillH fill6(&evt6, "MBadPixelsCam",       "FillUnsuitable");
@@ -404,4 +408,5 @@
     write.AddContainer("MCerPhotEvt",         "Events");
     write.AddContainer("MPedPhotCam",         "Events");
+    write.AddContainer("MPedPhotFromExtractorRndm", "Events");
     write.AddContainer("MTime",               "Events", kFALSE);
     write.AddContainer("MRawEvtHeader",       "Events");