Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 1552)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 1553)
@@ -1,8 +1,20 @@
                                                                   -*-*- END -*-*-
+
+ 2002/10/24: Thomas Bretz
+
+   * macros/multidimdist.C:
+     - some changes to make it work with the latest version of Mars
+
+   * mhist/MHMatrix.cc:
+     - changed the Print member function to be more flexible
+
+
+
  2002/10/19: Abelardo Moralejo
 
    * manalysis/MCerPhotCalc.cc
-     -Added check of whether a pixel has all its FADC slices empty before
-      subtracting pedestal.
+     - Added check of whether a pixel has all its FADC slices empty before
+       subtracting pedestal.
+
 
 
Index: /trunk/MagicSoft/Mars/macros/multidimdist.C
===================================================================
--- /trunk/MagicSoft/Mars/macros/multidimdist.C	(revision 1552)
+++ /trunk/MagicSoft/Mars/macros/multidimdist.C	(revision 1553)
@@ -48,5 +48,5 @@
     //   CalEvents:  Calibration Events
     //
-    MReadMarsFile  read("Events", "star.root");
+    MReadMarsFile  read("Events", "~/Mars/star2.root");
     read.DisableAutoScheme();
     tlist.AddToList(&read);
@@ -73,5 +73,5 @@
 
     MHMatrix matrix2("MatrixHadrons");
-    matrix2.AddColumns(&matrix);
+    matrix2.AddColumns(matrix.GetColumns());
     plist.AddToList(&matrix2);
 
@@ -98,4 +98,7 @@
     tlist.PrintStatistics();
 
+    fillmat.Print("size");
+    fillmat2.Print("size");
+
     // ---------------------------------------------------------
 
@@ -104,9 +107,11 @@
     plist.Replace(&tlist2);
 
-    MReadMarsFile read2("Events", "star2.root");
+    MReadMarsFile read2("Events", "~/Mars/star2.root");
     read2.DisableAutoScheme();
     tlist2.AddToList(&read2);
 
-    MMultiDimDistCalc calc(5);
+    MMultiDimDistCalc calc;
+    calc.SetUseNumRows(0);
+    calc.SetUseKernelMethod(kTRUE);
     tlist2.AddToList(&calc);
 
Index: /trunk/MagicSoft/Mars/mhist/MHMatrix.cc
===================================================================
--- /trunk/MagicSoft/Mars/mhist/MHMatrix.cc	(revision 1552)
+++ /trunk/MagicSoft/Mars/mhist/MHMatrix.cc	(revision 1553)
@@ -316,13 +316,26 @@
 // Prints the meaning of the columns and the contents of the matrix.
 // Becareful, this can take a long time for matrices with many rows.
-//
-void MHMatrix::Print(Option_t *) const
-{
-    if (fData)
+// Use the option 'size' to print the size of the matrix.
+// Use the option 'cols' to print the culumns
+// Use the option 'data' to print the contents
+//
+void MHMatrix::Print(Option_t *o) const
+{
+    TString str(o);
+
+    if (str.Contains("size", TString::kIgnoreCase))
+    {
+        *fLog << all << GetDescriptor() << ": NumColumns=" << fM.GetNcols();
+        *fLog << " NumRows=" << fM.GetNrows() << endl;
+    }
+
+    if (!fData && str.Contains("cols", TString::kIgnoreCase))
+        *fLog << all << "Sorry, no column information available." << endl;
+
+    if (fData && str.Contains("cols", TString::kIgnoreCase))
         fData->Print();
-    else
-        *fLog << all << "Sorry, no column information available." << endl;
-
-    fM.Print();
+
+    if (str.Contains("data", TString::kIgnoreCase))
+        fM.Print();
 }