Import Geant4 10.3.0 source tree

source/run/include/G4RNGHelper.hh

@@ -44,72 +44,57 @@
 #include "globals.hh"
 
 template <class T>
-class G4TemplateRNGHelper {
-private:
-    static G4TemplateRNGHelper* instance;
-public:
+class G4TemplateRNGHelper
+{
+  public:
     // The container is modeled as a (shared) singleton
-    static G4TemplateRNGHelper* GetInstance() {
-        if (!instance)
-        {
-          instance = new G4TemplateRNGHelper();
-        }
-        return instance;
-    }
+    static G4TemplateRNGHelper<T>* GetInstance();
     typedef std::vector<T> SeedsQueue;
     typedef typename SeedsQueue::size_type SeedsQueueSize_type;
         
-private:
-    G4TemplateRNGHelper()
+    virtual ~G4TemplateRNGHelper()
     {
-          offset=0;
-          nev_filled=0;
-          nev_total=0;
-	  nRandParEvent=0;
-    }
-
-public:
-    virtual ~G4TemplateRNGHelper() {
-        Clear();
-        instance = 0;
+      Clear();
+      instance = 0;
     }
     
     //Returns seed given id
-    virtual const T GetSeed(const G4int& sdId ) {
-        G4int seedId = sdId - 2*offset;
-        if ( seedId < static_cast<G4int>(seeds.size()) )
-        {
-            T& seed = seeds[seedId];
-            return seed;
-        }
-        G4ExceptionDescription msg;
-        msg << "No seed number "<<seedId<<"("<<seeds.size()<<" available)\n"
-            << " Original seed number "<<sdId<<" filled so far "<<offset;
-        G4Exception("G4RNGHelper::GetSeed","Run0115", FatalException,msg);
-        return T();
+    virtual const T GetSeed(const G4int& sdId )
+    {
+      G4int seedId = sdId - 2*offset;
+      if ( seedId < static_cast<G4int>(seeds.size()) )
+      {
+         T& seed = seeds[seedId];
+         return seed;
+      }
+      G4ExceptionDescription msg;
+      msg << "No seed number "<<seedId<<"("<<seeds.size()<<" available)\n"
+          << " Original seed number "<<sdId<<" filled so far "<<offset;
+      G4Exception("G4RNGHelper::GetSeed","Run0115", FatalException,msg);
+      return T();
     }
     
     //Adds one seed to the collection
     void AddOneSeed( const T& seed ) { seeds.push_back(seed); }
 
     //Fills N primary seed pairs
-    void Fill(double* dbl,int nev,int nev_tot,int nrpe)
+    void Fill(G4double* dbl,G4int nev,G4int nev_tot,G4int nrpe)
     {
       seeds.clear();
-      for(int i=0;i<nrpe*nev;i++)
-      { seeds.push_back((long)(100000000L*dbl[i])); }
+      for(G4int i=0;i<nrpe*nev;i++)
+      { seeds.push_back((G4long)(100000000L*dbl[i])); }
       offset = 0;
       nev_filled = nev;
       nev_total = nev_tot;
       nRandParEvent = nrpe;
     }
 
-    void Refill(double* dbl, int nev)
+    void Refill(G4double* dbl, G4int nev)
     {
       if(nev==0) return;
       seeds.clear();
-      for(int i=0;i<nRandParEvent*nev;i++)
-      { seeds.push_back((long)(100000000L*dbl[i])); }
+      for(G4int i=0;i<nRandParEvent*nev;i++)
+      { seeds.push_back((G4long)(100000000L*dbl[i])); }
       offset += nev_filled;
       nev_filled = nev;
     }
@@ -119,18 +104,31 @@ public:
     
     //Empty the seeds container
     virtual void Clear() { seeds.clear(); }
-protected:
+
+  protected:
     SeedsQueue seeds;
     // Note: following numbers are number of events.
     //       seeds are generated for nRandParEvent times n_event
-    int offset;
-    int nev_filled;
-    int nev_total;
-    int nRandParEvent;
+    G4int offset;
+    G4int nev_filled;
+    G4int nev_total;
+    G4int nRandParEvent;
+
+  private:
+    G4TemplateRNGHelper()
+    {
+      offset=0;
+      nev_filled=0;
+      nev_total=0;
+      nRandParEvent=0;
+    }
+
+  private:
+    static G4TemplateRNGHelper<T>* instance;
 };
 
-typedef G4TemplateRNGHelper<long> G4RNGHelper;
+typedef G4TemplateRNGHelper<G4long> G4RNGHelper;
 typedef G4TemplateRNGHelper<G4String> G4StringRNGHelper;
-typedef std::queue<long> G4SeedsQueue;
+typedef std::queue<G4long> G4SeedsQueue;
 
 #endif