Changeset 962 for trunk/source/processes/hadronic/models/de_excitation/photon_evaporation/src

Timestamp:

Apr 6, 2009, 12:30:29 PM (15 years ago)

Author:

garnier

Message:

update processes

Location:

trunk/source/processes/hadronic/models/de_excitation/photon_evaporation/src

Files:

• G4DiscreteGammaDeexcitation.cc (modified) (4 diffs)
• G4PhotonEvaporation.cc (modified) (5 diffs)

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

@@ -130 +130 @@
   G4bool canDo = true;
     
-  if (_transition == 0) 
-    {
-      canDo = false;
-
-      if (_verbose > 0)
-        G4cout 
-          << "G4DiscreteGammaDeexcitation::CanDoTransition - Null transition " 
-          << G4endl;
-    } 
+  if (_transition == 0) {
+    canDo = false;
+    
+    if (_verbose > 0)
+      G4cout 
+        << "G4DiscreteGammaDeexcitation::CanDoTransition - Null transition " 
+        << G4endl;
+  } 
   G4Fragment nucleus = GetNucleus();
   if (canDo)  {
@@ -154 +153 @@
 
   G4double excitation = nucleus.GetExcitationEnergy();
+
   if (canDo) {
-    if (excitation <= 0.) 
-      {
-        canDo = false;
-        if (_verbose > 0) 
-          G4cout 
-            << "G4DiscreteGammaDeexcitation::CanDoTransition -  Excitation <= 0" 
-            << G4endl;
-      }
-    
-    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
-    // ensdf levels
-    if (excitation < _levelManager->MinLevelEnergy() * 0.9) canDo = false;  
+    if (excitation <= 0.) {
+      canDo = false;
+      if (_verbose > 0) 
+        G4cout 
+          << "G4DiscreteGammaDeexcitation::CanDoTransition -  Excitation <= 0" 
+          << G4endl;
+    } else { 
+      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
+      // ensdf levels
+      if (excitation < _levelManager->MinLevelEnergy() * 0.9) canDo = false;  
   
-    if (_verbose > 0)
-      {
+      if (_verbose > 0) {
         G4cout << "G4DiscreteGammaDeexcitation::CanDoTransition -  Excitation " 
                << excitation << ", Min-Max are " 
@@ -177 +174 @@
                << _levelManager->MaxLevelEnergy() << G4endl;
       }
-  }
-
+    }
+  }
+  
   if (canDo) {
     const G4NuclearLevel* level = _levelManager->NearestLevel(excitation);  
@@ -186 +184 @@
       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:" 
-             <<  (canDo ? " True " : " False ")  << G4endl; 
-    }
-
-
+    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:" 
+           <<  (canDo ? " True " : " False ")  << G4endl; 
+  }
+  
   return canDo;
       

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

@@ -64 +64 @@
 #include "G4DiscreteGammaDeexcitation.hh"
 #include "G4E1Probability.hh"
-#include "G4AtomicDeexcitation.hh"
 
 G4PhotonEvaporation::G4PhotonEvaporation()
   :_verbose(0),_myOwnProbAlgorithm (true),
-   _eOccupancy(0), _vShellNumber(-1),_gammaE(0.),_applyARM(false)
+   _eOccupancy(0), _vShellNumber(-1),_gammaE(0.)
 { 
   _probAlgorithm = new G4E1Probability;
@@ -199 +198 @@
   _eOccupancy = _discrDeexcitation->GetEO();
   _vShellNumber = _discrDeexcitation->GetVacantSN();
-  // _eOccupancy.DumpInfo() ;
+
+  // not sure if the following line is needed!
   _discrDeexcitation->SetVaccantSN(-1);
 
@@ -214 +214 @@
     }
 
-  // now to see if apply Atomic relaxation model or not
-  // only when there is a vacant orbital electron
-  
-  if (_applyARM && _vShellNumber != -1) 
-    {
-      G4int aZ = static_cast<G4int>(_discrDeexcitation->GetNucleus().GetZ());
-      G4int eShell = _vShellNumber+1;
-      if ( eShell > 0 ) {
-        G4AtomicDeexcitation* atomDeex = new G4AtomicDeexcitation();
-        // no auger electron for now
-        atomDeex->ActivateAugerElectronProduction(0);
-        std::vector<G4DynamicParticle*>* armProducts = atomDeex->GenerateParticles(aZ,eShell);
-        G4DynamicParticle* aParticle;   
-        if (_verbose > 0)
-          G4cout << " = BreakItUp = " << armProducts->size()
-                 << " particles from G4AtomicDeexcitation " << G4endl;
-        for (size_t i = 0;  i < armProducts->size(); i++)
-          {
-            aParticle = (*armProducts)[i] ;
-            G4LorentzVector lParticle = aParticle->Get4Momentum();
-            G4Fragment* aFragment = new
-              G4Fragment(lParticle,aParticle->GetDefinition());
-            aFragment->SetCreationTime(aParticle->GetProperTime());
-            products->push_back(aFragment);
-          }
-
-        for (size_t i = 0;  i < armProducts->size(); i++)
-           delete (*armProducts)[i];
-        delete armProducts;
-        delete atomDeex;
-      }
-    }
   // Add deexcited nucleus to products
   G4Fragment* finalNucleus = new G4Fragment(_discrDeexcitation->GetNucleus());
@@ -256 +224 @@
 
 #ifdef debug
-  if ( armProducts->size() == 0)
-    CheckConservation(nucleus,products);
+  CheckConservation(nucleus,products);
 #endif
   contProducts->clear();
@@ -265 +232 @@
   return products;
 }
-
 
 G4double G4PhotonEvaporation::GetEmissionProbability() const