Changeset 1340 for trunk/source/processes/hadronic/models/cascade/cascade/src/G4InuclEvaporation.cc

Timestamp:

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

Author:

garnier

Message:

update ti head

File:

• trunk/source/processes/hadronic/models/cascade/cascade/src/G4InuclEvaporation.cc (modified) (7 diffs)

trunk/source/processes/hadronic/models/cascade/cascade/src/G4InuclEvaporation.cc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4InuclEvaporation.cc,v 1.19 2010/06/25 09:44:40 gunter Exp $
-// Geant4 tag: $Name: geant4-09-04-beta-01 $
+// $Id: G4InuclEvaporation.cc,v 1.22 2010/09/24 21:09:01 mkelsey Exp $
+// Geant4 tag: $Name: hadr-casc-V09-03-85 $
 //
 // 20100114  M. Kelsey -- Remove G4CascadeMomentum, use G4LorentzVector directly
@@ -38 +38 @@
 //              G4CollisionOutput, copy G4DynamicParticle directly from
 //              G4InuclParticle, no switch-block required.  Fix scaling factors.
+// 20100914  M. Kelsey -- Migrate to integer A and Z
+// 20100924  M. Kelsey -- Migrate to "OutgoingNuclei" names in CollisionOutput 
 
+#include "G4InuclEvaporation.hh"
 #include <numeric>
 #include "G4IonTable.hh"
@@ -45 +48 @@
 #include "G4DynamicParticleVector.hh"
 #include "G4EvaporationInuclCollider.hh"
-#include "G4InuclEvaporation.hh"
 #include "G4InuclNuclei.hh"
 #include "G4Track.hh"
@@ -102 +104 @@
   }
 
-  G4double A = theNucleus.GetA();
-  G4double Z = theNucleus.GetZ();
+  G4int A = theNucleus.GetA_asInt();
+  G4int Z = theNucleus.GetZ_asInt();
   G4double mTar  = G4NucleiProperties::GetNuclearMass(A, Z); // Mass of the target nucleus
 
@@ -131 +133 @@
   evaporator->collide(0, nucleus, output);
 
-  const std::vector<G4InuclNuclei>& nucleiFragments = output.getNucleiFragments();
+  const std::vector<G4InuclNuclei>& outgoingNuclei = output.getOutgoingNuclei();
   const std::vector<G4InuclElementaryParticle>& particles = output.getOutgoingParticles();
 
@@ -158 +160 @@
   }
 
-  //  G4cout << "# fragments " << output.getNucleiFragments().size() << G4endl;
+  //  G4cout << "# fragments " << output.getOutgoingNuclei().size() << G4endl;
   i=1; 
-  if (!nucleiFragments.empty()) { 
-    nucleiIterator ifrag = nucleiFragments.begin();
-    for (; ifrag != nucleiFragments.end(); ifrag++) {
+  if (!outgoingNuclei.empty()) { 
+    nucleiIterator ifrag = outgoingNuclei.begin();
+    for (; ifrag != outgoingNuclei.end(); ifrag++) {
       if (verboseLevel > 2) {
         G4cout << " Nuclei fragment: " << i << G4endl; i++;
@@ -171 +173 @@
       G4LorentzVector vlab = ifrag->getMomentum().boost(boostToLab);
  
-      G4int A = G4int(ifrag->getA());
-      G4int Z = G4int(ifrag->getZ());
+      G4int A = ifrag->getA();
+      G4int Z = ifrag->getZ();
       if (verboseLevel > 2) {
         G4cout << "boosted v" << vlab << G4endl;