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

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.cc (modified) (14 diffs)

trunk/SophyaLib/NTools/generalfit.cc

@@ -9 +9 @@
 #include "pexceptions.h"
 #include "generalfit.h"
-#include "cvector.h"
 
 #define EPS_FIT_MIN 1.e-8
-
-using namespace PlanckDPC;
 
 //================================================================
@@ -874 +871 @@
 
 //++
-OVector GeneralFit::GetParm()
+Vector GeneralFit::GetParm()
 //
 //      Retourne les valeurs des parametres dans un vecteur.
@@ -1096 +1093 @@
 {
  volatile double oldChi2;
- OMatrix COVAR(mNPar,mNPar);
- OVector DA(mNPar);
- OVector dparam(mNPar);
- OVector paramTry(mNPar);
- OVector param_tr(mNPar);
- OVector paramTry_tr(mNPar);
- OVector step_tr(mNPar);
+ Matrix COVAR(mNPar,mNPar);
+ Vector DA(mNPar);
+ Vector dparam(mNPar);
+ Vector paramTry(mNPar);
+ Vector param_tr(mNPar);
+ Vector paramTry_tr(mNPar);
+ Vector step_tr(mNPar);
  nStop = nStopL = nStep = 0;
  Chi2 = oldChi2 = 0.;
@@ -1515 +1512 @@
 
 //////////////////////////////////////////////////////////////////////
-void GeneralFit::write_in_step(double ci2,OVector& par)
+void GeneralFit::write_in_step(double ci2,Vector& par)
 {
 if(FileStep==NULL) return;
@@ -1524 +1521 @@
 
 //////////////////////////////////////////////////////////////////////
-void GeneralFit::TryFunc(OVector& par,OVector& par_tr)
+void GeneralFit::TryFunc(Vector& par,Vector& par_tr)
 {
   BETA_Try = 0;
   ATGA_Try = 0;
   Chi2  = 0;
-  OVector deriv(mNPar);
-  OVector derivtr(mNPar);
+  Vector deriv(mNPar);
+  Vector derivtr(mNPar);
   double result;
 
@@ -1564 +1561 @@
 
 //////////////////////////////////////////////////////////////////////
-void GeneralFit::TryXi2(OVector& par,OVector& par_tr)
+void GeneralFit::TryXi2(Vector& par,Vector& par_tr)
 {
   double c, *parloc;
@@ -1664 +1661 @@
 
 //////////////////////////////////////////////////////////////////////
-OVector GeneralFit::p_vers_tr(OVector const& p)
-{
- OVector tr(p);
+Vector GeneralFit::p_vers_tr(Vector const& p)
+{
+ Vector tr(p);
  for(int i=0;i<mNPar;i++) {
    if( fixParam[i] || ! boundParam[i] ) continue;
@@ -1675 +1672 @@
 
 //////////////////////////////////////////////////////////////////////
-void GeneralFit::p_vers_tr(OVector const& p,OVector& tr)
+void GeneralFit::p_vers_tr(Vector const& p,Vector& tr)
 {
  for(int i=0;i<mNPar;i++) {
@@ -1695 +1692 @@
 
 //////////////////////////////////////////////////////////////////////
-OVector GeneralFit::tr_vers_p(OVector const& tr)
-{
- OVector p(tr);
+Vector GeneralFit::tr_vers_p(Vector const& tr)
+{
+ Vector p(tr);
  for(int i=0;i<mNPar;i++) {
    if( fixParam[i] || ! boundParam[i] ) continue;
@@ -1706 +1703 @@
 
 //////////////////////////////////////////////////////////////////////
-void GeneralFit::tr_vers_p(OVector const& tr,OVector& p)
+void GeneralFit::tr_vers_p(Vector const& tr,Vector& p)
 {
  for(int i=0;i<mNPar;i++) {
@@ -1727 +1724 @@
 
 //////////////////////////////////////////////////////////////////////
-OVector GeneralFit::dp_vers_dtr(OVector const& dp,OVector const& tr)
-{
- OVector dtr(dp);
+Vector GeneralFit::dp_vers_dtr(Vector const& dp,Vector const& tr)
+{
+ Vector dtr(dp);
  for(int i=0;i<mNPar;i++) {
    if( fixParam[i] || ! boundParam[i] ) continue;
@@ -1738 +1735 @@
 
 //////////////////////////////////////////////////////////////////////
-void GeneralFit::dp_vers_dtr(OVector const& dp,OVector const& tr,OVector& dtr)
+void GeneralFit::dp_vers_dtr(Vector const& dp,Vector const& tr,Vector& dtr)
 {
  for(int i=0;i<mNPar;i++) {
@@ -1759 +1756 @@
 
 //////////////////////////////////////////////////////////////////////
-OVector GeneralFit::dtr_vers_dp(OVector const& dtr,OVector const& tr)
-{
- OVector dp(dtr);
+Vector GeneralFit::dtr_vers_dp(Vector const& dtr,Vector const& tr)
+{
+ Vector dp(dtr);
  for(int i=0;i<mNPar;i++) {
    if( fixParam[i] || ! boundParam[i] ) continue;
@@ -1771 +1768 @@
 //////////////////////////////////////////////////////////////////////
 // inline fonction pour aller + vite dans le try()
-//void GeneralFit::dtr_vers_dp(OVector const& dtr,OVector const& tr,OVector& dp)
-
-//////////////////////////////////////////////////////////////////////
-int GeneralFit::put_in_limits_for_deriv(OVector const& p,OVector& dp,double dist)
+//void GeneralFit::dtr_vers_dp(Vector const& dtr,Vector const& tr,Vector& dp)
+
+//////////////////////////////////////////////////////////////////////
+int GeneralFit::put_in_limits_for_deriv(Vector const& p,Vector& dp,double dist)
 // 1-/ Redefinit dp pour qu'il soit superieur a minStepDeriv
 // 2-/ Redefinit dp pour que p+/-dp reste dans les limites (parametre borne)