Updates EvtGen Code

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

diff --git a/TEvtGen/EvtGenModels/EvtSVVHelCPMix.cxx b/TEvtGen/EvtGenModels/EvtSVVHelCPMix.cpp
similarity index 82%
rename from TEvtGen/EvtGenModels/EvtSVVHelCPMix.cxx
rename to TEvtGen/EvtGenModels/EvtSVVHelCPMix.cpp
index ca0ce13f00038d1826a9211849e0709e00c389a3..425e175d3942986b0d514ed90a70ba8727dc185e 100644 (file)
--- a/TEvtGen/EvtGenModels/EvtSVVHelCPMix.cxx
+++ b/TEvtGen/EvtGenModels/EvtSVVHelCPMix.cpp
@@ -124,24 +124,23 @@ void EvtSVVHelCPMix::decay( EvtParticle *p){
   v2 = parent->getDaug(1);
 
   EvtVector4R momv1 = v1->getP4();
-  EvtVector4R momv2 = v2->getP4();
 
   EvtVector3R v1dir(momv1.get(1),momv1.get(2),momv1.get(3));
   v1dir=v1dir/v1dir.d3mag();
 
-// Definition of quantities used in construction of complex amplitudes:
+  // Definition of quantities used in construction of complex amplitudes:
 
-EvtTensor3C M;  // Tensor as defined in EvtGen manual, equ 117
-EvtComplex a,b,c; // Helicity amplitudes; EvtGen manual eqns 126-128, also see Phys Lett B 369 p144-150 eqn 15
-EvtComplex deltamu = EvtComplex(deltaM, -0.5*deltagamma); // See Phys Rev D 34 p1404
+  EvtTensor3C M;  // Tensor as defined in EvtGen manual, equ 117
+  EvtComplex a,b,c; // Helicity amplitudes; EvtGen manual eqns 126-128, also see Phys Lett B 369 p144-150 eqn 15
+  //EvtComplex deltamu = EvtComplex(deltaM, -0.5*deltagamma); // See Phys Rev D 34 p1404
 
-// conversion from times in mm/c to natural units [GeV]^-1
-double t = ((parent->getLifetime())/2.998e11)*6.58e-25; 
+  // conversion from times in mm/c to natural units [GeV]^-1
+  double t = ((parent->getLifetime())/2.998e11)*6.58e-25; 
 
-// The following two quantities defined in Phys Rev D 34 p1404
-EvtComplex fplus =  EvtComplex(cos(averageM*t),-1.*sin(averageM*t))*exp(-(gamma/2.0)*t)*
+  // The following two quantities defined in Phys Rev D 34 p1404
+  EvtComplex fplus =  EvtComplex(cos(averageM*t),-1.*sin(averageM*t))*exp(-(gamma/2.0)*t)*
     (cos(0.5*deltaM*t)*cosh(0.25*deltagamma*t)+EvtComplex(0.0,sin(0.5*deltaM*t)*sinh(0.25*deltagamma*t)));
-EvtComplex fminus = EvtComplex(cos(averageM*t), -1.*sin(averageM*t))*exp(-(gamma/2.0)*t)*EvtComplex(0.0,1.0)*
+  EvtComplex fminus = EvtComplex(cos(averageM*t), -1.*sin(averageM*t))*exp(-(gamma/2.0)*t)*EvtComplex(0.0,1.0)*
     (sin(0.5*deltaM*t)*cosh(0.25*deltagamma*t)-EvtComplex(0.0,1.0)*sinh(0.25*deltagamma*t)*cos(0.5*deltaM*t)); 
 
 // See EvtGen manual pp 106-107
@@ -151,8 +150,8 @@ EvtComplex fminus = EvtComplex(cos(averageM*t), -1.*sin(averageM*t))*exp(-(gamma
   c=(h0+0.5*(hp+hm));
   
   M=a*EvtTensor3C::id()+
-                b*eps(v1dir)+
-                c*directProd(v1dir,v1dir);
+    b*EvtGenFunctions::eps(v1dir)+
+    c*EvtGenFunctions::directProd(v1dir,v1dir);
                
   EvtVector3C t0=M.cont1(v1->eps(0).vec().conj());
   EvtVector3C t1=M.cont1(v1->eps(1).vec().conj());
@@ -231,4 +230,52 @@ EvtComplex fminus = EvtComplex(cos(averageM*t), -1.*sin(averageM*t))*exp(-(gamma
 
 }
 
+std::string EvtSVVHelCPMix::getParamName(int i) {
+  switch(i) {
+  case 0:
+    return "plusHelAmp";
+  case 1:
+    return "plusHelAmpPhase";
+  case 2:
+    return "zeroHelAmp";
+  case 3:
+    return "zeroHelAmpPhase";
+  case 4:
+    return "minusHelAmp";
+  case 5:
+    return "minusHelAmpPhase";
+  case 6:
+    return "averageM";
+  case 7:
+    return "deltaM";
+  case 8:
+    return "gamma";
+  case 9:
+    return "deltaGamma";
+  case 10:
+    return "weakMixPhase";
+  case 11:
+    return "weakDirectPhase";
+  default:
+    return "";
+  }
+}
 
+std::string EvtSVVHelCPMix::getParamDefault(int i) {
+  switch(i) {
+  case 0:
+    return "1.0";
+  case 1:
+    return "0.0";
+  case 2:
+    return "1.0";
+  case 3:
+    return "0.0";
+  case 4:
+    return "1.0";
+  case 5:
+    return "0.0";
+  default:
+    return "";
+  }
+}