Changeset 4655 for trunk/MagicSoft

Timestamp:

08/17/04 15:44:38 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mhbase/MHMatrix.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/mhbase/MHMatrix.cc

@@ -591 +591 @@
 const TArrayI MHMatrix::GetIndexOfSortedColumn(Int_t ncol, Bool_t desc) const
 {
+#if ROOT_VERSION_CODE < ROOT_VERSION(4,00,8)
+    TMatrixColumn col(fM, ncol);
+#else
     TMatrixFColumn_const col(fM, ncol);
+#endif
 
     const Int_t n = fM.GetNrows();
@@ -614 +618 @@
     const Int_t n = fM.GetNrows();
 
+#if ROOT_VERSION_CODE < ROOT_VERSION(4,00,8)
+    TVector vold(fM.GetNcols());
+#endif
+
     TMatrix m(n, fM.GetNcols());
-    TVector vold(fM.GetNcols());
     for (int i=0; i<n; i++)
-        TMatrixFRow(m, i) /*= vold*/ = TMatrixFRow_const(fM, idx[i]);
-
+#if ROOT_VERSION_CODE < ROOT_VERSION(4,00,8)
+        TMatrixRow(m, i) = vold = TMatrixRow(fM, idx[i]);
+#else
+        TMatrixFRow(m, i) = TMatrixFRow_const(fM, idx[i]);
+#endif
     fM = m;
 }