Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/source/processes/hadronic/models/cascade/cascade/src/G4CascadeXiMinusNChannel.cc

    r962 r1315  
    2828
    2929namespace {
    30   // Total cross section as a function of kinetic energy
    31   G4double xmntot[31];
    32  
    33   // Multiplicities as a function of kinetic energy
    34   G4double xmnMultiplicities[6][31];
    35 
    36   const G4int xmnindex[6][2] =
    37     {{0, 3}, {3, 21}, {21,74}, {74,76}, {76,78}, {78,80}};
    38 
    3930  // Outgoing particle types of a given multiplicity
    4031
    41   const G4int xmn2bfs[3][2] =
     32  static const G4int xmn2bfs[3][2] =
    4233    {{2, 31}, {21,27}, {25,27}};
    4334
    44   const G4int xmn3bfs[18][3] =
     35  static const G4int xmn3bfs[18][3] =
    4536    {{2,13,21}, {5,21,21}, {1,13,27}, {2,13,25}, {7,21,27}, {5,23,27},
    4637     {7,25,27}, {3,27,27}, {2,17,27}, {5,21,25}, {5,25,25}, {2,5,29},
    4738     {2,7,31},  {15,21,31},{11,27,31},{15,27,29},{1,5,31},  {15,25,31}}; 
    4839
    49   const G4int xmn4bfs[53][4] =
     40  static const G4int xmn4bfs[53][4] =
    5041    {{1,2,13,13},  {1,5,13,21},  {1,5,13,25},  {1,7,13,27},  {1,5,17,27}, 
    5142     {1,5,5,29},   {1,5,7,31},   {1,13,15,31}, {2,2,13,17},  {2,7,13,21},
    … …  
    6051     {3,15,27,31}, {7,11,27,31}, {7,15,27,29}};
    6152
    62   const G4int xmn5bfs[2][5] =
     53  static const G4int xmn5bfs[2][5] =
    6354    {{2,7,7,7,31},  {2,3,5,7,31}};
    6455
    65   const G4int xmn6bfs[2][6] =
     56  static const G4int xmn6bfs[2][6] =
    6657    {{2,7,7,7,7,31},  {2,3,5,7,7,31}};
    6758
    68   const G4int xmn7bfs[2][7] =
     59  static const G4int xmn7bfs[2][7] =
    6960    {{2,7,7,7,7,7,31},  {2,3,5,7,7,7,31}};
    7061
    … …  
    8071  // second index: kinetic energy
    8172  //
    82   const G4float xmnCrossSections[80][31] = {
     73  static const G4double xmnCrossSections[80][31] = {
    8374    //
    8475    // multiplicity 2 (3 channels)
    … …  
    501492
    502493G4CascadeXiMinusNChannelData::data_t
    503 G4CascadeXiMinusNChannelData::data = { xmntot,
    504                                        xmnMultiplicities,
    505                                        xmnindex,
    506                                        xmn2bfs,
    507                                        xmn3bfs,
    508                                        xmn4bfs,
    509                                        xmn5bfs,
    510                                        xmn6bfs,
    511                                        xmn7bfs,
    512                                        xmnCrossSections };
    513 namespace {
    514   struct initializer
    515   {
    516     initializer() { G4CascadeXiMinusNChannelData::data.initialize(); }
    517   };
    518 
    519   initializer init;
    520 }
     494G4CascadeXiMinusNChannelData::data(xmn2bfs, xmn3bfs, xmn4bfs,
     495                                   xmn5bfs, xmn6bfs, xmn7bfs,
     496                                   xmnCrossSections);
Note: See TracChangeset for help on using the changeset viewer.