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

Timestamp:

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

Author:

garnier

Message:

geant4 tag 9.4

File:

• trunk/source/processes/hadronic/models/de_excitation/photon_evaporation/src/G4DiscreteGammaDeexcitation.cc (modified) (4 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-03-ref-09 $
+// $Id: G4DiscreteGammaDeexcitation.cc,v 1.17 2010/11/17 19:17:17 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-04-ref-00 $
 //
 // -------------------------------------------------------------------
@@ -76 +76 @@
 {
   G4Fragment* nucleus = GetNucleus();
-  G4int A = static_cast<G4int>(nucleus->GetA());
-  G4int Z = static_cast<G4int>(nucleus->GetZ());
+  G4int A = nucleus->GetA_asInt();
+  G4int Z = nucleus->GetZ_asInt();
   //  _verbose =2;
   //  G4cout << "G4DiscreteGammaDeexcitation::CreateTransition: " << nucleus << G4endl;
@@ -163 +163 @@
       }
     } else { 
-      if (excitation > _levelManager->MaxLevelEnergy() + _tolerance) canDo = false;
+      if (excitation > _levelManager->MaxLevelEnergy() + _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
@@ -180 +180 @@
   if (canDo) {
     const G4NuclearLevel* level = _levelManager->NearestLevel(excitation);  
-    if (level != 0) {  
-      if (level->HalfLife() > _max_hl && !_rdm ) canDo = false;
+    if (!level) { 
+      canDo = false; 
+ 
     } else {
-      canDo = false;
-    }
-    if (_verbose > 0) {
-      G4cout << "G4DiscreteGammaDeexcitation::CanDoTransition -  Halflife " 
-             << level->HalfLife() << ", Calling from RDM " 
-             << (_rdm ? " True " : " False ")  << ", Max-HL = " <<  _max_hl << G4endl;
+      if (level->HalfLife() > _max_hl && !_rdm ) { canDo = false; }
+      
+      if (_verbose > 0) {
+        G4cout << "G4DiscreteGammaDeexcitation::CanDoTransition -  Halflife " 
+               << level->HalfLife() << ", Calling from RDM " 
+               << (_rdm ? " True " : " False ")  << ", Max-HL = " <<  _max_hl 
+               << G4endl;
+      }
     }
   }
   if (_verbose > 0) {
-    G4cout <<"G4DiscreteGammaDeexcitation::CanDoTransition - CanDo:" 
+    G4cout <<"G4DiscreteGammaDeexcitation::CanDoTransition - CanDo: " 
            <<  (canDo ? " True " : " False ")  << G4endl; 
   }