Import Geant4 8.1.0 source tree

source/particles/management/src/G4IonTable.cc

@@ -1,28 +1,31 @@
 //
 // ********************************************************************
-// * DISCLAIMER                                                       *
+// * License and Disclaimer                                           *
 // *                                                                  *
-// * The following disclaimer summarizes all the specific disclaimers *
-// * of contributors to this software. The specific disclaimers,which *
-// * govern, are listed with their locations in:                      *
-// *   http://cern.ch/geant4/license                                  *
+// * The  Geant4 software  is  copyright of the Copyright Holders  of *
+// * the Geant4 Collaboration.  It is provided  under  the terms  and *
+// * conditions of the Geant4 Software License,  included in the file *
+// * LICENSE and available at  http://cern.ch/geant4/license .  These *
+// * include a list of copyright holders.                             *
 // *                                                                  *
 // * Neither the authors of this software system, nor their employing *
 // * institutes,nor the agencies providing financial support for this *
 // * work  make  any representation or  warranty, express or implied, *
 // * regarding  this  software system or assume any liability for its *
-// * use.                                                             *
+// * use.  Please see the license in the file  LICENSE  and URL above *
+// * for the full disclaimer and the limitation of liability.         *
 // *                                                                  *
-// * This  code  implementation is the  intellectual property  of the *
-// * GEANT4 collaboration.                                            *
-// * By copying,  distributing  or modifying the Program (or any work *
-// * based  on  the Program)  you indicate  your  acceptance of  this *
-// * statement, and all its terms.                                    *
+// * This  code  implementation is the result of  the  scientific and *
+// * technical work of the GEANT4 collaboration.                      *
+// * By using,  copying,  modifying or  distributing the software (or *
+// * any work based  on the software)  you  agree  to acknowledge its *
+// * use  in  resulting  scientific  publications,  and indicate your *
+// * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
 //
 //
-// $Id: G4IonTable.cc,v 1.39 2005/11/18 21:07:35 asaim Exp $
-// GEANT4 tag $Name: geant4-08-00 $
+// $Id: G4IonTable.cc,v 1.41 2006/06/29 19:25:26 gunter Exp $
+// GEANT4 tag $Name: geant4-08-01 $
 //
 // 
 // --------------------------------------------------------------
@@ -75,25 +78,26 @@ G4IonTable::~G4IonTable()
 
   if (fIonList ==0) return;
 
+  //  No need to delete here because all particles are dynamic objects
+  //   
   // delete ion objects
-  G4ParticleDefinition* particle;
-  G4IonList::reverse_iterator i;
-  for (i = fIonList->rbegin(); i!= fIonList->rend(); ++i) {
-    particle = *i;
-
-    if ( !IsLightIon(particle) ) {
-      // delete if not static objects
+  //G4ParticleDefinition* particle;
+  //G4IonList::reverse_iterator i;
+  //for (i = fIonList->rbegin(); i!= fIonList->rend(); ++i) {
+  //  particle = *i;
+  //
+  //if ( !IsLightIon(particle) ) {
+  //    delete if not static objects
 #ifdef G4VERBOSE
-      G4String name;
-      if (GetVerboseLevel()>1) {
-        G4cout << "G4IonTable:~IonTable() : delete ion of  " ;
-        G4cout << particle->GetParticleName() << G4endl;
-      }
+  //    G4String name;
+  //    if (GetVerboseLevel()>1) {
+  //      G4cout << "G4IonTable:~IonTable() : delete ion of  " ;
+  //      G4cout << particle->GetParticleName() << G4endl;
+  //    }
 #endif
-      delete particle;
-    }
-
-  }
+  //    delete particle;
+  //  }
+  //}
 
   // remove all contents in the Ion List 
   fIonList->clear();
@@ -160,10 +164,9 @@ G4ParticleDefinition* G4IonTable::CreateIon(G4int Z, G4int A, G4double E, G4int
 			 J,              +1,             0,          
 			 0,               0,             0,             
 		 "nucleus",               0,             A,           0,
-		    stable,            life,    decayTable);
-
-  // Set Excitation Energy
-  ((G4Ions*)(ion))->SetExcitationEnergy(E);
+		    stable,            life,    decayTable,       false,
+		  "generic",              0,
+		      E                       );
 
 #ifdef G4VERBOSE
   if (GetVerboseLevel()>1) {
@@ -247,22 +250,11 @@ G4ParticleDefinition* G4IonTable::FindIon(G4int Z, G4int A, G4double E, G4int J)
     ion = *idx;
 
     // Z = Atomic Number 
-    G4int anAtomicNumber = 0;
-    // A = baryon number
-    G4int anAtomicMass = 0;
-    // excitation level
-    G4double anExcitaionEnergy =0.0;
-
-    if ( IsLightIon(ion) ) {
-      anAtomicNumber = G4int(ion->GetPDGCharge()/eplus);
-      anAtomicMass = ion->GetBaryonNumber();
-      anExcitaionEnergy = 0.0;
-
-    } else  {
-      anAtomicNumber   = ((const G4Ions*)(ion))->GetAtomicNumber();
-      anAtomicMass    =  ((const G4Ions*)(ion))->GetAtomicMass();
-      anExcitaionEnergy = ((const G4Ions*)(ion))->GetExcitationEnergy();
-    }
+    G4int     anAtomicNumber   = ion->GetAtomicNumber();
+     // A = baryon number
+    G4int  anAtomicMass    =  ion->GetAtomicMass();
+     // excitation level
+    G4double anExcitaionEnergy = ((const G4Ions*)(ion))->GetExcitationEnergy();
 
     if ( (A == anAtomicMass) && 
          (Z == anAtomicNumber ) &&