Changeset 1340 for trunk/source/particles/management/src/G4IonTable.cc

Timestamp:

Nov 5, 2010, 3:45:55 PM (14 years ago)

Author:

garnier

Message:

update ti head

File:

• trunk/source/particles/management/src/G4IonTable.cc (modified) (15 diffs)

trunk/source/particles/management/src/G4IonTable.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4IonTable.cc,v 1.61 2010/05/20 01:01:07 kurasige Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4IonTable.cc,v 1.65 2010/10/16 06:04:51 kurasige Exp $
+// GEANT4 tag $Name: particles-V09-03-15 $
 //
 // 
@@ -367 +367 @@
   // Search ions with A, Z ,E
   //  !! J is omitted now !!
-  G4ParticleDefinition* ion=0;
+  const G4ParticleDefinition* ion=0;
   G4bool isFound = false;
 
@@ -386 +386 @@
 
   if ( isFound ){ 
-    return ion;
+    return const_cast<G4ParticleDefinition*>(ion);
   } else {
     return 0;
@@ -414 +414 @@
   // Search ions with A, Z ,E
   //  !! J is omitted now !!
-  G4ParticleDefinition* ion=0;
+  const G4ParticleDefinition* ion=0;
   G4bool isFound = false;
 
@@ -435 +435 @@
 
   if ( isFound ){ 
-    return ion;
+    return const_cast<G4ParticleDefinition*>(ion);
   } else {
     return 0;
@@ -599 +599 @@
 
   // neutron is not ion
-  if ((particle->GetAtomicMass() >0) && (particle->GetAtomicNumber()>0)) return true;
+  if ((particle->GetAtomicMass()>0)   && 
+      (particle->GetAtomicNumber()>0) ){
+   if (particle->GetBaryonNumber()>0)  return true;
+   else return false;
+  }
+
    
-  //  particles derived from G4VIon and G4Ions
+  //  particles derived from G4Ions
   if (particle->GetParticleType() == nucleus) return true;
 
@@ -611 +616 @@
 
 /////////////////
+G4bool G4IonTable::IsAntiIon(const G4ParticleDefinition* particle)
+{
+  // return true if the particle is ion
+
+  static G4String anti_nucleus("anti_nucleus");
+  static G4String anti_proton("anti_proton");
+
+  // anti_neutron is not ion
+  if ((particle->GetAtomicMass()>0)   && 
+      (particle->GetAtomicNumber()>0) ){
+   if (particle->GetBaryonNumber()<0)  return true;
+   else return false;
+  }
+
+  //  particles derived from G4Ions
+  if (particle->GetParticleType() == anti_nucleus) return true;
+
+  // anti_proton (Anti_Hydrogen nucleus)
+  if (particle->GetParticleName() == anti_proton) return true;
+
+  return false;
+}
+
+/////////////////
 #include <algorithm>
 
-G4bool G4IonTable::IsLightIon(G4ParticleDefinition* particle) const
-{
-  static const std::string names[] = { "proton", "neutron", "alpha", "deuteron",
-                           "triton", "He3", "GenericIon"};
+G4bool G4IonTable::IsLightIon(const G4ParticleDefinition* particle) const
+{
+  static const std::string names[] = { "proton", "alpha", "deuteron",
+                           "triton", "He3"};
 
    // return true if the particle is pre-defined ion
-  return std::find(names, names+7, particle->GetParticleName())!=names+7;
+  return std::find(names, names+5, particle->GetParticleName())!=names+5;
+} 
+
+G4bool G4IonTable::IsLightAntiIon(const G4ParticleDefinition* particle) const
+{
+  static const std::string names[] = { "anti_proton", "anti_alpha", "anti_deuteron",
+                           "anti_triton", "anti_He3"};
+
+   // return true if the particle is pre-defined ion
+  return std::find(names, names+5, particle->GetParticleName())!=names+5;
 } 
 
@@ -627 +665 @@
   // returns pointer to pre-defined ions 
   static G4bool isInitialized = false;
-  static G4ParticleDefinition* p_proton=0;
-  static G4ParticleDefinition* p_neutron=0;
-  static G4ParticleDefinition* p_deuteron=0;
-  static G4ParticleDefinition* p_triton=0;
-  static G4ParticleDefinition* p_alpha=0;
-  static G4ParticleDefinition* p_He3=0;
+  static const G4ParticleDefinition* p_proton=0;
+  static const G4ParticleDefinition* p_deuteron=0;
+  static const G4ParticleDefinition* p_triton=0;
+  static const G4ParticleDefinition* p_alpha=0;
+  static const G4ParticleDefinition* p_He3=0;
   
   if (!isInitialized) {
     p_proton   = G4ParticleTable::GetParticleTable()->FindParticle("proton"); // proton 
-    p_neutron  = G4ParticleTable::GetParticleTable()->FindParticle("neutron"); // neutron 
     p_deuteron = G4ParticleTable::GetParticleTable()->FindParticle("deuteron"); // deuteron 
     p_triton   = G4ParticleTable::GetParticleTable()->FindParticle("triton"); // tritoon 
@@ -644 +680 @@
   }
 
-  G4ParticleDefinition* ion=0;
+  const G4ParticleDefinition* ion=0;
   if ( (Z<=2) ) {
     if ( (Z==1)&&(A==1) ) {
       ion = p_proton;
-    } else if ( (Z==0)&&(A==1) ) {
-      ion = p_neutron;
     } else if ( (Z==1)&&(A==2) ) {
       ion = p_deuteron;
@@ -660 +694 @@
     }
   }
-  return ion;
-}
+  return const_cast<G4ParticleDefinition*>(ion);
+}
+
+/////////////////
+G4ParticleDefinition* G4IonTable::GetLightAntiIon(G4int Z, G4int A) const
+{
+  // returns pointer to pre-defined ions 
+  static G4bool isInitialized = false;
+  static const G4ParticleDefinition* p_proton=0;
+  static const G4ParticleDefinition* p_deuteron=0;
+  static const G4ParticleDefinition* p_triton=0;
+  static const G4ParticleDefinition* p_alpha=0;
+  static const G4ParticleDefinition* p_He3=0;
+  
+  if (!isInitialized) {
+    p_proton   = G4ParticleTable::GetParticleTable()->FindParticle("anti_proton"); // proton 
+    p_deuteron = G4ParticleTable::GetParticleTable()->FindParticle("anti_deuteron"); // deuteron 
+    p_triton   = G4ParticleTable::GetParticleTable()->FindParticle("anti_triton"); // tritoon 
+    p_alpha    = G4ParticleTable::GetParticleTable()->FindParticle("anti_alpha"); // alpha 
+    p_He3      = G4ParticleTable::GetParticleTable()->FindParticle("anti_He3"); // He3 
+    isInitialized = true;
+  }
+
+  const G4ParticleDefinition* ion=0;
+  if ( (Z<=2) ) {
+    if ( (Z==1)&&(A==1) ) {
+      ion = p_proton;
+    } else if ( (Z==1)&&(A==2) ) {
+      ion = p_deuteron;
+    } else if ( (Z==1)&&(A==3) ) {
+      ion = p_triton;
+    } else if ( (Z==2)&&(A==4) ) {
+      ion = p_alpha;
+    } else if ( (Z==2)&&(A==3) ) {
+      ion = p_He3;
+    }
+  }
+  return const_cast<G4ParticleDefinition*>(ion);
+}
+
 
 /////////////////
@@ -683 +755 @@
   if (L == 0) {
     // calculate nucleus mass
-    G4ParticleDefinition* ion=GetLightIon(Z, A);
+    const G4ParticleDefinition* ion=GetLightIon(Z, A);
     
     if (ion!=0) {
@@ -708 +780 @@
 // -- Methods for handling conatiner  ---
 /////////////////
-void G4IonTable::Insert(G4ParticleDefinition* particle)
+void G4IonTable::Insert(const G4ParticleDefinition* particle)
 {
   if (!IsIon(particle)) return;
@@ -718 +790 @@
   G4int encoding=GetNucleusEncoding(Z, A, L);
 
-  fIonList->insert( std::pair<G4int, G4ParticleDefinition*>(encoding, particle) );
-
-}
-
-/////////////////
-void G4IonTable::Remove(G4ParticleDefinition* particle)
+  fIonList->insert( std::pair<const G4int, const G4ParticleDefinition*>(encoding, particle) );
+
+}
+
+/////////////////
+void G4IonTable::Remove(const G4ParticleDefinition* particle)
 {
   if (IsIon(particle)) {
@@ -757 +829 @@
 void G4IonTable::DumpTable(const G4String &particle_name) const
 {
-  G4ParticleDefinition* ion;
+  const G4ParticleDefinition* ion;
   G4IonList::iterator idx;
   for (idx = fIonList->begin(); idx!= fIonList->end(); ++idx) {
@@ -905 +977 @@
     G4int counter = 0;
     while( idx != fIonList->end() ){
-      if ( counter == index ) return idx->second;
+      if ( counter == index ) {
+        return const_cast<G4ParticleDefinition*>(idx->second);
+      }
       counter++;
       idx++;