Changeset 1315 for trunk/source/processes/electromagnetic/utils/src/G4VEmProcess.cc

Timestamp:

Jun 18, 2010, 11:42:07 AM (14 years ago)

Author:

garnier

Message:

update geant4-09-04-beta-cand-01 interfaces-V09-03-09 vis-V09-03-08

File:

• trunk/source/processes/electromagnetic/utils/src/G4VEmProcess.cc (modified) (21 diffs)

trunk/source/processes/electromagnetic/utils/src/G4VEmProcess.cc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4VEmProcess.cc,v 1.79 2009/11/10 20:30:55 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4VEmProcess.cc,v 1.87 2010/05/10 13:35:32 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //
 // -------------------------------------------------------------------
@@ -53 +53 @@
 // 27-10-07 Virtual functions moved to source (V.Ivanchenko)
 // 24-06-09 Removed hidden bin in G4PhysicsVector (V.Ivanchenko)
+// 17-02-10 Added pointer currentParticle (VI)
 //
 // Class Description:
@@ -98 +99 @@
   currentModel(0),
   particle(0),
+  currentParticle(0),
   currentCouple(0)
 {
@@ -165 +167 @@
   G4VEmFluctuationModel* fm = 0;
   modelManager->AddEmModel(order, p, fm, region);
-  if(p) p->SetParticleChange(pParticleChange);
+  if(p) { p->SetParticleChange(pParticleChange); }
 }
 
@@ -205 +207 @@
 void G4VEmProcess::PreparePhysicsTable(const G4ParticleDefinition& part)
 {
-  if(!particle) particle = ∂
+  if(!particle) { SetParticle(&part); }
   if(1 < verboseLevel) {
     G4cout << "G4VEmProcess::PreparePhysicsTable() for "
@@ -214 +216 @@
   }
 
-  (G4LossTableManager::Instance())->EmConfigurator()->AddModels();
+  (G4LossTableManager::Instance())->PreparePhysicsTable(&part, this);
 
   if(particle == &part) {
@@ -230 +232 @@
     }
 
-    theCuts = modelManager->Initialise(particle,secondaryParticle,2.,verboseLevel);
+    theCuts = modelManager->Initialise(particle,secondaryParticle,
+                                       2.,verboseLevel);
     const G4ProductionCutsTable* theCoupleTable=
           G4ProductionCutsTable::GetProductionCutsTable();
@@ -242 +245 @@
     }
   }
-  // Sub Cutoff and Deexcitation
+  // Deexcitation
   if (nDERegions>0) {
 
@@ -287 +290 @@
   }
 
+  (G4LossTableManager::Instance())->BuildPhysicsTable(particle);
   if(buildLambdaTable) {
     BuildLambdaTable();
@@ -294 +298 @@
   // reduce printout for nuclear stopping
   G4bool gproc = true;
-  if(GetProcessName() == "nuclearStopping" && 
+  G4int st = GetProcessSubType();
+  if(st == fCoulombScattering && part.GetParticleType() == "nucleus" && 
      partname != "GenericIon" && partname != "alpha") { gproc = false; } 
 
@@ -354 +359 @@
            << particle->GetParticleName()
            << G4endl;
-    if(2 < verboseLevel) {
-      G4cout << *theLambdaTable << G4endl;
-    }
   }
 }
@@ -385 +387 @@
   if(verboseLevel > 2 && buildLambdaTable) {
     G4cout << "      LambdaTable address= " << theLambdaTable << G4endl;
-    if(theLambdaTable) G4cout << (*theLambdaTable) << G4endl;
+    if(theLambdaTable) { G4cout << (*theLambdaTable) << G4endl; }
   }
 }
@@ -399 +401 @@
   *condition = NotForced;
   G4double x = DBL_MAX;
-  if(previousStepSize <= DBL_MIN) theNumberOfInteractionLengthLeft = -1.0;
+  if(previousStepSize <= DBL_MIN) { theNumberOfInteractionLengthLeft = -1.0; }
   InitialiseStep(track);
-  if(!currentModel->IsActive(preStepKinEnergy)) return x;
+  if(!currentModel->IsActive(preStepKinEnergy)) { return x; }
 
   if(preStepKinEnergy < mfpKinEnergy) {
@@ -428 +430 @@
       G4cout << "G4VEmProcess::PostStepGetPhysicalInteractionLength ";
       G4cout << "[ " << GetProcessName() << "]" << G4endl; 
-      G4cout << " for " << particle->GetParticleName() 
+      G4cout << " for " << currentParticle->GetParticleName() 
              << " in Material  " <<  currentMaterial->GetName()
              << " Ekin(MeV)= " << preStepKinEnergy/MeV 
@@ -461 +463 @@
   // Do not make anything if particle is stopped, the annihilation then
   // should be performed by the AtRestDoIt!
-  if (track.GetTrackStatus() == fStopButAlive) return &fParticleChange;
+  if (track.GetTrackStatus() == fStopButAlive) { return &fParticleChange; }
 
   G4double finalT = track.GetKineticEnergy();
@@ -469 +471 @@
     G4double lx = GetLambda(finalT, currentCouple);
     if(preStepLambda<lx && 1 < verboseLevel) {
-      G4cout << "WARING: for " << particle->GetParticleName() 
+      G4cout << "WARING: for " << currentParticle->GetParticleName() 
              << " and " << GetProcessName()
              << " E(MeV)= " << finalT/MeV
@@ -483 +485 @@
 
   SelectModel(finalT, currentCoupleIndex);
-  if(!currentModel->IsActive(finalT)) return &fParticleChange;
+  if(!currentModel->IsActive(finalT)) { return &fParticleChange; }
   if(useDeexcitation) {
     currentModel->SetDeexcitationFlag(idxDERegions[currentCoupleIndex]);
@@ -662 +664 @@
     SelectModel(kineticEnergy, currentCoupleIndex);
     cross = currentModel->CrossSectionPerVolume(currentMaterial,
-                                                particle,kineticEnergy);
-  }
-
+                                                currentParticle,kineticEnergy);
+  }
+
+  if(cross < 0.0) { cross = 0.0; }
   return cross;
 }
@@ -676 +679 @@
   *condition = NotForced;
   return G4VEmProcess::MeanFreePath(track);
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+G4double G4VEmProcess::MeanFreePath(const G4Track& track)
+{
+  DefineMaterial(track.GetMaterialCutsCouple());
+  preStepLambda = GetCurrentLambda(track.GetKineticEnergy());
+  G4double x = DBL_MAX;
+  if(DBL_MIN < preStepLambda) x = 1.0/preStepLambda;
+  return x;
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+G4double 
+G4VEmProcess::ComputeCrossSectionPerAtom(G4double kineticEnergy, 
+                                         G4double Z, G4double A, G4double cut)
+{
+  SelectModel(kineticEnergy, currentCoupleIndex);
+  G4double x = 0.0;
+  if(currentModel) {
+   x = currentModel->ComputeCrossSectionPerAtom(currentParticle,kineticEnergy,
+                                                 Z,A,cut);
+  }
+  return x;
 }
 
@@ -714 +743 @@
     theEnergyOfCrossSectionMax[i] = emax;
     theCrossSectionMax[i] = smax;
-    if(2 < verboseLevel) {
+    if(1 < verboseLevel) {
       G4cout << "For " << particle->GetParticleName() 
              << " Max CS at i= " << i << " emax(MeV)= " << emax/MeV
@@ -733 +762 @@
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
+
+const G4Element* G4VEmProcess::GetCurrentElement() const
+{
+  const G4Element* elm = 0;
+  if(currentModel) {elm = currentModel->GetCurrentElement(); }
+  return elm;
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....