Changeset 962 for trunk/source/processes/hadronic/models/binary_cascade/src
- Timestamp:
- Apr 6, 2009, 12:30:29 PM (15 years ago)
- Location:
- trunk/source/processes/hadronic/models/binary_cascade/src
- Files:
-
- 13 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/source/processes/hadronic/models/binary_cascade/src/G4AntiProtonField.cc
r819 r962 37 37 // ------------------------------------------------------------------- 38 38 #include "G4AntiProtonField.hh" 39 #include "G4NucleiProperties Table.hh"39 #include "G4NucleiProperties.hh" 40 40 #include "G4VNuclearDensity.hh" 41 41 #include "G4FermiMomentum.hh" … … 87 87 G4double A = theNucleus->GetMassNumber(); 88 88 G4double Z = theNucleus->GetCharge(); 89 G4double bindingEnergy = G4NucleiProperties Table::GetBindingEnergy(G4lrint(Z), G4lrint(A));89 G4double bindingEnergy = G4NucleiProperties::GetBindingEnergy(G4lrint(A), G4lrint(Z)); 90 90 G4double nucleusMass = Z*proton_mass_c2+(A-Z)*neutron_mass_c2+bindingEnergy; 91 91 G4double reducedMass = antiProtonMass*nucleusMass/(antiProtonMass+nucleusMass); -
trunk/source/processes/hadronic/models/binary_cascade/src/G4BinaryCascade.cc
r819 r962 86 86 // 87 87 88 G4BinaryCascade::G4BinaryCascade() : G4VIntraNuclearTransportModel() 88 G4BinaryCascade::G4BinaryCascade() : 89 G4VIntraNuclearTransportModel("Binary Cascade") 89 90 { 90 91 // initialise the resonance sector … … 97 98 theImR.push_back(theDecay); 98 99 G4Scatterer * aSc=new G4Scatterer; 100 theH1Scatterer = new G4Scatterer; 99 101 theImR.push_back(aSc); 100 102 G4MesonAbsorption * aAb=new G4MesonAbsorption; … … 111 113 SetMinEnergy(0.0*GeV); 112 114 SetMaxEnergy(10.1*GeV); 113 PrintWelcomeMessage();115 //PrintWelcomeMessage(); 114 116 thePrimaryEscape = true; 115 117 thePrimaryType = 0; … … 118 120 119 121 G4BinaryCascade::G4BinaryCascade(const G4BinaryCascade& ) 120 : G4VIntraNuclearTransportModel( )122 : G4VIntraNuclearTransportModel("Binary Cascade") 121 123 { 122 124 } … … 134 136 delete theLateParticle; 135 137 delete theExcitationHandler; 138 delete theH1Scatterer; 136 139 } 137 140 … … 2440 2443 G4bool done(false); 2441 2444 std::vector<G4KineticTrack *>::iterator iter, jter; 2442 static G4Scatterer theScatterer;2445 // data member static G4Scatterer theH1Scatterer; 2443 2446 //G4cout << " start 1H1 for " << (*secondaries).front()->GetDefinition()->GetParticleName() 2444 2447 // << " on " << aHTarg->GetParticleName() << G4endl; … … 2451 2454 delete secs; 2452 2455 } 2453 secs = the Scatterer.Scatter(*(*secondaries).front(), aTarget);2456 secs = theH1Scatterer->Scatter(*(*secondaries).front(), aTarget); 2454 2457 for(size_t ss=0; secs && ss<secs->size(); ss++) 2455 2458 { -
trunk/source/processes/hadronic/models/binary_cascade/src/G4BinaryLightIonReaction.cc
r819 r962 39 39 40 40 G4BinaryLightIonReaction::G4BinaryLightIonReaction() 41 : theModel(), theHandler(), theProjectileFragmentation(&theHandler) {} 41 : G4HadronicInteraction("Binary Cascade"), theModel(), theHandler(), 42 theProjectileFragmentation(&theHandler) {} 42 43 43 44 G4HadFinalState *G4BinaryLightIonReaction:: -
trunk/source/processes/hadronic/models/binary_cascade/src/G4KM_OpticalEqRhs.cc
r819 r962 38 38 39 39 #include "G4KM_OpticalEqRhs.hh" 40 #include "G4NucleiProperties Table.hh"40 #include "G4NucleiProperties.hh" 41 41 #include "G4VNuclearDensity.hh" 42 42 #include "G4HadTmpUtil.hh" … … 56 56 G4double A = theNucleus->GetMassNumber(); 57 57 G4double Z = theNucleus->GetCharge(); 58 G4double bindingEnergy = G4NucleiProperties Table::GetBindingEnergy(G4lrint(Z), G4lrint(A));58 G4double bindingEnergy = G4NucleiProperties::GetBindingEnergy(G4lrint(A), G4lrint(Z)); 59 59 G4double nucleusMass = Z*proton_mass_c2+(A-Z)*neutron_mass_c2+bindingEnergy; 60 60 G4double reducedMass = mass*nucleusMass/(mass+nucleusMass); -
trunk/source/processes/hadronic/models/binary_cascade/src/G4KaonMinusField.cc
r819 r962 37 37 // ------------------------------------------------------------------- 38 38 #include "G4KaonMinusField.hh" 39 #include "G4NucleiProperties Table.hh"39 #include "G4NucleiProperties.hh" 40 40 #include "G4VNuclearDensity.hh" 41 41 #include "G4FermiMomentum.hh" … … 85 85 G4double A = theNucleus->GetMassNumber(); 86 86 G4double Z = theNucleus->GetCharge(); 87 G4double bindingEnergy = G4NucleiProperties Table::GetBindingEnergy(G4lrint(Z), G4lrint(A));87 G4double bindingEnergy = G4NucleiProperties::GetBindingEnergy(G4lrint(A), G4lrint(Z)); 88 88 G4double nucleusMass = Z*proton_mass_c2+(A-Z)*neutron_mass_c2+bindingEnergy; 89 89 G4double reducedMass = kaonMass*nucleusMass/(kaonMass+nucleusMass); -
trunk/source/processes/hadronic/models/binary_cascade/src/G4KaonPlusField.cc
r819 r962 37 37 // ------------------------------------------------------------------- 38 38 #include "G4KaonPlusField.hh" 39 #include "G4NucleiProperties Table.hh"39 #include "G4NucleiProperties.hh" 40 40 #include "G4VNuclearDensity.hh" 41 41 #include "G4FermiMomentum.hh" … … 85 85 G4double A = theNucleus->GetMassNumber(); 86 86 G4double Z = theNucleus->GetCharge(); 87 G4double bindingEnergy = G4NucleiProperties Table::GetBindingEnergy(G4lrint(Z), G4lrint(A));87 G4double bindingEnergy = G4NucleiProperties::GetBindingEnergy(G4lrint(A), G4lrint(Z)); 88 88 G4double nucleusMass = Z*proton_mass_c2+(A-Z)*neutron_mass_c2+bindingEnergy; 89 89 G4double reducedMass = kaonMass*nucleusMass/(kaonMass+nucleusMass); -
trunk/source/processes/hadronic/models/binary_cascade/src/G4KaonZeroField.cc
r819 r962 37 37 // ------------------------------------------------------------------- 38 38 #include "G4KaonZeroField.hh" 39 #include "G4NucleiProperties Table.hh"39 #include "G4NucleiProperties.hh" 40 40 #include "G4VNuclearDensity.hh" 41 41 #include "G4FermiMomentum.hh" … … 85 85 G4double A = theNucleus->GetMassNumber(); 86 86 G4double Z = theNucleus->GetCharge(); 87 G4double bindingEnergy = G4NucleiProperties Table::GetBindingEnergy(G4lrint(Z), G4lrint(A));87 G4double bindingEnergy = G4NucleiProperties::GetBindingEnergy(G4lrint(A), G4lrint(Z)); 88 88 G4double nucleusMass = Z*proton_mass_c2+(A-Z)*neutron_mass_c2+bindingEnergy; 89 89 G4double reducedMass = kaonMass*nucleusMass/(kaonMass+nucleusMass); -
trunk/source/processes/hadronic/models/binary_cascade/src/G4PionMinusField.cc
r819 r962 37 37 // ------------------------------------------------------------------- 38 38 #include "G4PionMinusField.hh" 39 #include "G4NucleiProperties Table.hh"39 #include "G4NucleiProperties.hh" 40 40 #include "G4VNuclearDensity.hh" 41 41 #include "G4FermiMomentum.hh" … … 83 83 G4double Z = theNucleus->GetCharge(); 84 84 G4double pionMinusMass = G4PionMinus::PionMinus()->GetPDGMass(); 85 G4double bindingEnergy = G4NucleiProperties Table::GetBindingEnergy(G4lrint(Z), G4lrint(A));85 G4double bindingEnergy = G4NucleiProperties::GetBindingEnergy(G4lrint(A), G4lrint(Z)); 86 86 G4double nucleusMass = Z*proton_mass_c2+(A-Z)*neutron_mass_c2+bindingEnergy; 87 87 G4double reducedMass = pionMinusMass*nucleusMass/(pionMinusMass+nucleusMass); -
trunk/source/processes/hadronic/models/binary_cascade/src/G4PionPlusField.cc
r819 r962 37 37 // ------------------------------------------------------------------- 38 38 #include "G4PionPlusField.hh" 39 #include "G4NucleiProperties Table.hh"39 #include "G4NucleiProperties.hh" 40 40 #include "G4VNuclearDensity.hh" 41 41 #include "G4FermiMomentum.hh" … … 85 85 G4double A = theNucleus->GetMassNumber(); 86 86 G4double Z = theNucleus->GetCharge(); 87 G4double bindingEnergy = G4NucleiProperties Table::GetBindingEnergy(G4lrint(Z), G4lrint(A));87 G4double bindingEnergy = G4NucleiProperties::GetBindingEnergy(G4lrint(A), G4lrint(Z)); 88 88 G4double nucleusMass = Z*proton_mass_c2+(A-Z)*neutron_mass_c2+bindingEnergy; 89 89 G4double reducedMass = pionPlusMass*nucleusMass/(pionPlusMass+nucleusMass); -
trunk/source/processes/hadronic/models/binary_cascade/src/G4PionZeroField.cc
r819 r962 37 37 // ------------------------------------------------------------------- 38 38 #include "G4PionZeroField.hh" 39 #include "G4NucleiProperties Table.hh"39 #include "G4NucleiProperties.hh" 40 40 #include "G4VNuclearDensity.hh" 41 41 #include "G4FermiMomentum.hh" … … 85 85 G4double Z = theNucleus->GetCharge(); 86 86 87 G4double bindingEnergy = G4NucleiProperties Table::GetBindingEnergy(G4lrint(Z), G4lrint(A));87 G4double bindingEnergy = G4NucleiProperties::GetBindingEnergy(G4lrint(A), G4lrint(Z)); 88 88 G4double nucleusMass = Z*proton_mass_c2+(A-Z)*neutron_mass_c2+bindingEnergy; 89 89 G4double reducedMass = pionZeroMass*nucleusMass/(pionZeroMass+nucleusMass); -
trunk/source/processes/hadronic/models/binary_cascade/src/G4SigmaMinusField.cc
r819 r962 37 37 // ------------------------------------------------------------------- 38 38 #include "G4SigmaMinusField.hh" 39 #include "G4NucleiProperties Table.hh"39 #include "G4NucleiProperties.hh" 40 40 #include "G4VNuclearDensity.hh" 41 41 #include "G4FermiMomentum.hh" … … 84 84 G4double A = theNucleus->GetMassNumber(); 85 85 G4double Z = theNucleus->GetCharge(); 86 G4double bindingEnergy = G4NucleiProperties Table::GetBindingEnergy(G4lrint(Z), G4lrint(A));86 G4double bindingEnergy = G4NucleiProperties::GetBindingEnergy(G4lrint(A), G4lrint(Z)); 87 87 G4double nucleusMass = Z*proton_mass_c2+(A-Z)*neutron_mass_c2+bindingEnergy; 88 88 G4double reducedMass = sigmaMinusMass*nucleusMass/(sigmaMinusMass+nucleusMass); -
trunk/source/processes/hadronic/models/binary_cascade/src/G4SigmaPlusField.cc
r819 r962 37 37 // ------------------------------------------------------------------- 38 38 #include "G4SigmaPlusField.hh" 39 #include "G4NucleiProperties Table.hh"39 #include "G4NucleiProperties.hh" 40 40 #include "G4VNuclearDensity.hh" 41 41 #include "G4FermiMomentum.hh" … … 85 85 G4double A = theNucleus->GetMassNumber(); 86 86 G4double Z = theNucleus->GetCharge(); 87 G4double bindingEnergy = G4NucleiProperties Table::GetBindingEnergy(G4lrint(Z), G4lrint(A));87 G4double bindingEnergy = G4NucleiProperties::GetBindingEnergy(G4lrint(A), G4lrint(Z)); 88 88 G4double nucleusMass = Z*proton_mass_c2+(A-Z)*neutron_mass_c2+bindingEnergy; 89 89 G4double reducedMass = sigmaPlusMass*nucleusMass/(sigmaPlusMass+nucleusMass); -
trunk/source/processes/hadronic/models/binary_cascade/src/G4SigmaZeroField.cc
r819 r962 37 37 // ------------------------------------------------------------------- 38 38 #include "G4SigmaZeroField.hh" 39 #include "G4NucleiProperties Table.hh"39 #include "G4NucleiProperties.hh" 40 40 #include "G4VNuclearDensity.hh" 41 41 #include "G4FermiMomentum.hh" … … 85 85 G4double A = theNucleus->GetMassNumber(); 86 86 G4double Z = theNucleus->GetCharge(); 87 G4double bindingEnergy = G4NucleiProperties Table::GetBindingEnergy(G4lrint(Z), G4lrint(A));87 G4double bindingEnergy = G4NucleiProperties::GetBindingEnergy(G4lrint(A), G4lrint(Z)); 88 88 G4double nucleusMass = Z*proton_mass_c2+(A-Z)*neutron_mass_c2+bindingEnergy; 89 89 G4double reducedMass = sigmaZeroMass*nucleusMass/(sigmaZeroMass+nucleusMass);
Note: See TracChangeset
for help on using the changeset viewer.