Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 8395)
+++ trunk/MagicSoft/Mars/Changelog	(revision 8396)
@@ -22,10 +22,5 @@
 
    * mjobs/MJCalibrateSignal.cc:
-     - renamed tab "Conv" to "ConvUpd"
-     - renamed task "FillConv" to "FillConvUpd"
-     - moved filling of pedestal histograms before processing 
-       of calibration events
      - added a lot of comments
-     - only fill calibration constants if ReadyToSave flag is set
      - added some code for future use
 
Index: trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc
===================================================================
--- trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc	(revision 8395)
+++ trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc	(revision 8396)
@@ -612,5 +612,5 @@
     MHCamEvent evt6(102, "Unsuitable", "Fraction of unsuitable events per Pixel;;[1]");
     // MHCamEvent evt7(  6, "Times",      "Calibrated Arrival Time;;T [fadc sl]");
-    MHCamEvent evt8(  0, "ConvUpd",    "Calibration Conv. Factors;;[phe/cnts]");
+    MHCamEvent evt8(  0, "Conv",       "Calibration Conv. Factors;;[phe/cnts]");
     MHCamEvent evt9(  7, "PulsePos",   "Pulse Position of cosmics (>50phe);;T");
     MHCamEvent evtR(  4, "HiLoCal",    "Hi-/Lo-Gain ratio;;Ratio");
@@ -629,5 +629,5 @@
     MFillH fill6(&evt6, "MBadPixelsCam",                 "FillUnsuitable");
     // MFillH fill7(&evt7, "MSignalCam",                    "FillTimes");
-    MFillH fill8(&evt8, "MCalibrationIntensityConstCam", "FillConvUpd");
+    MFillH fill8(&evt8, "MCalibrationIntensityConstCam", "FillConv");
     MFillH fill9(&evt9, "MSignalCam",                    "FillPulse");
     MFillH fillR(&evtR, "MExtractedSignalCam",           "FillHiLoCal");
@@ -725,5 +725,5 @@
     tlist3.SetFilter(&fcalib);
 
-    MFDataPhrase filcalco("MCalibrationIntensityConstCam.IsReadyToSave>0.5", "CalibConstFilter");
+    //MFDataPhrase filcalco("MCalibrationIntensityConstCam.IsReadyToSave>0.5", "CalibConstFilter");
     if (fIsInterlaced)
     {
@@ -736,8 +736,9 @@
 	tlist3.AddToList(&taskenv3);
         tlist3.AddToList(&pacalc);     // MCalibCalcFromPast
-
-        tlist3.AddToList(&filcalco);   // CalibConstFilter (IsReadyToSave)
-        fill8.SetFilter(&filcalco);
-        tlist3.AddToList(&fill8);      // FillConvUpd
+        /*
+         tlist3.AddToList(&filcalco);   // CalibConstFilter (IsReadyToSave)
+         fill8.SetFilter(&filcalco);
+         tlist3.AddToList(&fill8);      // FillConvUpd
+         */
 
         tlist3.AddToList(&filcam);     // FillChargeCam
@@ -776,4 +777,5 @@
     */
     tlist2.AddToList(&fill2);
+    tlist2.AddToList(&fill8);        // FillConv
     tlist2.AddToList(&calib);        // MCalibrateData
     if (extractor2 || extractor1->InheritsFrom("MExtractTimeAndCharge"))