Changeset 7179 for trunk/MagicSoft/Mars/mjobs

Timestamp:

07/11/05 10:34:49 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mjobs

Files:

• MDataSet.cc (modified) (6 diffs)
• MSequence.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/mjobs/MDataSet.cc

@@ -49 +49 @@
 //
 // The sequence number are used to concatenate the filenames of the
-// sequences using the file structure used in the datacenter.
+// sequences using the file structure used in the datacenter. Each sequence
+// can be added to the on and off data at the same time but only once.
 //
 // If you have different file names you can overwrite the default file names
@@ -60 +61 @@
 //
 // Resource file entries are case sensitive!
+//
+// IMPORTANT:
+//   * Run filenames must begin with a string which allows correct
+//     ordering in time, otherwise synchronization might fail.
+//   * Sequence filenames should also have names allowing to order them
+//     in time, but it is not necessary.
 //
 // MISSING (27/01/04): The default name and paths cannot be used yet, because
@@ -90 +97 @@
 // --------------------------------------------------------------------------
 //
-// Copy the run numbers from the TString runs into the TArrayI data
+// Copy the sequence numbers from the TString runs into the TArrayI data
+// Sequences which are twice in the list are only added once. In this case
+// a warning is emitted.
 //
 void MDataSet::Split(TString &runs, TArrayI &data) const
@@ -103 +112 @@
         TString num = runs(regexp);
 
-        const Int_t n = data.GetSize();
+        const Int_t seq = atoi(num.Data());
+        const Int_t n   = data.GetSize();
+
+        // skip already existing entries
+        int i;
+        for (i=0; i<n; i++)
+            if (data[i] == seq)
+                break;
+
+        if (i<n)
+        {
+            *fLog << warn << "WARNING - Sequence #" << seq << " alraedy in list... skipped." << endl;
+            continue;
+        }
+
+        // set new entry
         data.Set(n+1);
-        data[n] = atoi(num.Data());
-
+        data[n] = seq;
+
+        // remove entry from string
         runs.Remove(0, runs.First(num)+num.Length());
     }
 }
 
+// --------------------------------------------------------------------------
+//
+// After resolving the sequence filename and directory either from the
+// default (/magic/data/sequences/0004/sequence00004000.txt) or from
+// the corresponding entries in the dataset file.
+// The entries are sorted by filename.
+//
 void MDataSet::ResolveSequences(TEnv &env, const TArrayI &num, TList &list) const
 {
@@ -235 +267 @@
 }
 
+// --------------------------------------------------------------------------
+//
+// Adds all sequences contained in list to the MDirIter. After adding
+// everything MDirIter::Sort is called to sort all entries by name.
+//
 Bool_t MDataSet::AddSequencesFromList(const TList &list, MDirIter &files)
 {
@@ -251 +288 @@
         seq.SetupDatRuns(files, MSequence::kImages, dir.IsNull() ? 0 : dir.Data());
     }
+
+    // This is important in case of synchronisation, because the
+    // files in the sequences can be interleaved (eg W1, W2)
+    // Filenames MUST begin with an appropriate string which allow
+    // to order them correctly in time!
+    files.Sort();
 
     if (gLog.GetDebugLevel()>4)

trunk/MagicSoft/Mars/mjobs/MSequence.cc

@@ -31 +31 @@
 //
 //  A sequence is a collection of runs which should be used together.
+//  Any run can be contained only once.
 //
 //  Here is an example how a file describing a sequence could look like:
@@ -152 +153 @@
 // --------------------------------------------------------------------------
 //
-// Copy the run numbers from the TString runs into the TArrayI data
+// Copy the run numbers from the TString runs into the TArrayI data.
+// Runs which are twice in the list are only added once. In this case
+// a warning is emitted.
 //
 void MSequence::Split(TString &runs, TArrayI &data) const
@@ -165 +168 @@
         TString num = runs(regexp);
 
-        const Int_t n = data.GetSize();
+        const Int_t run = atoi(num.Data());
+        const Int_t n   = data.GetSize();
+
+        // skip already existing entries
+        int i;
+        for (i=0; i<n; i++)
+            if (data[i] == run)
+                break;
+
+        if (i<n)
+        {
+            *fLog << warn << "WARNING - Run #" << run << " alraedy in list... skipped." << endl;
+            continue;
+        }
+
+        // set new entry
         data.Set(n+1);
-        data[n] = atoi(num.Data());
+        data[n] = run;
 
         runs.Remove(0, runs.First(num)+num.Length());
     }
 }
-/*
-UInt_t MSequence::SetupRuns(MDirIter &iter, const TArrayI &arr, const char *path, char *id, Bool_t raw) const
-{
-    TString d(path);
-
-    // Setup path
-    if (d.IsNull())
-    {
-        d = GetStandardPath();
-        d += raw ? "rawfiles/" : "merpp/";
-        d += fNight.GetStringFmt("%Y/%m/%d");
-    }
-    else
-        gSystem->ExpandPathName(d);
-
-    for (int i=0; i<arr.GetSize(); i++)
-    {
-        // R. DeLosReyes and T. Bretz
-        // Changes to read the DAQ numbering format. Changes takes place
-        // between runs 35487 and 00035488 (2004_08_30)
-        const char *fmt = arr[i]>35487 ? "%08d_%s_*_E" : "%05d_%s_*_E";
-
-        TString n;
-
-        // Create file name
-        n =  fNight.GetStringFmt("%Y%m%d_");
-        n += Form(fmt, arr[i], id);
-        n += raw ? ".raw" : ".root";
-
-        // Add Path/File to TIter
-        iter.AddDirectory(d, n, 0);
-    }
-
-    return iter.GetNumEntries();
-}
-*/
+
 UInt_t MSequence::SetupRuns(MDirIter &iter, const TArrayI &arr, FileType_t type, const char *path) const
 {