Changeset 7888 for trunk/MagicSoft/Mars

Timestamp:

08/19/06 20:26:37 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• NEWS (modified) (1 diff)
• mbase/MEvtLoop.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -30 +30 @@
    * mastro/MAstroCatalog.cc, mbase/MParContainer.cc,
      mbase/MStatusDisplay.cc, mbase/MTask.cc, mpointing/MHSrcPosCam.cc
-     mpointing/MPointingPos.cc:
+     mpointing/MPointingPos.cc, mbase/MEvtLoop.cc:
      - replaced MString::Form by new function name MString::Format
 

trunk/MagicSoft/Mars/NEWS

@@ -12 +12 @@
      the distribution abs(y[i]-median) but at 68:32 division instead 
      of 50:50, which is somehow the mediani counterpart of the rms.
+
+   - general: MAstroCatalog allows now to read calatog files (as bsc5)
+     even if they are compressed with gzip (recommended compression
+     is with "-1")
 
    - showplot:

trunk/MagicSoft/Mars/mbase/MEvtLoop.cc

@@ -85 +85 @@
 #include "MLogManip.h"
 
+#include "MString.h"
 #include "MParList.h"
 #include "MTaskList.h"
@@ -272 +273 @@
 UInt_t MEvtLoop::GetMemoryUsage()
 {
-    const TString path = Form("/proc/%d/status", gSystem->GetPid());
+    const TString path = MString::Format("/proc/%d/status", gSystem->GetPid());
     if (gSystem->AccessPathName(path, kFileExists))
         return 0;
@@ -378 +379 @@
     // Set new progress bar position
     //
-    if (fProgress && fNumEvents>0)
-        fProgress->SetPosition((Double_t)num/fNumEvents);
+    if (fNumEvents>0 && fProgress)
+    {
+        const Double_t pos = (Double_t)num/fNumEvents;
+        fProgress->SetPosition(pos);
+//        if (gROOT->IsBatch())
+//            *fLog << all << MString::Format("%.1f", pos) << "%..." << flush;
+    }
 
     // FIXME: This is a workaround, because TApplication::Run is not
@@ -906 +912 @@
 // If available print the contents of the parameter list.
 //
-void MEvtLoop::Print(Option_t *opt) const
+void MEvtLoop::Print(Option_t *) const
 {
     if (fParList)