Remove WCSimWCDigitizer (the old digitizer) and its WCSimDarkRateMessenger constructor

Author: tdealtry

include/WCSimDarkRateMessenger.hh

@@ -9,13 +9,11 @@ class G4UIdirectory;
 class G4UIcmdWithADoubleAndUnit;
 class G4UIcmdWithADouble;
 class G4UIcmdWithAnInteger;
-class WCSimWCDigitizer;
 class WCSimWCAddDarkNoise;
 
 class WCSimDarkRateMessenger: public G4UImessenger
 {
 public:
-  WCSimDarkRateMessenger(WCSimWCDigitizer*);
   WCSimDarkRateMessenger(WCSimWCAddDarkNoise*);
 
   ~WCSimDarkRateMessenger();
@@ -25,7 +23,6 @@ public:
 private:
   void Initialize();
 
-  WCSimWCDigitizer* WCSimDigitize;
   WCSimWCAddDarkNoise* WCSimAddDarkNoise;
 
   G4UIdirectory* WCSimDir;
@@ -36,7 +33,6 @@ private:
   G4UIcmdWithADoubleAndUnit* SetDarkHigh;
   G4UIcmdWithADoubleAndUnit* SetDarkWindow;
 
-  G4int constructor;
   G4String initaliseString;
 };
 

include/WCSimWCDigitizer.hh

@@ -1,5 +1,4 @@
 #include "WCSimDarkRateMessenger.hh"
-#include "WCSimWCDigitizer.hh"
 #include "WCSimWCAddDarkNoise.hh"
 
 #include "G4UIdirectory.hh"
@@ -8,21 +7,9 @@
 #include "G4UIcmdWithADouble.hh"
 #include "G4UIcmdWithAnInteger.hh"
 
-WCSimDarkRateMessenger::WCSimDarkRateMessenger(WCSimWCDigitizer* darkratepoint)
-  : WCSimDigitize(darkratepoint)
-{
-  //inform the DarkRateMessenger which constructor was called
-  constructor = 0;
-
-  Initialize();
-}
-
 WCSimDarkRateMessenger::WCSimDarkRateMessenger(WCSimWCAddDarkNoise* darkratepoint)
   : WCSimAddDarkNoise(darkratepoint)
 {
-  //inform the DarkRateMessenger which constructor was called
-  constructor = 1;
-
   Initialize();
 }
 
@@ -110,56 +97,34 @@ void WCSimDarkRateMessenger::SetNewValue(G4UIcommand* command,G4String newValue)
     // Since kHz is 10e-3 for this class we must multiply by a 10e6 factor
     // to make default units in kHz
     double const conversion_to_kHz = 1000000;
-    if(constructor == 0)
-      WCSimDigitize->SetDarkRate(conversion_to_kHz * SetFrequency->GetNewDoubleValue(newValue));
-    else if(constructor == 1)
-      WCSimAddDarkNoise->SetDarkRate(conversion_to_kHz * SetFrequency->GetNewDoubleValue(newValue));
+    WCSimAddDarkNoise->SetDarkRate(conversion_to_kHz * SetFrequency->GetNewDoubleValue(newValue));
     G4cout << "Setting Dark Rate " << conversion_to_kHz * SetFrequency->GetNewDoubleValue(newValue)
 	   << initaliseString.c_str() << G4endl;
   }
   else if(command == SetConversionRate){
-    if(constructor == 0)
-      WCSimDigitize->SetConversion(SetConversionRate->GetNewDoubleValue(newValue));
-    else if(constructor == 1)
-      WCSimAddDarkNoise->SetConversion(SetConversionRate->GetNewDoubleValue(newValue));
+    WCSimAddDarkNoise->SetConversion(SetConversionRate->GetNewDoubleValue(newValue));
     G4cout << "Setting Dark Rate Conversion value " << SetConversionRate->GetNewDoubleValue(newValue)
 	   << initaliseString.c_str() << G4endl;
   }
   else if(command == SetDarkMode){
-    if(constructor == 0){
-    }
-    else if(constructor == 1) {
-      WCSimAddDarkNoise->SetDarkMode(SetDarkMode->GetNewIntValue(newValue));
-      G4cout << "Setting DarkMode value " << SetDarkMode->GetNewIntValue(newValue)
-	     << initaliseString.c_str() << G4endl;
-    }
+    WCSimAddDarkNoise->SetDarkMode(SetDarkMode->GetNewIntValue(newValue));
+    G4cout << "Setting DarkMode value " << SetDarkMode->GetNewIntValue(newValue)
+	   << initaliseString.c_str() << G4endl;
   }
   else if(command == SetDarkLow){
-    if(constructor == 0){
-    }   
-    else if(constructor == 1) {
-      WCSimAddDarkNoise->SetDarkLow(SetDarkLow->GetNewDoubleValue(newValue));
-      G4cout << "Setting DarkLow value " << SetDarkLow->GetNewDoubleValue(newValue)
-	     << initaliseString.c_str() << G4endl;
-    }
+    WCSimAddDarkNoise->SetDarkLow(SetDarkLow->GetNewDoubleValue(newValue));
+    G4cout << "Setting DarkLow value " << SetDarkLow->GetNewDoubleValue(newValue)
+	   << initaliseString.c_str() << G4endl;
   }
   else if(command == SetDarkHigh){
-    if(constructor == 0) {
-    }   
-    else if(constructor == 1) {
-      WCSimAddDarkNoise->SetDarkHigh(SetDarkHigh->GetNewDoubleValue(newValue));
-      G4cout << "Setting DarkHigh value " << SetDarkHigh->GetNewDoubleValue(newValue)
-	     << initaliseString.c_str() << G4endl;
-    }
+    WCSimAddDarkNoise->SetDarkHigh(SetDarkHigh->GetNewDoubleValue(newValue));
+    G4cout << "Setting DarkHigh value " << SetDarkHigh->GetNewDoubleValue(newValue)
+	   << initaliseString.c_str() << G4endl;
   }
   else if(command == SetDarkWindow){
-    if(constructor == 0){
-    }
-    else if(constructor == 1) {
-      WCSimAddDarkNoise->SetDarkWindow(SetDarkWindow->GetNewDoubleValue(newValue));
-      G4cout << "Setting DarkWindow value " << SetDarkWindow->GetNewDoubleValue(newValue)
-	     << initaliseString.c_str() << G4endl;
-    }
+    WCSimAddDarkNoise->SetDarkWindow(SetDarkWindow->GetNewDoubleValue(newValue));
+    G4cout << "Setting DarkWindow value " << SetDarkWindow->GetNewDoubleValue(newValue)
+	   << initaliseString.c_str() << G4endl;
   }
 
 }