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

Timestamp:

Oct 25, 1999, 12:36:22 PM (26 years ago)

Author:

ansari

Message:

Vector/Matrix OVector/OMatrix cmv 25/10/99

File:

• trunk/SophyaLib/NTools/generalfit.cc (modified) (13 diffs)

trunk/SophyaLib/NTools/generalfit.cc

@@ -874 +874 @@
 
 //++
-Vector GeneralFit::GetParm()
+OVector GeneralFit::GetParm()
 //
 //      Retourne les valeurs des parametres dans un vecteur.
@@ -1096 +1096 @@
 {
  volatile double oldChi2;
- 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);
+ 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);
  nStop = nStopL = nStep = 0;
  Chi2 = oldChi2 = 0.;
@@ -1515 +1515 @@
 
 //////////////////////////////////////////////////////////////////////
-void GeneralFit::write_in_step(double ci2,Vector& par)
+void GeneralFit::write_in_step(double ci2,OVector& par)
 {
 if(FileStep==NULL) return;
@@ -1524 +1524 @@
 
 //////////////////////////////////////////////////////////////////////
-void GeneralFit::TryFunc(Vector& par,Vector& par_tr)
+void GeneralFit::TryFunc(OVector& par,OVector& par_tr)
 {
   BETA_Try = 0;
   ATGA_Try = 0;
   Chi2  = 0;
-  Vector deriv(mNPar);
-  Vector derivtr(mNPar);
+  OVector deriv(mNPar);
+  OVector derivtr(mNPar);
   double result;
 
@@ -1564 +1564 @@
 
 //////////////////////////////////////////////////////////////////////
-void GeneralFit::TryXi2(Vector& par,Vector& par_tr)
+void GeneralFit::TryXi2(OVector& par,OVector& par_tr)
 {
   double c, *parloc;
@@ -1664 +1664 @@
 
 //////////////////////////////////////////////////////////////////////
-Vector GeneralFit::p_vers_tr(Vector const& p)
-{
- Vector tr(p);
+OVector GeneralFit::p_vers_tr(OVector const& p)
+{
+ OVector tr(p);
  for(int i=0;i<mNPar;i++) {
    if( fixParam[i] || ! boundParam[i] ) continue;
@@ -1675 +1675 @@
 
 //////////////////////////////////////////////////////////////////////
-void GeneralFit::p_vers_tr(Vector const& p,Vector& tr)
+void GeneralFit::p_vers_tr(OVector const& p,OVector& tr)
 {
  for(int i=0;i<mNPar;i++) {
@@ -1695 +1695 @@
 
 //////////////////////////////////////////////////////////////////////
-Vector GeneralFit::tr_vers_p(Vector const& tr)
-{
- Vector p(tr);
+OVector GeneralFit::tr_vers_p(OVector const& tr)
+{
+ OVector p(tr);
  for(int i=0;i<mNPar;i++) {
    if( fixParam[i] || ! boundParam[i] ) continue;
@@ -1706 +1706 @@
 
 //////////////////////////////////////////////////////////////////////
-void GeneralFit::tr_vers_p(Vector const& tr,Vector& p)
+void GeneralFit::tr_vers_p(OVector const& tr,OVector& p)
 {
  for(int i=0;i<mNPar;i++) {
@@ -1727 +1727 @@
 
 //////////////////////////////////////////////////////////////////////
-Vector GeneralFit::dp_vers_dtr(Vector const& dp,Vector const& tr)
-{
- Vector dtr(dp);
+OVector GeneralFit::dp_vers_dtr(OVector const& dp,OVector const& tr)
+{
+ OVector dtr(dp);
  for(int i=0;i<mNPar;i++) {
    if( fixParam[i] || ! boundParam[i] ) continue;
@@ -1738 +1738 @@
 
 //////////////////////////////////////////////////////////////////////
-void GeneralFit::dp_vers_dtr(Vector const& dp,Vector const& tr,Vector& dtr)
+void GeneralFit::dp_vers_dtr(OVector const& dp,OVector const& tr,OVector& dtr)
 {
  for(int i=0;i<mNPar;i++) {
@@ -1759 +1759 @@
 
 //////////////////////////////////////////////////////////////////////
-Vector GeneralFit::dtr_vers_dp(Vector const& dtr,Vector const& tr)
-{
- Vector dp(dtr);
+OVector GeneralFit::dtr_vers_dp(OVector const& dtr,OVector const& tr)
+{
+ OVector dp(dtr);
  for(int i=0;i<mNPar;i++) {
    if( fixParam[i] || ! boundParam[i] ) continue;
@@ -1771 +1771 @@
 //////////////////////////////////////////////////////////////////////
 // inline fonction pour aller + vite dans le try()
-//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)
+//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)
 // 1-/ Redefinit dp pour qu'il soit superieur a minStepDeriv
 // 2-/ Redefinit dp pour que p+/-dp reste dans les limites (parametre borne)