Changeset 7349 for trunk/MagicSoft/Mars/mjobs

Timestamp:

09/12/05 16:35:04 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mjobs

Files:

• MDataSet.cc (modified) (2 diffs)
• MJCut.cc (modified) (1 diff)
• MSequence.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/mjobs/MDataSet.cc

@@ -110 +110 @@
     while (!runs.IsNull())
     {
-        TString num = runs(regexp);
+        const TString num = runs(regexp);
+
+        if (num.IsNull())
+        {
+            *fLog << warn << "WARNING - Sequence is NaN (not a number): " << runs << endl;
+            break;
+        }
 
         const Int_t seq = atoi(num.Data());
@@ -122 +128 @@
 
         if (i<n)
-            *fLog << warn << "WARNING - Sequence #" << seq << " alraedy in list... skipped." << endl;
+            *fLog << warn << "WARNING - Sequence #" << seq << " already in list... skipped." << endl;
         else
         {

trunk/MagicSoft/Mars/mjobs/MJCut.cc

@@ -171 +171 @@
     p += "/";
     p += fNameOutput.IsNull() ? Form("ganymed%08d.root", num) : fNameOutput.Data();
+    gSystem->ExpandPathName(p);
     return p;
 }

trunk/MagicSoft/Mars/mjobs/MSequence.cc

@@ -166 +166 @@
     while (!runs.IsNull())
     {
-        TString num = runs(regexp);
+        const TString num = runs(regexp);
+
+        if (num.IsNull())
+        {
+            *fLog << warn << "WARNING - Run is NaN (not a number): " << runs << endl;
+            break;
+        }
 
         const Int_t run = atoi(num.Data());
@@ -178 +184 @@
 
         if (i<n)
-            *fLog << warn << "WARNING - Run #" << run << " alraedy in list... skipped." << endl;
+            *fLog << warn << "WARNING - Run #" << run << " already in list... skipped." << endl;
         else
         {