Changeset 3615 in Sophya for trunk/Cosmo/SimLSS/cmvobserv3d.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/Cosmo/SimLSS/cmvobserv3d.cc (modified) (6 diffs)

trunk/Cosmo/SimLSS/cmvobserv3d.cc

@@ -7 +7 @@
 #include <math.h>
 #include <unistd.h>
+#include "sophyainit.h"
 #include "timing.h"
 #include "ntuple.h"
 #include "matharr.h"
+#include "randfmt.h"
+//#include "randr48.h"
+#include "srandgen.h"
 
 #include "constcosmo.h"
@@ -71 +75 @@
 int main(int narg,char *arg[])
 {
+ SophyaInit();
  InitTim();
 
@@ -146 +151 @@
  system("date -u");
 
+ // --- Choix du generateur aleatoire (a faire ICI imperativement avant AutoInitRand)
+ FMTRandGen *RandGen = new FMTRandGen;
+ RandGen->SelectGaussianAlgo(C_Gaussian_RandLibSNorm);
+ RandGen->SelectPoissonAlgo(C_Poisson_Ahrens);
+ RandomGeneratorInterface::SetGlobalRandGenP(RandGen);
+ 
+ // --- Decodage des arguments
  char c;
  while((c = getopt(narg,arg,"ha0PWSV2U:G:F:x:y:z:s:Z:M:A:T:N:Q:R:8:O:o:")) != -1) {
@@ -151 +163 @@
   switch (c) {
   case 'a' :
-    Auto_Ini_Ranf(5);
+    AutoInitRand(5);
     break;
   case '0' :
@@ -262 +274 @@
      <<whattowrt[4]<<endl;
  cout<<"rootnameout="<<rootnameout<<endl;
+ ShowRandom();
+ cout<<"   First random is: "<<drand01()<<endl;
 
  string tagobs = rootnameout + ".ppf";
@@ -772 +786 @@
  }
 
+ //-----------------------------------------------------------------
+ delete RandGen;
  PrtTim(">>>> End Of Job");
+
  return 0;
 }