Changeset 1207 in Sophya for trunk/SophyaPI/PIext/piafitting.h


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/SophyaPI/PIext/piafitting.h

    r1200 r1207  
    1111#include <vector>
    1212
    13 #include "anydataobj.h"
     13#include "nomgadapter.h"
    1414
    1515#include "pdlmgr.h"
    … …  
    2424class GeneralFunction; class GeneralFunc; class GeneralFit;
    2525class GeneralFitData;
    26 class Histo;  class Histo2D;
    27 class RzImage;
    2826#else
    2927#include "tvector.h"
    … …  
    3129class GeneralFunction; class GeneralFunc; class GeneralFit;
    3230class GeneralFitData;
    33 class Histo; class Histo2D;
    34 class RzImage; //CMV_A_VIRER class RzImage
    3531}
    3632#endif
    … …  
    5349  bool okres, okfun;
    5450  int polcx,polcy; double xc,yc;
    55   double err_e, err_E;
     51  GeneralFitData::FitErrType err_type;
     52  double err_scale,err_min;
    5653  double stc2;
    5754  int nstep;
    … …  
    6158} DFOPTIONS ;
    6259
    63 void ResetDPointer(void);
    6460void ResetOptions(void);
    6561void DecodeOptions(string opt);
    … …  
    6864void PrintOptions(void);
    6965void FillGData(void);
     66void GetCentering(void);
    7067void DecodeFunction(string func);
    7168void ReSetParam(void);
    … …  
    8986PIAFitterWind* FWindFit; // Fenetre de config interactive
    9087// Objet a fitter
    91 string mNObj; AnyDataObj* mObj; // Do not delete
     88string mNObj;
     89NObjMgrAdapter* mAdObj; // Ne pas deleter
    9290// Structure de data pour le fit, parametres et options
    9391GeneralFitData* mGData;
    94 int_4 mNPar,mNVar,mNBinX,mNBinY,mNData;
     92bool delmGData;
     93int_4 mNPar,mNVar,mNData;
    9594Vector mPar; Vector mStep; Vector mMin; Vector mMax; Vector mFix;
    9695Vector mParSave; Vector mStepSave; Vector mMinSave; Vector mMaxSave; Vector mFixSave;
    … …  
    9897DFOPTIONS mOpt;
    9998DFOPTIONS mOptSave;
    100 bool ApplyXYcentering;
    101 // Possibles objets a fitter
    102 Vector* mV; Histo* mH; // Do not delete
    103 Matrix* mM; Histo2D* mH2; // Do not delete
    104 RzImage* mIm; // Do not delete
    105 GeneralFitData* mG; // Do not delete
    10699// Gestion des fonctions de fit predefinies
    107100GeneralFunction* mFunction; string mFName;
Note: See TracChangeset for help on using the changeset viewer.