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

Timestamp:

Nov 25, 2009, 5:13:58 PM (15 years ago)

Author:

garnier

Message:

update CVS release candidate geant4.9.3.01

Location:

trunk/source/particles/management/include

Files:

• G4DalitzDecayChannel.hh (modified) (1 diff)
• G4DecayProducts.hh (modified) (1 diff)
• G4DecayTable.hh (modified) (1 diff)
• G4DecayTableMessenger.hh (modified) (1 diff)
• G4DynamicParticle.hh (modified) (1 diff)
• G4DynamicParticle.icc (modified) (1 diff)
• G4DynamicParticleFastVector.hh (modified) (1 diff)
• G4ElectronOccupancy.hh (modified) (2 diffs)
• G4HyperNucleiProperties.hh (modified) (1 diff)
• G4IonTable.hh (modified) (9 diffs)
• G4Ions.hh (modified) (1 diff)
• G4IsotopeProperty.hh (modified) (1 diff)
• G4KL3DecayChannel.hh (modified) (1 diff)
• G4MuonDecayChannel.hh (modified) (1 diff)
• G4NeutronBetaDecayChannel.hh (modified) (1 diff)
• G4NucleiProperties.hh (modified) (5 diffs)
• G4NucleiPropertiesTheoreticalTable.hh (modified) (1 diff)
• G4PDGCodeChecker.hh (modified) (1 diff)
• G4ParticleDefinition.hh (modified) (2 diffs)
• G4ParticleDefinition.icc (modified) (2 diffs)
• G4ParticleMessenger.hh (modified) (4 diffs)
• G4ParticleMomentum.hh (modified) (1 diff)
• G4ParticlePropertyData.hh (modified) (1 diff)
• G4ParticlePropertyMessenger.hh (modified) (1 diff)
• G4ParticlePropertyTable.hh (modified) (1 diff)
• G4ParticleTable.hh (modified) (1 diff)
• G4ParticleTable.icc (modified) (1 diff)
• G4ParticleTableIterator.hh (modified) (1 diff)
• G4ParticleWithCuts.hh (modified) (1 diff)
• G4PhaseSpaceDecayChannel.hh (modified) (1 diff)
• G4PrimaryParticle.hh (modified) (1 diff)
• G4PrimaryVertex.hh (modified) (1 diff)
• G4ShortLivedTable.hh (modified) (1 diff)
• G4TauLeptonicDecayChannel.hh (modified) (1 diff)
• G4VDecayChannel.hh (modified) (1 diff)
• G4VIsotopeTable.hh (modified) (1 diff)
• G4VUserPrimaryParticleInformation.hh (modified) (1 diff)
• G4VUserPrimaryVertexInformation.hh (modified) (1 diff)

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

@@ -26 +26 @@
 //
 // $Id: G4DalitzDecayChannel.hh,v 1.5 2006/06/29 19:22:43 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //

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

@@ -26 +26 @@
 //
 // $Id: G4DecayProducts.hh,v 1.12 2006/06/29 19:22:45 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //

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

@@ -26 +26 @@
 //
 // $Id: G4DecayTable.hh,v 1.9 2006/06/29 19:22:47 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //

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

@@ -26 +26 @@
 //
 // $Id: G4DecayTableMessenger.hh,v 1.8 2006/06/29 19:22:52 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //

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

@@ -26 +26 @@
 //
 // $Id: G4DynamicParticle.hh,v 1.18 2007/03/11 07:17:35 kurasige Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 // 

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

@@ -26 +26 @@
 //
 // $Id: G4DynamicParticle.icc,v 1.16 2007/03/11 07:17:35 kurasige Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 // 

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

@@ -26 +26 @@
 //
 // $Id: G4DynamicParticleFastVector.hh,v 1.4 2006/06/29 19:23:06 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 // 

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

@@ -25 +25 @@
 //
 //
-// $Id: G4ElectronOccupancy.hh,v 1.9 2006/06/29 19:23:08 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4ElectronOccupancy.hh,v 1.10 2009/10/21 12:50:31 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 // 
@@ -62 +62 @@
 {
  public:
-   enum { MaxSizeOfOrbit = 7};
+   enum { MaxSizeOfOrbit = 10};
 
  public: // With Description

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

@@ -26 +26 @@
 //
 // $Id: G4HyperNucleiProperties.hh,v 1.1 2007/09/14 07:04:09 kurasige Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 // 

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

@@ -25 +25 @@
 //
 //
-// $Id: G4IonTable.hh,v 1.26 2008/03/20 02:23:30 kurasige Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4IonTable.hh,v 1.28 2009/09/23 12:13:48 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 // 
@@ -43 +43 @@
 //      New design using G4VIsotopeTable          5 Oct. 99 H.Kurashige
 //      Add GetNucleusEncoding according PDG 2006 9 Oct. 2006 H.Kurashige
+//      Use STL map                              30 Jul. 2009 H.Kurashige
 
 #ifndef G4IonTable_h
@@ -50 +51 @@
 #include "globals.hh"
 #include "G4ParticleDefinition.hh"
+#include "G4ParticleTableIterator.hh"
+#include "G4Ions.hh"
 
 #include <cmath>
 #include <vector>
+#include <map>
 
 class G4ParticleTable;
@@ -66 +70 @@
 
  public:
-   // Use STL Vector as list of ions
-   typedef std::vector<G4ParticleDefinition*> G4IonList;
+   // Use STL map as list of ions
+   typedef  std::multimap<G4int, G4ParticleDefinition*> G4IonList;
+   typedef  std::multimap<G4int, G4ParticleDefinition*>::iterator G4IonListIterator;
 
  public:
@@ -111 +116 @@
    // The ion can be get by using PDG encoding 
    // !! Only ground state can be obtained .i.e. Isomer = 0
-  
+   
+   void CreateAllIon();
+   // All ground state ions will be created
 
    // Find/Get "excited state" 
@@ -130 +137 @@
    // The third and last arguments gives no effect
 
-   static G4bool        IsIon(G4ParticleDefinition*);
+   static G4bool        IsIon(const G4ParticleDefinition*);
    // return true if the particle is ion
 
@@ -183 +190 @@
    G4ParticleDefinition* GetParticle(G4int index) const;
    // Return the pointer of index-th ion in the table
-
+ 
    G4bool                Contains(const G4ParticleDefinition *particle) const;
    // Return 'true' if the ion exists
@@ -237 +244 @@
   return numberOfElements;
 }
+
 inline G4bool  G4IonTable::Contains(const G4ParticleDefinition* particle) const
 {
-  G4IonList::iterator i;
-  for (i = fIonList->begin(); i!= fIonList->end(); ++i) {
-    if (**i==*particle) return true;
+  if (!IsIon(particle)) return false;
+
+  G4int Z = particle->GetAtomicNumber();
+  G4int A = particle->GetAtomicMass();  
+  G4int L = particle->GetQuarkContent(3);  //strangeness 
+  G4int encoding=GetNucleusEncoding(Z, A, L);
+  G4bool found = false;
+  if (encoding !=0 ) {
+    G4IonList::iterator i = fIonList->find(encoding);
+    for( ;i != fIonList->end() ; i++) {
+      if (particle == i->second ) {
+        found  = true;
+        break;
+      }
+    }
   }
-  return false;
+  return found;
 }
 
@@ -258 +278 @@
 inline void G4IonTable::clear()
 {
+#ifdef G4VERBOSE
+    if (GetVerboseLevel()>2) {
+      G4cout << "G4IonTable::Clear() : number of Ion regsitered =  "; 
+      G4cout << fIonList->size() <<  G4endl;
+    }
+#endif
   fIonList->clear();
 }
 
-inline G4ParticleDefinition*  G4IonTable::GetParticle(G4int index) const
-{
-  if ( (index >=0 ) && (index < Entries()) ){
-    return (*fIonList)[index];
-  } else {
-    return 0; 
-  } 
-}
 
 

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

@@ -26 +26 @@
 //
 // $Id: G4Ions.hh,v 1.15 2008/06/08 12:43:19 kurasige Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 // 

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

@@ -26 +26 @@
 //
 // $Id: G4IsotopeProperty.hh,v 1.5 2007/03/15 06:53:27 kurasige Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 // 

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

@@ -26 +26 @@
 //
 // $Id: G4KL3DecayChannel.hh,v 1.5 2006/06/29 19:23:33 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //

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

@@ -26 +26 @@
 //
 // $Id: G4MuonDecayChannel.hh,v 1.6 2006/06/29 19:23:35 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //

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

@@ -26 +26 @@
 //
 // $Id: G4NeutronBetaDecayChannel.hh,v 1.2 2006/06/29 19:23:51 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //

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

@@ -25 +25 @@
 //
 //
-// $Id: G4NucleiProperties.hh,v 1.18 2008/10/28 07:12:31 kurasige Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4NucleiProperties.hh,v 1.20 2009/05/02 11:58:17 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 // 
@@ -38 +38 @@
 // excess formula by V.Lara (9 May 99)
 // 
+// 090331 Migrate to AME03 by Koi, Tatsumi 
 
 #ifndef G4NucleiProperties_h
@@ -44 +45 @@
 #include "globals.hh"
 #include "G4ios.hh"
-#include "G4NucleiPropertiesTable.hh"
+#include "G4NucleiPropertiesTableAME03.hh"
 #include "G4NucleiPropertiesTheoreticalTable.hh"
 #include "G4ParticleTable.hh"
@@ -67 +68 @@
   // Give mass of nucleus A,Z
   static G4double GetNuclearMass(const G4double A, const G4double Z);
+  static G4double GetNuclearMass(const G4int A, const G4int Z);
 
   // return 'true' if the nucleus in the stable table 
   // (i.e.in G4NucleiPropertiesTable)
   static bool IsInStableTable(const G4double A, const G4double Z);
+  static bool IsInStableTable(const G4int A, const G4int Z);
 
   // Give binding energy 
@@ -88 +91 @@
   
   static G4double  AtomicMass(G4double A, G4double Z);
+  
+  static G4double  NuclearMass(G4double A, G4double Z);
   
   static G4double BindingEnergy(G4double A, G4double Z);

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

@@ -26 +26 @@
 //
 // $Id: G4NucleiPropertiesTheoreticalTable.hh,v 1.8 2008/10/22 12:35:46 kurasige Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 // 

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

@@ -26 +26 @@
 //
 // $Id: G4PDGCodeChecker.hh,v 1.9 2007/09/14 07:04:09 kurasige Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 // 

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: geant4-09-02-ref-02 $
+// $Id: G4ParticleDefinition.hh,v 1.33 2008/11/14 16:26:30 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 // 
@@ -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: geant4-09-02-ref-02 $
+// $Id: G4ParticleDefinition.icc,v 1.14 2009/03/27 20:33:50 gum Exp $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 
@@ -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*std::fabs(thePDGMagneticMoment/muB - 2.*thePDGCharge/eplus);   
+   } else {     
+     return 0.0;
+   }
+}

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

@@ -25 +25 @@
 //
 //
-// $Id: G4ParticleMessenger.hh,v 1.8 2008/06/08 12:43:19 kurasige Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4ParticleMessenger.hh,v 1.9 2009/07/31 06:39:22 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //
@@ -71 +71 @@
 //    25 Nov. 1998, H. Kurashige   : add /particle/find
 //    08 Jun. 2008, H. Kurashige   : add /particle/verbose
+//    30 Jul. 2009, H. Kurashige   : add /particle/createAllIon
 //---------------------------------------------------------------
 
@@ -84 +85 @@
 class G4UIcmdWithAString; 
 class G4UIcmdWithAnInteger; 
+class G4UIcmdWithoutParameter; 
 
 #include "G4UImessenger.hh"
@@ -108 +110 @@
     G4UIcmdWithAString *        selectCmd;
     G4UIcmdWithAnInteger *      findCmd;
+    G4UIcmdWithoutParameter *   createAllCmd;
     G4UIcmdWithAnInteger *      verboseCmd;
 

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

@@ -26 +26 @@
 //
 // $Id: G4ParticleMomentum.hh,v 1.6 2006/06/29 19:24:08 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 // 

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

@@ -26 +26 @@
 //
 // $Id: G4ParticlePropertyData.hh,v 1.3 2007/03/11 07:17:35 kurasige Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 // 

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

@@ -26 +26 @@
 //
 // $Id: G4ParticlePropertyMessenger.hh,v 1.7 2006/06/29 19:24:14 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //

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

@@ -25 +25 @@
 //
 // $Id: G4ParticlePropertyTable.hh,v 1.4 2006/06/29 19:24:18 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 // 

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

@@ -26 +26 @@
 //
 // $Id: G4ParticleTable.hh,v 1.21 2008/03/22 06:03:40 kurasige Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 // 

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

@@ -26 +26 @@
 //
 // $Id: G4ParticleTable.icc,v 1.11 2007/09/14 07:04:09 kurasige Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 // 

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

@@ -26 +26 @@
 //
 // $Id: G4ParticleTableIterator.hh,v 1.7 2006/06/29 19:24:36 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 // 

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

@@ -26 +26 @@
 //
 // $Id: G4ParticleWithCuts.hh,v 1.19 2006/06/29 19:24:38 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 // 

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

@@ -26 +26 @@
 //
 // $Id: G4PhaseSpaceDecayChannel.hh,v 1.6 2006/06/29 19:24:40 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //

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

@@ -26 +26 @@
 //
 // $Id: G4PrimaryParticle.hh,v 1.4 2006/09/28 14:29:43 kurasige Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //

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

@@ -26 +26 @@
 //
 // $Id: G4PrimaryVertex.hh,v 1.4 2006/07/20 15:14:43 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //

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

@@ -26 +26 @@
 //
 // $Id: G4ShortLivedTable.hh,v 1.13 2008/03/20 02:23:31 kurasige Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 // 

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

@@ -26 +26 @@
 //
 // $Id: G4TauLeptonicDecayChannel.hh,v 1.2 2006/06/29 19:24:48 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //

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

@@ -26 +26 @@
 //
 // $Id: G4VDecayChannel.hh,v 1.12 2006/06/29 19:24:50 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //

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

@@ -26 +26 @@
 //
 // $Id: G4VIsotopeTable.hh,v 1.6 2006/06/29 19:24:52 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 // 

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

@@ -26 +26 @@
 //
 // $Id: G4VUserPrimaryParticleInformation.hh,v 1.2 2006/06/29 19:24:54 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //

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

@@ -26 +26 @@
 //
 // $Id: G4VUserPrimaryVertexInformation.hh,v 1.2 2006/06/29 19:24:56 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-03-cand-01 $
 //
 //