Index: trunk/MagicSoft/Mars/mcalib/MCalibrationIntensityChargeCam.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrationIntensityChargeCam.cc	(revision 5658)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrationIntensityChargeCam.cc	(revision 5659)
@@ -88,16 +88,6 @@
 {
   
-  Int_t size = 0;
-  
-  if (col == MCalibrationCam::kNONE)
-    size = GetSize();
-  else
-    for (Int_t i=0;i<GetSize();i++)
-      {
-        MCalibrationChargeCam *cam = (MCalibrationChargeCam*)GetCam(i);
-        if (cam->GetPulserColor() == col)
-          size++;
-      }
-
+  Int_t size = CountNumEntries(col);
+  
   if (size == 0)
     return NULL;
@@ -108,5 +98,7 @@
   TArrayF sigerr(size);
   
-  for (Int_t i=0;i<size;i++)
+  Int_t cnt = 0;
+
+  for (Int_t i=0;i<GetSize();i++)
     {
       //
@@ -128,12 +120,13 @@
         continue;
       //
-      phe[i]    = pix.GetPheFFactorMethod();
-      pheerr[i] = pix.GetPheFFactorMethodErr();
+      phe[cnt]    = pix.GetPheFFactorMethod();
+      pheerr[cnt] = pix.GetPheFFactorMethodErr();
       //
       // For the calculation of Q, we have to use the 
       // converted value!
       //
-      sig   [i] = pix.GetConvertedMean();
-      sigerr[i] = pix.GetConvertedMeanErr();
+      sig   [cnt] = pix.GetConvertedMean();
+      sigerr[cnt] = pix.GetConvertedMeanErr();
+      cnt++;
     }
   
@@ -264,6 +257,4 @@
       const Float_t pheerr       = apix.GetPheFFactorMethodErr();
 
-      *fLog << "PHERELVAR: " << pherelvar << endl;
-      
       sig[cnt]       = phe;
       sigerr[cnt]    = pheerr;