Changeset 1315 for trunk/source/processes/electromagnetic/standard/src/G4UrbanMscModel93.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/processes/electromagnetic/standard/src/G4UrbanMscModel93.cc (modified) (7 diffs)

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

@@ -1 @@
-//
+// 
 // ********************************************************************
 // * License and Disclaimer                                           *
@@ -25 +25 @@
 //
 //
-// $Id: G4UrbanMscModel93.cc,v 1.1 2009/11/01 13:05:01 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4UrbanMscModel93.cc,v 1.4 2010/05/20 13:17:25 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //
 // -------------------------------------------------------------------
-//
+//   
 // GEANT4 Class file
-//
+//    
 //
 // File name:   G4UrbanMscModel93
@@ -466 +466 @@
   presafety = sp->GetSafety();
 
-  //G4cout << "G4Urban2::StepLimit tPathLength= " 
-  //     <<tPathLength<<" safety= " << presafety
-  //       << " range= " <<currentRange<< " lambda= "<<lambda0
-  //     << " Alg: " << steppingAlgorithm <<G4endl;
+ // G4cout << "G4Urban2::StepLimit tPathLength= " 
+ //      <<tPathLength<<" safety= " << presafety
+ //        << " range= " <<currentRange<< " lambda= "<<lambda0
+ //      << " Alg: " << steppingAlgorithm <<G4endl;
 
   // far from geometry boundary
@@ -571 +571 @@
       if(tlimit < stepmin) tlimit = stepmin;
 
-      if(tPathLength > tlimit) tPathLength = tlimit  ; 
+      // randomize 1st step or 1st 'normal' step in volume
+      if((stepStatus == fUndefined) ||
+         ((smallstep == skin) && !insideskin)) 
+        { 
+          G4double temptlimit = tlimit;
+          if(temptlimit > tlimitmin)
+          {
+            do {
+              temptlimit = G4RandGauss::shoot(tlimit,0.3*tlimit);        
+               } while ((temptlimit < tlimitmin) || 
+                        (temptlimit > 2.*tlimit-tlimitmin));
+          }
+          else
+            temptlimit = tlimitmin;
+          if(tPathLength > temptlimit) tPathLength = temptlimit;
+        }
+      else
+        {  
+          if(tPathLength > tlimit) tPathLength = tlimit  ; 
+        }
 
     }
@@ -617 +636 @@
       //lower limit for tlimit
       if(tlimit < tlimitmin) tlimit = tlimitmin;
-
+      
       if(tPathLength > tlimit) tPathLength = tlimit;
+
     }
   
@@ -1002 +1022 @@
 G4double G4UrbanMscModel93::SampleDisplacement()
 {
+  // compute rmean = sqrt(<r**2>) from theory
   const G4double kappa = 2.5;
   const G4double kappapl1 = kappa+1.;
   const G4double kappami1 = kappa-1.;
+  // Compute rmean = sqrt(<r**2>) from theory
   G4double rmean = 0.0;
   if ((currentTau >= tausmall) && !insideskin) {
@@ -1022 +1044 @@
   }
 
+  if(rmean == 0.) return rmean;
+
   // protection against z > t ...........................
-  if(rmean > 0.) {
-    G4double zt = (tPathLength-zPathLength)*(tPathLength+zPathLength);
-    if(zt <= 0.)
-      rmean = 0.;
-    else if(rmean*rmean > zt)
-      rmean = sqrt(zt);
-  }
+  G4double rmax = (tPathLength-zPathLength)*(tPathLength+zPathLength);
+    if(rmax <= 0.)
+      rmax = 0.;
+    else
+      rmax = sqrt(rmax);
+
+  if(rmean >= rmax) return rmax;
+     
   return rmean;
+  // VI comment out for the time being
+  /*
+  //sample r (Gaussian distribution with a mean of rmean )
+  G4double r = 0.;
+  G4double sigma = min(rmean,rmax-rmean);
+  sigma /= 3.;
+  G4double rlow  = rmean-3.*sigma;
+  G4double rhigh = rmean+3.*sigma;
+  do {
+      r = G4RandGauss::shoot(rmean,sigma);  
+     } while ((r < rlow) || (r > rhigh));   
+
+  return r;
+  */
 }