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

update processes

Location:
trunk/source/processes/hadronic/models/parton_string/diffraction/include
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/source/processes/hadronic/models/parton_string/diffraction/include/G4DiffractiveExcitation.hh

    r819 r962  
    2525//
    2626//
    27 // $Id: G4DiffractiveExcitation.hh,v 1.1 2007/05/25 06:56:53 vuzhinsk Exp $
     27// $Id: G4DiffractiveExcitation.hh,v 1.2 2008/04/25 14:20:13 vuzhinsk Exp $
    2828
    2929#ifndef G4DiffractiveExcitation_h
    … …  
    4242class G4VSplitableHadron;
    4343class G4ExcitedString;
     44#include "G4FTFParameters.hh"                            // Uzhi 19.04.08
    4445#include "G4ThreeVector.hh"
    4546
    … …  
    5253      virtual ~G4DiffractiveExcitation();
    5354
    54       virtual G4bool ExciteParticipants (G4VSplitableHadron *aPartner, G4VSplitableHadron * bPartner) const;
     55      virtual G4bool ExciteParticipants (G4VSplitableHadron *aPartner,
     56                                         G4VSplitableHadron * bPartner,
     57                                         G4FTFParameters *theParameters) const;
     58
    5559      virtual G4ExcitedString * String(G4VSplitableHadron * aHadron, G4bool isProjectile) const;
    56      
    57 //      void SetPtWidth(G4double aValue) { widthOfPtSquare = aValue*aValue; }
    58 //      void SetExtraMass(G4double aValue) { minExtraMass = aValue; }
    59 //      void SetMinimumMass(G4double aValue) { minmass = aValue; }
    60 
    6160
    6261  private:
    … …  
    6463      G4DiffractiveExcitation(const G4DiffractiveExcitation &right);
    6564     
    66 //    G4double ChooseX(G4double Xmin, G4double Xmax) const;                      // Uzhi
     65      G4ThreeVector GaussianPt(G4double  AveragePt2, G4double maxPtSquare) const; // Uzhi
    6766      G4double ChooseP(G4double Pmin, G4double Pmax) const;                       // Uzhi
    68 
    69 //    G4ThreeVector GaussianPt(G4double widthSquare, G4double maxPtSquare) const;
    70       G4ThreeVector GaussianPt(G4double  AveragePt2, G4double maxPtSquare) const;  // Uzhi
    7167     
    7268      const G4DiffractiveExcitation & operator=(const G4DiffractiveExcitation &right);
    … …  
    7470      int operator!=(const G4DiffractiveExcitation &right) const;
    7571
    76   private:
    77 // Model Parameters:
    78 /*                                                                                // Uzhi
    79         const G4double widthOfPtSquare; // width^2 of pt for string excitation   
    80         const G4double minExtraMass;    // minimum excitation mass               
    81         const G4double minmass; // mean pion transverse mass; used for Xmin       
    82 */                                                                                // Uzhi
    8372};
    8473

  • trunk/source/processes/hadronic/models/parton_string/diffraction/include/G4DiffractiveHHScatterer.hh

    r819 r962  
    2525//
    2626//
    27 // $Id: G4DiffractiveHHScatterer.hh,v 1.3 2006/06/29 20:54:25 gunter Exp $
     27// $Id: G4DiffractiveHHScatterer.hh,v 1.4 2008/04/25 14:20:13 vuzhinsk Exp $
    2828
    2929#ifndef G4DiffractiveHHScatterer_h
    … …  
    4444class G4KineticTrack;
    4545#include "G4KineticTrackVector.hh"
     46#include "G4FTFParameters.hh"                            // Uzhi 21.04.08
    4647
    4748class G4DiffractiveHHScatterer
    … …  
    5758const G4DiffractiveExcitation * theExcitation;
    5859G4LundStringFragmentation * theStringFragmentation;
     60G4FTFParameters  *theParameters;                       // Uzhi  21.04.08
    5961};
    6062

  • trunk/source/processes/hadronic/models/parton_string/diffraction/include/G4DiffractiveSplitableHadron.hh

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

  • trunk/source/processes/hadronic/models/parton_string/diffraction/include/G4FTFModel.hh

    r819 r962  
    2525//
    2626//
    27 // $Id: G4FTFModel.hh,v 1.5 2007/04/24 10:32:59 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-01-patch-02 $
     27// $Id: G4FTFModel.hh,v 1.7 2008/04/25 14:20:13 vuzhinsk Exp $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030// Class Description
    … …  
    5252class G4VSplitableHadron;
    5353class G4ExcitedString;
     54
     55#include "G4FTFParameters.hh"                            // Uzhi 29.03.08
    5456#include "G4FTFParticipants.hh"
    5557
    5658#include "G4ExcitedStringVector.hh"
    5759#include "G4DiffractiveExcitation.hh"
    58 
     60#include "G4ElasticHNScattering.hh"
    5961
    6062class G4FTFModel : public G4VPartonStringModel
    … …  
    8486 
    8587  private:     
    86        
     88
     89       G4ReactionProduct theProjectile;       
    8790       G4FTFParticipants theParticipants;
    88        G4ReactionProduct theProjectile;
    89        
     91
     92       G4FTFParameters  *theParameters;        // Uzhi  29.03.08
    9093       G4DiffractiveExcitation * theExcitation;
    91 
     94       G4ElasticHNScattering   * theElastic;   // Uzhi 29.03.08
    9295
    9396
    9497};
    9598
     99// ------------------------------------------------------------
    96100inline
    97101G4V3DNucleus * G4FTFModel::GetWoundedNucleus() const

  • trunk/source/processes/hadronic/models/parton_string/diffraction/include/G4FTFParticipants.hh

    r819 r962  
    2525//
    2626//
    27 // $Id: G4FTFParticipants.hh,v 1.4 2006/06/29 20:54:32 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-01-patch-02 $
     27// $Id: G4FTFParticipants.hh,v 1.5 2008/03/31 15:34:01 vuzhinsk Exp $
     28// GEANT4 tag $Name: geant4-09-02-ref-02 $
    2929//
    3030
    … …  
    4141
    4242#include "G4VParticipants.hh"
     43#include "G4FTFParameters.hh"   // Uzhi 29.03.08
    4344#include <vector>
    4445#include "G4Nucleon.hh"
    … …  
    6061      int operator!=(const G4FTFParticipants &right) const;
    6162
    62       void BuildInteractions(const G4ReactionProduct  &thePrimary);
     63      void GetList(const G4ReactionProduct  &thePrimary,
     64                         G4FTFParameters    *theParameters); // Uzhi 29.03.08
     65
     66      void StartLoop();
    6367      G4bool Next();
    6468      const G4InteractionContent & GetInteraction() const;
    65 
    66       void StartLoop();
    6769     
     70      std::vector<G4InteractionContent *> theInteractions;
    6871  private:
    6972
    70       std::vector<G4InteractionContent *> theInteractions;
     73//      std::vector<G4InteractionContent *> theInteractions;
    7174 
    7275      G4int currentInteraction;
    … …  
    9598
    9699#endif
    97 
    98 
Note: See TracChangeset for help on using the changeset viewer.