Changeset 1315 for trunk/source/processes/cuts

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

Location:

trunk/source/processes/cuts

Files:

• History (modified) (2 diffs)
• src/G4ProductionCutsTable.cc (modified) (4 diffs)

trunk/source/processes/cuts/History

@@ -1 @@
-$Id: History,v 1.33 2009/11/12 00:20:03 kurasige Exp $
+$Id: History,v 1.34 2010/01/22 11:10:26 kurasige Exp $
 -------------------------------------------------------------------
 
@@ -17 +17 @@
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
+
+Jan. 22th, 2010  -  H.Kurashige (procuts-V09-03-00) 
+- Fixed G4ProductionCutTable to solve problems with zero range for protons 
 
 Nov. 12th, 2009  -  H.Kurashige (procuts-V09-02-08) 

trunk/source/processes/cuts/src/G4ProductionCutsTable.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4ProductionCutsTable.cc,v 1.25 2009/11/11 03:20:22 kurasige Exp $
-// GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4ProductionCutsTable.cc,v 1.27 2010/01/22 11:10:26 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-cand-01 $
 //
 //
@@ -252 +252 @@
   if (verboseLevel>2) {
     timer.Stop();
-    std::cout << "G4ProductionCutsTable::UpdateCoupleTable "
+    G4cout << "G4ProductionCutsTable::UpdateCoupleTable "
               << "  elapsed time for calculation of  energy cuts " << G4endl;
-    std::cout << timer <<G4endl;
+    G4cout << timer <<G4endl;
   }
 
@@ -291 +291 @@
 
   // check range
-  if (range <=0.0) return -1.0;
+  if (range ==0.0) return 0.0;
+  if (range <0.0) return -1.0;
 
   // check particle
@@ -922 +923 @@
       G4bool fRatio = true;
       for (size_t j=0; j< NumberOfG4CutIndex; j++) {
-        G4double ratio =  cutValues[j]/aCut->GetProductionCut(j);
-        fRatio = fRatio && (0.999<ratio) && (ratio<1.001) ;
-      }
+        // check ratio only if values are not the same
+        if (cutValues[j] != aCut->GetProductionCut(j)) {  
+          G4double ratio =  cutValues[j]/aCut->GetProductionCut(j);
+          fRatio = fRatio && (0.999<ratio) && (ratio<1.001) ;
+        }
+      } 
       if (!fRatio) continue; 
       // MCC matched