Updates EvtGen Code

[u/mrichter/AliRoot.git] / TEvtGen / EvtGenModels / EvtBHadronic.cpp

diff --git a/TEvtGen/EvtGenModels/EvtBHadronic.cxx b/TEvtGen/EvtGenModels/EvtBHadronic.cpp
similarity index 82%
rename from TEvtGen/EvtGenModels/EvtBHadronic.cxx
rename to TEvtGen/EvtGenModels/EvtBHadronic.cpp
index 2520391a284b519951b757b3cbf3426091270278..3a0ed8524c371d97d604f5771be09862ab188758 100644 (file)
--- a/TEvtGen/EvtGenModels/EvtBHadronic.cxx
+++ b/TEvtGen/EvtGenModels/EvtBHadronic.cpp
@@ -73,9 +73,7 @@ void EvtBHadronic::decay( EvtParticle *p){
   p->initializePhaseSpace(getNDaug(),getDaugs());
 
   EvtVector4R p4[MAX_DAUG];
-  double m;
-
-  m = p->mass();
+  p->mass();
 
 
   int i,j;
@@ -127,9 +125,10 @@ void EvtBHadronic::decay( EvtParticle *p){
 
     g.setdiag(1.0,-1.0,-1.0,-1.0);
     tds = -f*g 
-      -ap*(directProd(p4b,p4b)+directProd(p4b,p4[0]))
-      -gf*EvtComplex(0.0,1.0)*dual(directProd(p4[0]+p4b,p4b-p4[0]))
-      -am*((directProd(p4b,p4b)-directProd(p4b,p4[0])));
+      -ap*(EvtGenFunctions::directProd(p4b,p4b)+EvtGenFunctions::directProd(p4b,p4[0]))
+      -gf*EvtComplex(0.0,1.0)*dual(EvtGenFunctions::directProd(p4[0]+p4b,p4b-p4[0]))
+      -am*((EvtGenFunctions::directProd(p4b,p4b)-
+            EvtGenFunctions::directProd(p4b,p4[0])));
     jb[0]=tds.cont1(p->getDaug(0)->epsParent(0).conj());
     jb[1]=tds.cont1(p->getDaug(0)->epsParent(1).conj());
     jb[2]=tds.cont1(p->getDaug(0)->epsParent(2).conj());
@@ -143,9 +142,11 @@ void EvtBHadronic::decay( EvtParticle *p){
 
     g.setdiag(1.0,-1.0,-1.0,-1.0);
     tds = -f*g 
-      -ap*(directProd(p4b,p4b)+directProd(p4b,p4[0]))
-      -gf*EvtComplex(0.0,1.0)*dual(directProd(p4[0]+p4b,p4b-p4[0]))
-      -am*((directProd(p4b,p4b)-directProd(p4b,p4[0])));
+      -ap*(EvtGenFunctions::directProd(p4b,p4b)+
+           EvtGenFunctions::directProd(p4b,p4[0]))
+      -gf*EvtComplex(0.0,1.0)*dual(EvtGenFunctions::directProd(p4[0]+p4b,p4b-p4[0]))
+      -am*((EvtGenFunctions::directProd(p4b,p4b)-
+            EvtGenFunctions::directProd(p4b,p4[0])));
     jb[0]=tds.cont1(p->getDaug(0)->epsParent(0).conj());
     jb[1]=tds.cont1(p->getDaug(0)->epsParent(1).conj());
     jb[2]=tds.cont1(p->getDaug(0)->epsParent(2).conj());
@@ -174,23 +175,23 @@ void EvtBHadronic::decay( EvtParticle *p){
     ep_meson_bb[3]=ep_meson_b[3]*(p4b);
     ep_meson_bb[4]=ep_meson_b[4]*(p4b);
     
-    jb[0]=EvtComplex(0.0,(1.0)*hf)*dual(directProd(pp,pm)).cont2(ep_meson_b[0])
+    jb[0]=EvtComplex(0.0,(1.0)*hf)*dual(EvtGenFunctions::directProd(pp,pm)).cont2(ep_meson_b[0])
        -kf*ep_meson_b[0]
        -bp*ep_meson_bb[0]*pp-bm*ep_meson_bb[0]*pm;
      
-    jb[1]=EvtComplex(0.0,(1.0)*hf)*dual(directProd(pp,pm)).cont2(ep_meson_b[1])
+    jb[1]=EvtComplex(0.0,(1.0)*hf)*dual(EvtGenFunctions::directProd(pp,pm)).cont2(ep_meson_b[1])
        -kf*ep_meson_b[1]
        -bp*ep_meson_bb[1]*pp-bm*ep_meson_bb[1]*pm;
     
-    jb[2]=EvtComplex(0.0,(1.0)*hf)*dual(directProd(pp,pm)).cont2(ep_meson_b[2])
+    jb[2]=EvtComplex(0.0,(1.0)*hf)*dual(EvtGenFunctions::directProd(pp,pm)).cont2(ep_meson_b[2])
        -kf*ep_meson_b[2]
        -bp*ep_meson_bb[2]*pp-bm*ep_meson_bb[2]*pm;
     
-    jb[3]=EvtComplex(0.0,(1.0)*hf)*dual(directProd(pp,pm)).cont2(ep_meson_b[3])
+    jb[3]=EvtComplex(0.0,(1.0)*hf)*dual(EvtGenFunctions::directProd(pp,pm)).cont2(ep_meson_b[3])
        -kf*ep_meson_b[3]
        -bp*ep_meson_bb[3]*pp-bm*ep_meson_bb[3]*pm;
     
-    jb[4]=EvtComplex(0.0,(1.0)*hf)*dual(directProd(pp,pm)).cont2(ep_meson_b[4])
+    jb[4]=EvtComplex(0.0,(1.0)*hf)*dual(EvtGenFunctions::directProd(pp,pm)).cont2(ep_meson_b[4])
        -kf*ep_meson_b[4]
        -bp*ep_meson_bb[4]*pp-bm*ep_meson_bb[4]*pm;
     break;
@@ -203,9 +204,11 @@ void EvtBHadronic::decay( EvtParticle *p){
     ffmodel.getvectorff(B0,D1P10,EvtPDL::getMeanMass(D1P10),q2,&f,&gf,&ap,&am);
     g.setdiag(1.0,-1.0,-1.0,-1.0);
     tds = -f*g 
-      -ap*(directProd(p4b,p4b)+directProd(p4b,p4[0]))
-      +gf*EvtComplex(0.0,1.0)*dual(directProd(p4[0]+p4b,p4b-p4[0]))
-      -am*((directProd(p4b,p4b)-directProd(p4b,p4[0])));
+      -ap*(EvtGenFunctions::directProd(p4b,p4b)+
+           EvtGenFunctions::directProd(p4b,p4[0]))
+      +gf*EvtComplex(0.0,1.0)*dual(EvtGenFunctions::directProd(p4[0]+p4b,p4b-p4[0]))
+      -am*((EvtGenFunctions::directProd(p4b,p4b)-
+            EvtGenFunctions::directProd(p4b,p4[0])));
     jb[0]=tds.cont1(p->getDaug(0)->epsParent(0).conj());
     jb[1]=tds.cont1(p->getDaug(0)->epsParent(1).conj());
     jb[2]=tds.cont1(p->getDaug(0)->epsParent(2).conj());