Changeset 7749 for trunk/MagicSoft/Mars/mhbase

Timestamp:

05/29/06 15:58:38 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhbase

Files:

• MHMatrix.cc (modified) (4 diffs)
• MHMatrix.h (modified) (1 diff)

trunk/MagicSoft/Mars/mhbase/MHMatrix.cc

@@ -53 +53 @@
 #include <TArrayD.h>
 #include <TArrayI.h>
-#include <TVector.h>
 
 #include <TH1.h>
@@ -421 +420 @@
         avg /= rows;
 
+#if ROOT_VERSION_CODE > ROOT_VERSION(5,00,00)
+        TMatrixFColumn(m, x) += -avg;
+#else
         TMatrixColumn(m, x) += -avg;
+#endif
     }
 
@@ -924 +927 @@
     //
     TVector v(fM.GetNrows());
+#if ROOT_VERSION_CODE > ROOT_VERSION(5,00,00)
+    v = TMatrixFColumn_const(fM, refcolumn);
+#else
     v = TMatrixColumn(fM, refcolumn);
+#endif
     //v += -frombin;
     //v *= 1/dbin;
@@ -1260 +1267 @@
     for (int i=0; i<m.GetNrows(); i++)
     {
+#if ROOT_VERSION_CODE > ROOT_VERSION(5,00,00)
+        const TMatrixFRow_const &row = TMatrixFRow_const(m, i);
+#else
         const TMatrixRow &row = TMatrixRow(m, i);
-
+#endif
         // finite (-> math.h) checks for NaN as well as inf
         int jcol;

trunk/MagicSoft/Mars/mhbase/MHMatrix.h

@@ -9 +9 @@
 #include <TMatrix.h>
 #endif
+
 #ifndef MARS_MH
 #include "MH.h"
 #endif
 
+#ifndef ROOT_TVector
+#include <TVector.h>
+#endif
+
 class TArrayI;
 class TArrayF;
-class TVector;
 class TH1F;