Changeset 1347 for trunk/source/processes/hadronic/models/incl/src/G4InclAblaLightIonInterface.cc

Timestamp:

Dec 22, 2010, 3:52:27 PM (13 years ago)

Author:

garnier

Message:

geant4 tag 9.4

File:

• trunk/source/processes/hadronic/models/incl/src/G4InclAblaLightIonInterface.cc (modified) (6 diffs)

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

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4InclAblaLightIonInterface.cc,v 1.14 2010/10/29 06:48:43 gunter Exp $ 
+// $Id: G4InclAblaLightIonInterface.cc,v 1.16 2010/11/17 20:19:09 kaitanie Exp $ 
 // Translation of INCL4.2/ABLA V3 
 // Pekka Kaitaniemi, HIP (translation)
@@ -103 +103 @@
   }
 
-  if(verboseLevel > 1) {
-    G4Calincl::printProjectileTargetInfo(aTrack, theNucleus);
-  }
-
   // Inverse kinematics for targets with Z = 1 and A = 1
   //  if(false) {
   G4LorentzRotation toBreit = aTrack.Get4Momentum().boostVector();
 
-  if(theNucleus.GetZ_asInt() == 1 && theNucleus.GetA_asInt() == 1 && G4Calincl::canUseInverseKinematics(aTrack, theNucleus)) {
+  if(theNucleus.GetZ_asInt() == 1 && theNucleus.GetA_asInt() == 1 && G4InclInput::canUseInverseKinematics(aTrack, theNucleus)) {
     G4ParticleDefinition *oldTargetDef = theTableOfParticles->GetIon(theNucleus.GetA_asInt(), theNucleus.GetZ_asInt(), 0.0);
     const G4ParticleDefinition *oldProjectileDef = aTrack.GetDefinition();
 
+    if(oldProjectileDef != 0 && oldTargetDef != 0) {
     G4int oldTargetA = oldTargetDef->GetAtomicMass();
     G4int newTargetA = oldProjectileDef->GetAtomicMass();
     G4int newTargetZ = oldProjectileDef->GetAtomicNumber();
 
-    if(newTargetA > 0 && newTargetZ > 0 && oldTargetDef != 0 && oldProjectileDef != 0) {
+    if(newTargetA > 0 && newTargetZ > 0) {
       G4Nucleus swappedTarget(oldProjectileDef->GetAtomicMass(), oldProjectileDef->GetAtomicNumber());
 
@@ -137 +134 @@
       G4cout <<"Badly defined target after swapping. Falling back to normal (non-swapped) mode." << G4endl;
       calincl = new G4InclInput(aTrack, theNucleus, false);
+    }
     }
   } else {
@@ -489 +487 @@
         }
       }
+      delete theSpectatorFermiBreakupResult;
+      theSpectatorFermiBreakupResult = 0;
+
       if(std::abs(fourMomentumBalance.mag() / MeV) > 0.1 * MeV) { 
         G4cout <<"Four-momentum balance after spectator nucleus Fermi break-up:" << G4endl;
@@ -588 +589 @@
         }
       }
+      delete theFermiBreakupResult;
+      theFermiBreakupResult = 0;
+
       if(std::abs(fourMomentumBalance.mag() / MeV) > 0.1 * MeV) { 
         G4cout <<"Four-momentum balance after remnant nucleus Fermi break-up:" << G4endl;
@@ -697 +701 @@
   }
 
+  delete fermiBreakUp;
   delete calincl;
   calincl = 0;