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

trunk/SophyaPI/PIext/nomimagadapter.cc

@@ -6 +6 @@
 
 #include "nomimagadapter.h"
+#include "pimgadapter.h"
+
 #ifdef SANS_EVOLPLANCK
 #include "fitsimage.h"
-#endif
-#include "pimgadapter.h"
+#else
+#include "objfitter.h"
+#endif
+
 
 
@@ -103 +107 @@
 }
 
+/* --Methode-- */
+template <class T>
+GeneralFitData* NOMAdapter_Image<T>::GetGeneralFitData(bool& adel
+ ,GeneralFitData::FitErrType errtype,double errscale,double errmin
+ ,int i1,int i2,int j1,int j2)
+{
+adel = false;
+if(!mImg) return(NULL);
+
+int nx = mImg->XSize();
+int ny = mImg->YSize();
+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 = mImg->XPos(i);
+  double y = mImg->YPos(j);
+  double f = (*mImg)(i,j);
+  double e = 1.;
+  e = GeneralFitData::ComputeError(f,e,errtype,errscale,errmin);
+  mGData->AddData2(x,y,f,e);
+}
+
+return mGData;
+}
+
+template <class T>
+AnyDataObj* NOMAdapter_Image<T>::FitResidusObj(GeneralFit& mfit)
+{
+#ifdef SANS_EVOLPLANCK
+RzImage* rzim = mImg->FitResidus(mfit);  
+ImageR4* im   = new ImageR4(*rzim);
+return im;
+#else
+Image<T>* im = new Image<T>(ObjectFitter::FitResidus(*mImg,mfit));
+return im;
+#endif
+}
+
+template <class T>
+AnyDataObj* NOMAdapter_Image<T>::FitFunctionObj(GeneralFit& mfit)
+{
+#ifdef SANS_EVOLPLANCK
+RzImage* rzim = mImg->FitFunction(mfit);  
+ImageR4* im   = new ImageR4(*rzim);
+return im;
+#else
+Image<T>* im = NULL;
+//im = new Image<T>(ObjectFitter::FitFunction(*mImg,mfit));
+return im;
+#endif
+}