Changeset 7358 for trunk/MagicSoft/Mars/mjobs

Timestamp:

09/21/05 14:26:45 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mjobs

Files:

• MDataSet.cc (modified) (4 diffs)
• MJob.cc (modified) (1 diff)
• MJob.h (modified) (1 diff)
• MSequence.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/mjobs/MDataSet.cc

@@ -86 +86 @@
 
 #include "MRead.h"
+#include "MJob.h"
 #include "MAstro.h"
 #include "MDirIter.h"
@@ -139 +140 @@
         runs.Remove(0, runs.First(num)+num.Length());
     }
+
+    MJob::SortArray(data);
 }
 
@@ -175 +178 @@
     // For the synchronization we must make sure, that all sequences are
     // in the correct order...
-    list.Sort();
+    // list.Sort();
 }
 
@@ -298 +301 @@
     // Filenames MUST begin with an appropriate string which allow
     // to order them correctly in time!
-    files.Sort();
+    // files.Sort();
 
     if (gLog.GetDebugLevel()>4)

trunk/MagicSoft/Mars/mjobs/MJob.cc

@@ -359 +359 @@
     return path;
 }
+
+void MJob::SortArray(TArrayI &arr)
+{
+    TArrayI idx(arr.GetSize());
+    TArrayI srt(arr);
+
+    TMath::Sort(arr.GetSize(), srt.GetArray(), idx.GetArray(), kFALSE);
+
+    for (int i=0; i<arr.GetSize(); i++)
+        arr[i] = srt[idx[i]];
+}

trunk/MagicSoft/Mars/mjobs/MJob.h

@@ -77 +77 @@
 
     static TString ExpandPath(TString fname);
+    static void SortArray(TArrayI &arr);
 
     ClassDef(MJob, 0) // Bas class for Jobs

trunk/MagicSoft/Mars/mjobs/MSequence.cc

@@ -130 +130 @@
 #include "MLogManip.h"
 
+#include "MJob.h"
 #include "MAstro.h"
 #include "MString.h"
@@ -194 +195 @@
         runs.Remove(0, runs.First(num)+num.Length());
     }
+
+    MJob::SortArray(data);
 }