Import Geant4 10.7.0 source tree

source/processes/hadronic/cross_sections/include/G4NeutronCaptureXS.hh

@@ -46,6 +46,7 @@
 #include "G4VCrossSectionDataSet.hh"
 #include "globals.hh"
 #include "G4ElementData.hh"
+#include "G4PhysicsVector.hh"
 #include "G4Threading.hh"
 #include <vector>
 #include <iostream>
@@ -55,7 +56,6 @@ const G4int MAXZCAPTURE = 93;
 class G4DynamicParticle;
 class G4ParticleDefinition;
 class G4Element;
-class G4PhysicsVector;
 
 class G4NeutronCaptureXS final : public G4VCrossSectionDataSet
 {
@@ -88,6 +88,11 @@ public:
 
   void CrossSectionDescription(std::ostream&) const final;
 
+  G4double IsoCrossSection(G4double ekin, G4double logekin, G4int Z, G4int A);
+
+  G4NeutronCaptureXS & operator=(const G4NeutronCaptureXS &right) = delete;
+  G4NeutronCaptureXS(const G4NeutronCaptureXS&) = delete;
+
 private: 
 
   void Initialise(G4int Z);
@@ -96,15 +101,10 @@ private:
 
   const G4String& FindDirectoryPath();
 
-  const G4PhysicsVector* GetPhysicsVector(G4int Z);
+  inline const G4PhysicsVector* GetPhysicsVector(G4int Z);
 
   G4PhysicsVector* RetrieveVector(std::ostringstream& in, G4bool warn);
 
-  G4double IsoCrossSection(G4double ekin, G4double logekin, G4int Z, G4int A);
-
-  G4NeutronCaptureXS & operator=(const G4NeutronCaptureXS &right);
-  G4NeutronCaptureXS(const G4NeutronCaptureXS&);
-
   G4double emax;
   G4double elimit;
   G4double logElimit;
@@ -114,8 +114,6 @@ private:
   G4bool   isMaster;
 
   static G4ElementData* data;
-  static const G4int amin[MAXZCAPTURE];
-  static const G4int amax[MAXZCAPTURE];
   static G4String gDataDirectory;
 
 #ifdef G4MULTITHREADED
@@ -123,4 +121,15 @@ private:
 #endif
 };
 
+inline
+const G4PhysicsVector* G4NeutronCaptureXS::GetPhysicsVector(G4int Z)
+{
+  const G4PhysicsVector* pv = data->GetElementData(Z);
+  if(pv == nullptr) { 
+    InitialiseOnFly(Z);
+    pv = data->GetElementData(Z);
+  }
+  return pv;
+}
+
 #endif