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

update processes

Location:
trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface
Files:
59 edited

Legend:

Unmodified
Added
Removed

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/History

    r819 r962  
    1313     ---------------------------------------------------------------
    1414
    15 07-May-2008 Gabriele Cosmo             (hadr-chips-inter-V09-00-13)
     1506-Feb-2009 V.Ivanchenko (hadr-chips-inter-V09-02-01)
     16------------------------------------------------------
     17
     1823-Jan-2009 V.Ivanchenko (hadr-chips-inter-V09-02-00)
     19------------------------------------------------------
     20- added deregistration in destructor of G4QCaptureAtRest
     21- added string decay destruction to G4ElectroNuclearReaction
     22
     2324-Oct-2008 Dennis Wright (hadr-chips-inter-V09-01-09)
     24------------------------------------------------------
     25- replace G4NucleiPropertiesTable::IsInTable with
     26  G4NucleiProperties::IsInStableTable in G4QElectronNuclearCrossSection,
     27  G4QMuonNuclearCrossSection, G4QPhotonNuclearCrossSection,
     28  G4QTauNuclearCrossSection
     29
     30 2-Oct-2008 Dennis Wright (hadr-chips-inter-V09-01-08)
     31------------------------------------------------------
     32- change process type integer from 15 to fHadronAtRest for
     33  G4PionMinusNuclearAtRestChips, G4ProtonAntiProtonAtRestChips,
     34  G4QCaptureAtRest
     35
     36- change process type integer from 16 to enum fChargeExchange for
     37  G4QCoherentChargeExchange
     38
     39- change process type integer from 12 to enum fHadronInelastic for
     40  G4QCollision, G4QDiffraction, G4QGluonString, G4QLowEnergy
     41
     42- change process type integer from 11 to fHadronElastic for
     43  G4QElastic, G4QIonIonElastic
     44
     45- remove process type from G4QAtomicElectronScattering,
     46  G4QDiscProcessMixer.cc
     47
     48 1-Sep-2008 Vladimir Ivanchenko        (hadr-chips-inter-V09-01-07)
    1649-------------------------------------------------------------------
    17 - Tag for release 9.1.p02.
     50G4QCaptureAtRest - added registration in G4HadronicProcessStore
     51                   and PrintInfo by adding PreparePhysicsTable and
     52                   BuildPhysicsTable
     53G4GammaNuclearReaction - moved implementations from header to source
     54                         and added name "CHIPS"
     55G4ElectroNuclearReaction - moved instantiation of HE model to
     56                         constructor from run time and added name "CHIPS"
    1857
    19 06-May-2008 Dennis Wright              (hadr-chips-inter-V09-01-05)
     58 8-Jul-2008 Dennis Wright              (hadr-chips-inter-V09-01-06)
     59-------------------------------------------------------------------
     60- add G4QIonIonElastic from HEAD
     61- add general process type, fHadronic to several processes
     62- set process sub-type to 11 (elastic) for G4QElastic, G4QIonIonElastic
     63- set process sub-type to 12 (inelastic) for G4QCollision, G4QDiffraction,
     64    G4QGluonString, G4QLowEnergy
     65- set process sub-type to 13 (capture) for G4QCaptureAtRest
     66- set process sub-type to 15 (stopping) for G4PionMinusNuclearAtRestChips,
     67    G4ProtonAntiProtonAtRestChips
     68- set process sub-type to 16 (quasi-elastic) for G4QCoherentChargeExchange
     69- set process sub-type to 10 (unknown) for G4QAtomicElectronScattering,
     70    G4QDiscProcessMixer
     71
     72 6-May-2008 Dennis Wright              (hadr-chips-inter-V09-01-05)
    2073-------------------------------------------------------------------
    2174- replace max-- with --max at lines 1191, 1195, 1197 of G4Collison.cc

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4ChiralInvariantPhaseSpace.hh

    r819 r962  
    2525//
    2626#ifndef G4ChiralInvariantPhaseSpace_h
    27 #define G4ChiralInvariantPhaseSpace_h
     27#define G4ChiralInvariantPhaseSpace_h 1
    2828
    2929//

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4ElectroNuclearReaction.hh

    r819 r962  
    2626//
    2727//
    28 // $Id: G4ElectroNuclearReaction.hh,v 1.23 2006/06/29 20:07:46 gunter Exp $
    29 // GEANT4 tag $Name: $
     28// $Id: G4ElectroNuclearReaction.hh,v 1.26 2009/01/24 11:57:46 vnivanch Exp $
     29// GEANT4 tag $Name: geant4-09-02-ref-02 $
    3030//
    3131//
    … …  
    3535//
    3636#ifndef G4ElectroNuclearReaction_h
    37 #define G4ElectroNuclearReaction_h
     37#define G4ElectroNuclearReaction_h 1
    3838
    3939#include "globals.hh"
    … …  
    4242#include "G4ElectroNuclearCrossSection.hh"
    4343#include "G4PhotoNuclearCrossSection.hh"
     44#include "G4GammaParticipants.hh"
     45#include "G4QGSModel.hh"
     46#include "G4QGSMFragmentation.hh"
     47#include "G4Nucleus.hh"
     48#include "G4HadFinalState.hh"
     49#include "G4HadProjectile.hh"
    4450#include "G4Electron.hh"
    4551#include "G4Positron.hh"
    4652#include "G4Gamma.hh"
    47 #include "G4GammaParticipants.hh"
    48 #include "G4QGSModel.hh"
    4953#include "G4TheoFSGenerator.hh"
    5054#include "G4GeneratorPrecompoundInterface.hh"
    51 #include "G4QGSMFragmentation.hh"
    5255#include "G4ExcitedStringDecay.hh"
    53 
     56 
    5457class G4ElectroNuclearReaction : public G4HadronicInteraction
    5558{
    56   public:
    57     virtual ~G4ElectroNuclearReaction(){}
    58     G4ElectroNuclearReaction()
    59     {
    60       SetMinEnergy(0*GeV);
    61       SetMaxEnergy(30*TeV);
     59public:
     60
     61  G4ElectroNuclearReaction():G4HadronicInteraction("CHIPS")
     62  {
     63    SetMinEnergy(0*GeV);
     64    SetMaxEnergy(30*TeV);
    6265     
    63       theHEModel = new G4TheoFSGenerator;
    64       theCascade = new G4GeneratorPrecompoundInterface;
    65     }
     66    theHEModel = new G4TheoFSGenerator;
     67    theCascade = new G4GeneratorPrecompoundInterface;
     68    theHEModel->SetTransport(theCascade);
     69    theHEModel->SetHighEnergyGenerator(&theStringModel);
     70    theStringDecay = new G4ExcitedStringDecay(&theFragmentation);
     71    theStringModel.SetFragmentationModel(theStringDecay);
     72    theHEModel->SetMinEnergy(2.5*GeV);
     73    theHEModel->SetMaxEnergy(100*TeV);
     74  }
     75
     76  virtual ~G4ElectroNuclearReaction() {delete  theStringDecay;};
    6677   
    67     virtual G4HadFinalState* ApplyYourself(const G4HadProjectile& aTrack,
    68     G4Nucleus& aTargetNucleus);
    69 
    70   private:
    71     G4ChiralInvariantPhaseSpace theLEModel;
    72     G4TheoFSGenerator * theHEModel;
    73     G4GeneratorPrecompoundInterface * theCascade;
    74     G4QGSModel< G4GammaParticipants > theStringModel;
    75     G4QGSMFragmentation theFragmentation;
    76     G4ExcitedStringDecay * theStringDecay;
    77     G4ElectroNuclearCrossSection theElectronData;
    78     G4PhotoNuclearCrossSection thePhotonData;
    79     G4HadFinalState theResult;
     78  G4HadFinalState* ApplyYourself(const G4HadProjectile& aTrack,
     79                                 G4Nucleus& aTargetNucleus);
     80
     81private:
     82
     83  G4ChiralInvariantPhaseSpace theLEModel;
     84  G4TheoFSGenerator * theHEModel;
     85  G4GeneratorPrecompoundInterface * theCascade;
     86  G4QGSModel< G4GammaParticipants > theStringModel;
     87  G4QGSMFragmentation theFragmentation;
     88  G4ExcitedStringDecay * theStringDecay;
     89  G4ElectroNuclearCrossSection theElectronData;
     90  G4PhotoNuclearCrossSection thePhotonData;
     91  G4HadFinalState theResult;
    8092};
    8193
    82 inline G4HadFinalState* G4ElectroNuclearReaction::
    83 ApplyYourself(const G4HadProjectile& aTrack, G4Nucleus& aTargetNucleus)
     94inline   
     95G4HadFinalState* G4ElectroNuclearReaction::ApplyYourself(const G4HadProjectile& aTrack,
     96                                                         G4Nucleus& aTargetNucleus)
    8497{
    8598  theResult.Clear();
    … …  
    198211  {
    199212    // G4cout << "0) Getting a high energy electro-nuclear reaction"<<G4endl;
    200     theHEModel->SetTransport(theCascade);
    201     theHEModel->SetHighEnergyGenerator(&theStringModel);
    202     theStringDecay = new G4ExcitedStringDecay(&theFragmentation);
    203     theStringModel.SetFragmentationModel(theStringDecay);
    204     theHEModel->SetMinEnergy(2.5*GeV);
    205     theHEModel->SetMaxEnergy(100*TeV);
    206 
    207213    G4HadFinalState * aResult = theHEModel->ApplyYourself(localTrack, aTargetNucleus);
    208214    for(G4int all = 0; all < aResult->GetNumberOfSecondaries(); all++)

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4GammaNuclearReaction.hh

    r819 r962  
    2525//
    2626//
    27 // $Id: G4GammaNuclearReaction.hh,v 1.13 2006/06/29 20:07:48 gunter Exp $
    28 // GEANT4 tag $Name: $
     27// $Id: G4GammaNuclearReaction.hh,v 1.14 2008/09/01 17:30:42 vnivanch Exp $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//
    … …  
    3232// Created: J.P. Wellisch, 2000/08/18
    3333// The last update: J.P. Wellisch, Thu Jun  6 2002.
     34// 01.09.2008 V.Ivanchenko move inline to source and define interaction name
    3435//
     36
    3537#ifndef G4GammaNuclearReaction_h
    36 #define G4GammaNuclearReaction_h
     38#define G4GammaNuclearReaction_h 1
    3739
    3840#include "globals.hh"
    3941#include "G4HadronicInteraction.hh"
    4042#include "G4ChiralInvariantPhaseSpace.hh"
    41 #include "G4Gamma.hh"
    4243
    4344class G4GammaNuclearReaction : public G4HadronicInteraction
    4445{
    45   public:
    46     virtual ~G4GammaNuclearReaction()
    47     {
    48     }
     46public:
     47
     48  G4GammaNuclearReaction();
     49
     50  virtual ~G4GammaNuclearReaction();
    4951   
    50     virtual G4HadFinalState* ApplyYourself(const G4HadProjectile& aTrack,
    51     G4Nucleus& aTargetNucleus);
     52  virtual G4HadFinalState* ApplyYourself(const G4HadProjectile& aTrack,
     53                                        G4Nucleus& aTargetNucleus);
    5254
    53   private:
    54     G4ChiralInvariantPhaseSpace theModel;
     55private:
     56
     57  G4ChiralInvariantPhaseSpace theModel;
     58
    5559};
    5660
    57 inline
    58 G4HadFinalState * G4GammaNuclearReaction::
    59 ApplyYourself(const G4HadProjectile& aTrack, G4Nucleus& aTargetNucleus)
    60 {
    61   if(aTrack.GetDefinition() != G4Gamma::GammaDefinition())
    62   {
    63     throw G4HadronicException(__FILE__, __LINE__, "Called G4GammaNuclearReaction for particle other than gamma");
    64   }
    65   return theModel.ApplyYourself(aTrack, aTargetNucleus);
    66 }
    67 
    6861#endif

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4PionMinusNuclearAtRestChips.hh

    r819 r962  
    3232#include "G4PionMinus.hh"
    3333#include "G4ChiralInvariantPhaseSpace.hh"
     34#include "G4HadronicProcessType.hh"
    3435
    3536class G4PionMinusNuclearAtRestChips : public G4VRestProcess
    … …  
    4344 
    4445     G4PionMinusNuclearAtRestChips(const G4String& processName ="PionMinusAnnihilationAtRest")
    45       : G4VRestProcess (processName) {}
     46      : G4VRestProcess (processName, fHadronic)
     47     {
     48       SetProcessSubType(fHadronAtRest);
     49     }
    4650 
    4751    ~G4PionMinusNuclearAtRestChips() {}

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4ProtonAntiProtonAtRestChips.hh

    r819 r962  
    3939#include "G4StopElementSelector.hh"
    4040#include "G4ChiralInvariantPhaseSpace.hh"
     41#include "G4HadronicProcessType.hh"
    4142
    4243class G4ProtonAntiProtonAtRestChips : public G4VRestProcess
    … …  
    5051 
    5152     G4ProtonAntiProtonAtRestChips(const G4String& processName ="AntiProtonAnnihilationAtRest")
    52       : G4VRestProcess (processName) {}
     53      : G4VRestProcess (processName, fHadronic)
     54     {
     55       SetProcessSubType(fHadronAtRest);
     56     }
    5357 
    5458    ~G4ProtonAntiProtonAtRestChips() {}

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QANuANuNuclearCrossSection.hh

    r819 r962  
    2626//
    2727// $Id: G4QANuANuNuclearCrossSection.hh,v 1.1 2007/11/01 16:09:38 mkossov Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QANuENuclearCrossSection.hh

    r819 r962  
    2626//
    2727// $Id: G4QANuENuclearCrossSection.hh,v 1.1 2007/10/02 10:00:37 mkossov Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QANuMuNuclearCrossSection.hh

    r819 r962  
    2626//
    2727// $Id: G4QANuMuNuclearCrossSection.hh,v 1.6 2006/12/01 10:57:46 mkossov Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QAtomicElectronScattering.hh

    r819 r962  
    2525//
    2626// $Id: G4QAtomicElectronScattering.hh,v 1.2 2006/12/13 15:45:16 gunter Exp $
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2828//
    2929//      ---------------- G4QAtomicElectronScattering header ----------------

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QCaptureAtRest.hh

    r819 r962  
    2424// ********************************************************************
    2525//
    26 // $Id: G4QCaptureAtRest.hh,v 1.3 2007/02/09 09:33:28 mkossov Exp $
    27 // GEANT4 tag $Name: $
     26// $Id: G4QCaptureAtRest.hh,v 1.6 2008/10/02 21:10:07 dennis Exp $
     27// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2828//
    2929//      ---------------- G4QCaptureAtRest header ----------------
    … …  
    9494#include "G4ThreeVector.hh"
    9595#include "G4LorentzVector.hh"
     96#include "G4HadronicProcessType.hh"
    9697
    9798// CHIPS Headers
    … …  
    118119
    119120  // Destructor
    120   ~G4QCaptureAtRest();
     121  virtual ~G4QCaptureAtRest();
    121122
    122   G4bool IsApplicable(const G4ParticleDefinition& particle);
     123  virtual G4bool IsApplicable(const G4ParticleDefinition& particle);
     124
     125  virtual void PreparePhysicsTable(const G4ParticleDefinition&);
     126
     127  virtual void BuildPhysicsTable(const G4ParticleDefinition&);
    123128
    124129  G4VParticleChange* AtRestDoIt(const G4Track& aTrack, const G4Step& aStep);

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QCoherentChargeExchange.hh

    r819 r962  
    2424// ********************************************************************
    2525//
    26 // $Id: G4QCoherentChargeExchange.hh,v 1.4 2007/08/09 13:04:37 mkossov Exp $
    27 // GEANT4 tag $Name: $
     26// $Id: G4QCoherentChargeExchange.hh,v 1.5 2008/10/02 21:10:07 dennis Exp $
     27// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2828//
    2929//      ---------------- G4QCoherentChargeExchange header ----------------
    … …  
    5656#include "G4ThreeVector.hh"
    5757#include "G4LorentzVector.hh"
     58#include "G4HadronicProcessType.hh"
    5859
    5960// CHIPS Headers

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QCollision.hh

    r819 r962  
    2424// ********************************************************************
    2525//
    26 // $Id: G4QCollision.hh,v 1.10 2007/11/01 16:09:38 mkossov Exp $
    27 // GEANT4 tag $Name: $
     26// $Id: G4QCollision.hh,v 1.11 2008/10/02 21:10:07 dennis Exp $
     27// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2828//
    2929//      ---------------- G4QCollision header ----------------
    … …  
    8585#include "G4ThreeVector.hh"
    8686#include "G4LorentzVector.hh"
     87#include "G4HadronicProcessType.hh"
    8788
    8889// CHIPS Headers

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QDiffraction.hh

    r819 r962  
    2424// ********************************************************************
    2525//
    26 // $Id: G4QDiffraction.hh,v 1.1 2007/08/23 15:58:43 mkossov Exp $
    27 // GEANT4 tag $Name: $
     26// $Id: G4QDiffraction.hh,v 1.2 2008/10/02 21:10:07 dennis Exp $
     27// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2828//
    2929//      ---------------- G4QDiffraction header ----------------
    … …  
    5454#include "G4ThreeVector.hh"
    5555#include "G4LorentzVector.hh"
     56#include "G4HadronicProcessType.hh"
    5657
    5758// CHIPS Headers

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QDiffractionRatio.hh

    r819 r962  
    2525//
    2626//
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2828//
    2929//

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QDiscProcessMixer.hh

    r819 r962  
    2424// ********************************************************************
    2525//
    26 // $Id: G4QDiscProcessMixer.hh,v 1.2 2007/08/31 09:36:57 mkossov Exp $
    27 // GEANT4 tag $Name: $
     26// $Id: G4QDiscProcessMixer.hh,v 1.3 2008/07/09 19:45:09 dennis Exp $
     27// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2828//
    2929//      ---------------- G4QDiscProcessMixer header ----------------
    … …  
    6767  G4QDiscProcessMixer(const G4String& processName = "Mixed Discrete Process",
    6868                      const G4ParticleDefinition* proj = G4Gamma::Gamma(),
    69                       G4ProcessType pType = fNotDefined );
     69                      G4ProcessType pType = fHadronic );
    7070
    7171  // Destructor

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QDiscreteProcessVector.hh

    r819 r962  
    2626//
    2727// $Id: G4QDiscreteProcessVector.hh,v 1.1 2007/08/28 15:48:15 mkossov Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//      ---------------- G4QDiscreteProcessVector ----------------

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QElastic.hh

    r819 r962  
    2424// ********************************************************************
    2525//
    26 // $Id: G4QElastic.hh,v 1.3 2007/05/23 15:14:25 mkossov Exp $
    27 // GEANT4 tag $Name: $
     26// $Id: G4QElastic.hh,v 1.4 2008/10/02 21:10:07 dennis Exp $
     27// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2828//
    2929//      ---------------- G4QElastic header ----------------
    … …  
    5656#include "G4ThreeVector.hh"
    5757#include "G4LorentzVector.hh"
     58#include "G4HadronicProcessType.hh"
    5859
    5960// CHIPS Headers

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QElasticCrossSection.hh

    r819 r962  
    2525//
    2626//
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2828//
    2929//

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QElectronNuclearCrossSection.hh

    r819 r962  
    2525//
    2626//
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2828//
    2929//
    … …  
    4141#include "G4ParticleTable.hh"
    4242#include "G4NucleiProperties.hh"
    43 #include "G4NucleiPropertiesTable.hh"
    4443#include <vector>
    4544#include "Randomize.hh"

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QGluonString.hh

    r819 r962  
    2424// ********************************************************************
    2525//
    26 // $Id: G4QGluonString.hh,v 1.1 2006/10/30 10:33:38 mkossov Exp $
    27 // GEANT4 tag $Name: $
     26// $Id: G4QGluonString.hh,v 1.2 2008/10/02 21:10:07 dennis Exp $
     27// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2828//
    2929//      ---------------- G4QGluonString header ----------------
    … …  
    6262#include "G4ThreeVector.hh"
    6363#include "G4LorentzVector.hh"
     64#include "G4HadronicProcessType.hh"
    6465
    6566// CHIPS Headers

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QIonIonCrossSection.hh

    r819 r962  
    2525//
    2626//
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2828//
    2929//

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QLowEnergy.hh

    r819 r962  
    2424// ********************************************************************
    2525//
    26 // $Id: G4QLowEnergy.hh,v 1.3 2007/11/15 09:36:43 mkossov Exp $
    27 // GEANT4 tag $Name: $
     26// $Id: G4QLowEnergy.hh,v 1.4 2008/10/02 21:10:07 dennis Exp $
     27// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2828//
    2929//      ---------------- G4QLowEnergy header ----------------
    … …  
    5555#include "G4ThreeVector.hh"
    5656#include "G4LorentzVector.hh"
     57#include "G4HadronicProcessType.hh"
    5758
    5859// CHIPS Headers

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QMuonNuclearCrossSection.hh

    r819 r962  
    2525//
    2626//
    27 // $Id: G4QMuonNuclearCrossSection.hh,v 1.5 2006/12/01 10:57:46 mkossov Exp $
    28 // GEANT4 tag $Name: $
     27// $Id: G4QMuonNuclearCrossSection.hh,v 1.6 2008/10/24 19:23:25 dennis Exp $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//
    … …  
    4545#include "G4ParticleTable.hh"
    4646#include "G4NucleiProperties.hh"
    47 #include "G4NucleiPropertiesTable.hh"
    4847#include <vector>
    4948#include "Randomize.hh"

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QNeutronNuclearCrossSection.hh

    r819 r962  
    2525//
    2626//
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2828//
    2929//

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QNuENuclearCrossSection.hh

    r819 r962  
    2626//
    2727// $Id: G4QNuENuclearCrossSection.hh,v 1.1 2007/10/02 10:00:37 mkossov Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QNuMuNuclearCrossSection.hh

    r819 r962  
    2626//
    2727// $Id: G4QNuMuNuclearCrossSection.hh,v 1.6 2006/12/01 10:57:46 mkossov Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QNuNuNuclearCrossSection.hh

    r819 r962  
    2626//
    2727// $Id: G4QNuNuNuclearCrossSection.hh,v 1.1 2007/11/01 16:09:38 mkossov Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QPhotonNuclearCrossSection.hh

    r819 r962  
    2525//
    2626//
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2828//
    2929//
    … …  
    4242#include "G4ParticleTable.hh"
    4343#include "G4NucleiProperties.hh"
    44 #include "G4NucleiPropertiesTable.hh"
    4544#include <vector>
    4645#include "G4VQCrossSection.hh"

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QProtonNuclearCrossSection.hh

    r819 r962  
    2525//
    2626//
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2828//
    2929//

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QTauNuclearCrossSection.hh

    r819 r962  
    2525//
    2626//
    27 // $Id: G4QTauNuclearCrossSection.hh,v 1.5 2006/12/01 10:57:46 mkossov Exp $
    28 // GEANT4 tag $Name: $
     27// $Id: G4QTauNuclearCrossSection.hh,v 1.6 2008/10/24 19:23:48 dennis Exp $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//
    … …  
    4545#include "G4ParticleTable.hh"
    4646#include "G4NucleiProperties.hh"
    47 #include "G4NucleiPropertiesTable.hh"
    4847#include <vector>
    4948#include "Randomize.hh"

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4QuasiFreeRatios.hh

    r819 r962  
    2525//
    2626//
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2828//
    2929//

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/include/G4VQCrossSection.hh

    r819 r962  
    2626//
    2727// $Id: G4VQCrossSection.hh,v 1.9 2007/11/15 09:36:43 mkossov Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QANuANuNuclearCrossSection.cc

    r819 r962  
    2626//
    2727// $Id: G4QANuANuNuclearCrossSection.cc,v 1.2 2007/11/02 15:57:16 mkossov Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QANuENuclearCrossSection.cc

    r819 r962  
    2626//
    2727// $Id: G4QANuENuclearCrossSection.cc,v 1.2 2007/11/01 16:09:38 mkossov Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QANuMuNuclearCrossSection.cc

    r819 r962  
    2626//
    2727// $Id: G4QANuMuNuclearCrossSection.cc,v 1.11 2007/11/01 16:09:38 mkossov Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QAtomicElectronScattering.cc

    r819 r962  
    2424// ********************************************************************
    2525//
    26 // $Id: G4QAtomicElectronScattering.cc,v 1.2 2006/12/13 15:45:19 gunter Exp $
    27 // GEANT4 tag $Name: $
     26// $Id: G4QAtomicElectronScattering.cc,v 1.4 2008/10/02 21:10:07 dennis Exp $
     27// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2828//
    2929//      ---------------- G4QAtomicElectronScattering class -----------------
    … …  
    4141
    4242G4QAtomicElectronScattering::G4QAtomicElectronScattering(const G4String& processName):
    43  G4VDiscreteProcess(processName)
     43 G4VDiscreteProcess(processName, fElectromagnetic)
    4444{
    4545#ifdef debug

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QCaptureAtRest.cc

    r819 r962  
    2424// ********************************************************************
    2525//
    26 // $Id: G4QCaptureAtRest.cc,v 1.13 2007/10/02 10:00:37 mkossov Exp $
    27 // GEANT4 tag $Name: $
     26// $Id: G4QCaptureAtRest.cc,v 1.19 2009/01/24 11:57:46 vnivanch Exp $
     27// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2828//
    2929//      ---------------- G4QCaptureAtRest class -----------------
    … …  
    4141
    4242#include "G4QCaptureAtRest.hh"
     43#include "G4HadronicProcessStore.hh"
    4344
    4445G4QCaptureAtRest::G4QCaptureAtRest(const G4String& processName)
    45   : G4VRestProcess(processName), Time(0.), EnergyDeposition(0.)
     46  : G4VRestProcess(processName, fHadronic), Time(0.), EnergyDeposition(0.)
    4647{
     48  SetProcessSubType(fCapture);
    4749#ifdef debug
    4850  G4cout<<"G4QCaptureAtRest::Constructor is called"<<G4endl;
    … …  
    5456  G4Quasmon::SetParameters(Temperature,SSin2Gluons,EtaEtaprime);  // Hadronic parameters
    5557  G4QEnvironment::SetParameters(SolidAngle); // SolAngle of pbar-A secondary mesons capture
     58  G4HadronicProcessStore::Instance()->RegisterExtraProcess(this);
    5659}
    5760
    … …  
    102105
    103106G4QCaptureAtRest::~G4QCaptureAtRest()
    104 {}
     107{
     108  // deregister in the store
     109  G4HadronicProcessStore::Instance()->DeRegisterExtraProcess(this);
     110}
    105111
    106112G4LorentzVector G4QCaptureAtRest::GetEnegryMomentumConservation()
    … …  
    131137#endif
    132138  return false;
     139}
     140
     141void G4QCaptureAtRest::PreparePhysicsTable(const G4ParticleDefinition& p)
     142{
     143  G4HadronicProcessStore::Instance()->RegisterParticleForExtraProcess(this, &p);
     144}
     145
     146void G4QCaptureAtRest::BuildPhysicsTable(const G4ParticleDefinition& p)
     147{
     148  G4HadronicProcessStore::Instance()->PrintInfo(&p);
    133149}
    134150

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QCoherentChargeExchange.cc

    r819 r962  
    2424// ********************************************************************
    2525//
    26 // $Id: G4QCoherentChargeExchange.cc,v 1.5 2007/10/02 10:00:37 mkossov Exp $
    27 // GEANT4 tag $Name: $
     26// $Id: G4QCoherentChargeExchange.cc,v 1.7 2008/10/02 21:10:07 dennis Exp $
     27// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2828//
    2929//      ---------------- G4QCoherentChargeExchange class -----------------
    … …  
    5252// Constructor
    5353G4QCoherentChargeExchange::G4QCoherentChargeExchange(const G4String& processName)
    54   : G4VDiscreteProcess(processName)
     54  : G4VDiscreteProcess(processName, fHadronic)
    5555{
    5656#ifdef debug
    … …  
    5858#endif
    5959  if (verboseLevel>0) G4cout << GetProcessName() << " process is created "<< G4endl;
    60 
     60  SetProcessSubType(fChargeExchange);
    6161  //G4QCHIPSWorld::Get()->GetParticles(nPartCWorld); // Create CHIPS World (234 part. max)
    6262}

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QCollision.cc

    r819 r962  
    2424// ********************************************************************
    2525//
    26 // $Id: G4QCollision.cc,v 1.24.2.2 2008/05/07 13:47:31 gcosmo Exp $
    27 // GEANT4 tag $Name: geant4-09-01-patch-02 $
     26// $Id: G4QCollision.cc,v 1.28 2008/10/02 21:10:07 dennis Exp $
     27// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2828//
    2929//      ---------------- G4QCollision class -----------------
    … …  
    4848std::vector<std::vector<G4double>*>G4QCollision::IsoProbInEl;//SumProbabIsotopes inElementI
    4949
    50 G4QCollision::G4QCollision(const G4String& processName) : G4VDiscreteProcess(processName)
     50G4QCollision::G4QCollision(const G4String& processName):
     51 G4VDiscreteProcess(processName, fHadronic)
    5152{
    5253#ifdef debug
    … …  
    5455#endif
    5556  if (verboseLevel>0) G4cout << GetProcessName() << " process is created "<< G4endl;
    56 
     57  SetProcessSubType(fHadronInelastic);
    5758  //G4QCHIPSWorld::Get()->GetParticles(nPartCWorld); // Create CHIPSWorld (234 part.max)
    5859  G4QNucleus::SetParameters(freeNuc,freeDib,clustProb,mediRatio); // Clusterization param's

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QDiffraction.cc

    r819 r962  
    2424// ********************************************************************
    2525//
    26 // $Id: G4QDiffraction.cc,v 1.3 2007/10/02 10:00:37 mkossov Exp $
    27 // GEANT4 tag $Name: $
     26// $Id: G4QDiffraction.cc,v 1.5 2008/10/02 21:10:07 dennis Exp $
     27// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2828//
    2929//      ---------------- G4QDiffraction class -----------------
    … …  
    5151
    5252// Constructor
    53 G4QDiffraction::G4QDiffraction(const G4String& processName):G4VDiscreteProcess(processName)
     53G4QDiffraction::G4QDiffraction(const G4String& processName):
     54 G4VDiscreteProcess(processName, fHadronic)
    5455{
    5556#ifdef debug
    … …  
    5758#endif
    5859  if (verboseLevel>0) G4cout << GetProcessName() << " process is created "<< G4endl;
    59 
     60  SetProcessSubType(fHadronInelastic);
    6061  G4QCHIPSWorld::Get()->GetParticles(nPartCWorld); // Create CHIPS World (234 part. max)
    6162}

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QDiffractionRatio.cc

    r819 r962  
    2525//
    2626//
    27 // $Id: G4QDiffractionRatio.cc,v 1.7.2.1 2008/04/23 14:57:21 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-01-patch-02 $
     27// $Id: G4QDiffractionRatio.cc,v 1.9 2008/03/21 21:40:08 dennis Exp $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QDiscProcessMixer.cc

    r819 r962  
    2424// ********************************************************************
    2525//
    26 // $Id: G4QDiscProcessMixer.cc,v 1.2 2007/08/31 09:36:57 mkossov Exp $
    27 // GEANT4 tag $Name: $
     26// $Id: G4QDiscProcessMixer.cc,v 1.4 2008/10/02 21:10:07 dennis Exp $
     27// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2828//
    2929//      ---------------- G4QDiscProcessMixer class -----------------

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QElastic.cc

    r819 r962  
    2424// ********************************************************************
    2525//
    26 // $Id: G4QElastic.cc,v 1.25 2007/11/15 09:36:43 mkossov Exp $
    27 // GEANT4 tag $Name: $
     26// $Id: G4QElastic.cc,v 1.27 2008/10/02 21:10:07 dennis Exp $
     27// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2828//
    2929//      ---------------- G4QElastic class -----------------
    … …  
    5151
    5252// Constructor
    53 G4QElastic::G4QElastic(const G4String& processName) : G4VDiscreteProcess(processName)
     53G4QElastic::G4QElastic(const G4String& processName):
     54 G4VDiscreteProcess(processName, fHadronic)
    5455{
    5556#ifdef debug
    … …  
    5758#endif
    5859  if (verboseLevel>0) G4cout << GetProcessName() << " process is created "<< G4endl;
    59 
     60  SetProcessSubType(fHadronElastic);
    6061  //G4QCHIPSWorld::Get()->GetParticles(nPartCWorld); // Create CHIPS World (234 part. max)
    6162}

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QElasticCrossSection.cc

    r819 r962  
    2525//
    2626//
    27 // $Id: G4QElasticCrossSection.cc,v 1.33.2.1 2008/04/23 14:57:21 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-01-patch-02 $
     27// $Id: G4QElasticCrossSection.cc,v 1.36 2008/03/21 21:42:44 dennis Exp $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QElectronNuclearCrossSection.cc

    r819 r962  
    2525//
    2626//
    27 // $Id: G4QElectronNuclearCrossSection.cc,v 1.11.10.1 2008/04/23 14:57:22 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-01-patch-02 $
     27// $Id: G4QElectronNuclearCrossSection.cc,v 1.13 2008/10/24 19:25:41 dennis Exp $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//
    … …  
    267267  //G4double mT= G4QPDGCode(111).GetNuclMass(Z,N,0);
    268268  G4double mT= 0.;
    269   if(G4NucleiPropertiesTable::IsInTable(Z,A))
    270                                             mT=G4NucleiProperties::GetNuclearMass(A,Z)/MeV;
     269  if(G4NucleiProperties::IsInStableTable(A,Z))
     270                               mT = G4NucleiProperties::GetNuclearMass(A,Z)/MeV;
    271271  else return 0.;       // If it is not in the Table of Stable Nuclei, then the Threshold=0
    272272  // ---------
    273273  G4double mP= infEn;
    274274  //if(Z) mP= G4QPDGCode(111).GetNuclMass(Z-1,N,0);
    275   if(Z&&G4NucleiPropertiesTable::IsInTable(Z-1,A-1))
    276             mP=G4NucleiProperties::GetNuclearMass(A-1.,Z-1.)/MeV; // ResNucMass for a proton
     275  if(Z&&G4NucleiProperties::IsInStableTable(A-1,Z-1))
     276            mP = G4NucleiProperties::GetNuclearMass(A-1.,Z-1.)/MeV; // ResNucMass for a proton
    277277  G4double mN= infEn;
    278278  //if(N) mN= G4QPDGCode(111).GetNuclMass(Z,N-1,0);
    279   if(N&&G4NucleiPropertiesTable::IsInTable(Z,A-1))
    280             mN=G4NucleiProperties::GetNuclearMass(A-1.,Z-0.)/MeV;  // ResNucMass for a neutron
     279  if(N&&G4NucleiProperties::IsInStableTable(A-1,Z))
     280            mN = G4NucleiProperties::GetNuclearMass(A-1.,Z-0.)/MeV;  // ResNucMass for a neutron
    281281
    282282  G4double mA= infEn;
    283   if(N>1&&Z>1&&G4NucleiPropertiesTable::IsInTable(Z-2,A-4))
    284             mA=G4NucleiProperties::GetNuclearMass(A-4.,Z-2.)/MeV; // ResNucMass for an alpha
     283  if(N>1&&Z>1&&G4NucleiProperties::IsInStableTable(A-4,Z-2))
     284            mA = G4NucleiProperties::GetNuclearMass(A-4.,Z-2.)/MeV; // ResNucMass for an alpha
    285285
    286286  G4double dP= mP +mProt - mT;

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QGluonString.cc

    r819 r962  
    2424// ********************************************************************
    2525//
    26 // $Id: G4QGluonString.cc,v 1.1 2006/10/30 10:33:38 mkossov Exp $
    27 // GEANT4 tag $Name: $
     26// $Id: G4QGluonString.cc,v 1.3 2008/10/02 21:10:07 dennis Exp $
     27// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2828//
    2929//      ---------------- G4QGluonString class -----------------
    … …  
    4747std::vector<std::vector<G4double>*>G4QGluonString::IsoProbInEl;//SumProbabIsotopeInElementI
    4848
    49 G4QGluonString::G4QGluonString(const G4String& processName):G4VDiscreteProcess(processName)
     49G4QGluonString::G4QGluonString(const G4String& processName):
     50 G4VDiscreteProcess(processName, fHadronic)
    5051{
    5152#ifdef debug
    … …  
    5354#endif
    5455  if (verboseLevel>0) G4cout<<GetProcessName()<<" process is created by CHIPS"<<G4endl;
    55 
     56  SetProcessSubType(fHadronInelastic);
    5657  G4QCHIPSWorld::Get()->GetParticles(nPartCWorld); // Create CHIPS World with 234 particles
    5758  G4QNucleus::SetParameters(freeNuc,freeDib,clustProb,mediRatio); // Clusterization param's

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QIonIonCrossSection.cc

    r819 r962  
    2626//
    2727// The lust update: M.V. Kossov, CERN/ITEP(Moscow) 19-Aug-07
    28 // GEANT4 tag $Name: geant4-09-01-patch-02 $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QLowEnergy.cc

    r819 r962  
    2424// ********************************************************************
    2525//
    26 // $Id: G4QLowEnergy.cc,v 1.4.2.1 2008/04/23 14:57:22 gcosmo Exp $
    27 // GEANT4 tag $Name: geant4-09-01-patch-02 $
     26// $Id: G4QLowEnergy.cc,v 1.7 2008/10/02 21:10:07 dennis Exp $
     27// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2828//
    2929//      ---------------- G4QLowEnergy class -----------------
    … …  
    5252// Constructor
    5353G4QLowEnergy::G4QLowEnergy(const G4String& processName):
    54   G4VDiscreteProcess(processName), evaporate(true)
     54  G4VDiscreteProcess(processName, fHadronic), evaporate(true)
    5555{
    5656#ifdef debug
    … …  
    5858#endif
    5959  if (verboseLevel>0) G4cout<<GetProcessName()<<" process is created "<<G4endl;
    60 
     60  SetProcessSubType(fHadronInelastic);
    6161  G4QCHIPSWorld::Get()->GetParticles(nPartCWorld); // Create CHIPS World (234 part. max)
    6262}

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QMuonNuclearCrossSection.cc

    r819 r962  
    2525//
    2626//
    27 // $Id: G4QMuonNuclearCrossSection.cc,v 1.11.10.1 2008/04/23 14:57:22 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-01-patch-02 $
     27// $Id: G4QMuonNuclearCrossSection.cc,v 1.13 2008/10/24 19:24:59 dennis Exp $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//
    … …  
    271271  //G4double mT= G4QPDGCode(111).GetNuclMass(Z,N,0);
    272272  G4double mT= 0.;
    273   if(G4NucleiPropertiesTable::IsInTable(Z,A))
    274                                             mT=G4NucleiProperties::GetNuclearMass(A,Z)/MeV;
     273  if(G4NucleiProperties::IsInStableTable(A,Z))
     274                            mT = G4NucleiProperties::GetNuclearMass(A,Z)/MeV;
    275275  else return 0.;       // If it is not in the Table of Stable Nuclei, then the Threshold=0
    276276  // --------- Splitting thresholds
    277277  G4double mP= infEn;
    278   if(Z&&G4NucleiPropertiesTable::IsInTable(Z-1,A-1))
    279             mP=G4NucleiProperties::GetNuclearMass(A-1.,Z-1.)/MeV; // ResNucMass for a proton
     278  if(Z&&G4NucleiProperties::IsInStableTable(A-1,Z-1))
     279            mP = G4NucleiProperties::GetNuclearMass(A-1.,Z-1.)/MeV; // ResNucMass for a proton
    280280
    281281  G4double mN= infEn;
    282   if(N&&G4NucleiPropertiesTable::IsInTable(Z-0,A-1))
    283             mN=G4NucleiProperties::GetNuclearMass(A-1.,Z-0.)/MeV;  // ResNucMass for a neutron
     282  if(N&&G4NucleiProperties::IsInStableTable(A-1,Z))
     283            mN = G4NucleiProperties::GetNuclearMass(A-1.,Z)/MeV;  // ResNucMass for a neutron
    284284
    285285  G4double mA= infEn;
    286   if(N>1&&Z>1&&G4NucleiPropertiesTable::IsInTable(Z-2,A-4))
     286  if(N>1&&Z>1&&G4NucleiProperties::IsInStableTable(A-4,Z-2))
    287287            mA=G4NucleiProperties::GetNuclearMass(A-4.,Z-2.)/MeV; // ResNucMass for an alpha
    288288

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QNeutronNuclearCrossSection.cc

    r819 r962  
    2626//
    2727// The lust update: M.V. Kossov, CERN/ITEP(Moscow) 17-June-02
    28 // GEANT4 tag $Name: geant4-09-01-patch-02 $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QNuENuclearCrossSection.cc

    r819 r962  
    2626//
    2727// $Id: G4QNuENuclearCrossSection.cc,v 1.2 2007/11/01 16:09:38 mkossov Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QNuMuNuclearCrossSection.cc

    r819 r962  
    2626//
    2727// $Id: G4QNuMuNuclearCrossSection.cc,v 1.12 2007/11/01 16:09:38 mkossov Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QNuNuNuclearCrossSection.cc

    r819 r962  
    2626//
    2727// $Id: G4QNuNuNuclearCrossSection.cc,v 1.2 2007/11/02 15:57:16 mkossov Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QPhotonNuclearCrossSection.cc

    r819 r962  
    2626//
    2727// The lust update: M.V. Kossov, CERN/ITEP(Moscow) 17-June-02
    28 // GEANT4 tag $Name: geant4-09-01-patch-02 $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//
    … …  
    262262  //G4double mT= G4QPDGCode(111).GetNuclMass(Z,N,0);
    263263  G4double mT= 0.;
    264   if(G4NucleiPropertiesTable::IsInTable(Z,A))
    265                                             mT=G4NucleiProperties::GetNuclearMass(A,Z)/MeV;
     264  if(G4NucleiProperties::IsInStableTable(A,Z))
     265                           mT = G4NucleiProperties::GetNuclearMass(A,Z)/MeV;
    266266  G4double mP= infEn;
    267   if(Z&&G4NucleiPropertiesTable::IsInTable(Z-1,A-1))
    268             mP=G4NucleiProperties::GetNuclearMass(A-1.,Z-1.)/MeV; // ResNucMass for a proton
     267  if(Z&&G4NucleiProperties::IsInStableTable(A-1,Z-1))
     268            mP = G4NucleiProperties::GetNuclearMass(A-1.,Z-1.)/MeV; // ResNucMass for a proton
    269269
    270270  G4double mN= infEn;
    271   if(N&&G4NucleiPropertiesTable::IsInTable(Z-0,A-1))
    272             mN=G4NucleiProperties::GetNuclearMass(A-1.,Z-0.)/MeV;  // ResNucMass for a neutron
     271  if(N&&G4NucleiProperties::IsInStableTable(A-1,Z))
     272            mN = G4NucleiProperties::GetNuclearMass(A-1.,Z)/MeV;  // ResNucMass for a neutron
    273273
    274274  G4double mA= infEn;
    275   if(N>1&&Z>1&&G4NucleiPropertiesTable::IsInTable(Z-2,A-4))
     275  if(N>1&&Z>1&&G4NucleiProperties::IsInStableTable(A-4,Z-2))
    276276            mA=G4NucleiProperties::GetNuclearMass(A-4.,Z-2.)/MeV; // ResNucMass for an alpha
    277277

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QProtonNuclearCrossSection.cc

    r819 r962  
    2626//
    2727// The lust update: M.V. Kossov, CERN/ITEP(Moscow) 17-June-02
    28 // GEANT4 tag $Name: geant4-09-01-patch-02 $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QTauNuclearCrossSection.cc

    r819 r962  
    2525//
    2626//
    27 // $Id: G4QTauNuclearCrossSection.cc,v 1.10 2006/12/04 10:44:22 mkossov Exp $
    28 // GEANT4 tag $Name: $
     27// $Id: G4QTauNuclearCrossSection.cc,v 1.11 2008/10/24 19:24:29 dennis Exp $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//
    … …  
    269269  //G4double mT= G4QPDGCode(111).GetNuclMass(Z,N,0);
    270270  G4double mT= 0.;
    271   if(G4NucleiPropertiesTable::IsInTable(Z,A))
    272                                             mT=G4NucleiProperties::GetNuclearMass(A,Z)/MeV;
     271  if(G4NucleiProperties::IsInStableTable(A,Z))
     272                             mT = G4NucleiProperties::GetNuclearMass(A,Z)/MeV;
    273273  else return 0.;       // If it is not in the Table of Stable Nuclei, then the Threshold=0
    274274  // --------- Splitting thresholds
    275275  G4double mP= infEn;
    276   if(Z&&G4NucleiPropertiesTable::IsInTable(Z-1,A-1))
    277             mP=G4NucleiProperties::GetNuclearMass(A-1.,Z-1.)/MeV; // ResNucMass for a proton
     276  if(Z&&G4NucleiProperties::IsInStableTable(A-1,Z-1))
     277            mP = G4NucleiProperties::GetNuclearMass(A-1.,Z-1.)/MeV; // ResNucMass for a proton
    278278
    279279  G4double mN= infEn;
    280   if(N&&G4NucleiPropertiesTable::IsInTable(Z,A-1))
    281             mN=G4NucleiProperties::GetNuclearMass(A-1.,Z-0.)/MeV;  // ResNucMass for a neutron
     280  if(N&&G4NucleiProperties::IsInStableTable(A-1,Z))
     281            mN = G4NucleiProperties::GetNuclearMass(A-1.,Z)/MeV;  // ResNucMass for a neutron
    282282
    283283  G4double mA= infEn;
    284   if(N>1&&Z>1&&G4NucleiPropertiesTable::IsInTable(Z-2,A-4))
    285             mA=G4NucleiProperties::GetNuclearMass(A-4.,Z-2.)/MeV; // ResNucMass for an alpha
     284  if(N>1&&Z>1&&G4NucleiProperties::IsInStableTable(A-4,Z-2))
     285            mA = G4NucleiProperties::GetNuclearMass(A-4.,Z-2.)/MeV; // ResNucMass for an alpha
    286286
    287287  G4double dP= mP +mProt - mT;

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4QuasiFreeRatios.cc

    r819 r962  
    2525//
    2626//
    27 // $Id: G4QuasiFreeRatios.cc,v 1.16.2.1 2008/04/23 14:57:22 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-01-patch-02 $
     27// $Id: G4QuasiFreeRatios.cc,v 1.19 2008/03/21 21:44:39 dennis Exp $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/interface/src/G4VQCrossSection.cc

    r819 r962  
    2626//
    2727// $Id: G4VQCrossSection.cc,v 1.14 2007/11/15 09:36:43 mkossov Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//
Note: See TracChangeset for help on using the changeset viewer.