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

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

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4PhotonEvaporation.cc,v 1.13 2010/05/17 11:47:43 flei Exp $
-// GEANT4 tag $Name: geant4-09-03-ref-09 $
+// $Id: G4PhotonEvaporation.cc,v 1.16 2010/11/23 18:03:21 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-04-ref-00 $
 //
 // -------------------------------------------------------------------
@@ -75 +75 @@
 { 
   _probAlgorithm = new G4E1Probability;
-  _discrDeexcitation = new G4DiscreteGammaDeexcitation;
+  G4DiscreteGammaDeexcitation* p = new G4DiscreteGammaDeexcitation();
+  p->SetICM(false);
+  _discrDeexcitation = p;
   _contDeexcitation = new G4ContinuumGammaDeexcitation;
-  (dynamic_cast <G4DiscreteGammaDeexcitation*> (_discrDeexcitation))->SetICM(false);
-}
-
+  _nucleus = 0;
+}
 
 G4PhotonEvaporation::~G4PhotonEvaporation()
@@ -87 +88 @@
   delete _contDeexcitation;
 }
-
 
 void G4PhotonEvaporation::Initialize(const G4Fragment& fragment)
@@ -290 +290 @@
 G4double G4PhotonEvaporation::GetEmissionProbability() const
 {
-  G4double prob = 0.;
-  if (_probAlgorithm != 0) {
-    prob = _probAlgorithm->EmissionProbability(*_nucleus,_gammaE);
-  }
+  G4double prob = 
+    _probAlgorithm->EmissionProbability(*_nucleus,_nucleus->GetExcitationEnergy());
   return prob;
 }
@@ -308 +306 @@
 
   _myOwnProbAlgorithm = false;
-
-  return;
 }
 
@@ -318 +314 @@
   _contDeexcitation->SetVerboseLevel(verbose);
   _discrDeexcitation->SetVerboseLevel(verbose);
-
-  return;
 }
 
@@ -325 +319 @@
 {
  (dynamic_cast <G4DiscreteGammaDeexcitation*> (_discrDeexcitation))->SetICM(ic);
- return;
 }
 
@@ -331 +324 @@
 {
  (dynamic_cast <G4DiscreteGammaDeexcitation*> (_discrDeexcitation))->SetHL(hl);
- return;
 }
 
@@ -337 +329 @@
 {
  (dynamic_cast <G4DiscreteGammaDeexcitation*> (_discrDeexcitation))->SetRDM(fromRDM);
- return;
 }
 
@@ -343 +334 @@
 {
   _discrDeexcitation->SetEO(eo);
-  return;
 }