Changeset 3601 in Sophya for trunk/SophyaLib/NTools/tsfunran.cc

Timestamp:

Apr 28, 2009, 5:23:19 PM (16 years ago)

Author:

cmv

Message:

adaptation de TsFunRan a RandomGeneratorInterface , cmv 28/04/2009

File:

• trunk/SophyaLib/NTools/tsfunran.cc (modified) (12 diffs)

trunk/SophyaLib/NTools/tsfunran.cc

@@ -1 +1 @@
 #include "sopnamsp.h"
 #include "machdefs.h"
+#include <iostream>
 #include "pexceptions.h"
+#include "randr48.h"
 #include "tsfunran.h"
-#include <iostream>
 
 
@@ -43 +44 @@
 */
 TsFunRan::TsFunRan(TsFunRan::Func f, r_8 xMin, r_8 xMax, int_4 nBin, bool pdf)
-  : Histo(xMin,xMax,nBin)
+  : Histo(xMin,xMax,nBin), rg_(NULL), internal_rg_(false)
 {
  if(nBin<=1)
    throw RangeCheckError("TsFunRan::TsFunRan less than 2 bins requested");
  for(int_4 i=0;i<nBin;i++) (*this)(i) = f(BinCenter(i));
- rg_ = new RandomGenerator(1,false);
+ rg_ = new DR48RandGen();
  create_DF(pdf);
 }
@@ -57 +58 @@
 */
 TsFunRan::TsFunRan(ClassFunc& f, r_8 xMin, r_8 xMax, int_4 nBin, bool pdf)
-  : Histo(xMin,xMax,nBin)
+  : Histo(xMin,xMax,nBin), rg_(NULL), internal_rg_(false)
 {
  if(nBin<=1)
    throw RangeCheckError("TsFunRan::TsFunRan less than 2 bins requested");
  for(int_4 i=0;i<nBin;i++) (*this)(i) = f(BinCenter(i));
- rg_ = new RandomGenerator(1,false);
+ rg_ = new DR48RandGen();
  create_DF(pdf);
 }
@@ -74 +75 @@
 */
 TsFunRan::TsFunRan(r_8 *tab, int_4 nBin, bool pdf)
-: Histo(-0.5,nBin-0.5,nBin)
+: Histo(-0.5,nBin-0.5,nBin), rg_(NULL), internal_rg_(false)
 {
  if(nBin<=1)
    throw RangeCheckError("TsFunRan::TsFunRan less than 2 bins requested");
  for(int_4 i=0;i<nBin;i++) (*this)(i) = tab[i];
- rg_ = new RandomGenerator(1,false);
+ rg_ = new DR48RandGen();
  create_DF(pdf);
 }
@@ -92 +93 @@
 */
 TsFunRan::TsFunRan(r_8 *tab, int_4 nBin, r_8 xMin, r_8 xMax, bool pdf)
-: Histo(xMin,xMax,nBin)
+: Histo(xMin,xMax,nBin), rg_(NULL), internal_rg_(false)
 {
  if(nBin<=1)
    throw RangeCheckError("TsFunRan::TsFunRan less than 2 bins requested");
  for(int_4 i=0;i<nBin;i++) (*this)(i) = tab[i];
- rg_ = new RandomGenerator(1,false);
+ rg_ = new DR48RandGen();
  create_DF(pdf);
 }
@@ -105 +106 @@
 */
 TsFunRan::TsFunRan(TVector<r_8>& tab, int_4 nBin, bool pdf)
-: Histo(-0.5,nBin-0.5,nBin)
+: Histo(-0.5,nBin-0.5,nBin), rg_(NULL), internal_rg_(false)
 {
  if(nBin<=1)
    throw RangeCheckError("TsFunRan::TsFunRan less than 2 bins requested");
  for(int_4 i=0;i<nBin;i++) (*this)(i) = tab(i);
- rg_ = new RandomGenerator(1,false);
+ rg_ = new DR48RandGen();
  create_DF(pdf);
 }
@@ -118 +119 @@
 */
 TsFunRan::TsFunRan(TVector<r_8>& tab, int_4 nBin, r_8 xMin, r_8 xMax, bool pdf)
-: Histo(xMin,xMax,nBin)
+: Histo(xMin,xMax,nBin), rg_(NULL), internal_rg_(false)
 {
  if(nBin<=1)
    throw RangeCheckError("TsFunRan::TsFunRan less than 2 bins requested");
  for(int_4 i=0;i<nBin;i++) (*this)(i) = tab(i);
- rg_ = new RandomGenerator(1,false);
+ rg_ = new DR48RandGen();
  create_DF(pdf);
 }
@@ -134 +135 @@
 */
 TsFunRan::TsFunRan(Histo &h, bool pdf)
-  : Histo(h)
+  : Histo(h), rg_(NULL), internal_rg_(false)
 {
  if(mBins<=1)
    throw RangeCheckError("TsFunRan::TsFunRan less than 2 bins requested");
- rg_ = new RandomGenerator(1,false);
+ rg_ = new DR48RandGen();
  create_DF(pdf);
 }
@@ -145 +146 @@
 /*! Creator by copy */
 TsFunRan::TsFunRan(const TsFunRan& fh)
-  : Histo(fh)
-{
-  rg_ = new RandomGenerator(*fh.rg_);
+  : Histo(fh), rg_(fh.rg_), internal_rg_(false)
+{
 }
 
@@ -153 +153 @@
 /*! Creator by default */
 TsFunRan::TsFunRan(void)
-{
-  rg_ = new RandomGenerator(1,false);
+  : rg_(NULL), internal_rg_(false)
+{
 }
 
@@ -160 +160 @@
 TsFunRan::~TsFunRan(void)
 {
-  if(rg_!=NULL) delete rg_;
+  if(rg_!=NULL && internal_rg_) delete rg_;
 }
 
@@ -180 +180 @@
 
 /********* Methode *********/
-void TsFunRan::SetRandomGenerator(RandomGenerator& rg)
-{
-  if(rg_!=NULL) delete rg_;
-  rg_ = new RandomGenerator(rg);
+void TsFunRan::SetRandomGenerator(RandomGeneratorInterface* rg)
+{
+  if(rg_!=NULL && internal_rg_) delete rg_;
+  rg_ = rg;
 }