Changeset 4732 for trunk/MagicSoft/Mars/mbase

Timestamp:

08/25/04 17:30:31 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbase

Files:

• MEvtLoop.cc (modified) (2 diffs)
• MLog.cc (modified) (4 diffs)
• MTaskEnv.cc (modified) (6 diffs)
• MTaskEnv.h (modified) (2 diffs)
• MTime.cc (modified) (1 diff)

trunk/MagicSoft/Mars/mbase/MEvtLoop.cc

@@ -933 +933 @@
 //      CleaningLevel1:  3.0
 //
+//
+// With the argument prefix you can overwrite the name of the MEvtLoop object
+// as prefix - use with extreme care! The prifix argument must not end with
+// a dot!
+//
+//
 // Warning: The programmer is responsible for the names to be unique in
 //          all Mars classes.
@@ -938 +944 @@
 Int_t MEvtLoop::ReadEnv(const TEnv &env, TString prefix, Bool_t print)
 {
-    if (!prefix.IsNull())
-        *fLog << warn << "WARNING - Second argument in MEvtLoop::ReadEnv has no meaning... ignored." << endl;
-
-    prefix = fName;
+//    if (!prefix.IsNull())
+//        *fLog << warn << "WARNING - Second argument in MEvtLoop::ReadEnv has no meaning... ignored." << endl;
+
+    if (prefix.IsNull())
+        prefix = fName;
     prefix += ".";
 

trunk/MagicSoft/Mars/mbase/MLog.cc

@@ -107 +107 @@
 #include <TGTextView.h>
 
-#include "MLogPlugin.h"
+#include "MArgs.h"
 #include "MParContainer.h"
-#include "MArgs.h"
+
+#include "MLogHtml.h"
 
 ClassImp(MLog);
@@ -520 +521 @@
     *this << "   -v#                       Verbosity level # [default=2]" << endl;
     *this << "   -a, --no-colors           Do not use Ansii color codes" << endl;
+    *this << "   --log[=file]              Write log-out to ascii-file [default: prgname.log]" << endl;
+    *this << "   --html[=file]             Write log-out to html-file [default: prgname.html]" << endl;
     *this << "   --debug[=n]               Enable root debugging [default: gDebug=1]" << endl;
+    *this << "   --null                    Null output (supresses all output)" << endl;
 }
 
@@ -527 +531 @@
 // Setup MLog and global debug output from command line arguments.
 //
-//    gLog << "     -v#                              Verbosity level # [default=2]" << endl;
-//    gLog << "     -a, --no-colors                  Do not use Ansii color codes" << endl;
-//    gLog << "     --debug[=n]                      Enable root debugging (Default: gDebug=1)" << endl;
-//
 void MLog::Setup(MArgs &arg)
 {
-    if (arg.HasOnlyAndRemove("--no-colors") || arg.HasOnlyAndRemove("-a"))
-        SetNoColors();
-
-    SetDebugLevel(arg.HasOption("-v") ? arg.GetIntAndRemove("-v") : 2);
-
+    // FXIME: This is not really at a place where it belongs to!
     gDebug = arg.HasOption("--debug=") ? arg.GetIntAndRemove("--debug=") : 0;
     if (gDebug==0 && arg.HasOnlyAndRemove("--debug"))
         gDebug=1;
+
+    TString f1 = arg.GetStringAndRemove("--log=", "");
+    if (f1.IsNull() && arg.HasOnlyAndRemove("--log"))
+        f1 = Form("%s.log", arg.GetName());
+    if (!f1.IsNull())
+    {
+        SetOutputFile(f1);
+        EnableOutputDevice(eFile);
+    }
+
+    TString f2 = arg.GetStringAndRemove("--html=", "");
+    if (f2.IsNull() && arg.HasOnlyAndRemove("--html"))
+        f2 = Form("%s.html", arg.GetName());
+    if (!f2.IsNull())
+    {
+        MLogHtml *html = new MLogHtml(f2);
+        html->SetBit(kCanDelete);
+        AddPlugin(html);
+    }
+
+    const Bool_t null = arg.HasOnlyAndRemove("--null");
+    if (null)
+        SetNullOutput();
+
+    if (arg.HasOnlyAndRemove("--no-colors") || arg.HasOnlyAndRemove("-a"))
+        SetNoColors();
+
+    SetDebugLevel(arg.GetIntAndRemove("-v", 2));
 }
 
@@ -653 +677 @@
 // is automatically removed from the list of active plugins.
 //
+// If MLog should take the ownership cal plug->SetBit(kCanDelete);
+//
 void MLog::AddPlugin(MLogPlugin *plug)
 {
     fPlugins->Add(plug);
-    plug->SetBit(kMustCleanup);
-}
+}

trunk/MagicSoft/Mars/mbase/MTaskEnv.cc

@@ -27 +27 @@
 // MTaskEnv
 //
-// If you want to create a new task inside a macro you will have to compile
-// your macro using macro.C++, because the root interpreter cannot use
-// uncompiled classes. To workaround this problem you can write simple
-// funcions (which can be handled by CINT) and use MTaskEnv.
-//
-// This is a simple way to develop new code in a macro without need
-// to compile it.
-//
-// Example:
-//    Int_t Process()
-//    {
-//       gLog << "Processing..." << endl;
-//       return kTRUE;
-//    }
-//
-//    void main()
-//    {
-//       MTaskEnv task;
-//       task.SetProcess(Process);
-//       MTaskList list;
-//       list.AddToList(&task);
-//    }
+// This class is used if a task - at runtime - should be replaced or setup
+// from a resource file, eg.
+//
+//
+// resources.rc:
+//   MyTask: MThisIsMyClass
+//   MyTask.Resource1: yes
+//   MyTask.Resource2: 50
+//
+// macro.C:
+//   MTaskList list;
+//
+//   MDefaultTask def;
+//   MTaskEnv taskenv("MyTask");
+//   taskenv.SetDefault(&def);
+//
+//   list.AddToList(&taskenv);
+//   [...]
+//   evtloop.ReadEnv("resource.rc");
+//
+// In this case MTaskEnv will act like MDefaultTask if nothing is found in the
+// resource file. If the task is setup via the resource file like in the
+// example above it will act like a MThisIsMyClass setup with Resource1 and
+// Resource2.
+//
+//
+// You can also skip the task completely if you setup (in lower case letters!)
+//
+// resources.rc:
+//   MyTask: <dummy>
+//
+//
+// A third option is to setup a MTaskEnv to be skipped except a task is
+// initialized through the resource file:
+//   MTaskEnv taskenv("MyTask");
+//   taskenv.SetDefault(0);
 //
 //
@@ -165 +179 @@
 Bool_t MTaskEnv::ReInit(MParList *list)
 {
-    *fLog << fTask->ClassName() << " - " << flush;
+    *fLog << fTask->ClassName() << " <MTaskEnv>... " << flush;
     return fTask->ReInit(list);
 }
@@ -171 +185 @@
 Int_t MTaskEnv::PreProcess(MParList *list)
 {
+    if (TestBit(kIsDummy))
+    {
+        *fLog << inf << "Dummy Task... skipped." << endl;
+        return kSKIP;
+    }
+
     if (!fTask)
     {
@@ -177 +197 @@
     }
 
-    *fLog << fTask->ClassName() << " - " << flush;
+    *fLog << fTask->ClassName() << " <MTaskEnv>... " << flush;
     return fTask->CallPreProcess(list);
 }
@@ -188 +208 @@
 Int_t MTaskEnv::PostProcess()
 {
-    *fLog << fTask->ClassName() << " - " << flush;
+    *fLog << fTask->ClassName() << " <MTaskEnv>... " << flush;
     return fTask->CallPostProcess();
 }
@@ -200 +220 @@
     task.ReplaceAll("\015", "");
     task = task.Strip(TString::kBoth);
+
+    if (task=="<dummy>")
+    {
+        if (TestBit(kIsOwner) && fTask)
+            delete fTask;
+        fTask = 0;
+        SetBit(kIsDummy);
+        return kTRUE;
+    }
+
     fTask = GetTask(task.Data());
     if (!fTask)

trunk/MagicSoft/Mars/mbase/MTaskEnv.h

@@ -14 +14 @@
     MTask *fTask;
 
-    enum { kIsOwner = BIT(14) };
+    enum { kIsOwner = BIT(14), kIsDummy = BIT(15) };
 
     MTask *GetTask(const char *name) const;
@@ -33 +33 @@
     void SetOwner(Bool_t b=kTRUE) { b ? SetBit(kIsOwner) : ResetBit(kIsOwner); }
 
-    void SetDefault(MTask *task) { fTask = task; }
+    void SetDefault(MTask *task) { fTask = task; if (!task) SetBit(kIsDummy); }
     void SetDefault(const char *def);
 

trunk/MagicSoft/Mars/mbase/MTime.cc

@@ -70 +70 @@
 
 #include <iomanip>
+
+#ifndef __USE_XOPEN
+#define __USE_XOPEN // on some systems needed for strptime
+#endif
 
 #include <time.h>     // struct tm