Changeset 1315 in Sophya for trunk/SophyaPI


Ignore:
Timestamp:
Nov 9, 2000, 6:46:33 PM (25 years ago)
Author:
ercodmgr
Message:

Adaptateur pour TArray et flag share ds methode CloneDataObj() - Reza 9/11/2000

Location:
trunk/SophyaPI/PIext
Files:
2 added
18 edited

Legend:

Unmodified
Added
Removed

  • trunk/SophyaPI/PIext/Makefile

    r1286 r1315  
    44 
    55all: $(LIB)libPIext.a
    6 $(LIB)libPIext.a : $(OBJ)basexecut.o $(OBJ)cxxexecutor.o $(OBJ)cxxexecwin.o $(OBJ)nobjmgr.o $(OBJ)nomgadapter.o $(OBJ)nomgfdadapter.o $(OBJ)nomhistadapter.o $(OBJ)nomimagadapter.o $(OBJ)nomskymapadapter.o $(OBJ)nomspecrespadapter.o $(OBJ)nomtmatvecadapter.o $(OBJ)pawexecut.o $(OBJ)piacmd.o $(OBJ)piafitting.o $(OBJ)pigfd1.o $(OBJ)pigfd2.o $(OBJ)pihisto.o $(OBJ)pihisto2d.o $(OBJ)piinit.o $(OBJ)pintup3d.o $(OBJ)pintuple.o $(OBJ)pipodrw.o $(OBJ)pisiadw.o $(OBJ)pistdimgapp.o $(OBJ)pitvmaad.o $(OBJ)servnobjm.o
     6$(LIB)libPIext.a : $(OBJ)basexecut.o $(OBJ)cxxexecutor.o $(OBJ)cxxexecwin.o $(OBJ)nobjmgr.o $(OBJ)nomgadapter.o $(OBJ)nomgfdadapter.o $(OBJ)nomhistadapter.o $(OBJ)nomimagadapter.o $(OBJ)nomskymapadapter.o $(OBJ)nomspecrespadapter.o $(OBJ)nomtarradapter.o $(OBJ)nomtmatvecadapter.o $(OBJ)pawexecut.o $(OBJ)piacmd.o $(OBJ)piafitting.o $(OBJ)pigfd1.o $(OBJ)pigfd2.o $(OBJ)pihisto.o $(OBJ)pihisto2d.o $(OBJ)piinit.o $(OBJ)pintup3d.o $(OBJ)pintuple.o $(OBJ)pipodrw.o $(OBJ)pisiadw.o $(OBJ)pistdimgapp.o $(OBJ)pitvmaad.o $(OBJ)servnobjm.o
    77        $(AR) $(ARFLAGS)  $@ $?
    88ifeq ($(CXX),cxx)
    … …  
    1111 
    1212clean:
    13         rm -f $(OBJ)basexecut.o $(OBJ)cxxexecutor.o $(OBJ)cxxexecwin.o $(OBJ)nobjmgr.o $(OBJ)nomgadapter.o $(OBJ)nomgfdadapter.o $(OBJ)nomhistadapter.o $(OBJ)nomimagadapter.o $(OBJ)nomskymapadapter.o $(OBJ)nomspecrespadapter.o $(OBJ)nomtmatvecadapter.o $(OBJ)pawexecut.o $(OBJ)piacmd.o $(OBJ)piafitting.o $(OBJ)pigfd1.o $(OBJ)pigfd2.o $(OBJ)pihisto.o $(OBJ)pihisto2d.o $(OBJ)piinit.o $(OBJ)pintup3d.o $(OBJ)pintuple.o $(OBJ)pipodrw.o $(OBJ)pisiadw.o $(OBJ)pistdimgapp.o $(OBJ)pitvmaad.o $(OBJ)servnobjm.o
     13        rm -f $(OBJ)basexecut.o $(OBJ)cxxexecutor.o $(OBJ)cxxexecwin.o $(OBJ)nobjmgr.o $(OBJ)nomgadapter.o $(OBJ)nomgfdadapter.o $(OBJ)nomhistadapter.o $(OBJ)nomimagadapter.o $(OBJ)nomskymapadapter.o $(OBJ)nomspecrespadapter.o $(OBJ)nomtarradapter.o $(OBJ)nomtmatvecadapter.o $(OBJ)pawexecut.o $(OBJ)piacmd.o $(OBJ)piafitting.o $(OBJ)pigfd1.o $(OBJ)pigfd2.o $(OBJ)pihisto.o $(OBJ)pihisto2d.o $(OBJ)piinit.o $(OBJ)pintup3d.o $(OBJ)pintuple.o $(OBJ)pipodrw.o $(OBJ)pisiadw.o $(OBJ)pistdimgapp.o $(OBJ)pitvmaad.o $(OBJ)servnobjm.o
    1414ifeq ($(CXX),cxx)
    1515        cd $(REPM); rm -f *.o
    … …  
    103103 $(INC)objfio.h \
    104104 $(INC)mutyv.h \
    105  $(INC)strutilxx.h nomgadapter.h \
     105 $(INC)strutilxx.h \
     106 $(INC)cxxcmplnk.h nomgadapter.h \
    106107 $(INC)pidrawer.h \
    107108 $(INC)pibwdggen.h \
    … …  
    614615 $(INC)specrespvector.h \
    615616 $(INC)gaussfilt.h
     617$(OBJ)nomtarradapter.o: nomtarradapter.cc \
     618 $(INC)machdefs.h \
     619 $(INC)datatype.h nomtarradapter.h \
     620 nomgadapter.h $(INC)ppersist.h \
     621 $(INC)pexceptions.h \
     622 $(INC)gnumd5.h \
     623 $(INC)anydataobj.h \
     624 $(INC)pidrawer.h \
     625 $(INC)pibwdggen.h \
     626 $(INC)pisysdep.h \
     627 $(INC)piwdgx.h \
     628 $(INC)piwdggen.h \
     629 $(INC)pimsghandler.h \
     630 $(INC)picolist.h \
     631 $(INC)picmap.h \
     632 $(INC)picmapx.h \
     633 $(INC)picmapgen.h \
     634 $(INC)pigraphx.h \
     635 $(INC)pigraphgen.h \
     636 $(INC)pifontx.h \
     637 $(INC)pifontgen.h \
     638 $(INC)pigraphuc.h \
     639 $(INC)pievthandler.h \
     640 $(INC)psfile.h \
     641 $(INC)parradapter.h \
     642 $(INC)lut.h \
     643 $(INC)ntupintf.h \
     644 $(INC)generalfit.h \
     645 $(INC)tvector.h \
     646 $(INC)tmatrix.h \
     647 $(INC)tarray.h \
     648 $(INC)basarr.h \
     649 $(INC)mutyv.h \
     650 $(INC)dvlist.h \
     651 $(INC)objfio.h \
     652 $(INC)ndatablock.h \
     653 $(INC)utilarr.h \
     654 $(INC)generaldata.h \
     655 $(INC)poly.h \
     656 $(INC)peida.h \
     657 $(INC)utils.h \
     658 $(INC)perrors.h \
     659 $(INC)fmath.h \
     660 $(INC)fioarr.h
    616661$(OBJ)nomtmatvecadapter.o: nomtmatvecadapter.cc \
    617662 $(INC)machdefs.h \
    … …  
    11691214 nomimagadapter.h $(INC)cimage.h \
    11701215 $(INC)fioarr.h nomtmatvecadapter.h \
    1171  nomskymapadapter.h $(INC)pixelmap.h \
     1216 nomtarradapter.h nomskymapadapter.h \
     1217 $(INC)pixelmap.h \
    11721218 $(INC)spherepos.h \
    11731219 $(INC)unitvector.h \

  • trunk/SophyaPI/PIext/nobjmgr.cc

    r1276 r1315  
    551551  return(false);
    552552}
    553 AnyDataObj * cloneobj = adap->CloneDataObj();
     553AnyDataObj * cloneobj = adap->CloneDataObj(true);
    554554delete adap;
    555555if (cloneobj == NULL) {

  • trunk/SophyaPI/PIext/nomgadapter.cc

    r1224 r1315  
    3737
    3838/* --Methode-- */
    39 AnyDataObj* NObjMgrAdapter::CloneDataObj()
     39AnyDataObj* NObjMgrAdapter::CloneDataObj(bool)
    4040{
    4141string s = typeid(*mObj).name();

  • trunk/SophyaPI/PIext/nomgadapter.h

    r1224 r1315  
    3333
    3434  // Returns a new data-object, cloning the original object
    35   virtual AnyDataObj*           CloneDataObj();
     35  virtual AnyDataObj*           CloneDataObj(bool share=false);
    3636
    3737  // Copies data from object o

  • trunk/SophyaPI/PIext/nomgfdadapter.cc

    r1207 r1315  
    4444
    4545/* --Methode-- */
    46 AnyDataObj* NOMAdapter_GeneralFitData::CloneDataObj()
     46AnyDataObj* NOMAdapter_GeneralFitData::CloneDataObj(bool /*share*/)
    4747{
    4848return( new GeneralFitData(*mG) );

  • trunk/SophyaPI/PIext/nomgfdadapter.h

    r1207 r1315  
    2323  virtual string           GetDataObjType();
    2424
    25   virtual AnyDataObj*      CloneDataObj();
     25  virtual AnyDataObj*      CloneDataObj(bool share=false);
    2626
    2727  virtual void             SavePPF(POutPersist& s, string const & nom);

  • trunk/SophyaPI/PIext/nomhistadapter.cc

    r1214 r1315  
    4747
    4848/* --Methode-- */
    49 AnyDataObj* NOMAdapter_Histo::CloneDataObj()
     49AnyDataObj* NOMAdapter_Histo::CloneDataObj(bool /*share*/)
    5050{
    5151mHis->UpdateHisto();  // pour le cas ou c'est un HProf
    … …  
    223223
    224224/* --Methode-- */
    225 AnyDataObj* NOMAdapter_Histo2D::CloneDataObj()
     225AnyDataObj* NOMAdapter_Histo2D::CloneDataObj(bool /*share*/)
    226226{
    227227return ( new Histo2D(*mHis) );
    … …  
    411411
    412412/* --Methode-- */
    413 AnyDataObj* NOMAdapter_NTuple::CloneDataObj()
     413AnyDataObj* NOMAdapter_NTuple::CloneDataObj(bool /*share*/)
    414414{
    415415return ( new NTuple(*mNt) );
    … …  
    476476
    477477/* --Methode-- */
    478 AnyDataObj* NOMAdapter_XNTuple::CloneDataObj()
     478AnyDataObj* NOMAdapter_XNTuple::CloneDataObj(bool /*share*/)
    479479{
    480480return ( new XNTuple(*mNt) );

  • trunk/SophyaPI/PIext/nomhistadapter.h

    r1207 r1315  
    2727  virtual string                GetDataObjType();
    2828
    29   virtual AnyDataObj*           CloneDataObj();
     29  virtual AnyDataObj*           CloneDataObj(bool share=false);
    3030
    3131  //  virtual void                      ReadFits(string const & flnm);
    … …  
    7575  virtual string                GetDataObjType();
    7676
    77   virtual AnyDataObj*           CloneDataObj();
     77  virtual AnyDataObj*           CloneDataObj(bool share=false);
    7878
    7979  //  virtual void                      ReadFits(string const & flnm);
    … …  
    125125  virtual string                GetDataObjType();
    126126
    127   virtual AnyDataObj*           CloneDataObj();
     127  virtual AnyDataObj*           CloneDataObj(bool share=false);
    128128
    129129  //  virtual void                      ReadFits(string const & flnm);
    … …  
    151151  virtual string                GetDataObjType();
    152152
    153   virtual AnyDataObj*           CloneDataObj();
     153  virtual AnyDataObj*           CloneDataObj(bool share=false);
    154154
    155155  //  virtual void                      ReadFits(string const & flnm);

  • trunk/SophyaPI/PIext/nomimagadapter.cc

    r1237 r1315  
    5959/* --Methode-- */
    6060template <class T>
    61 AnyDataObj* NOMAdapter_Image<T>::CloneDataObj()
     61AnyDataObj* NOMAdapter_Image<T>::CloneDataObj(bool share)
    6262{
    6363#ifdef SANS_EVOLPLANCK
    … …  
    6666else return ( new FitsImage<T>(*fima) );
    6767#else
    68 return( new Image<T>(*mImg ) );
     68return( new Image<T>(*mImg, share) );
    6969#endif
    7070}

  • trunk/SophyaPI/PIext/nomimagadapter.h

    r1214 r1315  
    2525  virtual NObjMgrAdapter*       Clone(AnyDataObj* o);
    2626  virtual string                GetDataObjType();
    27   virtual AnyDataObj*           CloneDataObj();
     27  virtual AnyDataObj*           CloneDataObj(bool share=false);
    2828
    2929  //  virtual void                      ReadFits(string const & flnm);

  • trunk/SophyaPI/PIext/nommatvecadapter.cc

    r1207 r1315  
    4040
    4141/* --Methode-- */
    42 AnyDataObj* NOMAdapter_Vector::CloneDataObj()
     42AnyDataObj* NOMAdapter_Vector::CloneDataObj(bool /*share*/)
    4343{
    4444return ( new Vector(*mVec) );
    … …  
    203203
    204204/* --Methode-- */
    205 AnyDataObj* NOMAdapter_Matrix::CloneDataObj()
     205AnyDataObj* NOMAdapter_Matrix::CloneDataObj(bool /*share*/)
    206206{
    207207return ( new Matrix(*mMtx) );

  • trunk/SophyaPI/PIext/nommatvecadapter.h

    r1207 r1315  
    3131  virtual string                GetDataObjType();
    3232
    33   virtual AnyDataObj*           CloneDataObj();
     33  virtual AnyDataObj*           CloneDataObj(bool share=false);
    3434
    3535  //  virtual void                      ReadFits(string const & flnm);
    … …  
    8181  virtual string                GetDataObjType();
    8282
    83   virtual AnyDataObj*           CloneDataObj();
     83  virtual AnyDataObj*           CloneDataObj(bool share=false);
    8484
    8585  //  virtual void                      ReadFits(string const & flnm);

  • trunk/SophyaPI/PIext/nomskymapadapter.cc

    r1237 r1315  
    9595/* --Methode-- */
    9696template <class T>
    97 AnyDataObj* NOMAdapter_PixelMap<T>::CloneDataObj()
     97AnyDataObj* NOMAdapter_PixelMap<T>::CloneDataObj(bool share)
    9898{
    9999LocalMap<T>* lm = dynamic_cast< LocalMap<T> * >(mMap);
    100 if (lm != NULL) return( new LocalMap<T>(*lm) );
     100if (lm != NULL) return( new LocalMap<T>(*lm, share) );
    101101SphereThetaPhi<T>* st = dynamic_cast< SphereThetaPhi<T> * >(mMap);
    102 if (st != NULL) return( new SphereThetaPhi<T>(*st) );
     102if (st != NULL) return( new SphereThetaPhi<T>(*st, share) );
    103103SphereHEALPix<T>* sg = dynamic_cast< SphereHEALPix<T> * >(mMap);
    104 if (sg != NULL) return( new SphereHEALPix<T>(*sg) );
     104if (sg != NULL) return( new SphereHEALPix<T>(*sg, share) );
    105105return(NULL);
    106106}

  • trunk/SophyaPI/PIext/nomskymapadapter.h

    r1165 r1315  
    2828  virtual string                GetDataObjType();
    2929
    30   virtual AnyDataObj*           CloneDataObj();
     30  virtual AnyDataObj*           CloneDataObj(bool share=false);
    3131
    3232  //  virtual void                      ReadFits(string const & flnm);

  • trunk/SophyaPI/PIext/nomtmatvecadapter.cc

    r1237 r1315  
    6363/* --Methode-- */
    6464template <class T>
    65 AnyDataObj* NOMAdapter_TMatrix<T>::CloneDataObj()
     65AnyDataObj* NOMAdapter_TMatrix<T>::CloneDataObj(bool share)
    6666{
    6767if (mMtx == NULL)  return(NULL);
    6868TVector<T>* v = dynamic_cast<TVector<T> *>(mMtx);
    69 if (v != NULL) return( new TVector<T>(*v, false) );
    70 else return ( new TMatrix<T>(*mMtx, false) );
     69if (v != NULL) return( new TVector<T>(*v, share) );
     70else return ( new TMatrix<T>(*mMtx, share) );
    7171}
    7272
    … …  
    204204}
    205205
     206// ---- Specialisation pour complexes -----
     207GeneralFitData* NOMAdapter_TMatrix< complex<r_4> >::GetGeneralFitData(bool& adel
     208 ,GeneralFitData::FitErrType errtype,double errscale,double errmin
     209 ,int i1,int i2,int j1,int j2)
     210{
     211  return(NULL);
     212}
     213
     214AnyDataObj* NOMAdapter_TMatrix< complex<r_4> >::FitResidusObj(GeneralFit& mfit)
     215{
     216  return(NULL);
     217}
     218
     219AnyDataObj* NOMAdapter_TMatrix< complex<r_4> >::FitFunctionObj(GeneralFit& mfit)
     220{
     221  return(NULL);
     222}
     223
     224GeneralFitData* NOMAdapter_TMatrix< complex<r_8> >::GetGeneralFitData(bool& adel
     225 ,GeneralFitData::FitErrType errtype,double errscale,double errmin
     226 ,int i1,int i2,int j1,int j2)
     227{
     228  return(NULL);
     229}
     230
     231AnyDataObj* NOMAdapter_TMatrix< complex<r_8> >::FitResidusObj(GeneralFit& mfit)
     232{
     233  return(NULL);
     234}
     235
     236AnyDataObj* NOMAdapter_TMatrix< complex<r_8> >::FitFunctionObj(GeneralFit& mfit)
     237{
     238  return(NULL);
     239}
    206240
    207241// -------------------------------------------------------------
    … …  
    269303
    270304/* --Methode-- */
    271 r_8* NTupInt_TMatrix< complex<float> >::GetLineD(int n) const
     305r_8* NTupInt_TMatrix< complex<r_4> >::GetLineD(int n) const
    272306{
    273307int i,j;
    … …  
    286320}
    287321
    288 r_8* NTupInt_TMatrix< complex<double> >::GetLineD(int n) const
     322r_8* NTupInt_TMatrix< complex<r_8> >::GetLineD(int n) const
    289323{
    290324int i,j;
    … …  
    310344#pragma define_template NOMAdapter_TMatrix<r_4>
    311345#pragma define_template NOMAdapter_TMatrix<r_8>
    312 //#pragma define_template NOMAdapter_TMatrix< complex<r_4> >
    313 //#pragma define_template NOMAdapter_TMatrix< complex<r_8> >
     346#pragma define_template NOMAdapter_TMatrix< complex<r_4> >
     347#pragma define_template NOMAdapter_TMatrix< complex<r_8> >
    314348//#pragma define_template NTupInt_TMatrix<uint_2>
    315349//#pragma define_template NTupInt_TMatrix<int_2>
    … …  
    327361template class NOMAdapter_TMatrix<r_4>;
    328362template class NOMAdapter_TMatrix<r_8>;
    329 //template class NOMAdapter_TMatrix< complex<r_4> >;
    330 //template class NOMAdapter_TMatrix< complex<r_8> >;
     363template class NOMAdapter_TMatrix< complex<r_4> >;
     364template class NOMAdapter_TMatrix< complex<r_8> >;
    331365// template class NTupInt_TMatrix<uint_2>;
    332366// template class NTupInt_TMatrix<int_2>;

  • trunk/SophyaPI/PIext/nomtmatvecadapter.h

    r1207 r1315  
    2626  virtual string                GetDataObjType();
    2727
    28   virtual AnyDataObj*           CloneDataObj();
     28  virtual AnyDataObj*           CloneDataObj(bool share=false);
    2929
    3030  //  virtual void                      ReadFits(string const & flnm);

  • trunk/SophyaPI/PIext/objlist.list

    r1251 r1315  
    99nomskymapadapter.o
    1010nomspecrespadapter.o
     11nomtarradapter.o
    1112nomtmatvecadapter.o
    1213pawexecut.o

  • trunk/SophyaPI/PIext/piinit.cc

    r1207 r1315  
    1414#include <complex>
    1515#include "nomtmatvecadapter.h"
     16#include "nomtarradapter.h"
    1617#include "nomskymapadapter.h"
    1718#include "spherethetaphi.h"
    … …  
    5556  serv->RegisterClass(new Matrix, new NOMAdapter_Matrix );
    5657#else
     58  serv->RegisterClass(new TArray<int_4>, new NOMAdapter_TArray<int_4> );
     59  serv->RegisterClass(new TArray<r_4>, new NOMAdapter_TArray<r_4> );
     60  serv->RegisterClass(new TArray<r_8>, new NOMAdapter_TArray<r_8> );
     61  serv->RegisterClass(new TArray<complex<r_4> >, new NOMAdapter_TArray<complex<r_4> > );
     62  serv->RegisterClass(new TArray<complex<r_8> >, new NOMAdapter_TArray<complex<r_8> > );
     63
    5764  serv->RegisterClass(new TVector<int_4>, new NOMAdapter_TMatrix<int_4> );
    5865  serv->RegisterClass(new TMatrix<int_4>, new NOMAdapter_TMatrix<int_4> );
    … …  
    6168  serv->RegisterClass(new TVector<r_8>, new NOMAdapter_TMatrix<r_8> );
    6269  serv->RegisterClass(new TMatrix<r_8>, new NOMAdapter_TMatrix<r_8> );
    63   //CMV// serv->RegisterClass(new TVector<complex<r_4> >, new NOMAdapter_TMatrix<complex<r_4> > );
    64   //CMV// serv->RegisterClass(new TMatrix<complex<r_4> >, new NOMAdapter_TMatrix<complex<r_4> > );
    65   //CMV// serv->RegisterClass(new TVector<complex<r_8> >, new NOMAdapter_TMatrix<complex<r_8> > );
    66   //CMV// serv->RegisterClass(new TMatrix<complex<r_8> >, new NOMAdapter_TMatrix<complex<r_8> > );
     70  serv->RegisterClass(new TVector<complex<r_4> >, new NOMAdapter_TMatrix<complex<r_4> > );
     71  serv->RegisterClass(new TMatrix<complex<r_4> >, new NOMAdapter_TMatrix<complex<r_4> > );
     72  serv->RegisterClass(new TVector<complex<r_8> >, new NOMAdapter_TMatrix<complex<r_8> > );
     73  serv->RegisterClass(new TMatrix<complex<r_8> >, new NOMAdapter_TMatrix<complex<r_8> > );
    6774#endif
    6875
Note: See TracChangeset for help on using the changeset viewer.