save the WCSimRandomParameters options in WCSimRootOptions. To do this, more significant changes were required:

- moving of WCSimRandomGenerator enumeration to WCSimEnumerations & renaming as WCSimRandomGenerator_t
- adding pointer to WCSimRandomParameters in WCSimRunAction

Author: tdealtry

WCSim.cc

@@ -90,7 +90,7 @@ int main(int argc,char** argv)
   runManager->SetUserAction(myGeneratorAction);
 
 
-  WCSimRunAction* myRunAction = new WCSimRunAction(WCSimdetector);
+  WCSimRunAction* myRunAction = new WCSimRunAction(WCSimdetector, randomparameters);
 
   //save all the options from WCSimTuningParameters & WCSimPhysicsListFactory
   //(set in tuning_parameters.mac & jobOptions*.mac)

include/WCSimEnumerations.hh

@@ -15,12 +15,19 @@ typedef enum EDigitizerType {
   kDigitizerSKI
 } DigitizerType_t;
 
+typedef enum ERandomGeneratorType {
+  RANDOM_E_RANLUX=1,
+  RANDOM_E_RANECU=2,
+  RANDOM_E_HEPJAMES=3
+} WCSimRandomGenerator_t;
+
 class WCSimEnumerations
 {
 public:
 
   static std::string EnumAsString(DigitizerType_t d);
   static std::string EnumAsString(TriggerType_t t);
+  static std::string EnumAsString(WCSimRandomGenerator_t r);
   static TriggerType_t TriggerTypeFromString(std::string s);
 
 };

include/WCSimRandomParameters.hh

@@ -1,17 +1,12 @@
 #ifndef WCSimRandomParameters_h
 #define WCSimRandomParameters_h 1
 #include "WCSimRandomMessenger.hh"
+#include "WCSimRootOptions.hh"
 #include "CLHEP/Random/Random.h"
 #include "CLHEP/Random/RanluxEngine.h"
 #include "CLHEP/Random/JamesRandom.h"
 #include "CLHEP/Random/RanecuEngine.h"
 
-typedef enum {
-  RANDOM_E_RANLUX=1,
-  RANDOM_E_RANECU=2,
-  RANDOM_E_HEPJAMES=3
-} WCSimRandomGenerator;
-
 class WCSimRandomParameters
 {
 
@@ -24,8 +19,8 @@ public:
     }
   ~WCSimRandomParameters() {delete RandomMessenger;}
 
-  WCSimRandomGenerator GetGenerator() {return generator; }
-  void SetGenerator(WCSimRandomGenerator rng) 
+  WCSimRandomGenerator_t GetGenerator() {return generator; }
+  void SetGenerator(WCSimRandomGenerator_t rng)
   {
     switch (rng)
       {
@@ -66,8 +61,14 @@ public:
       seed = iseed;
     }
 
+  void SaveOptionsToOutput(WCSimRootOptions * wcopt)
+  {
+    wcopt->SetRandomSeed(seed);
+    wcopt->SetRandomGenerator(generator);
+  }
+
 private:
-  WCSimRandomGenerator generator;
+  WCSimRandomGenerator_t generator;
   int seed;
   WCSimRandomMessenger *RandomMessenger;
 };

include/WCSimRootOptions.hh

@@ -12,6 +12,8 @@
 #include "TClonesArray.h"
 #include <string>
 
+#include "WCSimEnumerations.hh"
+
 class TDirectory;
 using std::string;
 
@@ -113,8 +115,13 @@ public:
   //WCSimPrimaryGeneratorAction gets
   string GetVectorFileName() {return VectorFileName;}
   string GetGeneratorType() {return GeneratorType;}
-  
-  
+  //WCSimRandomParameters sets
+  void SetRandomSeed(int iRandomSeed) {RandomSeed = iRandomSeed;}
+  void SetRandomGenerator(WCSimRandomGenerator_t iRandomGenerator) {RandomGenerator = iRandomGenerator;}
+  //WCSimRandomParameters gets
+  int                    GetRandomSeed() {return RandomSeed;}
+  WCSimRandomGenerator_t GetRandomGenerator() {return RandomGenerator;}
+
 private:
   //WCSimDetector*
   string DetectorName;
@@ -166,6 +173,10 @@ private:
   //WCSimPrimaryGeneratorAction
   string VectorFileName;
   string GeneratorType;
+
+  //WCSimRandomParameters
+  int                    RandomSeed;
+  WCSimRandomGenerator_t RandomGenerator;
 
   ClassDef(WCSimRootOptions,1)  //WCSimRootEvent structure
 };

include/WCSimRunAction.hh

@@ -11,14 +11,15 @@
 #include "WCSimRootGeom.hh"
 #include "WCSimRootOptions.hh"
 #include "WCSimDetectorConstruction.hh"
+#include "WCSimRandomParameters.hh"
 
 class G4Run;
 class WCSimRunActionMessenger;
 
 class WCSimRunAction : public G4UserRunAction
 {
 public:
-  WCSimRunAction(WCSimDetectorConstruction*);
+  WCSimRunAction(WCSimDetectorConstruction*, WCSimRandomParameters*);
   ~WCSimRunAction();
 
 public:
@@ -54,6 +55,7 @@ private:
   WCSimRootGeom* wcsimrootgeom;
   WCSimRootOptions* wcsimrootoptions;
   WCSimDetectorConstruction* wcsimdetector;
+  WCSimRandomParameters* wcsimrandomparameters;
 
   int numberOfEventsGenerated;
   int numberOfTimesWaterTubeHit;

src/WCSimEnumerations.cc

@@ -35,6 +35,25 @@ std::string WCSimEnumerations::EnumAsString(TriggerType_t t)
   return "";
 }
 
+std::string WCSimEnumerations::EnumAsString(WCSimRandomGenerator_t r)
+{
+  switch(r) {
+  case (RANDOM_E_RANLUX) :
+    return "RANLUX";
+    break;
+  case (RANDOM_E_RANECU) :
+    return "RANECU";
+    break;
+  case (RANDOM_E_HEPJAMES) :
+    return "HEPJAMES";
+    break;
+  default:
+    return "";
+    break;
+  }
+  return "";
+}
+
 TriggerType_t WCSimEnumerations::TriggerTypeFromString(std::string s)
 {
   for(int i = int(kTriggerUndefined)+1; i <= kTriggerFailure; i++) {

src/WCSimRootOptions.cc

@@ -72,5 +72,8 @@ void WCSimRootOptions::Print()
     << "WCSimPrimaryGeneratorAction" << endl
     << "\tVectorFileName: " << VectorFileName << endl
     << "\tGeneratorType: " << GeneratorType << endl
+    << "WCSimPrimaryGeneratorAction" << endl
+    << "\tRandomSeed: " << RandomSeed << endl
+    << "\tRandomGenerator: " << WCSimEnumerations::EnumAsString(RandomGenerator) << endl
     << endl;
 }

src/WCSimRunAction.cc

@@ -25,7 +25,8 @@
 int pawc_[500000];                // Declare the PAWC common
 struct ntupleStruct jhfNtuple;
 
-WCSimRunAction::WCSimRunAction(WCSimDetectorConstruction* test)
+WCSimRunAction::WCSimRunAction(WCSimDetectorConstruction* test, WCSimRandomParameters* rand)
+  : wcsimrandomparameters(rand)
 {
   ntuples = 1;
 
@@ -90,8 +91,9 @@ void WCSimRunAction::BeginOfRunAction(const G4Run* /*aRun*/)
   optionsTree = new TTree("wcsimRootOptionsT","WCSim Options Tree");
   optionsTree->Branch("wcsimrootoptions", "WCSimRootOptions", &wcsimrootoptions, bufsize, 0);
 
-  //set detector options
+  //set detector & random options
   wcsimdetector->SaveOptionsToOutput(wcsimrootoptions);
+  wcsimrandomparameters->SaveOptionsToOutput(wcsimrootoptions);
 }
 
 void WCSimRunAction::EndOfRunAction(const G4Run*)