Changeset 1511

Timestamp:

09/02/02 15:58:52 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• mhist/HistIncl.h (modified) (1 diff)
• mhist/MHMatrix.cc (modified) (2 diffs)
• mhist/MHMatrix.h (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -1 +1 @@
                                                                   -*-*- END -*-*-
+
+ 2002/09/02: Thomas Bretz
+
+   * mhist/MHMatrix.[h,cc]:
+     - added GetIndexdOfSortedColumn
+     - added SortMatrixByColumn
+
+   * mhist/HistIncl.h:
+     - added TArrayI.h (for MHMatrix.h)
+
+
 
  2002/08/19: Thomas Bretz
@@ -28 +39 @@
      - added comments
      - added another sanity check in SetBinning(TH1*,TH1*)
+
 
 

trunk/MagicSoft/Mars/mhist/HistIncl.h

@@ -2 +2 @@
 
 #include <TF1.h>
+#include <TArrayI.h>
 
 #endif // __CINT__

trunk/MagicSoft/Mars/mhist/MHMatrix.cc

@@ -49 +49 @@
 
 #include <TList.h>
+#include <TArrayF.h>
 #include <TArrayD.h>
 #include <TArrayI.h>
@@ -482 +483 @@
             out << "   " << GetUniqueName() << ".AddColumn(\"" << (*fData)[i].GetRule() << "\");" << endl;
 }
+
+const TArrayI MHMatrix::GetIndexOfSortedColumn(Int_t ncol, Bool_t desc) const
+{
+    TMatrixColumn col(fM, ncol);
+
+    const Int_t n = fM.GetNrows();
+
+    TArrayF array(n);
+
+    for (int i=0; i<n; i++)
+        array[i] = col(i);
+
+    TArrayI idx(n);
+    TMath::Sort(n, array.GetArray(), idx.GetArray(), desc);
+
+    return idx;
+}
+
+void MHMatrix::SortMatrixByColumn(Int_t ncol, Bool_t desc)
+{
+    TArrayI idx = GetIndexOfSortedColumn(ncol, desc);
+
+    const Int_t n = fM.GetNrows();
+
+    TMatrix m(n, fM.GetNcols());
+    for (int i=0; i<n; i++)
+    {
+        TVector vold(n);
+        vold = TMatrixRow(fM, idx[i]);
+
+        TMatrixRow rownew(m, i);
+        rownew = vold;
+    }
+
+    fM = m;
+}

trunk/MagicSoft/Mars/mhist/MHMatrix.h

@@ -9 +9 @@
 #endif
 
+class TArrayI;
 class MDataArray;
 
@@ -59 +60 @@
     void Reassign();
 
+    const TArrayI GetIndexOfSortedColumn(Int_t ncol=0, Bool_t desc=kTRUE) const;
+    void SortMatrixByColumn(Int_t ncol=0, Bool_t desc=kTRUE);
+
     ClassDef(MHMatrix, 1) // Multidimensional Matrix to store events
 };