Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 3233)
+++ trunk/MagicSoft/Mars/Changelog	(revision 3234)
@@ -4,4 +4,10 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2004/01/18: Markus Gaug
+
+    * macros/calibration.C
+      - fixed a buggy display of the F-Factor method
+
 
  2004/01/18: Abelardo Moralejo
Index: trunk/MagicSoft/Mars/macros/calibration.C
===================================================================
--- trunk/MagicSoft/Mars/macros/calibration.C	(revision 3233)
+++ trunk/MagicSoft/Mars/macros/calibration.C	(revision 3234)
@@ -514,8 +514,8 @@
     // F-Factor Method
     TCanvas &c4 = display->AddTab("F-Factor");
-    c4.Divide(2,3);
-
-    CamDraw(c4, disp6,calcam,1, 2 , 2);
-    CamDraw(c4, disp7,calcam,2, 2 , 2);
+    c4.Divide(3,3);
+
+    CamDraw(c4, disp6,calcam,1, 3 , 2);
+    CamDraw(c4, disp7,calcam,2, 3 , 2);
     CamDraw(c4, disp8,calcam,3, 3 , 2);
 
Index: trunk/MagicSoft/Mars/mcalib/MCalibrationCalc.cc
===================================================================
--- trunk/MagicSoft/Mars/mcalib/MCalibrationCalc.cc	(revision 3233)
+++ trunk/MagicSoft/Mars/mcalib/MCalibrationCalc.cc	(revision 3234)
@@ -594,4 +594,9 @@
       pix.CheckOscillations();
       
+    //
+      // calculate the F-Factor method
+      //
+      pix.CalcFFactorMethod();
+
     }