Index: /trunk/MagicSoft/Mars/callisto.rc
===================================================================
--- /trunk/MagicSoft/Mars/callisto.rc	(revision 7003)
+++ /trunk/MagicSoft/Mars/callisto.rc	(revision 7004)
@@ -359,7 +359,8 @@
 
 # -------------------------------------------------------------------------
-# Use this if you want to change to time from run headers instead of event time
-# -------------------------------------------------------------------------
-#MJCalibrateSignal.MPointingPosInterpolate.TimeMode: eventtime, runtime
+# use the entire results obtained with the F-Factor method (including a
+# new number of mean photo-electrons)
+# -------------------------------------------------------------------------
+#MJCalibrateSignal.MCalibCalcFromPast.UpdateWithFFactorMethod: yes
 
 # -------------------------------------------------------------------------
Index: /trunk/MagicSoft/Mars/ganymed.cc
===================================================================
--- /trunk/MagicSoft/Mars/ganymed.cc	(revision 7003)
+++ /trunk/MagicSoft/Mars/ganymed.cc	(revision 7004)
@@ -71,5 +71,5 @@
     gLog << "   --print-ds                Print Dataset information" << endl;
     gLog << "   --print-files             Print Files taken from Sequences ('+' found, '-' missing)" << endl;
-    gLog << "   --full-display            Show as many plots as possible" << endl;
+//    gLog << "   --full-display            Show as many plots as possible" << endl;
     gLog << "   --config=ganymed.rc       Resource file [default=ganymed.rc]" << endl;
     gLog << endl;
@@ -112,5 +112,5 @@
     const Bool_t  kDebugMem     = arg.HasOnlyAndRemove("--debug-mem");
     const Bool_t  kWriteOnly    = arg.HasOnlyAndRemove("--write-only");
-    const Bool_t  kFullDisplay  = arg.HasOnlyAndRemove("--full-display");
+//    const Bool_t  kFullDisplay  = arg.HasOnlyAndRemove("--full-display");
     Int_t  kDebugEnv = arg.HasOnlyAndRemove("--debug-env") ? 1 : 0;
     kDebugEnv = arg.GetIntAndRemove("--debug-env=", kDebugEnv);
@@ -241,5 +241,6 @@
     job.EnableWriteOnly(kWriteOnly);
     job.EnableWobbleMode(iswobble);
-    job.EnableFullDisplay(kFullDisplay);
+    //if (kFullDisplay)
+    //    job.EnableFullDisplay(kFullDisplay);
     job.EnableMonteCarloMode(kIsMc);
     job.EnableStorageOfResult(!kSkipResult);
Index: /trunk/MagicSoft/Mars/manalysis/MEnergyEstimate.cc
===================================================================
--- /trunk/MagicSoft/Mars/manalysis/MEnergyEstimate.cc	(revision 7003)
+++ /trunk/MagicSoft/Mars/manalysis/MEnergyEstimate.cc	(revision 7004)
@@ -111,8 +111,8 @@
         return kFALSE;
 
+    *fLog << inf << "Rule for energy estimation: " << fData->GetRule() << endl;
+
     if (!fData->PreProcess(plist))
         return kFALSE;
-
-    *fLog << inf << "Rule for energy estimation: " << fData->GetRule() << endl;
 
     return kTRUE;