Changeset 8071

Timestamp:

10/15/06 16:44:55 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• NEWS (modified) (1 diff)
• callisto.cc (modified) (1 diff)
• ganymed.cc (modified) (1 diff)
• mbase/MEnv.cc (modified) (1 diff)
• mbase/MEnv.h (modified) (1 diff)
• star.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2006/10/15 Thomas Bretz
+
+   * mbase/MEnv.[h,cc]:
+     - implmenetd the possibility to check whether the given resource
+       file eists
+
+   * star.cc, ganymed.c, callisto.cc:
+     - implemented an error if the resource file doen't exist
+       (returns 0xfe)
+
+
 
  2006/10/15

trunk/MagicSoft/Mars/NEWS

@@ -2 +2 @@
 
  *** <cvs>
+
+   - general: The programs now return 0xfe if the requested resource file
+     doesn't exist.
 
 

trunk/MagicSoft/Mars/callisto.cc

@@ -352 +352 @@
 
     MEnv env(kConfig);
+    if (!env.IsValid())
+    {
+        gLog << err << "Configuration file " << kConfig << " not found." << endl;
+        return 0xfe;
+    }
+
     if (kModeC/* || kUseTest*/)
     {

trunk/MagicSoft/Mars/ganymed.cc

@@ -246 +246 @@
     //
     MEnv env(kConfig);
+    if (!env.IsValid())
+    {
+        gLog << err << "Configuration file " << kConfig << " not found." << endl;
+        return 0xfe;
+    }
 
     MJCut job(Form("MJCut #%d", seq.GetNumAnalysis()));

trunk/MagicSoft/Mars/mbase/MEnv.cc

@@ -48 +48 @@
 
 using namespace std;
+
+//---------------------------------------------------------------------------
+//
+// (Default) constructor. If the given file cannot be accessed the data
+// member fName is set to "" which can then be checked by IsValid()
+//
+MEnv::MEnv(const char *name) : TEnv(name), fName(name)
+{
+    fChecked.SetOwner();
+
+    if (fName.IsNull())
+        return;
+
+    TString fname(name);
+    gSystem->ExpandPathName(fname);
+
+    if (gSystem->AccessPathName(fname, kFileExists))
+        fName = "";
+}
 
 //---------------------------------------------------------------------------

trunk/MagicSoft/Mars/mbase/MEnv.h

@@ -26 +26 @@
 
 public:
-    MEnv(const char *name="") : TEnv(name), fName(name) { fChecked.SetOwner(); }
+    MEnv(const char *name="");
+
+    Bool_t      IsValid() const { return !fName.IsNull(); }
 
     TObject    *Clone(const char *newname="") const;

trunk/MagicSoft/Mars/star.cc

@@ -228 +228 @@
     //
     MEnv env(kConfig);
+    if (!env.IsValid())
+    {
+        gLog << err << "Configuration file " << kConfig << " not found." << endl;
+        return 0xfe;
+    }
+
     {
         MJStar job(Form("MJStar #%d", seq.GetSequence()));