Import Geant4 10.3.0.beta source tree

source/processes/hadronic/models/particle_hp/src/G4ParticleHPCaptureFS.cc

@@ -84,14 +84,16 @@
     if ( HasFSData() && !G4ParticleHPManager::GetInstance()->GetUseOnlyPhotoEvaporation() ) 
     { 
        //NDL has final state data
-      if ( hasExactMF6 )
-	{
+       if ( hasExactMF6 ) {
 	  theMF6FinalState.SetTarget(theTarget);
 	  theMF6FinalState.SetProjectileRP(theNeutron);
           thePhotons = theMF6FinalState.Sample( eKinetic );
-       }
-       else
+       } else {
           thePhotons = theFinalStatePhotons.GetPhotons(eKinetic);
+       }
+       if ( thePhotons == NULL ) {
+          throw G4HadronicException(__FILE__, __LINE__, "Final state data for photon is not properly allocated");
+       }
     }
     else
     {
@@ -141,7 +143,7 @@
 // add them to the final state
 
     G4int nPhotons = 0;
-    if(thePhotons!=0) nPhotons=thePhotons->size();
+    nPhotons=thePhotons->size();
 
 ///*
    if ( DoNotAdjustFinalState() ) {