Changeset 1315 for trunk/source/processes/hadronic/util/include/G4Nucleus.hh

Timestamp:

Jun 18, 2010, 11:42:07 AM (14 years ago)

Author:

garnier

Message:

update geant4-09-04-beta-cand-01 interfaces-V09-03-09 vis-V09-03-08

File:

• trunk/source/processes/hadronic/util/include/G4Nucleus.hh (modified) (6 diffs)

trunk/source/processes/hadronic/util/include/G4Nucleus.hh

@@ -30 +30 @@
  // last modified: 27-Mar-1997
  // Chr. Volcker, 10-Nov-1997: new methods and class variables.
-// M.G. Pia, 2 Oct 1998: modified GetFermiMomentum (original design was
-//                       the source of memory leaks)
+ // M.G. Pia, 2 Oct 1998: modified GetFermiMomentum (original design was
+ //                       the source of memory leaks)
+ // G.Folger, spring 2010:  add integer A/Z interface
  
 #ifndef G4Nucleus_h
@@ -57 +58 @@
     G4Nucleus( const G4double A, const G4double Z );
 
+    G4Nucleus( const G4int A, const G4int Z );
+
     G4Nucleus( const G4Material *aMaterial );
     
@@ -68 +71 @@
        if( this != &right )
        {
+         theA=right.theA;  
+         theZ=right.theZ;  
          aEff=right.aEff;  
          zEff=right.zEff;  
@@ -89 +94 @@
 
     void SetParameters( const G4double A, const G4double Z );
-    
+    void SetParameters( const G4int A, const G4int Z );
+    
+//deprecated Jan 2010, GF
     inline G4double GetN() const
     { return aEff; }
@@ -95 +102 @@
     inline G4double GetZ() const
     { return zEff; }
-    
+
+//to be replaced by new 
+    inline G4int GetA_asInt() const
+    { return theA; }   
+    
+    inline G4int GetN_asInt() const
+    { return theA-theZ; }   
+    
+    inline G4int GetZ_asInt() const
+    { return theZ; }   
+//... \GF
+
     G4DynamicParticle *ReturnTargetParticle() const;
     
     G4double AtomicMass( const G4double A, const G4double Z ) const;
+    G4double AtomicMass( const G4int A, const G4int Z ) const;
     
     G4double GetThermalPz( const G4double mass, const G4double temp ) const;
@@ -155 +174 @@
  private:
     
+    G4int    theA;
+    G4int    theZ;
     G4double aEff;  // effective atomic weight
     G4double zEff;  // effective atomic number