Changeset 1340 for trunk/source/processes/hadronic/models/neutron_hp/src

Timestamp:

Nov 5, 2010, 3:45:55 PM (14 years ago)

Author:

garnier

Message:

update ti head

Location:

trunk/source/processes/hadronic/models/neutron_hp/src

Files:

• G4NeutronHPFissionData.cc (modified) (2 diffs)
• G4NeutronHPInelastic.cc (modified) (1 diff)
• G4NeutronHPInelasticCompFS.cc (modified) (2 diffs)
• G4NeutronHPNBodyPhaseSpace.cc (modified) (1 diff)
• G4NeutronHPThermalScattering.cc (modified) (2 diffs)

trunk/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPFissionData.cc

@@ -32 +32 @@
 // 081024 G4NucleiPropertiesTable:: to G4NucleiProperties::
 // 081124 Protect invalid read which caused run time errors by T. Koi
+// 100729 Add safty for 0 lenght cross sections by T. Koi
 
 #include "G4NeutronHPFissionData.hh"
@@ -149 +150 @@
   G4int index = anE->GetIndex();
 
+// 100729 TK add safety
+if ( ( ( *theCrossSections )( index ) )->GetVectorLength() == 0 ) return result;
+
   // prepare neutron
   G4double eKinetic = aP->GetKineticEnergy();

trunk/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPInelastic.cc

@@ -34 +34 @@
 //
 // $Id: G4NeutronHPInelastic.cc,v 1.24 2008/12/03 22:28:48 tkoi Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// GEANT4 tag $Name: geant4-09-03-ref-09 $
 //
 // 070523 bug fix for G4FPE_DEBUG on by A. Howard (and T. Koi)

trunk/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPInelasticCompFS.cc

@@ -40 +40 @@
 // 100406 "nothingWasKnownOnHadron=1" then sample mu isotropic in CM 
 //        add two_body_reaction
+// 100909 add safty 
 //
 #include "G4NeutronHPInelasticCompFS.hh"
@@ -276 +277 @@
                                (aHadron.GetMass()+residualMass*G4Neutron::Neutron()->GetPDGMass()));
 
-      aHadron.SetMomentum(theNeutron.GetMomentum()*(1./theNeutron.GetTotalMomentum())*
-                        std::sqrt(aHadron.GetTotalEnergy()*aHadron.GetTotalEnergy()-
-                                  aHadron.GetMass()*aHadron.GetMass()));
-
-/*
-      G4double p2 = ( aHadron.GetTotalEnergy()*aHadron.GetTotalEnergy()-aHadron.GetMass()*aHadron.GetMass() );
+      //aHadron.SetMomentum(theNeutron.GetMomentum()*(1./theNeutron.GetTotalMomentum())*
+      //                  std::sqrt(aHadron.GetTotalEnergy()*aHadron.GetTotalEnergy()-
+      //                            aHadron.GetMass()*aHadron.GetMass()));
+
+      //TK add safty 100909
+      G4double p2 = ( aHadron.GetTotalEnergy()*aHadron.GetTotalEnergy() - aHadron.GetMass()*aHadron.GetMass() );
       G4double p = 0.0;
-      if ( p2 > 0.0 )
-      { 
-         p = std::sqrt( p ); 
-      } 
+      if ( p2 > 0.0 ) p = std::sqrt( p ); 
+
       aHadron.SetMomentum(theNeutron.GetMomentum()*(1./theNeutron.GetTotalMomentum())*p );
-*/
 
     }
     else
     {
-      while( iLevel!=-1 && theGammas.GetLevel(iLevel)==0 ) { iLevel--; }
+      while( iLevel!=-1 && theGammas.GetLevel(iLevel) == 0 ) { iLevel--; }
     }
 

trunk/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPNBodyPhaseSpace.cc

@@ -26 +26 @@
 //
 // $Id: G4NeutronHPNBodyPhaseSpace.cc,v 1.13 2006/06/29 20:53:11 gunter Exp $
-// GEANT4 tag $Name: geant4-09-04-beta-01 $
+// GEANT4 tag $Name: geant4-09-03-ref-09 $
 //
 #include "G4NeutronHPNBodyPhaseSpace.hh"

trunk/source/processes/hadronic/models/neutron_hp/src/G4NeutronHPThermalScattering.cc

@@ -40 +40 @@
 // 070625 Fix memory leaking at destructor by T. Koi 
 // 081201 Fix memory leaking at destructor by T. Koi 
+// 100729 Add model name in constructor Problem #1116
 
 #include "G4NeutronHPThermalScattering.hh"
@@ -48 +49 @@
 
 G4NeutronHPThermalScattering::G4NeutronHPThermalScattering()
+                             :G4HadronicInteraction("NeutronHPThermalScattering")
 {