Changeset 1228 for trunk/source/processes/hadronic/models/cascade

Timestamp:

Jan 8, 2010, 11:56:51 AM (14 years ago)

Author:

garnier

Message:

update geant4.9.3 tag

Location:

trunk/source/processes/hadronic/models/cascade

Files:

• History (modified) (1 diff)
• cascade/include/G4CascadeMomentum.hh (modified) (1 diff)
• cascade/include/G4FinalStateSampler.hh (modified) (1 diff)
• cascade/include/G4NucleonSampler.hh (modified) (1 diff)
• cascade/include/G4PionSampler.hh (modified) (1 diff)
• cascade/src/G4FinalStateSampler.cc (modified) (1 diff)
• cascade/src/G4NucleiModel.cc (modified) (3 diffs)
• cascade/src/G4NucleonSampler.cc (modified) (4 diffs)
• cascade/src/G4PionSampler.cc (modified) (5 diffs)

trunk/source/processes/hadronic/models/cascade/History

@@ -15 +15 @@
      ---------------------------------------------------------------
 
+1 Dec 2009 Dennis Wright (hadr-casc-V09-02-11)
+----------------------------------------------
+- G4PionSampler, G4NucleonSampler: change loop variable in ctor from i to j
+  in order to satisfy Windows compiler
+ 
 11 Nov 2009 Dennis Wright (hadr-casc-V09-02-10)
 -----------------------------------------------

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

@@ -25 +25 @@
 //
 // $Id: G4CascadeMomentum.hh,v 1.1 2008/09/22 10:06:32 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 //

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

@@ -25 +25 @@
 //
 // $Id: G4FinalStateSampler.hh,v 1.2 2009/09/17 18:11:57 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: D. H. Wright

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

@@ -25 +25 @@
 //
 // $Id: G4NucleonSampler.hh,v 1.1 2009/09/24 18:50:27 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: D. H. Wright

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

@@ -25 +25 @@
 //
 // $Id: G4PionSampler.hh,v 1.2 2009/09/17 18:10:44 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 // Author: D. H. Wright

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

@@ -25 +25 @@
 //
 // $Id: G4FinalStateSampler.cc,v 1.2 2009/09/17 18:15:38 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// GEANT4 tag $Name: geant4-09-03 $
 //
 

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

@@ -969 +969 @@
 
   G4double rat;
-  G4double ratm;
+  //  G4double ratm;
 
   // Calculate number of protons and neutrons in local region
-  G4double Athird = std::pow(A, 0.3333);
-  G4double Nneut = Athird*(A-Z)/A;
-  G4double Nprot = Athird*Z/A;
+  //  G4double Athird = std::pow(A, 0.3333);
+  //  G4double Nneut = Athird*(A-Z)/A;
+  //  G4double Nprot = Athird*Z/A;
 
   // Reduce number of 
@@ -985 +985 @@
 
     // Calculate ratio modified for local region
-    G4double deltaP = protonNumber - protonNumberCurrent;
+    //    G4double deltaP = protonNumber - protonNumberCurrent;
     //    G4cout << " deltaP = " << deltaP << G4endl;
-    ratm = std::max(0.0, (Nprot - deltaP)/Nprot);
+    //    ratm = std::max(0.0, (Nprot - deltaP)/Nprot);
 
   } else {
@@ -997 +997 @@
 
     // Calculate ratio modified for local region
-    G4double deltaN = neutronNumber - neutronNumberCurrent;
+    //    G4double deltaN = neutronNumber - neutronNumberCurrent;
     //   G4cout << " deltaN = " << deltaN << G4endl;
-    ratm = std::max(0.0, (Nneut - deltaN)/Nneut);
+    //    ratm = std::max(0.0, (Nneut - deltaN)/Nneut);
   }
 

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

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4NucleonSampler.cc,v 1.1 2009/09/24 18:51:14 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: G4NucleonSampler.cc,v 1.2 2009/12/02 17:34:57 dennis Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
  
@@ -62 +62 @@
   }
 
-  G4int i, k, m;
+  G4int j, k, m;
   G4int start, stop;
 
@@ -70 +70 @@
     for (k = 0; k < 30; k++) {
       t1_dSigma_dMult[m][k] = 0.0;
-      for (i = start; i < stop; i++) t1_dSigma_dMult[m][k] += PPCrossSections[i][k];
+      for (j = start; j < stop; j++) t1_dSigma_dMult[m][k] += PPCrossSections[j][k];
     }
 
@@ -77 +77 @@
     for (k = 0; k < 30; k++) {
       t0_dSigma_dMult[m][k] = 0.0;
-      for (i = start; i < stop; i++) t0_dSigma_dMult[m][k] += NPCrossSections[i][k];
+      for (j = start; j < stop; j++) t0_dSigma_dMult[m][k] += NPCrossSections[j][k];
     }
   }

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

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4PionSampler.cc,v 1.4 2009/10/09 01:03:45 dennis Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: G4PionSampler.cc,v 1.5 2009/12/02 17:35:10 dennis Exp $
+// GEANT4 tag $Name: geant4-09-03 $
 //
  
@@ -60 +60 @@
   }
 
-  G4int i, k, m;
+  G4int j, k, m;
   G4int start, stop;
 
@@ -68 +68 @@
     for (k = 0; k < 30; k++) {
       t33_dSigma_dMult[m][k] = 0.0;
-      for (i = start; i < stop; i++) t33_dSigma_dMult[m][k] += pipPCrossSections[i][k];
+      for (j = start; j < stop; j++) t33_dSigma_dMult[m][k] += pipPCrossSections[j][k];
     }
 
@@ -75 +75 @@
     for (k = 0; k < 30; k++) {
       t31_dSigma_dMult[m][k] = 0.0;
-      for (i = start; i < stop; i++) t31_dSigma_dMult[m][k] += pimPCrossSections[i][k];
+      for (j = start; j < stop; j++) t31_dSigma_dMult[m][k] += pimPCrossSections[j][k];
     }
 
@@ -82 +82 @@
     for (k = 0; k < 30; k++) {
       t11_dSigma_dMult[m][k] = 0.0;
-      for (i = start; i < stop; i++) t11_dSigma_dMult[m][k] += pizPCrossSections[i][k];
+      for (j = start; j < stop; j++) t11_dSigma_dMult[m][k] += pizPCrossSections[j][k];
     }
   }