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

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

@@ -28 +28 @@
 
 namespace {
-
-  // Total cross section as a function of kinetic energy
-  G4double x0ptot[31];
-
-  // Multiplicities as a function of kinetic energy
-  G4double x0pMultiplicities[6][31];
-
-
-  const G4int x0pindex[6][2] = 
-    {{0, 3}, {3, 21}, {21,74}, {74,76}, {76,78}, {78,80}};
-
   // Outgoing particle types of a given multiplicity
 
-  const G4int x0p2bfs[3][2] =
+  static const G4int x0p2bfs[3][2] =
     {{1, 29}, {21,23}, {23,25}};
 
-  const G4int x0p3bfs[18][3] =
+  static const G4int x0p3bfs[18][3] =
     {{1,17,21}, {3,21,21}, {1,13,23}, {2,17,23}, {7,21,23}, {5,23,23},
      {7,23,25}, {3,23,27}, {1,17,25}, {3,21,25}, {3,25,25}, {1,7,29},
      {2,3,29},  {11,21,29},{11,25,29},{15,23,29},{1,3,31},  {11,23,31}};  
 
-  const G4int x0p4bfs[53][4] =
+  static const G4int x0p4bfs[53][4] =
     {{1,1,13,17},  {1,2,17,17},  {1,7,17,21},  {1,3,13,21},  {1,7,17,25},  
      {1,3,13,25},  {1,7,13,23},  {1,5,17,23},  {1,3,17,27},  {1,7,7,29},
@@ -62 +51 @@
      {3,15,23,31}, {7,11,23,31}, {3,11,27,29}};
 
-  const G4int x0p5bfs[2][5] =
+  static const G4int x0p5bfs[2][5] =
     {{1,7,7,7,29},  {1,3,5,7,29}};
 
-  const G4int x0p6bfs[2][6] =
+  static const G4int x0p6bfs[2][6] =
     {{1,7,7,7,7,29},  {1,3,5,7,7,29}};
 
-  const G4int x0p7bfs[2][7] =
+  static const G4int x0p7bfs[2][7] =
     {{1,7,7,7,7,7,29},  {1,3,5,7,7,7,29}};
 
@@ -82 +71 @@
   // second index: kinetic energy
   // 
-  const G4float x0pCrossSections[80][31] = {
+  static const G4double x0pCrossSections[80][31] = {
     //
     // multiplicity 2 (3 channels)
@@ -503 +492 @@
 
 G4CascadeXiZeroPChannelData::data_t
-G4CascadeXiZeroPChannelData::data = { x0ptot,
-                                      x0pMultiplicities,
-                                      x0pindex,
-                                      x0p2bfs,
-                                      x0p3bfs,
-                                      x0p4bfs,
-                                      x0p5bfs,
-                                      x0p6bfs,
-                                      x0p7bfs,
-                                      x0pCrossSections };
-
-namespace {
-  struct initializer
-  {
-    initializer() { G4CascadeXiZeroPChannelData::data.initialize(); }
-  };
-
-  initializer init;
-}
-
+G4CascadeXiZeroPChannelData::data(x0p2bfs, x0p3bfs, x0p4bfs,
+                                  x0p5bfs, x0p6bfs, x0p7bfs,
+                                  x0pCrossSections);