Changeset 514 in Sophya for trunk/SophyaLib/NTools/generalfit.h

Timestamp:

Oct 25, 1999, 6:43:04 PM (26 years ago)

Author:

ansari

Message:

elimination des OVector/OMatrix au profit des TVector/TMatrix cmv 25/10/99

File:

• trunk/SophyaLib/NTools/generalfit.h (modified) (5 diffs)

trunk/SophyaLib/NTools/generalfit.h

@@ -4 +4 @@
 
 #include "pexceptions.h"
-#include "matrix.h"
-#include "cvector.h"
+#include "tvector.h"
 #include "generaldata.h"
 
@@ -124 +123 @@
 
   double          GetParm(int);
-  OVector          GetParm();
+  Vector          GetParm();
   double          GetParmErr(int);
   double          GetCoVar(int,int);
@@ -168 +167 @@
   GeneralFitData*   mData;
 
-  OVector          Param;
-  OVector          errParam;
-  OVector          stepParam;
-  OVector          minParam;
-  OVector          maxParam;
-  OVector          minStepDeriv;
-  OVector          Eps;
+  Vector          Param;
+  Vector          errParam;
+  Vector          stepParam;
+  Vector          minParam;
+  Vector          maxParam;
+  Vector          minStepDeriv;
+  Vector          Eps;
   unsigned short int* fixParam;
   unsigned short int* boundParam;
@@ -188 +187 @@
   FILE            *FileStep;
   
-  OMatrix          ATGA;
-  OVector          BETA;
-  OMatrix          ATGA_Try;
-  OVector          BETA_Try;
-  OVector          C;
-  OVector          D;
+  Matrix          ATGA;
+  Vector          BETA;
+  Matrix          ATGA_Try;
+  Vector          BETA_Try;
+  Vector          C;
+  Vector          D;
   
   double          Chi2;
@@ -202 +201 @@
   
   // Fonctions privees
-  void       write_in_step(double ci2,OVector& par);
+  void       write_in_step(double ci2,Vector& par);
   void       General_Init(void);
-  void       TryFunc(OVector& par,OVector& par_tr);
-  void       TryXi2(OVector& par,OVector& par_tr);
+  void       TryFunc(Vector& par,Vector& par_tr);
+  void       TryXi2(Vector& par,Vector& par_tr);
   void       CheckSanity();
   void       Set_Bound_C_D(int i);
   void       Set_Bound_C_D();
   double     p_vers_tr(int i,double p);
-  OVector     p_vers_tr(OVector const& p);
-  void       p_vers_tr(OVector const& p,OVector& tr);
+  Vector     p_vers_tr(Vector const& p);
+  void       p_vers_tr(Vector const& p,Vector& tr);
   double     tr_vers_p(int i,double tr);
-  OVector     tr_vers_p(OVector const& tr);
-  void       tr_vers_p(OVector const& tr,OVector& p);
+  Vector     tr_vers_p(Vector const& tr);
+  void       tr_vers_p(Vector const& tr,Vector& p);
   double     c_dp_vers_dtr(int i,double tr);
-  OVector       dp_vers_dtr(OVector const& dp,OVector const& tr);
-  void         dp_vers_dtr(OVector const& dp,OVector const& tr,OVector& dtr);
+  Vector       dp_vers_dtr(Vector const& dp,Vector const& tr);
+  void         dp_vers_dtr(Vector const& dp,Vector const& tr,Vector& dtr);
   double     c_dtr_vers_dp(int i,double tr);
-  OVector       dtr_vers_dp(OVector const& dtr,OVector const& tr);
-  int        put_in_limits_for_deriv(OVector const& p,OVector& dp,double dist=0.66);
-  inline void dtr_vers_dp(OVector const& dtr,OVector const& tr,OVector& dp)
+  Vector       dtr_vers_dp(Vector const& dtr,Vector const& tr);
+  int        put_in_limits_for_deriv(Vector const& p,Vector& dp,double dist=0.66);
+  inline void dtr_vers_dp(Vector const& dtr,Vector const& tr,Vector& dp)
               {  for(int i=0;i<mNPar;i++)
                    { if( fixParam[i] ) continue;