Changeset 1228 for trunk/source/processes/electromagnetic/utils/src

Timestamp:

Jan 8, 2010, 11:56:51 AM (15 years ago)

Author:

garnier

Message:

update geant4.9.3 tag

Location:

trunk/source/processes/electromagnetic/utils/src

Files:

• G4AtomicShell.cc (modified) (1 diff)
• G4DummyModel.cc (modified) (1 diff)
• G4ElectronIonPair.cc (modified) (1 diff)
• G4EmCalculator.cc (modified) (9 diffs)
• G4EmConfigurator.cc (modified) (5 diffs)
• G4EmCorrections.cc (modified) (1 diff)
• G4EmElementSelector.cc (modified) (1 diff)
• G4EmModelManager.cc (modified) (1 diff)
• G4EmMultiModel.cc (modified) (1 diff)
• G4EmProcessOptions.cc (modified) (1 diff)
• G4EmSaturation.cc (modified) (1 diff)
• G4EnergyLossMessenger.cc (modified) (1 diff)
• G4EnergyLossTables.cc (modified) (1 diff)
• G4LossTableBuilder.cc (modified) (1 diff)
• G4LossTableManager.cc (modified) (1 diff)
• G4VEmFluctuationModel.cc (modified) (1 diff)
• G4VEmModel.cc (modified) (1 diff)
• G4VEmProcess.cc (modified) (1 diff)
• G4VEnergyLoss.cc (modified) (1 diff)
• G4VEnergyLossProcess.cc (modified) (1 diff)
• G4VMscModel.cc (modified) (1 diff)
• G4VMultipleScattering.cc (modified) (1 diff)
• G4ionEffectiveCharge.cc (modified) (1 diff)

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

@@ -26 +26 @@
 //
 // $Id: G4AtomicShell.cc,v 1.2 ????
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Authors: Elena Guardincerri (Elena.Guardincerri@ge.infn.it)

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

@@ -25 +25 @@
 //
 // $Id: G4DummyModel.cc,v 1.4 2009/04/07 18:39:47 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------

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

@@ -25 +25 @@
 //
 // $Id: G4ElectronIonPair.cc,v 1.2 2008/10/17 14:46:16 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------

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

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4EmCalculator.cc,v 1.48 2009/11/11 23:59:48 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: G4EmCalculator.cc,v 1.49 2009/11/22 17:58:39 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
@@ -127 +127 @@
   if(couple && UpdateParticle(p, kinEnergy) ) {
     res = manager->GetDEDX(p, kinEnergy, couple);
-    /*
+    
     if(isIon) {
       if(FindEmModel(p, currentProcessName, kinEnergy)) {
-        G4double length = 1.*um;
-        G4cout << "### GetDEDX: E= " << kinEnergy << " res= " << res; 
+        G4double length = CLHEP::nm;
         G4double eloss = res*length;
+        //G4cout << "### GetDEDX: E= " << kinEnergy << " dedx0= " << res 
+        //       << " de= " << eloss << G4endl;; 
         G4double niel  = 0.0;
+        dynParticle.SetKineticEnergy(kinEnergy);
+        currentModel->GetChargeSquareRatio(p, mat, kinEnergy);
         currentModel->CorrectionsAlongStep(couple,&dynParticle,eloss,niel,length);
         res = eloss/length; 
-     
-        //G4cout << "### GetDEDX: E= " << kinEnergy << " res= " << res;  
-        G4cout << " res1= " << res << G4endl;;
+        //G4cout << " de1= " << eloss << " res1= " << res 
+        //       << " " << p->GetParticleName() <<G4endl;;
       }
     } 
-    */
+    
     if(verbose>0) {
       G4cout << "G4EmCalculator::GetDEDX: E(MeV)= " << kinEnergy/MeV
@@ -466 +468 @@
 
       // low energy correction for ions
-      /*
       if(isIon) {
-        G4double length = 1.*nm;
+        G4double length = CLHEP::nm;
         const G4Region* r = 0;
         const G4MaterialCutsCouple* couple = FindCouple(mat, r);
         G4double eloss = res*length;
         G4double niel  = 0.0;
+        dynParticle.SetKineticEnergy(kinEnergy);
+        currentModel->GetChargeSquareRatio(p, mat, kinEnergy);
         currentModel->CorrectionsAlongStep(couple,&dynParticle,eloss,niel,length);
         res = eloss/length; 
@@ -482 +485 @@
         }
       }
-      */
     }
       
@@ -971 +973 @@
                                          G4double kinEnergy)
 {
-  G4bool res = false;
+  isApplicable = false;
   if(!p) {
     G4cout << "G4EmCalculator::FindEmModel WARNING: no particle defined" 
            << G4endl;
-    return res;
+    return isApplicable;
   }
   G4String partname =  p->GetParticleName();
@@ -985 +987 @@
     G4cout << "G4EmCalculator::FindEmModel for " << partname
            << " (type= " << p->GetParticleType()
-           << ") and " << processName << " at e(MeV)= " << scaledEnergy;
+           << ") and " << processName << " at E(MeV)= " << scaledEnergy;
     if(p != part) G4cout << "  GenericIon is the base particle";       
     G4cout << G4endl;
@@ -1019 +1021 @@
   }
   if(elproc) {
-    isApplicable = true;
     currentModel = elproc->SelectModelForMaterial(scaledEnergy, idx);
     G4double eth = currentModel->LowEnergyLimit();
-    if(eth > 0.0) { loweModel = elproc->SelectModelForMaterial(eth-keV, idx); }       
+    loweModel = elproc->SelectModelForMaterial(eth - CLHEP::eV, idx);
   }
 
@@ -1035 +1036 @@
         currentModel = (vem[i])->SelectModelForMaterial(kinEnergy, idx);
         G4double eth = currentModel->LowEnergyLimit();
-        if(eth > 0.0) { loweModel = (vem[i])->SelectModelForMaterial(eth-keV, idx); }       
-        isApplicable    = true;
+        loweModel = (vem[i])->SelectModelForMaterial(eth - CLHEP::eV, idx);
         break;
       }
@@ -1053 +1053 @@
         currentModel = (vmsc[i])->SelectModelForMaterial(kinEnergy, idx);
         G4double eth = currentModel->LowEnergyLimit();
-        if(eth > 0.0) { loweModel = (vmsc[i])->SelectModelForMaterial(eth-keV, idx); }       
-        isApplicable    = true;
+        loweModel = (vmsc[i])->SelectModelForMaterial(eth - CLHEP::eV, idx);  
         break;
       }
     }
   }
-  if(currentModel) res = true;
-  return res;
+  if(currentModel) {
+    if(loweModel == currentModel) { loweModel = 0; }
+    isApplicable = true;
+    if(verbose > 1) {
+      G4cout << "Model <" << currentModel->GetName() 
+             << "> Emin(MeV)= " << currentModel->LowEnergyLimit()/MeV;
+      if(loweModel) { 
+        G4cout << " LowEnergy model <" << loweModel->GetName() << ">"; 
+      }
+      G4cout << G4endl;
+    } 
+  }
+  return isApplicable;
 }
 

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

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4EmConfigurator.cc,v 1.5 2009/07/20 17:06:48 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: G4EmConfigurator.cc,v 1.6 2009/11/22 19:48:30 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------
@@ -67 +67 @@
 G4EmConfigurator::G4EmConfigurator()
 {
-  index = 1;
+  index = -10;
 }
 
@@ -156 +156 @@
 
   // new set
-  index--;
+  --index;
 
   G4ParticleTable::G4PTblDicIterator* theParticleIterator = 
@@ -258 +258 @@
           mod->SetHighEnergyLimit(e2);
 
-          //G4cout << "e1= " << e1 << " e2= " << e2 << G4endl;
+          //G4cout << "index= " << index << " e1= " << e1 << " e2= " << e2 << G4endl;
 
           // added model
@@ -270 +270 @@
             p->AddEmModel(index,mod,reg);
           } else if(ptype == msc) {
+            //G4cout << "### Added msc model order= " << index << " for " 
+            //     << particleName << " and " << processName << "  " << mod << G4endl;
             G4VMultipleScattering* p = static_cast<G4VMultipleScattering*>(proc);
             p->AddEmModel(index,mod,reg);

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

@@ -25 +25 @@
 //
 // $Id: G4EmCorrections.cc,v 1.54 2009/10/29 17:56:36 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------

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

@@ -25 +25 @@
 //
 // $Id: G4EmElementSelector.cc,v 1.11 2009/09/29 11:31:37 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------

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

@@ -25 +25 @@
 //
 // $Id: G4EmModelManager.cc,v 1.58 2009/10/29 18:07:08 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------

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

@@ -25 +25 @@
 //
 // $Id: G4EmMultiModel.cc,v 1.6 2007/05/22 17:31:58 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------

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

@@ -25 +25 @@
 //
 // $Id: G4EmProcessOptions.cc,v 1.27 2009/10/29 19:25:28 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------

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

@@ -25 +25 @@
 //
 // $Id: G4EmSaturation.cc,v 1.10 2009/09/25 09:16:40 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------

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

@@ -26 +26 @@
 //
 // $Id: G4EnergyLossMessenger.cc,v 1.38 2009/10/29 19:25:28 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------

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

@@ -26 +26 @@
 //
 // $Id: G4EnergyLossTables.cc,v 1.34 2008/07/08 10:57:22 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------

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

@@ -25 +25 @@
 //
 // $Id: G4LossTableBuilder.cc,v 1.32 2009/08/11 17:24:53 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------

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

@@ -25 +25 @@
 //
 // $Id: G4LossTableManager.cc,v 1.97 2009/10/29 19:25:28 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------

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

@@ -25 +25 @@
 //
 // $Id: G4VEmFluctuationModel.cc,v 1.4 2009/02/19 11:25:50 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------

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

@@ -25 +25 @@
 //
 // $Id: G4VEmModel.cc,v 1.30 2009/09/23 14:42:47 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------

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

@@ -25 +25 @@
 //
 // $Id: G4VEmProcess.cc,v 1.79 2009/11/10 20:30:55 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------

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

@@ -26 +26 @@
 //
 // $Id: G4VEnergyLoss.cc,v 1.46 2006/06/29 19:55:21 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 

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

@@ -25 +25 @@
 //
 // $Id: G4VEnergyLossProcess.cc,v 1.158 2009/10/29 18:07:08 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------

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

@@ -25 +25 @@
 //
 // $Id: G4VMscModel.cc,v 1.13 2009/07/20 17:32:47 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------

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

@@ -25 +25 @@
 //
 // $Id: G4VMultipleScattering.cc,v 1.77 2009/10/29 18:07:08 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------

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

@@ -25 +25 @@
 //
 // $Id: G4ionEffectiveCharge.cc,v 1.25 2009/10/29 16:57:39 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // -------------------------------------------------------------------