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

Timestamp:

May 19, 1999, 5:58:06 PM (26 years ago)

Author:

ansari

Message:

FIO_... + grosses modifs cmv 19/5/99

File:

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

trunk/SophyaLib/NTools/generalfit.cc

@@ -11 +11 @@
 #endif
 
+#include "pexceptions.h"
 #include "generalfit.h"
-#include "perrors.h"
 #include "cvector.h"
-#include "nbconst.h"
-#include "tabmath.h"
 
 #define EPS_FIT_MIN 1.e-8
+
+using namespace PlanckDPC;
 
 //================================================================
@@ -1433 +1433 @@
 //////////////////////////////////////////////////////////////////////
 //++
-GeneralFitData* GeneralFit::DataResidus(bool clean)
+GeneralFitData GeneralFit::DataResidus(bool clean)
 //
 //      Retourne une structure ``GeneralFitData'' contenant
@@ -1444 +1444 @@
 //--
 {
-if(!mData) return NULL;
-if(!mFunction) return NULL;
-GeneralFitData* datres = new GeneralFitData(*mData,clean);
+if(!mData || !mFunction)
+  throw(NullPtrError("GeneralFit::DataResidus: NULL pointer\n"));
+GeneralFitData datres(*mData,clean);
 for(int k=0; k<mData->NData(); k++)
-  datres->mF[k] -= mFunction->Value(&datres->mXP[mNVar*k],Param.Data());
+  datres.mF[k] -= mFunction->Value(&datres.mXP[mNVar*k],Param.Data());
 return datres;
 }
@@ -1454 +1454 @@
 //////////////////////////////////////////////////////////////////////
 //++
-GeneralFitData* GeneralFit::DataFunction(bool clean)
+GeneralFitData GeneralFit::DataFunction(bool clean)
 //
 //      Retourne une structure ``GeneralFitData'' contenant
@@ -1461 +1461 @@
 //--
 {
-if(!mData) return NULL;
-if(!mFunction) return NULL;
-GeneralFitData* datres = new GeneralFitData(*mData,clean);
+if(!mData || !mFunction)
+  throw(NullPtrError("GeneralFit::DataFunction: NULL pointer\n"));
+GeneralFitData datres(*mData,clean);
 for(int k=0; k<mData->NData(); k++)
-  datres->mF[k] = mFunction->Value(&datres->mXP[mNVar*k],Param.Data());
+  datres.mF[k] = mFunction->Value(&datres.mXP[mNVar*k],Param.Data());
 return datres;
 }