Index: trunk/MagicSoft/Mars/mcalib/MCalibrationBlindPix.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrationBlindPix.cc	(revision 8049)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrationBlindPix.cc	(revision 8106)
@@ -1,3 +1,5 @@
 /* ======================================================================== *\
+! $Name: not supported by cvs2svn $:$Id: MCalibrationBlindPix.cc,v 1.15 2006-10-17 17:15:59 tbretz Exp $
+! --------------------------------------------------------------------------
 !
 ! *
@@ -375,10 +377,10 @@
 {
 
-  const Float_t err = fAttErr[fColor];
-
-  if (err < 0.)
-    return -1.;
-  
-  return err*err*2.3;
+  const Float_t ferr = fAttErr[fColor];
+
+  if (ferr < 0.)
+    return -1.;
+  
+  return ferr*ferr*2.3;
 }
 
Index: trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc	(revision 8049)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc	(revision 8106)
@@ -1,3 +1,5 @@
 /* ======================================================================== *\
+! $Name: not supported by cvs2svn $:$Id: MCalibrationChargeCalc.cc,v 1.166 2006-10-17 17:15:59 tbretz Exp $
+! --------------------------------------------------------------------------
 !
 ! *
@@ -1807,5 +1809,5 @@
       
       MCalibrationChargePix &pix   = (MCalibrationChargePix&)(*chargecam)[i];
-      MCalibrationQEPix     &qepix = (MCalibrationQEPix&)    (*qecam)    [i];
+      MCalibrationQEPix     &qpix  = (MCalibrationQEPix&)    (*qecam)    [i];
       MBadPixelsPix         &bad   =                         (*badcam)   [i];
 
@@ -1818,9 +1820,9 @@
       const Float_t qerelvar = avphotrelvar +  pix.GetPheFFactorMethodRelVar();
 
-      qepix.SetQEFFactor    ( qe            , fPulserColor );
-      qepix.SetQEFFactorVar ( qerelvar*qe*qe, fPulserColor );      
-      qepix.SetFFactorMethodValid(  kTRUE   , fPulserColor );
-
-      if (!qepix.UpdateFFactorMethod( qecam->GetPlexiglassQE() ))
+      qpix.SetQEFFactor    ( qe            , fPulserColor );
+      qpix.SetQEFFactorVar ( qerelvar*qe*qe, fPulserColor );
+      qpix.SetFFactorMethodValid(  kTRUE   , fPulserColor );
+
+      if (!qpix.UpdateFFactorMethod( qecam->GetPlexiglassQE() ))
         *fLog << warn << GetDescriptor() 
               << ": Cannot update Quantum efficiencies with the F-Factor Method" << endl;
@@ -1949,11 +1951,11 @@
     {
       
-      MCalibrationChargePix &pix   = (MCalibrationChargePix&)(*chargecam)[i];
-      MCalibrationQEPix     &qepix = (MCalibrationQEPix&)    (*qecam)    [i];
-      MBadPixelsPix         &bad   =                         (*badcam)   [i];
+      MCalibrationChargePix &pix  = (MCalibrationChargePix&)(*chargecam)[i];
+      MCalibrationQEPix     &qpix = (MCalibrationQEPix&)    (*qecam)    [i];
+      MBadPixelsPix         &bad  =                         (*badcam)   [i];
 
       if (bad.IsUnsuitable(MBadPixelsPix::kUnsuitableRun))
         {
-          qepix.SetFFactorMethodValid(kFALSE,fPulserColor);
+          qpix.SetFFactorMethodValid(kFALSE,fPulserColor);
           pix.SetFFactorMethodValid(kFALSE);
           continue;
Index: trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCam.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCam.cc	(revision 8049)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCam.cc	(revision 8106)
@@ -1,3 +1,5 @@
 /* ======================================================================== *\
+! $Name: not supported by cvs2svn $:$Id: MCalibrationChargeCam.cc,v 1.69 2006-10-17 17:18:40 tbretz Exp $
+! --------------------------------------------------------------------------
 !
 ! *
@@ -680,5 +682,5 @@
 
 
-Bool_t MCalibrationChargeCam::GetConversionFactorFFactor(Int_t ipx, Float_t &mean, Float_t &err, Float_t &ffactor)
+Bool_t MCalibrationChargeCam::GetConversionFactorFFactor(Int_t ipx, Float_t &mean, Float_t &ferr, Float_t &ffactor)
 {
 
@@ -691,5 +693,5 @@
 
   mean    = conv;
-  err     = pix.GetMeanConvFADC2PheErr();
+  ferr    = pix.GetMeanConvFADC2PheErr();
   ffactor = pix.GetMeanFFactorFADC2Phot();
 
Index: trunk/MagicSoft/Mars/mcalib/MCalibrationIntensityChargeCam.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrationIntensityChargeCam.cc	(revision 8049)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrationIntensityChargeCam.cc	(revision 8106)
@@ -1,3 +1,5 @@
 /* ======================================================================== *\
+! $Name: not supported by cvs2svn $:$Id: MCalibrationIntensityChargeCam.cc,v 1.23 2006-10-17 17:15:59 tbretz Exp $
+! --------------------------------------------------------------------------
 !
 ! *
@@ -266,11 +268,11 @@
       sigerr[cnt]    = pheerr;
 
-      Double_t sig  = 0.;
+      Double_t sig1 = 0.;
       Double_t sig2 = 0.;
       Int_t    num  = 0;
 
-      for (Int_t i=0; i<cam->GetSize(); i++)
-        {
-          const MCalibrationChargePix &pix = (MCalibrationChargePix&)(*cam)[i];
+      for (Int_t j=0; j<cam->GetSize(); j++)
+        {
+          const MCalibrationChargePix &pix = (MCalibrationChargePix&)(*cam)[j];
           //
           // Don't use bad pixels
@@ -280,8 +282,8 @@
           //
           //
-          if (aidx != geom[i].GetAidx())
+          if (aidx != geom[j].GetAidx())
             continue;
           
-          sig  += pix.GetConvertedMean();
+          sig1 += pix.GetConvertedMean();
           sig2 += pix.GetConvertedMean() * pix.GetConvertedMean();
           num++;
@@ -290,11 +292,11 @@
       if (num > 1)
         {
-          sig           /= num;
-
-          Double_t var = (sig2 - sig*sig*num) / (num-1);
-          var /= sig*sig;
+          sig1 /= num;
+
+          Double_t var = (sig2 - sig1*sig1*num) / (num-1);
+          var /= sig1*sig1;
           var += pherelvar;
 
-          phepersig[cnt] = phe/sig;
+          phepersig[cnt] = phe/sig1;
           if (var > 0.)
             phepersigerr[cnt] = TMath::Sqrt(var) * phepersig[cnt];
@@ -1057,9 +1059,9 @@
       for (Int_t i=0; i<GetSize(); i++)
         {
-          MCalibrationChargeCam *cam = (MCalibrationChargeCam*)GetCam(i);
+          MCalibrationChargeCam *ccam = (MCalibrationChargeCam*)GetCam(i);
           //
           // Get the calibration pix from the calibration cam
           //
-          MCalibrationChargePix &pix = (MCalibrationChargePix&)(*cam)[npix];
+          MCalibrationChargePix &pix = (MCalibrationChargePix&)(*ccam)[npix];
           //
           // Don't use bad pixels
@@ -1096,5 +1098,5 @@
           if (option.Contains("conversionfactor"))
           {
-              const MCalibrationChargePix &apix = (MCalibrationChargePix&)cam->GetAverageArea(0);
+              const MCalibrationChargePix &apix = (MCalibrationChargePix&)ccam->GetAverageArea(0);
               pvar = apix.GetPheFFactorMethod()/pix.GetConvertedMean();
           }