Changeset 1207 in Sophya for trunk/SophyaPI/PIext/nomgfdadapter.cc

Timestamp:

Sep 29, 2000, 4:26:15 PM (25 years ago)

Author:

ercodmgr

Message:

• refonte de piaffiting avec les fits adapteurs
• addapteur de fit pour les objets existants
• entree des Image<T> dans les fits (retour !!!)

cmv 29/9/00

File:

• trunk/SophyaPI/PIext/nomgfdadapter.cc (modified) (2 diffs)

trunk/SophyaPI/PIext/nomgfdadapter.cc

@@ -7 +7 @@
 #include "nomgfdadapter.h"
 #include "pipodrw.h"
+
+#ifndef SANS_EVOLPLANCK
+#include "objfitter.h"
+#endif
 
 //-------------------------------------------------------------------------
@@ -70 +74 @@
 }
 
+/* --Methode-- */
+GeneralFitData* NOMAdapter_GeneralFitData::GetGeneralFitData(bool& adel
+ ,GeneralFitData::FitErrType errtype,double errscale,double errmin
+ ,int i1,int i2,int j1,int j2)
+{
+adel = false;
+if(!mG) return(NULL);
+
+int n = mG->NData();
+if(n<=0) return(NULL);
+int nv = mG->NVar();
+if(nv<=0) return(NULL);
+
+i1 = (i1<0||i1>=n)? 0: i1;
+i2 = (i2<0||i2>=n||i2<i1)? n-1: i2;
+n = i2-i1+1;
+
+// Pas de gestion des erreurs sur les Abscisses Xi
+GeneralFitData* mGData = new GeneralFitData(nv,n,0);
+adel = true;
+
+double *x = new double[nv];
+for(int i=i1;i<=i2;i++) {
+  for(int j=0;j<nv;j++) x[j] = mG->Absc(j,i);
+  double f = mG->Val(i);
+  double e = mG->EVal(i);
+  e = GeneralFitData::ComputeError(f,e,errtype,errscale,errmin);
+  mGData->AddData(x,f,e);
+  if(!mG->IsValid(i)) mGData->KillData(i);
+}
+delete [] x;
+
+return mGData;
+}
+
+AnyDataObj* NOMAdapter_GeneralFitData::FitResidusObj(GeneralFit& mfit)
+{
+GeneralFitData* g = NULL;
+#ifdef SANS_EVOLPLANCK
+g = mG->FitResidus(mfit); 
+#else
+g = new GeneralFitData(ObjectFitter::FitResidus(*mG,mfit));
+#endif
+return g;
+}
+
+AnyDataObj* NOMAdapter_GeneralFitData::FitFunctionObj(GeneralFit& mfit)
+{
+GeneralFitData* g = NULL;
+#ifdef SANS_EVOLPLANCK
+g = mG->FitFunction(mfit); 
+#else
+g = new GeneralFitData(ObjectFitter::FitFunction(*mG,mfit));
+#endif
+return g;
+}