Import Geant4 9.6.0 source tree

source/processes/hadronic/models/radioactive_decay/include/G4RadioactiveDecay.hh

@@ -54,11 +54,15 @@
 // %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 ////////////////////////////////////////////////////////////////////////////////
 //
+#include <vector>
+#include <map>
+#include <CLHEP/Units/SystemOfUnits.h>
+
 #include "G4ios.hh"
 #include "globals.hh"
 #include "G4VRestDiscreteProcess.hh"
 #include "G4ParticleChangeForRadDecay.hh"
-#include "G4RadioactiveDecaymessenger.hh"  
+// #include "G4RadioactiveDecaymessenger.hh"  
 
 #include "G4NucleusLimits.hh"
 #include "G4RadioactiveDecayRate.hh"
@@ -67,9 +71,6 @@
 #include "G4RadioactivityTable.hh"
 #include "G4ThreeVector.hh"
 
-#include <vector>
-#include <map>
-
 class G4RadioactiveDecaymessenger;
 
 typedef std::vector<G4RadioactiveDecayRateVector> G4RadioactiveDecayRateTable;
@@ -182,7 +183,7 @@ class G4RadioactiveDecay : public G4VRestDiscreteProcess
 
     inline void SetAnalogueMonteCarlo (G4bool r ) { 
       AnalogueMC  = r; 
-      if (!AnalogueMC) halflifethreshold = 1e-6*s;
+      if (!AnalogueMC) halflifethreshold = 1e-6*CLHEP::s;
     }
     // Controls whether G4RadioactiveDecay runs in analogue mode or
     // variance reduction mode.
@@ -217,14 +218,14 @@ class G4RadioactiveDecay : public G4VRestDiscreteProcess
       return forceDecayDirection; 
     }
 
-    inline void SetDecayHalfAngle(G4double halfAngle=0.*deg) {
-      forceDecayHalfAngle = std::min(std::max(0.*deg,halfAngle),180.*deg);
+    inline void SetDecayHalfAngle(G4double halfAngle=0.*CLHEP::deg) {
+      forceDecayHalfAngle = std::min(std::max(0.*CLHEP::deg,halfAngle),180.*CLHEP::deg);
     }
 
     inline G4double GetDecayHalfAngle() const {return forceDecayHalfAngle;}
 
     inline void SetDecayCollimation(const G4ThreeVector& theDir,
-                                    G4double halfAngle = 0.*deg) {
+                                    G4double halfAngle = 0.*CLHEP::deg) {
       SetDecayDirection(theDir);
       SetDecayHalfAngle(halfAngle);
     }
@@ -252,7 +253,7 @@ class G4RadioactiveDecay : public G4VRestDiscreteProcess
     G4double GetMeanLifeTime(const G4Track& theTrack,
                              G4ForceCondition* condition);
 
-    G4double GetTaoTime(G4double,G4double);
+    G4double GetTaoTime(const G4double,const G4double);
 
     G4double GetDecayTime();
 
@@ -264,16 +265,13 @@ class G4RadioactiveDecay : public G4VRestDiscreteProcess
     G4RadioactiveDecay & operator=(const G4RadioactiveDecay &right);
 
     G4RadioactiveDecaymessenger* theRadioactiveDecaymessenger;
-    G4PhysicsTable* aPhysicsTable;
     G4RIsotopeTable* theIsotopeTable;
 
     G4NucleusLimits theNucleusLimits;
 
-    const G4double HighestBinValue;
-    const G4double LowestBinValue;
-
-    const G4int TotBin;
+    G4double HighestValue;
 
+    G4bool isInitialised;
     G4bool AnalogueMC;
     G4bool BRBias;
     G4bool FBeta;
@@ -297,6 +295,7 @@ class G4RadioactiveDecay : public G4VRestDiscreteProcess
 
     std::vector<G4String> LoadedNuclei;
     std::vector<G4String> ValidVolumes;
+    bool isAllVolumesMode;
 
     G4RadioactiveDecayRate theDecayRate;
     G4RadioactiveDecayRates theDecayRateVector;