Changeset 1337 for trunk/source/processes/hadronic/models/parton_string/hadronization/src/G4VLongitudinalStringDecay.cc

Timestamp:

Sep 30, 2010, 2:47:17 PM (14 years ago)

Author:

garnier

Message:

tag geant4.9.4 beta 1 + modifs locales

File:

• trunk/source/processes/hadronic/models/parton_string/hadronization/src/G4VLongitudinalStringDecay.cc (modified) (10 diffs)

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

@@ -25 +25 @@
 //
 //
-// $Id: G4VLongitudinalStringDecay.cc,v 1.18 2009/08/03 13:21:25 vuzhinsk Exp $
-// GEANT4 tag $Name: geant4-09-03 $
+// $Id: G4VLongitudinalStringDecay.cc,v 1.20 2010/06/21 17:50:48 vuzhinsk Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-01 $
 //
 // -----------------------------------------------------------------------------
@@ -179 +179 @@
                       << string->Get4Momentum().m() << G4endl;
 #endif                
-G4cout << "VlongSF Warning replacing string by single hadron " <<G4endl;
-G4cout << hadrons.first->GetParticleName() << " string .. " <<G4endl;
-G4cout << string->Get4Momentum() << " " << string->Get4Momentum().m() << G4endl;
 */
                G4ThreeVector   Mom3 = string->Get4Momentum().vect();
@@ -201 +198 @@
                       << string->Get4Momentum().m() << G4endl;
 #endif                
-
-// Uzhi Formation time in the case???
 
                G4LorentzVector  Mom1, Mom2;
@@ -328 +323 @@
                         G4FragmentingString *&newString)
 {
-//G4cout<<"In G4VLong String Dec######################"<<G4endl;
-
        //... random choice of string end to use for creating the hadron (decay)   
        SideOfDecay = (G4UniformRand() < 0.5)? 1: -1;
@@ -354 +347 @@
        G4LorentzVector* HadronMomentum=SplitEandP(HadronDefinition, string, newString);
 
-       delete newString; newString=0;                          // Uzhi 20.06.08
+       delete newString; newString=0;                          
         
        G4KineticTrack * Hadron =0;
@@ -365 +358 @@
                                         HadronMomentum);
 
-//G4cout<<"Out G4VLong String Dec######################"<<G4endl;          
-//G4cout<<"newString 4Mom"<<newString->Get4Momentum()<<G4endl;
-//G4cout<<"newString Pl  "<<newString->LightConePlus()<<G4endl;
-//G4cout<<"newString Mi  "<<newString->LightConeMinus()<<G4endl;
-//G4cout<<"newString Pts "<<newString->StablePt()<<G4endl;
-//G4cout<<"newString Ptd "<<newString->DecayPt()<<G4endl;
-//G4cout<<"newString M2  "<<newString->Mass2()<<G4endl;
-//G4cout<<"newString M2  "<<newString->Mass()<<G4endl;
            delete HadronMomentum;
        }      
@@ -474 +459 @@
 
 //-----------------------------------------------------------------------------
-
-// G4ThreeVector G4VLongitudinalStringDecay::SampleQuarkPt()
-//    {
-//    G4double width_param= 2.0 * GeV*GeV;
-//    G4double R = G4UniformRand();
-//    G4double Pt = std::sqrt(width_param*R/(1-R));
-//    G4double phi = 2.*pi*G4UniformRand();
-//    return G4ThreeVector(Pt * std::cos(phi),Pt * std::sin(phi),0);
-//    }
-
 G4ThreeVector G4VLongitudinalStringDecay::SampleQuarkPt(G4double ptMax)
    {
@@ -505 +480 @@
 
 //   `yo-yo` formation time
-//   const G4double kappa = 1.0 * GeV/fermi/4.;      // Uzhi String tension 1.06.08
-     G4double kappa = GetStringTensionParameter();
-//G4cout<<"Kappa "<<kappa<<G4endl;                   // Uzhi 20.06.08
-//G4int Uzhi; G4cin>>Uzhi;                           // Uzhi 20.06.08
-//G4cout<<"Number of hadrons "<<Hadrons->size()<<G4endl; // Vova
+//   const G4double kappa = 1.0 * GeV/fermi/4.;      
+   G4double kappa = GetStringTensionParameter();
    for(size_t c1 = 0; c1 < Hadrons->size(); c1++)
       {
@@ -522 +494 @@
       G4double HadronPz = Hadrons->operator[](c1)->Get4Momentum().pz();
       Hadrons->operator[](c1)->SetFormationTime(
-(theInitialStringMass - 2.*SumPz + HadronE - HadronPz)/(2.*kappa)/c_light); //Uzhi1.07.09c_light
+(theInitialStringMass - 2.*SumPz + HadronE - HadronPz)/(2.*kappa)/c_light); 
 
       G4ThreeVector aPosition(0, 0,     
@@ -528 +500 @@
       Hadrons->operator[](c1)->SetPosition(aPosition);
 
-/*
-G4cout<<"kappa "<<kappa<<G4endl;
-G4cout<<c1<<" Partic time, position Old "<<
-(theInitialStringMass - 2.*SumPz + HadronE - HadronPz)/(2.*kappa)<<' '<<
-(theInitialStringMass - 2.*SumE  - HadronE + HadronPz)/(2.*kappa)<<G4endl;
-
-G4cout<<c1<<" Partic time, position New "<<
-(theInitialStringMass - 2.*SumPz + HadronE - HadronPz)/(2.*kappa)/c_light<<' '<<
-(theInitialStringMass - 2.*SumE  - HadronE + HadronPz)/(2.*kappa)<<G4endl;
-
-G4cout<<"fermi "<<fermi<<" 1/fermi "<<1./fermi<<' '<<"1*fermi/c "<<1.*fermi/c_light<<G4endl;
-G4int Uzhi; G4cin>>Uzhi;                           // Uzhi 20.06.08
-*/
       } 
    }
 
 //-----------------------------------------------------------------------------
-
-/*
-void G4VLongitudinalStringDecay::CalculateHadronTimePosition(G4double theInitialStringMass, G4KineticTrackVector* Hadrons)
-   {
-   // 'constituent' formation time 
-   const G4double kappa = 1.0 * GeV/fermi;
-   for(G4int c1 = 0; c1 < Hadrons->length(); c1++)
-      {
-      G4double SumPz = 0; 
-      G4double SumE  = 0;
-      for(G4int c2 = 0; c2 <= c1; c2++)
-         {
-         SumPz += Hadrons->at(c2)->Get4Momentum().pz();
-         SumE  += Hadrons->at(c2)->Get4Momentum().e();   
-         } 
-      Hadrons->at(c1)->SetFormationTime((theInitialStringMass - 2.*SumPz)/(2.*kappa));
-      G4ThreeVector aPosition(0, 0,     (theInitialStringMass - 2.*SumE)/(2.*kappa));
-      Hadrons->at(c1)->SetPosition(aPosition);
-      } 
-   c1 = Hadrons->length()-1;   
-   Hadrons->at(c1)->SetFormationTime(Hadrons->at(c1-1)->GetFormationTime());
-   Hadrons->at(c1)->SetPosition(Hadrons->at(c1-1)->GetPosition());
-   }
-*/
-
-
-//*****************************************************************************
 
 void G4VLongitudinalStringDecay::SetSigmaTransverseMomentum(G4double aValue)