Changeset 1340 for trunk/source/processes/hadronic/models/cascade/cascade/src/G4NuclWatcher.cc

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/src/G4NuclWatcher.cc (modified) (3 diffs)

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

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4NuclWatcher.cc,v 1.3 2010/06/25 09:44:54 gunter Exp $
-// Geant4 tag: $Name: geant4-09-04-beta-01 $
+// $Id: G4NuclWatcher.cc,v 1.5 2010/10/19 19:48:57 mkelsey Exp $
+// Geant4 tag: $Name: hadr-casc-V09-03-85 $
 //
 // 20100202  M. Kelsey -- Move most code here from .hh file, clean up
 // 20100405  M. Kelsey -- Pass const-ref std::vector<>
+// 20101010  M. Kelsey -- Migrate to integer A and Z
+// 20101019  M. Kelsey -- CoVerity report: "!true" should be "!here"
 
 #include "G4NuclWatcher.hh"
@@ -37 +39 @@
 #include <cmath>
 
-G4NuclWatcher::G4NuclWatcher(G4double z, 
+G4NuclWatcher::G4NuclWatcher(G4int z, 
                              const std::vector<G4double>& expa, 
                              const std::vector<G4double>& expcs, 
@@ -47 +49 @@
     exper_err(experr), checkable(check), nucleable(nucl) {}
 
-void G4NuclWatcher::watch(G4double a, G4double z) {
+void G4NuclWatcher::watch(G4int a, G4int z) {
   const G4double small = 0.001;
   
-  if (std::fabs(z-nuclz) >= small) return;
+  if (std::abs(z-nuclz) >= small) return;
 
   G4bool here = false;          // Increment specified nucleus count
   G4int  simulatedAsSize = simulated_as.size();
-  for (G4int i = 0; i<simulatedAsSize && !true; i++) {
-    if (std::fabs(simulated_as[i] - a) < small) {
+  for (G4int i = 0; i<simulatedAsSize && !here; i++) {
+    if (std::abs(simulated_as[i] - a) < small) {
       simulated_cs[i] += 1.0;
       here = true;              // Terminates loop