Changeset 1340 for trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeData.hh

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/G4CascadeData.hh (modified) (9 diffs)

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

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4CascadeData.hh,v 1.7 2010/06/25 09:41:54 gunter Exp $
-// GEANT4 tag: $Name: geant4-09-04-beta-01 $
+// $Id: G4CascadeData.hh,v 1.10 2010/08/04 05:28:24 mkelsey Exp $
+// GEANT4 tag: $Name: hadr-casc-V09-03-85 $
 //
 // 20100507  M. Kelsey -- Use template arguments to dimension const-refs
@@ -35 +35 @@
 // 20100611  M. Kelsey -- Work around Intel ICC compiler warning about
 //              index[] subscripts out of range.  Dimension to full [9].
+// 20100803  M. Kelsey -- Add printing function for debugging, split
+//              implementation code to .icc file.  Add name argument.
 
 #ifndef G4_CASCADE_DATA_HH
@@ -41 +43 @@
 #include "globals.hh"
 #include "G4CascadeSampler.hh"          /* To get number of energy bins */
+#include "G4String.hh"
+
 
 template <int NE,int N2,int N3,int N4,int N5,int N6,int N7,int N8=0,int N9=0>
@@ -72 +76 @@
   static const G4int empty9bfs[1][9];
 
+  const G4String name;                  // For diagnostic purposes
+
   G4int maxMultiplicity() const { return NM+1; }  // Used by G4CascadeFunctions
+
+  void print(G4int mult=-1) const;      // Dump multiplicty tables (-1 == all)
+  void printXsec(const G4double (&xsec)[NE]) const;
 
   // Constructor for kaon/hyperon channels, with multiplicity <= 7
@@ -78 +87 @@
                 const G4int (&the4bfs)[N4][4], const G4int (&the5bfs)[N5][5],
                 const G4int (&the6bfs)[N6][6], const G4int (&the7bfs)[N7][7],
-                const G4double (&xsec)[NXS][NE])
+                const G4double (&xsec)[NXS][NE],
+                const G4String& aName="G4CascadeData")
     : x2bfs(the2bfs), x3bfs(the3bfs), x4bfs(the4bfs), x5bfs(the5bfs),
       x6bfs(the6bfs), x7bfs(the7bfs), x8bfs(empty8bfs), x9bfs(empty9bfs),
-      crossSections(xsec), tot(sum) { initialize(); }
+      crossSections(xsec), tot(sum), name(aName) { initialize(); }
 
   // Constructor for kaon/hyperon channels, with multiplicity <= 7 and inclusive
@@ -87 +97 @@
                 const G4int (&the4bfs)[N4][4], const G4int (&the5bfs)[N5][5],
                 const G4int (&the6bfs)[N6][6], const G4int (&the7bfs)[N7][7],
-                const G4double (&xsec)[NXS][NE], const G4double (&theTot)[NE])
+                const G4double (&xsec)[NXS][NE], const G4double (&theTot)[NE],
+                const G4String& aName="G4CascadeData")
     : x2bfs(the2bfs), x3bfs(the3bfs), x4bfs(the4bfs), x5bfs(the5bfs),
       x6bfs(the6bfs), x7bfs(the7bfs), x8bfs(empty8bfs), x9bfs(empty9bfs),
-      crossSections(xsec), tot(theTot) { initialize(); }
+      crossSections(xsec), tot(theTot), name(aName) { initialize(); }
 
   // Constructor for pion/nuleon channels, with multiplicity > 7
@@ -97 +108 @@
                 const G4int (&the6bfs)[N6][6], const G4int (&the7bfs)[N7][7],
                 const G4int (&the8bfs)[N8D][8], const G4int (&the9bfs)[N9D][9],
-                const G4double (&xsec)[NXS][NE])
+                const G4double (&xsec)[NXS][NE],
+                const G4String& aName="G4CascadeData")
     : x2bfs(the2bfs), x3bfs(the3bfs), x4bfs(the4bfs), x5bfs(the5bfs),
       x6bfs(the6bfs), x7bfs(the7bfs), x8bfs(the8bfs), x9bfs(the9bfs),
-      crossSections(xsec), tot(sum) { initialize(); }
+      crossSections(xsec), tot(sum), name(aName) { initialize(); }
 
   // Constructor for pion/nuleon channels, with multiplicity > 7 and inclusive
@@ -107 +119 @@
                 const G4int (&the6bfs)[N6][6], const G4int (&the7bfs)[N7][7],
                 const G4int (&the8bfs)[N8D][8], const G4int (&the9bfs)[N9D][9],
-                const G4double (&xsec)[NXS][NE], const G4double (&theTot)[NE])
+                const G4double (&xsec)[NXS][NE], const G4double (&theTot)[NE],
+                const G4String& aName="G4CascadeData")
     : x2bfs(the2bfs), x3bfs(the3bfs), x4bfs(the4bfs), x5bfs(the5bfs),
       x6bfs(the6bfs), x7bfs(the7bfs), x8bfs(the8bfs), x9bfs(the9bfs),
-      crossSections(xsec), tot(theTot) { initialize(); }
+      crossSections(xsec), tot(theTot), name(aName) { initialize(); }
+
   void initialize();                    // Fill summed arrays from input
 };
-
-template <int NE,int N2,int N3,int N4,int N5,int N6,int N7,int N8,int N9> inline
-void G4CascadeData<NE,N2,N3,N4,N5,N6,N7,N8,N9>::initialize() {
-  // Initialize index offsets for cross-section array (can't do globally)
-  index[0] = 0;   index[1] = N02; index[2] = N23; index[3] = N24;
-  index[4] = N25; index[5] = N26; index[6] = N27; index[7] = N28;
-  index[8] = N29;
-
-  // Initialize multiplicity array
-  for (G4int m = 0; m < NM; m++) {
-    G4int start = index[m];
-    G4int stop = index[m+1];
-    for (G4int k = 0; k < NE; k++) {
-      multiplicities[m][k] = 0.0;
-      for (G4int i = start; i < stop; i++) {
-        multiplicities[m][k] += crossSections[i][k];
-      }
-    }
-  }
-  
-  // Initialize total cross section array
-  for (G4int k = 0; k < NE; k++) {
-    sum[k] = 0.0;
-    for (G4int m = 0; m < NM; m++) {
-      sum[k] += multiplicities[m][k];
-    }
-  }
-}
 
 // Dummy arrays for use when optional template arguments are skipped
@@ -149 +135 @@
 const G4int G4CascadeData<NE,N2,N3,N4,N5,N6,N7,N8,N9>::empty9bfs[1][9] = {{0}};
 
+// GCC and other compilers require template implementations here
+#include "G4CascadeData.icc"
+
 #endif