Changeset 768 in Sophya


Ignore:
Timestamp:
Mar 2, 2000, 6:19:19 PM (26 years ago)
Author:
ansari
Message:

Reorganisation - PeidaInit() -> SophyaInit() - Reza 2/3/2000

Location:
trunk/SophyaProg/Tests
Files:
19 edited

Legend:

Unmodified
Added
Removed

  • trunk/SophyaProg/Tests/Makefile

    r742 r768  
    1515LIBF =  $(SLB)libsophya.so
    1616#LIBS = -L$(SLB) -lPI -lsophya -lm
    17 LIBS = -L$(SLB) -lsophya -lm
     17LIBS = -L$(SLB) -lextsophya -lsophya -lm
    1818ifeq ($(MACHEROS),Linux)
    1919LIBS := $(LIBS) -ldl

  • trunk/SophyaProg/Tests/fitsServTest.cc

    r476 r768  
    99#include "spherethetaphi.h"
    1010#include "localmap.h"
     11#include "skymapinit.h"
    1112
    1213
    1314int main()
    1415{
     16  // ----- ATTENTION -------
     17  // Initialisation de Sophya
     18  // A faire au debut de main()
     19  SophyaInit();
    1520
    16   //PeidaImagesInitiator imgini;
    17   //  PeidaInit();
    1821   FitsIoServer fserv;
    1922  int nsmax=32;

  • trunk/SophyaProg/Tests/fitsioGorski.cc

    r571 r768  
    99#include "nbrandom.h"
    1010#include "fitsioserver.h"
     11#include "skymapinit.h"
     12
    1113int main()
    1214{
    1315
    1416  // ----- ATTENTION -------
    15   // Initialisation de Peida
     17  // Initialisation de Sophya
    1618  // A faire au debut de main()
    17   PeidaInit();
     19  SophyaInit();
    1820
    1921  int m=4;

  • trunk/SophyaProg/Tests/fitsioImage.cc

    r573 r768  
    77#include "nbrandom.h"
    88#include "fitsioserver.h"
     9#include "skymapinit.h"
     10
     11
    912int main()
    1013{
    1114
    1215  // ----- ATTENTION -------
    13   // Initialisation de Peida
     16  // Initialisation de Sophya
    1417  // A faire au debut de main()
    15   PeidaInit();
     18  SophyaInit();
     19
    1620  ImageR4  img(20, 10);
    1721  r_4 compt=0;

  • trunk/SophyaProg/Tests/fitsioLocMap.cc

    r573 r768  
    88#include "nbrandom.h"
    99#include "fitsioserver.h"
     10#include "skymapinit.h"
     11
     12
    1013int main()
    1114{
    1215
    1316  // ----- ATTENTION -------
    14   // Initialisation de Peida
     17  // Initialisation de Sophya
    1518  // A faire au debut de main()
    16   PeidaInit();
     19  SophyaInit();
    1720
    1821  int nx=10;

  • trunk/SophyaProg/Tests/fitsioSphere.cc

    r573 r768  
    88#include "nbrandom.h"
    99#include "fitsioserver.h"
     10#include "skymapinit.h"
     11
    1012int main()
    1113{
    1214
    1315  // ----- ATTENTION -------
    14   // Initialisation de Peida
     16  // Initialisation de Sophya
    1517  // A faire au debut de main()
    16   PeidaInit();
     18  SophyaInit();
    1719
    1820  int m=4;

  • trunk/SophyaProg/Tests/sphg0.cc

    r583 r768  
    88{
    99  double teta,phi;
    10   PeidaInit();
     10  SophyaInit();
     11
    1112  int  m=32;
    1213  SphereGorski<double> sph(m);

  • trunk/SophyaProg/Tests/t_scan.cc

    r573 r768  
    55#include "nbmath.h"
    66// Utilisation de la classe Scan
    7 #include "outilsinit.h"
     7#include "sambainit.h"
    88#include "scan.h"
    99#include "ppersist.h"
    … …  
    1111{
    1212  // ----- ATTENTION -------
    13   // Initialisation de Peida
     13  // Initialisation de Sophya
    1414  // A faire au debut de main()
    15   PeidaInit();
     15  SophyaInit();
     16
    1617  int nbpix;
    1718  float teta,phi;

  • trunk/SophyaProg/Tests/tblitz.cc

    r274 r768  
    44#include "timing.h"
    55#include "cimage.h"
    6 #include "outilsinit.h"
     6#include "ntoolsinit.h"
    77// Test des NDataBlock
    88#include "ndatablock.h"
    … …  
    1313main(int narg, char *arg[])
    1414{
    15 PeidaInit();
     15SophyaInit();
    1616InitTim();
    1717

  • trunk/SophyaProg/Tests/testfitsio.cc

    r573 r768  
    99#include "spherethetaphi.h"
    1010#include "localmap.h"
    11 
     11#include "skymapinit.h"
    1212
    1313int main()
    1414{
    1515
    16   //PeidaImagesInitiator imgini;
    17   //  PeidaInit();
     16  SophyaInit();
     17
    1818   FitsIoServer fserv;
    1919  int nsmax=32;

  • trunk/SophyaProg/Tests/tfft.cc

    r715 r768  
     1#include "machdefs.h"
     2
    13#include <math.h>
    24#include <iostream.h>
    35
     6#include "nbrandom.h"
    47#include "fftpserver.h"
    58#include "fftmserver.h"
    6 #include "sambainit.h"
     9#include "fftwserver.h"
     10#include "ntoolsinit.h"
    711
    812#include "timing.h"
    913
     14
     15static bool inp_typ_random = false ;  // true -> random input
    1016
    1117template <class T>
    … …  
    3743  cout << " DBG/4 outc " << outc.NElts()  << endl;
    3844
    39   for (int i=0; i<num ; i++){
     45  if (inp_typ_random)
     46    for (int i=0; i<num ; i++){
     47      ino[i] = in[i] = GauRnd(0., 1.);
     48      inc[i] = complex<T> (in[i], 0.);
     49    }
     50  else for (int i=0; i<num ; i++){
    4051    ino[i] = in[i] = 0.5 + cos(2*M_PI*(double)i/(double)num)
    4152                         + 2*sin(4*M_PI*(double)i/(double)num);
    … …  
    158169{
    159170
    160   PeidaInit();
     171  SophyaInit();
    161172  InitTim();   // Initializing the CPU timer
    162173
    163174  if (narg < 4) {
    164     cout << "tfft/ args error - \n  Usage tfft size p/P/M f/d [NPrtFC NPrt] \n"
    165          << " p=FFTPackTest  P=FFTPack, M=FFTMayer, f=float, d=double " << endl;
     175    cout << "tfft/ args error - \n  Usage tfft size px/Px/Mx/Wx f/d [NPrtFC NPrt] \n"
     176         << " p=FFTPackTest  P=FFTPack, M=FFTMayer, W= FFTWServer"
     177         << " x=0 -> Random input - f=float, d=double " << endl;
    166178    exit(0);
    167179  }
    … …  
    169181  FFTPackServer fftp;
    170182  FFTMayerServer fftm;
     183
     184  FFTWServer fftw;
     185
     186  inp_typ_random = false;
     187  if (arg[2][1] == '0')  inp_typ_random = true;
    171188
    172189  int sz = atoi(arg[1]);
    … …  
    177194  FFTServerInterface * ffts;
    178195  if (*arg[2] == 'M')  ffts = fftm.Clone();
     196  else if (*arg[2] == 'W')  ffts = fftw.Clone();
    179197  else ffts = fftp.Clone();
    180198

  • trunk/SophyaProg/Tests/timg.cc

    r298 r768  
    22#include <iostream.h>
    33// Utilisation de la classe Image<T>
    4 #include "outilsinit.h"
     4#include "ntoolsinit.h"
    55#include "cimage.h"
    66// Utilisation des generateurs aleatoires
    … …  
    1919
    2020// ----- ATTENTION -------
    21 // Initialisation de Peida
     21// Initialisation de Sophya
    2222// A faire au debut de main()
    23 PeidaInit();
     23SophyaInit();
    2424
    2525cout << " ........ Debut de timg.cc ....... " << endl;

  • trunk/SophyaProg/Tests/tnt.cc

    r720 r768  
    44#include <iostream.h>
    55
    6 #include "outilsinit.h"
     6#include "histinit.h"
    77#include "dvlist.h"
    88#include "ntuple.h"
    … …  
    1616int main(int narg, char *arg[])
    1717{
    18   PeidaInit();
     18  SophyaInit();
    1919  if (narg < 2) {
    2020    cout << " tnt/Erreur arg - Usage: tnt d/n/x/X \n"

  • trunk/SophyaProg/Tests/tobjio.cc

    r742 r768  
    66
    77// Pour le test
    8 #include "sambainit.h"
    9 #include "cvector.h"
    10 #include "matrix.h"
     8#include "histinit.h"
    119#include "histos.h"
    1210#include "histos2.h"
    … …  
    2119{
    2220
    23   PeidaInit();
     21  SophyaInit();
    2422
    2523  cout << "Hash check, OMatrix : " << hex << PIOPersist::Hash("OMatrix") << dec << endl;

  • trunk/SophyaProg/Tests/tspm.cc

    r606 r768  
    11#include <iostream.h>
    2 #include "sambainit.h"
     2#include "skymapinit.h"
    33#include "spheregorski.h"
    44#include "spherethetaphi.h"
    … …  
    2727  double gmoy, gsig;
    2828
    29   PeidaInit();
     29  SophyaInit();
    3030  InitTim();   // Initializing the CPU timer
    3131  if ((narg > 1) && (strcmp(arg[1],"-h") == 0) )  {

  • trunk/SophyaProg/Tests/tspm2.cc

    r606 r768  
    11#include <iostream.h>
    22#include <math.h>
    3 #include "sambainit.h"
     3#include "skymapinit.h"
    44#include "spheregorski.h"
    55#include "spherethetaphi.h"
    … …  
    8484  double gmoy=0., gsig=0.;
    8585
    86   PeidaInit();
     86  SophyaInit();
    8787  InitTim();   // Initializing the CPU timer
    8888  if ((narg > 1) && (strcmp(arg[1],"-h") == 0) )  {

  • trunk/SophyaProg/Tests/tstndblk.cc

    r583 r768  
    55#include <string.h>
    66#include <math.h>
    7 #include "outilsinit.h"
     7#include "ntoolsinit.h"
    88#include "pexceptions.h"
    99#include "ndatablock.h"
    … …  
    1212int main(int narg,char *arg[])
    1313{
    14 PeidaInit();
     14SophyaInit();
    1515float x1[5] = {1.,2.,3.,4.,5.};
    1616float x2[5] = {10.,20.,30.,40.,50.};

  • trunk/SophyaProg/Tests/tsttmat.cc

    r552 r768  
    55#include <string.h>
    66#include <math.h>
    7 #include "outilsinit.h"
     7#include "ntoolsinit.h"
    88#include "pexceptions.h"
    9 #include "matrix.h"
    109#include "tmatrix.h"
    1110#include "nbrandom.h"
    … …  
    1413int main(int narg,char *arg[])
    1514{
    16 PeidaInit();
     15SophyaInit();
    1716r_8 v[3][4] = {{1,2,3,4},{4,5,6,5},{7,8,9,10}};
    1817

  • trunk/SophyaProg/Tests/tsttvec.cc

    r552 r768  
    55#include <string.h>
    66#include <math.h>
    7 #include "outilsinit.h"
     7#include "ntoolsinit.h"
    88#include "pexceptions.h"
    9 #include "cvector.h"
     9
    1010#include "tvector.h"
    1111#include "nbrandom.h"
    … …  
    1414int main(int narg,char *arg[])
    1515{
    16 PeidaInit();
     16SophyaInit();
    1717r_8 v[10] = {1,2,3,4,5,6,7,8,9,10};
    1818{
Note: See TracChangeset for help on using the changeset viewer.