Import Geant4 11.1.0 source tree

source/processes/electromagnetic/utils/src/G4EmParameters.cc

@@ -134,6 +134,7 @@ void G4EmParameters::Initialise()
   fSamplingTable = false;
   fPolarisation = false;
   fMuDataFromFile = false;
+  fPEKShell = true;
   fDNA = false;
   fIsPrinted = false;
 
@@ -238,26 +239,33 @@ G4bool G4EmParameters::Fluo() const
   return fCParameters->Fluo();
 }
 
+G4EmFluoDirectory G4EmParameters::FluoDirectory() const
+{
+  return fCParameters->FluoDirectory();
+}
+
+void G4EmParameters::SetFluoDirectory(G4EmFluoDirectory val)
+{
+  if(IsLocked()) { return; }
+  fCParameters->SetFluoDirectory(val);
+}
+
 void G4EmParameters::SetBeardenFluoDir(G4bool val)
 {
   if(IsLocked()) { return; }
   fCParameters->SetBeardenFluoDir(val);
 }
 
-G4bool G4EmParameters::BeardenFluoDir() const
-{
-  return fCParameters->BeardenFluoDir();
-}
-
 void G4EmParameters::SetANSTOFluoDir(G4bool val)
 {
   if(IsLocked()) { return; }
   fCParameters->SetANSTOFluoDir(val);
 }
 
-G4bool G4EmParameters::ANSTOFluoDir() const
+void G4EmParameters::SetXDB_EADLFluoDir(G4bool val)
 {
-  return fCParameters->ANSTOFluoDir();
+  if(IsLocked()) { return; }
+  fCParameters->SetXDB_EADLFluoDir(val);
 }
 
 void G4EmParameters::SetAuger(G4bool val)
@@ -266,6 +274,18 @@ void G4EmParameters::SetAuger(G4bool val)
   fCParameters->SetAuger(val);
 }
 
+G4bool G4EmParameters::BeardenFluoDir()
+{
+  auto dir = fCParameters->FluoDirectory();
+  return (dir == fluoBearden);
+}
+
+G4bool G4EmParameters::ANSTOFluoDir()
+{
+  auto dir = fCParameters->FluoDirectory();
+  return (dir == fluoANSTO);
+}
+
 G4bool G4EmParameters::Auger() const
 {
   return fCParameters->Auger();
@@ -482,6 +502,17 @@ G4bool G4EmParameters::EnableSamplingTable() const
   return fSamplingTable;
 }
 
+G4bool G4EmParameters::PhotoeffectBelowKShell() const
+{
+  return fPEKShell;
+}
+
+void G4EmParameters::SetPhotoeffectBelowKShell(G4bool v)
+{
+  if(IsLocked()) { return; }
+  fPEKShell = v;
+}
+
 void G4EmParameters::ActivateDNA()
 {
   if(IsLocked()) { return; }
@@ -1250,7 +1281,7 @@ void G4EmParameters::DefineRegParamForDeex(G4VAtomDeexcitation* ptr) const
 
 void G4EmParameters::StreamInfo(std::ostream& os) const
 {
-  G4int prec = os.precision(5);
+  G4long prec = os.precision(5);
   os << "=======================================================================" << "\n";
   os << "======                 Electromagnetic Physics Parameters      ========" << "\n";
   os << "=======================================================================" << "\n";
@@ -1266,6 +1297,7 @@ void G4EmParameters::StreamInfo(std::ostream& os) const
   os << "Use combined TransportationWithMsc                 " <<transportationWithMsc << "\n";
   os << "Use general process                                " <<gener << "\n";
   os << "Enable linear polarisation for gamma               " <<fPolarisation << "\n";
+  os << "Enable photoeffect sampling below K-shell          " <<fPEKShell << "\n";
   os << "Enable sampling of quantum entanglement            " 
      <<fBParameters->QuantumEntanglement()  << "\n";
   os << "X-section factor for integral approach             " <<lambdaFactor << "\n";
@@ -1315,7 +1347,10 @@ void G4EmParameters::StreamInfo(std::ostream& os) const
      <<G4BestUnit(lowestMuHadEnergy,"Energy") << "\n";
   os << "Use ICRU90 data                                    " << fICRU90 << "\n";
   os << "Fluctuations of dE/dx are enabled                  " <<lossFluctuation << "\n";
-  os << "Type of fluctuation model                          " << fFluct << "\n";
+  G4String namef = "Universal";
+  if(fFluct == fUrbanFluctuation) { namef = "Urban"; }
+  else if(fFluct == fDummyFluctuation) { namef = "Dummy"; }
+  os << "Type of fluctuation model for leptons and hadrons  " << namef << "\n";
   os << "Use built-in Birks satuaration                     " << birks << "\n";
   os << "Build CSDA range enabled                           " <<buildCSDARange << "\n";
   os << "Use cut as a final range enabled                   " <<cutAsFinalRange << "\n";
@@ -1359,10 +1394,12 @@ void G4EmParameters::StreamInfo(std::ostream& os) const
   os << "======                 Atomic Deexcitation Parameters          ========" << "\n";
   os << "=======================================================================" << "\n";
   os << "Fluorescence enabled                               " <<fCParameters->Fluo() << "\n";
-  os << "Fluorescence Bearden data files enabled            " 
-     <<fCParameters->BeardenFluoDir() << "\n";
-  os << "Fluorescence ANSTO data files enabled              " 
-     <<fCParameters->ANSTOFluoDir() << "\n";
+  G4String named = "fluor";
+  G4EmFluoDirectory fdir = FluoDirectory();
+  if(fdir == fluoBearden) { named = "fluor_Bearden"; }
+  else if(fdir == fluoANSTO) { named = "fluor_ANSTO"; }
+  else if(fdir == fluoXDB_EADL) { named = "fluor_XDB_EADL"; }
+  os << "Directory in G4LEDATA for fluorescence data files  " << named << "\n";
   os << "Auger electron cascade enabled                     " 
      <<fCParameters->Auger() << "\n";
   os << "PIXE atomic de-excitation enabled                  " <<fCParameters->Pixe() << "\n";