Ignore:
Timestamp:
Nov 25, 2009, 5:13:58 PM (16 years ago)
Author:
garnier
Message:

update CVS release candidate geant4.9.3.01

Location:
trunk/source/processes/hadronic/models/parton_string/management
Files:
19 edited

Legend:

Unmodified
Added
Removed

  • trunk/source/processes/hadronic/models/parton_string/management/History

    r962 r1196  
    1 $Id: History,v 1.4 2008/04/01 08:20:25 vuzhinsk Exp $
     1$Id: History,v 1.7 2009/07/17 12:41:20 vuzhinsk Exp $
    22-------------------------------------------------------------------
    33
    … …  
    1515     * Please list in reverse chronological order (last date on top)
    1616     ---------------------------------------------------------------
     1717-July-2009 V. Uzhinsky  (had-partonstring-mgt-V09-02-01)
     18  A Status of nuclear nucleon involved in an interaction is introdused.
     19  Status: 0 - spectator, 1 - involved nucleon, 2 - absorbed nucleon
     20  (G4VSplitableHadron)
     21
     22  A connection between a participant nucleon and a nuclear nucleon was
     23  introsuced in G4InteractionContent.
     24
     2510-July-2009 V. Uzhinsky  (had-partonstring-mgt-V09-02-00)
     26  Introduction the right tag number.
     27
     289-July-2009 V. Uzhinsky     (had-partonstring-mgt-V08-02-02)
     29- New field was added in G4VSplitableHadron class (G4 bool Activation) and
     30  corresponding methods to operatite with it. It was needed for an
     31  absorption of meson in nuclear collision generated by FTF.
    1732
    183324-Apr 2007 Gunter Folger   (had-partonstring-mgt-V08-02-01)

  • trunk/source/processes/hadronic/models/parton_string/management/include/G4EventGenerator.hh

    r1007 r1196  
    2626//
    2727// $Id: G4EventGenerator.hh,v 1.3 2006/06/29 20:55:13 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030#ifndef G4EventGenerator_h

  • trunk/source/processes/hadronic/models/parton_string/management/include/G4InteractionCode.hh

    r1007 r1196  
    2626//
    2727// $Id: G4InteractionCode.hh,v 1.3 2006/06/29 20:55:15 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030#ifndef G4InteractionCode_h

  • trunk/source/processes/hadronic/models/parton_string/management/include/G4InteractionContent.hh

    r1007 r1196  
    2525//
    2626//
    27 // $Id: G4InteractionContent.hh,v 1.4 2007/01/24 10:28:54 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4InteractionContent.hh,v 1.5 2009/07/17 12:36:41 vuzhinsk Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030
    … …  
    4343
    4444#include "G4VSplitableHadron.hh"
    45 
     45#include "G4Nucleon.hh"                // Uzhi 16.07.09
    4646class G4InteractionContent
    4747{
    … …  
    5858      G4VSplitableHadron * GetProjectile() const ;
    5959      G4VSplitableHadron * GetTarget() const;
     60
     61      void                 SetTargetNucleon(G4Nucleon * aNucleon); // Uzhi 16.07.09
     62      G4Nucleon          * GetTargetNucleon() const;              // Uzhi 16.07.09
    6063
    6164      void SetTarget(G4VSplitableHadron *aTarget);
    … …  
    8689      G4VSplitableHadron * theTarget;
    8790      G4VSplitableHadron * theProjectile;
     91      G4Nucleon          * theTargetNucleon;
    8892     
    8993      G4int theNumberOfHard;
    … …  
    107111{
    108112        theTarget = aTarget;
     113}
     114
     115inline void G4InteractionContent::SetTargetNucleon(G4Nucleon * aNucleon) // Uzhi 16.07.09
     116{
     117        theTargetNucleon = aNucleon;
     118}
     119
     120inline G4Nucleon * G4InteractionContent::GetTargetNucleon() const       // Uzhi 16.07.09
     121{
     122       return theTargetNucleon;
    109123}
    110124

  • trunk/source/processes/hadronic/models/parton_string/management/include/G4PomeronCrossSection.hh

    r1007 r1196  
    2828//
    2929// $Id: G4PomeronCrossSection.hh,v 1.3 2006/06/29 20:55:19 gunter Exp $
    30 // GEANT4 tag $Name: geant4-09-02 $
     30// GEANT4 tag $Name: geant4-09-03-cand-01 $
    3131//
    3232#include "G4Proton.hh"

  • trunk/source/processes/hadronic/models/parton_string/management/include/G4StringModel.hh

    r1007 r1196  
    2626//
    2727// $Id: G4StringModel.hh,v 1.3 2006/06/29 20:55:23 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030#ifndef G4StringModel_h

  • trunk/source/processes/hadronic/models/parton_string/management/include/G4VParticipants.hh

    r1007 r1196  
    2525//
    2626//
    27 // $Id: G4VParticipants.hh,v 1.4 2008/05/19 13:03:20 vuzhinsk Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4VParticipants.hh,v 1.6 2009/11/19 14:23:09 gunter Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030
    … …  
    6565
    6666
    67   protected:
     67//  protected:   // Uzhi 26 July 09
    6868
    6969 
    … …  
    9090        if ( theNucleus == NULL ) theNucleus = new G4Fancy3DNucleus();
    9191        theNucleus->Init(theA, theZ);
    92         theNucleus->SortNucleonsInZ();    // Uzhi 16.05.08 Sorting of nucleon-Z
     92        theNucleus->SortNucleonsIncZ();
    9393}
    9494

  • trunk/source/processes/hadronic/models/parton_string/management/include/G4VPartonStringModel.hh

    r1007 r1196  
    2626//
    2727// $Id: G4VPartonStringModel.hh,v 1.3 2006/06/29 20:55:27 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030#ifndef G4VPartonStringModel_h

  • trunk/source/processes/hadronic/models/parton_string/management/include/G4VSplitableHadron.hh

    r1007 r1196  
    2525//
    2626//
    27 // $Id: G4VSplitableHadron.hh,v 1.4 2008/05/19 13:03:20 vuzhinsk Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4VSplitableHadron.hh,v 1.6 2009/07/17 12:36:41 vuzhinsk Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030
    … …  
    8181      const G4ThreeVector & GetPosition() const;
    8282
     83      void SetStatus(const G4int aStatus);             // Uzhi 17.07.09
     84      G4int GetStatus();                              // Uzhi 17.07.09
     85
    8386      virtual void SplitUp() = 0;
    8487      virtual G4Parton * GetNextParton() = 0 ;
    … …  
    106109      G4int theCollisionCount;
    107110
     111      G4int  Status;             // Uzhi 17.07.09
    108112      G4bool isSplit;
    109113
    … …  
    165169}
    166170
     171inline void G4VSplitableHadron::SetStatus(G4int aStatus)          // Uzhi 17.07.09
     172{
     173        Status=aStatus;
     174}
     175
     176inline G4int G4VSplitableHadron::GetStatus()                      // Uzhi 17.07.09
     177{
     178        return Status;
     179}
    167180
    168181

  • trunk/source/processes/hadronic/models/parton_string/management/include/G4VStringFragmentation.hh

    r1007 r1196  
    2626//
    2727// $Id: G4VStringFragmentation.hh,v 1.3 2006/06/29 20:55:31 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030#ifndef G4VStringFragmentation_h

  • trunk/source/processes/hadronic/models/parton_string/management/include/G4VertexCode.hh

    r1007 r1196  
    2626//
    2727// $Id: G4VertexCode.hh,v 1.3 2006/06/29 20:55:33 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030#ifndef G4VertexCode_h

  • trunk/source/processes/hadronic/models/parton_string/management/src/G4EventGenerator.cc

    r1007 r1196  
    2626//
    2727// $Id: G4EventGenerator.cc,v 1.4 2006/06/29 20:55:37 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// G4EventGenerator

  • trunk/source/processes/hadronic/models/parton_string/management/src/G4InteractionContent.cc

    r1007 r1196  
    2626//
    2727// $Id: G4InteractionContent.cc,v 1.4 2006/06/29 20:55:39 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// ------------------------------------------------------------

  • trunk/source/processes/hadronic/models/parton_string/management/src/G4PomeronCrossSection.cc

    r1007 r1196  
    2626//
    2727// $Id: G4PomeronCrossSection.cc,v 1.6 2006/11/07 12:51:39 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030

  • trunk/source/processes/hadronic/models/parton_string/management/src/G4StringModel.cc

    r1007 r1196  
    2626//
    2727// $Id: G4StringModel.cc,v 1.4 2006/06/29 20:55:45 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// G4StringModel

  • trunk/source/processes/hadronic/models/parton_string/management/src/G4VParticipants.cc

    r1007 r1196  
    2626//
    2727// $Id: G4VParticipants.cc,v 1.3 2006/06/29 20:55:47 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// ------------------------------------------------------------

  • trunk/source/processes/hadronic/models/parton_string/management/src/G4VPartonStringModel.cc

    r1007 r1196  
    2525//
    2626//
    27 // $Id: G4VPartonStringModel.cc,v 1.5 2007/01/24 10:29:30 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4VPartonStringModel.cc,v 1.6 2009/10/05 12:52:48 vuzhinsk Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030//// ------------------------------------------------------------
    … …  
    9999                throw G4HadronicException(__FILE__, __LINE__, "G4VPartonStringModel::Scatter(): fails to generate strings");
    100100        }
    101 
    102101        theThis->Init(theNucleus,thePrimary);
    103102        strings = GetStrings();
    … …  
    106105  G4KineticTrackVector * theResult = 0;
    107106  G4double stringEnergy(0);
     107
    108108  for ( unsigned int astring=0; astring < strings->size(); astring++)
    109109  {
    … …  
    137137           
    138138  theResult = stringFragmentationModel->FragmentStrings(strings);
     139/*
     140G4cout<<"Size "<<theResult->size()<<G4endl;
     141  for ( unsigned int i=0; i < theResult->size(); i++)
     142  {
     143
     144G4cout<<(*theResult)[i]->Get4Momentum()<<" "<<(*theResult)[i]->Get4Momentum().mag()<<G4endl;;
     145  }
     146*/
    139147  std::for_each(strings->begin(), strings->end(), DeleteString() );
    140148  delete strings;

  • trunk/source/processes/hadronic/models/parton_string/management/src/G4VSplitableHadron.cc

    r1007 r1196  
    2525//
    2626//
    27 // $Id: G4VSplitableHadron.cc,v 1.5 2008/05/19 13:03:20 vuzhinsk Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4VSplitableHadron.cc,v 1.7 2009/07/17 12:36:41 vuzhinsk Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030
    … …  
    4242
    4343G4VSplitableHadron::G4VSplitableHadron()
    44       :  theDefinition(NULL), TimeOfCreation(0.), theCollisionCount(0), isSplit(false) // Uzhi 8.05.08
     44      :  theDefinition(NULL), TimeOfCreation(0.), theCollisionCount(0),  // Uzhi 8.05.08
     45         Status(0), isSplit(false)                                       // Uzhi 17.07.09
    4546{
    4647}
    4748
    4849G4VSplitableHadron::G4VSplitableHadron(const G4ReactionProduct & aPrimary)
    49       :  TimeOfCreation(0.), theCollisionCount(0), isSplit(false)                     // Uzhi 8.05.08
     50      :  TimeOfCreation(0.), theCollisionCount(0),                       // Uzhi 8.05.08
     51         Status(0), isSplit(false)                                       // Uzhi 17.07.09
    5052{
    5153        theDefinition=aPrimary.GetDefinition();
    … …  
    5658G4VSplitableHadron::G4VSplitableHadron(const G4Nucleon & aNucleon)
    5759{
    58         TimeOfCreation   = 0.;   // Uzhi 8.05.08
     60        TimeOfCreation   = 0.;                                          // Uzhi 8.05.08
    5961        theCollisionCount= 0;
    6062        isSplit          = false;
    … …  
    6264        the4Momentum     =aNucleon.GetMomentum();
    6365        thePosition      =aNucleon.GetPosition();
     66        Status           = 0;                                           // Uzhi 17.07.09
    6467}
    6568
    … …  
    7275        the4Momentum     =aNucleon->Get4Momentum();
    7376        thePosition      =aNucleon->GetPosition();
     77        Status           = 0;                                        // Uzhi 17.07.09
    7478}
    7579
    … …  
    8286        the4Momentum     = right.Get4Momentum();
    8387        thePosition      =  right.GetPosition();
     88        Status           = 0;                                        // Uzhi 17.07.09
    8489}
    8590

  • trunk/source/processes/hadronic/models/parton_string/management/src/G4VStringFragmentation.cc

    r1007 r1196  
    2626//
    2727// $Id: G4VStringFragmentation.cc,v 1.4 2006/06/29 20:55:53 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// G4VStringFragmentation
Note: See TracChangeset for help on using the changeset viewer.