Changeset 1347 for trunk/source/processes/electromagnetic/lowenergy/src/G4hLowEnergyIonisation.cc

Timestamp:

Dec 22, 2010, 3:52:27 PM (13 years ago)

Author:

garnier

Message:

geant4 tag 9.4

File:

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

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

@@ -174 +174 @@
   shellCS = new G4teoCrossSection("analytical");
 
+  deexcitationManager.InitialiseForNewRun();
+  deexcitationManager.SetAugerActive(false);
+  deexcitationManager.SetPIXEActive(true);
+
 }
 
@@ -990 +994 @@
   if(newpart != 0) {
 
+    //    G4cout << "AlongStep DEEXCTATION!!!" << G4endl; //debug 
     size_t nSecondaries = newpart->size();
     aParticleChange.SetNumberOfSecondaries(nSecondaries);
@@ -1296 +1301 @@
               ||  bindingEnergy >= minElectronEnergy) ) {
         
-        G4int shellId = atomicShell->ShellId();
-        secondaryVector = deexcitationManager.GenerateParticles(Z, shellId);
+        //      G4int shellId = atomicShell->ShellId();
+        deexcitationManager.GenerateParticles(secondaryVector, atomicShell, Z, minGammaEnergy, minElectronEnergy);
         
         if (secondaryVector != 0) {
-          
+          // debug        G4cout << "DEEXCTATION!!!" << G4endl; //debug  
           nSecondaries = secondaryVector->size();
           for (size_t i = 0; i<nSecondaries; i++) {
@@ -1450 +1455 @@
 
   // create vector of tracks of secondary particles
-
+  
   std::vector<G4DynamicParticle*>* partVector =
          new std::vector<G4DynamicParticle*>;
-  std::vector<G4DynamicParticle*>* secVector = 0;
+  std::vector<G4DynamicParticle*>* secVector = new std::vector<G4DynamicParticle*>;
   G4DynamicParticle* aSecondary = 0;
   G4ParticleDefinition* type = 0;
   G4double e, tkin, grej;
   G4ThreeVector position;
-  G4int shell, shellId;
+  G4int shell;
 
   // sample secondaries
@@ -1482 +1487 @@
         } while( G4UniformRand() > grej );
 
+        // Atom total cross section     
+        shellCS->SetTotalCS(totalCrossSectionMap[Z]);  
+        
         shell = shellCS->SelectRandomShell(Z,incidentEnergy,hMass,tkin);
-
-        shellId = transitionManager->Shell(Z, shell)->ShellId();
+        
+        //        shellId = transitionManager->Shell(Z, shell)->ShellId();
         G4double maxE = transitionManager->Shell(Z, shell)->BindingEnergy();
-
-        if (maxE>minGammaEnergy || maxE>minElectronEnergy ) {
-          secVector = deexcitationManager.GenerateParticles(Z, shellId);
-        } else {
-          secVector = 0;
-        }
-
-        if (secVector) {
-
-          for (size_t l = 0; l<secVector->size(); l++) {
-
-            aSecondary = (*secVector)[l];
-            if(aSecondary) {
-
-              e = aSecondary->GetKineticEnergy();
-              type = aSecondary->GetDefinition();
-              if ( etot + e <= eLoss &&
-                   ( (type == G4Gamma::Gamma() && e > minGammaEnergy ) ||
-                   (type == G4Electron::Electron() && e > minElectronEnergy) ) ) {
-
-                     etot += e;
-                     partVector->push_back(aSecondary);
-
-              } else {
-                     delete aSecondary;
+        
+        if (maxE>minGammaEnergy || maxE>minElectronEnergy ) 
+          {
+          deexcitationManager.GenerateParticles(secVector, transitionManager->Shell(Z, shell), Z, minGammaEnergy, minElectronEnergy);
+          }
+
+          if (!(secVector->empty())) {
+            size_t secN = secVector->size();
+            for (size_t l = 0; l<secN; l++) {
+              
+              aSecondary = (*secVector)[l];
+              if(aSecondary) {
+                
+                e = aSecondary->GetKineticEnergy();
+                type = aSecondary->GetDefinition();
+                if ( etot + e <= eLoss &&
+                     ( (type == G4Gamma::Gamma() && e > minGammaEnergy ) ||
+                       (type == G4Electron::Electron() && e > minElectronEnergy) ) ) 
+                  {
+                    etot += e;
+                    partVector->push_back(aSecondary);  
+                  } 
+                else 
+                  {
+                    delete aSecondary;
+                  }
+                aSecondary = 0;
               }
+              (*secVector)[l] = 0;
+              delete (*secVector)[l];
             }
+            
+            //      secVector = 0;
+
           }
-          delete secVector;
-        }
       }
     }
   }
+
+  delete secVector;
 
   if(partVector->empty()) {
@@ -2013 +2028 @@
 void G4hLowEnergyIonisation::ActivateAugerElectronProduction(G4bool val)
 {
-  deexcitationManager.ActivateAugerElectronProduction(val);
+  deexcitationManager.SetAugerActive(val);
 }