Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 7516)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 7517)
@@ -18,4 +18,20 @@
 
                                                  -*-*- END OF LINE -*-*-
+ 2006/02/17 Thomas Bretz
+
+   * showplot.cc:
+     - fixed path inflation in case of ganymed
+
+   * mjobs/MDataSet.cc:
+     - return kFALSE if requested source wasn't found in catalog
+
+   * mjobs/MJCut.cc:
+     - reformatted output of source to fit in one line
+
+   * mpointing/MPointingPos.[h,cc]:
+     - output source name (title) in Print() if set
+
+
+
  2006/02/16 Daniela Dorner
 
Index: /trunk/MagicSoft/Mars/NEWS
===================================================================
--- /trunk/MagicSoft/Mars/NEWS	(revision 7516)
+++ /trunk/MagicSoft/Mars/NEWS	(revision 7517)
@@ -3,4 +3,7 @@
  *** Version  <cvs>
 
+   - showplot: path inflation for ganymed files was broken
+
+   - ganymed: now stops in requested source isn't found in catalog file
 
 
Index: /trunk/MagicSoft/Mars/mjobs/MDataSet.cc
===================================================================
--- /trunk/MagicSoft/Mars/mjobs/MDataSet.cc	(revision 7516)
+++ /trunk/MagicSoft/Mars/mjobs/MDataSet.cc	(revision 7517)
@@ -421,5 +421,8 @@
         line.ReadLine(fin);
         if (!fin)
-            break;
+        {
+            gLog << err << "ERROR - Source '" << fNameSource << "' not found in " << catalog << "." << endl;
+            return kFALSE;
+        }
 
         n++;
Index: /trunk/MagicSoft/Mars/mjobs/MJCut.cc
===================================================================
--- /trunk/MagicSoft/Mars/mjobs/MJCut.cc	(revision 7516)
+++ /trunk/MagicSoft/Mars/mjobs/MJCut.cc	(revision 7517)
@@ -338,5 +338,5 @@
 //   "MHillas"      to  "Events"
 //   "MHillasSrc"   to  "Events"
-//   "MHadronness"  to  "Events"       yes
+//   "Hadronness"   to  "Events"       yes
 //   "MEnergyEst"   to  "Events"       yes
 //   "DataType"     to  "Events"
@@ -365,4 +365,6 @@
     write->AddContainer("MMcEvt",         "Events", kFALSE);
     write->AddContainer("DataType",       "Events");
+    //    write->AddContainer("MMuonSearchPar", "Events", kFALSE);
+    //    write->AddContainer("MMuonCalibPar",  "Events", kFALSE);
 }
 
@@ -465,5 +467,5 @@
             return kFALSE;
         plist.AddToList(&source);
-        *fLog << all << "Using Source Position: ";
+        *fLog << all;
         source.Print("RaDec");
     }
Index: /trunk/MagicSoft/Mars/mpointing/MPointingPos.cc
===================================================================
--- /trunk/MagicSoft/Mars/mpointing/MPointingPos.cc	(revision 7516)
+++ /trunk/MagicSoft/Mars/mpointing/MPointingPos.cc	(revision 7517)
@@ -54,4 +54,7 @@
 using namespace std;
 
+const TString MPointingPos::gsDefName  = "MPointingPos";
+const TString MPointingPos::gsDefTitle = "Container storing the (corrected) telescope pointing position";
+
 // --------------------------------------------------------------------------
 //
@@ -89,5 +92,5 @@
         opt = "radeczdaz";
 
-    *fLog << GetDescriptor() << ": ";
+    *fLog << GetDescriptor() << ":";
 
     if (opt.Contains("ra", TString::kIgnoreCase))
@@ -101,4 +104,8 @@
     if (opt.Contains("az", TString::kIgnoreCase))
         *fLog << " Az=" << MAstro::GetStringDeg(fAz);
+
+    if (fTitle!=gsDefTitle)
+        *fLog << " <" << fTitle << ">";
+
     *fLog << endl;
 }
Index: /trunk/MagicSoft/Mars/mpointing/MPointingPos.h
===================================================================
--- /trunk/MagicSoft/Mars/mpointing/MPointingPos.h	(revision 7516)
+++ /trunk/MagicSoft/Mars/mpointing/MPointingPos.h	(revision 7517)
@@ -18,4 +18,7 @@
 {
 private:
+    static const TString gsDefName;
+    static const TString gsDefTitle;
+
     Double_t fZd;  // [deg] Zenith distance (ZA)
     Double_t fAz;  // [deg] Azimuth
@@ -28,6 +31,6 @@
     MPointingPos(const char *name=0, const char *title=0) : fZd(0), fAz(0), fRa(0), fHa(0), fDec(0)
     {
-        fName  = name ? name   : "MPointingPos";
-        fTitle = title ? title : "Container storing the (corrected) telescope pointing position";
+        fName  = name  ? (TString)name  : gsDefName;
+        fTitle = title ? (TString)title : gsDefTitle;
     }
     MPointingPos(const MPointingPos &p) : MParContainer(p),
Index: /trunk/MagicSoft/Mars/showplot.cc
===================================================================
--- /trunk/MagicSoft/Mars/showplot.cc	(revision 7516)
+++ /trunk/MagicSoft/Mars/showplot.cc	(revision 7517)
@@ -159,4 +159,5 @@
     //
     TString kInput = arg.GetArgumentStr(0);
+    kInput.ToLower();
 
     //
@@ -177,5 +178,6 @@
             break;
         }
-        file += Form("/%04d/%08d/", num/10000, num);
+        file += kInput==(TString)"ganymed" ? Form("/%05d", num/100000) : Form("/%04d", num/10000);
+        file += Form("/%08d/", num);
         file += kInput;
         file += Form("%08d.root", num);