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

trunk/SophyaPI/PIext/nomhistadapter.cc

@@ -11 +11 @@
 #include "servnobjm.h"
 
+#ifndef SANS_EVOLPLANCK
+#include "objfitter.h"
+#endif
+
 //-------------------------------------------------------------------------
 // Class Adaptateur d'objet (Pour NamedObjMgr) d'objet Histo / HProf
@@ -88 +92 @@
 }
 
+/* --Methode-- */
+GeneralFitData* NOMAdapter_Histo::GetGeneralFitData(bool& adel
+ ,GeneralFitData::FitErrType errtype,double errscale,double errmin
+ ,int i1,int i2,int j1,int j2)
+{
+adel = false;
+if(!mHis) return(NULL);
+
+int nx = mHis->NBins();
+if(nx<=0) return(NULL);
+
+i1 = (i1<0||i1>=nx)? 0: i1;
+i2 = (i2<0||i2>=nx||i2<i1)? nx-1: i2;
+
+GeneralFitData* mGData = new GeneralFitData(1,i2-i1+1,0);
+adel = true;
+
+for(int i=i1;i<=i2;i++) {
+  double x = mHis->BinCenter(i);
+  double f = (*mHis)(i);
+  double e = (mHis->HasErrors())? mHis->Error(i) : 1.;
+  e = GeneralFitData::ComputeError(f,e,errtype,errscale,errmin);
+  mGData->AddData1(x,f,e);
+}
+
+return mGData;
+}
+
+AnyDataObj* NOMAdapter_Histo::FitResidusObj(GeneralFit& mfit)
+{
+Histo* h = NULL;
+#ifdef SANS_EVOLPLANCK
+h = mHis->FitResidus(mfit); 
+#else
+h = new Histo(ObjectFitter::FitResidus(*mHis,mfit));
+#endif
+return h;
+}
+
+AnyDataObj* NOMAdapter_Histo::FitFunctionObj(GeneralFit& mfit)
+{
+Histo* h = NULL;
+#ifdef SANS_EVOLPLANCK
+h = mHis->FitFunction(mfit); 
+#else
+h = new Histo(ObjectFitter::FitFunction(*mHis,mfit));
+#endif
+return h;
+}
 
 // -------------------------------------------------------------
@@ -215 +268 @@
 }
 
+
+/* --Methode-- */
+GeneralFitData* NOMAdapter_Histo2D::GetGeneralFitData(bool& adel
+ ,GeneralFitData::FitErrType errtype,double errscale,double errmin
+ ,int i1,int i2,int j1,int j2)
+{
+adel = false;
+if(!mHis) return(NULL);
+
+int nx = mHis->NBinX();
+int ny = mHis->NBinY();
+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,y; mHis->BinCenter(i,j,x,y);
+  double f = (*mHis)(i,j);
+  double e = (mHis->HasErrors())? mHis->Error(i,j) : 1.;
+  e = GeneralFitData::ComputeError(f,e,errtype,errscale,errmin);
+  mGData->AddData2(x,y,f,e);
+}
+
+return mGData;
+}
+
+AnyDataObj* NOMAdapter_Histo2D::FitResidusObj(GeneralFit& mfit)
+{
+Histo2D* h2 = NULL;
+#ifdef SANS_EVOLPLANCK
+h2 = mHis->FitFunction(mfit);
+#else
+h2 = new Histo2D(ObjectFitter::FitResidus(*mHis,mfit));
+#endif
+return h2;
+}
+
+AnyDataObj* NOMAdapter_Histo2D::FitFunctionObj(GeneralFit& mfit)
+{
+Histo2D* h2 = NULL;
+#ifdef SANS_EVOLPLANCK
+h2 = mHis->FitFunction(mfit);
+#else
+h2 = new Histo2D(ObjectFitter::FitFunction(*mHis,mfit));
+#endif
+return h2;
+}
 
 
@@ -403 +509 @@
 return(mNt);
 }
-
-