X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=STARLIGHT%2Fstarlight%2Fsrc%2Fgammagammaleptonpair.cpp;h=cdcb458130a36a58b0d8e720bfd2af35045da134;hb=0e1bd874534d3ce0b2f32083440760c9acfd3bae;hp=f1b871df2033c642b0755c850d8bf442e99ee04a;hpb=37486cebd88560b91a0c0f7703b911cd93e91510;p=u%2Fmrichter%2FAliRoot.git

diff --git a/STARLIGHT/starlight/src/gammagammaleptonpair.cpp b/STARLIGHT/starlight/src/gammagammaleptonpair.cpp
index f1b871df203..cdcb458130a 100644
--- a/STARLIGHT/starlight/src/gammagammaleptonpair.cpp
+++ b/STARLIGHT/starlight/src/gammagammaleptonpair.cpp
@@ -20,9 +20,9 @@
 ///////////////////////////////////////////////////////////////////////////
 //
 // File and Version Information:
-// $Rev:: 164                         $: revision of last commit
-// $Author:: odjuvsla                 $: author of last commit
-// $Date:: 2013-10-06 16:18:08 +0200 #$: date of last commit
+// $Rev:: 184                         $: revision of last commit
+// $Author:: jnystrand                $: author of last commit
+// $Date:: 2014-09-12 00:59:43 +0200 #$: date of last commit
 //
 // Description:
 //    Nystrand 220710
@@ -64,7 +64,7 @@ Gammagammaleptonpair::Gammagammaleptonpair(beamBeamSystem& bbsystem)
     //Now we will calculate the crosssection
     twoLeptonCrossSection();
     //If it is a tauon, calculate its tables
-    if(inputParametersInstance.prodParticleId()==starlightConstants::TAUON) calculateTable();
+    if(inputParametersInstance.prodParticleId()==starlightConstants::TAUONDECAY) calculateTable();
 }
 
 
@@ -198,7 +198,6 @@ void Gammagammaleptonpair::pickw(double &w)
 	_remainwd = remainw;
 	//calculate the w value
 	w = _Warray[ivalw]+(_Warray[ivalw+1]-_Warray[ivalw])*remainw;
-
     }
 }
 
@@ -399,12 +398,10 @@ void Gammagammaleptonpair::twoBodyDecay(starlightConstants::particleTypeEnum &ip
     double mdec=0.,E1=0.,E2=0.;
     double pmag, anglelep[20001];
     // double ytest=0.,dndtheta;
-    double phi,theta(0),xtest,Ecm;
+    double phi,theta,xtest,Ecm;
     double betax,betay,betaz;
     double hirestheta,hirestest,hiresw;  //added from JN->needed precision
 
-    //    set the mass of the daughter particles
-
     mdec = getMass();
     if(W < 2*mdec)
     {
@@ -472,7 +469,7 @@ void Gammagammaleptonpair::twoBodyDecay(starlightConstants::particleTypeEnum &ip
     E2 = sqrt(mdec*mdec+px2*px2+py2*py2+pz2*pz2);
     //        decay tau to electrons
     //        note that after this routine px1, etc., refer to the electrons
-    if(_GGlepInputpidtest == starlightConstants::TAUON)
+    if(_GGlepInputpidtest == starlightConstants::TAUONDECAY)
         tauDecay(px1,py1,pz1,E1,px2,py2,pz2,E2);
 
     //     Lorentz transform into the lab frame
@@ -490,10 +487,11 @@ void Gammagammaleptonpair::twoBodyDecay(starlightConstants::particleTypeEnum &ip
 
     // change particle id from that of parent to that of daughters
     // change taoun id into electron id, already switched particles in tau decay
-    if(_GGlepInputpidtest == starlightConstants::TAUON)
+    if(_GGlepInputpidtest == starlightConstants::TAUONDECAY)
         ipid = starlightConstants::ELECTRON;
     //        electrons remain electrons; muons remain muons
-    if ((_GGlepInputpidtest == starlightConstants::ELECTRON) || (_GGlepInputpidtest == starlightConstants::MUON))
+    if ( (_GGlepInputpidtest == starlightConstants::ELECTRON) || (_GGlepInputpidtest == starlightConstants::MUON) || 
+         (_GGlepInputpidtest == starlightConstants::TAUON) )
         ipid = _GGlepInputpidtest;
 }
 
@@ -644,6 +642,8 @@ upcEvent Gammagammaleptonpair::produceEvent()
 	 }
        }
      }
+     else if(!_ptCutEnabled && !_etaCutEnabled) 
+	_nmbAccepted++;
     
    }while((_ptCutEnabled || _etaCutEnabled) && !accepted);
    //twoBodyDecay(ipid,pairE,comenergy,pairmomx,pairmomy,pairmomz,px1,py1,pz1,px2,py2,pz2,iFbadevent);
@@ -823,6 +823,9 @@ double Gammagammaleptonpair::getMass()
     case starlightConstants::TAUON:
 	leptonmass=starlightConstants::tauMass;
 	break;
+    case starlightConstants::TAUONDECAY:
+	leptonmass=starlightConstants::tauMass;
+	break;
     default:
 	cout<<"Not a recognized lepton, Gammagammaleptonpair::getmass(), mass = 0."<<endl;
     }