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

Timestamp:

Sep 30, 2010, 2:47:17 PM (14 years ago)

Author:

garnier

Message:

tag geant4.9.4 beta 1 + modifs locales

File:

• trunk/source/processes/hadronic/models/cascade/cascade/include/G4CascadeData.hh (modified) (4 diffs)

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

@@ -23 +23 @@
 // * acceptance of all terms of the Geant4 Software license.          *
 // ********************************************************************
-// $Id: G4CascadeData.hh,v 1.5 2010/05/16 05:18:36 mkelsey Exp $
-// GEANT4 tag: $Name: geant4-09-04-beta-cand-01 $
+//
+// $Id: G4CascadeData.hh,v 1.7 2010/06/25 09:41:54 gunter Exp $
+// GEANT4 tag: $Name: geant4-09-04-beta-01 $
 //
 // 20100507  M. Kelsey -- Use template arguments to dimension const-refs
@@ -32 +33 @@
 //              from measured inclusive (tot) cross-sections.  Add two
 //              ctors to pass inclusive xsec array as input (for piN/NN).
+// 20100611  M. Kelsey -- Work around Intel ICC compiler warning about
+//              index[] subscripts out of range.  Dimension to full [9].
 
 #ifndef G4_CASCADE_DATA_HH
@@ -50 +53 @@
   enum { NM=N9?8:N8?7:6, NXS=N29 };     // Multiplicity and cross-section bins
 
-  G4int index[NM+1];                    // Start and stop indices to xsec's
+  G4int index[9];                       // Start and stop indices to xsec's
   G4double multiplicities[NM][NE];      // Multiplicity distributions
 
@@ -115 +118 @@
   // 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; 
-  if (NM>6) index[7]=N28;
-  if (NM>7) index[8]=N29;
+  index[4] = N25; index[5] = N26; index[6] = N27; index[7] = N28;
+  index[8] = N29;
 
   // Initialize multiplicity array