Changeset 1192 for trunk/source/processes/electromagnetic/lowenergy/src/G4PenelopeComptonModel.cc

Timestamp:

Nov 19, 2009, 2:53:25 PM (15 years ago)

Author:

garnier

Message:

update par rapport a CVS

File:

• trunk/source/processes/electromagnetic/lowenergy/src/G4PenelopeComptonModel.cc (modified) (6 diffs)

trunk/source/processes/electromagnetic/lowenergy/src/G4PenelopeComptonModel.cc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4PenelopeComptonModel.cc,v 1.4 2009/04/18 18:29:34 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
+// $Id: G4PenelopeComptonModel.cc,v 1.8 2009/10/23 09:29:24 pandola Exp $
+// GEANT4 tag $Name: emlowen-V09-02-64 $
 //
 // Author: Luciano Pandola
@@ -44 +44 @@
 //                  - do not apply low-energy limit (default is 0)
 //                  - do not apply production threshold on level of the model
+// 21 Oct 2009   L Pandola    Remove un-necessary fUseAtomicDeexcitation flag - now managed by
+//                            G4VEmModel::DeexcitationFlag()
+//                            Add ActivateAuger() method
 //
 
@@ -58 +61 @@
 #include "G4PenelopeIntegrator.hh"
 #include "G4AtomicTransitionManager.hh"
-#include "G4AtomicDeexcitation.hh"
 #include "G4AtomicShell.hh"
 #include "G4Gamma.hh"
@@ -79 +81 @@
   ZForIntegration = 1;
 
-  fUseAtomicDeexcitation = true;
+  //by default, the model will use atomic deexcitation
+  SetDeexcitationFlag(true);
+  ActivateAuger(false);
+
   verboseLevel= 0;
   // Verbosity scale:
@@ -523 +528 @@
       { 
         G4DynamicParticle* aPhoton;
-        G4AtomicDeexcitation deexcitationManager;
         deexcitationManager.SetCutForSecondaryPhotons(cutg);
         deexcitationManager.SetCutForAugerElectrons(cute);
-        deexcitationManager.ActivateAugerElectronProduction(false);
       
         photonVector = deexcitationManager.GenerateParticles(Z,shellId);
@@ -749 +752 @@
 }
 
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+void G4PenelopeComptonModel::ActivateAuger(G4bool augerbool)
+{
+  if (!DeexcitationFlag() && augerbool)
+    {
+      G4cout << "WARNING - G4PenelopeComptonModel" << G4endl;
+      G4cout << "The use of the Atomic Deexcitation Manager is set to false " << G4endl;
+      G4cout << "Therefore, Auger electrons will be not generated anyway" << G4endl;
+    }
+  deexcitationManager.ActivateAugerElectronProduction(augerbool);
+  if (verboseLevel > 1)
+    G4cout << "Auger production set to " << augerbool << G4endl;
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....