Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 2672)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 2673)
@@ -4,4 +4,11 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2003/12/12: Markus Gaug / Michele Doro
+
+   * manalysis/MCalibrationCam.cc
+     - did not compile because of a wrong command to MCalibrationPix, 
+       now corrected
+
 
  2003/12/12: Nadia Tonello
Index: /trunk/MagicSoft/Mars/manalysis/MCalibrationCam.cc
===================================================================
--- /trunk/MagicSoft/Mars/manalysis/MCalibrationCam.cc	(revision 2672)
+++ /trunk/MagicSoft/Mars/manalysis/MCalibrationCam.cc	(revision 2673)
@@ -510,5 +510,5 @@
       break;
     case 12:
-      val = (*this)[idx].GetConversionFFactorMethod();
+      val = (*this)[idx].GetMeanConversionFFactorMethod();
       break;
     case 13:
@@ -551,5 +551,5 @@
   
   const Float_t mean = fBlindPixel->GetLambda();
-  //  const Float_t merr = fBlindPixel->GetErrLambda();
+  const Float_t merr = fBlindPixel->GetErrLambda();
   
   switch (fColor)
@@ -616,16 +616,12 @@
     return kFALSE;
 
-  Float_t conv = (*this)[ipx].GetConversionFFactorMethod();
+  Float_t conv = (*this)[ipx].GetMeanConversionFFactorMethod();
 
   if (conv < 0.)
     return kFALSE;
 
-  mean = conv;
-
-  //
-  // Not yet ready , sorry 
-  //
-  err  = -1.;
-  sigma = -1.;
+  mean  = conv;
+  err   = (*this)[ipx].GetErrorConversionFFactorMethod();
+  sigma = (*this)[ipx].GetSigmaConversionFFactorMethod();
 
   return kTRUE;
@@ -633,15 +629,39 @@
 
 
+//-----------------------------------------------------------------------------------
+//
+// Calculates the conversion factor between the integral of FADCs slices 
+// (as defined in the signal extractor MExtractSignal.cc)
+// and the number of photons reaching the plexiglass for one Inner Pixel 
+//
+// FIXME: The PINDiode is still not working and so is the code 
+//
 Bool_t MCalibrationCam::GetConversionFactorPINDiode(Int_t ipx, Float_t &mean, Float_t &err, Float_t &sigma)
 {
 
-  return kTRUE;
-
-}
-
+  if (ipx < 0 || !IsPixelFitted(ipx))
+    return kFALSE;
+
+  return kFALSE;
+
+}
+
+//-----------------------------------------------------------------------------------
+//
+// Calculates the best combination of the three used methods possible 
+// between the integral of FADCs slices 
+// (as defined in the signal extractor MExtractSignal.cc)
+// and the number of photons reaching one Inner Pixel. 
+// The procedure is not yet defined.
+//
+// FIXME: The PINDiode is still not working and so is the code 
+//
 Bool_t MCalibrationCam::GetConversionFactorCombined(Int_t ipx, Float_t &mean, Float_t &err, Float_t &sigma)
 {
 
-  return kTRUE;
-
-}
+  if (ipx < 0 || !IsPixelFitted(ipx))
+    return kFALSE;
+
+  return kFALSE;
+
+}