Changeset 961 for trunk/source/processes/electromagnetic/muons/src/G4MuMultipleScattering.cc

Timestamp:

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

Author:

garnier

Message:

update processes

File:

• trunk/source/processes/electromagnetic/muons/src/G4MuMultipleScattering.cc (modified) (5 diffs)

trunk/source/processes/electromagnetic/muons/src/G4MuMultipleScattering.cc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4MuMultipleScattering.cc,v 1.3 2007/11/09 19:48:10 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4MuMultipleScattering.cc,v 1.12 2008/10/16 13:37:04 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // -----------------------------------------------------------------------------
@@ -47 +47 @@
 
 #include "G4MuMultipleScattering.hh"
-#include "G4MuMscModel.hh"
+#include "G4WentzelVIModel.hh"
 #include "G4MscStepLimitType.hh"
 
@@ -61 +61 @@
   samplez           = false ; 
   isInitialized     = false;  
-  SetRangeFactor(0.04);
+  SetRangeFactor(0.2);
   SetLateralDisplasmentFlag(true);
 }
@@ -84 +84 @@
   if(isInitialized) {
 
-    if (p->GetParticleType() != "nucleus") {
+    if (p->GetParticleType() != "nucleus" && p->GetPDGMass() < GeV) {
       mscModel->SetStepLimitType(StepLimitType());
       mscModel->SetLateralDisplasmentFlag(LateralDisplasmentFlag());
-      //mscModel->SetThetaLimit(thetaLimit);
       mscModel->SetRangeFactor(RangeFactor());
     }
+    mscModel->SetPolarAngleLimit(PolarAngleLimit());
     return;
   }
 
-  if (p->GetParticleType() == "nucleus") {
+  if (p->GetParticleType() == "nucleus" || p->GetPDGMass() > GeV) {
     SetLateralDisplasmentFlag(false);
     SetBuildLambdaTable(false);
-    //    SetRangeFactor(0.2);
   }
 
-  // initialisation of parameters
-  //  G4String part_name = p->GetParticleName();
-  mscModel = new G4MuMscModel(RangeFactor(),thetaLimit);
+  // initialisation of the model
+
+  mscModel = new G4WentzelVIModel();
+  mscModel->SetStepLimitType(StepLimitType());
   mscModel->SetLateralDisplasmentFlag(LateralDisplasmentFlag());
+  mscModel->SetRangeFactor(RangeFactor());
+  mscModel->SetPolarAngleLimit(PolarAngleLimit());
+  mscModel->SetLowEnergyLimit(MinKinEnergy());
+  mscModel->SetHighEnergyLimit(MaxKinEnergy());
 
   AddEmModel(1,mscModel);
@@ -112 +116 @@
 void G4MuMultipleScattering::PrintInfo()
 {
-  G4cout << "      Boundary/stepping algorithm is active with RangeFactor= "
-         << RangeFactor()
-         << "  Step limit type " << StepLimitType()
-         << G4endl;
+  G4cout << "      RangeFactor= " << RangeFactor()
+         << ", step limit type: " << StepLimitType()
+         << ", lateralDisplacement: " << LateralDisplasmentFlag()
+         << G4endl;
 }