Changeset 1340 for trunk/source/processes/hadronic/models/binary_cascade/src/G4BinaryLightIonReaction.cc

Timestamp:

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

Author:

garnier

Message:

update ti head

File:

• trunk/source/processes/hadronic/models/binary_cascade/src/G4BinaryLightIonReaction.cc (modified) (8 diffs)

trunk/source/processes/hadronic/models/binary_cascade/src/G4BinaryLightIonReaction.cc

@@ -53 +53 @@
   if(getenv("BLICDEBUG") ) G4cerr << " ######### Binary Light Ion Reaction number starts ######### "<<eventcounter<<G4endl;
     G4ping debug("debug_G4BinaryLightIonReaction");
-    G4double a1=aTrack.GetDefinition()->GetBaryonNumber();
-    G4double z1=aTrack.GetDefinition()->GetPDGCharge();
-    G4double a2=targetNucleus.GetN();
-    G4double z2=targetNucleus.GetZ();
+    G4int a1=aTrack.GetDefinition()->GetBaryonNumber();
+    G4int z1=G4lrint(aTrack.GetDefinition()->GetPDGCharge());
+    G4int a2=targetNucleus.GetA_asInt();
+    G4int z2=targetNucleus.GetZ_asInt();
     debug.push_back(a1);
     debug.push_back(z1);
@@ -70 +70 @@
     if(a2<a1)
     {
-      debug.push_back("swapping....");
       swapped = true;
-      G4double tmp(0);
+      G4int tmp(0);
       tmp = a2; a2=a1; a1=tmp;
       tmp = z2; z2=z1; z1=tmp;
-      G4double m1=G4ParticleTable::GetParticleTable()->GetIonTable()->GetIonMass(G4lrint(z1),G4lrint(a1));
+      G4double m1=G4ParticleTable::GetParticleTable()->GetIonTable()->GetIonMass(z1,a1);
       G4LorentzVector it(m1, G4ThreeVector(0,0,0));
       mom = toBreit*it;
     }
-    debug.push_back("After swap");
-    debug.push_back(a1);
-    debug.push_back(z1);
-    debug.push_back(a2);
-    debug.push_back(z2);
-    debug.push_back(mom);
-    debug.dump();
 
     G4ReactionProductVector * result = NULL;
@@ -92 +84 @@
 
 
-//    G4double m1=G4ParticleTable::GetParticleTable()->GetIonTable()->GetIonMass(G4lrint(z1),G4lrint(a1));
+//    G4double m1=G4ParticleTable::GetParticleTable()->GetIonTable()->GetIonMass(z1,a1);
 //    G4cout << "Entering the decision point "
 //           << (mom.t()-mom.mag())/a1 << " "
@@ -107 +99 @@
       aPreFrag.SetA(a1+a2);
       aPreFrag.SetZ(z1+z2);
-      aPreFrag.SetNumberOfParticles(G4lrint(a1));
-      aPreFrag.SetNumberOfCharged(G4lrint(z1));
+      aPreFrag.SetNumberOfParticles(a1);
+      aPreFrag.SetNumberOfCharged(z1);
       aPreFrag.SetNumberOfHoles(0);
       G4ThreeVector plop(0.,0., mom.vect().mag());
-      G4double m2=G4ParticleTable::GetParticleTable()->GetIonTable()->GetIonMass(G4lrint(z2),G4lrint(a2));
+      G4double m2=G4ParticleTable::GetParticleTable()->GetIonTable()->GetIonMass(z2,a2);
       m_nucl=m2;
       G4LorentzVector aL(mom.t()+m2, plop);
@@ -117 +109 @@
       G4ParticleDefinition * preFragDef;
       preFragDef = G4ParticleTable::GetParticleTable()
-                      ->FindIon(G4lrint(z1+z2),G4lrint(a1+a2),0,G4lrint(z1+z2));  
+                      ->FindIon(z1+z2,a1+a2,0,z1+z2);  
       aPreFrag.SetParticleDefinition(preFragDef);
 
@@ -225 +217 @@
                        << ", kinetic energy " << aTrack.GetKineticEnergy() 
                        << G4endl;
-              G4cerr << " Target nucleus (A,Z)=(" <<  targetNucleus.GetN()
-                       << "," << targetNucleus.GetZ() << G4endl;
+              G4cerr << " Target nucleus (A,Z)=(" <<  targetNucleus.GetA_asInt()
+                       << "," << targetNucleus.GetZ_asInt() << G4endl;
               G4cerr << " if frequent, please submit above information as bug report"
                       << G4endl << G4endl;
@@ -399 +391 @@
         aProRes.SetNumberOfParticles(0);
         aProRes.SetNumberOfCharged(0);
-        aProRes.SetNumberOfHoles(G4lrint(a1)-resA);
+        aProRes.SetNumberOfHoles(a1-resA);
         G4double mFragment=G4ParticleTable::GetParticleTable()->GetIonTable()->GetIonMass(resZ,resA);
         G4LorentzVector pFragment(0,0,0,mFragment+std::max(0.,theStatisticalExEnergy) );
@@ -420 +412 @@
                     << ", kinetic energy " << aTrack.GetKineticEnergy() 
                     << G4endl;
-           G4cerr << " Target nucleus (A,Z)=(" <<  targetNucleus.GetN()
-                    << "," << targetNucleus.GetZ() << G4endl;
+           G4cerr << " Target nucleus (A,Z)=(" <<  targetNucleus.GetA_asInt()
+                    << "," << targetNucleus.GetZ_asInt() << G4endl;
            G4cerr << " if frequent, please submit above information as bug report"
                    << G4endl << G4endl;