Changeset 1340 for trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeInterpolator.icc

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/include/G4CascadeInterpolator.icc (modified) (5 diffs)

trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeInterpolator.icc

@@ +1 @@
+#ifndef G4CASCADE_INTERPOLATOR_ICC
+#define G4CASCADE_INTERPOLATOR_ICC
 //
 // ********************************************************************
@@ -24 +26 @@
 // ********************************************************************
 //
-// $Id: G4CascadeInterpolator.icc,v 1.6 2010/06/25 09:42:02 gunter Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// $Id: G4CascadeInterpolator.icc,v 1.8 2010/10/19 19:48:00 mkelsey Exp $
+// GEANT4 tag $Name: hadr-casc-V09-03-85 $
 //
 // Author:  Michael Kelsey <kelsey@slac.stanford.edu>
@@ -43 +45 @@
 // 20100520  M. Kelsey -- Second bug fix:  Loop in bin search should start at
 //              i=1, not i=0 (since i-1 is the key).
+// 20100803  M. Kelsey -- Add printBins() function for debugging
+// 20101019  M. Kelsey -- CoVerity reports: recursive #include, index overrun
 
+#include "globals.hh"
 #include "G4CascadeInterpolator.hh"
+#include <iomanip>
 
 
@@ -66 +72 @@
   } else {                              // Assume nBins small; linear search
     int i;
-    for (i=1; i<nBins && x>xBins[i]; i++) {;}   // Stops when x within bin i-1
+    for (i=1; i<last && x>xBins[i]; i++) {;}    // Stops when x within bin i-1
     xindex = i-1;
     xbin = xBins[i] - xBins[i-1];
@@ -102 +108 @@
   return (i==last) ? yb[last] : (yb[i] + frac*(yb[i+1]-yb[i]));
 }
+
+
+// Print bin edges for debugging
+
+template <int NBINS>
+void G4CascadeInterpolator<NBINS>::printBins() const {
+  G4cout << " G4CascadeInterpolator<" << NBINS << "> : " << G4endl;
+  for (G4int k=0; k<NBINS; k++) {
+    G4cout << " " << std::setw(5) << xBins[k];
+    if ((k+1)%12 == 0) G4cout << G4endl;
+  }
+  G4cout << G4endl;
+}
+
+#endif  /* G4CASCADE_INTERPOLATOR_ICC */