Changeset 4722 for trunk/MagicSoft/Mars/mbase

Timestamp:

08/24/04 14:51:17 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mbase

Files:

• MArgs.cc (modified) (1 diff)
• MArgs.h (modified) (1 diff)
• MDirIter.cc (modified) (1 diff)
• MDirIter.h (modified) (1 diff)
• MEvtLoop.cc (modified) (1 diff)
• MLog.cc (modified) (1 diff)
• MLog.h (modified) (1 diff)

trunk/MagicSoft/Mars/mbase/MArgs.cc

@@ -231 +231 @@
 // --------------------------------------------------------------------------
 //
+// Returns GetIntAndRemove. If HasOption returns kFALSE def is returned.
+//
+Int_t MArgs::GetIntAndRemove(const TString name, Int_t def)
+{
+    if (!HasOption(name))
+        return def;
+    return GetIntAndRemove(name);
+}
+
+// --------------------------------------------------------------------------
+//
+// Returns GetFloatAndRemove. If HasOption returns kFALSE def is returned.
+//
+Double_t MArgs::GetFloatAndRemove(const TString name, Double_t def)
+{
+    if (!HasOption(name))
+        return def;
+    return GetFloatAndRemove(name);
+}
+
+// --------------------------------------------------------------------------
+//
+// Returns GetStringAndRemove. If HasOption returns kFALSE def is returned.
+//
+TString MArgs::GetStringAndRemove(const TString name, const TString def)
+{
+    if (!HasOption(name))
+        return def;
+    return GetStringAndRemove(name);
+}
+
+// --------------------------------------------------------------------------
+//
 // Return the TString corresponding to the i-th argument.
 // This is ment for enumerations like

trunk/MagicSoft/Mars/mbase/MArgs.h

@@ -43 +43 @@
     TString  GetStringAndRemove(const TString name);
 
+    Int_t    GetIntAndRemove(const TString name, Int_t def);
+    Double_t GetFloatAndRemove(const TString name, Double_t def);
+    TString  GetStringAndRemove(const TString name, const TString def);
+
     Bool_t   Has(const TString name) const;
     Bool_t   HasOnly(const TString name) const;

trunk/MagicSoft/Mars/mbase/MDirIter.cc

@@ -151 +151 @@
 // --------------------------------------------------------------------------
 //
+// Adds all entries from iter to this object
+//
+void MDirIter::Add(const MDirIter &iter)
+{
+    TIter Next(&iter.fList);
+    TObject *o=0;
+    while ((o=Next()))
+        fList.Add(o->Clone());
+}
+
+// --------------------------------------------------------------------------
+//
 //  Return the pointer to the current directory. If the pointer is NULL
 //  a new directory is opened. If no new directory can be opened NULL is

trunk/MagicSoft/Mars/mbase/MDirIter.h

@@ -49 +49 @@
 
     Int_t AddDirectory(const char *dir, const char *filter="", Int_t recursive=0);
+    void  Add(const MDirIter &iter);
     void  Reset();
 

trunk/MagicSoft/Mars/mbase/MEvtLoop.cc

@@ -964 +964 @@
 Bool_t MEvtLoop::ReadEnv(const char *config)
 {
-    return config ? ReadEnv(TEnv(config)) : kTRUE;
+    if (!config)
+        return kTRUE;
+
+    const Bool_t fileexist = !gSystem->AccessPathName(config, kFileExists);
+    if (!fileexist)
+    {
+        *fLog << warn << "WARNING - resource file '" << config << "' not found... no resources applied." << endl;
+        return kFALSE;
+    }
+
+    return ReadEnv(TEnv(config));
 }
 

trunk/MagicSoft/Mars/mbase/MLog.cc

@@ -512 +512 @@
 // --------------------------------------------------------------------------
 //
+// Print usage information setup in Setup()
+//
+void MLog::Usage()
+{
+    //                 1         2         3         4         5         6         7         8
+    //        12345678901234567890123456789012345678901234567890123456789012345678901234567890
+    *this << "   -v#                       Verbosity level # [default=2]" << endl;
+    *this << "   -a, --no-colors           Do not use Ansii color codes" << endl;
+    *this << "   --debug[=n]               Enable root debugging [default: gDebug=1]" << endl;
+}
+
+// --------------------------------------------------------------------------
+//
 // Setup MLog and global debug output from command line arguments.
 //

trunk/MagicSoft/Mars/mbase/MLog.h

@@ -185 +185 @@
 
     void Setup(MArgs &arg);
+    void Usage();
 
     void ReadEnv(const TEnv &env, TString prefix="", Bool_t print=kFALSE);