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

trunk/Cosmo/SimLSS/cmvschdist.cc

@@ -17 +17 @@
 #include <math.h>
 #include <unistd.h>
+#include "sophyainit.h"
 #include "timing.h"
 #include "histos.h"
 #include "ntuple.h"
+//#include "randr48.h"
+#include "randfmt.h"
 #include "srandgen.h"
 #include "perandom.h"
@@ -46 +49 @@
 int main(int narg,char *arg[])
 {
+SophyaInit();
  double h75 = 0.71 / 0.75;
  double nstar = 0.006*pow(h75,3.);  //  
@@ -62 +66 @@
  string nametoppf = "";
 
+ // --- 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,"h0avm:N:n:r:R:W:")) != -1) {
@@ -99 +110 @@
      break;
    case 'a' :
-     Auto_Ini_Ranf(5);
+     AutoInitRand(5);
      break;
    case 'h' :
@@ -201 +212 @@
  }
 
+ delete RandGen;
+
  PrtTim("End of Job");