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

update CVS release candidate geant4.9.3.01

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

Legend:

Unmodified
Added
Removed

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