Save the options from WCSimPrimaryGeneratorAction

Author: tdealtry

include/WCSimEventAction.hh

@@ -53,7 +53,7 @@ private:
   G4String DigitizerChoice;
   G4String TriggerChoice;
   bool     ConstructedDAQClasses;
-  bool     SavedDAQOptions;
+  bool     SavedOptions;
 };
 
 

include/WCSimPrimaryGeneratorAction.hh

@@ -7,6 +7,8 @@
 
 #include <fstream>
 
+#include "WCSimRootOptions.hh"
+
 class WCSimDetectorConstruction;
 class G4ParticleGun;
 class G4GeneralParticleSource;
@@ -51,6 +53,10 @@ public:
   G4double GetYDir() {return yDir;};
   G4double GetZDir() {return zDir;};
 
+  G4String GetGeneratorTypeString();
+  
+  void SaveOptionsToOutput(WCSimRootOptions * wcopt);
+
 private:
   WCSimDetectorConstruction*      myDetector;
   G4ParticleGun*                  particleGun;

include/WCSimRootOptions.hh

@@ -107,6 +107,13 @@ public:
   //WCSimPhysicsListFactory gets
   string GetPhysicsListName() {return PhysicsListName;}
   string GetSecondaryHadModel() {return SecondaryHadModel;}
+  //WCSimPrimaryGeneratorAction sets
+  void SetVectorFileName(string iVectorFileName) {VectorFileName = iVectorFileName;}
+  void SetGeneratorType(string iGeneratorType) {GeneratorType = iGeneratorType;}
+  //WCSimPrimaryGeneratorAction gets
+  string GetVectorFileName() {return VectorFileName;}
+  string GetGeneratorType() {return GeneratorType;}
+  
 
 private:
   //WCSimDetector*
@@ -155,6 +162,10 @@ private:
   //WCSimPhysicsListFactory
   string PhysicsListName;
   string SecondaryHadModel;
+
+  //WCSimPrimaryGeneratorAction
+  string VectorFileName;
+  string GeneratorType;
 
   ClassDef(WCSimRootOptions,1)  //WCSimRootEvent structure
 };

src/WCSimEventAction.cc

@@ -60,7 +60,7 @@ WCSimEventAction::WCSimEventAction(WCSimRunAction* myRun,
   :runAction(myRun), generatorAction(myGenerator), 
    detectorConstructor(myDetector),
    ConstructedDAQClasses(false),
-   SavedDAQOptions(false)
+   SavedOptions(false)
 {
   DAQMessenger = new WCSimWCDAQMessenger(this);
 
@@ -401,16 +401,18 @@ void WCSimEventAction::EndOfEventAction(const G4Event* evt)
 
   //save DAQ options here. This ensures that when the user selects a default option
   // (e.g. with -99), the saved option value in the output reflects what was run
-  if(!SavedDAQOptions) {
+  if(!SavedOptions) {
     WCSimRootOptions * wcsimopt = runAction->GetRootOptions();
     //Dark noise
     WCDNM->SaveOptionsToOutput(wcsimopt);
     //Digitizer
     WCDM->SaveOptionsToOutput(wcsimopt);
     //Trigger
     WCTM->SaveOptionsToOutput(wcsimopt);
+    //Generator
+    generatorAction->SaveOptionsToOutput(wcsimopt);
 
-    SavedDAQOptions = true;
+    SavedOptions = true;
   }
 }
 

src/WCSimPrimaryGeneratorAction.cc

@@ -35,7 +35,7 @@ inline int   atoi( const string& s ) {return std::atoi( s.c_str() );}
 
 WCSimPrimaryGeneratorAction::WCSimPrimaryGeneratorAction(
 					  WCSimDetectorConstruction* myDC)
-  :myDetector(myDC)
+  :myDetector(myDC), vectorFileName("")
 {
   //T. Akiri: Initialize GPS to allow for the laser use 
   MyGPS = new G4GeneralParticleSource();
@@ -264,6 +264,26 @@ void WCSimPrimaryGeneratorAction::GeneratePrimaries(G4Event* anEvent)
     }
 }
 
+void WCSimPrimaryGeneratorAction::SaveOptionsToOutput(WCSimRootOptions * wcopt)
+{
+  if(useMulineEvt)
+    wcopt->SetVectorFileName(vectorFileName);
+  else
+    wcopt->SetVectorFileName("");
+  wcopt->SetGeneratorType(GetGeneratorTypeString());
+}
+
+G4String WCSimPrimaryGeneratorAction::GetGeneratorTypeString()
+{
+  if(useMulineEvt)
+    return "muline";
+  else if(useNormalEvt)
+    return "gun";
+  else if(useLaserEvt)
+    return "laser";
+  return "";
+}
+
 // Returns a vector with the tokens
 vector<string> tokenize( string separators, string input ) 
 {

src/WCSimRootOptions.cc

@@ -69,5 +69,8 @@ void WCSimRootOptions::Print()
     << "Physics List Factory:" << endl
     << "\tPhysicsListName: " << PhysicsListName << endl
     << "\tSecondaryHadModel: " << SecondaryHadModel << endl
+    << "WCSimPrimaryGeneratorAction" << endl
+    << "\tVectorFileName: " << VectorFileName << endl
+    << "\tGeneratorType: " << GeneratorType << endl
     << endl;
 }