Changeset 379 in Sophya


Ignore:
Timestamp:
Aug 9, 1999, 11:34:03 PM (26 years ago)
Author:
ercodmgr
Message:

fit/fitw/fitlin cmv 9/8/99

Location:
trunk/SophyaPI/PIext
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/SophyaPI/PIext/piafitting.cc

    r368 r379  
     1//CMVBUG reste pb suivant:
     2//openppf cmvwppf.ppf
     3//fitw h1g g2 p:4500,45,10,900
     4//delobjs h1g
     5//clic sur FIT  -> OK
     6//clic sur FIT 2sd fois -> core dump!!!
     7//
     8//
    19#include <stdio.h>
    210#include <stdlib.h>
    … …  
    2836#include "pistdimgapp.h"
    2937
    30 ////      ----------    Classe de fenetre de fit interactive ------------
    31 #define FINPARMAX  10    // Nb maxi de parametres de fit
    32 
     38////////////////////////////////////////////////////////////////////
     39////---------- Classe de fenetre de fit interactive ------------////
     40////////////////////////////////////////////////////////////////////
    3341class PIAFitterWind :  public PIWindow {
    3442public :
    … …  
    3745  virtual void  Show();
    3846  virtual void  Process(PIMessage msg, PIMsgHandler* sender, void* data=NULL);
    39   inline  void  SetObjName(string& nom) { oname = nom; }
    40           void  SetNbParms(int npar);
     47  void SetState(void);
    4148protected :
    42   PIStdImgApp* dap;
    43   PIAFitter* fitter;
    44   PILabel* labn; 
    45   PIOptMenu* pom[2];
    46   PIButton* but[2];
    47   PICheckBox* ckb[2];
    48   PILabel* lab[2];
    49   PILabel* labp[FINPARMAX];   // Maximum FINPARMAX  parametres
    50   PIText* txtp[FINPARMAX];    //        "       "      "
    51   PIText* txts[FINPARMAX];    //        "       "      " 
    52   string oname;
     49  PIStdImgApp* mDap;
     50  PIAFitter*   mFitter;
     51  PILabel**    lab; int nlab;
     52  PIText**     txt; int ntxt;
     53  PIButton**   but; int nbut;
     54  PICheckBox** ckb; int nckb;
     55  bool ReFillGData;
    5356};
    5457
    55 ///////////////////// Fit 1D et 2D //////////////////////////
    56 
    57 PIAFitterWind* fwind = NULL;
    58 
    59 /* --Methode-- */
    60 PIAFitter::PIAFitter(PIACmd *piac, PIStdImgApp* app)
    61 {
    62 string kw, usage;
    63 
    64 kw = "fit";
    65 usage = "Fitting function to DataObjects (Histo, Histo2D, Vector, ...)";
    66 usage += "\n Usage: fit nomobj func [Options]";
    67 usage += "\n [p:p1,...,pn s:s1,...,sn m:m1,...,mn M:M1,...,Mn o:... o:...]";
    68 piac->RegisterCommand(kw, usage, this, "Fitting");
    69 
    70 kw = "fitw";
    71 usage = "Interactive Window Fit";
    72 usage += "\n Usage: fit nomobj ";
    73 piac->RegisterCommand(kw, usage, this, "Fitting");
    74 
    75 // Je cree une seule copie de PIAFitterWind
    76 // Attention, ca ne marchera pas si on detruit this
    77 if (fwind == NULL)  fwind = new PIAFitterWind(app, this);
    78 }
    79 
    80 /* --Methode-- */
    81 PIAFitter::~PIAFitter()
    82 {
    83 }
    84 
    85 int PIAFitter::Execute(string& kw, vector<string>& tokens)
    86 {
    87 // Fit 1D sur objets 1D. Egalement Fit 2D sur objets 2D.
    88 if (kw == "fit") {
    89   if (tokens.size() < 2) {
    90     cout <<"Usage:fit nomobj func \n"
    91          <<" [p:p1,...,pn s:s1,...,sn m:m1,...,mn M:M1,...,Mn o:... o:...]\n";
    92     return(0);
    93   }
    94   string p=""; string s=""; string m=""; string M=""; string O="";
    95   if (tokens.size()>2)
    96     for(int ip=2;ip<tokens.size();ip++) {
    97       if(tokens[ip].length()<=2) continue;
    98       const char *c = tokens[ip].c_str();
    99       if(c[1]!=':') continue;
    100       if(c[0]=='p')      p=c+2;
    101       else if(c[0]=='s') s=c+2;
    102       else if(c[0]=='m') m=c+2;
    103       else if(c[0]=='M') M=c+2;
    104       else if(c[0]=='o') {O += ","; O += c+2;}
    105     }
    106   Fit12D(tokens[0],tokens[1],p,s,m,M,O);
    107 }
    108 else if (kw == "fitw") {
    109   if (tokens.size() < 1) {
    110     cout << "Usage: fitw nomobj" << endl;
    111     return(0);
    112     }
    113   cout << " *DBG* Affichage PIAFitterWind ** " << endl;
    114   fwind->SetObjName(tokens[0]);
    115   fwind->Show();
    116  }
    117 
    118 return(0);
    119 }
    120 
    121 /* --Methode-- cmv 13/10/98 */
    122 void  PIAFitter::Fit12D(string& nom, string& func,
    123                                string par,string step,string min,string max,
    124                                string opt)
     58////////////////////////////////////////////////////////////////////////
     59//| --------------- Fit Lineaire a 1 et 2 dimensions ---------------
     60//| Syntaxe:
     61//| fitlin nom pnn [o:.aa,bb,cc, o;dd,ee,ff o:gg,hh,jj,kk etc...]
     62//| avec:
     63//| nom  : cf commentaire ordre "fit"
     64//| pnn  : fit polynome degre nn avec classe Poly (lineaire) 1D ou 2D
     65//| o:aa,...,bb : cf commentaires ordre "fit"
     66//|
     67////////////////////////////////////////////////////////////////////////
    12568//| --------------- Fit d'objets a 1 et 2 dimensions ---------------
     69//|                 avec interface d'aide graphique
     70//| Syntaxe:
     71//| fitw nom func
     72//|     [p:p1,p2,...,pn s:s1,s2,...,sn m:m1,m2,...,mn M:M1,mM2,...,Mn f:f1,...,fn]
     73//|     [o:.aa,bb,cc, o;dd,ee,ff o:gg,hh,jj,kk etc...]
     74//| cf commentaire ordre "fit"
     75//|
     76////////////////////////////////////////////////////////////////////////
     77//| --------------- Fit d'objets a 1 et 2 dimensions ---------------
     78//| Syntaxe:
     79//| fit nom func
     80//|     [p:p1,p2,...,pn s:s1,s2,...,sn m:m1,m2,...,mn M:M1,mM2,...,Mn f:f1,...,fn]
     81//|     [o:.aa,bb,cc, o;dd,ee,ff o:gg,hh,jj,kk etc...]
     82//|----- OBJET -----
    12683//| nom  : nom de l'objet qui peut etre:
    12784//|        fit-1D:  Vector,Histo1D,HProf ou GeneraFitData(1D)
    12885//|        fit-2D:  Matrix,Histo2D,Image<T> ou GeneraFitData(2D)
    129 //| func : pnn : fit polynome degre nn avec classe Poly (lineaire) 1D ou 2D
    130 //|      : Pnn : fit polynome degre nn avec GeneralFit (non-lineaire) 1D ou 2D
     86//|
     87//|----- FUNCTION -----
     88//| func : pnn : fit polynome degre nn avec GeneralFit (non-lineaire) 1D ou 2D
    13189//|      : gnn : fit gaussienne (hauteur) + polynome de degre nn 1D
    13290//|      : g   : fit gaussienne (hauteur) 1D
    … …  
    143101//|      : M   : fit Moffat+fond (expos=p6) (volume) 2D
    144102//|      : Mi  : fit Moffat+fond integree (expos=p6) (volume) 2D
    145 //| par  : p1,...,pn : valeur d'initialisation des parametres (def=0)
    146 //| step : s1,...,sn : valeur des steps de depart (def=1)
    147 //| min  : m1,...,mn : valeur des minima (def=1)
    148 //| max  : M1,...,Mn : valeur des maxima (def=-1) (max<=min : pas de limite)
    149 //| opt  : options "Eaa.b,eaa.b,f,r,caa.b,Xaa.b"
     103//|
     104//|----- INIT PARAMETRES ET ETAT DU FIT -----
     105//| p    : p1,...,pn : valeur d'initialisation des parametres (def=0)
     106//| s    : s1,...,sn : valeur des steps de depart (def=1)
     107//| m    : m1,...,mn : valeur des minima (def=1)
     108//| M    : M1,...,Mn : valeur des maxima (def=-1) (max<=min : pas de limite)
     109//| f    : f1,...,fn : si >=1 parametre fixe sinon libre (def=0)
     110//| - Remarque: si pi,si,mi ou Mi = '!' la valeur correspondante n'est pas changee
     111//|
     112//|----- OPTIONS -----
     113//| o    : options "o:Eaa.b,eaa.b,f,r,caa.b,Xaa.b"
     114//|      F : initialisation a partir des resultats et de l'etat du fit precedent
     115//|          (option non prioritaire sur les definitions p:,s:,m:,M:,f:o:)
    150116//|      f : generation d'un Objet identique contenant la fonction fittee
    151117//|      r : generation d'un Objet identique contenant les residus
    152118//|      Xaa.b : aa.b valeur du DXi2 d'arret (def=1.e-3)
    153119//|      Naa : aa nombre maximum d'iterations (def=100)
    154 //|      la.b : niveau "a.b" de print: a=niveau de print Fit1/2D
    155 //|                                    b=niveau de debug GeneralFit
    156 //|      Ii1/i2 numeros des bins X de l'histos utilises pour le fit [i1,i2]
    157 //|2D    Jj1/j2 numeros des bins Y de l'histos utilises pour le fit [j1,j2]
    158 //|      - L'erreur est celle associee a l'objet (si elle existe),
    159 //|        elle est mise a 1 sinon, sauf si E... ou e... est precise:
     120//|      la : niveau "a" de print: a=niveau de print Fit1/2D
     121//|      da : niveau "a" de debug: a=niveau de GeneralFit
     122//|      Ii1/i2 : numeros des bins X de l'histos utilises pour le fit [i1,i2]
     123//|2D    Jj1/j2 : numeros des bins Y de l'histos utilises pour le fit [j1,j2]
     124//|    - L'erreur est celle associee a l'objet (si elle existe),
     125//|      elle est mise a 1 sinon, sauf si E... ou e... est precise:
    160126//|      Eaa.b : si |val|>=1 erreur = aa.b*sqrt(|val|)
    161127//|              si |val|<1  erreur = aa.b
    … …  
    168134//|      x : demande de centrage: on fit x-xc au lieu de x
    169135//|          avec xc=abscisse du milieu de l'histogramme
    170 //|          Actif pour exp+poly 1D, poly 1D
    171 //|                pour gauss+poly 1D, xc est le centre de la gaussienne.
     136//|          Actif pour  exp+poly 1D, poly 1D
     137//|          Pour gauss+poly 1D, xc est le centre de la gaussienne.
    172138//|2D    yaa.b et y : idem "xaa.b et x" mais pour y
    173 {
    174 
     139////////////////////////////////////////////////////////////////////////
     140
     141/* --Methode-- */
     142PIAFitter::PIAFitter(PIACmd *piac, PIStdImgApp* app)
     143: mApp(app), FWindFit(NULL)
     144, mNObj(""), mObj(NULL), mFunc(NULL), mFName(""), mGData(NULL)
     145, mNPar(0), mNVar(0),  mNBinX(0), mNBinY(0), mNData(0)
     146, mPar(1), mStep(1), mMin(1), mMax(1), mFix(1)
     147, mParSave(1), mStepSave(1), mMinSave(1), mMaxSave(1), mFixSave(1)
     148, mFit(NULL)
     149, mV(NULL), mH(NULL), mM(NULL), mH2(NULL), mIm(NULL), mG(NULL)
     150{
     151// Init et Set des options
     152mPar=0.; mStep=1.; mMin=1.; mMax=-1.; mFix=0.;
     153mParSave=0.; mStepSave=1.; mMinSave=1.; mMaxSave=-1.; mFixSave=0.;
     154ResetOptions();
     155mOptSave = mOpt;
     156
     157// enregistrement des ordres de fit
     158string kw, usage;
     159
     160kw = "fit";
     161usage = "Fitting function to DataObjects (Histo, Histo2D, Vector, ...)";
     162usage += "\n Usage: fit nomobj func [Options]";
     163usage += "\n [p:p1,...,pn s:s1,...,sn m:m1,...,mn M:M1,...,Mn o:... o:...]";
     164piac->RegisterCommand(kw,usage,this,"Fitting");
     165
     166kw = "fitw";
     167usage = "Fitting function to DataObjects with Interactive Window Help";
     168usage += "\n Usage: fitw nomobj func [Options]";
     169usage += "\n [p:p1,...,pn s:s1,...,sn m:m1,...,mn M:M1,...,Mn o:... o:...]";
     170piac->RegisterCommand(kw,usage,this,"Fitting");
     171
     172kw = "fitlin";
     173usage = "Linear Fitting of Polynoms to DataObjects";
     174usage += "\n Usage: fitlin nomobj func [o:... o:...]";
     175piac->RegisterCommand(kw,usage,this,"Fitting");
     176}
     177
     178/* --Methode-- */
     179PIAFitter::~PIAFitter()
     180{
     181if(mFit != NULL) {delete mFit; mFit=NULL;}
     182if(mFunc != NULL) {delete mFunc; mFunc=NULL;}
     183if(mGData != NULL) {delete mGData; mGData=NULL;}
     184if(FWindFit != NULL) {delete FWindFit; FWindFit=NULL;}
     185}
     186
     187/* --Methode-- */
     188void PIAFitter::ResetDPointer(void)
     189// Reset des pointeurs sur les donnees
     190{
     191mNObj = ""; mObj=NULL;
     192mV=NULL; mH=NULL; mM=NULL; mH2=NULL; mIm=NULL; mG=NULL;
     193}
     194
     195/* --Methode-- */
     196void PIAFitter::ResetOptions(void)
     197// Reset des options
     198{
     199mOpt.okres = mOpt.okfun = false;
     200mOpt.polcx = mOpt.polcy = 0;
     201mOpt.xc = mOpt.yc = 0.;
     202mOpt.stc2 = 1.e-3;
     203mOpt.nstep = 100;
     204mOpt.err_e = mOpt.err_E = -1.;
     205mOpt.lp = 1; mOpt.lpg = 0;
     206mOpt.i1 = mOpt.j1 = mOpt.i2 = mOpt.j2 = -1;
     207mOpt.fromlastfit = false;
     208}
     209
     210/* --Methode-- */
     211void PIAFitter::DecodeOptions(string opt)
     212// Decodage des options a partir des chaines de caracteres
     213{
     214ResetOptions();
     215if(opt.length()<=0) return;
     216
     217size_t p,q; string dum;
     218opt = "," + opt + ",";
     219
     220if(strstr(opt.c_str(),",F,"))  // init options/param a partir du fit precedent
     221  {mOpt = mOptSave; mOpt.fromlastfit = true;}
     222if(strstr(opt.c_str(),",r,")) mOpt.okres = true;  // residus
     223if(strstr(opt.c_str(),",f,")) mOpt.okfun = true;  // fonction fittee
     224if(strstr(opt.c_str(),",x")) { // Demande de centrage (fit X=x-xc)
     225  mOpt.polcx = 2; // Le centrage est calcule automatiquement
     226  p = opt.find(",x"); q = opt.find_first_of(',',p+1);
     227  dum = opt.substr(p,q-p);
     228  if(dum.length()>2) {
     229    sscanf(dum.c_str(),",x%lf",&mOpt.xc);
     230    mOpt.polcx = 1; // Le centrage est fixe par la valeur lue
     231  }
     232}
     233if(strstr(opt.c_str(),",y")) { // Demande de centrage (fit Y=y-yc)
     234  mOpt.polcy = 2; // Le centrage est calcule automatiquement
     235  p = opt.find(",y"); q = opt.find_first_of(',',p+1);
     236  dum = opt.substr(p,q-p);
     237  if(dum.length()>2) {
     238    sscanf(dum.c_str(),",y%lf",&mOpt.yc);
     239    mOpt.polcy = 1; // Le centrage est fixe par la valeur lue
     240  }
     241}
     242if(strstr(opt.c_str(),",E")) { // Erreurs imposees a "sqrt(val)" ou "aa.b*sqrt(val)"
     243  p = opt.find(",E"); q = opt.find_first_of(',',p+1);
     244  dum = opt.substr(p,q-p);
     245  if(dum.length()>2) sscanf(dum.c_str(),",E%lf",&mOpt.err_E);
     246  if(mOpt.err_E<=0.) mOpt.err_E = 1.;  //mOpt.err_e=-1.;
     247}
     248if(strstr(opt.c_str(),",e")) { // Erreurs imposees a "1" ou "aa.b"
     249  p = opt.find(",e"); q = opt.find_first_of(',',p+1);
     250  dum = opt.substr(p,q-p);
     251  if(dum.length()>2) sscanf(dum.c_str(),",e%lf",&mOpt.err_e);
     252  if(mOpt.err_e<=0.) mOpt.err_e = 1.;  //mOpt.err_E=-1.;
     253}
     254if(strstr(opt.c_str(),",X")) { // Valeur du StopChi2
     255  p = opt.find(",X"); q = opt.find_first_of(',',p+1);
     256  dum = opt.substr(p,q-p);
     257  if(dum.length()>2) sscanf(dum.c_str(),",X%lf",&mOpt.stc2);
     258}
     259if(strstr(opt.c_str(),",N")) { // Nombre maximum d'iterations
     260  p = opt.find(",N"); q = opt.find_first_of(',',p+1);
     261  dum = opt.substr(p,q-p);
     262  if(dum.length()>2) sscanf(dum.c_str(),",N%d",&mOpt.nstep);
     263}
     264if(strstr(opt.c_str(),",l")) { // niveau de print
     265  p = opt.find(",l"); q = opt.find_first_of(',',p+1);
     266  dum = opt.substr(p,q-p);
     267  if(dum.length()>2) sscanf(dum.c_str(),",l%d",&mOpt.lp);
     268}
     269if(strstr(opt.c_str(),",d")) { // niveau de debug du fit
     270  p = opt.find(",d"); q = opt.find_first_of(',',p+1);
     271  dum = opt.substr(p,q-p);
     272  if(dum.length()>2) sscanf(dum.c_str(),",d%d",&mOpt.lpg);
     273}
     274if(strstr(opt.c_str(),",I")) { // intervalle de fit selon X
     275  p = opt.find(",I"); q = opt.find_first_of(',',p+1);
     276  dum = opt.substr(p,q-p);
     277  if(dum.length()>2) sscanf(dum.c_str(),",I%d/%d",&mOpt.i1,&mOpt.i2);
     278}
     279if(strstr(opt.c_str(),",J")) { // intervalle de fit selon Y
     280  p = opt.find(",J"); q = opt.find_first_of(',',p+1);
     281  dum = opt.substr(p,q-p);
     282  if(dum.length()>2) sscanf(dum.c_str(),",J%d/%d",&mOpt.j1,&mOpt.j2);
     283}
     284
     285return;
     286}
     287
     288/* --Methode-- */
     289void PIAFitter::DecodeObject(string obj)
     290// Decodage de l'objet a fitter
     291{
    175292NamedObjMgr omg;
    176 AnyDataObj* obj = omg.GetObj(nom);
    177 if (obj == NULL) {
    178   cout<<"PIAFitter::Fit12D() Error , Pas d'objet de nom "<<nom<<endl;
     293AnyDataObj* mobj = omg.GetObj(obj);
     294if(mobj == NULL)
     295  {cout<<"PIAFitter::DecodeObject Error , Pas d'objet de nom "<<obj<<endl;
     296   return;}
     297
     298// Reset
     299ResetDPointer();
     300mNVar = mNBinX = mNBinY = mNData = 0;
     301
     302mObj = mobj; mNObj = obj;
     303string ctyp = typeid(*mObj).name();
     304
     305// 1D
     306if (typeid(*mObj) == typeid(Vector)) {
     307  mNVar = 1;
     308  mV = (Vector*) mObj; mNBinX = mV->NElts(); mNBinY = 1;
     309  }
     310else if ( (typeid(*mObj) == typeid(HProf)) || (typeid(*mObj) == typeid(Histo)) ) {
     311  mNVar = 1;
     312  mH = (Histo*)  mObj; mNBinX = mH->NBins(); mNBinY = 1;
     313  }
     314// 2D
     315else if (typeid(*mObj) == typeid(Matrix)) {
     316  mNVar = 2;
     317  mM = (Matrix*) mObj; mNBinX = mM->NCol(); mNBinY =mM->NRows();
     318  }
     319else if (typeid(*mObj) == typeid(Histo2D)) {
     320  mNVar = 2;
     321  mH2 = (Histo2D*) mObj; mNBinX = mH2->NBinX(); mNBinY = mH2->NBinY();
     322  }
     323else if (typeid(*mObj) == typeid(GeneralFitData)) {
     324  mG = (GeneralFitData*) mObj; mNBinX = mG->NData(); mNBinY = 1;
     325  if(     mG->NVar()==1) mNVar = 1;
     326  else if(mG->NVar()==2) mNVar = 2;
     327  else
     328     {cout<<"PIAFitter::DecodeObject Error: \n"
     329         <<" GeneralFitData ne peut avoir que 1 ou 2 variables d'abscisse: "
     330         <<((GeneralFitData*) mObj)->NVar()<<endl;
     331     return;}
     332  }
     333else if (dynamic_cast<RzImage*>(mObj)) {
     334  mNVar = 2;
     335  mIm = (RzImage*) mObj; mNBinX = mIm->XSize(); mNBinY = mIm->YSize();
     336  }
     337else {
     338  cout<<"PIAFitter::DecodeObject Error , Objet n'est pas un "
     339      <<"Histo1D/HProf/Vector/Histo2D/Image/Matrix/GeneralFitData "<<ctyp<<endl;
    179340  return;
    180 }
    181 if(func.length()<=0)
    182   {cout<<"PIAFitter::Fit12D() Donnez un nom de fonction a fitter."<<endl;
    183    return;}
    184 string ctyp = typeid(*obj).name();
    185 
    186 int ndim = 0, nbinx=0, nbiny=0, ndata = 0;
    187 Vector* v = NULL; Histo* h = NULL;
    188 Matrix* m = NULL; Histo2D* h2 = NULL; RzImage* im = NULL;
    189 GeneralFitData* g = NULL;
    190 
    191   // 1D
    192 if (typeid(*obj) == typeid(Vector)) {
    193   ndim = 1;
    194   v = (Vector*) obj; nbinx = v->NElts(); nbiny = 1;
    195   }
    196 else if ( (typeid(*obj) == typeid(HProf)) || (typeid(*obj) == typeid(Histo)) ) {
    197   ndim = 1;
    198   h = (Histo*)  obj; nbinx = h->NBins(); nbiny = 1;
    199   }
    200 else if (typeid(*obj) == typeid(Matrix)) {
    201   ndim = 2;
    202   m = (Matrix*) obj; nbinx = m->NCol(); nbiny = m->NRows();
    203   }
    204 else if (typeid(*obj) == typeid(Histo2D)) {
    205   ndim = 2;
    206   h2 = (Histo2D*) obj; nbinx = h2->NBinX(); nbiny = h2->NBinY();
    207   }
    208 else if (typeid(*obj) == typeid(GeneralFitData)) {
    209   g = (GeneralFitData*) obj; nbinx = g->NData(); nbiny = 1;
    210   if(     g->NVar()==1) ndim = 1;
    211   else if(g->NVar()==2) ndim = 2;
    212   else {
    213      cout<<"GeneralFitData ne peut avoir que 1 ou 2 variables d'abscisse: "
    214          <<((GeneralFitData*) obj)->NVar()<<endl; return; }
    215   }
    216 else if (dynamic_cast<RzImage*>(obj)) {
    217   ndim = 2;
    218   im = (RzImage*) obj; nbinx = im->XSize(); nbiny = im->YSize();
    219   }
    220 else  {
    221   cout<<"PIAFitter::Fit12D() Error , Objet n'est pas un "
    222       <<"Histo1D/HProf/Vector/Histo2D/Image/Matrix/GeneralFitData "<<ctyp<<endl;
    223   return;
    224   }
    225 
    226 ndata = nbinx*nbiny;
    227 if(ndata<=0)
    228   {cout<<"L'objet a "<<nbinx<<","<<nbiny<<" bins ("<<ndata<<")"<<endl; return;}
    229 
    230 // Decodage des options et des parametres, mise en forme
    231 Vector Par(1); Vector Step(1); Vector Min(1); Vector Max(1); DFOPTIONS O;
    232 DecodeFitsOptions(par,step,min,max,opt,Par,Step,Min,Max,O);
    233 O.i1 = (O.i1<0||O.i1>=nbinx)? 0: O.i1;
    234 O.i2 = (O.i2<0||O.i2>=nbinx||O.i2<O.i1)? nbinx-1: O.i2;
    235 if(ndim>=2) {
    236   O.j1 = (O.j1<0||O.j1>=nbiny)? 0: O.j1;
    237   O.j2 = (O.j2<0||O.j2>=nbiny||O.j2<O.j1)? nbiny-1: O.j2;
    238 } else O.j2 = O.j1 = 0;
    239 if(O.polcx==2) {
    240   if(v||m)    O.xc = (O.i2-O.i1+1)/2.;
    241   else if(h)  O.xc = (h->XMin()+h->XMax())/2.;
    242   else if(h2) O.xc = (h2->XMin()+h2->XMax())/2.;
    243   else if(g)  {double mini,maxi; g->GetMinMax(2,mini,maxi); O.xc=(mini+maxi)/2.;}
    244   else if(im) {O.xc = im->XOrg() * im->XPxSize()*(O.i2-O.i1+1)/2.;}
    245 }
    246 if(O.polcy==2 && ndim>=2) {
    247   if(m)  O.yc = (O.j2-O.j1+1)/2.;
    248   if(h2) O.yc = (h2->YMin()+h2->YMax())/2.;
    249   if(g)  {double mini,maxi; g->GetMinMax(12,mini,maxi); O.yc=(mini+maxi)/2.;}
    250   if(im) {O.yc = im->YOrg() * im->YPxSize()*(O.j2-O.j1+1)/2.;}
    251 }
    252 if(O.lp>0)
    253   cout<<"Fit["<<nbinx<<","<<nbiny<<"] ("<<ndata<<") dim="<<ndim<<":"
    254       <<" Int=["<<O.i1<<","<<O.i2<<"],["<<O.j1<<","<<O.j2<<"]"<<endl
    255       <<" Cent="<<O.polcx<<","<<O.polcy<<","<<O.xc<<"+x"<<","<<O.yc<<"+y"
    256       <<" TypE="<<O.err_e<<","<<O.err_E
    257       <<" StpX2="<<O.stc2<<" Nstep="<<O.nstep
    258       <<" lp,lpg="<<O.lp<<","<<O.lpg<<endl;
    259 
    260 ///////////////////////////////////
    261 // Remplissage de GeneralFitData //
    262 ///////////////////////////////////
    263 GeneralFitData mydata(ndim,ndata,0);
    264 {for(int i=O.i1;i<=O.i2;i++) for(int j=O.j1;j<=O.j2;j++) {
    265   double x,y,f,e;
    266 
    267   if(v)
    268     {x= (double) i; f=(*v)(i); e=1.;}
    269   else if(h)
    270     {x=h->BinCenter(i); f=(*h)(i); e=(h->HasErrors())?h->Error(i):1.;}
    271   else if(m)
    272     {x=(double) i; y=(double) j; f=(*m)(j,i); e=1.;}
    273   else if(h2)
    274     {float xf,yf; h2->BinCenter(i,j,xf,yf); x=(double)xf; y=(double)yf;
    275      f=(*h2)(i,j); e=(h2->HasErrors())?h2->Error(i,j):1.;}
    276   else if(im)
    277     {x=im->XOrg()+(i+0.5)*im->XPxSize(); y=im->YOrg()+(j+0.5)*im->YPxSize();
    278      f=im->DValue(i,j); e=1.;}
    279   else if(g&&ndim==1) {x= g->X(i); f=g->Val(i); e=g->EVal(i);}
    280   else if(g&&ndim==2) {x= g->X(i); y= g->Y(i); f=g->Val(i); e=g->EVal(i);}
     341  }
     342
     343mNData = mNBinX*mNBinY;
     344if(mNData<=0) {
     345  cout<<"L'objet a "<<mNBinX<<","<<mNBinY<<" bins ("<<mNData<<")"<<endl;
     346  return;
     347}
     348
     349return;
     350}
     351
     352/* --Methode-- */
     353void PIAFitter::CheckOptions(void)
     354// Check consistence des choix des options
     355// ATTENTION: cette methode a besoin que l'objet a fitter soit deja lu
     356{
     357if(mOpt.lp<0) mOpt.lp = 0;
     358if(mOpt.lpg<0) mOpt.lpg = 0;
     359mOpt.i1 = (mOpt.i1<0||mOpt.i1>=mNBinX)? 0: mOpt.i1;
     360mOpt.i2 = (mOpt.i2<0||mOpt.i2>=mNBinX||mOpt.i2<mOpt.i1)? mNBinX-1: mOpt.i2;
     361if(mNVar>=2) {
     362  mOpt.j1 = (mOpt.j1<0||mOpt.j1>=mNBinY)? 0: mOpt.j1;
     363  mOpt.j2 = (mOpt.j2<0||mOpt.j2>=mNBinY||mOpt.j2<mOpt.j1)? mNBinY-1: mOpt.j2;
     364} else mOpt.j2 = mOpt.j1 = 0;
     365if(mOpt.polcx==2) {
     366  if(mV||mM)   mOpt.xc = (mOpt.i2-mOpt.i1+1)/2.;
     367  else if(mH)  mOpt.xc = (mH->XMin()+mH->XMax())/2.;
     368  else if(mH2) mOpt.xc = (mH2->XMin()+mH2->XMax())/2.;
     369  else if(mG)  {double mini,maxi; mG->GetMinMax(2,mini,maxi); mOpt.xc=(mini+maxi)/2.;}
     370  else if(mIm) {mOpt.xc = mIm->XOrg() * mIm->XPxSize()*(mOpt.i2-mOpt.i1+1)/2.;}
     371}
     372if(mOpt.polcy==2 && mNVar>=2) {
     373  if(mM)  mOpt.yc = (mOpt.j2-mOpt.j1+1)/2.;
     374  if(mH2) mOpt.yc = (mH2->YMin()+mH2->YMax())/2.;
     375  if(mG)  {double mini,maxi; mG->GetMinMax(12,mini,maxi); mOpt.yc=(mini+maxi)/2.;}
     376  if(mIm) {mOpt.yc = mIm->YOrg() * mIm->YPxSize()*(mOpt.j2-mOpt.j1+1)/2.;}
     377}
     378if(mOpt.err_e>0.) mOpt.err_E=-1.;
     379if(mOpt.err_E>0.) mOpt.err_e =-1.;
     380if(mOpt.stc2<=0.) mOpt.stc2 = 1.e-3;
     381if(mOpt.nstep<2) mOpt.nstep = 100;
     382
     383return;
     384}
     385
     386/* --Methode-- */
     387void PIAFitter::PrintOptions(void)
     388// Print des options
     389{
     390cout<<"Fit["<<mNBinX<<","<<mNBinY<<"] ("<<mNData<<") dim="<<mNVar<<":"
     391    <<" Int=["<<mOpt.i1<<","<<mOpt.i2<<"],["<<mOpt.j1<<","<<mOpt.j2<<"]"<<endl
     392    <<" Cent="<<mOpt.polcx<<","<<mOpt.polcy<<","<<mOpt.xc<<"+x"<<","<<mOpt.yc<<"+y"
     393    <<" TypE="<<mOpt.err_e<<","<<mOpt.err_E
     394    <<" StpX2="<<mOpt.stc2<<" Nstep="<<mOpt.nstep<<" Init.LFit="<<mOpt.fromlastfit
     395    <<" lp,lpg="<<mOpt.lp<<","<<mOpt.lpg<<endl;
     396return;
     397}
     398
     399/* --Methode-- */
     400void PIAFitter::FillGData(void)
     401// Fill generalfitdata pour le fit
     402// ATTENTION: cette methode a besoin que les options soient decodees et checkees
     403{
     404if(mNData<=0) return;
     405if(mGData!=NULL) {delete mGData; mGData=NULL;}
     406mGData = new GeneralFitData(mNVar,mNData,0);
     407
     408for(int i=mOpt.i1;i<=mOpt.i2;i++) for(int j=mOpt.j1;j<=mOpt.j2;j++) {
     409  double x,y=0.,f,e;
     410
     411  if(mV)
     412    {x= (double) i; f=(*mV)(i); e=1.;}
     413  else if(mH)
     414    {x=mH->BinCenter(i); f=(*mH)(i); e=(mH->HasErrors())?mH->Error(i):1.;}
     415  else if(mM)
     416    {x=(double) i; y=(double) j; f=(*mM)(j,i); e=1.;}
     417  else if(mH2)
     418    {float xf,yf; mH2->BinCenter(i,j,xf,yf); x=(double)xf; y=(double)yf;
     419     f=(*mH2)(i,j); e=(mH2->HasErrors())?mH2->Error(i,j):1.;}
     420  else if(mIm)
     421    {x=mIm->XOrg()+(i+0.5)*mIm->XPxSize(); y=mIm->YOrg()+(j+0.5)*mIm->YPxSize();
     422     f=mIm->DValue(i,j); e=1.;}
     423  else if(mG&&mNVar==1) {x= mG->X(i); f=mG->Val(i); e=mG->EVal(i);}
     424  else if(mG&&mNVar==2) {x= mG->X(i); y=mG->Y(i); f=mG->Val(i); e=mG->EVal(i);}
    281425  else x=y=f=e=0.;
    282426
    283427  // Gestion des erreurs a utiliser
    284   if(O.err_e>0.) e=O.err_e;
    285   else if(O.err_E>0.) {e=(f<-1.||f>1.)?O.err_E*sqrt(fabs(f)):O.err_E;}
    286 
    287   // Remplissage de generalfit
    288   if(func[0]=='p') {x -= O.xc; if(ndim>=2) y -= O.yc;}
    289   if(ndim==1)      mydata.AddData1(x,f,e);
    290   else if(ndim==2) mydata.AddData2(x,y,f,e);
    291 }}
    292 if(mydata.NData()<=0)
    293   {cout<<"Pas de donnees dans GeneralFitData: "<<mydata.NData()<<endl;
    294    return;}
    295 if(O.lpg>1) {
    296   mydata.PrintStatus();
    297   mydata.PrintData(0);
    298   mydata.PrintData(mydata.NData()-1);
    299 }
    300 
    301 ////////////////////////////////////////////
    302 // Identification de la fonction a fitter //
    303 ////////////////////////////////////////////
    304 GeneralFunction* myfunc = NULL;
    305 if(func[0]=='p' && ndim==1) {
    306   // Fit de polynome sans passer par les GeneralFit
    307   int degre = 0;
    308   if(func.length()>1) sscanf(func.c_str()+1,"%d",&degre);
    309   cout<<"Fit (lineaire) 1D polynome de degre "<<degre<<endl;
    310   Poly p1(0);
    311   double c2rl = mydata.PolFit(0,p1,degre);
    312   cout<<"C2r_lineaire = "<<c2rl<<endl;
    313   if(O.lp>0) cout<<p1<<endl;
     428  if(mOpt.err_e>0.) e=mOpt.err_e;
     429  else if(mOpt.err_E>0.) {e=(f<-1.||f>1.)?mOpt.err_E*sqrt(fabs(f)):mOpt.err_E;}
     430
     431  // Remplissage de generalfitdata
     432  if(mFName[0]=='p') {x -= mOpt.xc; if(mNVar>=2) y -= mOpt.yc;}
     433  if(mNVar==1)      mGData->AddData1(x,f,e);
     434  else if(mNVar==2) mGData->AddData2(x,y,f,e);
     435}
     436
     437if(mGData->NData()<=0) {
     438  cout<<"Pas de donnees dans GeneralFitData: "<<mGData->NData()<<endl;
    314439  return;
    315 
    316 } else if(func[0]=='P' && ndim==1) {
    317   // Fit de polynome
     440}
     441
     442if(mOpt.lpg>1) {
     443  mGData->PrintStatus();
     444  mGData->PrintData(0);
     445  mGData->PrintData(mGData->NData()-1);
     446}
     447
     448return;
     449}
     450
     451/* --Methode-- */
     452void PIAFitter::DecodeFunction(string func)
     453// Fonction a fitter
     454// ATTENTION: cette methode a besoin que les donnees soient lues
     455{
     456if(func.length()<=0) {
     457  cout<<"PIAFitter::DecodeFunction Donnez un nom de fonction a fitter."<<endl;
     458  return;
     459}
     460if(mFunc!=NULL) {delete mFunc; mFunc=NULL;}
     461
     462mNPar=0;
     463mFName = func;
     464
     465if(func[0]=='p' && mNVar==1) { //polynome
    318466  int degre = 0;
    319467  if(func.length()>1) sscanf(func.c_str()+1,"%d",&degre);
    320468  cout<<"Fit polynome 1D de degre "<<degre<<endl;
    321   Polyn1D* myf = new Polyn1D(degre,O.xc);
    322   myfunc = myf;
    323 
    324 } else if(func[0]=='e' && ndim==1) {
    325   // Fit d'exponentielle
     469  Polyn1D* myf = new Polyn1D(degre,mOpt.xc);
     470  mFunc = myf; mNPar = mFunc->NPar();
     471
     472} else if(func[0]=='e' && mNVar==1) { //exponentielle
    326473  int degre =-1;
    327474  if(func.length()>1) sscanf(func.c_str()+1,"%d",&degre);
    328475  cout<<"Fit d'exponentielle+polynome 1D de degre "<<degre<<endl;
    329476  Exp1DPol* myf;
    330   if(degre>=0) myf = new Exp1DPol((unsigned int)degre,O.xc);
    331        else    myf = new Exp1DPol(O.xc);
    332   myfunc = myf;
    333 
    334 } else if(func[0]=='g' && ndim==1) {
    335   // Fit de gaussienne en hauteur
     477  if(degre>=0) myf = new Exp1DPol((unsigned int)degre,mOpt.xc);
     478       else    myf = new Exp1DPol(mOpt.xc);
     479  mFunc = myf; mNPar = mFunc->NPar();
     480
     481} else if(func[0]=='g' && mNVar==1) { //gaussienne en hauteur
    336482  int degre =-1;
    337483  if(func.length()>1) sscanf(func.c_str()+1,"%d",&degre);
    338484  cout<<"Fit de Gaussienne_en_hauteur+polynome 1D de degre "<<degre<<endl;
    339485  Gauss1DPol* myf;
    340   if(degre>=0) myf = new Gauss1DPol((unsigned int)degre,((O.polcx)?true:false));
    341   else { bool bfg = (O.polcx)?true:false;   myf = new Gauss1DPol(bfg); }
    342   myfunc = myf;
    343 
    344 } else if(func[0]=='G' && ndim==1) {
    345   // Fit de gaussienne en volume
     486  if(degre>=0) myf = new Gauss1DPol((unsigned int)degre,((mOpt.polcx)?true:false));
     487  else { bool bfg = (mOpt.polcx)?true:false;   myf = new Gauss1DPol(bfg); }
     488  mFunc = myf; mNPar = mFunc->NPar();
     489
     490} else if(func[0]=='G' && mNVar==1) { //gaussienne en volume
    346491  int degre =-1;
    347492  if(func.length()>1) sscanf(func.c_str()+1,"%d",&degre);
    348493  cout<<"Fit de Gaussienne_en_volume+polynome 1D de degre "<<degre<<endl;
    349494  GaussN1DPol* myf;
    350   if(degre>=0) myf = new GaussN1DPol((unsigned int)degre,((O.polcx)?true:false));
    351   else  { bool bfg = (O.polcx)?true:false;   myf = new GaussN1DPol(bfg); }
    352   myfunc = myf;
    353 
    354 } else if(func[0]=='p' && ndim==2) {
    355   // Fit de polynome 2D sans passer par les GeneralFit
    356   int degre = 0;
    357   if(func.length()>1) sscanf(func.c_str()+1,"%d",&degre);
    358   cout<<"Fit (lineaire) polynome 2D de degre "<<degre<<endl;
    359   Poly2 p2(0);
    360   double c2rl = mydata.PolFit(0,1,p2,degre);
    361   cout<<"C2r_lineaire = "<<c2rl<<endl;
    362   if(O.lp>0) cout<<p2<<endl;
    363   return;
    364 
    365 } else if(func[0]=='P' && ndim==2) {
    366   // Fit de polynome 2D
     495  if(degre>=0) myf = new GaussN1DPol((unsigned int)degre,((mOpt.polcx)?true:false));
     496  else  { bool bfg = (mOpt.polcx)?true:false;   myf = new GaussN1DPol(bfg); }
     497  mFunc = myf; mNPar = mFunc->NPar();
     498
     499} else if(func[0]=='p' && mNVar==2) { //polynome 2D
    367500  int degre = 0;
    368501  if(func.length()>1) sscanf(func.c_str()+1,"%d",&degre);
    369502  cout<<"Fit polynome 2D de degre "<<degre<<endl;
    370   Polyn2D* myf = new Polyn2D(degre,O.xc,O.yc);
    371   myfunc = myf;
    372 
    373 } else if(func[0]=='G' && ndim==2) {
    374   // Fit de gaussienne+fond en volume
     503  Polyn2D* myf = new Polyn2D(degre,mOpt.xc,mOpt.yc);
     504  mFunc = myf; mNPar = mFunc->NPar();
     505
     506} else if(func[0]=='G' && mNVar==2) { //gaussienne+fond en volume
    375507  int integ = 0;
    376508  if(func.length()>1) if(func[1]=='i') integ=1;
    377509  cout<<"Fit de Gaussienne+Fond 2D integ="<<integ<<endl;
    378   if(integ) {GauRhInt2D* myf = new GauRhInt2D; myfunc = myf;}
    379     else    {GauRho2D* myf = new GauRho2D; myfunc = myf;}
    380 
    381 } else if(func[0]=='d' && ndim==2) {
    382   // Fit de DL gaussienne+fond en volume
     510  if(integ) {GauRhInt2D* myf = new GauRhInt2D; mFunc = myf;}
     511    else    {GauRho2D* myf = new GauRho2D; mFunc = myf;}
     512  mNPar = mFunc->NPar();
     513
     514} else if(func[0]=='d' && mNVar==2) { //DL gaussienne+fond en volume
    383515  int integ = 0;
    384516  if(func.length()>1) if(func[1]=='i') integ=1;
    385517  cout<<"Fit de DL de Gaussienne+Fond 2D integ="<<integ<<endl;
    386   if(integ) {GdlRhInt2D* myf = new GdlRhInt2D; myfunc = myf;}
    387     else    {GdlRho2D* myf = new GdlRho2D; myfunc = myf;}
    388 
    389 } else if(func[0]=='D' && ndim==2) {
    390   // Fit de DL gaussienne+fond avec coeff variable p6 en volume
     518  if(integ) {GdlRhInt2D* myf = new GdlRhInt2D; mFunc = myf;}
     519    else    {GdlRho2D* myf = new GdlRho2D; mFunc = myf;}
     520  mNPar = mFunc->NPar();
     521
     522} else if(func[0]=='D' && mNVar==2) { //DL gaussienne+fond avec coeff variable p6 en volume
    391523  int integ = 0;
    392524  if(func.length()>1) if(func[1]=='i') integ=1;
    393525  cout<<"Fit de DL de Gaussienne+Fond avec coeff variable (p6) 2D integ="<<integ<<endl;
    394   if(integ) {Gdl1RhInt2D* myf = new Gdl1RhInt2D; myfunc = myf;}
    395     else    {Gdl1Rho2D* myf = new Gdl1Rho2D; myfunc = myf;}
    396 
    397 } else if(func[0]=='M' && ndim==2) {
    398   // Fit de Moffat+fond (volume)
     526  if(integ) {Gdl1RhInt2D* myf = new Gdl1RhInt2D; mFunc = myf;}
     527    else    {Gdl1Rho2D* myf = new Gdl1Rho2D; mFunc = myf;}
     528  mNPar = mFunc->NPar();
     529
     530} else if(func[0]=='M' && mNVar==2) { //Moffat+fond (volume)
    399531  int integ = 0;
    400532  if(func.length()>1) if(func[1]=='i') integ=1;
    401533  cout<<"Fit de Moffat+Fond (expos=p6) 2D integ="<<integ<<endl;
    402   if(integ) {MofRhInt2D* myf = new MofRhInt2D; myfunc = myf;}
    403     else    {MofRho2D* myf = new MofRho2D; myfunc = myf;}
     534  if(integ) {MofRhInt2D* myf = new MofRhInt2D; mFunc = myf;}
     535    else    {MofRho2D* myf = new MofRho2D; mFunc = myf;}
     536  mNPar = mFunc->NPar();
    404537
    405538} else {
    406   cout<<"Fonction "<<func<<" inconnue pour la dim "<<ndim<<endl;
     539  cout<<"Fonction "<<func<<" inconnue pour la dim "<<mNVar<<endl;
     540  mNPar = 0;
    407541  return;
    408542}
    409543
    410 /////////////////////////
    411 // Fit avec generalfit //
    412 /////////////////////////
    413 if(myfunc->NPar()>Par.NElts())
    414   {cout<<"Trop de parametres: "<<myfunc->NPar()<<">"<<Par.NElts()<<endl;
    415   if(myfunc) delete myfunc; return;}
    416 GeneralFit myfit(myfunc);
    417 myfit.SetDebug(O.lpg);
    418 myfit.SetData(&mydata);
    419 myfit.SetStopChi2(O.stc2);
    420 myfit.SetMaxStep(O.nstep);
    421 {for(int i=0;i<myfunc->NPar();i++) {
     544return;
     545}
     546
     547/* --Methode-- */
     548void PIAFitter::ReSetParam(void)
     549// Pour (re)dimensionner les tableaux des parametres
     550// ATTENTION: cette methode a besoin que la fonction soit connue
     551{
     552if(mNPar==0) return;
     553mPar.Realloc(mNPar);  mPar=0.;
     554mStep.Realloc(mNPar); mStep=1.;
     555mMin.Realloc(mNPar);  mMin=1.;
     556mMax.Realloc(mNPar);  mMax=-1.;
     557mFix.Realloc(mNPar);  mFix=0.;
     558return;
     559}
     560
     561/* --Methode-- */
     562void PIAFitter::InitParFromLastFit(void)
     563// Initialisation du fit a partir des resultats du fit precedent
     564// (Les arguments de la ligne de commande sont prioritaires)
     565// ATTENTION: cette methode a besoin que la fonction soit connue
     566{
     567if(mNPar==0) return;
     568int n = mParSave.NElts();
     569if(n==0) return;
     570
     571for(int i=0;i<mNPar;i++) {
     572  if(i>=n) break;
     573  mPar(i)  = mParSave(i);
     574  mStep(i) = mStepSave(i);
     575  mMin(i)  = mMinSave(i);
     576  mMax(i)  = mMaxSave(i);
     577  mFix(i)  = mFixSave(i);
     578}
     579
     580return;
     581}
     582
     583/* --Methode-- */
     584void PIAFitter::DecodeParam(string par,string step,string min,string max,string fix)
     585// Decodage des parametres
     586// ATTENTION: cette methode a besoin que la fonction soit connue
     587//                            et que les options soient decodees
     588{
     589if(mNPar==0) return;
     590ReSetParam();
     591if(mOpt.fromlastfit) InitParFromLastFit();
     592Vector* v=NULL; string* s=NULL;
     593for(int j=0;j<5;j++) {
     594  if(j==0) {v=&mPar; s=&par;} else if(j==1) {v=&mStep; s=&step;}
     595  else if(j==2) {v=&mMin; s=&min;} else if(j==3) {v=&mMax; s=&max;}
     596  else if(j==4) {v=&mFix; s=&fix;}
     597  if(s->length()>0) *s += ",";
     598  for(int i=0;i<mNPar;i++) {
     599    if(s->length()<=0) break;
     600    if((*s)[0]!='!') sscanf(s->c_str(),"%lf",&(*v)(i));
     601    size_t p = s->find_first_of(',') + 1;
     602    if(p>=s->length()) *s = ""; else *s = s->substr(p);
     603  }
     604}
     605return;
     606}
     607
     608/* --Methode-- */
     609int PIAFitter::DoFit(void)
     610// Fit avec generalfit
     611{
     612if(mNPar==0) return -1000;
     613if(mFunc==NULL || mGData==NULL) {
     614  cout<<"PIAFitter::DoFit error: mFunc="<<mFunc<<" mGData="<<mGData<<endl;
     615  return -1001;
     616}
     617// classe GeneraFit
     618if(mFit != NULL) {delete mFit; mFit= NULL;}
     619mFit= new GeneralFit(mFunc);
     620// Options et Set de GeneralFit
     621mFit->SetDebug(mOpt.lpg);
     622mFit->SetData(mGData);
     623mFit->SetStopChi2(mOpt.stc2);
     624mFit->SetMaxStep(mOpt.nstep);
     625{for(int i=0;i<mFunc->NPar();i++) {
    422626  char str[10];
    423627  sprintf(str,"P%d",i);
    424   myfit.SetParam(i,str,Par(i),Step(i),Min(i),Max(i));
     628  mFit->SetParam(i,str,mPar(i),mStep(i),mMin(i),mMax(i));
     629  if((int)(mFix(i)+0.001)>=1.) mFit->SetFix(i);
    425630}}
    426 if(O.lp>1) myfit.PrintFit();
     631if(mOpt.lp>1) mFit->PrintFit();
     632
     633// Fit
     634mParSave = mPar;
     635mStepSave = mStep; mMinSave = mMin; mMaxSave = mMax; mFixSave = mFix;
     636mOptSave = mOpt;
    427637double c2r = -1.;
    428 int rcfit = (double) myfit.Fit();
    429 if(O.lp>0) myfit.PrintFit();
     638int rcfit = mFit->Fit();
     639if(mOpt.lp>0) mFit->PrintFit();
    430640if(rcfit>0) {
    431   c2r = myfit.GetChi2Red();
    432   cout<<"C2r_Reduit = "<<c2r<<" nstep="<<myfit.GetNStep()<<" rc="<<rcfit<<endl;
    433   Vector ParFit(myfunc->NPar());
    434   for(int i=0;i<myfunc->NPar();i++) ParFit(i)=myfit.GetParm(i);
     641  c2r = mFit->GetChi2Red();
     642  cout<<"C2r_Reduit = "<<c2r<<" nstep="<<mFit->GetNStep()<<" rc="<<rcfit<<endl;
     643  for(int i=0;i<mFunc->NPar();i++) mParSave(i)=mFit->GetParm(i);
    435644} else {
    436   cout<<"echec Fit, rc = "<<rcfit<<"  nstep="<<myfit.GetNStep()<<endl;
    437   myfit.PrintFitErr(rcfit);
    438 }
    439 
    440 // Mise a disposition des resultats
    441 if(rcfit>=0 && myfunc && (O.okres>0||O.okfun>0)) {
    442   string nomres = nom + "res";
    443   string nomfun = nom + "fun";
    444   if(v) {
    445     if(O.okres) {Vector* ob = v->FitResidus(myfit);  if(ob) omg.AddObj(ob,nomres);}
    446     if(O.okfun) {Vector* ob = v->FitFunction(myfit); if(ob) omg.AddObj(ob,nomfun);}
    447   } else if(h) {
    448     if(O.okres) {Histo* ob = h->FitResidus(myfit);  if(ob) omg.AddObj(ob,nomres);}
    449     if(O.okfun) {Histo* ob = h->FitFunction(myfit); if(ob) omg.AddObj(ob,nomfun);}
    450   } else if(m) {
    451     if(O.okres) {Matrix* ob = m->FitResidus(myfit);  if(ob) omg.AddObj(ob,nomres);}
    452     if(O.okfun) {Matrix* ob = m->FitFunction(myfit); if(ob) omg.AddObj(ob,nomfun);}
    453   } else if(h2) {
    454     if(O.okres) {Histo2D* ob = h2->FitResidus(myfit);  if(ob) omg.AddObj(ob,nomres);}
    455     if(O.okfun) {Histo2D* ob = h2->FitFunction(myfit); if(ob) omg.AddObj(ob,nomfun);}
    456   } else if(im) {
    457     if(O.okres) {RzImage* ob = im->FitResidus(myfit);  if(ob) omg.AddObj(ob,nomres);}
    458     if(O.okfun) {RzImage* ob = im->FitFunction(myfit); if(ob) omg.AddObj(ob,nomfun);}
    459   } else if(g) {
    460     if(O.okres) {GeneralFitData* ob = g->FitResidus(myfit);  if(ob) omg.AddObj(ob,nomres);}
    461     if(O.okfun) {GeneralFitData* ob = g->FitFunction(myfit); if(ob) omg.AddObj(ob,nomfun);}
    462   }
    463 }
    464 
    465 // Nettoyage
    466 if(myfunc) delete myfunc;
    467 return;
    468 }
    469 
    470 
    471 /* --Function static propre aux routines de fit 1D et 2D-- cmv 13/10/98 */
    472 void PIAFitter::DecodeFitsOptions(string par,string step,string min,string max,string opt
    473                       ,Vector& Par,Vector& Step,Vector& Min,Vector& Max,DFOPTIONS& O)
    474 //| Pour decoder les "string" et remplir les vecteurs du fit (cf commentaires dans Fit1D)
    475 {
    476 // set des vecteurs et decodage des string correspondantes
    477 int NParMax = 100;
    478 Par.Realloc(NParMax); Step.Realloc(NParMax);
    479 Min.Realloc(NParMax); Max.Realloc(NParMax);
    480 {
    481   Vector* v=NULL; string* s=NULL;
    482   {for(int i=0;i<NParMax;i++) {Par(i)=0.; Step(i)=1.; Min(i)=1.; Max(i)=-1.;}}
    483   for(int j=0;j<4;j++) {
    484     if(j==0)      {v=&Par; s=&par;}
    485     else if(j==1) {v=&Step; s=&step;}
    486     else if(j==2) {v=&Min; s=&min;}
    487     else if(j==3) {v=&Max; s=&max;}
    488     if(s->length()>0) *s += ",";
    489     for(int i=0;i<NParMax;i++) {
    490       if(s->length()<=0) break;
    491       sscanf(s->c_str(),"%lf",&(*v)(i));
    492       size_t p = s->find_first_of(',') + 1;
    493       if(p>=s->length()) *s = ""; else *s = s->substr(p);
    494     }
    495   }
    496 }
    497 
    498 // Decodage de options de opt
    499 O.okres = O.okfun = 0;
    500 O.polcx = O.polcy = 0;
    501 O.xc = O.yc = 0.;
    502 O.stc2 = 1.e-3;
    503 O.nstep = 100;
    504 O.err_e = O.err_E = -1.;
    505 O.lp = 1; O.lpg = 0;
    506 O.i1 = O.j1 = O.i2 = O.j2 = -1;
    507 
    508 if(opt.length()<=0) return;
    509 opt = "," + opt + ",";
    510 
    511 if(strstr(opt.c_str(),",r,")) O.okres = 1;  // residus
    512 if(strstr(opt.c_str(),",f,")) O.okfun = 1;  // fonction fittee
    513 if(strstr(opt.c_str(),",x")) { // Demande de centrage (fit X=x-xc)
    514   O.polcx = 2; // Le centrage est calcule automatiquement
    515   size_t p = opt.find(",x");
    516   size_t q = opt.find_first_of(',',p+1);
    517   string dum = opt.substr(p,q-p);
    518   if(dum.length()>2) {
    519     sscanf(dum.c_str(),",x%lf",&O.xc);
    520     O.polcx = 1; // Le centrage est fixe par la valeur lue
    521   }
    522 }
    523 if(strstr(opt.c_str(),",y")) { // Demande de centrage (fit Y=y-yc)
    524   O.polcy = 2; // Le centrage est calcule automatiquement
    525   size_t p = opt.find(",y");
    526   size_t q = opt.find_first_of(',',p+1);
    527   string dum = opt.substr(p,q-p);
    528   if(dum.length()>2) {
    529     sscanf(dum.c_str(),",y%lf",&O.yc);
    530     O.polcy = 1; // Le centrage est fixe par la valeur lue
    531   }
    532 }
    533 if(strstr(opt.c_str(),",E")) { // Erreurs imposees a "sqrt(val)" ou "aa.b*sqrt(val)"
    534   size_t p = opt.find(",E");
    535   size_t q = opt.find_first_of(',',p+1);
    536   string dum = opt.substr(p,q-p);
    537   if(dum.length()>2) sscanf(dum.c_str(),",E%lf",&O.err_E);
    538   if(O.err_E<=0.) O.err_E = 1.;
    539   O.err_e=-1.;
    540 }
    541 if(strstr(opt.c_str(),",e")) { // Erreurs imposees a "1" ou "aa.b"
    542   size_t p = opt.find(",e");
    543   size_t q = opt.find_first_of(',',p+1);
    544   string dum = opt.substr(p,q-p);
    545   if(dum.length()>2) sscanf(dum.c_str(),",e%lf",&O.err_e);
    546   if(O.err_e<=0.) O.err_e = 1.;
    547   O.err_E=-1.;
    548 }
    549 if(strstr(opt.c_str(),",X")) { // Valeur du StopChi2
    550   size_t p = opt.find(",X");
    551   size_t q = opt.find_first_of(',',p+1);
    552   string dum = opt.substr(p,q-p);
    553   if(dum.length()>2) sscanf(dum.c_str(),",X%lf",&O.stc2);
    554   if(O.stc2<=0.) O.stc2 = 1.e-3;
    555 }
    556 if(strstr(opt.c_str(),",N")) { // Nombre maximum d'iterations
    557   size_t p = opt.find(",N");
    558   size_t q = opt.find_first_of(',',p+1);
    559   string dum = opt.substr(p,q-p);
    560   if(dum.length()>2) sscanf(dum.c_str(),",N%d",&O.nstep);
    561   if(O.nstep<2) O.nstep = 100;
    562 }
    563 if(strstr(opt.c_str(),",l")) { // niveau de print
    564   size_t p = opt.find(",l");
    565   size_t q = opt.find_first_of(',',p+1);
    566   string dum = opt.substr(p,q-p);
    567   float ab;
    568   if(dum.length()>2) sscanf(dum.c_str(),",l%f",&ab);
    569   if(ab<0) ab = 0.;
    570   O.lp = (int) ab; O.lpg = int(10.*(ab-(float)O.lp+0.01));
    571 }
    572 if(strstr(opt.c_str(),",I")) { // intervalle de fit selon X
    573   size_t p = opt.find(",I");
    574   size_t q = opt.find_first_of(',',p+1);
    575   string dum = opt.substr(p,q-p);
    576   if(dum.length()>2) sscanf(dum.c_str(),",I%d/%d",&O.i1,&O.i2);
    577 }
    578 if(strstr(opt.c_str(),",J")) { // intervalle de fit selon Y
    579   size_t p = opt.find(",J");
    580   size_t q = opt.find_first_of(',',p+1);
    581   string dum = opt.substr(p,q-p);
    582   if(dum.length()>2) sscanf(dum.c_str(),",J%d/%d",&O.j1,&O.j2);
    583 }
    584 return;
    585 }
    586 
    587 
    588 // ---------------- Fenetre de fit interactive -------
    589 
     645  cout<<"echec Fit, rc = "<<rcfit<<"  nstep="<<mFit->GetNStep()<<endl;
     646  mFit->PrintFitErr(rcfit);
     647}
     648
     649return rcfit;
     650}
     651
     652/* --Methode-- */
     653void PIAFitter::FitFunRes(void)
     654// Mise a disposition des resultats (fonction fitee et residus)
     655{
     656if(mFunc && (mOpt.okres||mOpt.okfun)) {
     657  NamedObjMgr omg;
     658  string nomres = mNObj + "res";
     659  string nomfun = mNObj + "fun";
     660  if(mV) {
     661    if(mOpt.okres) {Vector* ob = mV->FitResidus(*mFit);  if(ob) omg.AddObj(ob,nomres);}
     662    if(mOpt.okfun) {Vector* ob = mV->FitFunction(*mFit); if(ob) omg.AddObj(ob,nomfun);}
     663  } else if(mH) {
     664    if(mOpt.okres) {Histo* ob = mH->FitResidus(*mFit);  if(ob) omg.AddObj(ob,nomres);}
     665    if(mOpt.okfun) {Histo* ob = mH->FitFunction(*mFit); if(ob) omg.AddObj(ob,nomfun);}
     666  } else if(mM) {
     667    if(mOpt.okres) {Matrix* ob = mM->FitResidus(*mFit);  if(ob) omg.AddObj(ob,nomres);}
     668    if(mOpt.okfun) {Matrix* ob = mM->FitFunction(*mFit); if(ob) omg.AddObj(ob,nomfun);}
     669  } else if(mH2) {
     670    if(mOpt.okres) {Histo2D* ob = mH2->FitResidus(*mFit);  if(ob) omg.AddObj(ob,nomres);}
     671    if(mOpt.okfun) {Histo2D* ob = mH2->FitFunction(*mFit); if(ob) omg.AddObj(ob,nomfun);}
     672  } else if(mIm) {
     673    if(mOpt.okres) {RzImage* ob = mIm->FitResidus(*mFit);  if(ob) omg.AddObj(ob,nomres);}
     674    if(mOpt.okfun) {RzImage* ob = mIm->FitFunction(*mFit); if(ob) omg.AddObj(ob,nomfun);}
     675  } else if(mG) {
     676    if(mOpt.okres) {GeneralFitData* ob = mG->FitResidus(*mFit);  if(ob) omg.AddObj(ob,nomres);}
     677    if(mOpt.okfun) {GeneralFitData* ob = mG->FitFunction(*mFit); if(ob) omg.AddObj(ob,nomfun);}
     678  }
     679}
     680return;
     681}
     682
     683/* --Methode-- */
     684void PIAFitter::LinFit(void)
     685// Fit lineaire de polynomes
     686{
     687if(mFName.length()<=0)
     688  {cout<<"PIAFitter::LinFit Donnez un nom de fonction a fitter."<<endl;
     689   return;}
     690if(!mGData)
     691  {cout<<"PIAFitter::LinFit pas de Data."<<endl; return;}
     692if(mFName[0]!='p')
     693  {cout<<"PIAFitter::LinFit fonction non prevue "<<mFName<<endl;
     694   return;}
     695int degre = 0;
     696if(mFName.length()>1) sscanf(mFName.c_str()+1,"%d",&degre);
     697
     698if(mNVar==1) {  // Fit lineaire de polynome 1D
     699  cout<<"Fit (lineaire) 1D polynome de degre "<<degre<<endl;
     700  Poly p1(0);
     701  double c2rl = mGData->PolFit(0,p1,degre);
     702  cout<<"C2r_lineaire = "<<c2rl<<endl;
     703  if(mOpt.lp>0) cout<<p1<<endl;
     704} else if(mNVar==2) {  // Fit lineaire de polynome 2D
     705  cout<<"Fit (lineaire) polynome 2D de degre "<<degre<<endl;
     706  Poly2 p2(0);
     707  double c2rl = mGData->PolFit(0,1,p2,degre);
     708  cout<<"C2r_lineaire = "<<c2rl<<endl;
     709  if(mOpt.lp>0) cout<<p2<<endl;
     710}
     711
     712return;
     713}
     714
     715/* --Methode-- */
     716int PIAFitter::Execute(string& kw, vector<string>& tokens)
     717// Execution des commandes de fit : "fit" et "fitw"
     718{
     719if(tokens.size() < 2) {
     720  cout
     721  <<"Usage:fit  nomobj func [Options]\n"
     722  <<" ou   fitw nomobj func [Options]\n"
     723  <<" avec Options: [p:p1,...,pn s:s1,...,sn m:m1,...,mn \n"
     724  <<"                M:M1,...,Mn f:f1,...,fn o:.,.,. o:.,.,.]\n"
     725  <<" ou   fitlin nomobj func [o:.,.,. o:.,.,.]\n";
     726  return(-1);
     727}
     728// decodage des arguments de la commande
     729string mSp,mSs,mSm,mSM,mSf,mSo;
     730mSp=""; mSs=""; mSm=""; mSM=""; mSf=""; mSo="";
     731if(tokens.size()>2)
     732  for(int ip=2;ip<(int)tokens.size();ip++) {
     733    if(tokens[ip].length()<=2) continue;
     734    const char *c = tokens[ip].c_str();
     735    if(c[1]!=':') continue;
     736    if(c[0]=='p')      mSp=c+2;
     737    else if(c[0]=='s') mSs=c+2;
     738    else if(c[0]=='m') mSm=c+2;
     739    else if(c[0]=='M') mSM=c+2;
     740    else if(c[0]=='f') mSf=c+2;
     741    else if(c[0]=='o') {mSo += ","; mSo += c+2;}
     742  }
     743// Execution des commandes
     744DecodeOptions(mSo);
     745DecodeObject(tokens[0]);
     746CheckOptions();
     747if(mOpt.lp>0) PrintOptions();
     748FillGData();
     749DecodeFunction(tokens[1]);
     750DecodeParam(mSp,mSs,mSm,mSM,mSf);
     751if (kw == "fit") {
     752  int rc = DoFit();
     753  if(rc>=0) FitFunRes();
     754} else if (kw == "fitlin") {
     755  LinFit();
     756} else if (kw == "fitw") {
     757  if(FWindFit!=NULL) {delete FWindFit; FWindFit=NULL;}
     758  FWindFit = new PIAFitterWind(mApp,this);
     759  FWindFit->Show();
     760}
     761
     762return(0);
     763}
     764
     765////////////////////////////////////////////////////////////////////
     766////---------- Classe de fenetre de fit interactive ------------////
     767////////////////////////////////////////////////////////////////////
    590768
    591769/* --Methode-- */
    … …  
    593771 : PIWindow((PIMsgHandler*)par, "PIAFitter", PIWK_normal, 240, 240, 150, 150)
    594772{
    595 dap = par;
    596 fitter = fiter;
    597 int bsx, bsy, spx, spy;
    598 
    599 // On definit la taille a partir de la taille par defaut des composantes
    600 // PIApplicationPrefCompSize(bsx, bsy);
     773ReFillGData = false;
     774mDap = par;
     775mFitter = fiter;
     776string obj = mFitter->mNObj;
     777string fun = mFitter->mFName;
     778int npar = mFitter->mNPar;
     779
     780// Alloc de la taille
     781nlab = 20+npar;   lab = new PILabel*[nlab];    {for(int i=0;i<nlab;i++) lab[i]=NULL;}
     782ntxt = 20+4*npar; txt = new PIText*[ntxt];     {for(int i=0;i<ntxt;i++) txt[i]=NULL;}
     783nbut = 20;        but = new PIButton*[nbut];   {for(int i=0;i<nbut;i++) but[i]=NULL;}
     784nckb = 20+npar;   ckb = new PICheckBox*[nckb]; {for(int i=0;i<nckb;i++) ckb[i]=NULL;}
     785
     786// On definit la taille a partir de la taille par defaut des composantes
     787// bsx,bsy = environ 6 lettres
     788int bsx,bsy;
    601789par->PrefCompSz(bsx, bsy);
    602 spx = bsx/10;
    603 spy = bsy/4;
    604 
    605 int wszx = 3*spx+4*bsx;
    606 int wszy = 5*bsy+6*spy;
     790int spx = (bsx>=10) ? bsx/10 : 1;  // intervalle entre lettres X
     791int spy = (bsy>=6) ? bsy/6 : 1;    // intervalle entre lettres Y
     792
     793int wszx = (5*bsx+5*spx)+spx;
     794int wszy = 8*(bsy+spy)+npar*(bsy+spy)+spy;
    607795SetSize(wszx, wszy);
    608 int cpx = spx;
    609 int cpy = spy;
    610 
    611 cpx = spx+bsx;
    612 labn = new PILabel(this, "ObjectName", 2.0*bsx, bsy, cpx, cpy);
    613 labn->SetBinding(PIBK_elastic, PIBK_fixed, PIBK_elastic, PIBK_free);
    614 
    615 cpy += spy+bsy;
    616 cpx = spx;
    617 ckb[0] = new PICheckBox(this,"Gen.Func", 1001, 2*bsx, bsy, cpx, cpy);
    618 cpx += bsx*2+spx;
    619 ckb[1] = new PICheckBox(this,"Gen.Resid", 1002, 2*bsx, bsy, cpx, cpy);
    620 ckb[0]->SetBinding(PIBK_elastic, PIBK_fixed, PIBK_elastic, PIBK_free);
    621 ckb[1]->SetBinding(PIBK_elastic, PIBK_fixed, PIBK_elastic, PIBK_free);
    622 
    623 cpy += spy+bsy;
    624 cpx = spx;
    625 pom[0] = new PIOptMenu(this, "FitFunc", 2*bsx, bsy, cpx, cpy);
    626 pom[0]->AppendItem("Poly0", 100);
    627 pom[0]->AppendItem("Poly1", 101);
    628 pom[0]->AppendItem("Poly2", 102);
    629 pom[0]->AppendItem("Gaussienne", 103);
    630 pom[0]->AppendItem("Gauss+Poly0",104);
    631 pom[0]->AppendItem("Gauss+Poly1",105);
    632 pom[0]->AppendItem("Gauss+Poly2",106);
    633 pom[0]->SetBinding(PIBK_elastic, PIBK_fixed, PIBK_elastic, PIBK_free);
    634 
    635 cpx += bsx*2+spx;
    636 pom[1] = new PIOptMenu(this, "NPar", 2*bsx, bsy, cpx, cpy);
    637 pom[1]->AppendItem("Un NP=1", 201);
    638 pom[1]->AppendItem("Deux NP=2",202);
    639 pom[1]->AppendItem("Trois NP=3",203);
    640 pom[1]->AppendItem("Cinq  NP=5",205);
    641 pom[1]->AppendItem("Huit  NP=8",208);
    642 pom[1]->AppendItem("Dix  NP=10",210);
    643 pom[1]->SetBinding(PIBK_elastic, PIBK_fixed, PIBK_elastic, PIBK_free);
    644 
    645 cpy += spy+bsy;
    646 cpx = 0.5*bsx;
    647 but[0] =  new PIButton(this, "DoFit", 555, bsx*1.5, bsy, cpx, cpy);
    648 cpx += bsx*1.5+3*spx;
    649 but[1] =  new PIButton(this, "Dismiss", 777, bsx*1.5, bsy, cpx, cpy);
    650 but[0]->SetBinding(PIBK_elastic, PIBK_fixed, PIBK_elastic, PIBK_free);
    651 but[1]->SetBinding(PIBK_elastic, PIBK_fixed, PIBK_elastic, PIBK_free);
    652 
    653 //  Pour les parametres
    654 cpy += bsy+spy;
    655 cpx = 0.6*bsx+1.5*spx;
    656 lab[0] = new PILabel(this, "Init.Val", 1.7*bsx, bsy, cpx, cpy);
    657 cpx += 1.7*bsx+0.5*spx;
    658 lab[1] = new PILabel(this, "Step", 1.7*bsx, bsy, cpx, cpy);
    659 lab[0]->SetBinding(PIBK_elastic, PIBK_fixed, PIBK_elastic, PIBK_free);
    660 lab[1]->SetBinding(PIBK_elastic, PIBK_fixed, PIBK_elastic, PIBK_free);
    661 
    662 for(int i=0; i<FINPARMAX; i++) {
    663   char buff[32];
    664   cpy += bsy+spy;
    665   cpx = spx;
    666   sprintf(buff, "P%d",i);
    667   labp[i] = new PILabel(this, buff, 0.6*bsx, bsy, cpx, cpy);
    668   labp[i]->SetBinding(PIBK_elastic, PIBK_fixed, PIBK_elastic, PIBK_free);
    669   sprintf(buff, "Val%d",i);
    670   cpx += 0.6*bsx+0.5*spx;
    671   txtp[i] = new PIText(this, buff, 1.7*bsx, bsy, cpx, cpy);
    672   txtp[i]->SetBinding(PIBK_elastic, PIBK_fixed, PIBK_elastic, PIBK_free);
    673   sprintf(buff, "Step%d",i);
    674   cpx += 1.7*bsx+0.5*spx;
    675   txts[i] = new PIText(this, buff, 1.7*bsx, bsy, cpx, cpy);
    676   txts[i]->SetBinding(PIBK_elastic, PIBK_fixed, PIBK_elastic, PIBK_free);
    677   } 
     796int cpx,cpy;
     797
     798// 1 ere ligne
     799cpx=spx; cpy=spy;
     800but[0] = new PIButton(this,"Fr.Last",111,bsx,bsy,cpx,cpy);
     801but[0]->SetBinding(PIBK_elastic,PIBK_elastic, PIBK_elastic,PIBK_elastic);
     802cpx += bsx+spx;
     803but[1] = new PIButton(this,"Default",222,bsx,bsy,cpx,cpy);
     804but[1]->SetBinding(PIBK_elastic,PIBK_elastic, PIBK_elastic,PIBK_elastic);
     805cpx+=bsx+spx;
     806ckb[0] = new PICheckBox(this,"Gen Fun",1001,bsx,bsy,cpx,cpy);
     807ckb[0]->SetBinding(PIBK_elastic,PIBK_elastic, PIBK_elastic,PIBK_elastic);
     808cpx += bsx+2*spx;
     809ckb[1] = new PICheckBox(this,"Res",1002,bsx,bsy,cpx,cpy);
     810ckb[1]->SetBinding(PIBK_elastic,PIBK_elastic, PIBK_elastic,PIBK_elastic);
     811
     812// 2 ieme ligne
     813cpx=spx; cpy += bsy+spy;
     814ckb[2] = new PICheckBox(this,"Cent X",1003,bsx,bsy,cpx,cpy);
     815ckb[2]->SetBinding(PIBK_elastic,PIBK_elastic, PIBK_elastic,PIBK_elastic);
     816cpx+=bsx+spx;
     817txt[0] = new PIText(this,"",bsx,bsy,cpx,cpy);
     818txt[0]->SetBinding(PIBK_elastic,PIBK_elastic, PIBK_elastic,PIBK_elastic);
     819cpx+=bsx+2*spx;
     820ckb[3] = new PICheckBox(this,"Y",1004,bsx/2,bsy,cpx,cpy);
     821ckb[3]->SetBinding(PIBK_elastic,PIBK_elastic, PIBK_elastic,PIBK_elastic);
     822cpx+=bsx/2+spx;
     823txt[1] = new PIText(this,"",bsx,bsy,cpx,cpy);
     824txt[1]->SetBinding(PIBK_elastic,PIBK_elastic, PIBK_elastic,PIBK_elastic);
     825
     826// 3 ieme ligne
     827cpx=spx; cpy += bsy+spy;
     828lab[0] = new PILabel(this,"Err cste",1.25*bsx,bsy,cpx,cpy);
     829lab[0]->SetBinding(PIBK_elastic,PIBK_elastic, PIBK_elastic,PIBK_elastic);
     830cpx+=1.25*bsx+spx;
     831txt[2] = new PIText(this,"",bsx,bsy,cpx,cpy);
     832txt[2]->SetBinding(PIBK_elastic,PIBK_elastic, PIBK_elastic,PIBK_elastic);
     833cpx+=bsx+2*spx;
     834lab[1] = new PILabel(this,"sqrt",bsx,bsy,cpx,cpy);
     835lab[1]->SetBinding(PIBK_elastic,PIBK_elastic, PIBK_elastic,PIBK_elastic);
     836cpx+=bsx+spx;
     837txt[3] = new PIText(this,"",bsx,bsy,cpx,cpy);
     838txt[3]->SetBinding(PIBK_elastic,PIBK_elastic, PIBK_elastic,PIBK_elastic);
     839
     840// 4 ieme ligne
     841cpx=spx; cpy += bsy+spy;
     842lab[2] = new PILabel(this,"Stop Xi2",1.25*bsx,bsy,cpx,cpy);
     843lab[2]->SetBinding(PIBK_elastic,PIBK_elastic, PIBK_elastic,PIBK_elastic);
     844cpx+=1.25*bsx+spx;
     845txt[4] = new PIText(this,"",bsx,bsy,cpx,cpy);
     846txt[4]->SetBinding(PIBK_elastic,PIBK_elastic, PIBK_elastic,PIBK_elastic);
     847cpx+=bsx+spx;
     848lab[3] = new PILabel(this,"Iter",bsx, bsy, cpx, cpy);
     849lab[3]->SetBinding(PIBK_elastic,PIBK_elastic, PIBK_elastic,PIBK_elastic);
     850cpx+=bsx+spx;
     851txt[5] = new PIText(this,"",bsx,bsy,cpx,cpy);
     852txt[5]->SetBinding(PIBK_elastic,PIBK_elastic, PIBK_elastic,PIBK_elastic);
     853
     854// 5 ieme ligne
     855cpx=spx; cpy += bsy+spy;
     856lab[4] = new PILabel(this,"Print",bsx,bsy,cpx,cpy);
     857lab[4]->SetBinding(PIBK_elastic,PIBK_elastic, PIBK_elastic,PIBK_elastic);
     858cpx+=bsx+spx;
     859txt[6] = new PIText(this,"",bsx/2,bsy,cpx,cpy);
     860txt[6]->SetBinding(PIBK_elastic,PIBK_elastic, PIBK_elastic,PIBK_elastic);
     861cpx+=bsx/2+spx;
     862lab[5] = new PILabel(this,"Debug",bsx,bsy,cpx,cpy);
     863lab[5]->SetBinding(PIBK_elastic,PIBK_elastic, PIBK_elastic,PIBK_elastic);
     864cpx+=bsx+spx;
     865txt[7] = new PIText(this,"",bsx/2,bsy,cpx,cpy);
     866txt[7]->SetBinding(PIBK_elastic,PIBK_elastic, PIBK_elastic,PIBK_elastic);
     867
     868// 6 ieme ligne
     869cpx=spx; cpy += bsy+spy;
     870lab[6] = new PILabel(this,"Range X",bsx,bsy,cpx,cpy);
     871lab[6]->SetBinding(PIBK_elastic,PIBK_elastic, PIBK_elastic,PIBK_elastic);
     872cpx+=bsx+spx;
     873txt[8] = new PIText(this,"",0.75*bsx,bsy,cpx,cpy);
     874txt[8]->SetBinding(PIBK_elastic,PIBK_elastic, PIBK_elastic,PIBK_elastic);
     875cpx+=0.75*bsx+spx;
     876txt[9] = new PIText(this,"",0.75*bsx,bsy,cpx,cpy);
     877txt[9]->SetBinding(PIBK_elastic,PIBK_elastic, PIBK_elastic,PIBK_elastic);
     878cpx+=0.75*bsx+spx;
     879lab[7] = new PILabel(this,"Y",bsx/2,bsy,cpx,cpy);
     880lab[7]->SetBinding(PIBK_elastic,PIBK_elastic, PIBK_elastic,PIBK_elastic);
     881cpx+=bsx/2+spx;
     882txt[10] = new PIText(this,"",0.75*bsx,bsy,cpx,cpy);
     883txt[10]->SetBinding(PIBK_elastic,PIBK_elastic, PIBK_elastic,PIBK_elastic);
     884cpx+=0.75*bsx+spx;
     885txt[11] = new PIText(this,"",0.75*bsx,bsy,cpx,cpy);
     886txt[11]->SetBinding(PIBK_elastic,PIBK_elastic, PIBK_elastic,PIBK_elastic);
     887
     888// 7 ieme ligne
     889cpx=spx; cpy+=bsy+spy;
     890but[2] = new PIButton(this, "Dismiss",777,bsx,bsy,cpx,cpy);
     891but[2]->SetBinding(PIBK_elastic,PIBK_elastic, PIBK_elastic,PIBK_elastic);
     892cpx += bsx+spx;
     893but[3] = new PIButton(this, "Refesh",666,bsx,bsy,cpx,cpy);
     894but[3]->SetBinding(PIBK_elastic,PIBK_elastic, PIBK_elastic,PIBK_elastic);
     895cpx += bsx+spx;
     896but[4] = new PIButton(this, "Fit",333,bsx,bsy,cpx,cpy);
     897but[4]->SetBinding(PIBK_elastic,PIBK_elastic, PIBK_elastic,PIBK_elastic);
     898cpx+=bsx+spx;
     899lab[8] = new PILabel(this,fun.c_str(),bsx/2,bsy,cpx,cpy);
     900lab[8]->SetBinding(PIBK_elastic,PIBK_elastic, PIBK_elastic,PIBK_elastic);
     901
     902// Parametres (npar lignes)
     903cpx=spx; cpy+=bsy+spy;
     904lab[9] = new PILabel(this,"Par",bsx/2,bsy,cpx,cpy);
     905lab[9]->SetBinding(PIBK_elastic,PIBK_elastic, PIBK_elastic,PIBK_elastic);
     906cpx+=bsx/2+spx;
     907lab[10] = new PILabel(this,"F",bsx/3,bsy,cpx,cpy);
     908lab[10]->SetBinding(PIBK_elastic,PIBK_elastic, PIBK_elastic,PIBK_elastic);
     909cpx+=bsx/3+spx;
     910lab[11] = new PILabel(this,"Init",bsx,bsy,cpx,cpy);
     911lab[11]->SetBinding(PIBK_elastic,PIBK_elastic, PIBK_elastic,PIBK_elastic);
     912cpx+=bsx+spx;
     913lab[12] = new PILabel(this,"Step",bsx,bsy,cpx,cpy);
     914lab[12]->SetBinding(PIBK_elastic,PIBK_elastic, PIBK_elastic,PIBK_elastic);
     915cpx+=bsx+spx;
     916lab[13] = new PILabel(this,"Min",bsx,bsy,cpx,cpy);
     917lab[13]->SetBinding(PIBK_elastic,PIBK_elastic, PIBK_elastic,PIBK_elastic);
     918cpx+=bsx+spx;
     919lab[14] = new PILabel(this,"Max",bsx,bsy,cpx,cpy);
     920lab[14]->SetBinding(PIBK_elastic,PIBK_elastic, PIBK_elastic,PIBK_elastic);
     921if(npar>0) {
     922  for(int i=0;i<npar;i++) {
     923    cpx=spx; cpy+=bsy+spy;
     924    char str[8]; sprintf(str,"P%d",i);
     925    lab[20+i] = new PILabel(this,str,bsx/2,bsy,cpx,cpy);
     926    lab[20+i]->SetBinding(PIBK_elastic,PIBK_elastic, PIBK_elastic,PIBK_elastic);
     927    cpx+=bsx/2+spx;
     928    // Attention pas de message entre 1500 et 2000 (permet 500 parametres!)
     929    ckb[20+i] = new PICheckBox(this,"",1500+i,bsx/3,bsy,cpx,cpy);
     930    ckb[20+i]->SetBinding(PIBK_elastic,PIBK_elastic, PIBK_elastic,PIBK_elastic);
     931    cpx+=bsx/3+spx;
     932    for(int j=0;j<4;j++) {
     933      txt[20+4*i+j] = new PIText(this,"",bsx,bsy,cpx,cpy);
     934      txt[20+4*i+j]->SetBinding(PIBK_elastic,PIBK_elastic, PIBK_elastic,PIBK_elastic);
     935      cpx+=bsx+spx;
     936    }
     937  }
     938}
     939
     940return;
    678941}
    679942
    … …  
    682945{
    683946int i;
    684 for(i=0; i<2; i++) {
    685   delete pom[i];
    686   delete ckb[i];
    687   delete but[i];
    688   }
    689 delete labn;
    690 delete lab[0];
    691 delete lab[1];
    692 for(i=0; i< FINPARMAX; i++) {
    693   delete labp[i];
    694   delete txtp[i];
    695   delete txts[i];
    696   }
    697 }
    698 
    699 /* --Methode-- */
    700 void PIAFitterWind::SetNbParms(int npar)
    701 {
    702 if (npar < 1) npar = 1;
    703 if (npar > FINPARMAX) npar = FINPARMAX;
    704 
    705 int bsx, bsy, spx, spy;
    706 
    707 dap->PrefCompSz(bsx, bsy);
    708 spx = bsx/10;
    709 spy = bsy/4;
    710 
    711 int wszx = 3*spx+4*bsx;
    712 int wszy = (5+npar)*bsy+(6+npar)*spy;
    713 SetSize(wszx, wszy);
    714 
    715 int i;
    716 for(i=0; i<npar; i++) {
    717   labp[i]->Manage();
    718   txtp[i]->Manage();
    719   txts[i]->Manage();
    720   }
    721 for(i=npar; i<FINPARMAX; i++) {
    722   labp[i]->UnManage();
    723   txtp[i]->UnManage();
    724   txts[i]->UnManage();
    725   }
    726 
     947for(i=0;i<nlab;i++) if(lab[i]) {delete lab[i]; lab[i]=NULL;}
     948for(i=0;i<ntxt;i++) if(txt[i]) {delete txt[i]; txt[i]=NULL;}
     949for(i=0;i<nbut;i++) if(but[i]) {delete but[i]; but[i]=NULL;}
     950for(i=0;i<nckb;i++) if(ckb[i]) {delete ckb[i]; ckb[i]=NULL;}
     951if(lab) {delete lab; lab=NULL; nlab=0;}
     952if(txt) {delete txt; txt=NULL; ntxt=0;}
     953if(but) {delete but; but=NULL; nbut=0;}
     954if(ckb) {delete ckb; ckb=NULL; nckb=0;}
    727955}
    728956
    … …  
    730958void PIAFitterWind::Show()
    731959{
    732 // Si on veut initialiser des trucs au moment ou apparait la fenetre
    733 labn->SetLabel(oname);
    734 SetNbParms(3);
    735 pom[1]->SetValue(203);
     960//mDap->SetBlocked();
     961SetState();
    736962PIWindow::Show();
     963return;
     964}
     965
     966/* --Methode-- */
     967void PIAFitterWind::SetState(void)
     968// Ecriture et positionnement des ckb et txt
     969{
     970int npar = mFitter->mNPar;
     971
     972// Les check-boxes
     973ckb[0]->SetState(mFitter->mOpt.okfun);
     974ckb[1]->SetState(mFitter->mOpt.okres);
     975ckb[2]->SetState((mFitter->mOpt.polcx>0)?true:false);
     976ckb[3]->SetState((mFitter->mOpt.polcy>0)?true:false);
     977if(npar>0)
     978  for(int i=0;i<npar;i++) ckb[20+i]->SetState((mFitter->mFix(i)>=1.)?true:false);
     979
     980// Les champs textes
     981char str[128]; string dum;
     982sprintf(str,"%f",mFitter->mOpt.xc);    dum=str; txt[0]->SetText(dum);
     983sprintf(str,"%f",mFitter->mOpt.yc);    dum=str; txt[1]->SetText(dum);
     984sprintf(str,"%f",mFitter->mOpt.err_e); dum=str; txt[2]->SetText(dum);
     985sprintf(str,"%f",mFitter->mOpt.err_E); dum=str; txt[3]->SetText(dum);
     986sprintf(str,"%f",mFitter->mOpt.stc2);  dum=str; txt[4]->SetText(dum);
     987sprintf(str,"%d",mFitter->mOpt.nstep); dum=str; txt[5]->SetText(dum);
     988sprintf(str,"%d",mFitter->mOpt.lp);    dum=str; txt[6]->SetText(dum);
     989sprintf(str,"%d",mFitter->mOpt.lpg);   dum=str; txt[7]->SetText(dum);
     990sprintf(str,"%d",mFitter->mOpt.i1);    dum=str; txt[8]->SetText(dum);
     991sprintf(str,"%d",mFitter->mOpt.i2);    dum=str; txt[9]->SetText(dum);
     992sprintf(str,"%d",mFitter->mOpt.j1);    dum=str; txt[10]->SetText(dum);
     993sprintf(str,"%d",mFitter->mOpt.j2);    dum=str; txt[11]->SetText(dum);
     994if(npar>0) {
     995  for(int i=0;i<npar;i++) {
     996    sprintf(str,"%f",mFitter->mPar(i));  dum=str; txt[20+4*i+0]->SetText(dum);
     997    sprintf(str,"%f",mFitter->mStep(i)); dum=str; txt[20+4*i+1]->SetText(dum);
     998    sprintf(str,"%f",mFitter->mMin(i));  dum=str; txt[20+4*i+2]->SetText(dum);
     999    sprintf(str,"%f",mFitter->mMax(i));  dum=str; txt[20+4*i+3]->SetText(dum);
     1000  }
     1001}
     1002
     1003return;
    7371004}
    7381005
    … …  
    7401007void PIAFitterWind::Process(PIMessage msg, PIMsgHandler* sender, void* data)
    7411008{
    742 
    743 char *mf[7] = {"p0","p1","p2","g","g0","g1","g2"};
     1009int lp = 1;
     1010int npar = mFitter->mNPar;
     1011
     1012// L'objet existe t-il encore?
     1013NamedObjMgr omg;
     1014if(omg.GetObj(mFitter->mNObj) == NULL) {
     1015  cout<<"PIAFitterWind::Process Error , Pas d'objet de nom "<<mFitter->mNObj<<endl;
     1016  mFitter->ResetDPointer(); return;
     1017}
     1018
     1019// On recupere les champs textes
     1020string dum; char str[128];
     1021int lenxc=0, lenyc=0;
     1022dum=txt[0]->GetText(); strcpy(str,dum.c_str()); strip(str,'B',' ');
     1023  sscanf(str,"%lf",&(mFitter->mOpt.xc)); lenxc = strlen(str);
     1024dum=txt[1]->GetText(); strcpy(str,dum.c_str()); strip(str,'B',' ');
     1025  sscanf(str,"%lf",&(mFitter->mOpt.yc)); lenyc = strlen(str);
     1026dum=txt[2]->GetText(); strcpy(str,dum.c_str()); strip(str,'B',' ');
     1027  sscanf(str,"%lf",&(mFitter->mOpt.err_e));
     1028dum=txt[3]->GetText(); strcpy(str,dum.c_str()); strip(str,'B',' ');
     1029  sscanf(str,"%lf",&(mFitter->mOpt.err_E));
     1030dum=txt[4]->GetText(); strcpy(str,dum.c_str()); strip(str,'B',' ');
     1031  sscanf(str,"%lf",&(mFitter->mOpt.stc2));
     1032dum=txt[5]->GetText(); strcpy(str,dum.c_str()); strip(str,'B',' ');
     1033  sscanf(str,"%d",&(mFitter->mOpt.nstep));
     1034dum=txt[6]->GetText(); strcpy(str,dum.c_str()); strip(str,'B',' ');
     1035  sscanf(str,"%d",&(mFitter->mOpt.lp));
     1036dum=txt[7]->GetText(); strcpy(str,dum.c_str()); strip(str,'B',' ');
     1037  sscanf(str,"%d",&(mFitter->mOpt.lpg));
     1038dum=txt[8]->GetText(); strcpy(str,dum.c_str()); strip(str,'B',' ');
     1039  sscanf(str,"%d",&(mFitter->mOpt.i1));
     1040dum=txt[9]->GetText(); strcpy(str,dum.c_str()); strip(str,'B',' ');
     1041  sscanf(str,"%d",&(mFitter->mOpt.i2));
     1042dum=txt[10]->GetText(); strcpy(str,dum.c_str()); strip(str,'B',' ');
     1043sscanf(str,"%d",&(mFitter->mOpt.j1));
     1044dum=txt[11]->GetText(); strcpy(str,dum.c_str()); strip(str,'B',' ');
     1045  sscanf(str,"%d",&(mFitter->mOpt.j2));
     1046if(npar>0) {
     1047  for(int i=0;i<npar;i++) {
     1048    dum=txt[20+4*i+0]->GetText(); strcpy(str,dum.c_str()); strip(str,'B',' ');
     1049      sscanf(str,"%lf",&(mFitter->mPar(i)));
     1050    dum=txt[20+4*i+1]->GetText(); strcpy(str,dum.c_str()); strip(str,'B',' ');
     1051      sscanf(str,"%lf",&(mFitter->mStep(i)));
     1052    dum=txt[20+4*i+2]->GetText(); strcpy(str,dum.c_str()); strip(str,'B',' ');
     1053      sscanf(str,"%lf",&(mFitter->mMin(i)));
     1054    dum=txt[20+4*i+3]->GetText(); strcpy(str,dum.c_str()); strip(str,'B',' ');
     1055      sscanf(str,"%lf",&(mFitter->mMax(i)));
     1056  }
     1057}
     1058
     1059// Decodage des messages
    7441060msg = UserMsg(msg);
    745 
    746 if ((msg > 200) && (msg <= 200+FINPARMAX)) {  // On change le nombre de parametre
    747   SetNbParms(msg-200);
     1061if(msg ==777) {
     1062  if(lp) cout<<"Dismiss"<<endl;
     1063  //mDap->SetReady();
     1064  Hide();
    7481065  return;
    749   }
    750  
    751 if (msg == 777)  { Hide(); return; }  // On cache la fenetre
    752 
    753 if (msg == 555) {  // On fait le fit
    754   vector<string> args;
    755   string cmd = oname;
    756   string a;
    757   args.push_back(oname);
    758   int imf = pom[0]->GetValue()-100;
    759   if ((imf < 0) || (imf > 6)) imf = 0;
    760   a = mf[imf];
    761   cmd += " " + a + " ";
    762   args.push_back(a);
    763   cmd += a;
    764   args.push_back(a);
    765   if (ckb[0]->GetState() || ckb[1]->GetState()) {
    766     a = "o:";
    767     if (ckb[0]->GetState()) a += "f";
    768     if (ckb[1]->GetState()) a += "r";
    769     cmd += " " + a;
    770     args.push_back(a);
    771     }
    772   cout << "FitComm= fit " << cmd << endl;
    773   string kw = "fit";
    774   fitter->Execute(kw, args);
    775   }
    776 
    777 }
     1066}
     1067if(msg ==666) {
     1068  if(lp) cout<<"Refresh"<<endl;
     1069  if(ReFillGData) mFitter->FillGData();
     1070  ReFillGData = false;
     1071}
     1072if(msg ==111) {
     1073  if(lp) cout<<"Update from last"<<endl;
     1074  mFitter->ResetOptions();
     1075  mFitter->mOpt = mFitter->mOptSave;
     1076  mFitter->ReSetParam();
     1077  mFitter->InitParFromLastFit();
     1078  ReFillGData = true;
     1079}
     1080if(msg ==222) {
     1081  if(lp) cout<<"Default options/par"<<endl;
     1082  mFitter->ResetOptions();
     1083  mFitter->ReSetParam();
     1084  ReFillGData = true;
     1085}
     1086if(msg ==333) {
     1087  if(lp) cout<<"Do the fit"<<endl;
     1088  if(ReFillGData) mFitter->FillGData();
     1089  ReFillGData = false;
     1090  int rc = mFitter->DoFit();
     1091  if(rc>=0) mFitter->FitFunRes();
     1092}
     1093if(msg==1001) {
     1094  if(ckb[0]->GetState()) {
     1095    if(lp) cout<<"Gen fitted function"<<endl;
     1096    mFitter->mOpt.okfun = true;
     1097  } else if(!ckb[0]->GetState()) {
     1098    if(lp) cout<<"No Gen fitted function"<<endl;
     1099    mFitter->mOpt.okfun = false;
     1100  }
     1101}
     1102if(msg==1002) {
     1103  if(ckb[1]->GetState()) {
     1104    if(lp) cout<<"Gen fitted residus"<<endl;
     1105    mFitter->mOpt.okres = true;
     1106  } else if(!ckb[1]->GetState()) {
     1107    if(lp) cout<<"No Gen fitted residus"<<endl;
     1108    mFitter->mOpt.okres = false;
     1109  }
     1110}
     1111if(msg==1003) {
     1112  if(ckb[2]->GetState()) {
     1113    if(lp) cout<<"Centrage X"<<endl;
     1114    if(lenxc>0) mFitter->mOpt.polcx = 1; else mFitter->mOpt.polcx = 2;
     1115  } else if(!ckb[2]->GetState()) {
     1116    if(lp) cout<<"No Centrage X"<<endl;
     1117    mFitter->mOpt.polcx = 0;
     1118  }
     1119  ReFillGData = true;
     1120}
     1121if(msg==1004) {
     1122  if(ckb[3]->GetState()) {
     1123    if(lp) cout<<"Centrage Y"<<endl;
     1124    if(lenyc>0) mFitter->mOpt.polcy = 1; else mFitter->mOpt.polcy = 2;
     1125  } else if(!ckb[3]->GetState()) {
     1126    if(lp) cout<<"No Centrage Y"<<endl;
     1127    mFitter->mOpt.polcy = 0;
     1128  }
     1129  ReFillGData = true;
     1130}
     1131if(msg>=1500 && msg<2000) {
     1132  int ip = msg-1500;
     1133  if(ckb[20+ip]->GetState()) {
     1134    if(lp) cout<<"Fix Param "<<ip<<endl;
     1135    mFitter->mFix(ip) = 1.001;
     1136  } else if(!ckb[20+ip]->GetState()) {
     1137    if(lp) cout<<"Not Fix Param "<<ip<<endl;
     1138    mFitter->mFix(ip) = 0.;
     1139  }
     1140}
     1141
     1142mFitter->CheckOptions();
     1143SetState();
     1144if(mFitter->mOpt.lp>1) mFitter->PrintOptions();
     1145
     1146return;
     1147}

  • trunk/SophyaPI/PIext/piafitting.h

    r361 r379  
    2020#include "dlftypes.h"
    2121#include "piacmd.h"
     22#include "cvector.h"
    2223
    23 class Vector;
    2424class PIStdImgApp;
     25class PIAFitterWind;
     26class GeneralFunction;
     27class GeneralFitData;
     28class GeneralFit;
     29class Histo;
     30class Matrix; class Histo2D; class RzImage;
    2531
    2632class PIAFitter : public CmdExecutor {
    2733public :
    28                         PIAFitter(PIACmd* piac, PIStdImgApp* app);
    29   virtual               ~PIAFitter();
    30   virtual int          Execute(string& keyw, vector<string>& args);
     34  PIAFitter(PIACmd* piac, PIStdImgApp* app);
     35  virtual ~PIAFitter();
     36  virtual int Execute(string& keyw, vector<string>& args);
    3137
    32 //   Methodes de fit -  CMV , deux methodes H1 H2 ou 1 seule ??) ...
    33   virtual void          Fit12D(string & nom, string& func,
    34                                string par,string step,string min,string max,string opt);
     38friend class PIAFitterWind;
    3539
    3640protected :
     41
    3742typedef struct DFOptions {
    38   int okres, okfun;
     43  bool okres, okfun;
    3944  int polcx,polcy; double xc,yc;
    4045  double err_e, err_E;
    … …  
    4348  int lp,lpg;
    4449  int i1,i2,j1,j2;
     50  bool fromlastfit;
    4551} DFOPTIONS ;
    4652
    47   static void DecodeFitsOptions(string par,string step,string min,string max,string opt
    48                                ,Vector& Par,Vector& Step,Vector& Min,Vector& Max,DFOPTIONS& O);
     53void ResetDPointer(void);
     54void ResetOptions(void);
     55void DecodeOptions(string opt);
     56void DecodeObject(string obj);
     57void CheckOptions(void);
     58void PrintOptions(void);
     59void FillGData(void);
     60void DecodeFunction(string func);
     61void ReSetParam(void);
     62void InitParFromLastFit(void);
     63void DecodeParam(string par,string step,string min,string max,string fix);
     64int  DoFit(void);
     65void FitFunRes(void);
     66void LinFit(void);
     67
     68PIStdImgApp* mApp; // Do not delete
     69PIAFitterWind* FWindFit;
     70string mNObj; AnyDataObj* mObj; // Do not delete
     71GeneralFunction* mFunc; string mFName;
     72GeneralFitData* mGData;
     73int mNPar,mNVar,mNBinX,mNBinY,mNData;
     74Vector mPar; Vector mStep; Vector mMin; Vector mMax; Vector mFix;
     75Vector mParSave; Vector mStepSave; Vector mMinSave; Vector mMaxSave; Vector mFixSave;
     76GeneralFit* mFit;
     77DFOPTIONS mOpt;
     78DFOPTIONS mOptSave;
     79// Objets a fitter
     80Vector* mV; Histo* mH; // Do not delete
     81Matrix* mM; Histo2D* mH2; RzImage* mIm; // Do not delete
     82GeneralFitData* mG; // Do not delete
     83
    4984};
    5085
Note: See TracChangeset for help on using the changeset viewer.