Changeset 774 in Sophya

Timestamp:

Mar 10, 2000, 4:24:53 PM (26 years ago)

Author:

ansari

Message:

Adaptation aux modifs de TMatrixRC<T> - Reza 10/3/2000

Location:

trunk/SophyaLib/NTools

Files:

• generalfit.cc (modified) (2 diffs)
• linfit.cc (modified) (3 diffs)

trunk/SophyaLib/NTools/generalfit.cc

@@ -13 +13 @@
 #include "pexceptions.h"
 #include "generalfit.h"
+#include "sopemtx.h"
 
 #define EPS_FIT_MIN 1.e-8
@@ -1167 +1168 @@
    // Calcul de la matrice des covariances
 #ifdef __mac__
-   COVAR = ATGA.Inverse();
+   COVAR = SimpleMatrixOperation<r_8>::Inverse(ATGA); /* $CHECK$  Reza 10/3/2000 */
 #else
    TRY {
-     COVAR = ATGA.Inverse();
+     COVAR = SimpleMatrixOperation<r_8>::Inverse(ATGA); /* $CHECK$  Reza 10/3/2000 */
    } CATCHALL {
      if(debugLevel>0) {

trunk/SophyaLib/NTools/linfit.cc

@@ -1 +1 @@
 #include "machdefs.h"
 #include "peida.h"
+#include "sopemtx.h"
 #include "linfit.h"
 
@@ -38 +39 @@
   for (int j=0; j<nf; j++)
     for (int k=j; k<nf; k++)
-      a(j,k) = a(k,j) = fx.Row(j) * fx.Row(k);
+      a(j,k) = a(k,j) = TMatrixRC<r_8>::Row(const_cast<Matrix &>(fx), j) 
+        * TMatrixRC<r_8>::Row(const_cast<Matrix &>(fx), k); /* $CHECK$ Reza 10/3/2000 */
    
   c = fx * y;
 
-  if (Matrix::GausPiv(a,c) == 0) THROW(singMatxErr);
+  if (SimpleMatrixOperation<r_8>::GausPiv(a,c) == 0) THROW(singMatxErr); /* $CHECK$ Reza 10/3/2000 */
 
   double xi2 = 0;
@@ -105 +107 @@
   }
 
-  if (Matrix::GausPiv(a,d) == 0) THROW(singMatxErr);
+  if (SimpleMatrixOperation<r_8>::GausPiv(a,d) == 0) THROW(singMatxErr); /* $CHECK$ Reza 10/3/2000 */
 
   for (int l=0; l<nf; l++) {