Changeset 1347 for trunk/source/processes/hadronic/models/util/src/G4KineticTrack.cc

Timestamp:

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

Author:

garnier

Message:

geant4 tag 9.4

File:

• trunk/source/processes/hadronic/models/util/src/G4KineticTrack.cc (modified) (4 diffs)

trunk/source/processes/hadronic/models/util/src/G4KineticTrack.cc

@@ -493 +493 @@
       G4cout << "DECAY Actual Mass " << theActualMass << G4endl;
 */
+  G4ParticleDefinition* thisDefinition = this->GetDefinition();
+  if(!thisDefinition)
+  {
+    G4cerr << "Error condition encountered in G4KineticTrack::Decay()"<<G4endl;
+    G4cerr << "  track has no particle definition associated."<<G4endl;
+    return 0;
+  }
+  G4DecayTable* theDecayTable = thisDefinition->GetDecayTable();
+  if(!theDecayTable)
+  {
+    G4cerr << "Error condition encountered in G4KineticTrack::Decay()"<<G4endl;
+    G4cerr << "  particle definiton has no decay table associated."<<G4endl;
+    G4cerr << "  particle was "<<thisDefinition->GetParticleName()<<G4endl;
+    return 0;
+  }
  
  G4int chargeBalance = G4lrint(theDefinition->GetPDGCharge() );     
@@ -512 +527 @@
      //  cout << "DECAY Total Width " << theTotalActualWidth << G4endl;
      G4double r = theTotalActualWidth * G4UniformRand();
-     G4ParticleDefinition* thisDefinition = this->GetDefinition();
-     if(!thisDefinition)
-     {
-       G4cerr << "Error condition encountered in G4KineticTrack::Decay()"<<G4endl;
-       G4cerr << "  track has no particle definition associated."<<G4endl;
-       return 0;
-     }
-     G4DecayTable* theDecayTable = thisDefinition->GetDecayTable();
-     if(!theDecayTable)
-     {
-       G4cerr << "Error condition encountered in G4KineticTrack::Decay()"<<G4endl;
-       G4cerr << "  particle definiton has no decay table associated."<<G4endl;
-       G4cerr << "  particle was "<<thisDefinition->GetParticleName()<<G4endl;
-       return 0;
-     }
-     G4VDecayChannel* theDecayChannel=NULL;
+     G4VDecayChannel* theDecayChannel(0);
      for (index = nChannels - 1; index >= 0; index--)
         {
@@ -538 +538 @@
             }
         }
-        
+
+     delete [] theCumActualWidth;
+   
      if(!theDecayChannel)
      {
@@ -669 +671 @@
         }
      delete theDecayProducts;
-     delete [] theCumActualWidth;
      if(getenv("DecayEnergyBalanceCheck"))
        std::cout << "DEBUGGING energy balance in cms and lab, charge baryon balance : "