Index: trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.cc
===================================================================
--- trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.cc	(revision 8366)
+++ trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.cc	(revision 8417)
@@ -82,5 +82,4 @@
 #include "MCalibrationPix.h"
 
-#include "MBadPixelsIntensityCam.h"
 #include "MBadPixelsCam.h"
 #include "MBadPixelsPix.h"
@@ -144,6 +143,5 @@
     fHistName(gsHistName),fHistTitle(gsHistTitle),
     fHistXTitle(gsHistXTitle),fHistYTitle(gsHistYTitle),
-    fCurrentNumEvts(0),
-    fColor(MCalibrationCam::kNONE), fIntensBad(NULL),
+    fCurrentNumEvts(0), fColor(MCalibrationCam::kNONE),
     fBadPixels(NULL), fIntensCam(NULL), fCam(NULL), fGeom(NULL),
     fRunHeader(NULL)
@@ -568,5 +566,4 @@
 //
 // Gets or creates the pointers to:
-// - MBadPixelsIntensityCam
 // - MBadPixelsCam
 //
@@ -606,21 +603,14 @@
   const Int_t nareas   = fGeom->GetNumAreas();
 
-  fIntensBad = (MBadPixelsIntensityCam*)pList->FindObject(AddSerialNumber("MBadPixelsIntensityCam"));
-  if (fIntensBad)
-    *fLog << inf << "Found MBadPixelsIntensityCam ... " << endl;
-  else
-    {
-      fBadPixels = (MBadPixelsCam*)pList->FindObject("MBadPixelsCam");
+  fBadPixels = (MBadPixelsCam*)pList->FindObject("MBadPixelsCam");
+  if (!fBadPixels)
+  {
+      fBadPixels = (MBadPixelsCam*)pList->FindCreateObj(AddSerialNumber("MBadPixelsCam"));
       if (!fBadPixels)
-        {
-          
-          fBadPixels = (MBadPixelsCam*)pList->FindCreateObj(AddSerialNumber("MBadPixelsCam"));
-          if (!fBadPixels)
-              return kFALSE;
-
-          fBadPixels->InitSize(npixels);
-        }
-    }
-  
+          return kFALSE;
+
+      fBadPixels->InitSize(npixels);
+  }
+
   if (IsAverageing())
     {
@@ -644,7 +634,6 @@
       for (Int_t i=0; i<npixels; i++)
         {
-          
-          MBadPixelsPix &bad = fIntensBad ? (*fIntensBad)[i] : (*fBadPixels)[i];
-          if (bad.IsUnsuitable(MBadPixelsPix::kUnsuitableRun))
+
+          if ((*fBadPixels)[i].IsUnsuitable(MBadPixelsPix::kUnsuitableRun))
             continue;
           
@@ -746,6 +735,5 @@
         pix.SetProbLimit(fProbLimit);
         
-        MBadPixelsPix &bad = fIntensBad ? (*fIntensBad)[i] : (*fBadPixels)[i];
-        InitHists(pix,bad,i);
+        InitHists(pix, (*fBadPixels)[i], i);
 
 	if (fCam)
@@ -823,6 +811,5 @@
         pix.SetProbLimit(fProbLimit);
         
-        MBadPixelsPix &bad = fIntensBad ? (*fIntensBad)[i] : (*fBadPixels)[i];
-        InitHists(pix,bad,i);
+        InitHists(pix, (*fBadPixels)[i], i);
       }
   }
@@ -1255,4 +1242,5 @@
   {
       *fLog << warn << "Pixel  " << setw(4) << pix.GetPixId() << ": Hi-Gain histogram empty." << endl;
+      bad.SetUncalibrated( fittyp );
       return;
   }
@@ -1260,4 +1248,5 @@
   {
       *fLog << warn << "Pixel  " << setw(4) << pix.GetPixId() << ": Hi-Gain histogram contains only overflows." << endl;
+      bad.SetUncalibrated( fittyp );
       return;
   }
@@ -1265,4 +1254,5 @@
   {
       *fLog << warn << "Pixel  " << setw(4) << pix.GetPixId() << ": Hi-Gain histogram contains only underflows." << endl;
+      bad.SetUncalibrated( fittyp );
       return;
   }
@@ -1357,4 +1347,5 @@
   {
       // *fLog << warn << "Pixel   " << setw(4) << pix.GetPixId() << ": Lo-Gain histogram empty." << endl;
+      bad.SetUncalibrated( fittyp );
       return;
   }
@@ -1362,4 +1353,5 @@
   {
       *fLog << warn << "Pixel  " << setw(4) << pix.GetPixId() << ": Lo-Gain histogram contains only overflows." << endl;
+      bad.SetUncalibrated( fittyp );
       return;
   }
@@ -1367,4 +1359,5 @@
   {
       *fLog << warn << "Pixel  " << setw(4) << pix.GetPixId() << ": Lo-Gain histogram contains only underflows." << endl;
+      bad.SetUncalibrated( fittyp );
       return;
   }
Index: trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.h
===================================================================
--- trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.h	(revision 8366)
+++ trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.h	(revision 8417)
@@ -32,5 +32,4 @@
 class MCalibrationCam;
 class MCalibrationPix;
-class MBadPixelsIntensityCam;
 class MBadPixelsCam;
 class MBadPixelsPix;
@@ -100,5 +99,4 @@
   MCalibrationCam::PulserColor_t fColor;  // Colour of the pulsed LEDs
 
-  MBadPixelsIntensityCam *fIntensBad;     //! Bad Pixels intensity calibration storage container  
   MBadPixelsCam    *fBadPixels;           //! Bad Pixels storage container
   MCalibrationIntensityCam *fIntensCam;   //! Intensity Calibration Cam with the results
Index: trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeCam.cc
===================================================================
--- trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeCam.cc	(revision 8366)
+++ trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeCam.cc	(revision 8417)
@@ -1,4 +1,4 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MHCalibrationChargeCam.cc,v 1.55 2007-03-04 14:46:44 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MHCalibrationChargeCam.cc,v 1.56 2007-04-18 15:33:56 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -150,5 +150,4 @@
 #include "MGeomPix.h"
 
-#include "MBadPixelsIntensityCam.h"
 #include "MBadPixelsCam.h"
 #include "MBadPixelsPix.h"
@@ -429,7 +428,4 @@
 {
   
-  MBadPixelsCam *badcam    = fIntensBad 
-    ? (MBadPixelsCam*)        fIntensBad->GetCam()  : fBadPixels;
-
   TH1F *h;
 
@@ -450,5 +446,5 @@
         pix.SetBinningAbsTime(higainsamples, -0.5, higainsamples-0.5);
 
-        InitHists(pix,(*badcam)[i],i);
+        InitHists(pix,(*fBadPixels)[i], i);
 
         h = pix.GetHAbsTime();
@@ -541,7 +537,4 @@
 
 
-  MBadPixelsCam *badcam    = fIntensBad 
-    ? (MBadPixelsCam*)        fIntensBad->GetCam()  : fBadPixels;
-
   const Int_t logainsamples = fRunHeader->GetNumSamplesLoGain();
 
@@ -564,5 +557,5 @@
           pix.SetBlackoutLimit(fgLoGainBlackoutLimit);
 
-          InitHists(pix,(*badcam)[i],i);
+          InitHists(pix,(*fBadPixels)[i], i);
 
           h = pix.GetHAbsTime();
@@ -870,5 +863,4 @@
 
   MCalibrationCam *chargecam = fIntensCam ? fIntensCam->GetCam() : fCam;
-  MBadPixelsCam   *badcam    = fIntensBad ? fIntensBad->GetCam() : fBadPixels;
 
   const Int_t hifirst = fSignal->GetFirstUsedSliceHiGain();
@@ -899,5 +891,5 @@
         }
 
-      MBadPixelsPix &bad = (*badcam)[i];
+      MBadPixelsPix &bad = (*fBadPixels)[i];
 
       h = histhi.GetHGausHist();
@@ -929,9 +921,9 @@
         
         MHCalibrationChargePix &histlo = (MHCalibrationChargePix&)(*this)(i);
-        MBadPixelsPix          &bad    = (*badcam)[i];
         
         if (histlo.IsExcluded())
 	  continue;
 
+        MBadPixelsPix &bad = (*fBadPixels)[i];
         if (histlo.GetSaturated() > fNumLoGainSaturationLimit*histlo.GetHGausHist()->GetEntries())
           {
@@ -1055,5 +1047,5 @@
   // Perform the fitting for the High Gain (done in MHCalibrationCam)
   //
-  FitHiGainArrays(*chargecam, *badcam, 
+  FitHiGainArrays(*chargecam, *fBadPixels,
                   MBadPixelsPix::kHiGainNotFitted,
                   MBadPixelsPix::kHiGainOscillating);
@@ -1063,5 +1055,5 @@
   //
   if (IsLoGain())
-    FitLoGainArrays(*chargecam, *badcam, 
+    FitLoGainArrays(*chargecam, *fBadPixels,
                     MBadPixelsPix::kLoGainNotFitted,
                     MBadPixelsPix::kLoGainOscillating);
@@ -1090,5 +1082,5 @@
           continue;
 
-      MBadPixelsPix &bad = (*badcam)[i];
+      MBadPixelsPix &bad = (*fBadPixels)[i];
       bad.SetUnsuitable(MBadPixelsPix::kUnsuitableRun);
       bad.SetUncalibrated(MBadPixelsPix::kLoGainBlackout);
@@ -1151,11 +1143,10 @@
 {
 
-  MBadPixelsCam   *badcam    = fIntensBad ? fIntensBad->GetCam() : fBadPixels;
   MCalibrationCam *chargecam = fIntensCam ? fIntensCam->GetCam() : fCam;
       
-  for (Int_t i=0; i<badcam->GetSize(); i++)
+  for (Int_t i=0; i<fBadPixels->GetSize(); i++)
     {
       
-      MBadPixelsPix    &bad    = (*badcam)[i];
+      MBadPixelsPix    &bad    = (*fBadPixels)[i];
       MCalibrationPix  &pix    = (*chargecam)[i];
 
Index: trunk/MagicSoft/Mars/mhcalib/MHCalibrationHiLoCam.cc
===================================================================
--- trunk/MagicSoft/Mars/mhcalib/MHCalibrationHiLoCam.cc	(revision 8366)
+++ trunk/MagicSoft/Mars/mhcalib/MHCalibrationHiLoCam.cc	(revision 8417)
@@ -1,4 +1,4 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MHCalibrationHiLoCam.cc,v 1.20 2006-10-19 14:01:49 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MHCalibrationHiLoCam.cc,v 1.21 2007-04-18 15:33:56 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -116,5 +116,4 @@
 #include "MGeomPix.h"
 
-#include "MBadPixelsIntensityCam.h"
 #include "MBadPixelsCam.h"
 #include "MBadPixelsPix.h"
@@ -718,5 +717,4 @@
 
   MCalibrationCam *hilocam = fCam;
-  MBadPixelsCam   *badcam  = fIntensBad ? fIntensBad->GetCam() : fBadPixels;
 
   const Int_t nareas   = fAverageHiGainAreas->GetSize();
@@ -766,5 +764,5 @@
 
 
-  FitHiGainArrays(*hilocam,*badcam,
+  FitHiGainArrays(*hilocam, *fBadPixels,
                   MBadPixelsPix::kHiLoNotFitted,
                   MBadPixelsPix::kHiLoOscillating);
@@ -843,5 +841,5 @@
   }
 
-  FitLoGainArrays(*hilocam,*badcam,
+  FitLoGainArrays(*hilocam, *fBadPixels,
                   MBadPixelsPix::kHiLoNotFitted,
                   MBadPixelsPix::kHiLoOscillating);
@@ -859,9 +857,7 @@
 {
 
-  MBadPixelsCam *badcam = fIntensBad ? fIntensBad->GetCam() : fBadPixels;
-
-  for (Int_t i=0; i<badcam->GetSize(); i++)
-    {
-      MBadPixelsPix          &bad    = (*badcam)[i];
+  for (Int_t i=0; i<fBadPixels->GetSize(); i++)
+    {
+      MBadPixelsPix &bad = (*fBadPixels)[i];
 
       if (bad.IsUncalibrated( MBadPixelsPix::kHiLoNotFitted ))
Index: trunk/MagicSoft/Mars/mhcalib/MHCalibrationPulseTimeCam.cc
===================================================================
--- trunk/MagicSoft/Mars/mhcalib/MHCalibrationPulseTimeCam.cc	(revision 8366)
+++ trunk/MagicSoft/Mars/mhcalib/MHCalibrationPulseTimeCam.cc	(revision 8417)
@@ -1,4 +1,4 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MHCalibrationPulseTimeCam.cc,v 1.34 2007-03-04 11:55:55 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MHCalibrationPulseTimeCam.cc,v 1.35 2007-04-18 15:33:56 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -124,5 +124,4 @@
 #include "MHCalibrationPix.h"
 #include "MCalibrationIntensityCam.h"
-#include "MBadPixelsIntensityCam.h"
 
 #include "MGeomCam.h"
@@ -308,6 +307,5 @@
         pix.SetBinning(fNbins, fFirst, fLast);
 
-        MBadPixelsPix &bad = fIntensBad ? (*fIntensBad)[i] : (*fBadPixels)[i];
-        InitHists(pix,bad,i);
+        InitHists(pix, (*fBadPixels)[i], i);
 
 	if (fCam)
Index: trunk/MagicSoft/Mars/mhcalib/MHCalibrationRelTimeCam.cc
===================================================================
--- trunk/MagicSoft/Mars/mhcalib/MHCalibrationRelTimeCam.cc	(revision 8366)
+++ trunk/MagicSoft/Mars/mhcalib/MHCalibrationRelTimeCam.cc	(revision 8417)
@@ -107,5 +107,4 @@
 #include "MGeomPix.h"
 
-#include "MBadPixelsIntensityCam.h"
 #include "MBadPixelsCam.h"
 #include "MBadPixelsPix.h"
@@ -448,5 +447,4 @@
 
   MCalibrationCam *relcam = fIntensCam ? fIntensCam->GetCam() : fCam;
-  MBadPixelsCam   *badcam = fIntensBad ? fIntensBad->GetCam() : fBadPixels;
 
   const Int_t nareas = fAverageHiGainAreas->GetSize();
@@ -542,10 +540,10 @@
     }
 
-  FitHiGainArrays(*relcam,*badcam,
+  FitHiGainArrays(*relcam, *fBadPixels,
                   MBadPixelsPix::kRelTimeNotFitted,
                   MBadPixelsPix::kRelTimeOscillating);
 
   if (IsLoGain())        
-    FitLoGainArrays(*relcam,*badcam,
+    FitLoGainArrays(*relcam, *fBadPixels,
                     MBadPixelsPix::kRelTimeNotFitted,
                     MBadPixelsPix::kRelTimeOscillating);
@@ -563,9 +561,7 @@
 {
 
-  MBadPixelsCam *badcam = fIntensBad ? fIntensBad->GetCam() : fBadPixels;
-
-  for (Int_t i=0; i<badcam->GetSize(); i++)
-    {
-      MBadPixelsPix          &bad    = (*badcam)[i];
+  for (Int_t i=0; i<fBadPixels->GetSize(); i++)
+    {
+      MBadPixelsPix &bad = (*fBadPixels)[i];
 
       if (bad.IsUncalibrated( MBadPixelsPix::kRelTimeNotFitted ))
Index: trunk/MagicSoft/Mars/mhcalib/MHPedestalCam.cc
===================================================================
--- trunk/MagicSoft/Mars/mhcalib/MHPedestalCam.cc	(revision 8366)
+++ trunk/MagicSoft/Mars/mhcalib/MHPedestalCam.cc	(revision 8417)
@@ -104,5 +104,4 @@
 #include "MCalibrationPix.h"
 
-#include "MBadPixelsIntensityCam.h"
 #include "MBadPixelsCam.h"
 
@@ -127,4 +126,5 @@
 const TString MHPedestalCam::gsHistYTitle = "Nr. events";
 const TString MHPedestalCam::fgNamePedestalCam = "MPedestalCam";
+
 // --------------------------------------------------------------------------
 //
@@ -375,6 +375,5 @@
         pix.SetProbLimit(fProbLimit);
 
-        MBadPixelsPix &bad = fIntensBad ? (*fIntensBad)[i] : (*fBadPixels)[i];
-        InitHists(pix,bad,i);
+        InitHists(pix, (*fBadPixels)[i], i);
       }
   }