Changeset 1315 for trunk/source/processes/hadronic/models/de_excitation/photon_evaporation/src/G4ContinuumGammaDeexcitation.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/G4ContinuumGammaDeexcitation.cc (modified) (6 diffs)

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

@@ -24 +24 @@
 // ********************************************************************
 //
+// $Id: G4ContinuumGammaDeexcitation.cc,v 1.7 2010/04/30 16:08:03 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //
 // -------------------------------------------------------------------
@@ -40 +42 @@
 //
 //      02 May 2003,   Vladimir Ivanchenko change interface to G4NuclearlevelManager
+//
+//      19 April 2010 J. M. Quesada: smaller value of tolerance parameter
 //      
 // -------------------------------------------------------------------
@@ -61 +65 @@
 //
 
-G4ContinuumGammaDeexcitation::G4ContinuumGammaDeexcitation(): _nucleusZ(0), _nucleusA(0), _levelManager(0)
+G4ContinuumGammaDeexcitation::G4ContinuumGammaDeexcitation()
+  : _nucleusZ(0), _nucleusA(0), _levelManager(0)
 { }
 
@@ -71 +76 @@
 G4VGammaTransition* G4ContinuumGammaDeexcitation::CreateTransition()
 {
-  G4Fragment nucleus = GetNucleus();
-  G4int Z = static_cast<G4int>(nucleus.GetZ());
-  G4int A = static_cast<G4int>(nucleus.GetA());
-  G4double excitation = nucleus.GetExcitationEnergy();
+  G4Fragment* nucleus = GetNucleus();
+  G4int Z = static_cast<G4int>(nucleus->GetZ());
+  G4int A = static_cast<G4int>(nucleus->GetA());
+  G4double excitation = nucleus->GetExcitationEnergy();
 
   if (_nucleusA != A || _nucleusZ != Z)
@@ -83 +88 @@
     }
 
-  if (_verbose > 1)
+  if (_verbose > 1) {
     G4cout << "G4ContinuumGammaDeexcitation::CreateTransition - Created" << G4endl;
-
+  }
   G4VGammaTransition* gt =  new G4ContinuumGammaTransition(_levelManager,Z,A,excitation,_verbose );
 
@@ -92 +97 @@
     
 
-G4bool G4ContinuumGammaDeexcitation::CanDoTransition() const
+G4bool G4ContinuumGammaDeexcitation::CanDoTransition() 
 {
- G4bool canDo = true;
+  //JMQ: far too small, creating sometimes continuum gammas instead of the right discrete ones
+  // (when excitation energy is slightly over maximum discrete  energy): changed
+  //  G4double tolerance = 10*eV;
+  const G4double tolerance = CLHEP::keV;
 
   if (_transition == 0) 
     {
-      canDo = false;
-
-      if (_verbose > 0)
-        G4cout 
-          << "G4ContinuumGammaDeexcitation::CanDoTransition - Null transition "
-          << G4endl;
+      if (_verbose > 0) {
+        G4cout << "G4ContinuumGammaDeexcitation::CanDoTransition - Null transition "
+               << G4endl;
+      }
+      return false;
     }
 
-  G4Fragment nucleus = GetNucleus();
-  G4double excitation = nucleus.GetExcitationEnergy();
+  G4Fragment* nucleus = GetNucleus();
+  G4double excitation = nucleus->GetExcitationEnergy();
 
-  G4double A = nucleus.GetA();
-  G4double Z = nucleus.GetZ();
-  if (A <2 || Z<3)
+  //  G4int A = (G4int)nucleus->GetA();
+  // G4int Z = (G4int)nucleus->GetZ();
+  if (_nucleusA<2 || _nucleusZ<3)
     {
-      canDo = false;
-      if (_verbose > 0) 
-        G4cout 
-          << "G4ContinuumGammaDeexcitation::CanDoTransition - n/p/H"
-          << G4endl;
+      if (_verbose > 1) { 
+        G4cout << "G4ContinuumGammaDeexcitation::CanDoTransition - n/p/H"
+               << G4endl;
+      }
+      return false;
     }
 
-
-
-  if (excitation <= 0.) 
+  if (excitation <= tolerance) 
     {
-      canDo = false;
-      if (_verbose > 0) 
-        G4cout 
-          << "G4ContinuumGammaDeexcitation::CanDoTransition -  Excitation <= 0"
-          << G4endl;
+      if (_verbose > 1) { 
+        G4cout << "G4ContinuumGammaDeexcitation::CanDoTransition -  Excitation "
+               << excitation/CLHEP::keV << " keV is too small"
+               << G4endl;
+      }
+      return false;
     }
-  G4double tolerance = 10*eV;
-  if (excitation <= (_levelManager->MaxLevelEnergy()+ tolerance)) 
-    {
-      canDo = false;  
-      if (_verbose > 0)
-      G4cout << "G4ContinuumGammaDeexcitation::CanDoTransition -  Excitation " 
-             << excitation << " below max discrete level " 
-             << _levelManager->MaxLevelEnergy() << G4endl;
+  if (excitation <= (_levelManager->MaxLevelEnergy() + tolerance)) 
+    {  
+      if (_verbose > 0) {
+        G4cout << "G4ContinuumGammaDeexcitation::CanDoTransition -  Excitation " 
+               << excitation << " below max discrete level " 
+               << _levelManager->MaxLevelEnergy() << G4endl;
+      }
+      return false;
     }
   
-  if (canDo)
-    { if (_verbose > 1) 
-      G4cout <<"G4ContinuumGammaDeexcitation::CanDoTransition - CanDo" 
-             << G4endl; 
-    }
-
-  return canDo;
-
+  if (_verbose > 1) {
+    G4cout <<"G4ContinuumGammaDeexcitation::CanDoTransition - CanDo" 
+           << " Eex(keV)= " << excitation/CLHEP::keV 
+           << " Emax(keV)= " << _levelManager->MaxLevelEnergy()/CLHEP::keV 
+           << " Z= " << _nucleusZ << " A= " << _nucleusA
+           << G4endl;
+  }
+  return true;
 }