Changeset 1553 for trunk

Timestamp:

10/24/02 16:29:40 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• macros/multidimdist.C (modified) (4 diffs)
• mhist/MHMatrix.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -1 +1 @@
                                                                   -*-*- 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.
+
 
 

trunk/MagicSoft/Mars/macros/multidimdist.C

@@ -48 +48 @@
     //   CalEvents:  Calibration Events
     //
-    MReadMarsFile  read("Events", "star.root");
+    MReadMarsFile  read("Events", "~/Mars/star2.root");
     read.DisableAutoScheme();
     tlist.AddToList(&read);
@@ -73 +73 @@
 
     MHMatrix matrix2("MatrixHadrons");
-    matrix2.AddColumns(&matrix);
+    matrix2.AddColumns(matrix.GetColumns());
     plist.AddToList(&matrix2);
 
@@ -98 +98 @@
     tlist.PrintStatistics();
 
+    fillmat.Print("size");
+    fillmat2.Print("size");
+
     // ---------------------------------------------------------
 
@@ -104 +107 @@
     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);
 

trunk/MagicSoft/Mars/mhist/MHMatrix.cc

@@ -316 +316 @@
 // 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();
 }