diff --git a/Examples/pbarpToOmegaPi/GOmegaPiProject.cfg b/Examples/pbarpToOmegaPi/GOmegaPiProject.cfg index 6ee48756d764249e381e134959c3ac370a626936..5050a70223a2c783d2aab2ba37b1432ae3766d07 100644 --- a/Examples/pbarpToOmegaPi/GOmegaPiProject.cfg +++ b/Examples/pbarpToOmegaPi/GOmegaPiProject.cfg @@ -6,10 +6,10 @@ # The amount of random number producer threads #nProducerThreads = 8 -nProducerThreads = 2 +nProducerThreads = 4 # The amount of threads processing individuals simultaneously #nEvaluationThreads = 16 -nEvaluationThreads = 4 +nEvaluationThreads = 8 # The size of the population populationSize = 100 # The number of parents in the population diff --git a/Examples/pbarpToOmegaPi/OmegaPiLh.cc b/Examples/pbarpToOmegaPi/OmegaPiLh.cc index 8c6ab6c561a207a603ea349116139c278b800d8e..3d89fea69b7af33caf88a2c2c616d16d75c369a1 100644 --- a/Examples/pbarpToOmegaPi/OmegaPiLh.cc +++ b/Examples/pbarpToOmegaPi/OmegaPiLh.cc @@ -90,12 +90,11 @@ complex<double> OmegaPiLh::calcCoherentAmp(Spin lamgamma, Spin Minit, std::map< for ( it=fitParm.begin(); it!=fitParm.end(); ++it){ boost::shared_ptr<const JPCLS> theJPCLS=it->first; if (fabs(lamomega)>theJPCLS->J) continue; - complex<double> omegaDecAmp=Clebsch(1,0,1,lamgamma,1, lamgamma)*Clebsch(1,lamgamma,0,0,1, lamgamma)*theData.Dfp[1][lamomega][lamgamma]; + complex<double> omegaDecAmp=Clebsch(1,0,1,lamgamma,1, lamgamma)*conj(theData.Dfd[1][lamomega][lamgamma]);// Clebsch(1,lamgamma,0,0,1, lamgamma)=1 double theMag=it->second.first; double thePhi=it->second.second; complex<double> expiphi(cos(thePhi), sin(thePhi)); - result+=theMag*expiphi*Clebsch(theJPCLS->L,0,1, lamomega,theJPCLS->J, lamomega)*Clebsch(1,lamomega,0,0,1,lamomega)*theData.Dfp[theJPCLS->J][Minit][lamomega]; - result*=omegaDecAmp; + result+=theMag*expiphi*omegaDecAmp*Clebsch(theJPCLS->L,0,1, lamomega,theJPCLS->J, lamomega)*conj(theData.Dfp[theJPCLS->J][Minit][lamomega]); //Clebsch(1,lamomega,0,0,1,lamomega)=1 } }