Changeset 1315 for trunk/source/processes/hadronic/models/de_excitation/photon_evaporation/src/G4DiscreteGammaDeexcitation.cc

Timestamp:

Jun 18, 2010, 11:42:07 AM (14 years ago)

Author:

garnier

Message:

update geant4-09-04-beta-cand-01 interfaces-V09-03-09 vis-V09-03-08

File:

• trunk/source/processes/hadronic/models/de_excitation/photon_evaporation/src/G4DiscreteGammaDeexcitation.cc (modified) (7 diffs)

trunk/source/processes/hadronic/models/de_excitation/photon_evaporation/src/G4DiscreteGammaDeexcitation.cc

@@ -24 +24 @@
 // ********************************************************************
 //
+// $Id: G4DiscreteGammaDeexcitation.cc,v 1.15 2010/05/10 07:20:40 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //
 // -------------------------------------------------------------------
@@ -65 +67 @@
   _rdm(false), _levelManager(0)
 {
-  _tolerance = 0.1 * MeV;
+  _tolerance = CLHEP::keV;
 }
 
-
-G4DiscreteGammaDeexcitation::~G4DiscreteGammaDeexcitation() {}
-
+G4DiscreteGammaDeexcitation::~G4DiscreteGammaDeexcitation() 
+{}
 
 G4VGammaTransition* G4DiscreteGammaDeexcitation::CreateTransition()
 {
-  G4Fragment nucleus = GetNucleus();
-  G4int A = static_cast<G4int>(nucleus.GetA());
-  G4int Z = static_cast<G4int>(nucleus.GetZ());
-
+  G4Fragment* nucleus = GetNucleus();
+  G4int A = static_cast<G4int>(nucleus->GetA());
+  G4int Z = static_cast<G4int>(nucleus->GetZ());
+  //  _verbose =2;
+  //  G4cout << "G4DiscreteGammaDeexcitation::CreateTransition: " << nucleus << G4endl;
   if (_nucleusA != A || _nucleusZ != Z) 
     {
@@ -84 +86 @@
       _levelManager = G4NuclearLevelStore::GetInstance()->GetManager(Z,A);
     }
-
-
 
   if (_levelManager->IsValid()) 
@@ -96 +96 @@
         }
         
-      G4double excitation = nucleus.GetExcitationEnergy();
-      //      const G4NuclearLevel* level =_levelManager.NearestLevel(excitation, _tolerance);
+      G4double excitation = nucleus->GetExcitationEnergy();
       const G4NuclearLevel* level =_levelManager->NearestLevel(excitation);
         
       if (level != 0)  
         { 
-          if (_verbose > 0)
+          if (_verbose > 0) {
             G4cout 
               << "G4DiscreteGammaDeexcitation::CreateTransition - Created from level energy " 
               << level->Energy() << ", excitation is " 
               << excitation << G4endl;
-          G4DiscreteGammaTransition* dtransit = new G4DiscreteGammaTransition(*level,Z);
+          }
+          G4DiscreteGammaTransition* dtransit = new G4DiscreteGammaTransition(*level,Z,A);
           dtransit->SetICM(_icm);  
           return dtransit;
@@ -113 +113 @@
       else 
         { 
-          if (_verbose > 0)
+          if (_verbose > 0) {
             G4cout 
               << "G4DiscreteGammaDeexcitation::CreateTransition - No transition created from "
               << excitation << " within tolerance " << _tolerance << G4endl;
-            
+          }
           return 0; 
         }
     }
-  else return 0;
+  return 0;
 }
 
 
-G4bool G4DiscreteGammaDeexcitation::CanDoTransition() const
+G4bool G4DiscreteGammaDeexcitation::CanDoTransition() 
 {
 
@@ -138 +138 @@
         << G4endl;
   } 
-  G4Fragment nucleus = GetNucleus();
   if (canDo)  {
-    G4double A = nucleus.GetA();
-    G4double Z = nucleus.GetZ();
-    if (Z<2 || A<3 || Z>98)
+    if (_nucleusZ<2 || _nucleusA<3 || _nucleusZ>98)
       {
         canDo = false;
@@ -152 +149 @@
   }
 
-  G4double excitation = nucleus.GetExcitationEnergy();
+  G4Fragment* nucleus = GetNucleus();
+  G4double excitation = nucleus->GetExcitationEnergy();
+  //G4cout << "G4DiscreteGammaDeexcitation::CanDoTransition: " << nucleus << G4endl;
 
   if (canDo) {
-    if (excitation <= 0.) {
+    if (excitation <= _tolerance) {
       canDo = false;
-      if (_verbose > 0) 
+      if (_verbose > 0) {
         G4cout 
           << "G4DiscreteGammaDeexcitation::CanDoTransition -  Excitation <= 0" 
+          << excitation << "  " << excitation - _tolerance
           << G4endl;
+      }
     } else { 
       if (excitation > _levelManager->MaxLevelEnergy() + _tolerance) canDo = false;
-      if (excitation < _levelManager->MinLevelEnergy() - _tolerance) canDo = false;  
+      //if (excitation < _levelManager->MinLevelEnergy() - _tolerance) canDo = false;  
       // The following is a protection to avoid looping in case of elements with very low
       // ensdf levels
-      if (excitation < _levelManager->MinLevelEnergy() * 0.9) canDo = false;  
+      //if (excitation < _levelManager->MinLevelEnergy() * 0.9) canDo = false;  
   
       if (_verbose > 0) {