Import Geant4 10.6.0 source tree

source/processes/electromagnetic/lowenergy/include/G4IonParametrisedLossModel.hh

@@ -179,7 +179,7 @@ class G4IonParametrisedLossModel : public G4VEmModel {
 
    // Function which allows to switch off scaling of stopping powers of heavy
    // ions from existing ICRU 73 data
-   void DeactivateICRU73Scaling();
+   // void DeactivateICRU73Scaling();
 
    // Function checking the applicability of physics tables to ion-material
    // combinations (Note: the energy range of tables is not checked)
@@ -323,7 +323,7 @@ class G4IonParametrisedLossModel : public G4VEmModel {
    G4DataVector cutEnergies;
 
    // Pointer to generic ion and mass of generic ion
-   G4ParticleDefinition* genericIon;
+   const G4ParticleDefinition* genericIon;
    G4double genericIonPDGMass;
 
    // ######################################################################
@@ -356,6 +356,7 @@ class G4IonParametrisedLossModel : public G4VEmModel {
                                             // values in the transition region
    G4double dedxCacheGenIonMassRatio;       // Ratio of generic ion mass       
                                             // and current particle mass
+   G4bool isInitialised;
 };
 
 

source/processes/electromagnetic/lowenergy/include/G4LivermorePhotoElectricModel.hh

@@ -40,6 +40,7 @@
 
 #include "G4VEmModel.hh"
 #include "G4ElementData.hh"
+#include "G4Threading.hh"
 #include <vector>
 
 class G4ParticleChangeForGamma;
@@ -81,7 +82,7 @@ public:
     virtual void InitialiseForElement(const G4ParticleDefinition*, G4int Z);
     
     inline void SetLimitNumberOfShells(G4int);
-    G4double GetBindingEnergy (G4double ZZ, G4int shell);
+    G4double GetBindingEnergy (G4int Z, G4int shell);
     
     G4LivermorePhotoElectricModel & operator=
     (const G4LivermorePhotoElectricModel &right) = delete;
@@ -93,10 +94,12 @@ protected:
     
 private:
     
-    void ReadData(G4int Z, const char* path = nullptr);
+    void ReadData(G4int Z);
+
+    const G4String& FindDirectoryPath();
         
-    G4ParticleDefinition*   theGamma;
-    G4ParticleDefinition*   theElectron;
+    const G4ParticleDefinition*   theGamma;
+    const G4ParticleDefinition*   theElectron;
     
     G4int                   verboseLevel;
     G4int                   maxZ;
@@ -113,6 +116,11 @@ private:
     static G4ElementData*          fShellCrossSection;
     static G4Material*             fWater;
     static G4double                fWaterEnergyLimit;
+    static G4String                fDataDirectory;
+
+#ifdef G4MULTITHREADED
+    static G4Mutex livPhotoeffMutex;
+#endif
     
     G4VAtomDeexcitation*    fAtomDeexcitation;