Changeset 6906 for trunk/MagicSoft/Mars/mjobs/MSequence.cc

Timestamp:

04/04/05 10:11:18 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mjobs/MSequence.cc (modified) (7 diffs)

trunk/MagicSoft/Mars/mjobs/MSequence.cc

@@ -172 +172 @@
     }
 }
-
-const TString MSequence::GetStandardPath(Bool_t raw) const
-{
-    TString d("/magic/data/");
-    d += raw ? "rawfiles/" : "merpp/";
-    return d;
-}
-
+/*
 UInt_t MSequence::SetupRuns(MDirIter &iter, const TArrayI &arr, const char *path, char *id, Bool_t raw) const
 {
@@ -187 +180 @@
     if (d.IsNull())
     {
-        d = GetStandardPath(raw);
+        d = GetStandardPath();
+        d += raw ? "rawfiles/" : "merpp/";
         d += fNight.GetStringFmt("%Y/%m/%d");
     }
@@ -206 +200 @@
         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
+{
+    TString d(path);
+
+    // Setup path
+    if (d.IsNull())
+    {
+        d = GetStandardPath();
+        switch (type)
+        {
+        case kRawDat:
+        case kRawPed:
+        case kRawCal:
+        case kRawAll:
+            d += "rawfiles/";
+            break;
+        case kRootDat:
+        case kRootPed:
+        case kRootCal:
+        case kRootAll:
+            d += "merpp/";
+            break;
+        case kCalibrated:
+            d += "callisto/";
+            break;
+        case kImages:
+            d += "star/";
+            break;
+        }
+        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;
+        char *id="_";
+        switch (type)
+        {
+        case kRawDat:
+        case kRootDat:
+            id = "D";
+            break;
+        case kRawPed:
+        case kRootPed:
+            id = "P";
+            break;
+        case kRawCal:
+        case kRootCal:
+            id = "C";
+            break;
+        case kRawAll:
+        case kRootAll:
+            id = "[PCD]";
+            break;
+        case kCalibrated:
+            id = "Y";
+            break;
+        case kImages:
+            id = "I";
+            break;
+        }
+
+        // Create file name
+        n =  fNight.GetStringFmt("%Y%m%d_");
+        n += Form(fmt, arr[i], id);
+
+        switch (type)
+        {
+        case kRawDat:
+        case kRawPed:
+        case kRawCal:
+        case kRawAll:
+            n += ".raw";
+            break;
+        default:
+            n += ".root";
+        }
 
         // Add Path/File to TIter
@@ -369 +455 @@
 // Using raw=kTRUE you get correspodning raw-files setup.
 // Return the number of files added.
-//
-UInt_t MSequence::SetupPedRuns(MDirIter &iter, const char *path, char *id, Bool_t raw) const
-{
-    return SetupRuns(iter, fPedRuns, path, id, raw);
+UInt_t MSequence::SetupPedRuns(MDirIter &iter, const char *path, Bool_t raw) const
+{
+    return SetupRuns(iter, fPedRuns, raw?kRawPed:kRootPed, path);
 }
 
@@ -383 +468 @@
 // Return the number of files added.
 //
-UInt_t MSequence::SetupDatRuns(MDirIter &iter, const char *path, char *id, Bool_t raw) const
-{
-    return SetupRuns(iter, fDatRuns, path, id, raw);
+UInt_t MSequence::SetupDatRuns(MDirIter &iter, const char *path, Bool_t raw) const
+{
+    return SetupRuns(iter, fDatRuns, raw?kRawPed:kRootPed, path);
 }
 
@@ -396 +481 @@
 // Return the number of files added.
 //
-UInt_t MSequence::SetupAllRuns(MDirIter &iter, const char *path, char *id, Bool_t raw) const
-{
-    return SetupRuns(iter, fRuns, path, id, raw);
+UInt_t MSequence::SetupAllRuns(MDirIter &iter, const char *path, Bool_t raw) const
+{
+    return SetupRuns(iter, fRuns, raw?kRawAll:kRootAll, path);
 }
 
@@ -409 +494 @@
 // Return the number of files added.
 //
-UInt_t MSequence::SetupCalRuns(MDirIter &iter, const char *path, char *id, Bool_t raw) const
-{
-    return SetupRuns(iter, fCalRuns, path, id, raw);
+UInt_t MSequence::SetupCalRuns(MDirIter &iter, const char *path, Bool_t raw) const
+{
+    return SetupRuns(iter, fCalRuns, raw?kRawCal:kRootCal, path);
+}
+
+// --------------------------------------------------------------------------
+//
+// Add all data runs from the sequence to MDirIter.
+// If path==0 the standard path of the data-center is assumed.
+// If you have the runs locally use path="."
+// Using raw=kTRUE you get correspodning raw-files setup.
+// Return the number of files added.
+//
+UInt_t MSequence::SetupDatRuns(MDirIter &iter, FileType_t type, const char *path) const
+{
+    return SetupRuns(iter, fDatRuns, type, path);
 }