Changeset 3615 in Sophya for trunk/FrEROS/AnaLC/nbsread.cc

Timestamp:

May 1, 2009, 1:34:31 PM (16 years ago)

Author:

cmv

Message:

Modifs relatives a l'introduction de RandomGeneratorInterface + delete de srandgen.c, cmv 01/05/2009

File:

• trunk/FrEROS/AnaLC/nbsread.cc (modified) (4 diffs)

trunk/FrEROS/AnaLC/nbsread.cc

@@ -1 +1 @@
 /* lecture des fichiers de suivi:     cmv 21/12/93 */
 #include "machdefs.h"
+#include "sopnamsp.h"  // using SOPHYA namespace
 #include <stdio.h>
 #include <stdlib.h>
@@ -7 +8 @@
 #include <signal.h>
 
+#include "sophyainit.h"
 #include "fsvcache.h"
 #include "nbtri.h"
-#include "nbrandom.h"
 #include "nbmath.h"
 #include "strutil.h"
@@ -106 +107 @@
 if (narg < 2) usage(0);
 if( !strcmp(arg[1],"-h") != 0 ) usage(1);
+
+/*------------------------------------------*/
+/*-------- Initialisation Aleatoire --------*/
+/*------------------------------------------*/
+ SophyaInit();
+ RandGen = new DR48RandGen;
+ RandomGeneratorInterface::SetGlobalRandGenP(RandGen);
+
 
 /*------------------------------------------*/
@@ -417 +426 @@
 
 printf("Nombre total d'etoiles lues %d\n",netoiles);
-
-exit(0);
+delete RandGen;
+
+return(0);
 }