Ignore:
Timestamp:
Apr 6, 2009, 12:30:29 PM (15 years ago)
Author:
garnier
Message:

update processes

Location:
trunk/source/processes/hadronic/models/binary_cascade
Files:
15 edited

Legend:

Unmodified
Added
Removed

  • trunk/source/processes/hadronic/models/binary_cascade/History

    r819 r962  
    1313     * Please list in reverse chronological order (last date on top)
    1414     ---------------------------------------------------------------
     15
     168-Dec-2008 Gunter Folger                 had-binary-V09-01-03
     17  G4BinaryCascade: previous tag inadvertedly added developement;
     18  moved development to branch, and re-add data member initialisation.
     19
     205-Dec-2008 Gunter Folger                 had-binary-V09-01-02
     21  G4BinaryCascade: make static instance of G4Scatterer in 1H1... data
     22   member, to avoid bad late destruction of static instance
     23   ( found by GC using valgrind )
     24
     2517-Nov-2008 Vladimir Ivanchenko          had-binary-V09-01-01
     26G4BinaryCascade, G4BinaryLightIonReaction - added name of the model,
     27  comment out welcome message
     28
     2927-Oct-2008 Dennis Wright                had-binary-V09-01-00
     30- replace G4NucleiPropertiesTable::GetBindingEnergy(Z,A) with
     31  G4NucleiProperties::GetBindingEnergy(A,Z)  in
     32    G4AntiProtonField.cc, G4KaonMinusField.cc, G4KaonPlusField.cc,
     33    G4KaonZeroField.cc, G4PionMinusField.cc, G4PionPlusField.cc,
     34    G4PionZeroField.cc, G4SigmaMinusField.cc, G4SigmaPlusField.cc,
     35    G4SigmaZeroField.cc, G4KM_OpticalEqRhs.cc
    1536
    163716-Nov-2007 Gunter Folger                had-binary-V09-00-05

  • trunk/source/processes/hadronic/models/binary_cascade/include/G4BinaryCascade.hh

    r819 r962  
    6161class G4KineticTrack;
    6262class G43DNucleus;
     63class G4Scatterer;
    6364
    6465class G4BinaryCascade : public G4VIntraNuclearTransportModel
    … …  
    137138  G4ExcitationHandler * theExcitationHandler;
    138139  G4CollisionManager * theCollisionMgr;
     140 
     141  G4Scatterer * theH1Scatterer;
    139142
    140143  std::vector<G4BCAction *> theImR;

  • trunk/source/processes/hadronic/models/binary_cascade/src/G4AntiProtonField.cc

    r819 r962  
    3737// -------------------------------------------------------------------
    3838#include "G4AntiProtonField.hh"
    39 #include "G4NucleiPropertiesTable.hh"
     39#include "G4NucleiProperties.hh"
    4040#include "G4VNuclearDensity.hh"
    4141#include "G4FermiMomentum.hh"
    … …  
    8787  G4double A = theNucleus->GetMassNumber();
    8888  G4double Z = theNucleus->GetCharge();
    89   G4double bindingEnergy = G4NucleiPropertiesTable::GetBindingEnergy(G4lrint(Z), G4lrint(A));
     89  G4double bindingEnergy = G4NucleiProperties::GetBindingEnergy(G4lrint(A), G4lrint(Z));
    9090  G4double nucleusMass = Z*proton_mass_c2+(A-Z)*neutron_mass_c2+bindingEnergy;
    9191  G4double reducedMass = antiProtonMass*nucleusMass/(antiProtonMass+nucleusMass);

  • trunk/source/processes/hadronic/models/binary_cascade/src/G4BinaryCascade.cc

    r819 r962  
    8686//
    8787
    88 G4BinaryCascade::G4BinaryCascade() : G4VIntraNuclearTransportModel()
     88G4BinaryCascade::G4BinaryCascade() :
     89G4VIntraNuclearTransportModel("Binary Cascade")
    8990{
    9091  // initialise the resonance sector
    … …  
    9798  theImR.push_back(theDecay);
    9899  G4Scatterer * aSc=new G4Scatterer;
     100  theH1Scatterer = new G4Scatterer;
    99101  theImR.push_back(aSc);
    100102  G4MesonAbsorption * aAb=new G4MesonAbsorption;
    … …  
    111113  SetMinEnergy(0.0*GeV);
    112114  SetMaxEnergy(10.1*GeV);
    113   PrintWelcomeMessage();
     115  //PrintWelcomeMessage();
    114116  thePrimaryEscape = true;
    115117  thePrimaryType = 0;
    … …  
    118120
    119121G4BinaryCascade::G4BinaryCascade(const G4BinaryCascade& )
    120 : G4VIntraNuclearTransportModel()
     122: G4VIntraNuclearTransportModel("Binary Cascade")
    121123{
    122124}
    … …  
    134136  delete theLateParticle;
    135137  delete theExcitationHandler;
     138  delete theH1Scatterer;
    136139}
    137140
    … …  
    24402443    G4bool done(false);
    24412444    std::vector<G4KineticTrack *>::iterator iter, jter;
    2442     static G4Scatterer theScatterer;
     2445// data member    static G4Scatterer theH1Scatterer;
    24432446//G4cout << " start 1H1 for " << (*secondaries).front()->GetDefinition()->GetParticleName()
    24442447//       << " on " << aHTarg->GetParticleName() << G4endl; 
    … …  
    24512454       delete secs;
    24522455      }
    2453       secs = theScatterer.Scatter(*(*secondaries).front(), aTarget);
     2456      secs = theH1Scatterer->Scatter(*(*secondaries).front(), aTarget);
    24542457      for(size_t ss=0; secs && ss<secs->size(); ss++)
    24552458      {

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

    r819 r962  
    3939 
    4040  G4BinaryLightIonReaction::G4BinaryLightIonReaction()
    41   : theModel(), theHandler(), theProjectileFragmentation(&theHandler) {}
     41    : G4HadronicInteraction("Binary Cascade"), theModel(), theHandler(),
     42      theProjectileFragmentation(&theHandler) {}
    4243 
    4344  G4HadFinalState *G4BinaryLightIonReaction::

  • trunk/source/processes/hadronic/models/binary_cascade/src/G4KM_OpticalEqRhs.cc

    r819 r962  
    3838
    3939#include "G4KM_OpticalEqRhs.hh"
    40 #include "G4NucleiPropertiesTable.hh"
     40#include "G4NucleiProperties.hh"
    4141#include "G4VNuclearDensity.hh"
    4242#include "G4HadTmpUtil.hh"
    … …  
    5656  G4double A = theNucleus->GetMassNumber();
    5757  G4double Z = theNucleus->GetCharge();
    58   G4double bindingEnergy = G4NucleiPropertiesTable::GetBindingEnergy(G4lrint(Z), G4lrint(A));
     58  G4double bindingEnergy = G4NucleiProperties::GetBindingEnergy(G4lrint(A), G4lrint(Z));
    5959  G4double nucleusMass = Z*proton_mass_c2+(A-Z)*neutron_mass_c2+bindingEnergy;
    6060  G4double reducedMass = mass*nucleusMass/(mass+nucleusMass);

  • trunk/source/processes/hadronic/models/binary_cascade/src/G4KaonMinusField.cc

    r819 r962  
    3737// -------------------------------------------------------------------
    3838#include "G4KaonMinusField.hh"
    39 #include "G4NucleiPropertiesTable.hh"
     39#include "G4NucleiProperties.hh"
    4040#include "G4VNuclearDensity.hh"
    4141#include "G4FermiMomentum.hh"
    … …  
    8585  G4double A = theNucleus->GetMassNumber();
    8686  G4double Z = theNucleus->GetCharge();
    87   G4double bindingEnergy = G4NucleiPropertiesTable::GetBindingEnergy(G4lrint(Z), G4lrint(A));
     87  G4double bindingEnergy = G4NucleiProperties::GetBindingEnergy(G4lrint(A), G4lrint(Z));
    8888  G4double nucleusMass = Z*proton_mass_c2+(A-Z)*neutron_mass_c2+bindingEnergy;
    8989  G4double reducedMass = kaonMass*nucleusMass/(kaonMass+nucleusMass);

  • trunk/source/processes/hadronic/models/binary_cascade/src/G4KaonPlusField.cc

    r819 r962  
    3737// -------------------------------------------------------------------
    3838#include "G4KaonPlusField.hh"
    39 #include "G4NucleiPropertiesTable.hh"
     39#include "G4NucleiProperties.hh"
    4040#include "G4VNuclearDensity.hh"
    4141#include "G4FermiMomentum.hh"
    … …  
    8585  G4double A = theNucleus->GetMassNumber();
    8686  G4double Z = theNucleus->GetCharge();
    87   G4double bindingEnergy = G4NucleiPropertiesTable::GetBindingEnergy(G4lrint(Z), G4lrint(A));
     87  G4double bindingEnergy = G4NucleiProperties::GetBindingEnergy(G4lrint(A), G4lrint(Z));
    8888  G4double nucleusMass = Z*proton_mass_c2+(A-Z)*neutron_mass_c2+bindingEnergy;
    8989  G4double reducedMass = kaonMass*nucleusMass/(kaonMass+nucleusMass);

  • trunk/source/processes/hadronic/models/binary_cascade/src/G4KaonZeroField.cc

    r819 r962  
    3737// -------------------------------------------------------------------
    3838#include "G4KaonZeroField.hh"
    39 #include "G4NucleiPropertiesTable.hh"
     39#include "G4NucleiProperties.hh"
    4040#include "G4VNuclearDensity.hh"
    4141#include "G4FermiMomentum.hh"
    … …  
    8585  G4double A = theNucleus->GetMassNumber();
    8686  G4double Z = theNucleus->GetCharge();
    87   G4double bindingEnergy = G4NucleiPropertiesTable::GetBindingEnergy(G4lrint(Z), G4lrint(A));
     87  G4double bindingEnergy = G4NucleiProperties::GetBindingEnergy(G4lrint(A), G4lrint(Z));
    8888  G4double nucleusMass = Z*proton_mass_c2+(A-Z)*neutron_mass_c2+bindingEnergy;
    8989  G4double reducedMass = kaonMass*nucleusMass/(kaonMass+nucleusMass);

  • trunk/source/processes/hadronic/models/binary_cascade/src/G4PionMinusField.cc

    r819 r962  
    3737// -------------------------------------------------------------------
    3838#include "G4PionMinusField.hh"
    39 #include "G4NucleiPropertiesTable.hh"
     39#include "G4NucleiProperties.hh"
    4040#include "G4VNuclearDensity.hh"
    4141#include "G4FermiMomentum.hh"
    … …  
    8383  G4double Z = theNucleus->GetCharge();
    8484  G4double pionMinusMass = G4PionMinus::PionMinus()->GetPDGMass();
    85   G4double bindingEnergy = G4NucleiPropertiesTable::GetBindingEnergy(G4lrint(Z), G4lrint(A));
     85  G4double bindingEnergy = G4NucleiProperties::GetBindingEnergy(G4lrint(A), G4lrint(Z));
    8686  G4double nucleusMass = Z*proton_mass_c2+(A-Z)*neutron_mass_c2+bindingEnergy;
    8787  G4double reducedMass = pionMinusMass*nucleusMass/(pionMinusMass+nucleusMass);

  • trunk/source/processes/hadronic/models/binary_cascade/src/G4PionPlusField.cc

    r819 r962  
    3737// -------------------------------------------------------------------
    3838#include "G4PionPlusField.hh"
    39 #include "G4NucleiPropertiesTable.hh"
     39#include "G4NucleiProperties.hh"
    4040#include "G4VNuclearDensity.hh"
    4141#include "G4FermiMomentum.hh"
    … …  
    8585  G4double A = theNucleus->GetMassNumber();
    8686  G4double Z = theNucleus->GetCharge();
    87   G4double bindingEnergy = G4NucleiPropertiesTable::GetBindingEnergy(G4lrint(Z), G4lrint(A));
     87  G4double bindingEnergy = G4NucleiProperties::GetBindingEnergy(G4lrint(A), G4lrint(Z));
    8888  G4double nucleusMass = Z*proton_mass_c2+(A-Z)*neutron_mass_c2+bindingEnergy;
    8989  G4double reducedMass = pionPlusMass*nucleusMass/(pionPlusMass+nucleusMass);

  • trunk/source/processes/hadronic/models/binary_cascade/src/G4PionZeroField.cc

    r819 r962  
    3737// -------------------------------------------------------------------
    3838#include "G4PionZeroField.hh"
    39 #include "G4NucleiPropertiesTable.hh"
     39#include "G4NucleiProperties.hh"
    4040#include "G4VNuclearDensity.hh"
    4141#include "G4FermiMomentum.hh"
    … …  
    8585  G4double Z = theNucleus->GetCharge();
    8686
    87   G4double bindingEnergy = G4NucleiPropertiesTable::GetBindingEnergy(G4lrint(Z), G4lrint(A));
     87  G4double bindingEnergy = G4NucleiProperties::GetBindingEnergy(G4lrint(A), G4lrint(Z));
    8888  G4double nucleusMass = Z*proton_mass_c2+(A-Z)*neutron_mass_c2+bindingEnergy;
    8989  G4double reducedMass = pionZeroMass*nucleusMass/(pionZeroMass+nucleusMass);

  • trunk/source/processes/hadronic/models/binary_cascade/src/G4SigmaMinusField.cc

    r819 r962  
    3737// -------------------------------------------------------------------
    3838#include "G4SigmaMinusField.hh"
    39 #include "G4NucleiPropertiesTable.hh"
     39#include "G4NucleiProperties.hh"
    4040#include "G4VNuclearDensity.hh"
    4141#include "G4FermiMomentum.hh"
    … …  
    8484  G4double A = theNucleus->GetMassNumber();
    8585  G4double Z = theNucleus->GetCharge();
    86   G4double bindingEnergy = G4NucleiPropertiesTable::GetBindingEnergy(G4lrint(Z), G4lrint(A));
     86  G4double bindingEnergy = G4NucleiProperties::GetBindingEnergy(G4lrint(A), G4lrint(Z));
    8787  G4double nucleusMass = Z*proton_mass_c2+(A-Z)*neutron_mass_c2+bindingEnergy;
    8888  G4double reducedMass = sigmaMinusMass*nucleusMass/(sigmaMinusMass+nucleusMass);

  • trunk/source/processes/hadronic/models/binary_cascade/src/G4SigmaPlusField.cc

    r819 r962  
    3737// -------------------------------------------------------------------
    3838#include "G4SigmaPlusField.hh"
    39 #include "G4NucleiPropertiesTable.hh"
     39#include "G4NucleiProperties.hh"
    4040#include "G4VNuclearDensity.hh"
    4141#include "G4FermiMomentum.hh"
    … …  
    8585  G4double A = theNucleus->GetMassNumber();
    8686  G4double Z = theNucleus->GetCharge();
    87   G4double bindingEnergy = G4NucleiPropertiesTable::GetBindingEnergy(G4lrint(Z), G4lrint(A));
     87  G4double bindingEnergy = G4NucleiProperties::GetBindingEnergy(G4lrint(A), G4lrint(Z));
    8888  G4double nucleusMass = Z*proton_mass_c2+(A-Z)*neutron_mass_c2+bindingEnergy;
    8989  G4double reducedMass = sigmaPlusMass*nucleusMass/(sigmaPlusMass+nucleusMass);

  • trunk/source/processes/hadronic/models/binary_cascade/src/G4SigmaZeroField.cc

    r819 r962  
    3737// -------------------------------------------------------------------
    3838#include "G4SigmaZeroField.hh"
    39 #include "G4NucleiPropertiesTable.hh"
     39#include "G4NucleiProperties.hh"
    4040#include "G4VNuclearDensity.hh"
    4141#include "G4FermiMomentum.hh"
    … …  
    8585  G4double A = theNucleus->GetMassNumber();
    8686  G4double Z = theNucleus->GetCharge();
    87   G4double bindingEnergy = G4NucleiPropertiesTable::GetBindingEnergy(G4lrint(Z), G4lrint(A));
     87  G4double bindingEnergy = G4NucleiProperties::GetBindingEnergy(G4lrint(A), G4lrint(Z));
    8888  G4double nucleusMass = Z*proton_mass_c2+(A-Z)*neutron_mass_c2+bindingEnergy;
    8989  G4double reducedMass = sigmaZeroMass*nucleusMass/(sigmaZeroMass+nucleusMass);
Note: See TracChangeset for help on using the changeset viewer.