Changeset 244 in Sophya for trunk/SophyaLib/NTools


Ignore:
Timestamp:
Apr 22, 1999, 6:18:52 PM (26 years ago)
Author:
ansari
Message:

beaucoup modifs rz+cmv 22/4/99

Location:
trunk/SophyaLib/NTools
Files:
47 edited

Legend:

Unmodified
Added
Removed

  • trunk/SophyaLib/NTools/NTools.o.list

    r220 r244  
    2525nbrandom.o
    2626nbtri.o
     27ndatablock.o
    2728ntuple.o
    2829outilsinit.o

  • trunk/SophyaLib/NTools/cimage.cc

    r220 r244  
    55// LAL (Orsay) / IN2P3-CNRS  DAPNIA/SPP (Saclay) / CEA
    66
    7 // $Id: cimage.cc,v 1.1.1.1 1999-04-09 17:57:57 ansari Exp $       
    8 
    9 
    10 #include "defs.h"
     7// $Id: cimage.cc,v 1.2 1999-04-22 16:18:19 ansari Exp $       
     8
     9
     10#include "machdefs.h"
    1111#include <string.h>
    1212#include <stdio.h>

  • trunk/SophyaLib/NTools/cspline.cc

    r220 r244  
    1 #include "defs.h"
     1#include "machdefs.h"
    22
    33#include <stdlib.h>

  • trunk/SophyaLib/NTools/cspline.h

    r220 r244  
    22#define CSPLINE_H_SEEN
    33
    4 #include "defs.h"
    5 #include "machine.h"
     4#include "machdefs.h"
    65#include "cvector.h"
    76

  • trunk/SophyaLib/NTools/cvector.cc

    r220 r244  
    1 #include "defs.h"
     1#include "machdefs.h"
    22#include <string.h>
    33#include "cvector.h"

  • trunk/SophyaLib/NTools/datacards.cc

    r220 r244  
    1 // $Id: datacards.cc,v 1.1.1.1 1999-04-09 17:57:55 ansari Exp $
     1// $Id: datacards.cc,v 1.2 1999-04-22 16:18:22 ansari Exp $
    22//
    33// Datacards, acquisition EROS II
    … …  
    88// DAPNIA/SPP (Saclay) / CEA
    99
    10 #include "defs.h"
     10#include "machdefs.h"
    1111#include "datacards.h"
    1212#include <algorithm>

  • trunk/SophyaLib/NTools/datatypes.cc

    r220 r244  
    55// LAL (Orsay) / IN2P3-CNRS  DAPNIA/SPP (Saclay) / CEA
    66
    7 #include "defs.h"
    87#include "datatypes.h"
    98

  • trunk/SophyaLib/NTools/datatypes.h

    r220 r244  
    77#define DATATYPES_H_SEEN
    88
    9 #include "machine.h"
     9#include "machdefs.h"
    1010
    1111

  • trunk/SophyaLib/NTools/datime.c

    r220 r244  
    1 #include "defs.h"
     1#include "machdefs.h"
    22#include <stdlib.h>
    33#include <stdio.h>

  • trunk/SophyaLib/NTools/difeq.cc

    r220 r244  
    1 #include "defs.h"
    21#include "difeq.h"
    32#include "ctimer.h"

  • trunk/SophyaLib/NTools/difeq.h

    r220 r244  
    33#define DIFEQ_H_SEEN
    44
    5 #include "defs.h"
    6 #include "exceptions.h"
     5#include "machdefs.h"
     6#include "pexceptions.h"
    77#include "cvector.h"
    88

  • trunk/SophyaLib/NTools/dvlist.cc

    r220 r244  
    33// LAL (Orsay) / IN2P3-CNRS  DAPNIA/SPP (Saclay) / CEA
    44
    5 #include "defs.h"
     5#include "machdefs.h"
    66#include <stdlib.h>
    77#include <stdio.h>

  • trunk/SophyaLib/NTools/dynccd.cc

    r220 r244  
    1 #include "defs.h"
     1#include "machdefs.h"
    22#include <stdlib.h>
    33#include <stdio.h>

  • trunk/SophyaLib/NTools/dynccd.h

    r220 r244  
    44#define DYNCCD_H_SEEN
    55
    6 #include "machine.h"
    7 #include "exceptions.h"
     6#include "machdefs.h"
     7#include "pexceptions.h"
    88#include "ppersist.h"
    99

  • trunk/SophyaLib/NTools/fct1dfit.cc

    r220 r244  
    1 #include "defs.h"
     1#include "machdefs.h"
    22#include <stdio.h>
    33#include <stdlib.h>

  • trunk/SophyaLib/NTools/fct2dfit.cc

    r220 r244  
    1 #include "defs.h"
     1#include "machdefs.h"
    22#include <stdio.h>
    33#include <stdlib.h>

  • trunk/SophyaLib/NTools/generaldata.cc

    r220 r244  
    1 #include "defs.h"
     1#include "machdefs.h"
    22#include <stdio.h>
    33#include <stdlib.h>

  • trunk/SophyaLib/NTools/generaldata.h

    r220 r244  
    22#define GENERALDATA_SEEN
    33
    4 #include "exceptions.h"
     4#include "pexceptions.h"
    55#include "ppersist.h"
    66#include "poly.h"

  • trunk/SophyaLib/NTools/generalfit.cc

    r220 r244  
    1 #include "defs.h"
     1#include "machdefs.h"
    22#include <stdio.h>
    33#include <stdlib.h>

  • trunk/SophyaLib/NTools/generalfit.h

    r220 r244  
    33#define GENERALFIT_SEEN
    44
    5 #include "exceptions.h"
     5#include "pexceptions.h"
    66#include "matrix.h"
    77#include "cvector.h"

  • trunk/SophyaLib/NTools/hisprof.cc

    r220 r244  
    1 #include "defs.h"
     1#include "machdefs.h"
    22#include <string.h>
    33#include <stdio.h>

  • trunk/SophyaLib/NTools/histos.cc

    r220 r244  
    11//
    2 // $Id: histos.cc,v 1.1.1.1 1999-04-09 17:57:56 ansari Exp $
    3 //
    4 
    5 #include "defs.h"
     2// $Id: histos.cc,v 1.2 1999-04-22 16:18:36 ansari Exp $
     3//
     4
     5#include "machdefs.h"
    66#include <string.h>
    77#include <stdio.h>

  • trunk/SophyaLib/NTools/histos2.cc

    r241 r244  
    33//
    44
    5 #include "defs.h"
     5#include "machdefs.h"
    66
    77#include <string.h>

  • trunk/SophyaLib/NTools/histos2.h

    r220 r244  
    66#define HISTOS2_SEEN
    77
    8 #include "defs.h"
     8#include "machdefs.h"
    99#include <string>
    1010

  • trunk/SophyaLib/NTools/imageop.cc

    r237 r244  
    1 #include "defs.h"
     1#include "machdefs.h"
    22#include <stdio.h>
    33#include <stdlib.h>

  • trunk/SophyaLib/NTools/integ.cc

    r220 r244  
    1 #include "defs.h"
    21#include "integ.h"
    32#include "generalfit.h"

  • trunk/SophyaLib/NTools/integ.h

    r220 r244  
    33// integ.h
    44//
    5 // $Id: integ.h,v 1.1.1.1 1999-04-09 17:57:55 ansari Exp $
     5// $Id: integ.h,v 1.2 1999-04-22 16:18:40 ansari Exp $
    66//
    77
    … …  
    99#define INTEG_H_SEEN
    1010
    11 #include "defs.h"
    12 #include "exceptions.h"
     11#include "machdefs.h"
     12#include "pexceptions.h"
    1313#include <set>
    1414#if defined(__KCC__)

  • trunk/SophyaLib/NTools/linfit.cc

    r220 r244  
    1 #include "defs.h"
     1#include "machdefs.h"
    22#include "peida.h"
    33#include "linfit.h"

  • trunk/SophyaLib/NTools/matrix.cc

    r220 r244  
    1 // $Id: matrix.cc,v 1.1.1.1 1999-04-09 17:57:56 ansari Exp $
    2 
    3 #include "defs.h"
     1// $Id: matrix.cc,v 1.2 1999-04-22 16:18:41 ansari Exp $
     2
     3#include "machdefs.h"
    44#include <string.h>
    55#include <iostream.h>

  • trunk/SophyaLib/NTools/median.h

    r220 r244  
    11// This may look like C code, but it is really -*- C++ -*-
    22
    3 #include "defs.h"
     3#include "machdefs.h"
    44
    55// Filtre median, retourne la valeur mediane du tableau tab.

  • trunk/SophyaLib/NTools/nbmath.h

    r220 r244  
    44#define NBMATH_H_SEEN
    55
    6 #include <machine.h>
     6#include "machdefs.h"
    77
    88#ifdef __cplusplus

  • trunk/SophyaLib/NTools/nbrandom.c

    r220 r244  
    1 #include "defs.h"
     1#include "machdefs.h"
    22#include <stdlib.h>
    33#include <stdio.h>
    44#include <string.h>
     5#include <math.h>
    56#include <sys/time.h>
    6 #include "machine.h"
     7#include "machdefs.h"
    78#include "nbmath.h"
    89#include "nbrandom.h"

  • trunk/SophyaLib/NTools/nbrandom.h

    r220 r244  
    55#define NBRANDOM_H_SEEN
    66
    7 #include "defs.h"
     7#include "machdefs.h"
    88#include <stdlib.h>
    99#ifdef __mac__

  • trunk/SophyaLib/NTools/nbtri.h

    r220 r244  
    66
    77
    8 #include <machine.h>
     8#include "machdefs.h"
    99
    1010#ifdef __cplusplus

  • trunk/SophyaLib/NTools/outilsinit.cc

    r220 r244  
    4141  PPRegister(GeneralFitData);
    4242
    43   PPersistMgr::RegisterClass(RzImage::classId,  RzImage::Create);
    44   { ImageU2 iu2;
    45   PPersistMgr::RegisterClass(iu2.ClassId(),  ImageU2::Create); }
    46   { ImageI2 ii2;
    47   PPersistMgr::RegisterClass(ii2.ClassId(),  ImageI2::Create); }
    48   { ImageI4 ii4;
    49   PPersistMgr::RegisterClass(ii4.ClassId(),  ImageI4::Create); }
    50   { ImageR4 ir4;
    51   PPersistMgr::RegisterClass(ir4.ClassId(),  ImageR4::Create); }
     43  PPRegister(RzImage);
     44  PPRegister(ImageU2);
     45  PPRegister(ImageI2);
     46  PPRegister(ImageI4);
     47  PPRegister(ImageR4);
    5248
    5349  //PPersistMgr::RegisterClass(Matrix::classId,  Matrix::Create);

  • trunk/SophyaLib/NTools/peida.h

    r220 r244  
    44#define PEIDA_SEEN
    55
    6 #include "defs.h"
     6#include "machdefs.h"
    77#include "utils.h"
    8 #include "machine.h"
    98#include "perrors.h"
    10 #include "exceptions.h"
     9#include "pexceptions.h"
    1110#include "fmath.h"
    1211

  • trunk/SophyaLib/NTools/pemath.h

    r220 r244  
    55#define PEMATH_SEEN
    66
    7 #include "machine.h"
     7#include "machdefs.h"
    88
    99#define  Pi     (double) (3.1415926535898)    /* c'est Pi */

  • trunk/SophyaLib/NTools/perandom.cc

    r220 r244  
    1 #include "defs.h"
     1#include "machdefs.h"
     2#include "pexceptions.h"
    23#include "perandom.h"
    34#include "pemath.h"
    … …  
    198199{
    199200  x = ranX->BinRandom();
    200   FAILNIL(ranY[x]);
     201  //  FAILNIL(ranY[x]);  Ne compile pas $CHECK$ Reza 22/04/99
    201202  y = ranY[x]->BinRandom();
    202203}
    … …  
    211212  x = ranX->Random();
    212213  int i = int(ceil(x));
    213   FAILNIL(ranY[i]);
     214  //  FAILNIL(ranY[i]);  Ne compile pas $CHECK$ Reza 22/04/99
    214215  y = ranY[i]->Random();
    215216}

  • trunk/SophyaLib/NTools/perandom.h

    r220 r244  
    66#define PERANDOM_SEEN
    77
     8#include "machdefs.h"
    89#include <stdlib.h>
    9 #include "defs.h"
    10 #include "machine.h"
    1110#include "histos.h"
    1211#include "nbrandom.h"

  • trunk/SophyaLib/NTools/poly.cc

    r220 r244  
    1 #include "defs.h"
     1#include "machdefs.h"
    22#include "poly.h"
    33#include "linfit.h"
    … …  
    320320  Realloc(dg, true);
    321321
    322   #ifdef DEBUG
     322#ifdef DEBUG
    323323  int r = nr; int c = nc;
    324   #endif
     324#endif
    325325
    326326  Vector::ReadSelf(s);
    327327
     328#ifdef DEBUG
    328329  DBASSERT(r == nr && c == nc);
     330#endif
    329331  UpdateDeg();
    330332
    … …  
    796798  Realloc(dgx, dgy);
    797799
    798   #ifdef DEBUG
     800#ifdef DEBUG
    799801  int r = nr; int c = nc;
    800   #endif
     802#endif
    801803
    802804  Vector::ReadSelf(s);
    803805
     806#ifdef DEBUG
    804807  DBASSERT(r == nr && c == nc);
     808#endif
    805809  UpdateDeg();
    806810}

  • trunk/SophyaLib/NTools/rk4cdifeq.cc

    r220 r244  
    1 #include "defs.h"
     1#include "machdefs.h"
    22#include "rk4cdifeq.h"
    33#include "ctimer.h"

  • trunk/SophyaLib/NTools/rzimage.cc

    r220 r244  
    55// LAL (Orsay) / IN2P3-CNRS  DAPNIA/SPP (Saclay) / CEA
    66
    7 //  $Id: rzimage.cc,v 1.1.1.1 1999-04-09 17:57:57 ansari Exp $
    8 
    9 #include "defs.h"
     7//  $Id: rzimage.cc,v 1.2 1999-04-22 16:18:49 ansari Exp $
     8
     9#include "machdefs.h"
    1010#include <stdlib.h>
    1111#include <stdio.h>

  • trunk/SophyaLib/NTools/rzvect.h

    r220 r244  
    77#define RZVECT_SEEN
    88
    9 #include "machine.h"
    10 #include "exceptions.h"
     9#include "machdefs.h"
     10#include "pexceptions.h"
    1111#include "perrors.h"
    1212

  • trunk/SophyaLib/NTools/simplesort.cc

    r220 r244  
    11//
    2 // $Id: simplesort.cc,v 1.1.1.1 1999-04-09 17:57:58 ansari Exp $
     2// $Id: simplesort.cc,v 1.2 1999-04-22 16:18:50 ansari Exp $
    33//
    44
    5 #include "defs.h"
     5#include "machdefs.h"
    66#include "simplesort.h"
    77#include <stdlib.h>

  • trunk/SophyaLib/NTools/tabmath.cc

    r220 r244  
    1 #include "defs.h"
     1#include "machdefs.h"
    22#include "tabmath.h"
    33

  • trunk/SophyaLib/NTools/utils.cc

    r220 r244  
    11// This may look like C code, but it is really -*- C++ -*-
    22//
    3 // $Id: utils.cc,v 1.1.1.1 1999-04-09 17:57:57 ansari Exp $
     3// $Id: utils.cc,v 1.2 1999-04-22 16:18:51 ansari Exp $
    44//
    55
    6 #include "defs.h"
     6#include "machdefs.h"
    77#include "utils.h"
    8 #include "exceptions.h"
     8#include "pexceptions.h"
    99#include <string.h>
    1010
    1111// MemCpy marche meme en cas de recouvrement.
    12 
    1312void* MemCpy(void* dest, const void* source, size_t n)
    1413{

  • trunk/SophyaLib/NTools/utils.h

    r220 r244  
    11// This may look like C code, but it is really -*- C++ -*-
    22//
    3 // $Id: utils.h,v 1.1.1.1 1999-04-09 17:57:56 ansari Exp $
     3// $Id: utils.h,v 1.2 1999-04-22 16:18:52 ansari Exp $
    44//
    55
    … …  
    77#define UTILS_EA
    88
    9 #include "defs.h"
     9#include "machdefs.h"
    1010#include <string.h>
    1111#include <string>
Note: See TracChangeset for help on using the changeset viewer.