Changeset 1207 in Sophya for trunk/SophyaPI/PIext/nommatvecadapter.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/nommatvecadapter.cc (modified) (2 diffs)

trunk/SophyaPI/PIext/nommatvecadapter.cc

@@ -80 +80 @@
 
 
+/* --Methode-- */
+GeneralFitData* NOMAdapter_Vector::GetGeneralFitData(bool& adel
+ ,GeneralFitData::FitErrType errtype,double errscale,double errmin
+ ,int i1,int i2,int j1,int j2)
+{
+adel = false;
+if(!mVec) return(NULL);
+
+int n = mVec->NElts();
+if(n<=0) return(NULL);
+
+i1 = (i1<0||i1>=n)? 0: i1;
+i2 = (i2<0||i2>=n||i2<i1)? n-1: i2;
+
+GeneralFitData* mGData = new GeneralFitData(1,i2-i1+1,0);
+adel = true;
+
+for(int i=i1;i<=i2;i++) {
+  double x = (double) i;
+  double f = (*mVec)(i);
+  double e = 1.;
+  e = GeneralFitData::ComputeError(f,e,errtype,errscale,errmin);
+  mGData->AddData1(x,f,e);
+}
+
+return mGData;
+}
+
+AnyDataObj* NOMAdapter_Vector::FitResidusObj(GeneralFit& mfit)
+{
+Vector* v = NULL;
+v = mVec->FitResidus(mfit); 
+return v;
+}
+
+AnyDataObj* NOMAdapter_Vector::FitFunctionObj(GeneralFit& mfit)
+{
+Vector* v = NULL;
+v = mVec->FitFunction(mfit); 
+return v;
+}
+
 // -------------------------------------------------------------
 
@@ -199 +241 @@
 }
 
-
+/* --Methode-- */
+GeneralFitData* NOMAdapter_Matrix::GetGeneralFitData(bool& adel
+ ,GeneralFitData::FitErrType errtype,double errscale,double errmin
+ ,int i1,int i2,int j1,int j2)
+{
+adel = false;
+if(!mMtx) return(NULL);
+
+int nx = mMtx->NRows();
+int ny = mMtx->NCol();
+if(nx<=0 || ny<=0) return(NULL);
+
+i1 = (i1<0||i1>=nx)? 0: i1;
+i2 = (i2<0||i2>=nx||i2<i1)? nx-1: i2;
+j1 = (j1<0||j1>=ny)? 0: j1;
+j2 = (j2<0||j2>=ny||j2<j1)? ny-1: j2;
+
+GeneralFitData* mGData = new GeneralFitData(2,(i2-i1+1)*(j2-j1+1),0);
+adel = true;
+
+for(int i=i1;i<=i2;i++) for(int j=j1;j<=j2;j++) {
+  double x = (double) i;
+  double y = (double) j;
+  double f = (*mMtx)(i,j);
+  double e = 1.;
+  e = GeneralFitData::ComputeError(f,e,errtype,errscale,errmin);
+  mGData->AddData2(x,y,f,e);
+}
+
+return mGData;
+}
+
+AnyDataObj* NOMAdapter_Matrix::FitResidusObj(GeneralFit& mfit)
+{
+Matrix* m = NULL;
+m = mMtx->FitResidus(mfit); 
+return m;
+}
+
+AnyDataObj* NOMAdapter_Matrix::FitFunctionObj(GeneralFit& mfit)
+{
+Matrix* m = NULL;
+m = mMtx->FitFunction(mfit); 
+return m;
+}
 
 // -------------------------------------------------------------