Import Geant4 11.2.0 source tree

source/processes/hadronic/models/particle_hp/include/G4ParticleHPDataUsed.hh

@@ -26,7 +26,9 @@
 // 070625 add natural abundance (nat) flag by T. Koi
 //
 // P. Arce, June-2014 Conversion neutron_hp to particle_hp
+// V. Ivanchenko, July-2023 Basic revision of particle HP classes
 //
+
 #ifndef G4ParticleHPDataUsed_h
 #define G4ParticleHPDataUsed_h 1
 
@@ -34,38 +36,29 @@
 
 class G4ParticleHPDataUsed
 {
-  public:
-    G4ParticleHPDataUsed()
-    {
-      theName = "";
-      theA = 0;
-      theZ = 0;
-      theM = 0;
-      nat = false;
-    }
+public:
+  G4ParticleHPDataUsed() = default;
 
-    void SetA(G4double anA) { theA = anA; }
-    void SetZ(G4int aZ) { theZ = aZ; }
-    void SetM(G4int aM) { theM = aM; }
-    void SetName(G4String aName) { theName = aName; }
+  void SetA(G4double anA) { theA = G4lrint(anA); }
+  void SetA(G4int anA) { theA = anA; }
+  void SetZ(G4int aZ) { theZ = aZ; }
+  void SetM(G4int aM) { theM = aM; }
+  void SetName(const G4String& aName) { theName = aName; }
 
-    G4int GetZ() { return theZ; }
-    G4double GetA() { return theA; }
-    G4int GetM() { return theM; }
-    G4String GetName() { return theName; }
+  G4int GetZ() { return theZ; }
+  G4int GetA() { return theA; }
+  G4int GetM() { return theM; }
+  G4String& GetName() { return theName; }
 
-  private:
-    G4String theName;
-    G4double theA;
-    G4int theZ;
-    G4int theM;
+  G4bool IsThisNaturalAbundance() { return nat; };
+  void SetNaturalAbundanceFlag() { nat = TRUE; };
 
-  public:
-    G4bool IsThisNaturalAbundance() { return nat; };
-    void SetNaturalAbundanceFlag() { nat = TRUE; };
-
-  private:
-    G4bool nat;
+private:
+  G4int theA{0};
+  G4int theZ{0};
+  G4int theM{0};
+  G4bool nat{true};
+  G4String theName{""};
 };
 
 #endif