Changeset 1340 for trunk/source/processes/electromagnetic/lowenergy/src/G4LivermoreIonisationModel.cc

Timestamp:

Nov 5, 2010, 3:45:55 PM (14 years ago)

Author:

garnier

Message:

update ti head

File:

• trunk/source/processes/electromagnetic/lowenergy/src/G4LivermoreIonisationModel.cc (modified) (12 diffs)

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

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4LivermoreIonisationModel.cc,v 1.8 2010/03/26 09:32:50 pandola Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4LivermoreIonisationModel.cc,v 1.9 2010/10/13 07:28:47 pandola Exp $
+// GEANT4 tag $Name: emlowen-V09-03-54 $
 //
 // Author: Luciano Pandola
@@ -44 +44 @@
 //                  - atomic deexcitation managed via G4VEmModel::DeexcitationFlag() is
 //                    set as "true" (default would be false)
+// 12 Oct 2010   L Pandola
+//                  - add debugging information about energy in 
+//                    SampleDeexcitationAlongStep()
+//                  - generate fluorescence SampleDeexcitationAlongStep() only above 
+//                    the cuts.
+// 
 //
 
@@ -125 +131 @@
     }
   energySpectrum = new G4eIonisationSpectrum();
-  if (verboseLevel > 0)
+  if (verboseLevel > 3)
     G4cout << "G4VEnergySpectrum is initialized" << G4endl;
 
@@ -159 +165 @@
     }
 
-  if (verboseLevel > 1)
+  if (verboseLevel > 3)
     {
       G4cout << "Cross section data: " << G4endl; 
@@ -440 +446 @@
   //secondaries. The eloss value is updated.
   G4double energyLossBefore = eloss;
+
   if (verboseLevel > 2)
-    G4cout << "Energy loss along step before deexcitation : " << energyLossBefore/keV << 
-      " keV" << G4endl;
-
+    {
+      G4cout << "-----------------------------------------------------------" << G4endl;
+      G4cout << " SampleDeexcitationAlongStep() from G4LivermoreIonisation" << G4endl;
+      G4cout << "Energy loss along step before deexcitation : " << energyLossBefore/keV << 
+        " keV" << G4endl;
+    }
   G4double incidentEnergy = theTrack.GetDynamicParticle()->GetKineticEnergy();
 
@@ -453 +463 @@
   G4double cute = (*(theCoupleTable->GetEnergyCutsVector(1)))[index];
   
-  //Notice: in LowEnergyIonisation, fluorescence is always generated above 250 eV
-  //not above the tracking cut.
-  //G4double cutForLowEnergySecondaryParticles = 250.0*eV;
 
   std::vector<G4DynamicParticle*>* deexcitationProducts =
@@ -505 +512 @@
                               {
                                 e = aSecondary->GetKineticEnergy();
-                                if ( eTot + e <= eloss )
+                                G4double itsCut = cutg;
+                                if (aSecondary->GetParticleDefinition() == G4Electron::Electron())
+                                  itsCut = cute;
+                                if ( eTot + e <= eloss && e > itsCut )
                                   {
                                     eTot += e;
@@ -524 +534 @@
     }
 
+  G4double energyLossInFluorescence = 0.0;
   size_t nSecondaries = deexcitationProducts->size();
   if (nSecondaries > 0) 
     {
-      fParticleChange->SetNumberOfSecondaries(nSecondaries);
+      //You may have already secondaries produced by SampleSubCutSecondaries()
+      //at the process G4VEnergyLossProcess
+      G4int secondariesBefore = fParticleChange->GetNumberOfSecondaries();
+      fParticleChange->SetNumberOfSecondaries(nSecondaries+secondariesBefore);
       const G4StepPoint* preStep = theTrack.GetStep()->GetPreStepPoint();
       const G4StepPoint* postStep = theTrack.GetStep()->GetPostStepPoint();
@@ -538 +552 @@
       G4double time, q;
       G4ThreeVector position;
-      
+
       for (size_t i=0; i<nSecondaries; i++) 
         {
@@ -553 +567 @@
                   position += r;
                   G4Track* newTrack = new G4Track(part, time, position);
+                  energyLossInFluorescence += eSecondary;
                   pParticleChange->AddSecondary(newTrack);
                 }
@@ -566 +581 @@
   delete deexcitationProducts;
   
+  //Check and verbosities. Ensure energy conservation
   if (verboseLevel > 2)
-    G4cout << "Energy loss along step after deexcitation : " << eloss/keV <<  
-      " keV" << G4endl;
+    {
+      G4cout << "Energy loss along step after deexcitation : " << eloss/keV <<  
+        " keV" << G4endl;
+    }
+  if (verboseLevel > 1)
+    {
+      G4cout << "------------------------------------------------------------------" << G4endl;
+      G4cout << "Energy in fluorescence: " << energyLossInFluorescence/keV << " keV" << G4endl;
+      G4cout << "Residual energy loss: " << eloss/keV << " keV " << G4endl;
+      G4cout << "Total final: " << (energyLossInFluorescence+eloss)/keV << " keV" << G4endl;
+      G4cout << "Total initial: " << energyLossBefore/keV << " keV" << G4endl;  
+      G4cout << "------------------------------------------------------------------" << G4endl;
+    }
+  if (verboseLevel > 0)
+    {
+      if (std::fabs(energyLossBefore-energyLossInFluorescence-eloss)>10*eV)
+        {
+          G4cout << "Found energy non-conservation at SampleDeexcitationAlongStep() " << G4endl;
+          G4cout << "Energy in fluorescence: " << energyLossInFluorescence/keV << " keV" << G4endl;
+          G4cout << "Residual energy loss: " << eloss/keV << " keV " << G4endl;
+          G4cout << "Total final: " << (energyLossInFluorescence+eloss)/keV << " keV" << G4endl;
+          G4cout << "Total initial: " << energyLossBefore/keV << " keV" << G4endl;      
+        }
+    }
 }
 
@@ -655 +693 @@
            xsis->AddComponent(p);
          }
-       if(verboseLevel>0) xsis->PrintData();
+       if(verboseLevel>3) xsis->PrintData();
        shellVacancy->AddXsiTable(xsis);
     }