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);
