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

Timestamp:

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

Author:

garnier

Message:

update processes

File:

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

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