Changeset 1228 for trunk/source/processes/hadronic/models/incl/src

Timestamp:

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

Author:

garnier

Message:

update geant4.9.3 tag

Location:

trunk/source/processes/hadronic/models/incl/src

Files:

• G4Incl.cc (modified) (9 diffs)
• G4InclAblaCascadeInterface.cc (modified) (2 diffs)
• G4InclAblaLightIonInterface.cc (modified) (2 diffs)

trunk/source/processes/hadronic/models/incl/src/G4Incl.cc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4Incl.cc,v 1.22 2009/11/18 10:43:14 kaitanie Exp $ 
+// $Id: G4Incl.cc,v 1.29 2009/12/09 10:36:40 kaitanie Exp $ 
 // Translation of INCL4.2/ABLA V3 
 // Pekka Kaitaniemi, HIP (translation)
@@ -49 +49 @@
   densFunction = 5;
 
-  //  randomGenerator = new G4InclGeant4Random();
-  randomGenerator = new G4Ranecu();
+  randomGenerator = new G4InclGeant4Random();
+  //randomGenerator = new G4Ranecu();
 }
 
@@ -94 +94 @@
   varntp = aVarntp;
 
-  //  randomGenerator = new G4InclGeant4Random();
-  randomGenerator = new G4Ranecu();
+  randomGenerator = new G4InclGeant4Random();
+  // randomGenerator = new G4Ranecu();
   light_gaus_nuc = new G4LightGausNuc();
   light_nuc = new G4LightNuc();
@@ -855 +855 @@
   if(nopart > -1) {
     for(G4int j = 0; j < nopart; j++) {
+      if(ep[j] < 0.0) continue; // Workaround to avoid negative energies (and taking std::sqrt of a negative number).
       varntp->itypcasc[j] = 1;
       // kind(): 1=proton, 2=neutron, 3=pi+, 4=pi0, 5=pi -      
@@ -1086 +1087 @@
 
   G4double xrand = 0.0;
-  G4double ialdep = 0.0;
+  G4long ialdep = 0;
   G4int imat = 0;
   G4int iamat = 0, izmat = 0;
@@ -1126 +1127 @@
     }
 
-    hazard->ial = int(ialdep);
+    hazard->ial = ialdep;
   }
 
@@ -1430 +1431 @@
 {
   for(G4int i=0; i < saxw->n-1; i++) {
+    if((saxw->x[i+1][k] - saxw->x[i][k]) == 0.0) { // Safeguard to avoid division by zero
+      saxw->s[i][k] = 0.0;
+      continue;
+    }
     saxw->s[i][k] = (saxw->y[i+1][k] - saxw->y[i][k]) / (saxw->x[i+1][k] - saxw->x[i][k]);
   }
@@ -6860 +6865 @@
     x = std::sqrt(E*(E - v0));
     barr = 4.0*x/(E + E - v0 + x + x);
-    if (iz > 0) {
+    if (iz > 0 && izn != 0) { // izn = 0 causes division by zero
       G4double b = izn*1.44/r;
       G4double px = std::sqrt((E - v0)/b);
@@ -7474 +7479 @@
       prob = clmb2(rho,eta,&dumm);                                       
     } else {
-      x = std::exp(std::log(eta)/6.0);
+      if(eta <= 1.0e-6) { // Safeguard against a floating point exception
+        x = 0.0;
+      } else {
+        x = std::exp(std::log(eta)/6.0);
+      }
       prob = std::sqrt(dp1 - y*x/(c0 + c1 * std::pow(x,3) + rho * x));
     } 

trunk/source/processes/hadronic/models/incl/src/G4InclAblaCascadeInterface.cc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4InclAblaCascadeInterface.cc,v 1.12 2009/11/18 10:43:14 kaitanie Exp $ 
+// $Id: G4InclAblaCascadeInterface.cc,v 1.13 2009/12/04 13:16:57 kaitanie Exp $ 
 // Translation of INCL4.2/ABLA V3 
 // Pekka Kaitaniemi, HIP (translation)
@@ -229 +229 @@
       if(bulletType == proton) {
         aParticleDefinition = G4Proton::ProtonDefinition();
-      }
-      if(bulletType == neutron) {
+      } else if(bulletType == neutron) {
         aParticleDefinition = G4Neutron::NeutronDefinition();
-      }
-      if(bulletType == pionPlus) {
+      } else if(bulletType == pionPlus) {
         aParticleDefinition = G4PionPlus::PionPlusDefinition();
-      }
-      if(bulletType == pionZero) {
+      } else if(bulletType == pionZero) {
         aParticleDefinition = G4PionZero::PionZeroDefinition();
-      }
-      if(bulletType == pionMinus) {
+      } else if(bulletType == pionMinus) {
         aParticleDefinition = G4PionMinus::PionMinusDefinition();
-      }
-
-      cascadeParticle = new G4DynamicParticle();
-      cascadeParticle->SetDefinition(aParticleDefinition);
-      cascadeParticle->Set4Momentum(aTrack.Get4Momentum());
-      theResult.AddSecondary(cascadeParticle);
+      } else { // Projectile was not regognized
+        aParticleDefinition = 0;
+      }
+
+      if(aParticleDefinition != 0) {
+        cascadeParticle = new G4DynamicParticle();
+        cascadeParticle->SetDefinition(aParticleDefinition);
+        cascadeParticle->Set4Momentum(aTrack.Get4Momentum());
+        theResult.AddSecondary(cascadeParticle);
+      }
     }
 

trunk/source/processes/hadronic/models/incl/src/G4InclAblaLightIonInterface.cc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4InclAblaLightIonInterface.cc,v 1.10 2007/12/10 16:31:57 gunter Exp $ 
+// $Id: G4InclAblaLightIonInterface.cc,v 1.11 2009/12/04 13:16:57 kaitanie Exp $ 
 // Translation of INCL4.2/ABLA V3 
 // Pekka Kaitaniemi, HIP (translation)
@@ -207 +207 @@
       if(bulletType == proton) {
         aParticleDefinition = G4Proton::ProtonDefinition();
-      }
-      if(bulletType == neutron) {
+      } else if(bulletType == neutron) {
         aParticleDefinition = G4Neutron::NeutronDefinition();
-      }
-      if(bulletType == pionPlus) {
+      } else if(bulletType == pionPlus) {
         aParticleDefinition = G4PionPlus::PionPlusDefinition();
-      }
-      if(bulletType == pionZero) {
+      } else if(bulletType == pionZero) {
         aParticleDefinition = G4PionZero::PionZeroDefinition();
-      }
-      if(bulletType == pionMinus) {
+      } else if(bulletType == pionMinus) {
         aParticleDefinition = G4PionMinus::PionMinusDefinition();
-      }
-
-      cascadeParticle = new G4DynamicParticle();
-      cascadeParticle->SetDefinition(aParticleDefinition);
-      cascadeParticle->Set4Momentum(aTrack.Get4Momentum());
-      theResult.AddSecondary(cascadeParticle);
+      } else if(bulletType == deuteron) {
+        aParticleDefinition = G4Deuteron::DeuteronDefinition();
+      } else if(bulletType == triton) {
+        aParticleDefinition = G4Triton::TritonDefinition();
+      } else if(bulletType == he3) {
+        aParticleDefinition = G4He3::He3Definition();
+      } else if(bulletType == he4) {
+        aParticleDefinition = G4Alpha::AlphaDefinition();
+      } else { // Particle was not recognized. Probably an unsupported particle was given as input
+        aParticleDefinition = 0;
+      }
+
+      if(aParticleDefinition != 0) {
+        cascadeParticle = new G4DynamicParticle();
+        cascadeParticle->SetDefinition(aParticleDefinition);
+        cascadeParticle->Set4Momentum(aTrack.Get4Momentum());
+        theResult.AddSecondary(cascadeParticle);
+      }
     }