Changeset 1196 for trunk/source/processes/hadronic/models/qmd/src

Timestamp:

Nov 25, 2009, 5:13:58 PM (15 years ago)

Author:

garnier

Message:

update CVS release candidate geant4.9.3.01

Location:

trunk/source/processes/hadronic/models/qmd/src

Files:

• G4QMDGroundStateNucleus.cc (modified) (1 diff)
• G4QMDReaction.cc (modified) (2 diffs)

trunk/source/processes/hadronic/models/qmd/src/G4QMDGroundStateNucleus.cc

@@ -48 +48 @@
    //std::cout << " G4QMDGroundStateNucleus( G4int z , G4int a ) Begin " << z << " " << a << std::endl;
 
-// Hydrogen  Case
-   if ( z ==  1 && a == 1 )
+   if ( z == 1 && a == 1 ) // Hydrogen  Case or proton primary
    {
       SetParticipant( new G4QMDParticipant( G4Proton::Proton() , G4ThreeVector( 0.0 ) , G4ThreeVector( 0.0 ) ) );
+      return;
+   }
+   else if ( z == 0 && a == 1 ) // Neutron primary
+   {
+      SetParticipant( new G4QMDParticipant( G4Neutron::Neutron() , G4ThreeVector( 0.0 ) , G4ThreeVector( 0.0 ) ) );
       return;
    }

trunk/source/processes/hadronic/models/qmd/src/G4QMDReaction.cc

@@ -33 +33 @@
 // 090122 Be8 -> Alpha + Alpha 
 // 090331 Change member shenXS and genspaXS object to pointer 
+// 091119 Fix for incidence of neutral particles 
 //
 #include "G4QMDReaction.hh"
@@ -636 +637 @@
    G4double pccf = std::sqrt( pcca );
 
-   G4double aas = 2.0 * eccm * b / double ( zp * zt ) / ccoul;  
-   G4double bbs = 1.0 / std::sqrt ( 1.0 + aas*aas );
-   G4double aas1 = ( 1.0 + aas * b / rmax ) * bbs;
+   //Fix for neutral particles
+   G4double aas1 = 0.0;
+   G4double bbs = 0.0;
+
+   if ( zp != 0 )
+   {
+      G4double aas = 2.0 * eccm * b / double ( zp * zt ) / ccoul;
+      bbs = 1.0 / std::sqrt ( 1.0 + aas*aas );
+      aas1 = ( 1.0 + aas * b / rmax ) * bbs;
+   }
 
    G4double cost = 0.0;