Merge branch 'master' of tau.ep1.rub.de:/var/www/git/Pawian

Examples/JpsiGamEtaPiPiNew/JpsiGamEtaPiPiEventListNew.cc

@@ -130,7 +130,7 @@ void JpsiGamEtaPiPiEventListNew::read4Vecs(EventList& evtList, std::vector<EvtDa
     evtData->FourVecsDec[enumJpsiGamEtaPiPi4V::normPipPimDecHeliEtaPipPim] = V4_normPipPimDecHeliEtaPipPim;
     evtData->FourVecsDec[enumJpsiGamEtaPiPi4V::normEtaPipDecHeliEtaPipPim] = V4_normEtaPipDecHeliEtaPipPim;
     
-    // calculate and store WignerD functions for Psi -> X gamma (JPC =0-+, 0++, 2++)
+    // calculate and store WignerD functions for Psi -> X gamma (JPC =0-+, 1++, 2-+)
 
     Spin jPsi=1;
     for (Spin M=-1; M<=1; M=M+2){

Examples/JpsiGamEtaPiPiNew/XDecAmpBase.cc

@@ -182,12 +182,7 @@ complex<double> XDecAmpBase::XToEtaFAmp(Spin lamX, Spin jf, EvtDataNew* theData,
   
   complex<double> result(0.,0.);
   
-  Vector4<double > p4PiPiFloat=theData->FourVecsDec[enumJpsiGamEtaPiPi4V::PipPim_HeliPsi];
-  Vector4<double > p4PiPi(p4PiPiFloat.E(),
-			  p4PiPiFloat.Px(),
-			  p4PiPiFloat.Py(),
-			  p4PiPiFloat.Pz());  
-  
+  Vector4<double > p4PiPi=theData->FourVecsDec[enumJpsiGamEtaPiPi4V::PipPim_HeliPsi];
   std::map< boost::shared_ptr<const JPCLS>, double, pawian::Collection::SharedPtrLess >::iterator itXMag;
   
   for ( itXMag=XToEtaFMag.begin(); itXMag!=XToEtaFMag.end(); ++itXMag){
@@ -197,22 +192,17 @@ complex<double> XDecAmpBase::XToEtaFAmp(Spin lamX, Spin jf, EvtDataNew* theData,
     complex<double> expiphiX(cos(theXPhi), sin(theXPhi));
     complex<double> amp(0.,0.);     
     for(Spin lamf = -jf; lamf <= jf; lamf++){
-      
       if( fabs(lamf)> _spinX || fabs(lamf)>XState->S) continue;
-      
       amp += theXMag*expiphiX*sqrt(2.*XState->L+1.)
 	*Clebsch(XState->L, 0, XState->S, lamf, _spinX, lamf)
 	*Clebsch(jf, lamf, 0, 0, XState->S, lamf)
 	*conj(theData->WignerDsDec[enumJpsiGamEtaPiPiDfunc::XTofEta][_spinX][lamX][lamf])
 	*conj(theData->WignerDsDec[enumJpsiGamEtaPiPiDfunc::fToPiPi][jf][lamf][0])
 	*BreitWignerBlattW(p4PiPi, _massPi, _massPi, fMass, fWidth, jf);
-     }
-     
-     result+= amp;
-   }
-   
-   return result;
-
+    }
+    result+= amp;
+  }
+  return result;
 }
 
 complex<double> XDecAmpBase::XToAPiBWAmp(Spin lamX, Spin jA, EvtDataNew* theData, 
@@ -226,7 +216,6 @@ complex<double> XDecAmpBase::XToAPiBWAmp(Spin lamX, Spin jA, EvtDataNew* theData
   Vector4<double > p4EtaPiminus=theData->FourVecsDec[enumJpsiGamEtaPiPi4V::EtaPim_HeliPsi];  
   std::map< boost::shared_ptr<const JPCLS>, double, pawian::Collection::SharedPtrLess >::iterator itXMag;
 
-
   for ( itXMag=etaToAPiMag.begin(); itXMag!=etaToAPiMag.end(); ++itXMag){
     boost::shared_ptr<const JPCLS> XState=itXMag->first;
     double theXMag=itXMag->second;
@@ -235,26 +224,25 @@ complex<double> XDecAmpBase::XToAPiBWAmp(Spin lamX, Spin jA, EvtDataNew* theData
     complex<double> amp(0.,0.);     
     
     for(Spin lamA = -jA; lamA <= jA; lamA++){
-      if( fabs(lamA)> _spinX || fabs(lamA)>XState->S) continue;
+      if(fabs(lamA)> _spinX || fabs(lamA)>XState->S) continue;
       
       amp += theXMag*expiphiX*sqrt(2.*XState->L+1.)*sqrt(2.*jA + 1.)
+	*Clebsch(XState->L, 0, XState->S, lamA, _spinX, lamA)
+	*Clebsch(jA, lamA, 0, 0, XState->S, lamA)
 	*(  conj(theData->WignerDsDec[enumJpsiGamEtaPiPiDfunc::XToAplusPiminus][_spinX][lamX][lamA])
 	    *BreitWignerBlattW(p4EtaPiplus, _massPi, _massEta, aMass, aWidth, jA)
 	    *conj(theData->WignerDsDec[enumJpsiGamEtaPiPiDfunc::Aplus][jA][lamA][0])+
 	    conj(theData->WignerDsDec[enumJpsiGamEtaPiPiDfunc::XToAminusPiplus][_spinX][lamX][lamA])
 	    *BreitWignerBlattW(p4EtaPiminus, _massPi, _massEta, aMass, aWidth, jA)
 	    *conj(theData->WignerDsDec[enumJpsiGamEtaPiPiDfunc::Aminus][jA][lamA][0])
-	    );
+	 );
     }
-    
     result+= amp;
   }
-  
   return result;
 }
 
 
-
 void  XDecAmpBase::getDefaultParams(fitParamsNew& fitVal, fitParamsNew& fitErr){
 
   if (_piPiEtaHyp){

PwaUtils/PsiProdBaseLhNew.cc

@@ -137,23 +137,19 @@ double PsiProdBaseLhNew::calcEvtIntensity(EvtDataNew* theData, fitParamsNew& the
       JmGpTmpMap[helf1]= ParityProdMap[helf1][1]*psiToXGammaAmp(-1, 1, helf1, 1, theData, MagProdMap[helf1][1], PhiProdMap[helf1][1]);
       TmpDecAmp[helf1] = currentF1DecAmp->XdecAmp(helf1, theData, theParamVal);
 
-        JpGmTmpMap[-helf1]= ParityProdMap[-helf1][-1]*psiToXGammaAmp(1, 1, -helf1, -1, theData, MagProdMap[-helf1][-1], PhiProdMap[-helf1][-1]);
-        JmGmTmpMap[-helf1]= ParityProdMap[-helf1][-1]*psiToXGammaAmp(-1, 1, -helf1, -1, theData, MagProdMap[-helf1][-1], PhiProdMap[-helf1][-1]);
-        TmpDecAmp[-helf1] = currentF1DecAmp->XdecAmp(-helf1, theData, theParamVal);
+      JpGmTmpMap[-helf1]= ParityProdMap[-helf1][-1]*psiToXGammaAmp(1, 1, -helf1, -1, theData, MagProdMap[-helf1][-1], PhiProdMap[-helf1][-1]);
+      JmGmTmpMap[-helf1]= ParityProdMap[-helf1][-1]*psiToXGammaAmp(-1, 1, -helf1, -1, theData, MagProdMap[-helf1][-1], PhiProdMap[-helf1][-1]);
+      TmpDecAmp[-helf1] = currentF1DecAmp->XdecAmp(-helf1, theData, theParamVal);
     }
-
+    
     for (Spin helf1=-1; helf1<2; helf1++){
       JmpGmp+=JpGpTmpMap[helf1]*TmpDecAmp[helf1];
       JmpGmm+=JpGmTmpMap[helf1]*TmpDecAmp[helf1];
       JmmGmp+=JmGpTmpMap[helf1]*TmpDecAmp[helf1];
       JmmGmm+=JmGmTmpMap[helf1]*TmpDecAmp[helf1];
-
     }
-
   }
-
-
-
+  
   //calculate gamma eta2 amplitudes
   for (itStr= _GammaEta2Hyps.begin(); itStr!= _GammaEta2Hyps.end(); ++itStr){
 
@@ -203,9 +199,6 @@ double PsiProdBaseLhNew::calcEvtIntensity(EvtDataNew* theData, fitParamsNew& the
     }
 
   }
-
-
-
   result=norm(JmpGmp)+norm(JmpGmm)+norm(JmmGmp)+norm(JmmGmm);
 
 
@@ -213,7 +206,7 @@ double PsiProdBaseLhNew::calcEvtIntensity(EvtDataNew* theData, fitParamsNew& the
     result = result + theParamVal.otherParams[_phasespaceKey];
   }
 
-//   Info << "result:\t" << result << endmsg;
+  //  Info << "result:\t" << result << endmsg;
   return result;  
 
 }