Add dark noise options to WCSimRootOptions

Add SaveOptionsToOutput() method to WCSimWCAddDarkNoise class
Use it in WCSimEventAction
Add Print() to WCSimRootOptions

Author: tdealtry

include/WCSimEventAction.hh

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

include/WCSimRootOptions.hh

@@ -17,17 +17,36 @@ class TDirectory;
 
 class WCSimRootOptions : public TObject {
 
-private:
-
-
 public:
 
   WCSimRootOptions();
   virtual ~WCSimRootOptions();
-
-  // Sets and gets
-
-
+  void Print();
+
+  //WCSimWCAddDarkNoise sets
+  void SetPMTDarkRate(double iPMTDarkRate) {PMTDarkRate = iPMTDarkRate;}
+  void SetConvRate(double iConvRate) {ConvRate = iConvRate;}
+  void SetDarkHigh(double iDarkHigh) {DarkHigh = iDarkHigh;}
+  void SetDarkLow(double iDarkLow) {DarkLow = iDarkLow;}
+  void SetDarkWindow(double iDarkWindow) {DarkWindow = iDarkWindow;}
+  void SetDarkMode(int iDarkMode) {DarkMode = iDarkMode;}
+  //WCSimWCAddDarkNoise gets
+  double GetPMTDarkRate() {return PMTDarkRate;}
+  double GetConvRate() {return ConvRate;}
+  double GetDarkHigh() {return DarkHigh;}
+  double GetDarkLow() {return DarkLow;}
+  double GetDarkWindow() {return DarkWindow;}
+  int    GetDarkMode() {return DarkMode;}
+  
+private:
+  //WCSimWCAddDarkNoise
+  double PMTDarkRate; // kHz
+  double ConvRate; // kHz
+  double DarkHigh; //ns
+  double DarkLow; //ns
+  double DarkWindow; //ns
+  int    DarkMode;
+  
   ClassDef(WCSimRootOptions,1)  //WCSimRootEvent structure
 };
 

include/WCSimWCAddDarkNoise.hh

@@ -6,6 +6,7 @@
 #include "G4VDigitizerModule.hh"
 #include "WCSimWCDigi.hh"
 #include "WCSimWCHit.hh"
+#include "WCSimRootOptions.hh"
 #include "globals.hh"
 #include "Randomize.hh"
 #include <map>
@@ -32,7 +33,8 @@ public:
   void SetDarkHigh(int idarkhigh){DarkHigh = idarkhigh;}
   void SetDarkLow(int idarklow){DarkLow = idarklow;}
   void SetDarkWindow(int idarkwindow){DarkWindow = idarkwindow;}
-
+  void SaveOptionsToOutput(WCSimRootOptions * wcopt);
+  
 private:
   void ReInitialize() { ranges.clear(); result.clear();}
   void SetPMTDarkDefaults();

src/WCSimEventAction.cc

@@ -59,7 +59,8 @@ WCSimEventAction::WCSimEventAction(WCSimRunAction* myRun,
 				   WCSimPrimaryGeneratorAction* myGenerator)
   :runAction(myRun), generatorAction(myGenerator), 
    detectorConstructor(myDetector),
-   ConstructedDAQClasses(false)
+   ConstructedDAQClasses(false),
+   SavedDAQOptions(false)
 {
   DAQMessenger = new WCSimWCDAQMessenger(this);
 
@@ -120,8 +121,13 @@ void WCSimEventAction::CreateDAQInstances()
 
 void WCSimEventAction::BeginOfEventAction(const G4Event*)
 {
-  if(!ConstructedDAQClasses)
+  if(!ConstructedDAQClasses) {
     CreateDAQInstances();
+
+    //and save options in output file
+    G4DigiManager* DMman = G4DigiManager::GetDMpointer();
+
+  }
 }
 
 void WCSimEventAction::EndOfEventAction(const G4Event* evt)
@@ -393,6 +399,15 @@ void WCSimEventAction::EndOfEventAction(const G4Event* evt)
 		WCDC_hits,
 		WCDC);
 
+  //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) {
+    WCSimRootOptions * wcsimopt = runAction->GetRootOptions();
+    //Dark noise
+    WCDNM->SaveOptionsToOutput(wcsimopt);
+
+    SavedDAQOptions = true;
+  }
 }
 
 G4int WCSimEventAction::WCSimEventFindStartingVolume(G4ThreeVector vtx)

src/WCSimRootOptions.cc

@@ -1,13 +1,17 @@
 ////////////////////////////////////////////////////////////////////////
 
 #include "TObject.h"
+#include <iostream>
 
 #include "WCSimRootOptions.hh"
 
 #ifndef REFLEX_DICTIONARY
 ClassImp(WCSimRootOptions)
 #endif
 
+using std::endl;
+using std::cout;
+
 //______________________________________________________________________________
 WCSimRootOptions::WCSimRootOptions()
 {
@@ -19,3 +23,17 @@ WCSimRootOptions::WCSimRootOptions()
 WCSimRootOptions::~WCSimRootOptions()
 {
 }
+
+//______________________________________________________________________________
+void WCSimRootOptions::Print()
+{
+  cout
+    << "Dark Noise options" << endl
+    << "\tPMTDarkRate: " << PMTDarkRate << " kHz" << endl
+    << "\tConvRate: " << ConvRate << " kHz" << endl
+    << "\tDarkHigh: " << DarkHigh << " ns" << endl
+    << "\tDarkLow: " << DarkLow << " ns" << endl
+    << "\tDarkWindow: " << DarkWindow << " ns" << endl
+    << "\tDarkMode: " << DarkMode << endl
+    << endl;
+}

src/WCSimWCAddDarkNoise.cc

@@ -280,3 +280,13 @@ void WCSimWCAddDarkNoise::FindDarkNoiseRanges(WCSimWCDigitsCollection* WCHCPMT,
   //now we should have a vector of non-overlapping range pairs to pass to the
   //dark noise routine
 }
+
+void WCSimWCAddDarkNoise::SaveOptionsToOutput(WCSimRootOptions * wcopt)
+{
+  wcopt->SetPMTDarkRate(PMTDarkRate);
+  wcopt->SetConvRate(ConvRate);
+  wcopt->SetDarkHigh(DarkHigh);
+  wcopt->SetDarkLow(DarkLow);
+  wcopt->SetDarkWindow(DarkWindow);
+  wcopt->SetDarkMode(DarkMode);
+}