Import Geant4 11.1.0.beta source tree

2022-07-01 10:44:02 +02:00
parent b3bf75a2a1
commit c07cea1fe0
2172 changed files with 183300 additions and 123938 deletions
@@ -62,7 +62,7 @@ class G4BetheHeitlerModel : public G4VEmModel

 public:

-  explicit G4BetheHeitlerModel(const G4ParticleDefinition* p = 0, 
+  explicit G4BetheHeitlerModel(const G4ParticleDefinition* p = nullptr,
                               const G4String& nam = "BetheHeitler");
 
  ~G4BetheHeitlerModel() override;
@@ -58,7 +58,7 @@ class G4BraggIonGasModel : public G4BraggModel

 public:

-  explicit G4BraggIonGasModel(const G4ParticleDefinition* p = 0,
+  explicit G4BraggIonGasModel(const G4ParticleDefinition* p = nullptr,
 			      const G4String& nam = "BraggIonGas");

  ~G4BraggIonGasModel() override;
@@ -82,7 +82,7 @@ private:

  void AddData(const G4double* energy, const G4double* xs, G4int idx);

-  char* dirPath = nullptr;
+  const char* dirPath = nullptr;
  const G4Material* currentMaterial = nullptr;

  G4int type = 0;
@@ -0,0 +1,57 @@
+//
+// ********************************************************************
+// * License and Disclaimer                                           *
+// *                                                                  *
+// * The  Geant4 software  is  copyright of the Copyright Holders  of *
+// * the Geant4 Collaboration.  It is provided  under  the terms  and *
+// * conditions of the Geant4 Software License,  included in the file *
+// * LICENSE and available at  http://cern.ch/geant4/license .  These *
+// * include a list of copyright holders.                             *
+// *                                                                  *
+// * Neither the authors of this software system, nor their employing *
+// * institutes,nor the agencies providing financial support for this *
+// * work  make  any representation or  warranty, express or implied, *
+// * regarding  this  software system or assume any liability for its *
+// * use.  Please see the license in the file  LICENSE  and URL above *
+// * for the full disclaimer and the limitation of liability.         *
+// *                                                                  *
+// * This  code  implementation is the result of  the  scientific and *
+// * technical work of the GEANT4 collaboration.                      *
+// * By using,  copying,  modifying or  distributing the software (or *
+// * any work based  on the software)  you  agree  to acknowledge its *
+// * use  in  resulting  scientific  publications,  and indicate your *
+// * acceptance of all terms of the Geant4 Software license.          *
+// ********************************************************************
+//
+// GEANT4 Class header file
+//
+// File name:     G4EmStandUtil
+//
+// Author:        Vladimir Ivanchenko
+//
+// Creation date: 29.05.2022
+//
+// Class Description:
+//
+// This utility class provide common computations for EM physics
+//
+
+#ifndef G4EmStandUtil_h
+#define G4EmStandUtil_h 1
+
+#include "globals.hh"
+#include "G4VEmFluctuationModel.hh"
+
+class G4EmStandUtil
+{
+
+public:
+
+  // select model for energy loss fluctuations
+  static G4VEmFluctuationModel* ModelOfFluctuations(G4bool isIon = false);
+
+};
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+
+#endif
@@ -52,7 +52,6 @@
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

 #include "G4VEmModel.hh"
-#include "G4Threading.hh"

 class G4ParticleChangeForLoss;
 class G4Pow;
@@ -98,10 +97,6 @@ private:
  G4Pow* g4calc;
  G4double theZieglerFactor;
  static G4double Z23[100];
-
-#ifdef G4MULTITHREADED
-  static G4Mutex ICRU49NuclearMutex;
-#endif
 };

 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -72,7 +72,7 @@ class G4ICRU73QOModel : public G4VEmModel

 public:

-  explicit G4ICRU73QOModel(const G4ParticleDefinition* p = 0,
+  explicit G4ICRU73QOModel(const G4ParticleDefinition* p = nullptr,
                           const G4String& nam = "ICRU73QO");

  ~G4ICRU73QOModel() = default;
@@ -72,7 +72,7 @@ public:

  explicit G4IonCoulombCrossSection();

-  ~G4IonCoulombCrossSection();
+  ~G4IonCoulombCrossSection() = default;

  void Initialise(const G4ParticleDefinition*, G4double cosThetaLim);

@@ -51,7 +51,6 @@

 #include "G4VEmModel.hh"
 #include "G4NistManager.hh"
-#include "G4Threading.hh"

 class G4EmCorrections;
 class G4ParticleChangeForLoss;
@@ -169,11 +168,6 @@ private:
  G4double formfact = 0.0;
  G4double twoln10;
  G4double fElimit;
-
-#ifdef G4MULTITHREADED
-  static G4Mutex theLSMutex;
-#endif
-
 };

 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -57,12 +57,10 @@

 #include "G4VEmModel.hh"
 #include "G4Log.hh"
-#include "G4Exp.hh"
-#include "G4Pow.hh"
-
 #include <vector>

 class G4ParticleChangeForGamma;
+class G4Pow;

 class G4PairProductionRelModel : public G4VEmModel
 {
@@ -61,7 +61,7 @@ public:
  G4ThreeVector& SampleDirection(const G4DynamicParticle* dp,
                                 G4double e = 0.0,
                                 G4int shellId = 0,
-                                 const G4Material* mat = 0) final;
+                                 const G4Material* mat = nullptr) final;

  void PrintGeneratorInformation() const override;

@@ -61,7 +61,6 @@

 #include "G4eBremsstrahlungRelModel.hh"
 #include "globals.hh"
-#include "G4Threading.hh"

 class G4Physics2DVector;
 class G4SBBremTable;
@@ -123,11 +122,6 @@ private:

  size_t                    fIndx;
  size_t                    fIndy;
-
-#ifdef G4MULTITHREADED
-  static G4Mutex theSBMutex;
-#endif
-
 };

 #endif
@@ -63,7 +63,6 @@

 class G4ParticleChangeForMSC;
 class G4SafetyHelper;
-class G4LossTableManager;

 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

@@ -119,7 +118,7 @@ private:

  inline G4double Randomizetlimit();
  
-  inline G4double SimpleScattering(G4double xmeanth, G4double x2meanth);
+  inline G4double SimpleScattering();

  inline G4double ComputeStepmin();

@@ -130,9 +129,7 @@ private:
  const G4ParticleDefinition* particle;
  const G4ParticleDefinition* positron;
  G4ParticleChangeForMSC*     fParticleChange;
-
  const G4MaterialCutsCouple* couple;
-  G4LossTableManager*         theManager;

  G4double mass;
  G4double charge,chargeSquare;
@@ -174,14 +171,17 @@ private:

  G4double tlow;
  G4double invmev;
+  G4double xmeanth = 0.0;
+  G4double x2meanth = 1./3.;
  G4double rndmarray[2];

  struct mscData {
-    G4double ecut, Zeff, Z23, sqrtZ;
+    G4double ecut, Z23, sqrtZ;
    G4double coeffth1, coeffth2;
    G4double coeffc1, coeffc2, coeffc3, coeffc4;
    G4double stepmina, stepminb;
    G4double doverra, doverrb;
+    G4double posa, posb, posc, posd, pose;
  };
  static std::vector<mscData*> msc;

@@ -225,8 +225,7 @@ inline G4double G4UrbanMscModel::Randomizetlimit()

 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

-inline
-G4double G4UrbanMscModel::SimpleScattering(G4double xmeanth, G4double x2meanth)
+inline G4double G4UrbanMscModel::SimpleScattering()
 {
  // 'large angle scattering'
  // 2 model functions with correct xmean and x2mean
@@ -63,7 +63,6 @@
 #include "G4NuclearFormfactorType.hh"
 #include "G4ThreeVector.hh"
 #include "G4Pow.hh"
-#include "G4Threading.hh"

 class G4ParticleDefinition;
 class G4ScreeningMottCrossSection;
@@ -176,11 +175,6 @@ protected:
  static G4double ScreenRSquareElec[100];
  static G4double ScreenRSquare[100];
  static G4double FormFactor[100];
-
-#ifdef G4MULTITHREADED
-  static G4Mutex WentzelOKandVIxSectionMutex;
-#endif
-
 };

 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -55,7 +55,6 @@
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......

 #include "G4WentzelVIModel.hh"
-#include "G4Threading.hh"
 #include <vector>

 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -93,10 +92,6 @@ private:

  static std::vector<G4double> effMass;
  G4NistManager* fNistManager;
-
-#ifdef G4MULTITHREADED
-  static G4Mutex WentzelVIRelModelMutex;
-#endif
 };

 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -44,7 +44,7 @@ class G4XrayRayleighModel : public G4VEmModel

 public:

-  explicit G4XrayRayleighModel(const G4ParticleDefinition* p = 0, 
+  explicit G4XrayRayleighModel(const G4ParticleDefinition* p = nullptr,
 			       const G4String& nam = "XrayRayleigh");

  ~G4XrayRayleighModel() override;
@@ -164,7 +164,7 @@ inline void G4eBremParametrizedModel::SetCurrentElement(const G4double Z)
  if(Z != currentZ) {
    currentZ = Z;

-    G4int iz = G4int(Z);
+    G4int iz = G4lrint(Z);
    z13 = nist->GetZ13(iz);
    z23 = z13*z13;
    lnZ = nist->GetLOGZ(iz);
@@ -88,7 +88,6 @@
 #include <sstream>

 #include "globals.hh"
-#include "zlib.h"
 #include "G4String.hh"
 #include "G4Physics2DVector.hh"

@@ -165,7 +164,7 @@ private:
  //       when restricted interval sampling is needed. This is controlled by
  //       the fIsRestrictedSamplingRequired flag (false by default).
  struct OneSamplingTable {
-    OneSamplingTable () {}
+    OneSamplingTable () = default;
    void SetSize(std::size_t nx, G4bool useAlias)  {
      fN = nx;
      // Alias
@@ -61,7 +61,7 @@ class G4eeToTwoGammaModel : public G4VEmModel

 public:

-  explicit G4eeToTwoGammaModel(const G4ParticleDefinition* p = 0,
+  explicit G4eeToTwoGammaModel(const G4ParticleDefinition* p = nullptr,
                               const G4String& nam = "eplus2gg");

  ~G4eeToTwoGammaModel() override;