Changeset 1347 for trunk/source/processes/hadronic/models/de_excitation/handler

Timestamp:

Dec 22, 2010, 3:52:27 PM (14 years ago)

Author:

garnier

Message:

geant4 tag 9.4

Location:

trunk/source/processes/hadronic/models/de_excitation/handler

Files:

• include/G4ExcitationHandler.hh (modified) (4 diffs)
• src/G4ExcitationHandler.cc (modified) (8 diffs)

trunk/source/processes/hadronic/models/de_excitation/handler/include/G4ExcitationHandler.hh

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4ExcitationHandler.hh,v 1.12 2010/04/27 14:00:23 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-ref-09 $
+// $Id: G4ExcitationHandler.hh,v 1.13 2010/11/17 16:20:31 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-04-ref-00 $
 //
 // Hadronic Process: Nuclear De-excitations
@@ -59 +59 @@
 #include "G4ReactionProductVector.hh"
 #include "G4ReactionProduct.hh"
-#include "G4ParticleTypes.hh"
-#include "G4ParticleTable.hh"
 // needed for default models
 #include "G4Evaporation.hh"
@@ -66 +64 @@
 #include "G4FermiBreakUp.hh"
 #include "G4PhotonEvaporation.hh"
-#include "G4IonConstructor.hh" 
+
+class G4IonTable;
 
 class G4ExcitationHandler 
@@ -141 +140 @@
   G4double minExcitation;
 
-  G4ParticleTable *theTableOfParticles;
+  G4IonTable* theTableOfIons;
 
   G4bool MyOwnEvaporationClass;

trunk/source/processes/hadronic/models/de_excitation/handler/src/G4ExcitationHandler.cc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4ExcitationHandler.cc,v 1.39 2010/05/18 15:46:11 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-ref-09 $
+// $Id: G4ExcitationHandler.cc,v 1.40 2010/11/17 16:20:38 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-04-ref-00 $
 //
 // Hadronic Process: Nuclear De-excitations
@@ -62 +62 @@
 #include "G4LorentzVector.hh"
 #include "G4NistManager.hh"
+#include "G4ParticleTable.hh"
+#include "G4IonTable.hh"
+#include "G4IonConstructor.hh" 
+#include "G4ParticleTypes.hh"
+
 #include <list>
 
@@ -70 +75 @@
   maxZForFermiBreakUp(9),maxAForFermiBreakUp(17),minEForMultiFrag(4.0*GeV),
   //  maxZForFermiBreakUp(9),maxAForFermiBreakUp(17),minEForMultiFrag(3.0*MeV),
-  //maxZForFermiBreakUp(1),maxAForFermiBreakUp(1),minEForMultiFrag(4.0*GeV),
   minExcitation(CLHEP::keV),
   MyOwnEvaporationClass(true), MyOwnMultiFragmentationClass(true),MyOwnFermiBreakUpClass(true),
   MyOwnPhotonEvaporationClass(true),OPTxs(3),useSICB(false)
 {                                                                          
-  theTableOfParticles = G4ParticleTable::GetParticleTable();
+  theTableOfIons = G4ParticleTable::GetParticleTable()->GetIonTable();
   
   theEvaporation = new G4Evaporation;
@@ -335 +339 @@
         theKindOfFragment = G4Alpha::AlphaDefinition();;
       } else {
-        theKindOfFragment = theTableOfParticles->FindIon(theFragmentZ,theFragmentA,0,theFragmentZ);
+        theKindOfFragment = 
+          theTableOfIons->GetIon(theFragmentZ,theFragmentA,0.0);
       }
       if (theKindOfFragment != 0) 
@@ -350 +355 @@
   return theReactionProductVector;
 }
-
-
 
 G4ReactionProductVector * 
@@ -399 +402 @@
       theKindOfFragment = theAlpha;
     } else {
-      theKindOfFragment = theTableOfParticles->FindIon(theFragmentZ,theFragmentA,0,theFragmentZ);
+      theKindOfFragment = 
+        theTableOfIons->GetIon(theFragmentZ,theFragmentA,0.0);
     }
     if (theKindOfFragment != 0) 
@@ -407 +411 @@
         theNew->SetTotalEnergy(theFragmentMomentum.e());
         theNew->SetFormationTime((*i)->GetCreationTime());
-#ifdef PRECOMPOUND_TEST
-        theNew->SetCreatorModel((*i)->GetCreatorModel());
-#endif
         theReactionProductVector->push_back(theNew);
       }
@@ -458 +459 @@
     ProductsEnergy += tmp.e();
     ProductsMomentum += tmp.vect();
-    ProductsA += static_cast<G4int>((*h)->GetA());
-    ProductsZ += static_cast<G4int>((*h)->GetZ());
+    ProductsA += (*h)->GetA_asInt();
+    ProductsZ += (*h)->GetZ_asInt();
   }
   
-  if (ProductsA != theInitialState.GetA()) {
+  if (ProductsA != theInitialState.GetA_asInt()) {
     G4cout << "!!!!!!!!!! Baryonic Number Conservation Violation !!!!!!!!!!" << G4endl;
     G4cout << "G4ExcitationHandler.cc: Barionic Number Conservation test for deexcitation fragments" 
            << G4endl; 
-    G4cout << "Initial A = " << theInitialState.GetA() 
+    G4cout << "Initial A = " << theInitialState.GetA_asInt() 
            << "   Fragments A = " << ProductsA << "   Diference --> " 
            << theInitialState.GetA() - ProductsA << G4endl;
   }
-  if (ProductsZ != theInitialState.GetZ()) {
+  if (ProductsZ != theInitialState.GetZ_asInt()) {
     G4cout << "!!!!!!!!!! Charge Conservation Violation !!!!!!!!!!" << G4endl;
     G4cout << "G4ExcitationHandler.cc: Charge Conservation test for deexcitation fragments"