Changeset 384 in Sophya

Timestamp:

Aug 12, 1999, 4:34:22 PM (26 years ago)

Author:

ercodmgr

Message:

Diverses modifs + Fonc. Link Dyn pour fitting - Reza+cmv 12/8/99

Location:

trunk/SophyaPI/PIext

Files:

• basexecut.cc (modified) (2 diffs)
• dlftypes.h (modified) (1 diff)
• piacmd.cc (modified) (1 diff)
• piafitting.cc (modified) (7 diffs)
• piafitting.h (modified) (2 diffs)
• pistdimgapp.cc (modified) (1 diff)

trunk/SophyaPI/PIext/basexecut.cc

@@ -51 +51 @@
 // >>>>>>>>>>> Fenetre graphique , changement d'attributs graphiques 
 else if (kw == "zone") {
-  if (tokens.size() < 2) { cout << "Usage: zone nx ny" << endl;  return(0); }
+  while (tokens.size() < 2) tokens.push_back("1");
   int nx, ny;
   nx = ny = 1;
@@ -596 +596 @@
 
 kw = "zone";
-usage = "To Divide the Graphic window \n  Usage: zone nx ny";
+usage = "To Divide the Graphic window \n  Usage: zone [nx=1 ny=1]";
 mpiac->RegisterCommand(kw, usage, this, "Graphics");
 kw = "newwin";

trunk/SophyaPI/PIext/dlftypes.h

@@ -14 +14 @@
 #endif
 
+// ------------ Fonctions pour trace de fonctions --------------
 typedef double (* DlFunctionOfX) (double x);
 typedef double (* DlFunctionOfXY) (double x, double y);
+// ---- Fonctions pour trace d'expressions d'objets ------------
 typedef int (* PlotExprFunc) (double* x, double* rx, double* ry, double* rz, double* rt);
 typedef int (* NTLoopExprFunc) (double* x, double* rx, double* ry, double* rz, 
                                 double* rt, int n, int nmax);
+
+// ---------- Fonctions UserFit ----------------
+typedef double (* DlUserFitFunc)(double const*, double const*);
+typedef double (* DlUserFitFuncDer)(double const*, double const*, double*);
+
+// ---------- Fonctions User et gestion de modules chargeables ----
 typedef void (* DlUserProcFunction) (vector<string>& args);
 typedef void (* DlFunction) ();

trunk/SophyaPI/PIext/piacmd.cc

@@ -809 +809 @@
 
 if ( (fip = fopen(file.c_str(),"r")) == NULL ) {
+  if (file.find('.') >= file.length()) {
+    cout << "PIACmd::Exec(): Error opening file " << file << endl;
+    file += ".pic";
+    cout << "                Trying file " << file << endl;
+    fip = fopen(file.c_str(),"r");
+    }
+  }
+
+if(fip == NULL) {
   cerr << "PIACmd::Exec() Error opening file " << file << endl;
   hist << "##! PIACmd::Exec() Error opening file " << file << endl;

trunk/SophyaPI/PIext/piafitting.cc

@@ -150 +150 @@
 , mFit(NULL)
 , mV(NULL), mH(NULL), mM(NULL), mH2(NULL), mIm(NULL), mG(NULL)
+, mDlUFunc(NULL), mNameFitFunc(""), mFitFunc(NULL), mFitFuncDer(NULL)
+, mUFNVar(0), mUFNPar(0)
 {
 // Init et Set des options
@@ -176 +178 @@
 usage += "\n Usage: fitlin nomobj func [o:... o:...]";
 piac->RegisterCommand(kw,usage,this,"Fitting");
+
+kw = "crfitfun";
+usage = "Creation de user function ";
+usage += "\n Usage: crfitfun file func nvar npar";
+piac->RegisterCommand(kw,usage,this,"Fitting");
 }
 
@@ -185 +192 @@
 if(mGData != NULL) {delete mGData; mGData=NULL;}
 if(FWindFit != NULL) {delete FWindFit; FWindFit=NULL;}
+if (mDlUFunc != NULL) delete mDlUFunc;
 }
 
@@ -658 +666 @@
 if(mFunc && (mOpt.okres||mOpt.okfun)) {
   NamedObjMgr omg;
-  string nomres = mNObj + "res";
-  string nomfun = mNObj + "fun";
+  string nomres = mNObj + "_res";
+  string nomfun = mNObj + "_fun";
   if(mV) {
     if(mOpt.okres) {Vector* ob = mV->FitResidus(*mFit);  if(ob) omg.AddObj(ob,nomres);}
@@ -673 +681 @@
     if(mOpt.okfun) {Histo2D* ob = mH2->FitFunction(*mFit); if(ob) omg.AddObj(ob,nomfun);}
   } else if(mIm) {
-    if(mOpt.okres) {RzImage* ob = mIm->FitResidus(*mFit);  if(ob) omg.AddObj(ob,nomres);}
-    if(mOpt.okfun) {RzImage* ob = mIm->FitFunction(*mFit); if(ob) omg.AddObj(ob,nomfun);}
+    if(mOpt.okres) {
+      RzImage* ob = mIm->FitResidus(*mFit);  
+      if(ob) {ImageR4* rob = new ImageR4(*ob); omg.AddObj(rob,nomres); delete ob;}
+    }
+    if(mOpt.okfun) {
+      RzImage* ob = mIm->FitFunction(*mFit);
+      if(ob) {ImageR4* rob = new ImageR4(*ob); omg.AddObj(rob,nomfun); delete ob;}
+    }
   } else if(mG) {
     if(mOpt.okres) {GeneralFitData* ob = mG->FitResidus(*mFit);  if(ob) omg.AddObj(ob,nomres);}
@@ -713 +727 @@
 
 return;
+}
+
+/* --Methode-- */
+void PIAFitter::LinkFitFunc(string const & fname, string const & funcname, int nvar, int npar)
+{
+
+if ((nvar < 1) || (npar < 1)) return;
+
+if (mDlUFunc != NULL) delete mDlUFunc;  // Nous en avons deja un, on nettoie
+
+mDlUFunc = NULL;
+mFitFunc = NULL; 
+mFitFuncDer = NULL; 
+mUFNVar= mUFNPar = 0;
+mNameFitFunc = "";
+
+// On compile le fichier C, on fabrique un .so et on l'ouvre
+mDlUFunc = PDynLinkMgr::BuildFromCFile(fname);
+if (mDlUFunc == NULL) {
+  cerr << "PIAFitter::LinkFitFunc() Erreur building .so " << endl;
+  return;
+  }
+
+// On recupere la fonction de fit
+mFitFunc = (DlUserFitFunc) mDlUFunc->GetFunction(funcname);
+if (mFitFunc == NULL) { // Probleme, on n'a pas trouve etc ... 
+  cerr << "PIAFitter::LinkFitFunc() Erreur linking function " << funcname << endl;
+  delete mDlUFunc;
+  mDlUFunc = NULL;
+  return;
+  }
+
+// On recupere la fonction de derives
+string fnameder = funcname+"_der";
+mFitFuncDer = (DlUserFitFuncDer) mDlUFunc->GetFunction(fnameder);
+if (mFitFunc == NULL) { 
+  cout << "PIAFitter::LinkFitFunc() No derive for " << fnameder << endl;
+  }
+
+mNameFitFunc = funcname;
+mUFNVar = nvar;
+mUFNPar = npar;
+
+cout << "PIAFitter::LinkFitFunc() UserFitFunc" << funcname
+     << " NVar=" << nvar << " NPar=" << npar << endl;
+
+}
+/* --Methode-- */
+void PIAFitter::PrepareFitFuncCFile(string const & fname, string const & funcname, int nvar, int npar)
+{
+// A Faire 
 }
 
@@ -760 +825 @@
   FWindFit = new PIAFitterWind(mApp,this);
   FWindFit->Show();
-}
+} else if (kw == "crfitfun") {
+  if (tokens.size() < 4) { 
+    cout <<"Usage:crfitfun ... " << endl; return(0); }
+    LinkFitFunc(tokens[0], tokens[1], 1, 7);
+    double par[7]={1000,0.,0.,1.,1.,0.1,100.};
+    double x[2]={1.,1.};
+    cout<<"Salut:"<<mFitFunc(x,par)<<endl;
+}
+
 
 return(0);

trunk/SophyaPI/PIext/piafitting.h

@@ -35 +35 @@
   virtual ~PIAFitter();
   virtual int Execute(string& keyw, vector<string>& args);
+  virtual void  LinkFitFunc(string const & fname, string const & funcname, int nvar, int npar);
+  virtual void  PrepareFitFuncCFile(string const & fname, string const & funcname, int nvar, int npar);
 
 friend class PIAFitterWind;
@@ -82 +84 @@
 GeneralFitData* mG; // Do not delete
 
+// Gestion de fonction de fit user
+PDynLinkMgr* mDlUFunc;
+string mNameFitFunc;
+DlUserFitFunc mFitFunc;
+DlUserFitFuncDer mFitFuncDer;
+int mUFNVar, mUFNPar; 
 };
 

trunk/SophyaPI/PIext/pistdimgapp.cc

@@ -1181 +1181 @@
     sprintf(strg,"Image: %s -  Pave %d %d \n",  curpimg->Nom().c_str(), 
             curpimg->XPave(),  curpimg->YPave());     
-    mps->DrawString(10., 25., strg, PI_Black, PI_BoldFont, 20);
+    mps->DrawString(10., 25., strg, PI_Black, PI_DefaultFont, PI_BoldFont, 20);
     mps->EndBloc();