Changeset 1340 for trunk/source/processes/electromagnetic/utils/src/G4VMultipleScattering.cc

Timestamp:

Nov 5, 2010, 3:45:55 PM (14 years ago)

Author:

garnier

Message:

update ti head

File:

• trunk/source/processes/electromagnetic/utils/src/G4VMultipleScattering.cc (modified) (4 diffs)

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

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4VMultipleScattering.cc,v 1.82 2010/04/12 11:45:03 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4VMultipleScattering.cc,v 1.86 2010/10/26 11:30:46 vnivanch Exp $
+// GEANT4 tag $Name: emutils-V09-03-23 $
 //
 // -------------------------------------------------------------------
@@ -294 +294 @@
   if(verboseLevel>0 && ( num == "e-" || num == "mu+" ||  
                          num == "proton" || num == "pi-" || 
-                         num == "GenericIon")) {
+                         num == "kaon+" || num == "GenericIon")) {
     PrintInfoDefinition();
     if(2 < verboseLevel && theLambdaTable) G4cout << *theLambdaTable << G4endl;
@@ -348 +348 @@
   DefineMaterial(track.GetMaterialCutsCouple());
   G4double ekin = track.GetKineticEnergy();
-  if(isIon) { ekin *= proton_mass_c2/track.GetDefinition()->GetPDGMass(); }
+  if(isIon) { ekin *= proton_mass_c2/track.GetParticleDefinition()->GetPDGMass(); }
   currentModel = static_cast<G4VMscModel*>(SelectModel(ekin));
   if(x > 0.0 && ekin > 0.0 && currentModel->IsActive(ekin)) {
     G4double tPathLength = 
       currentModel->ComputeTruePathLengthLimit(track, theLambdaTable, x);
-    if (tPathLength < x) *selection = CandidateForSelection;
+    if (tPathLength < x) { *selection = CandidateForSelection; }
     x = currentModel->ComputeGeomPathLength(tPathLength);
     //  G4cout << "tPathLength= " << tPathLength
@@ -404 +404 @@
                                        G4double& currentSafety)
 {
-  G4GPILSelection* selection = 0;
-  return AlongStepGetPhysicalInteractionLength(track,previousStepSize,currentMinimalStep,
-                                               currentSafety, selection);
+  G4GPILSelection selection = NotCandidateForSelection;
+  G4double x = AlongStepGetPhysicalInteractionLength(track,previousStepSize,
+                                                     currentMinimalStep,
+                                                     currentSafety, &selection);
+  return x;
 }