Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 5028)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 5029)
@@ -28,4 +28,7 @@
      - set MBadPixelsPix::kLoGainNotFitted only if High-Gain Saturation
        had occurred. 
+
+   * mhcalib/MHCalibrationChargeCam.cc
+     - simply calls to IntensityCam somewhat
 
 
Index: /trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.cc
===================================================================
--- /trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.cc	(revision 5028)
+++ /trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.cc	(revision 5029)
@@ -1226,5 +1226,6 @@
       {
         hist.BypassFit();
-        bad.SetUncalibrated( fittyp );
+        if (pix.IsHiGainSaturation())
+          bad.SetUncalibrated( fittyp );
       }
   
Index: /trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeCam.cc
===================================================================
--- /trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeCam.cc	(revision 5028)
+++ /trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeCam.cc	(revision 5029)
@@ -931,4 +931,7 @@
 
   TH1F *h = NULL;
+
+  MCalibrationCam *chargecam = fIntensCam ? fIntensCam->GetCam() : fCam;
+  MBadPixelsCam   *badcam    = fIntensBad ? fIntensBad->GetCam() : fBadPixels;
       
   for (Int_t i=0; i<fHiGainArray->GetSize(); i++)
@@ -940,7 +943,5 @@
         continue;
       
-      MCalibrationChargePix  &pix    = fIntensCam 
-        ? (MCalibrationChargePix&)(*fIntensCam)[i] 
-        : (MCalibrationChargePix&)(*fCam)[i];
+      MCalibrationChargePix  &pix = (MCalibrationChargePix&)(*chargecam)[i] ;
 
       if (histhi.GetSaturated() > fNumHiGainSaturationLimit*histhi.GetHGausHist()->GetEntries())
@@ -952,5 +953,5 @@
         }
 
-      MBadPixelsPix &bad = fIntensBad ? (*fIntensBad)[i] : (*fBadPixels)[i];
+      MBadPixelsPix &bad = (*badcam)[i];
 
       h = histhi.GetHGausHist();
@@ -982,5 +983,5 @@
         
         MHCalibrationChargePix &histlo = (MHCalibrationChargePix&)(*this)(i);
-        MBadPixelsPix &bad = fIntensBad ? (*fIntensBad)[i] : (*fBadPixels)[i];
+        MBadPixelsPix          &bad    = (*badcam)[i];
         
         if (histlo.IsExcluded())
@@ -1016,7 +1017,5 @@
           }
         
-        MCalibrationChargePix &pix = fIntensCam 
-          ? (MCalibrationChargePix&)(*fIntensCam)[i]
-          : (MCalibrationChargePix&)(*fCam)[i];
+        MCalibrationChargePix  &pix    = (MCalibrationChargePix&)(*chargecam)[i] ;
         
         if (pix.IsHiGainSaturation())
@@ -1028,7 +1027,5 @@
       
       MHCalibrationChargePix &histhi = (MHCalibrationChargePix&)GetAverageHiGainArea(j);      
-      MCalibrationChargePix  &pix    = fIntensCam 
-        ? (MCalibrationChargePix&)fIntensCam->GetAverageArea(j)
-        : (MCalibrationChargePix&)fCam->GetAverageArea(j);
+      MCalibrationChargePix  &pix    = (MCalibrationChargePix&)chargecam->GetAverageArea(j);
 
       if (histhi.GetSaturated() > fNumHiGainSaturationLimit*histhi.GetHGausHist()->GetEntries())
@@ -1040,8 +1037,5 @@
         }
 
-      MBadPixelsPix &bad    = fIntensCam 
-        ? fIntensCam->GetAverageBadArea(j)
-        : fCam->GetAverageBadArea(j);
-
+      MBadPixelsPix &bad = chargecam->GetAverageBadArea(j);
       FinalizeAbsTimes(histhi, pix, bad, fFirstHiGain, fLastHiGain);
    }
@@ -1060,13 +1054,9 @@
           }
         
-        MCalibrationChargePix  &pix    = fIntensCam
-          ? (MCalibrationChargePix&)fIntensCam->GetAverageArea(j) 
-          : (MCalibrationChargePix&)fCam->GetAverageArea(j) ;
+        MCalibrationChargePix  &pix    = (MCalibrationChargePix&)chargecam->GetAverageArea(j);
 
         if (pix.IsHiGainSaturation())
           {
-            MBadPixelsPix &bad    = fIntensCam
-              ? fIntensCam->GetAverageBadArea(j)  
-              : fCam->GetAverageBadArea(j);      
+            MBadPixelsPix &bad = chargecam->GetAverageBadArea(j);
             FinalizeAbsTimes(histlo, pix, bad, fFirstLoGain, fLastLoGain);
           }
@@ -1078,7 +1068,5 @@
       
       MHCalibrationChargePix &histhi = (MHCalibrationChargePix&)GetAverageHiGainSector(j);      
-      MCalibrationChargePix  &pix    = fIntensCam
-        ? (MCalibrationChargePix&)fIntensCam->GetAverageSector(j)  
-        : (MCalibrationChargePix&)fCam->GetAverageSector(j);
+      MCalibrationChargePix  &pix    = (MCalibrationChargePix&)chargecam->GetAverageSector(j);
 
       if (histhi.GetSaturated() > fNumHiGainSaturationLimit*histhi.GetHGausHist()->GetEntries())
@@ -1090,8 +1078,5 @@
         }
 
-      MBadPixelsPix &bad = fIntensCam 
-        ? fIntensCam->GetAverageBadSector(j)
-        : fCam->GetAverageBadSector(j);      
-
+      MBadPixelsPix &bad = chargecam->GetAverageBadSector(j);
       FinalizeAbsTimes(histhi, pix, bad, fFirstHiGain, fLastHiGain);
     }
@@ -1102,7 +1087,5 @@
         
         MHCalibrationChargePix &histlo = (MHCalibrationChargePix&)GetAverageLoGainSector(j);      
-        MBadPixelsPix          &bad    = fIntensCam
-          ? fIntensCam->GetAverageBadSector(j)
-          : fCam->GetAverageBadSector(j);        
+        MBadPixelsPix          &bad    = chargecam->GetAverageBadSector(j);
         
         if (histlo.GetSaturated() > fNumLoGainSaturationLimit*histlo.GetHGausHist()->GetEntries())
@@ -1115,7 +1098,5 @@
           }
         
-        MCalibrationChargePix  &pix    = fIntensCam 
-          ? (MCalibrationChargePix&)fIntensCam->GetAverageSector(j)
-          : (MCalibrationChargePix&)fCam->GetAverageSector(j);
+        MCalibrationChargePix  &pix    = (MCalibrationChargePix&)chargecam->GetAverageSector(j);
 
         if (pix.IsHiGainSaturation())
@@ -1126,6 +1107,5 @@
   // Perform the fitting for the High Gain (done in MHCalibrationCam)
   //
-  FitHiGainArrays(fIntensCam ? (MCalibrationCam&)(*fIntensCam->GetCam()) : (MCalibrationCam&)(*fCam),
-                  fIntensBad ?                   (*fIntensBad->GetCam()) : *fBadPixels,
+  FitHiGainArrays(*chargecam, *badcam, 
                   MBadPixelsPix::kHiGainNotFitted,
                   MBadPixelsPix::kHiGainOscillating);
@@ -1135,6 +1115,5 @@
   //
   if (IsLoGain())
-    FitLoGainArrays(fIntensCam ? (MCalibrationCam&)(*fIntensCam->GetCam()) : (MCalibrationCam&)(*fCam),
-                    fIntensBad ?                   (*fIntensBad->GetCam()) : *fBadPixels,
+    FitLoGainArrays(*chargecam, *badcam, 
                     MBadPixelsPix::kLoGainNotFitted,
                     MBadPixelsPix::kLoGainOscillating);
@@ -1195,5 +1174,6 @@
 {
 
-  MBadPixelsCam *badcam = fIntensBad ? fIntensBad->GetCam() : fBadPixels;
+  MBadPixelsCam   *badcam    = fIntensBad ? fIntensBad->GetCam() : fBadPixels;
+  MCalibrationCam *chargecam = fIntensCam ? fIntensCam->GetCam() : fCam;
       
   for (Int_t i=0; i<badcam->GetSize(); i++)
@@ -1201,5 +1181,5 @@
       
       MBadPixelsPix    &bad    = (*badcam)[i];
-      MCalibrationPix  &pix    = fIntensCam ? (*fIntensCam)[i] : (*fCam)[i];
+      MCalibrationPix  &pix    = (*chargecam)[i];
 
       if (bad.IsUncalibrated( MBadPixelsPix::kHiGainNotFitted ))
@@ -1210,5 +1190,5 @@
         if (pix.IsHiGainSaturation())
           bad.SetUnsuitable(   MBadPixelsPix::kUnreliableRun    );
- 
+
       if (bad.IsUncalibrated( MBadPixelsPix::kLoGainSaturation ))
           bad.SetUnsuitable(   MBadPixelsPix::kUnsuitableRun    );
@@ -1224,4 +1204,7 @@
         }
     }
+
+
+      
 }