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/hadronization
Files:
14 edited

Legend:

Unmodified
Added
Removed

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

    r1055 r1196  
    1 $Id: History,v 1.7 2009/05/22 16:36:52 gunter Exp $
     1$Id: History,v 1.10 2009/07/17 12:30:45 vuzhinsk Exp $
    22-------------------------------------------------------------------
    33
    … …  
    1515     * Please list in reverse chronological order (last date on top)
    1616     ---------------------------------------------------------------
     1717-July-2009 V. Uzhinsky                 (had-hadronization-V09-02-03)
     18   Some small optimization are done.
     19---------------------------------------------------------------------
     209-July-2009 V. Uzhinsky                 (had-hadronization-V09-02-02)
     21---------------------------------------------------------------------
     22- Bug was fixed in G4VLongitudinalStringDecay.cc at calculation of
     23  formation/creation time, c_light was inserted.
     24- String tension parameter was set to the usual value (1 GeV/fm) in
     25  G4LundStringFragmentation.cc
    1726
     27--------------------------------------------------------------
    182822-May-2009   Gunter Folger             (had-hadronization-V09-02-01)
    1929- remove temporary workaround - fix is now in QGS
    … …  
    2333  implemented; affected .hh and .cc for new optional argument of max Pt
    2434  to SampleQuarkPt()
     35
    2536
    263718-May-2009   Gunter Folger             (had-hadronization-V09-02-00)

  • trunk/source/processes/hadronic/models/parton_string/hadronization/include/G4ExcitedStringDecay.hh

    r1007 r1196  
    2525//
    2626//
    27 // $Id: G4ExcitedStringDecay.hh,v 1.7 2007/05/03 22:06:17 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     27// $Id: G4ExcitedStringDecay.hh,v 1.10 2009/10/05 12:52:48 vuzhinsk Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030#ifndef G4ExcitedStringDecay_h
    … …  
    8181  G4LorentzVector KTsecondaries;
    8282  G4bool NeedEnergyCorrector=false;
    83  
     83//G4cout<<"Number of strings "<<theStrings->size()<<G4endl;   // Vova 
    8484  for ( unsigned int astring=0; astring < theStrings->size(); astring++)
    8585  {
     86//G4cout<<"String# "<<astring<<" 4mom "<<theStrings->operator[](astring)->Get4Momentum()<<G4endl;  // Vova
    8687        KTsum+= theStrings->operator[](astring)->Get4Momentum();
     88//G4cout<<"KTsum "<<KTsum<<G4endl;
    8789        if( !(KTsum.e()<1) && !(KTsum.e()>-1) )
    8890        {
    … …  
    105107                continue;
    106108        }
    107        
     109
     110//G4cout<<" prod had "<<generatedKineticTracks->size()<<G4endl; // Vova
    108111        G4LorentzVector KTsum1;
    109112        for ( unsigned int aTrack=0; aTrack<generatedKineticTracks->size();aTrack++)

  • trunk/source/processes/hadronic/models/parton_string/hadronization/include/G4FragmentingString.hh

    r1007 r1196  
    2626//
    2727// $Id: G4FragmentingString.hh,v 1.4 2007/12/20 15:38:06 vuzhinsk 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/hadronization/include/G4HadronBuilder.hh

    r1055 r1196  
    2626//
    2727// $Id: G4HadronBuilder.hh,v 1.5 2009/05/18 09:43:40 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// -----------------------------------------------------------------------------

  • trunk/source/processes/hadronic/models/parton_string/hadronization/include/G4LundStringFragmentation.hh

    r1007 r1196  
    2626//
    2727// $Id: G4LundStringFragmentation.hh,v 1.6 2008/04/25 14:20:14 vuzhinsk Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $ Maxim Komogorov
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $ Maxim Komogorov
    2929//
    3030// -----------------------------------------------------------------------------

  • trunk/source/processes/hadronic/models/parton_string/hadronization/include/G4QGSMFragmentation.hh

    r1007 r1196  
    2626//
    2727// $Id: G4QGSMFragmentation.hh,v 1.5 2007/12/20 15:38:07 vuzhinsk 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/hadronization/include/G4VKinkyStringDecay.hh

    r1007 r1196  
    2626//
    2727// $Id: G4VKinkyStringDecay.hh,v 1.3 2006/06/29 20:54:53 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//  Maxim Komogorov
    3030//

  • trunk/source/processes/hadronic/models/parton_string/hadronization/include/G4VLongitudinalStringDecay.hh

    r1055 r1196  
    2626//
    2727// $Id: G4VLongitudinalStringDecay.hh,v 1.7 2009/05/22 16:35:47 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929// Maxim Komogorov
    3030//

  • trunk/source/processes/hadronic/models/parton_string/hadronization/src/G4ExcitedStringDecay.cc

    r1055 r1196  
    148148    Beta = TotalCollisionMom.boostVector();
    149149    Output->Boost(Beta);
     150/* // Uzhi
     151G4cout<<"Number of produced hadrons // correct E and P "<<Output->size()<<G4endl; // Uzhi
     152    for(cHadron = 0; cHadron < Output->size(); cHadron++)
     153    {
     154G4cout<<cHadron<<" "<<Output->operator[](cHadron)->Get4Momentum()<<" "<<Output->operator[](cHadron)->Get4Momentum().mag()<<Output->operator[](cHadron)->GetDefinition()->GetParticleName()<<G4endl; 
     155    }
     156*/ // Uzhi
    150157    return success;
    151158  }

  • trunk/source/processes/hadronic/models/parton_string/hadronization/src/G4HadronBuilder.cc

    r1055 r1196  
    2626//
    2727// $Id: G4HadronBuilder.cc,v 1.10 2009/05/22 16:34:31 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// -----------------------------------------------------------------------------

  • trunk/source/processes/hadronic/models/parton_string/hadronization/src/G4LundStringFragmentation.cc

    r1055 r1196  
    2525//
    2626//
    27 // $Id: G4LundStringFragmentation.cc,v 1.14 2009/05/22 16:36:46 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03-beta-cand-01 $ 1.8
     27// $Id: G4LundStringFragmentation.cc,v 1.18 2009/10/05 12:52:48 vuzhinsk Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $ 1.8
    2929//
    3030// -----------------------------------------------------------------------------
    … …  
    5858    SmoothParam  = 0.2;                   
    5959
    60     SetStringTensionParameter(0.25);                           // Uzhi 20 June 08
     60//    SetStringTensionParameter(0.25);                           // Uzhi 20 June 08
     61    SetStringTensionParameter(1.);                           // Uzhi 20 June 09
    6162   }
    6263
    … …  
    196197            LeftVector->operator[](0)->SetPosition(aPosition);
    197198*/           
    198 //G4cout<<"Single hadron "<<LeftVector->operator[](0)->GetPosition()<<" "<<LeftVector->operator[](0)->GetFormationTime()<<G4endl;
     199//G4cout<<"Single hadron "<<LeftVector->operator[](0)->Get4Momentum()<<" "<<LeftVector->operator[](0)->Get4Momentum().mag()<<G4endl;
    199200          } else {    // 2 hadrons created from qq-qqbar are stored
    200201            LeftVector->operator[](0)->SetFormationTime(theString.GetTimeOfCreation());
    … …  
    293294        G4double      TimeOftheStringCreation=theString.GetTimeOfCreation();
    294295        G4ThreeVector PositionOftheStringCreation(theString.GetPosition());
    295 
     296// Uzhi 11.07.09
     297//G4cout<<" String T Pos"<<TimeOftheStringCreation<<' '<<PositionOftheStringCreation<<G4endl;
    296298/*  // For large formation time open *
    297299        G4double      TimeOftheStringCreation=theString.GetTimeOfCreation()+100*fermi;
    … …  
    313315        }
    314316*/
     317
     318//G4cout<<"Lund Frag # hadrons"<<LeftVector->size()<<G4endl;       // Uzhi 11.07.09
    315319        for(size_t C1 = 0; C1 < LeftVector->size(); C1++)
    316320        {
    … …  
    322326           G4LorentzVector Coordinate(Hadron->GetPosition(), Hadron->GetFormationTime());
    323327           Momentum = toObserverFrame*Coordinate;
    324            Hadron->SetFormationTime(TimeOftheStringCreation+Momentum.e());
     328           Hadron->SetFormationTime(TimeOftheStringCreation+Momentum.e()    // Uzhi 11.07.09
     329                                                           -fermi/c_light); // Uzhi 11.07.09
    325330           G4ThreeVector aPosition(Momentum.vect());
    326331//         Hadron->SetPosition(theString.GetPosition()+aPosition);
    327332           Hadron->SetPosition(PositionOftheStringCreation+aPosition);
    328333//G4cout<<"Hadron "<<C1<<" "<<Hadron->GetPosition()/fermi<<" "<<Hadron->GetFormationTime()/fermi<<G4endl;
     334/* // Uzhi 11.07.09
     335G4cout<<C1<<' '<<Hadron->GetDefinition()->GetParticleName()<<G4endl;
     336G4cout<<Hadron->GetDefinition()->GetPDGMass()<<' '
     337<<Hadron->Get4Momentum()<<G4endl;
     338G4cout<<Hadron->GetFormationTime()<<' '
     339<<Hadron->GetPosition()<<' '
     340<<Hadron->GetPosition().z()/fermi<<G4endl;
     341*/  // Uzhi
    329342        };
    330343
    … …  
    519532//              <<  "   pt2max= " << pt2max ;
    520533                                                                                         
    521          Pt=SampleQuarkPt(sqrt(pt2max)); Pt.setZ(0); G4double Pt2=Pt.mag2();
     534         Pt=SampleQuarkPt(std::sqrt(pt2max)); Pt.setZ(0); G4double Pt2=Pt.mag2();
    522535
    523536         

  • trunk/source/processes/hadronic/models/parton_string/hadronization/src/G4QGSMFragmentation.cc

    r1007 r1196  
    2626//
    2727// $Id: G4QGSMFragmentation.cc,v 1.9 2008/06/23 08:35:55 vuzhinsk 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/hadronization/src/G4VKinkyStringDecay.cc

    r1007 r1196  
    2626//
    2727// $Id: G4VKinkyStringDecay.cc,v 1.4 2008/04/25 14:20:14 vuzhinsk Exp $
    28 // GEANT4 tag $Name: geant4-09-02 $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//  Maxim Komogorov
    3030//

  • trunk/source/processes/hadronic/models/parton_string/hadronization/src/G4VLongitudinalStringDecay.cc

    r1055 r1196  
    2525//
    2626//
    27 // $Id: G4VLongitudinalStringDecay.cc,v 1.14 2009/05/22 16:35:47 gunter Exp $
    28 // GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
     27// $Id: G4VLongitudinalStringDecay.cc,v 1.18 2009/08/03 13:21:25 vuzhinsk Exp $
     28// GEANT4 tag $Name: geant4-09-03-cand-01 $
    2929//
    3030// -----------------------------------------------------------------------------
    … …  
    7171
    7272// Changable Parameters below.
    73    
    7473   SigmaQT = 0.5 * GeV;
    7574   
    … …  
    493492   } else {
    494493      // sample in limited range
    495       Pt = -std::log(CLHEP::RandFlat::shoot(exp(-sqr(ptMax)/sqr(SigmaQT)), 1.));
     494      Pt = -std::log(CLHEP::RandFlat::shoot(std::exp(-sqr(ptMax)/sqr(SigmaQT)), 1.));
    496495   }
    497496   Pt = SigmaQT * std::sqrt(Pt);
    … …  
    505504   {
    506505
    507    // `yo-yo` formation time
     506//  `yo-yo` formation time
    508507//   const G4double kappa = 1.0 * GeV/fermi/4.;      // Uzhi String tension 1.06.08
    509508     G4double kappa = GetStringTensionParameter();
    510509//G4cout<<"Kappa "<<kappa<<G4endl;                   // Uzhi 20.06.08
    511510//G4int Uzhi; G4cin>>Uzhi;                           // Uzhi 20.06.08
     511//G4cout<<"Number of hadrons "<<Hadrons->size()<<G4endl; // Vova
    512512   for(size_t c1 = 0; c1 < Hadrons->size(); c1++)
    513513      {
    … …  
    521521      G4double HadronE  = Hadrons->operator[](c1)->Get4Momentum().e();
    522522      G4double HadronPz = Hadrons->operator[](c1)->Get4Momentum().pz();
    523       Hadrons->operator[](c1)->SetFormationTime((theInitialStringMass - 2.*SumPz + HadronE - HadronPz)/(2.*kappa));
    524       G4ThreeVector aPosition(0, 0,     (theInitialStringMass - 2.*SumE  - HadronE + HadronPz)/(2.*kappa));
     523      Hadrons->operator[](c1)->SetFormationTime(
     524(theInitialStringMass - 2.*SumPz + HadronE - HadronPz)/(2.*kappa)/c_light); //Uzhi1.07.09c_light
     525
     526      G4ThreeVector aPosition(0, 0,     
     527(theInitialStringMass - 2.*SumE  - HadronE + HadronPz)/(2.*kappa));
    525528      Hadrons->operator[](c1)->SetPosition(aPosition);
     529
     530/*
     531G4cout<<"kappa "<<kappa<<G4endl;
     532G4cout<<c1<<" Partic time, position Old "<<
     533(theInitialStringMass - 2.*SumPz + HadronE - HadronPz)/(2.*kappa)<<' '<<
     534(theInitialStringMass - 2.*SumE  - HadronE + HadronPz)/(2.*kappa)<<G4endl;
     535
     536G4cout<<c1<<" Partic time, position New "<<
     537(theInitialStringMass - 2.*SumPz + HadronE - HadronPz)/(2.*kappa)/c_light<<' '<<
     538(theInitialStringMass - 2.*SumE  - HadronE + HadronPz)/(2.*kappa)<<G4endl;
     539
     540G4cout<<"fermi "<<fermi<<" 1/fermi "<<1./fermi<<' '<<"1*fermi/c "<<1.*fermi/c_light<<G4endl;
     541G4int Uzhi; G4cin>>Uzhi;                           // Uzhi 20.06.08
     542*/
    526543      }
    527544   }
Note: See TracChangeset for help on using the changeset viewer.