Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 8417)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 8418)
@@ -34,15 +34,46 @@
      - fixed some typos in comments
 
-    * mjobs/MJCalibrateSignal.cc:
-      - removed dependenca on obsolete MCalibrationIntensityConstCam
-
-    * mjobs/MJCalibration.[h,cc]:
-      - for simplification removed all dependencies of unused intensity
-        calibration
-
-    * callisto.rc, callisto_Dec04Jan05.rc, callisto_MarApr05.rc,
-      callisto_mux.rc:
-      - removed line for switching on intensity calibration
-      - added expample lines for movie encoding
+   * mjobs/MJCalibrateSignal.cc:
+     - removed dependenca on obsolete MCalibrationIntensityConstCam
+
+   * mjobs/MJCalibration.[h,cc]:
+     - for simplification removed all dependencies of unused intensity
+       calibration
+
+   * callisto.rc, callisto_Dec04Jan05.rc, callisto_MarApr05.rc,
+     callisto_mux.rc:
+     - removed line for switching on intensity calibration
+     - added expample lines for movie encoding
+
+   * mbadpixels/BadPixelsLinkDef.h, mbadpixels/Makefile:
+     - removed obsolete MBadPixelsIntensityCam
+
+   * mcalib/MCalibCalcFromPast.[h.cc]:
+     - do not store fIntensRelTime (it is not used at all) as data member
+
+   * mcalib/MCalibColorSteer.[h,cc], mcalib/MCalibCalcFromPast.[h.cc]:
+     - instead of creating of a new MBadPixelsCam into the intensity array
+       clear the information of the old one (FIXME: DO NOT CLEAR PREV EXCL!)
+                                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   * mcalib/MCalibrationTestCalc.[h,cc]:
+     - removed empty Process function
+
+   * mcalib/MCalibColorSteer.[h,cc], mcalib/MCalibCalcFromPast.[h.cc],
+     mcalib/MCalibrationChargeCalc.[h,cc], mcalib/MCalibrationTestCalc.[h,cc],
+     mcalib/MCalibrationRelTimeCalc.[h,cc], mhcalib/MHCalibrationCam.[h,cc],
+     mhcalib/MHCalibrationChargeCam.cc, mhcalib/MHCalibrationHiLoCam.cc,
+     mhcalib/MHCalibrationPulseTimeCam.cc, mhcalib/MHCalibrationRelTimeCam.cc,
+     mhcalib/MHPedestalCam.cc:
+     - removed obsolete references to MBadPixelsIntensityCam, replaced
+       by MBadPixelsCam
+
+   * mhcalib/MHCalibrationCam.cc:
+     - set reason for uncalibrated pixels by SetUncalibrated
+
+   * mjobs/MJCalibrateSignal.cc:
+     - removed obsolete references to MBadPixelsIntensityCam
+     - removed MBadPixelsMerge, instead use the given MBadPixelsCam as 
+       starting point. THIS ALSO REMOVES SUPPORT FOR PREV. EXCLUDED PIXELS
+       (TO BE FIXED)
 
 
Index: /trunk/MagicSoft/Mars/NEWS
===================================================================
--- /trunk/MagicSoft/Mars/NEWS	(revision 8417)
+++ /trunk/MagicSoft/Mars/NEWS	(revision 8418)
@@ -23,4 +23,7 @@
    - callisto: removed unsused intensity calibration from MJCalibration
      for further simplification
+
+   - callisto: for simplification removed references to MBadPixelsIntensityCam, 
+     this also removes support for previously excluded pixels (TO BE FIXED)
 
    - callisto: Added the option to write an event movie. Please use
Index: /trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc
===================================================================
--- /trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc	(revision 8417)
+++ /trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc	(revision 8418)
@@ -73,5 +73,4 @@
 #include "MCalibrationIntensityRelTimeCam.h"
 #include "MCalibrationIntensityQECam.h"
-#include "MBadPixelsIntensityCam.h"
 
 #include "MHCalibrationChargeCam.h"
@@ -106,5 +105,5 @@
 #include "MCalibrateData.h"
 #include "MCalibrateRelTimes.h"
-#include "MBadPixelsMerge.h"
+//#include "MBadPixelsMerge.h"
 #include "MBadPixelsCalc.h"
 #include "MBadPixelsTreat.h"
@@ -261,5 +260,4 @@
     MCalibrationIntensityBlindCam       iblcam;
     MCalibrationIntensityRelTimeCam     itmcam;
-    MBadPixelsIntensityCam              ibdcam;
 
     MHCalibrationChargeCam      hchacam;
@@ -291,5 +289,4 @@
         interlacedcont.Add(&iblcam);
         interlacedcont.Add(&itmcam);
-        interlacedcont.Add(&ibdcam);
         interlacedcont.Add(&hchacam);
 	if (IsUseBlindPixel())
@@ -357,5 +354,5 @@
     MCalibConstCam constcam;
 
-    MBadPixelsCam badcam;
+    //MBadPixelsCam badcam;
     constcam.SetBadPixels(&badpix);
 
@@ -363,5 +360,5 @@
     MParList plist;
     plist.AddToList(this); // take care of fDisplay!
-    plist.AddToList(&badcam);
+    plist.AddToList(&badpix);
     plist.AddToList(&constcam);
     //plist.AddToList(&hilcam);
@@ -410,5 +407,5 @@
     if (!geom.IsNull())
         apply.SetGeometry(geom);
-    MBadPixelsMerge        merge(&badpix);
+    //MBadPixelsMerge        merge(&badpix);
 
     // Make sure that pedcamab has the correct name
@@ -711,5 +708,5 @@
     tlist2.AddToList(&decode);
     tlist2.AddToList(&apply);
-    tlist2.AddToList(&merge);
+    //tlist2.AddToList(&merge);
     tlist2.AddToList(&pedsub);
     tlist2.AddToList(&ftp2);