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

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

@@ -23 +23 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
+// $Id: G4InuclSpecialFunctions.cc,v 1.19 2010/03/19 05:03:23 mkelsey Exp $
+// Geant4 tag: $Name: geant4-09-04-beta-cand-01 $
 //
+// 20100114  M. Kelsey -- Remove G4CascadeMomentum, use G4LorentzVector directly
+
 #include "G4InuclSpecialFunctions.hh"
+#include "G4LorentzVector.hh"
+#include "G4ThreeVector.hh"
 #include "Randomize.hh"
+#include <cmath>
 
 G4double G4InuclSpecialFunctions::getAL(G4double A) {
@@ -34 +41 @@
   }
 
-  return 0.76 + 2.2 / std::pow(A, 0.333333);
+  return 0.76 + 2.2 / G4cbrt(A);
 }
 
@@ -84 +91 @@
 
   const G4double C = 55.4;
-  G4double Ef;
+  G4double arg = (ntype==0) ? (A-Z)/A : Z/A;
 
-  if (ntype == 0) {
-    Ef = C * std::pow((A - Z) / A, 0.666667);
+  return C * G4cbrt(arg*arg);   // 2/3 power
+}
 
-  } else {
-    Ef = C * std::pow(Z / A, 0.666667);
-  };
-
-  return Ef; 
+G4double G4InuclSpecialFunctions::G4cbrt(G4double x) {
+  return x==0 ? 0. : (x<0?-1.:1.)*std::exp(std::log(std::fabs(x))/3.);
 }
 
@@ -150 +154 @@
 }
 
-G4CascadeMomentum G4InuclSpecialFunctions::generateWithFixedTheta(G4double ct,
-                                                                        G4double p) {
-  G4int verboseLevel = 2;
-
+G4LorentzVector 
+G4InuclSpecialFunctions::generateWithFixedTheta(G4double ct, G4double p, 
+                                                G4double m) {
+  const G4int verboseLevel = 0;
   if (verboseLevel > 3) {
     G4cout << " >>> G4InuclSpecialFunctions::generateWithFixedTheta" << G4endl;
   }
 
-  G4CascadeMomentum momr;
   G4double phi = randomPHI();
   G4double pt = p * std::sqrt(std::fabs(1.0 - ct * ct));
-  //  not used:  G4CascadeMomentum mom1;
-  momr[1] = pt * std::cos(phi);
-  momr[2] = pt * std::sin(phi);
-  momr[3] = p * ct;
+
+  static G4ThreeVector pvec;    // Buffers to avoid memory thrashing
+  static G4LorentzVector momr;
+
+  pvec.set(pt*std::cos(phi), pt*std::sin(phi), p*ct);
+  momr.setVectM(pvec, m);
 
   return momr;
 }
+
+G4LorentzVector 
+G4InuclSpecialFunctions::generateWithRandomAngles(G4double p, G4double m) {
+  std::pair<G4double, G4double> COS_SIN = randomCOS_SIN();
+  G4double phi = randomPHI();
+  G4double pt = p * COS_SIN.second;
+  
+  static G4ThreeVector pvec;    // Buffers to avoid memory thrashing
+  static G4LorentzVector momr;
+
+  pvec.set(pt*std::cos(phi), pt*std::sin(phi), p*COS_SIN.first);
+  momr.setVectM(pvec, m);
+
+  return momr;
+}