Changeset 7220 for trunk/MagicSoft/Mars/mjobs

Timestamp:

07/25/05 18:44:24 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mjobs

Files:

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

trunk/MagicSoft/Mars/mjobs/MDataSet.cc

@@ -122 +122 @@
 
         if (i<n)
+            *fLog << warn << "WARNING - Sequence #" << seq << " alraedy in list... skipped." << endl;
+        else
         {
-            *fLog << warn << "WARNING - Sequence #" << seq << " alraedy in list... skipped." << endl;
-            continue;
+            // set new entry
+            data.Set(n+1);
+            data[n] = seq;
         }
-
-        // set new entry
-        data.Set(n+1);
-        data[n] = seq;
 
         // remove entry from string

trunk/MagicSoft/Mars/mjobs/MJPedestal.cc

@@ -800 +800 @@
 
     // check the resource file for it
-    if (CheckEnv(tenv)==kERROR)
+    if (!CheckEnv(tenv))
         return kFALSE;
 
@@ -1105 +1105 @@
 
         // The requested setup might have been overwritten
-        if (CheckEnv(*fExtractor)==kERROR)
+        if (!CheckEnv(*fExtractor))
             return kFALSE;
 

trunk/MagicSoft/Mars/mjobs/MSequence.cc

@@ -178 +178 @@
 
         if (i<n)
+            *fLog << warn << "WARNING - Run #" << run << " alraedy in list... skipped." << endl;
+        else
         {
-            *fLog << warn << "WARNING - Run #" << run << " alraedy in list... skipped." << endl;
-            continue;
+            // set new entry
+            data.Set(n+1);
+            data[n] = run;
         }
-
-        // set new entry
-        data.Set(n+1);
-        data[n] = run;
 
         runs.Remove(0, runs.First(num)+num.Length());