Changeset 961 for trunk/source/processes/electromagnetic/standard/src/G4MultipleScattering.cc

Timestamp:

Apr 6, 2009, 12:21:12 PM (15 years ago)

Author:

garnier

Message:

update processes

File:

• trunk/source/processes/electromagnetic/standard/src/G4MultipleScattering.cc (modified) (6 diffs)

trunk/source/processes/electromagnetic/standard/src/G4MultipleScattering.cc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4MultipleScattering.cc,v 1.70 2007/10/29 08:57:19 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4MultipleScattering.cc,v 1.75 2008/10/15 17:53:44 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -----------------------------------------------------------------------------
@@ -121 +121 @@
 // 12-02-07 skin can be changed via UI command, default skin=1 (VI)
 // 24-04-07 default skin=0 (temporal protection) (VI)
+// 11-03-08 use G4VMscModel interface (VI)
 //
 // -----------------------------------------------------------------------------
@@ -130 +131 @@
 #include "G4UrbanMscModel.hh"
 #include "G4MscStepLimitType.hh"
+#include "G4UrbanMscModel.hh"
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -138 +140 @@
   : G4VMultipleScattering(processName)
 {
-  dtrl              = 0.05;
-  lambdalimit       = 1.*mm;
-  
-  samplez           = false ; 
-  isInitialized     = false;  
+  isInitialized = false;  
 }
 
@@ -178 +176 @@
     SetLateralDisplasmentFlag(false);
     SetBuildLambdaTable(false);
-    SetSkin(0.0);
-    SetRangeFactor(0.2);
   }
 
   // initialisation of parameters - defaults for particles other
   // than ions can be overwritten by users
-  mscUrban = new G4UrbanMscModel(RangeFactor(),dtrl,lambdalimit,
-                                 GeomFactor(),Skin(),
-                                 samplez,StepLimitType());
+  mscUrban = new G4UrbanMscModel();
+  mscUrban->SetStepLimitType(StepLimitType());
   mscUrban->SetLateralDisplasmentFlag(LateralDisplasmentFlag());
+  mscUrban->SetSkin(Skin());
+  mscUrban->SetRangeFactor(RangeFactor());
+  mscUrban->SetGeomFactor(GeomFactor());
 
   AddEmModel(1,mscUrban);
@@ -204 +202 @@
 void G4MultipleScattering::PrintInfo()
 {
-  G4cout << "      Boundary/stepping algorithm is active with RangeFactor= "
-         << RangeFactor()
-         << "  Step limit type " << StepLimitType()
+  G4cout << "      RangeFactor= " << RangeFactor()
+         << ", step limit type: " << StepLimitType()
+         << ", lateralDisplacement: " << LateralDisplasmentFlag()
+         << ", skin= " << Skin()  
+         << ", geomFactor= " << GeomFactor()  
          << G4endl;
 }