Changeset 1315 for trunk/source/processes/hadronic/models/cascade/cascade/src/G4CascadParticle.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/hadronic/models/cascade/cascade/src/G4CascadParticle.cc (modified) (4 diffs)

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

@@ -23 +23 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
+// $Id: G4CascadParticle.cc,v 1.14 2010/03/16 22:10:26 mkelsey Exp $
+// Geant4 tag: $Name: geant4-09-04-beta-cand-01 $
 //
+// 20100112  M. Kelsey -- Remove G4CascadeMomentum, use G4LorentzVector directly
+// 20100114  M. Kelsey -- Replace vector<G4Double> position with G4ThreeVector 
+
 #include "G4CascadParticle.hh"
+#include "G4ios.hh"
+#include <cmath>
 
 G4CascadParticle::G4CascadParticle()
-  : verboseLevel(2) {
-
+  : verboseLevel(0), current_zone(-1), current_path(-1.), movingIn(false),
+    reflectionCounter(0), reflected(false), generation(-1) {
   if (verboseLevel > 3) {
     G4cout << " >>> G4CascadParticle::G4CascadParticle" << G4endl;
@@ -36 +43 @@
 G4double G4CascadParticle::getPathToTheNextZone(G4double rz_in, 
                                                 G4double rz_out) {
-  verboseLevel = 2;
-
   if (verboseLevel > 3) {
     G4cout << " >>> G4CascadParticle::getPathToTheNextZone" << G4endl;
   }
 
+  const G4LorentzVector& mom = getMomentum();
+
   G4double path = -1.0;
-  G4double rp = 0.0;
-  G4double rr = 0.0;
-  G4double pp = 0.0;
-  const G4CascadeMomentum& mom = theParticle.getMomentum();
-
-  for (G4int i = 1; i < 4; i++) {
-    rp += mom[i] * position[i - 1]; 
-    rr += position[i - 1] * position[i - 1]; 
-    pp += mom[i] * mom[i]; 
-  };
+  G4double rp = mom.vect().dot(position);
+  G4double rr = position.mag2();
+  G4double pp = mom.vect().mag2();
 
   G4double ra = rr - rp * rp / pp;
@@ -63 +63 @@
     ds = 1.0;
     movingIn = false; 
- 
   } else { 
-
     d2 = rz_in * rz_in - ra;
-
     if (d2 > 0.0) {
       ds = -1.0;
       movingIn = true;
-  
     } else {
-
       d2 = rz_out * rz_out - ra;
       ds = 1.0;
       movingIn = false;
-    };
-  };
+    }
+  }
 
   path = ds * std::sqrt(d2) - rp / pp;
@@ -86 +81 @@
 
 void G4CascadParticle::propagateAlongThePath(G4double path) {
-
   if (verboseLevel > 3) {
     G4cout << " >>> G4CascadParticle::propagateAlongThePath" << G4endl;
   }
 
-  const G4CascadeMomentum& mom = theParticle.getMomentum();
-  G4double pmod = theParticle.getMomModule();
+  position += getMomentum().vect().unit()*path;
+}
 
-  for(G4int i = 0; i < 3; i++) position[i] += mom[i + 1] * path / pmod;
+void G4CascadParticle::print() const {
+  theParticle.printParticle();
+  G4cout << " zone " << current_zone << " current_path " << current_path
+         << " reflectionCounter " << reflectionCounter << G4endl
+         << " x " << position.x() << " y " << position.y()
+         << " z " << position.z() << G4endl;
+}
 
-}