Changeset 584 in Sophya


Ignore:
Timestamp:
Nov 17, 1999, 11:08:41 AM (26 years ago)
Author:
ercodmgr
Message:

Modifs pour SOPHYA , TMatrix, PixelMap, ... Reza 17/11/99

Location:
trunk/SophyaPI/PIext
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/SophyaPI/PIext/exclude

    r533 r584  
     1nomtmatvecadapter.cc
    12modrecst.cc
    23userfitfunex.c

  • trunk/SophyaPI/PIext/exclude_dpc

    r497 r584  
    11modrecst.cc
    22userfitfunex.c
     3nommatvecadapter.cc
    34nomstladapter.cc
    45pistlist.cc

  • trunk/SophyaPI/PIext/nobjmgr.cc

    r546 r584  
    768768#else
    769769  s.GotoTagNum(i);
     770  nom = s.GetTagName(i);
    770771  try {
    771772    obj = s.ReadObject();
    772     char buffnom[64];
    773     sprintf(buffnom,"O%d",i);
    774     nom = buffnom;
    775773  }
    776774  catch (IOExc iox) {

  • trunk/SophyaPI/PIext/nomhistadapter.cc

    r546 r584  
    5151mHis->Write(pos,0,tag);
    5252#else
    53 string s = typeid(*mObj).name();
    54 cout << "NOMAdapter_Histo::SavePPF() - Error : Not supported for " << s << endl;
     53ObjFileIO<Histo> fio(mHis);
     54fio.Write(pos, nom);
    5555#endif
    5656}
    … …  
    169169mHis->Write(pos,0,tag);
    170170#else
    171 string s = typeid(*mObj).name();
    172 cout << "NOMAdapter_Histo2D::SavePPF() - Error : Not supported for " << s << endl;
     171ObjFileIO<Histo2D> fio(mHis);
     172fio.Write(pos, nom);
    173173#endif
    174174}
    … …  
    297297mNt->Write(pos,0,tag);
    298298#else
    299 string s = typeid(*mObj).name();
    300 cout << "NOMAdapter_NTuple::SavePPF() - Error : Not supported for " << s << endl;
     299ObjFileIO<NTuple> fio(mNt);
     300fio.Write(pos, nom);
    301301#endif
    302302}

  • trunk/SophyaPI/PIext/piinit.cc

    r495 r584  
    55#include "nomhistadapter.h"
    66#include "nomgfdadapter.h"
    7 #include "nommatvecadapter.h"
    87#include "nomimagadapter.h"
    98
    109#ifdef SANS_EVOLPLANCK
     10#include "nommatvecadapter.h"
    1111#include "fitsimage.h"
    1212#include "nomstladapter.h"
     13#else
     14#include <complex>
     15#include "nomtmatvecadapter.h"
     16#include "nomskymapadapter.h"
     17#include "spherethetaphi.h"
     18#include "spheregorski.h"
     19#include "localmap.h"
    1320#endif
    1421
    … …  
    3643  serv->RegisterClass(new GeneralFitData, new NOMAdapter_GeneralFitData );
    3744
     45#ifdef SANS_EVOLPLANCK
    3846  serv->RegisterClass(new Vector, new NOMAdapter_Vector );
    3947  serv->RegisterClass(new Matrix, new NOMAdapter_Matrix );
     48#else
     49  serv->RegisterClass(new TVector<int_4>, new NOMAdapter_TMatrix<int_4> );
     50  serv->RegisterClass(new TMatrix<int_4>, new NOMAdapter_TMatrix<int_4> );
     51  serv->RegisterClass(new TVector<r_4>, new NOMAdapter_TMatrix<r_4> );
     52  serv->RegisterClass(new TMatrix<r_4>, new NOMAdapter_TMatrix<r_4> );
     53  serv->RegisterClass(new TVector<r_8>, new NOMAdapter_TMatrix<r_8> );
     54  serv->RegisterClass(new TMatrix<r_8>, new NOMAdapter_TMatrix<r_8> );
     55  serv->RegisterClass(new TVector<complex<float> >, new NOMAdapter_TMatrix<complex<float> > );
     56  serv->RegisterClass(new TMatrix<complex<float> >, new NOMAdapter_TMatrix<complex<float> > );
     57  serv->RegisterClass(new TVector<complex<double> >, new NOMAdapter_TMatrix<complex<double> > );
     58  serv->RegisterClass(new TMatrix<complex<double> >, new NOMAdapter_TMatrix<complex<double> > );
     59#endif
    4060
    4161  serv->RegisterClass(new Image<uint_2>, new  NOMAdapter_Image<uint_2> );
    … …  
    5171
    5272  serv->RegisterClass(new StarList, new NOMAdapter_StarList );
     73#else
     74  serv->RegisterClass(new LocalMap<r_4>, new NOMAdapter_PixelMap<r_4> );
     75  serv->RegisterClass(new SphereThetaPhi<r_4>, new NOMAdapter_PixelMap<r_4> );
     76  serv->RegisterClass(new SphereGorski<r_4>, new NOMAdapter_PixelMap<r_4> );
     77  serv->RegisterClass(new LocalMap<r_8>, new NOMAdapter_PixelMap<r_8> );
     78  serv->RegisterClass(new SphereThetaPhi<r_8>, new NOMAdapter_PixelMap<r_8> );
     79  serv->RegisterClass(new SphereGorski<r_8>, new NOMAdapter_PixelMap<r_8> );
     80  serv->RegisterClass(new LocalMap<complex<float> >, new NOMAdapter_PixelMap<complex<float> > );
     81  serv->RegisterClass(new SphereThetaPhi<complex<float> >, new NOMAdapter_PixelMap<complex<float> > );
     82  serv->RegisterClass(new SphereGorski<complex<float> >, new NOMAdapter_PixelMap<complex<float> > );
     83  serv->RegisterClass(new LocalMap<complex<double> >, new NOMAdapter_PixelMap<complex<double> > );
     84  serv->RegisterClass(new SphereThetaPhi<complex<double> >, new NOMAdapter_PixelMap<complex<double> > );
     85  serv->RegisterClass(new SphereGorski<complex<double> >, new NOMAdapter_PixelMap<complex<double> > );
     86
    5387#endif
    5488

  • trunk/SophyaPI/PIext/pipodrw.cc

    r205 r584  
    5454}
    5555
    56 // ----------------------------------------------------------
    57 // Adaptateur de vecteurs Peida++ a P1DArrayAdapter
    58 // ----------------------------------------------------------
    59 
    60 /* --Methode-- */
    61 POVectorAdapter::POVectorAdapter(Vector* v, bool ad)
    62         : P1DArrayAdapter(v->NElts())
    63 {
    64 aDel = ad; mVec = v;
    65 }
    66 
    67 /* --Methode-- */
    68 POVectorAdapter::~POVectorAdapter()
    69 {
    70 if (aDel) delete mVec;
    71 }
    72 
    73 /* --Methode-- */
    74 double POVectorAdapter::Value(int i)
    75 {
    76 return((*mVec)(i));
    77 }
    7856
    7957// ----------------------------------------------------------
    … …  
    9977{
    10078return((*mH2d)(ix, iy));
     79}
     80
     81
     82#ifdef SANS_EVOLPLANCK
     83
     84// ----------------------------------------------------------
     85// Adaptateur de vecteurs Peida++ a P1DArrayAdapter
     86// ----------------------------------------------------------
     87
     88/* --Methode-- */
     89POVectorAdapter::POVectorAdapter(Vector* v, bool ad)
     90        : P1DArrayAdapter(v->NElts())
     91{
     92aDel = ad; mVec = v;
     93}
     94
     95/* --Methode-- */
     96POVectorAdapter::~POVectorAdapter()
     97{
     98if (aDel) delete mVec;
     99}
     100
     101/* --Methode-- */
     102double POVectorAdapter::Value(int i)
     103{
     104return((*mVec)(i));
    101105}
    102106
    … …  
    126130}
    127131
     132#endif   // SANS_EVOLPLANCK
    128133

  • trunk/SophyaPI/PIext/pipodrw.h

    r551 r584  
    1313
    1414#ifdef SANS_EVOLPLANCK
    15 #include "cvector.h"
    16 #include "matrix.h"
    1715class GeneralFunction;
    1816#else
    19 #include "tvector.h"
    20 #include "tmatrix.h"
    2117namespace SOPHYA {class GeneralFunction;}
    2218#endif
    … …  
    3632
    3733
    38 // Adaptateur de vecteurs Peida++ a P1DArrayAdapter
    39 class POVectorAdapter : public P1DArrayAdapter {
    40 public :
    41                   POVectorAdapter(Vector* v, bool ad=false);
    42   virtual         ~POVectorAdapter();
    43   virtual double  Value(int i);
    44 
    45 protected:
    46   bool aDel;
    47   Vector* mVec;
    48 };
    4934
    5035// Adaptateur d'Histo-2D Peida++ a P2DArrayAdapter
    … …  
    5944  bool aDel;
    6045  Histo2D* mH2d;
     46};
     47
     48#ifdef SANS_EVOLPLANCK
     49#include "cvector.h"
     50#include "matrix.h"
     51
     52// Adaptateur de vecteurs Peida++ a P1DArrayAdapter
     53class POVectorAdapter : public P1DArrayAdapter {
     54public :
     55                  POVectorAdapter(Vector* v, bool ad=false);
     56  virtual         ~POVectorAdapter();
     57  virtual double  Value(int i);
     58
     59protected:
     60  bool aDel;
     61  Vector* mVec;
    6162};
    6263
    … …  
    7576};
    7677
     78#endif   // SANS_EVOLPLANCK
    7779
    7880#endif

  • trunk/SophyaPI/PIext/pisiadw.cc

    r495 r584  
    211211  { printf("ObjMgrWind::SetFile Exception= %ld (%s) \n", (long)merr, PeidaExc(merr));
    212212  ok = false; } ENDTRY;
     213#else
     214try {
     215  mPin = new PInPersist(flnm);
     216  }
     217catch (IOExc iox) {
     218  cerr << "ObjMgrWind::SetFile/Error Exception - Msg= " << iox.Msg() << endl;
     219  ok = false;
     220  }
     221#endif
    213222
    214223if (!ok) { mPin = NULL;  dap->SetReady(); return; }
    … …  
    220229  return;
    221230}
    222 #endif
    223231if (objlist)  delete objlist;
    224232SetSize(ttx,tty);
    … …  
    238246  objlist->AppendItem(strg, 5000+i);
    239247}
     248#else
     249string tn;
     250for(i=0; i<mPin->NbTags(); i++) {
     251  tn = mPin->GetTagName(i);
     252  objlist->AppendItem(tn.c_str(), 5000+i);
     253}
    240254#endif
    241255

  • trunk/SophyaPI/PIext/servnobjm.cc

    r558 r584  
    2525#include "tmatrix.h"
    2626#include "tvector.h"
     27#include "pitvmaad.h"
    2728#endif
    2829
Note: See TracChangeset for help on using the changeset viewer.