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
Files:
123 edited

Legend:

Unmodified
Added
Removed

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

    r819 r962  
    1313     ---------------------------------------------------------------
    1414
    15 23-Apr-2008 Gabriele Cosmo              (hadr-chips-body-V09-00-20)
    16 -------------------------------------------------------------------
    17 - Tag for release 9.1.p02.
    18 
    191531-Mar-2008 Dennis Wright               (hadr-chips-body-V09-01-04)
    2016-------------------------------------------------------------------
    21 - Added more parentheses around && within || to satisfy gcc-4.3 compiler
     17- add more parentheses around && within || to satisfy gcc-4.3 compiler
    2218  files affected:
    2319    G4QChipolino.cc
    … …  
    282419-Mar-2008 Dennis Wright               (hadr-chips-body-V09-01-03)
    2925-------------------------------------------------------------------
    30 - Added parentheses around && within || to satisfy gcc-4.3 compiler
     26- add parentheses around && within || to satisfy gcc-4.3 compiler
    3127  files affected:
    3228    G4QChipolino.cc
    … …  
    3632    G4QPDGCode.cc
    3733    G4Quasmon.cc
    38 - Added braces and ; for empty while blocks to satisfy gcc-4.3
     34
     35- add braces and ; for empty while blocks to satisfy gcc-4.3
    3936  files affected:
    4037    G4QHadron.cc
    4138
    423918-Mar-2008 Vladimir Ivanchenko         (hadr-chips-body-V09-01-02)
    43 -------------------------------------------------------------------
    44 - G4QNucleus: fixed compillation warnings at Windows for constructors
     40- G4QNucleus - fixed compillation warnings at Windows for constructors

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QBesIKJY.hh

    r819 r962  
    2626//
    2727// $Id: G4QBesIKJY.hh,v 1.2 2006/06/29 20:05:55 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//      ---------------- G4QBesIKJY ----------------

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QCHIPSWorld.hh

    r819 r962  
    2626//
    2727// $Id: G4QCHIPSWorld.hh,v 1.25 2006/06/29 20:05:57 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//      ---------------- G4QCHIPSWorld ----------------

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QCandidate.hh

    r819 r962  
    2626//
    2727// $Id: G4QCandidate.hh,v 1.28 2006/06/29 20:05:59 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//      ---------------- G4QCandidate ----------------

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QCandidateVector.hh

    r819 r962  
    2626//
    2727// $Id: G4QCandidateVector.hh,v 1.21 2006/06/29 20:06:01 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//      ---------------- G4QCandidateVector ----------------

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QChipolino.hh

    r819 r962  
    2626//
    2727// $Id: G4QChipolino.hh,v 1.23 2006/06/29 20:06:03 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//      ---------------- G4QChipolino ----------------

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QContent.hh

    r819 r962  
    2626//
    2727// $Id: G4QContent.hh,v 1.28 2006/06/29 20:06:05 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//      ---------------- G4QContent ----------------

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QDecayChan.hh

    r819 r962  
    2626//
    2727// $Id: G4QDecayChan.hh,v 1.23 2006/06/29 20:06:07 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//      ---------------- G4QDecayChan ----------------

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QDecayChanVector.hh

    r819 r962  
    2626//
    2727// $Id: G4QDecayChanVector.hh,v 1.19 2006/06/29 20:06:09 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//      ---------------- G4QCandidateVector ----------------

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QEnvironment.hh

    r819 r962  
    2626//
    2727// $Id: G4QEnvironment.hh,v 1.32 2007/10/07 13:31:41 mkossov Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//      ---------------- G4QEnvironment ----------------

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QException.hh

    r819 r962  
    2626//
    2727// $Id: G4QException.hh,v 1.10 2006/06/29 20:06:13 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//      ---------------- G4QException ----------------

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QFragmentation.hh

    r819 r962  
    2626//
    2727// $Id: G4QFragmentation.hh,v 1.2 2006/12/12 11:02:22 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/body/include/G4QHadron.hh

    r819 r962  
    2626//
    2727// $Id: G4QHadron.hh,v 1.36 2008/01/09 09:37:24 gcosmo Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//      ---------------- G4QHadron ----------------

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QHadronBuilder.hh

    r819 r962  
    2626//
    2727// $Id: G4QHadronBuilder.hh,v 1.2 2006/12/12 11:02:22 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/body/include/G4QHadronVector.hh

    r819 r962  
    2626//
    2727// $Id: G4QHadronVector.hh,v 1.22 2006/11/16 11:36:09 mkossov Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//      ---------------- G4QCandidateVector ----------------
    … …  
    3737//
    3838// $Id: G4QHadronVector.hh,v 1.22 2006/11/16 11:36:09 mkossov Exp $
    39 // GEANT4 tag $Name: $
     39// GEANT4 tag $Name: geant4-09-02-ref-02 $
    4040//
    4141// ------------------------------------------------------------

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QInteraction.hh

    r819 r962  
    2626//
    2727// $Id: G4QInteraction.hh,v 1.2 2006/12/12 11:02:22 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/body/include/G4QInteractionVector.hh

    r819 r962  
    2626//
    2727// $Id: G4QInteractionVector.hh,v 1.1 2006/10/30 10:40:34 mkossov Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//      ---------------- G4QCandidateVector ----------------
    … …  
    3838//
    3939// $Id: G4QInteractionVector.hh,v 1.1 2006/10/30 10:40:34 mkossov Exp $
    40 // GEANT4 tag $Name: $
     40// GEANT4 tag $Name: geant4-09-02-ref-02 $
    4141//
    4242// ------------------------------------------------------------------

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QIsotope.hh

    r819 r962  
    2626//
    2727// $Id: G4QIsotope.hh,v 1.5 2006/06/29 20:06:19 gunter 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/body/include/G4QNucleus.hh

    r819 r962  
    2626//
    2727// $Id: G4QNucleus.hh,v 1.33 2007/10/31 13:23:07 mkossov Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//      ---------------- G4QNucleus ----------------

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QPDGCode.hh

    r819 r962  
    2626//
    2727// $Id: G4QPDGCode.hh,v 1.26 2006/06/29 20:06:23 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//      ---------------- G4QPDGCode ----------------

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QPDGCodeVector.hh

    r819 r962  
    2626//
    2727// $Id: G4QPDGCodeVector.hh,v 1.19 2006/06/29 20:06:25 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//      ---------------- G4QCandidateVector ----------------

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QPDGToG4Particle.hh

    r819 r962  
    2525//
    2626// $Id: G4QPDGToG4Particle.hh,v 1.4 2006/06/29 20:06:27 gunter Exp $
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2828//
    2929//      ---------------- G4QPDGToG4Particle header ----------------

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QParentCluster.hh

    r819 r962  
    2626//
    2727// $Id: G4QParentCluster.hh,v 1.23 2006/06/29 20:06:29 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//      ---------------- G4QParentCluster ----------------

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QParentClusterVector.hh

    r819 r962  
    2626//
    2727// $Id: G4QParentClusterVector.hh,v 1.18 2006/06/29 20:06:31 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//      ---------------- G4QCandidateVector ----------------

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QParticle.hh

    r819 r962  
    2626//
    2727// $Id: G4QParticle.hh,v 1.24 2006/06/29 20:06:33 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//      ---------------- G4QParticle ----------------

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QParticleVector.hh

    r819 r962  
    2626//
    2727// $Id: G4QParticleVector.hh,v 1.19 2006/06/29 20:06:35 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//      ---------------- G4QCandidateVector ----------------

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QParton.hh

    r819 r962  
    2929
    3030// $Id: G4QParton.hh,v 1.2 2006/12/12 11:02:22 mkossov Exp $
    31 // GEANT4 tag $Name: $
     31// GEANT4 tag $Name: geant4-09-02-ref-02 $
    3232//
    3333// ------------------------------------------------------------

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QPartonPair.hh

    r819 r962  
    2828//
    2929// $Id: G4QPartonPair.hh,v 1.1 2006/10/30 10:40:34 mkossov Exp $
    30 // GEANT4 tag $Name: $
     30// GEANT4 tag $Name: geant4-09-02-ref-02 $
    3131//
    3232// ------------------------------------------------------------

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QPartonPairVector.hh

    r819 r962  
    2626//
    2727// $Id: G4QPartonPairVector.hh,v 1.1 2006/11/16 11:36:09 mkossov Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//      ---------------- G4QCandidateVector ----------------

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QPartonVector.hh

    r819 r962  
    2626//
    2727// $Id: G4QPartonVector.hh,v 1.1 2006/10/30 10:40:34 mkossov Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//      ---------------- G4QCandidateVector ----------------
    … …  
    3737//
    3838// $Id: G4QPartonVector.hh,v 1.1 2006/10/30 10:40:34 mkossov Exp $
    39 // GEANT4 tag $Name: $
     39// GEANT4 tag $Name: geant4-09-02-ref-02 $
    4040//
    4141// ------------------------------------------------------------

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QPomeron.hh

    r819 r962  
    2828//
    2929// $Id: G4QPomeron.hh,v 1.2 2006/12/12 11:02:22 mkossov Exp $
    30 // GEANT4 tag $Name: $
     30// GEANT4 tag $Name: geant4-09-02-ref-02 $
    3131//
    3232// ------------------------------------------------------------

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QSplitter.hh

    r819 r962  
    2626//
    2727// $Id: G4QSplitter.hh,v 1.2 2006/06/29 20:06:37 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//      ---------------- G4QSplitter ----------------

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QString.hh

    r819 r962  
    2727//
    2828// $Id: G4QString.hh,v 1.2 2006/12/12 11:02:22 mkossov Exp $
    29 // GEANT4 tag $Name: $
     29// GEANT4 tag $Name: geant4-09-02-ref-02 $
    3030
    3131#ifndef G4QString_h

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QStringVector.hh

    r819 r962  
    2626//
    2727// $Id: G4QStringVector.hh,v 1.1 2006/10/30 10:40:35 mkossov Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//      ---------------- G4QStringVector ----------------

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4Quasmon.hh

    r819 r962  
    2626//
    2727// $Id: G4Quasmon.hh,v 1.39 2007/08/09 13:07:47 mkossov Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//      ---------------- G4Quasmon ----------------

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QuasmonString.hh

    r819 r962  
    2626//
    2727// $Id: G4QuasmonString.hh,v 1.4 2006/06/29 20:06:41 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//      ---------------- G4QuasmonString ----------------

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/include/G4QuasmonVector.hh

    r819 r962  
    2626//
    2727// $Id: G4QuasmonVector.hh,v 1.19 2006/06/29 20:06:43 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//      ---------------- G4QuasmonVector ----------------

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QBesIKJY.cc

    r819 r962  
    2626//
    2727// $Id: G4QBesIKJY.cc,v 1.2 2006/06/29 20:06:45 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//      ---------------- G4QBesIKJY ----------------

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QCHIPSWorld.cc

    r819 r962  
    2626//
    2727// $Id: G4QCHIPSWorld.cc,v 1.32 2006/06/29 20:06:47 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//      ---------------- G4QCHIPSWorld ----------------

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QCandidate.cc

    r819 r962  
    2626//
    2727// $Id: G4QCandidate.cc,v 1.34 2006/11/27 10:44:53 mkossov Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//      ---------------- G4QCandidate ----------------

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QChipolino.cc

    r819 r962  
    2525//
    2626//
    27 // $Id: G4QChipolino.cc,v 1.32.4.1 2008/04/23 14:47:22 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-01-patch-02 $
     27// $Id: G4QChipolino.cc,v 1.34 2008/03/31 20:29:33 dennis Exp $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//      ---------------- G4QChipolino ----------------

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QContent.cc

    r819 r962  
    2525//
    2626//
    27 // $Id: G4QContent.cc,v 1.43.4.1 2008/04/23 14:47:22 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-01-patch-02 $
     27// $Id: G4QContent.cc,v 1.44 2008/03/20 20:11:37 dennis Exp $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//      ---------------- G4QContent ----------------

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QDecayChan.cc

    r819 r962  
    2626//
    2727// $Id: G4QDecayChan.cc,v 1.27 2006/11/27 10:44:54 mkossov Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//      ---------------- G4QDecayChan ----------------

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QEnvironment.cc

    r819 r962  
    2828//
    2929//
    30 // $Id: G4QEnvironment.cc,v 1.135.2.1 2008/04/23 14:47:22 gcosmo Exp $
    31 // GEANT4 tag $Name: geant4-09-01-patch-02 $
     30// $Id: G4QEnvironment.cc,v 1.137 2008/03/31 20:30:00 dennis Exp $
     31// GEANT4 tag $Name: geant4-09-02-ref-02 $
    3232//
    3333//      ---------------- G4QEnvironment ----------------

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QException.cc

    r819 r962  
    2626//
    2727// $Id: G4QException.cc,v 1.9 2006/06/29 20:06:59 gunter Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//      ---------------- G4QException ----------------

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QFragmentation.cc

    r819 r962  
    2626//
    2727// $Id: G4QFragmentation.cc,v 1.3 2007/05/02 14:59:55 gunter 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/body/src/G4QHadron.cc

    r819 r962  
    2525//
    2626//
    27 // $Id: G4QHadron.cc,v 1.52.2.1 2008/04/23 14:47:23 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-01-patch-02 $
     27// $Id: G4QHadron.cc,v 1.53 2008/03/20 20:11:38 dennis Exp $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//      ---------------- G4QHadron ----------------

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QHadronBuilder.cc

    r819 r962  
    2626//
    2727// $Id: G4QHadronBuilder.cc,v 1.2 2006/12/12 11:02:22 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/body/src/G4QInteraction.cc

    r819 r962  
    2626//
    2727// $Id: G4QInteraction.cc,v 1.2 2006/12/12 11:02:22 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/body/src/G4QIsotope.cc

    r819 r962  
    2626//
    2727// $Id: G4QIsotope.cc,v 1.10 2007/11/28 14:14:36 mkossov Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//      ---------------- G4QIsotope class ----------------

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QNucleus.cc

    r819 r962  
    2525//
    2626//
    27 // $Id: G4QNucleus.cc,v 1.92.2.1 2008/04/23 14:47:23 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-01-patch-02 $
     27// $Id: G4QNucleus.cc,v 1.95 2008/03/31 20:30:17 dennis Exp $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//      ---------------- G4QNucleus ----------------

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QPDGCode.cc

    r819 r962  
    2525//
    2626//
    27 // $Id: G4QPDGCode.cc,v 1.55.2.1 2008/04/23 14:47:23 gcosmo Exp $
    28 // GEANT4 tag $Name: geant4-09-01-patch-02 $
     27// $Id: G4QPDGCode.cc,v 1.56 2008/03/20 20:11:38 dennis Exp $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//      ---------------- G4QPDGCode ----------------

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QPDGToG4Particle.cc

    r819 r962  
    2525//
    2626// $Id: G4QPDGToG4Particle.cc,v 1.5 2006/06/29 20:07:09 gunter Exp $
    27 // GEANT4 tag $Name: $
     27// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2828//
    2929// ---------------- G4QG4ToG4Particle singletone class ------------------

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QParentCluster.cc

    r819 r962  
    2626//
    2727// $Id: G4QParentCluster.cc,v 1.25 2006/11/27 10:44:55 mkossov Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//      ---------------- G4QParentCluster ----------------

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QParticle.cc

    r819 r962  
    2626//
    2727// $Id: G4QParticle.cc,v 1.33 2006/11/27 10:44:55 mkossov Exp $
    28 // GEANT4 tag $Name: $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030//      ---------------- G4QParticle ----------------

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QParton.cc

    r819 r962  
    2626//
    2727// $Id: G4QParton.cc,v 1.3 2006/12/12 11:02:22 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/body/src/G4QPartonPair.cc

    r819 r962  
    2727//
    2828// $Id: G4QPartonPair.cc,v 1.1 2006/10/30 10:40:36 mkossov Exp $
    29 // GEANT4 tag $Name: $
     29// GEANT4 tag $Name: geant4-09-02-ref-02 $
    3030//
    3131// ------------------------------------------------------------

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QPomeron.cc

    r819 r962  
    2626//
    2727// $Id: G4QPomeron.cc,v 1.2 2006/12/12 11:02:22 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/body/src/G4QSplitter.cc

    r819 r962  
    2929//
    3030// $Id: G4QSplitter.cc,v 1.6 2006/11/27 10:44:55 mkossov Exp $
    31 // GEANT4 tag $Name: $
     31// GEANT4 tag $Name: geant4-09-02-ref-02 $
    3232//
    3333//      ---------------- G4QSplitter ----------------

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QString.cc

    r819 r962  
    2626//
    2727// $Id: G4QString.cc,v 1.4 2007/07/06 07:38:36 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/body/src/G4Quasmon.cc

    r819 r962  
    2828//
    2929//
    30 // $Id: G4Quasmon.cc,v 1.105.2.1 2008/04/23 14:47:23 gcosmo Exp $
    31 // GEANT4 tag $Name: geant4-09-01-patch-02 $
     30// $Id: G4Quasmon.cc,v 1.107 2008/03/31 20:30:35 dennis Exp $
     31// GEANT4 tag $Name: geant4-09-02-ref-02 $
    3232//
    3333//      ---------------- G4Quasmon ----------------

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/body/src/G4QuasmonString.cc

    r819 r962  
    2929//
    3030// $Id: G4QuasmonString.cc,v 1.7 2006/11/27 10:44:55 mkossov Exp $
    31 // GEANT4 tag $Name: $
     31// GEANT4 tag $Name: geant4-09-02-ref-02 $
    3232//
    3333//      ---------------- G4QuasmonString ----------------

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/calcul/G4GlauberCrossSections.cc

    r819 r962  
    317317}
    318318
     319// Initialize factorials and combinatoric coefficients
    319320void Initialize()
    320321{
    … …  
    448449  G4double S        = (MassN+MassN)*HadrEnergy+MassN2+MassH2;// Mondelststam s
    449450  G4double EcmH     = (S-MassN2+MassH2)/2/std::sqrt(S);     // CM energy of a hadron
    450   G4double CMMom = std::sqrt(EcmH*EcmH-MassH2);             // CM momentum
     451  G4double CMMom    = std::sqrt(EcmH*EcmH-MassH2);          // CM momentum
    451452
    452453  G4double Stot     = HadrTot*mb2G2;                        // in GeV^-2
    … …  
    485486  for(G4int i=1; i<=A; i++)                          // @@ Make separately for n and p
    486487  {
    487     N              *= -Unucl*(A-i+1)*Rho2/i;
     488    N              *= -Unucl*(A-i+1)*Rho2/i;         // Includes total cross-section
    488489    G4double N4     = 1.;
    489     G4double Prod1  = std::exp(-Q2*R12B/i/4)*R12B/i;
     490    G4double Prod1  = std::exp(-Q2*R12B/i/4)*R12B/i; // Includes the slope
    490491    G4double medTot = R12B/i;
    491492    for(G4int l=1; l<=i; l++)
    … …  
    556557  ImElA0             *= Corr0;
    557558                       
    558   return (ReElA0*ReElA0+(ImElA0+Din1)*(ImElA0+Din1))*CMMom*CMMom*mb2G2/4/pi2;
     559  //return (ReElA0*ReElA0+(ImElA0+Din1)*(ImElA0+Din1))*CMMom*CMMom*mb2G2/4/pi2; // ds/do
     560  return (ReElA0*ReElA0+(ImElA0+Din1)*(ImElA0+Din1))*mb2G2/(twopi+twopi);
    559561} // End of DiffElasticCS
    560562
    … …  
    564566  static const G4double mb2G2 = 2.568;                      // Transform from mb to GeV^-2
    565567  static const G4double piMG  = pi/mb2G2;                   // PiTrans from GeV^-2 to mb
    566   G4double hMom       = HadrMom/1000.;                      // Momentum (GeV, inputParam)
     568  G4double p          = HadrMom/1000.;                      // Momentum (GeV, inputParam)
     569  G4double p2         = p*p;
    567570                G4double MassH      = G4QPDGCode(hPDG).GetMass()/1000.;   // Hadron Mass in GeV
    568571  G4double MassH2     = MassH*MassH;
    569   G4double HadrEnergy = std::sqrt(hMom*hMom+MassH2);        // Tot energy in GeV
     572  G4double HadrEnergy = std::sqrt(p2+MassH2);               // Tot energy in GeV
    570573                //G4cout<<"G4GCS::DiffElasticCS: PGG_proj="<<hPDG<<", A_nuc= "<<A<<G4endl;
    571   if(A==2 || A==3) G4Exception("G4GCS: This model does not work for nuclei with A=2, A=3");
    572   if(A>252) G4Exception("G4GCS: This nucleus is too heavy for the model !!!");
    573574  //if(HadrEnergy-MassH<1.) G4Exception("Kin energy is too small for the model (T>1 GeV)");
    574   CalculateParameters(hPDG, HadrMom);                   
    575   CalculateIntegralCS(A, HadrEnergy);
    576   CalculateNuclearParameters(A);
     575  CalculateParameters(hPDG, HadrMom);                       // ?                   
     576  CalculateIntegralCS(A, HadrEnergy);                       // ?
     577  CalculateNuclearParameters(A);                            // ?
    577578  G4double Q2 = aQ2/1000/1000;                              // in GeV^2
    578579                //G4doubleMassN     = A*0.938;                              // @@ This is bad!
    579580                G4double MassN    = A*0.9315;                             // @@ Atomic Unit is bad too
    580581  if(G4NucleiPropertiesTable::IsInTable(Z,A))
    581                                 MassN=G4NucleiProperties::GetNuclearMass(A,Z)/1000.;    // Geant4 NuclearMass
     582                                MassN=G4NucleiProperties::GetNuclearMass(A,Z)/1000.;    // Geant4 NuclearMass in GeV
    582583  G4double MassN2   = MassN*MassN;
    583584  G4double S        = (MassN+MassN)*HadrEnergy+MassN2+MassH2;// Mondelststam s
    584585  G4double EcmH     = (S-MassN2+MassH2)/2/std::sqrt(S);     // CM energy of a hadron
    585586  G4double CMMom    = std::sqrt(EcmH*EcmH-MassH2);          // CM momentum
    586   G4double Stot     = HadrTot*mb2G2;                        // in GeV^-2
    587   G4double Bhad     = HadrSlope;                            // in GeV^-2
    588   G4double Asq      = 1+HadrReIm*HadrReIm;                  // |M|^2/(ImM)^2
     587  //G4cout<<"P="<<CMMom<<",E="<<HadrEnergy<<",N="<<MassN2<<",h="<<MassH2<<",p="<<p<<G4endl;
     588  G4double p3       = p2*p;
     589  G4double p4       = p2*p2;
     590  G4double sp       = std::sqrt(p);
     591  G4double p2s      = p2*sp;
     592  G4double ap       = std::log(p);
     593  G4double dl       = ap-3.;
     594  G4double dl2      = dl*dl;
     595  G4double shPPTot  = 2.91/(p2s+.0024)+5.+(32.+.3*dl2+23./p)/(1.+1.3/p4); // SigPP in mb
     596  G4double shPNTot  = 12./(p2s+.05*p+.0001/std::sqrt(sp))+.35/p
     597                      +(38.+.3*dl2+8./p)/(1.+1.2/p3);       // SigPP in mb
     598  G4double hNTot    = (Z*shPPTot+(A-Z)*shPNTot)/A;          // SighN in mb
     599  G4double Stot     = hNTot*mb2G2;                          // in GeV^-2
     600  G4double shPPSl   = 8.*std::pow(p,.055)/(1.+3.64/p4);     // PPslope in GeV^-2
     601  G4double shPNSl   = (7.2+4.32/(p4*p4+.012*p3))/(1.+2.5/p4); // PNslope in GeV^-2
     602  G4double Bhad     = (Z*shPPSl+(A-Z)*shPNSl)/A;            // B-slope in GeV^-2
     603  G4double hNReIm   = -.55+ap*(.12+ap*.0045);               // Re/Im_hN in no unit
     604  G4double Asq      = 1+hNReIm*hNReIm;                      // |M|^2/(ImM)^2
    589605  G4double Rho2     = std::sqrt(Asq);                       // M/ImM
    590   G4double R12      = R1*R1;
    591   G4double R22      = R2*R2;
     606  G4double r1       = 3.9*std::pow(A-1.,.309);             // Positive diffractionalRadius
     607  G4double r2       = 2.*std::pow(A,.36);                  // Negative diffraction radius
     608  G4double pN       = Pnucl;                                // Dubna value
     609  //G4double pN       = .4;                                   // Screaning factor
     610  G4double Ae       = Aeff;                                 // Dubna value
     611  //G4double Ae       = .75;                                   // Normalization
     612  G4double R12      = r1*r1;
     613  G4double R22      = r2*r2;
     614  G4double R1C      = R12*r1;
     615  G4double R2C      = R22*r2;
    592616  G4double R12B     = R12+Bhad+Bhad;                        // Slope is used
    593617  G4double R22B     = R22+Bhad+Bhad;                        // Slope is used
    594   G4double Norm     = (R12*R1-Pnucl*R22*R2)*Aeff;           // Some questionable norming
    595   G4double R13      = R12*R1/R12B;                          // Slope is used
    596   G4double R23      = Pnucl*R22*R2/R22B;                    // Slope is used
     618  G4double Norm     = (R1C-pN*R2C)*Ae;                      // ScreanFac & NormFac are used
     619  G4double R13      = R1C/R12B;                             // Slope is used
     620  G4double R23      = pN*R2C/R22B;                          // Slope & ScreanFact are used
    597621  G4double norFac   = Stot/twopi/Norm;                      // totCS (in GeV^-2) is used
    598622  G4double Unucl    = norFac*R13;
    599   G4double SinFi    = HadrReIm/Rho2;
     623  G4double SinFi    = hNReIm/Rho2;                          // Real part
    600624  G4double FiH      = std::asin(SinFi);
    601625  G4double N        = -1.;
    … …  
    606630  for(G4int i=1; i<=A; i++)
    607631  {
    608     N              *= -Unucl*(A-i+1)*Rho2/i;
     632    N              *= -Unucl*(A-i+1)*Rho2/i;                // TotCS is used
    609633    G4double N4     = 1.;
    610634    G4double Prod1  = std::exp(-Q2*R12B/i/4)*R12B/i;        // Slope is used
    … …  
    631655  ImElA0         *= Corr0;
    632656                       
    633   return (ReElA0*ReElA0+ImElA0*ImElA0)*CMMom*CMMom*mb2G2/4/pi2;
     657  //return (ReElA0*ReElA0+ImElA0*ImElA0)*CMMom*CMMom*mb2G2/4/pi2; // ds/do
     658  return (ReElA0*ReElA0+ImElA0*ImElA0)*mb2G2/(twopi+twopi);
    634659} // End of DiffElasticCS
    635660
    … …  
    705730  else if(A==12) r0   = 0.80;
    706731                else           r0   = 1.16*(1.-1.16/Re2);  // For other nuclei which have not been tested
    707   G4double MassN      = mN;                              // A * AtomicUnit(GeV)
     732                G4double MassN      = A*0.9315;                             // @@ Atomic Unit is bad too
    708733  G4double MassN2     = MassN*MassN;
    709734  G4double S          = (MassN+MassN)*HadrEnergy+MassN2+MassH2; // Mondelstam S
    … …  
    736761    G4double expB     = std::exp(InExp);
    737762    G4double HRIE     = HadrReIm*InExp;
    738     ReIntegrand[i]    = (1.-expB*std::cos(HRIE));
    739     ImIntegrand[i]    = expB*std::sin(HRIE);
     763    ReIntegrand[i]    = (1.-expB*std::cos(HRIE));           // Real part of the amplitude
     764    ImIntegrand[i]    = expB*std::sin(HRIE);                // Imaginary part of the amplit
    740765  }
    741766  InCoh     = 0.;                                           // incohirent (quasi-elastic)
    742767  ValB       = -stepB;
    743   for(G4int k=0; k<NptB; k++)
     768  for(G4int k=0; k<NptB; k++)                               // Third integration (?)
    744769  {
    745770    ValB              += stepB;
    746771    InCoh             += Thick[k]*ValB*std::exp(-hTotG2*Thick[k]);
    747     G4double J0qb      = QJ0(std::sqrt(Q2)*ValB)*ValB;
     772    G4double J0qb      = QJ0(std::sqrt(Q2)*ValB)*ValB;      // Bessel0(Q*b)
    748773    ReSum             += J0qb*ReIntegrand[k];
    749774    ImSum             += J0qb*ImIntegrand[k];
    … …  
    753778  InCoh *= stepB*hTotG2*hTotG2*(1.+HadrReIm*HadrReIm)*std::exp(-HadrSlope*Q2)/8/mb2G2;
    754779  //G4cout<<"GHAD:RS="<<ReSum<<",IS="<<ImSum<<",CM="<<CMMom<<",st="<<stepB<<G4endl;
    755   return (ReSum*ReSum+ImSum*ImSum)*m2G10*CMMom*CMMom*stepB*stepB/twopi;
     780  //return (ReSum*ReSum+ImSum*ImSum)*m2G10*CMMom*CMMom*stepB*stepB/twopi; // ds/do
     781  return (ReSum*ReSum+ImSum*ImSum)*m2G10*stepB*stepB/12; // ds/dt
    756782} 
    757783
    … …  
    763789  static const G4double hc2   = .3893793;                   // Transform from GeV^-2 to mb
    764790  static const G4double mb2G2 = 1./hc2;                     // Transform from mb to GeV^-2
    765   //static const G4double mb2G2 = 2.568;                     // Transform from mb to GeV^-2
    766791  static const G4double f22mb = 10;                         // Transform from fermi^2 to mb
    767792  static const G4double f22G2 = f22mb*mb2G2;                // Transform from fm2 to GeV^-2
    768793  static const G4double f2Gm1 = std::sqrt(f22G2);           // Transform from fm to GeV^-1
    769794  G4double Re         = std::pow(A,.33333333);              // A-dep coefficient
    770   G4double Lim        = 50.*Re;                             // Integration accuracy limit
     795  G4double Lim        = 100*Re;                             // Integration accuracy limit
    771796  G4double Tb[Npb];                                         // Calculated T(b) array
    772797  G4QBesIKJY QI0(BessI0);                                   // I0 Bessel function
    773798  G4QBesIKJY QJ0(BessJ0);                                   // J0 Bessel function
    774            hMom       = hMom/1000.;                         // Momentum (GeV, inputParam)
     799  G4double p          = hMom/1000.;                         // Momentum (GeV, inputParam)
     800  G4double p2         = p*p;
    775801                G4double MassH      = G4QPDGCode(hPDG).GetMass()/1000.;   // Hadron Mass in GeV
    776802  G4double MassH2     = MassH*MassH;                        // Squared mass of the hadron
    777   G4double hEnergy    = std::sqrt(hMom*hMom+MassH2);        // Tot energy in GeV
     803  G4double hEnergy    = std::sqrt(p2+MassH2);               // Tot energy in GeV
    778804  G4double Q2         = aQ2/1000000.;                       // -t in GeV
    779   G4double MassN      = mN;                                 // AtomicUnit(GeV)[prototype]
     805                G4double MassN    = A*0.9315;                             // @@ Atomic Unit is bad too
     806  if(G4NucleiPropertiesTable::IsInTable(Z,A))
     807                                MassN=G4NucleiProperties::GetNuclearMass(A,Z)/1000.;    // Geant4 NuclearMass in GeV
    780808  G4double MassN2     = MassN*MassN;                        // Squared mass of the target
    781809  G4double S          = (MassN+MassN)*hEnergy+MassN2+MassH2;// Mondelstam s
    782810  G4double EcmH       = (S-MassN2+MassH2)/2/std::sqrt(S);   // Hadron CM Energy
    783811  G4double CMMom      = std::sqrt(EcmH*EcmH-MassH2);        // CM momentum (to norm CS)
    784   // @@ Temporary only for nucleons
    785   //G4cout<<"CHPS:E="<<hEnergy<<",dM="<<2*MassN<<",sN="<<MassN2<<",sH="<<MassH2<<G4endl;
    786   G4double shNTot     = 5.2+5.2*std::log(hEnergy)+51*std::pow(hEnergy,-.35); // SighN in mb
    787   G4double shNSl      = 5.44+.88*std::log(S);               // B-slope in GeV^-2
    788   G4double shNReIm    = .13*std::log(S/350)*std::pow(S,-.18); // Re/Im_hN in no unit
     812  //G4cout<<"2: P="<<CMMom<<",E="<<hEnergy<<",N="<<MassN2<<",h="<<MassH2<<",p="<<p<<G4endl;
     813  // The mean value of the total can be used
     814  G4double p3         = p2*p;
     815  G4double p4         = p2*p2;
     816  G4double sp         = std::sqrt(p);
     817  G4double p2s        = p2*sp;
     818  G4double ap         = std::log(p);
     819  G4double dl         = ap-3.;
     820  G4double dl2        = dl*dl;
     821  G4double shPPTot    = 2.91/(p2s+.0024)+5.+(32.+.3*dl2+23./p)/(1.+1.3/p4); // SigPP in mb
     822  G4double shPNTot    = 12./(p2s+.05*p+.0001/std::sqrt(sp))+.35/p
     823                        +(38.+.3*dl2+8./p)/(1.+1.2/p3);     // SigPP in mb
     824  G4double shNTot     = (Z*shPPTot+(A-Z)*shPNTot)/A;        // SighN in mb
     825#ifdef debug
     826  G4cout<<"CHIPS:SI,p="<<p<<",n="<<shNTot<<",P="<<shPPTot<<",N="<<shPNTot
     827        <<",Z="<<Z<<",A="<<A<<G4endl;
     828#endif
     829  G4double shPPSl     = 8.*std::pow(p,.055)/(1.+3.64/p4);   // PPslope in GeV^-2
     830  G4double shPNSl     = (7.2+4.32/(p4*p4+.012*p3))/(1.+2.5/p4); // PNslope in GeV^-2
     831  G4double shNSl      = (Z*shPPSl+(A-Z)*shPNSl)/A;          // B-slope in GeV^-2
     832#ifdef debug
     833  G4cout<<"CHIPS:SL,n="<<shNSl<<",P="<<shPPSl<<",N="<<shPNSl<<G4endl;
     834#endif
     835  G4double shNReIm    = -.55+ap*(.12+ap*.0045); // Re/Im_hN in no unit
    789836  //G4cout<<"CHPS: s="<<S<<",T="<<shNTot<<",R="<<shNReIm<<",B="<<shNSl<<G4endl;
    790837  // @@ End of temporary ^^^^^^^
    791838  G4double dHS        = shNSl+shNSl;                        // Working: doubled B-slope
    792   //G4double rAfm       = 0.;
    793   //if    (A==208) rAfm = 1.125*Re;
    794   //else if(A==90) rAfm = 1.12*Re;
    795   //else if(A==64) rAfm = 1.1*Re;
    796   //else if(A==58) rAfm = 1.09*Re;
    797   //else if(A==48) rAfm = 1.07*Re;
    798   //else if(A==40) rAfm = 1.15*Re;
    799   //else if(A==28) rAfm = 0.93*Re;
    800   //else if(A==16) rAfm = 0.92*Re;
    801   //else if(A==12) rAfm = 0.80*Re;
    802                 //else           rAfm = 1.16*(Re-1.16/Re);                  // For other nuclei
    803   //G4double stepB      = 2.5*rAfm*f2Gm1/(Npb-1);           // in GeV^-1, step of integral
    804839  G4double stepB      = (Re+Re+2.7)*f2Gm1/(Npb-1);          // in GeV^-1, step of integral
    805840  G4double hTotG2     = shNTot*mb2G2;                       // sigma_hN in GeV^-2
    … …  
    807842  G4double ImSum      = 0.;                                 // Integration of ImPart of Amp
    808843  G4double ValB       = -stepB;
    809   for(G4int i=0; i<Npb; i++)
     844  for(G4int i=0; i<Npb; i++)                                // First integration over b
    810845  {
    811846    ValB             += stepB;                              // An incident parameter
    812     G4double ValB2    = ValB*ValB;                          // A working value
    813     G4double IPH      = ValB/shNSl;                         // A working value
     847    G4double ValB2    = ValB*ValB;                          // A working value b^2
     848    G4double IPH      = ValB/shNSl;                         // A working value slope
    814849    G4double Integ    = 0.;                                 // Integral over ImpactParam.
    815850    G4double ValS     = 0.;                                 // Prototype of ImpactParameter
    816     for(G4int j=1; j<Npb; j++)
     851    for(G4int j=1; j<Npb; j++)                              // Second integration over b
    817852    {
    818853      ValS           += stepB; //  back to fm               // Impact parameter GeV^-1
    819854      if(!i) Tb[j]    = CHIPS_Tb(A,ValS/f2Gm1)/f22G2;       // GeV^2, calculate only once
    820855      //if(!i) Tb[j]    = Thickness(A,ValS/f2Gm1,rAfm)/f22G2; // Calculate T(b) only once
    821       G4double FunS   = IPH*ValS;                           // Working product
    822       if(FunS > Lim) break;                                 // (?)
    823       Integ          += ValS*std::exp(-(ValS*ValS+ValB2)/dHS)*QI0(FunS)*Tb[j];
     856      G4double FunS   = IPH*ValS;                           // b1*b2/slope
     857      if(FunS > Lim) break;                                 // To avoid NAN
     858      Integ          += ValS*std::exp(-(ValS*ValS+ValB2)/dHS)*QI0(FunS)*Tb[j]; // BessI0
    824859    }
    825     G4double InExp    = -hTotG2*Integ*stepB/dHS;            // Working product
    826     G4double expB     = std::exp(InExp);                    // Workung sqrt
     860    G4double InExp    = -hTotG2*Integ*stepB/dHS;            // Integrated absorption
     861    G4double expB     = std::exp(InExp);                    // Exponential absorption
    827862    G4double HRIE     = shNReIm*InExp;                      // Phase shift
    828     G4double J0qb      = QJ0(std::sqrt(Q2)*ValB)*ValB;
     863    G4double J0qb      = QJ0(std::sqrt(Q2)*ValB)*ValB;      // Bessel0(Q*b)
    829864    ReSum             += J0qb*(1.-expB*std::cos(HRIE));
    830865    ImSum             += J0qb*expB*std::sin(HRIE);
    … …  
    832867  //G4cout<<"CHPS:RS="<<ReSum<<",IS="<<ImSum<<",CM="<<CMMom<<",st="<<stepB<<G4endl;
    833868  //return (ReSum*ReSum+ImSum*ImSum)*mb2G2*CMMom*CMMom*stepB*stepB/twopi;
    834   return (ReSum*ReSum+ImSum*ImSum)*f22G2*CMMom*CMMom*stepB*stepB/twopi;
    835 } 
     869  //return (ReSum*ReSum+ImSum*ImSum)*f22G2*CMMom*CMMom*stepB*stepB/twopi; // ds/do
     870  return (ReSum*ReSum+ImSum*ImSum)*f22G2*stepB*stepB/12; // ds/dt
     871}
     872
     873// Separate quasielastic calculation
    836874G4double CHIPSDifQuasiElasticCS(G4int hPDG, G4double hMom, G4int A, G4int Z, G4double aQ2)
    837875{//      =================================================================================
    838876  static const G4int Npb      = 500;                        // A#of intergation points
    839   //static const G4double mN = .9315;                         // Atomic Unit GeV
    840   static const G4double mN = .938;                          // Mass of proton GeV
    841877  static const G4double hc2   = .3893793;                   // Transform from GeV^-2 to mb
    842878  static const G4double mb2G2 = 1./hc2;                     // Transform from mb to GeV^-2
    … …  
    845881  static const G4double f22G2 = f22mb*mb2G2;                // Transform from fm2 to GeV^-2
    846882  static const G4double f2Gm1 = std::sqrt(f22G2);           // Transform from fm to GeV^-1
    847            hMom       = hMom/1000.;                         // Momentum (GeV, inputParam)
    848                 G4double MassH      = G4QPDGCode(hPDG).GetMass()/1000.;   // Hadron Mass in GeV
    849   G4double MassH2     = MassH*MassH;                        // Squared mass of the hadron
    850   G4double hEnergy    = std::sqrt(hMom*hMom+MassH2);        // Tot energy in GeV
     883  G4double p          = hMom/1000.;                         // Momentum (GeV, inputParam)
     884  G4double p2         = p*p;
    851885  G4double Q2         = aQ2/1000000.;                       // -t in GeV
    852   G4double MassN      = mN;                                 // A*AtomicUnit(GeV)[prototype]
    853   //if(G4NucleiPropertiesTable::IsInTable(Z,A))
    854                 //              MassN=G4NucleiProperties::GetNuclearMass(A,Z)/A/1000.;  // Geant4 NuclearMass/A
    855   G4double MassN2     = MassN*MassN;                        // Squared mass of the target
    856   G4double S          = (MassN+MassN)*hEnergy+MassN2+MassH2;// Mondelstam s
    857886  // @@ Temporary only for nucleons
    858   G4double shNTot     = 5.2+5.2*std::log(hEnergy)+51*std::pow(hEnergy,-.35); // SighN in mb
    859   G4double shNSl      = 6.44+.88*std::log(S);               // B-slope in GeV^-2
    860   G4double shNReIm    = .13*std::log(S/350)*std::pow(S,-.18); // Re/Im_hN in no unit
     887  G4double p3         = p2*p;
     888  G4double p4         = p2*p2;
     889  G4double sp         = std::sqrt(p);
     890  G4double p2s        = p2*sp;
     891  G4double ap         = std::log(p);
     892  G4double dl         = ap-3.;
     893  G4double dl2        = dl*dl;
     894  G4double shPPTot    = 2.91/(p2s+.0024)+5.+(32.+.3*dl2+23./p)/(1.+1.3/p4); // SigPP in mb
     895  G4double shPNTot    = 12./(p2s+.05*p+.0001/std::sqrt(sp))+.35/p
     896                        +(38.+.3*dl2+8./p)/(1.+1.2/p3);     // SigPP in mb
     897  G4double shNTot     = (Z*shPPTot+(A-Z)*shPNTot)/A;        // SighN in mb
     898  G4double shPPSl     = 8.*std::pow(p,.055)/(1.+3.64/p4);   // PPslope in GeV^-2
     899  G4double shPNSl     = (7.2+4.32/(p4*p4+.012*p3))/(1.+2.5/p4); // PNslope in GeV^-2
     900  G4double shNSl      = (Z*shPPSl+(A-Z)*shPNSl)/A;          // B-slope in GeV^-2
     901  G4double shNReIm    = -.55+ap*(.12+ap*.0045); // Re/Im_hN in no unit
    861902  // @@ End of temporary ^^^^^^^
    862903  G4double Re         = std::pow(A,.33333333);              // A-dep coefficient
    … …  
    10091050  //const G4int A[na]={4,9,12,16,27,48,58,64,120,181,207,238}; // A's of target nuclei
    10101051  //                 He Al Pb
    1011   const G4int A[na]={208}; // A's of target nuclei
     1052  const G4int A[na]={119}; // A's of target nuclei
    10121053  //                     p    n  pi+  pi-  K+  K-  antip
    10131054  const G4int pdg[np]={2212,2112,211,-211,321,-321,-2212}; // projectiles
    1014   const G4double mom[nm]={1090.}; // momentum in MeV/c
     1055  const G4double mom[nm]={120.}; // momentum in MeV/c
    10151056#ifdef integrc
    10161057  for(G4int ip=0; ip<np; ip++)
    … …  
    10491090  //const G4int Z[na]={2,4, 6, 8,13,22,28,29, 50, 73, 82, 92}; // Z's of target nuclei
    10501091  //                He Al Pb
    1051   const G4int Z[na]={82}; // Z's of target nuclei
     1092  const G4int Z[na]={50}; // Z's of target nuclei
    10521093  // Test of differential ellastic cross sections
    10531094                Initialize();
    … …  
    10661107                      {
    10671108          G4double Sig1 = CHIPSDiffElCS(PDG, mom[im], Z[ia], A[ia], t[it]);
    1068           //G4double Sig1 = DiffElasticCS(PDG, mom[im], A[ia], t[it]);
     1109          //G4double Sig1 = DiffElasticCS(PDG, mom[im], A[ia], t[it]); //Doesn't work
    10691110          G4double Sig2 = CoherentDifElasticCS(PDG, mom[im], A[ia], t[it]);
    10701111          G4double Sig3 = CHIPSDifElasticCS(PDG, mom[im], A[ia], Z[ia], t[it]);

  • trunk/source/processes/hadronic/models/chiral_inv_phase_space/calcul/G4NuMuXQ2Integration.cc

    r819 r962  
    6262  else
    6363  {
    64                   double r=0.;
    65     double max=1.;
    66     double H=1.22;
    67     if(A==1)                   // Proton
    68                   {
    69       r=std::sqrt(Q2/1.66);
    70       max=.5;
    71     }
    72     else if(A<13)              // Light nuclei
    73                   {
    74       double f=Q2/4.62;
    75       r=f*f;
    76       max=.3;
    77       if(A>2) H=1.;
    78     }
    79     else if(A>0)               // Heavy nuclei
    80                   {
    81       double f=Q2/3.4;
    82       double ff=f*f;
    83       r=ff*ff;
    84       max=.5;
    85       H=1.;
    86     }
    87     else G4cout<<"strucf: A="<<A<<" <= 0"<< G4endl;
     64                  //double r=0.;
     65    double min=.077;             // Delta(0)
     66                                double max=.47;              // Hard Pomeron
     67    //double H=1.22;
     68    if(Q2<=0.) G4cout<<"strucf: Q2="<<Q2<<" <= 0"<< G4endl;
     69    double Q=std::sqrt(Q2);
     70    //if(A==1)                   // Proton
     71                  //{
     72    //  r=std::sqrt(Q2/1.66);
     73    //  max=.5;
     74    //}
     75    //else if(A<13)              // Light nuclei
     76                  //{
     77    //  double f=Q2/4.62;
     78    //  r=f*f;
     79    //  max=.3;
     80    //  if(A>2) H=1.;
     81    //}
     82    //else if(A>0)               // Heavy nuclei
     83                  //{
     84    //  double f=Q2/3.4;
     85    //  double ff=f*f;
     86    //  r=ff*ff;
     87    //  max=.5;
     88    //  H=1.;
     89    //}
     90    //else G4cout<<"strucf: A="<<A<<" <= 0"<< G4endl;
    8891    //
    8992    N=3.+.3581*std::log(1.+Q2/.04); // a#of partons in the nonperturbative phase space
    90     Del=(1.+r)/(12.5+r/max);
    91     double S=std::pow(1.+.6/Q2,-1.-Del);
    92     D=H*S*(1.-.5*S);
     93    Del=min+(max-min)/(1.+5./Q);
     94    D=0.68*std::pow(1.+.145/Q2,-1.-Del); // 0.68=1-0.34, m2=.145 GeV2
    9395    V=3*(1.-D)*(N-1.);
    94     double cc=Q2/.08;
    95     double cc2=cc*cc;
    96     //double C=(1.+cc2)/(1.+cc2/.24);              // Weak?
    97     double C=(1.+cc2)/(1.+cc2/.24)/(1.+Q2/21.6); // EM
    98     double c3=C+C+C;
     96    double c3=.75;                       // 3*0.25
    9997    double uu=std::exp(lGam(N-Del)-lGam(N-1.)-lGam(1.-Del))/N;
    10098    U2=(c3+N-3.)*uu;
    10199    U3=c3*uu;
    102     //UU=uu+uu+uu; // @@
    103100    mA  = A;
    104101    mQ2 = Q2;
    … …  
    125122  //else
    126123  xf3= U3*pp+dir;
    127   fL = per/4.;
     124  fL = per/5.;                             // 20%
    128125  return;
    129126}
    … …  
    157154  const double sik=GF2*hc2/pif; // precalculated coefficient
    158155  //const double mpi=.1349766;    // pi0 meson mass in GeV
    159   const double mpi=.13957018;   // charged pi meson mass in GeV
     156  //const double mpi=.13957018;   // charged pi meson mass in GeV
    160157  //const double mpi2=mpi*mpi;    // m_pi^2 in GeV^2
    161158  //const double me=.00051099892; // electron mass in GeV
    … …  
    168165  //const double mtau2=mtau*mtau; // m_tau^2 in GeV^2
    169166  //const double hmtau2=mtau2/2;  // .5*m_e^2 in GeV^2
    170   //const double mp=.93827203;    // proton mass in GeV
    171   //const double mn=.93956536;    // neutron mass in GeV
     167  const double mp=.93827203;    // proton mass in GeV
     168  const double mn=.93956536;    // neutron mass in GeV
    172169  //const double md=1.87561282;   // deuteron mass in GeV
    173   const double MN=.931494043;   // Nucleon mass (inside nucleus, atomic mass unit, GeV)
    174   //const double MN=(mn+mp)/2;    // Nucleon mass (mean free) in GeV
    175   //const double MD=1.232;        // proton mass in GeV
     170  //const double MN=.931494043;   // Nucleon mass (inside nucleus, atomic mass unit, GeV)
     171  const double MN=(mn+mp)/2;    // Nucleon mass (mean free) in GeV
     172  const double MD=1.232;        // proton mass in GeV
    176173  //const double mp2=mp*mp;       // m_p^2 in GeV^2
    177174  const double MN2=MN*MN;       // M_N^2 in GeV^2
    … …  
    184181  //
    185182  //const double mc=.3;           // parameter of W>M+mc cut for Quasi-Elastic/Delta
    186   const double mc=mpi;          // parameter of W>M+mc cut for Quasi-Elastic/Delta
     183  const double mc=std::sqrt((MN*MN+MD*MD)/2)-MN; // Squared mean between N and \Delta
     184  //const double mc=mpi;          // parameter of W>M+mc cut for Quasi-Elastic/Delta
    187185  const double mcV=(dMN+mc)*mc; // constant of W>M+mc cut for Quasi-Elastic
    188186  //std::ofstream fileNuMuX("NuMuXQ2.out", std::ios::out);
    … …  
    198196  int    A=12;                    // Neucleus for which calculations should be done
    199197  double lEnuMin=0;               // LogLog of Minimum energy of neutrino
    200   double lEnuMax=std::log(1.+std::log(300./EminMu)); // LogLog of Maximum energy of neutrino
    201   int    nE=31;
     198  double lEnuMax=std::log(1.+std::log(300./EminMu)); // LogLog of MaximumEnergy of neutrino
     199  int    nE=49;                   // Number of points
    202200  double dlE=(lEnuMax-lEnuMin)/nE;
    203201  lEnuMin+=dlE/10;
    … …  
    241239        double dik=MW4/Q2M/Q2M;
    242240        double qmc=Q2+mcV;
    243         double lXQES=std::log((std::sqrt(qmc*qmc+Q2*fMN2)-qmc)/dMN2); // Quasielastic boundary
     241        double lXQES=std::log((std::sqrt(qmc*qmc+Q2*fMN2)-qmc)/dMN2);//QuasielasticBoundary
    244242        //double lXQES=log(Q2/(Q2+mcV)); // Quasielastic boundary (W=MN+m_c)
    245243        //double xN=Q2/dME;
    … …  
    248246        double lXmin=std::log(xN);
    249247        // ****** QE ********
    250         //if(lXQES>lXmin) lXmin=lXQES;   // A cut which leaves only QES
     248        if(lXQES>lXmin) lXmin=lXQES;   // A cut which leaves only QES >>>>>>>>>>>>>>>>
    251249        // *** End of QE^^^^^
    252250        double lXmax=0.;               // QES is in DIS
    … …  
    262260                                      {
    263261            getFun(A, lX, Q2, f);
    264             DISxint+=f[0]+f[0]+xN*(f[1]+f[1]+xN*f[3]); // neutrino
    265             //DISxint+=f[0]+f[0]+xN*(f[2]+f[2]+xN*f[4]); // anti-neutrino
     262            // ***** Neutrino/Antineutrino switch ******>>>>>>>>>>>>>>>>>>>>>>>>>>>>
     263            //DISxint+=f[0]+f[0]+xN*(f[1]+f[1]+xN*f[3]); // neutrino
     264            DISxint+=f[0]+f[0]+xN*(f[2]+f[2]+xN*f[4]); // anti-neutrino
    266265            //G4cout<<f[0]<<","<<f[1]<<","<<f[2]<<","<<f[3]<<","<<f[4]<<G4endl;
    267266          }
    … …  
    279278    //===== tot/qe choice ====
    280279    DIStsig*=sik/Enu;
    281     G4cout<<"***total*** E="<<Enu<<",sig/E="<<DIStsig<<G4endl;
     280    //G4cout<<"***total-neutrino*** E="<<Enu<<" ,sig/E="<<DIStsig<<G4endl;
     281    G4cout<<"***total-antineutrino*** E="<<Enu<<" ,sig/E="<<DIStsig<<G4endl;
     282    //G4cout<<"***quasiel-nu*** E="<<Enu<<" ,sig/E="<<DIStsig<<G4endl;
     283    //G4cout<<"***quasiel-antinu*** E="<<Enu<<" ,sig/E="<<DIStsig<<G4endl;
    282284    //...................
    283285    //DIStsig*=sik;

  • 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.