Changeset 7170 for trunk/MagicSoft/Mars/mjobs

Timestamp:

06/27/05 10:45:56 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mjobs/MDataSet.cc (modified) (5 diffs)

trunk/MagicSoft/Mars/mjobs/MDataSet.cc

@@ -326 +326 @@
 {
     if (!HasSource())
-        return kFALSE;
+    {
+        gLog << err << "ERROR - MDataSet::GetSourcePos called, but no source available." << endl;
+        return kFALSE;
+    }
 
     TString catalog(fCatalog);
@@ -339 +342 @@
     }
 
-    TString ra,dec,epoch;
+    TString ra, dec, epoch;
 
     Int_t n = 0;
@@ -350 +353 @@
 
         n++;
-        line = line.Strip(TString::kBoth);
-
-        if (!line.BeginsWith(fNameSource))
+
+        // Strip all spaces from line
+        for (int i=0; i<line.Length(); i++)
+            if (line[i]==' ')
+                line.Remove(i--, 1);
+
+        if (fNameSource!=line(0, fNameSource.Length()))
             continue;
 
@@ -362 +369 @@
             if (p<0 && i<5)
             {
-                gLog << err << "Not enough arguments in line #" << n << endl;
-                return kFALSE;
+                gLog << err << "ERROR - Not enough arguments in line #" << n << " of " << catalog << endl;
+                return kFALSE;;
             }
 
@@ -387 +394 @@
         if (line.First(',')>=0)
         {
-            gLog << err << "Too much arguments in line #" << n << endl;
+            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")
     {
-        gLog << err << "Epoch not 2000... not supported." << endl;
+        gLog << err << "ERROR - Epoch not 2000... not supported." << endl;
         return kFALSE;
     }