Import Geant4 11.1.0 source tree

2022-12-09 14:43:28 +01:00
parent c07cea1fe0
commit 9f34590941
3810 changed files with 200490 additions and 182326 deletions
@@ -164,7 +164,7 @@ private:
  G4double mass = 0.0;
  G4double spin = 0.0;
  G4double chargeSquare = 1.0;
-  G4double effChargeSquare = 1.0;
+  G4double heChargeSquare = 4.0;
  G4double massRate = 1.0;
  G4double ratio = 1.0;
  G4double HeMass;
@@ -176,7 +176,6 @@ private:
  G4int    iMolecula = -1; // index in the molecula's table
  G4int    iASTAR = -1;    // index in ASTAR
  G4int    iICRU90 = -1;
-  G4bool   isIon = false;
  G4bool   isAlpha = false;
 };

@@ -74,7 +74,8 @@ public:

 private:

-  void ReadMaterialData(const G4String& name, G4bool type);
+  void ReadMaterialData(const G4Material* mat, const G4double fact, 
+                        const G4bool type);

  void ReadElementData(const G4Material* mat, G4bool type);

@@ -89,8 +90,9 @@ private:
  G4double fEmax;

  std::vector<G4int> fMatIndex;
+  // projectile Z <= 80, target element Z <= 92
  std::vector<G4PhysicsLogVector*>* fMatData[81] = {nullptr};
-  G4PhysicsLogVector* fElmData[81][81] = {{nullptr}};
+  G4PhysicsLogVector* fElmData[81][93] = {{nullptr}};
  G4PhysicsFreeVector* fVector = nullptr;

  G4int fNmat = 0;
@@ -176,8 +176,8 @@ inline void G4PAIModel::SetVerboseLevel(G4int verbose)
 inline G4int G4PAIModel::FindCoupleIndex(const G4MaterialCutsCouple* couple)
 {
  G4int idx = -1;
-  size_t jMatMax = fMaterialCutsCoupleVector.size();
-  for(size_t jMat = 0;jMat < jMatMax; ++jMat) { 
+  G4int jMatMax = (G4int)fMaterialCutsCoupleVector.size();
+  for(G4int jMat = 0;jMat < jMatMax; ++jMat) { 
    if(couple == fMaterialCutsCoupleVector[jMat]) {
      idx = jMat; 
      break; 
@@ -198,10 +198,3 @@ inline void G4PAIModel::SetParticle(const G4ParticleDefinition* p)
 }

 #endif
-
-
-
-
-
-
-
@@ -170,8 +170,8 @@ inline void G4PAIPhotModel::SetVerboseLevel(G4int verbose)
 inline G4int G4PAIPhotModel::FindCoupleIndex(const G4MaterialCutsCouple* couple)
 {
  G4int idx = -1;
-  size_t jMatMax = fMaterialCutsCoupleVector.size();
-  for(size_t jMat = 0;jMat < jMatMax; ++jMat) { 
+  G4int jMatMax = (G4int)fMaterialCutsCoupleVector.size();
+  for(G4int jMat = 0;jMat < jMatMax; ++jMat) { 
    if(couple == fMaterialCutsCoupleVector[jMat]) {
      idx = jMat; 
      break; 
@@ -192,10 +192,3 @@ inline void G4PAIPhotModel::SetParticle(const G4ParticleDefinition* p)
 }

 #endif
-
-
-
-
-
-
-
@@ -88,14 +88,16 @@ public:

 private:

-  G4ParticleDefinition*     theGamma;
-  G4ParticleDefinition*     theElectron;
-  G4ParticleChangeForGamma* fParticleChange;
-  G4VAtomDeexcitation*      fAtomDeexcitation;
+  G4ParticleDefinition* theGamma;
+  G4ParticleDefinition* theElectron;
+  G4ParticleChangeForGamma* fParticleChange = nullptr;
+  G4VAtomDeexcitation* fAtomDeexcitation = nullptr;

-  G4double                  fminimalEnergy;
-  std::vector<G4double>     fSandiaCof;
-  std::vector<G4double>     fMatEnergyTh;
+  G4bool fPEBelowKShell = true;
+
+  G4double fminimalEnergy;
+  std::vector<G4double> fSandiaCof;
+  std::vector<G4double> fMatEnergyTh;
 };

 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
@@ -82,7 +82,7 @@ public:

 private:

-  void AddData(const G4float* s, const G4Material*);
+  void AddData(const G4float* ss, const G4Material*);

  void FindData(G4int idx, const G4Material*);

@@ -135,7 +135,7 @@ G4UniversalFluctuation::AddExcitation(CLHEP::HepRandomEngine* rndm,
    eav  += ax*ex;
    esig2 += ax*ex*ex;
  } else {
-    const G4int p = G4Poisson(ax);
+    const G4int p = (G4int)G4Poisson(ax);
    if(p > 0) { eloss += ((p + 1) - 2.*rndm->flat())*ex; }
  }
 }
@@ -166,7 +166,6 @@ private:
  G4double rangeinit;
  G4double currentRadLength;

-  G4double rangecut;
  G4double drr,finalr;

  G4double tlow;
@@ -176,7 +175,7 @@ private:
  G4double rndmarray[2];

  struct mscData {
-    G4double ecut, Z23, sqrtZ;
+    G4double Z23, sqrtZ;
    G4double coeffth1, coeffth2;
    G4double coeffc1, coeffc2, coeffc3, coeffc4;
    G4double stepmina, stepminb;