Changeset 1315 for trunk/source/processes/hadronic/models/cascade/cascade/include/G4InuclSpecialFunctions.hh

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/include/G4InuclSpecialFunctions.hh (modified) (4 diffs)

trunk/source/processes/hadronic/models/cascade/cascade/include/G4InuclSpecialFunctions.hh

@@ -23 +23 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
+// $Id: G4InuclSpecialFunctions.hh,v 1.16 2010/04/13 05:30:10 mkelsey Exp $
+// Geant4 tag: $Name: geant4-09-04-beta-cand-01 $
 //
+// 20100114  M. Kelsey -- Remove G4CascadeMomentum, use G4LorentzVector directly
+// 20100319  M. Kelsey -- Add optional mass argument to generateWithFixedTheta;
+//              define new generateWithRandomAngles, encapsulating code; define
+//              cbrt() cube-root function (in math.h, but not in <math>!)
+// 20100412  M. Kelsey -- Modify paraMaker[Truncated] to take buffer as argument
+
 #ifndef G4INUCL_SPECIAL_FUNC_HH
 #define G4INUCL_SPECIAL_FUNC_HH
 
 #include "globals.hh"
-#include <cmath>
 #include <algorithm>
 #include <vector>
-#include "G4CascadeMomentum.hh"
+#include "G4LorentzVector.hh"
 
 namespace G4InuclSpecialFunctions {
@@ -51 +58 @@
                        G4int ntype);
   
-  std::pair<std::vector<G4double>, std::vector<G4double> > paraMaker(G4double Z);
+  void paraMaker(G4double Z, std::pair<std::vector<G4double>, std::vector<G4double> >& parms);
 
-  std::pair<G4double, G4double> paraMakerTruncated(G4double Z); 
+  void paraMakerTruncated(G4double Z, std::pair<G4double, G4double>& parms); 
 
   G4double getAL(G4double A);
@@ -60 +67 @@
 
   G4double csPN(G4double e);
+
+  G4double G4cbrt(G4double x);  // Can't use "cbrt" name, clashes with <math.h>
 
   G4double inuclRndm();
@@ -71 +80 @@
   G4double nucleiLevelDensity(G4double a);
 
-  G4CascadeMomentum generateWithFixedTheta(G4double ct, 
-                                          G4double p);
+  // Optional mass argument will be used to fill G4LorentzVector correctly
+  G4LorentzVector generateWithFixedTheta(G4double ct, G4double p,
+                                         G4double m=0.);
+
+  G4LorentzVector generateWithRandomAngles(G4double p, G4double m=0.);
 }
+
+
 #endif