Changeset 1340 for trunk/source/processes/hadronic/models/cascade/cascade/src/G4CascadParticle.cc

Timestamp:

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

Author:

garnier

Message:

update ti head

File:

• trunk/source/processes/hadronic/models/cascade/cascade/src/G4CascadParticle.cc (modified) (4 diffs)

trunk/source/processes/hadronic/models/cascade/cascade/src/G4CascadParticle.cc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4CascadParticle.cc,v 1.15 2010/06/25 09:44:00 gunter Exp $
-// Geant4 tag: $Name: geant4-09-04-beta-01 $
+// $Id: G4CascadParticle.cc,v 1.18 2010/10/20 14:34:26 mkelsey Exp $
+// Geant4 tag: $Name: hadr-casc-V09-03-85 $
 //
 // 20100112  M. Kelsey -- Remove G4CascadeMomentum, use G4LorentzVector directly
 // 20100114  M. Kelsey -- Replace vector<G4Double> position with G4ThreeVector 
+// 20101012  M. Kelsey -- Check for negative d2 in getPathToTheNextZone()
 
 #include "G4CascadParticle.hh"
@@ -45 +46 @@
                                                 G4double rz_out) {
   if (verboseLevel > 3) {
-    G4cout << " >>> G4CascadParticle::getPathToTheNextZone" << G4endl;
+    G4cout << " >>> G4CascadParticle::getPathToTheNextZone rz_in " << rz_in
+           << " rz_out " << rz_out << G4endl;
   }
 
@@ -59 +61 @@
   G4double ds;
   G4double d2;
- 
+
+  if (verboseLevel > 3) {
+    G4cout << " current_zone " << current_zone << " rr " << rr
+           << " rp " << rp << " pp " << pp << " ra " << ra << G4endl;
+  }
+
   if (current_zone == 0 || rp > 0.0) {
     d2 = rz_out * rz_out - ra;
-    ds = 1.0;
-    movingIn = false; 
+    if (d2 > 0.0) {
+      ds = 1.0;
+      movingIn = false;
+    } else {
+      d2 = rz_in * rz_in - ra;
+      ds = -1.0;
+      movingIn = true;
+    }
   } else { 
     d2 = rz_in * rz_in - ra;
@@ -75 +88 @@
     }
   }
+
+  if (verboseLevel > 3) G4cout << " ds " << ds << " d2 " << d2 << G4endl;
 
   path = ds * std::sqrt(d2) - rp / pp;