diff --git a/README.md b/README.md --- a/README.md +++ b/README.md @@ -455,6 +455,7 @@ Juan Otalora Wenbin Qian Daniel O'Hanlon +Daniel Johnson Many thanks also go to numerous members of the BaBar, Belle, and LHCb collaborations for their helpful input. diff --git a/inc/LauBlattWeisskopfFactor.hh b/inc/LauBlattWeisskopfFactor.hh --- a/inc/LauBlattWeisskopfFactor.hh +++ b/inc/LauBlattWeisskopfFactor.hh @@ -90,6 +90,7 @@ //! Method to create a new factor with cloned radius parameter /*! \param newSpin the value of the spin to use for the created instance + \param newBarrierType the BarrierType to use for the created instance */ LauBlattWeisskopfFactor* createClone( const UInt_t newSpin , const BarrierType newBarrierType ); diff --git a/inc/LauKMatrixPropagator.hh b/inc/LauKMatrixPropagator.hh --- a/inc/LauKMatrixPropagator.hh +++ b/inc/LauKMatrixPropagator.hh @@ -140,7 +140,6 @@ //! Get pole mass parameters, set according to the input file /*! \param [in] poleIndex number of the required pole - \param [in] channelIndex number of the required channel \return the parameter of the pole mass */ LauParameter& getPoleMassSqParameter(const Int_t poleIndex); @@ -310,10 +309,11 @@ //! Calculate the gamma angular-momentum barrier /*! + \param [in] iCh the channel index \param [in] s the invariant mass squared \return the centrifugal barrier factor for L=0,1, or 2 */ - Double_t calcGamma(const Int_t iCh, const Double_t s, KMatrixChannels phaseSpaceIndex) const; + Double_t calcGamma(const Int_t iCh, const Double_t s) const; //! Calulate the term 1/(m_pole^2 - s) for the scattering and production K-matrix formulae /*! diff --git a/src/LauKMatrixPropagator.cc b/src/LauKMatrixPropagator.cc --- a/src/LauKMatrixPropagator.cc +++ b/src/LauKMatrixPropagator.cc @@ -915,10 +915,8 @@ for (Int_t iChannel (0); iChannel < nChannels_; ++iChannel) { - LauKMatrixPropagator::KMatrixChannels phaseSpaceIndex = phaseSpaceTypes_[iChannel]; - if ( L_[iChannel] != 0 ) { - gamma = this->calcGamma(iChannel,s,phaseSpaceIndex); + gamma = this->calcGamma(iChannel,s); } else { gamma = 1.0; // S-wave } @@ -933,11 +931,13 @@ } -Double_t LauKMatrixPropagator::calcGamma(const Int_t iCh, const Double_t s, const LauKMatrixPropagator::KMatrixChannels phaseSpaceIndex) const +Double_t LauKMatrixPropagator::calcGamma(const Int_t iCh, const Double_t s) const { // Calculate the barrier factor Double_t gamma(0.0); + LauKMatrixPropagator::KMatrixChannels phaseSpaceIndex = phaseSpaceTypes_[iCh]; + LauComplex rho = getRho(s,phaseSpaceIndex); Double_t q = 0.5 * sqrt(s) * rho.abs();