Index: trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeBlindCam.cc
===================================================================
--- trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeBlindCam.cc	(revision 8427)
+++ trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeBlindCam.cc	(revision 8428)
@@ -318,6 +318,4 @@
   *fLog << endl;
 
-  MCalibrationCam *blindcam = fIntensCam ? fIntensCam->GetCam() : fCam;
-      
   for (Int_t i=0; i<fHiGainArray->GetSize(); i++)
     {
@@ -360,7 +358,5 @@
         }
 
-      MCalibrationBlindPix  &pix = (MCalibrationBlindPix&)(*blindcam)[i];
-
-      FitBlindPixel(hist,pix);
+      FitBlindPixel(hist, (MCalibrationBlindPix&)(*fCam)[i]);
     }
 
Index: trunk/MagicSoft/Mars/mhcalib/MHCalibrationHiLoCam.cc
===================================================================
--- trunk/MagicSoft/Mars/mhcalib/MHCalibrationHiLoCam.cc	(revision 8427)
+++ trunk/MagicSoft/Mars/mhcalib/MHCalibrationHiLoCam.cc	(revision 8428)
@@ -1,4 +1,4 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MHCalibrationHiLoCam.cc,v 1.21 2007-04-18 15:33:56 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MHCalibrationHiLoCam.cc,v 1.22 2007-04-20 13:55:00 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -392,5 +392,5 @@
         pix.SetHivsLoLast (fHivsLoLast);
 
-        InitHists(pix,fIntensCam ? fIntensCam->GetAverageBadArea(j) : fCam->GetAverageBadArea(j),j);
+        InitHists(pix, fCam->GetAverageBadArea(j), j);
 
 	if (fCam)
@@ -425,5 +425,5 @@
           pix.SetHivsLoLast (fHivsLoLast);
           
-          InitHists(pix,fIntensCam ? fIntensCam->GetAverageBadSector(j) : fCam->GetAverageBadSector(j),j);
+          InitHists(pix, fCam->GetAverageBadSector(j), j);
 
 	  if (fCam)
@@ -516,5 +516,5 @@
           pix.SetHivsLoLast (fHivsLoLast );
           
-          InitHists(pix,fIntensCam ? fIntensCam->GetAverageBadArea(j) : fCam->GetAverageBadArea(j),j);
+          InitHists(pix, fCam->GetAverageBadArea(j), j);
 
           h =  pix.GetHivsLo();
@@ -547,5 +547,5 @@
         pix.SetHivsLoLast (fHivsLoLast);
         
-        InitHists(pix,fIntensCam ? fIntensCam->GetAverageBadSector(j) : fCam->GetAverageBadSector(j),j);
+        InitHists(pix, fCam->GetAverageBadSector(j), j);
 
         h =  pix.GetHivsLo();
Index: trunk/MagicSoft/Mars/mhcalib/MHCalibrationPulseTimeCam.cc
===================================================================
--- trunk/MagicSoft/Mars/mhcalib/MHCalibrationPulseTimeCam.cc	(revision 8427)
+++ trunk/MagicSoft/Mars/mhcalib/MHCalibrationPulseTimeCam.cc	(revision 8428)
@@ -1,4 +1,4 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MHCalibrationPulseTimeCam.cc,v 1.35 2007-04-18 15:33:56 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MHCalibrationPulseTimeCam.cc,v 1.36 2007-04-20 13:55:00 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -253,5 +253,5 @@
 // Gets or creates the pointers to:
 // - MExtractedSignalCam
-// - MCalibrationPulseTimeCam or MCalibrationIntensityPulseTimeCam
+// - MCalibrationPulseTimeCam
 // - MBadPixelsCam
 //
@@ -327,5 +327,5 @@
         pix.SetBinning(fNbins, fFirst, fLast);
 
-        InitHists(pix,fIntensCam ? fIntensCam->GetAverageBadArea(j) : fCam->GetAverageBadArea(j),j);
+        InitHists(pix, fCam->GetAverageBadArea(j), j);
       }
   }
@@ -340,5 +340,5 @@
           pix.SetBinning(fNbins, fFirst, fLast);
 
-          InitHists(pix,fIntensCam ? fIntensCam->GetAverageBadSector(j) : fCam->GetAverageBadSector(j),j);
+          InitHists(pix, fCam->GetAverageBadSector(j), j);
       }
   }
@@ -464,5 +464,4 @@
   *fLog << endl;
 
-  MCalibrationCam &calcam  = *(fIntensCam ? fIntensCam->GetCam() : fCam);
   //
   // Perform the fitting for the High Gain (done in MHCalibrationCam)
@@ -472,10 +471,8 @@
 
       MHCalibrationPix &hist = (*this)[i];
-
       if (hist.IsExcluded())
         continue;
 
-      MCalibrationPix &pix    = calcam[i];
-      CalcHists(hist,pix);
+      CalcHists(hist, (*fCam)[i]);
     }
 
@@ -484,16 +481,8 @@
 
   for (Int_t j=0; j<fAverageHiGainAreas->GetSize(); j++)
-    {
-      MHCalibrationPix &hist = GetAverageHiGainArea(j);
-      MCalibrationPix  &pix  = calcam.GetAverageArea(j);
-      CalcHists(hist,pix);
-    }
+      CalcHists(GetAverageHiGainArea(j), fCam->GetAverageArea(j));
 
   for (Int_t j=0; j<fAverageHiGainSectors->GetSize(); j++)
-    {
-      MHCalibrationPix &hist = GetAverageHiGainSector(j);
-      MCalibrationPix  &pix  = calcam.GetAverageSector(j);
-      CalcHists(hist,pix);
-    }
+      CalcHists(GetAverageHiGainSector(j), fCam->GetAverageSector(j));
 
   return kTRUE;
Index: trunk/MagicSoft/Mars/mhcalib/MHCalibrationRelTimeCam.cc
===================================================================
--- trunk/MagicSoft/Mars/mhcalib/MHCalibrationRelTimeCam.cc	(revision 8427)
+++ trunk/MagicSoft/Mars/mhcalib/MHCalibrationRelTimeCam.cc	(revision 8428)
@@ -95,6 +95,4 @@
 #include "MParList.h"
 
-#include "MCalibrationIntensityRelTimeCam.h"
-
 #include "MCalibrationRelTimeCam.h"
 #include "MCalibrationRelTimePix.h"
@@ -446,6 +444,4 @@
   *fLog << endl;
 
-  MCalibrationCam *relcam = fIntensCam ? fIntensCam->GetCam() : fCam;
-
   const Int_t nareas = fAverageHiGainAreas->GetSize();
   const Int_t nsectors = fAverageHiGainSectors->GetSize();
@@ -467,11 +463,11 @@
       const Int_t sector = (*fGeom)[i].GetSector();
 
-      MCalibrationRelTimePix &pix = (MCalibrationRelTimePix&)(*relcam)[i] ;
-
       fNumareahi[aidx]++;
       fNumsectorhi[sector]++;
+
       //
       // Check saturation
       // 
+      MCalibrationRelTimePix &pix = (MCalibrationRelTimePix&)(*fCam)[i] ;
       if (histhi.GetSaturated() > fNumHiGainSaturationLimit*histhi.GetHGausHist()->GetEntries())
         {
@@ -496,7 +492,7 @@
   for (Int_t j=0; j<nareas; j++)
     {
-      
-      MHCalibrationPix     &histhi = GetAverageHiGainArea(j);      
-      MCalibrationRelTimePix &pix = (MCalibrationRelTimePix&)relcam->GetAverageArea(j);
+
+      MHCalibrationPix     &histhi = GetAverageHiGainArea(j);
+      MCalibrationRelTimePix &pix = (MCalibrationRelTimePix&)fCam->GetAverageArea(j);
 
       if (satarea[j] > 0.5*fNumareahi[j])
@@ -519,10 +515,10 @@
   for (Int_t j=0; j<fAverageHiGainSectors->GetSize(); j++)
     {
-      
+
       MHCalibrationPix &histhi = GetAverageHiGainSector(j);      
-      MCalibrationRelTimePix  &pix = (MCalibrationRelTimePix&)relcam->GetAverageSector(j) ;
 
       if (satsect[j] > 0.5*fNumsectorhi[j])
         {
+          MCalibrationRelTimePix  &pix = (MCalibrationRelTimePix&)fCam->GetAverageSector(j) ;
           pix.SetHiGainSaturation();
           histhi.SetExcluded();
@@ -540,10 +536,10 @@
     }
 
-  FitHiGainArrays(*relcam, *fBadPixels,
+  FitHiGainArrays(*fCam, *fBadPixels,
                   MBadPixelsPix::kRelTimeNotFitted,
                   MBadPixelsPix::kRelTimeOscillating);
 
-  if (IsLoGain())        
-    FitLoGainArrays(*relcam, *fBadPixels,
+  if (IsLoGain())
+    FitLoGainArrays(*fCam, *fBadPixels,
                     MBadPixelsPix::kRelTimeNotFitted,
                     MBadPixelsPix::kRelTimeOscillating);