Changeset 1315 for trunk/source/physics_lists/builders/src/G4EmStandardPhysics_option2.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/physics_lists/builders/src/G4EmStandardPhysics_option2.cc (modified) (4 diffs)

trunk/source/physics_lists/builders/src/G4EmStandardPhysics_option2.cc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4EmStandardPhysics_option2.cc,v 1.20 2009/11/24 12:53:22 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4EmStandardPhysics_option2.cc,v 1.23 2010/06/04 10:39:55 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //
 //---------------------------------------------------------------------------
@@ -99 +99 @@
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
-G4EmStandardPhysics_option2::G4EmStandardPhysics_option2(
-    G4int ver, const G4String& name)
-  : G4VPhysicsConstructor(name), verbose(ver)
+G4EmStandardPhysics_option2::G4EmStandardPhysics_option2(G4int ver)
+  : G4VPhysicsConstructor("G4EmStandard_opt2"), verbose(ver)
+{
+  G4LossTableManager::Instance();
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
+
+G4EmStandardPhysics_option2::G4EmStandardPhysics_option2(G4int ver, const G4String&)
+  : G4VPhysicsConstructor("G4EmStandard_opt2"), verbose(ver)
 {
   G4LossTableManager::Instance();
@@ -166 +173 @@
 
       G4eMultipleScattering* msc = new G4eMultipleScattering();
-      msc->AddEmModel(0, new G4UrbanMscModel93());
+      msc->AddEmModel(0, new G4WentzelVIModel());
+      msc->SetRangeFactor(0.1);
+      //msc->AddEmModel(0, new G4UrbanMscModel93());
       //      msc->AddEmModel(0, new G4GoudsmitSaundersonMscModel());
       pmanager->AddProcess(msc,                       -1, 1, 1);
       pmanager->AddProcess(new G4eIonisation,         -1, 2, 2);
       pmanager->AddProcess(new G4eBremsstrahlung,     -1,-3, 3);
+      pmanager->AddDiscreteProcess(new G4CoulombScattering());
 
     } else if (particleName == "e+") {
 
       G4eMultipleScattering* msc = new G4eMultipleScattering();
-      msc->AddEmModel(0, new G4UrbanMscModel93());
+      //msc->AddEmModel(0, new G4UrbanMscModel93());
+      msc->AddEmModel(0, new G4WentzelVIModel());
+      msc->SetRangeFactor(0.1);
       // msc->AddEmModel(0, new G4GoudsmitSaundersonMscModel());
       pmanager->AddProcess(msc,                       -1, 1, 1);
@@ -181 +193 @@
       pmanager->AddProcess(new G4eBremsstrahlung,     -1,-3, 3);
       pmanager->AddProcess(new G4eplusAnnihilation,    0,-1, 4);
+      pmanager->AddDiscreteProcess(new G4CoulombScattering());
 
     } else if (particleName == "mu+" ||