Changeset 7451 for trunk

Timestamp:

12/12/05 12:25:48 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• mjobs/MDataSet.cc (modified) (2 diffs)
• mtools/MCalendar.cc (added)
• mtools/MCalendar.h (added)

trunk/MagicSoft/Mars/Changelog

@@ -34 +34 @@
      - simplified reading the catlog file by using TString::Tokenize
 
+   * mtools/MCalendar.[h,cc]:
+     - added
+
 
 
@@ -80 +83 @@
      - replaced the nonsense TArrayS by TArrayC because the contents is
        just a byte
+
+   * mreport/MReportCC.cc:
+     - fixed the 
 
    * ganymed.cc:

trunk/MagicSoft/Mars/mjobs/MDataSet.cc

@@ -68 +68 @@
 //     in time, but it is not necessary.
 //
-// MISSING (27/01/04): The default name and paths cannot be used yet, because
-//                     they have to be defined soon.
-//
 /////////////////////////////////////////////////////////////////////////////
 #include "MDataSet.h"
@@ -425 +422 @@
         n++;
 
-        // Strip all spaces from line
-        for (int i=0; i<line.Length(); i++)
-            if (line[i]==' ')
-                line.Remove(i--, 1);
-
-        const Ssiz_t s = line.First(',');
-        if (s<0 || fNameSource!=line(0, s))
-            continue;
-
-        // CrabNebula,f|L|K0,5:34:32.0,22:0:52,-1.0,2000
-
-        for (int i=0; i<6; i++)
+        TObjArray *arr = line.Tokenize(",");
+
+        if (arr->GetEntries()<6)
         {
-            const Ssiz_t p = line.First(',');
-            if (p<0 && i<5)
-            {
-                gLog << err << "ERROR - Not enough arguments in line #" << n << " of " << catalog << endl;
-                return kFALSE;;
-            }
-
-            switch (i)
-            {
-            case 0:
-            case 1:
-            case 4:
-                break;
-            case 2:
-                ra = line(0, p);
-                break;
-            case 3:
-                dec = line(0, p);
-                break;
-            case 5:
-                epoch = line;
-                break;
-            }
-            line.Remove(0, p+1);
+            gLog << err << "ERROR - Not enough arguments in line #" << n << " of " << catalog << endl;
+            delete arr;
+            return kFALSE;;
         }
 
-        if (line.First(',')>=0)
-        {
-            gLog << err << "ERROR - Too much arguments in line #" << n << " of " << catalog << endl;
-            return kFALSE;
-        }
-
-        break;
-    }
-
-    if (epoch.IsNull())
-    {
-        gLog << err << "ERROR - No entry " << fNameSource << " in " << catalog << endl;
-        return kFALSE;
-    }
-
-    if (epoch!=(TString)"2000")
+        const TString name = (*arr)[0]->GetName();
+
+        ra    = (*arr)[2]->GetName();
+        dec   = (*arr)[3]->GetName();
+        epoch = (*arr)[5]->GetName();
+
+        delete arr;
+
+        if (name.Strip(TString::kBoth)==fNameSource)
+            break;
+    }
+
+    if (epoch.Strip(TString::kBoth)!=(TString)"2000")
     {
         gLog << err << "ERROR - Epoch not 2000... not supported." << endl;