Changeset 890 for trunk/source/particles/management/include

Timestamp:

Nov 25, 2008, 5:27:50 PM (16 years ago)

Author:

garnier

Message:

update to pre-tag revision

Location:

trunk/source/particles/management/include

Files:

• G4NucleiProperties.hh (modified) (3 diffs)
• G4NucleiPropertiesTable.hh (modified) (3 diffs)
• G4NucleiPropertiesTheoreticalTable.hh (modified) (3 diffs)
• G4ParticleDefinition.hh (modified) (2 diffs)
• G4ParticleDefinition.icc (modified) (2 diffs)

trunk/source/particles/management/include/G4NucleiProperties.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4NucleiProperties.hh,v 1.14 2006/06/29 19:23:54 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// $Id: G4NucleiProperties.hh,v 1.18 2008/10/28 07:12:31 kurasige Exp $
+// GEANT4 tag $Name:  $
 //
 // 
@@ -54 +54 @@
  //   (i.e. it has static member function only)
 
-
 public: 
 
@@ -66 +65 @@
 public:  // With Description
 
-        // Calculate Mass Excess of nucleus A,Z
-        static G4double GetMassExcess(const G4int A, const G4int Z);
+  // Give mass of nucleus A,Z
+  static G4double GetNuclearMass(const G4double A, const G4double Z);
 
-        static G4double GetAtomicMass(const G4double A, const G4double Z);
-        
-        static G4double GetBindingEnergy(const G4int A, const G4int Z);
-        
-        static G4double GetNuclearMass(const G4double A, const G4double Z);
+  // return 'true' if the nucleus in the stable table 
+  // (i.e.in G4NucleiPropertiesTable)
+  static bool IsInStableTable(const G4double A, const G4double Z);
+
+  // Give binding energy 
+  static G4double GetBindingEnergy(const G4int A, const G4int Z);
+  static G4double GetBindingEnergy(const G4double A, const G4double Z);
+
+  // Calculate Mass Excess of nucleus A,Z
+  static G4double GetMassExcess(const G4int A, const G4int Z);
+  static G4double GetMassExcess(const G4double A, const G4double Z);
 
 private:
+  // hidie methods to enforce using GetNuclearMass
+  // Give mass of Atom A,Z
+  static G4double GetAtomicMass(const G4double A, const G4double Z);
+  
+private:
+  
+  static G4double  AtomicMass(G4double A, G4double Z);
+  
+  static G4double BindingEnergy(G4double A, G4double Z);
+  
+  static G4double MassExcess(G4double A, G4double Z);
 
-        // Calculate Mass Excess according to Cameron's liquid drop formula
-//      static G4double CameronMassExcess(const G4int A, const G4int Z);
+private: 
+  // table of orbit electrons mass - binding energy 
+  enum  {MaxZ = 120};
+  static G4double electronMass[MaxZ];
 
-        static G4double  AtomicMass(G4double A, G4double Z);
-        
-        static G4double BindingEnergy(G4double A, G4double Z);
-
-        static G4double MassExcess(G4double A, G4double Z);
-        
-        
+private:
+  static G4bool   isIntialized;
+  static G4double mass_proton;
+  static G4double mass_neutron;
+  static G4double mass_deuteron;
+  static G4double mass_triton;
+  static G4double mass_alpha;
+  static G4double mass_He3;
+        
 };
 

trunk/source/particles/management/include/G4NucleiPropertiesTable.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4NucleiPropertiesTable.hh,v 1.13 2006/06/29 19:23:56 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// $Id: G4NucleiPropertiesTable.hh,v 1.14 2008/10/22 12:35:46 kurasige Exp $
+// GEANT4 tag $Name:  $
 //
 // -------------------------------------------------------------------
@@ -67 +67 @@
 //      Atomic Mass
 
+class G4NucleiProperties;
 
 class G4NucleiPropertiesTable 
@@ -83 +84 @@
 
   // Other Operations 
- public: // With Description
+  // all methods are private and can be used only by G4NucleiProperties
+
+  friend class G4NucleiProperties;  
+
+private:
 
   // Operation: GetMassExcess

trunk/source/particles/management/include/G4NucleiPropertiesTheoreticalTable.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4NucleiPropertiesTheoreticalTable.hh,v 1.7 2006/06/29 19:23:58 gunter Exp $
-// GEANT4 tag $Name: HEAD $
+// $Id: G4NucleiPropertiesTheoreticalTable.hh,v 1.8 2008/10/22 12:35:46 kurasige Exp $
+// GEANT4 tag $Name:  $
 //
 // 
@@ -46 +46 @@
 #include "globals.hh"
 
+class G4NucleiProperties;
+
 class G4NucleiPropertiesTheoreticalTable 
 {
@@ -61 +63 @@
 
   // Other Operations 
+  // all methods are private and can be used only by G4NucleiProperties
+  friend class G4NucleiProperties;  
 
- public: // With Description
+  
+ private: // With Description
   // Operation: GetMassExcess
   static G4double GetMassExcess(G4int Z, G4int A); 

trunk/source/particles/management/include/G4ParticleDefinition.hh

@@ -25 +25 @@
 //
 //
-// $Id: G4ParticleDefinition.hh,v 1.32 2008/03/22 06:03:40 kurasige Exp $
-// GEANT4 tag $Name: HEAD $
+// $Id: G4ParticleDefinition.hh,v 1.33 2008/11/14 16:26:30 kurasige Exp $
+// GEANT4 tag $Name:  $
 //
 // 
@@ -129 +129 @@
  
       G4double GetPDGMagneticMoment() const { return thePDGMagneticMoment; }
-  void SetPDGMagneticMoment(G4double mageticMoment);
+      void     SetPDGMagneticMoment(G4double mageticMoment); 
+      G4double CalculateAnomaly()  const;
+      // gives the anomaly of magnetic moment for spin 1/2 particles 
 
       const G4String& GetParticleType() const { return theParticleType; }

trunk/source/particles/management/include/G4ParticleDefinition.icc

@@ -25 +25 @@
 //
 //
-// $Id: G4ParticleDefinition.icc,v 1.12 2007/03/11 07:17:35 kurasige Exp $
-// GEANT4 tag $Name: HEAD $
+// $Id: G4ParticleDefinition.icc,v 1.13 2008/11/14 16:26:30 kurasige Exp $
+// GEANT4 tag $Name:  $
 //
 
@@ -155 +155 @@
 }
 
-
+inline
+  G4double G4ParticleDefinition::CalculateAnomaly()  const
+{
+   // gives the anomaly of magnetic moment for spin 1/2 particles 
+   if (thePDGiSpin==1) {
+     G4double muB = 0.5*eplus*hbar_Planck/(thePDGMass/c_squared);
+     return 0.5*fabs(thePDGMagneticMoment/muB - 2.*thePDGCharge/eplus);   
+   } else {     
+     return 0.0;
+   }
+}