• Use default values at declaration in LauAbsResonance to significantly simplify the constructors

• Cleanup LauAbsResonance constructor which involved a lot of duplication for K-matrix

• Remove duplicate par_mSq0_

Thanks, @jback. A few answers to your responses, with just one that doesn't (yet) make sense to me...

• Add K-matrix name to gCoupling parameters to avoid clashes in models with >1 K-matrix
• Resolve merge conflict
• Allow other parameters of the SVP part to be floated
• Fix merge conflict

• Remove whitespace at end of file
• Fix compilation errors

I think only 1 parameter needed a changed name - @jback let me know if I missed something here though.

• Allow other parameters of the SVP part to be floated

• Add K-matrix name to gCoupling parameters to avoid clashes in models with >1 K-matrix

• Correctly initialise a_ vector. Remove calculation of angular factor from K-matrix propagator. Remove any need to update the propagator with the LauKinematics object
• Remove angular parts of K-matrix header, and add extra function to indicate the final-state channel of the various coupled channels
• Update ProdPole and SVP to use resAmp (and leave amplitude to LauAbsResonance)
• Update LauAbsResonance to apply spin to constructed objects that don't use the 'normal' constructor
• Changes to LauResonanceMaker to allow retrieval of parent Blatt-Weisskopf factor without using resInfo that is not defined for K-matrix
• Changes to LauBlattWeisskopfFactor to accommodate tangential use by K-matrix to get parent factor without access to a resInfo

I've included the changes to tell the K-matrix about the orbital angular momentum of each channel, as discussed on Mattermost. I've also made 3 comments in the code for you, @jback. Thanks!

• Changes to allow different orbital angular momenta for different channels inside the K-matrix

• Changes to allow different orbital angular momenta for different channels inside the K-matrix

From further discussion elsewhere, it looks like the code needs further edits to allow channel-dependent L values (for a given total angular momentum J).

Need to apply an upper bound = 0 for s_0^scatt if this is allowed to float. Some parameters still need "names" added, as per Tom's suggestion.

• Remove done TODO comment and make const several function arguments
• Add function to LauKMatrixPropagator that returns K-matrix spin, and make various function arguments const
• Add barrier factors to numerator of K-matrix amplitude in ProdPole and ProdSVP, which need to know the spin of the K-matrix using the new getL() function
• Fix typo in ProdPole.cc and ProdSVP.cc

• Correct displaced doxygen comment
• Simplify setting of denominator parameter in barrier factor from file
• Cache the a/R^2 calculation - thanks John!
• Neater access to D*0 mass information from LauResonanceMaker - thanks Tom!
• Add definition of angular momentum term for spin-2 (max spin) to K-matrix

• Correct displaced doxygen comment
• Simplify setting of denominator parameter in barrier factor from file
• Cache the a/R^2 calculation - thanks John!
• Neater access to D*0 mass information from LauResonanceMaker - thanks Tom!
• Add definition of angular momentum term for spin-2 (max spin) to K-matrix

Thanks @jback and @tlatham, I've handled all the remaining comments. There are some deeper issues to resolve (see the Laura++ mattermost channel) before we land this. D39 needs to come first, anyway, and that one is ready to go.

• Correct Doxygen comments

In D41#1074, @johndan wrote:

General question, @tlatham : should I cherry-pick commits to bring this differential in line with the master (e.g. c38fa2a34f4a772754d1e8f610def10747d95104 - LauFormulaPar fix)?

Thanks @johndan, the changes you have made so far look good and makes the code more general. I have replied to your questions, and have also suggested that we calculate the barrier radii-squared terms at initialisation. Not sure what we can do for avoiding hard-coding the D* mass at initialisation (regarding access to LauResonanceMaker info).

• D*K system should be in P-wave, not just D0K !
• Changes after round of code-review with @jback
• Remove whitespace and make minor bugfixes found during compilation tests

Thank you for the comments @jback . I've implemented them in most cases, or left a reply in the few where further input from you is needed.

I've had a first look at the code and have provided some suggestions for changes that I think are needed.

• Add K-matrix name to parameter names, to allow multiple K-M's per model

• Add braces for Tom
• Allow pole mass-squared to vary

• Add doxygen lines for one function

Thanks very much for this @johndan. It looks good.
I think it would just be good to take the opportunity while we're at it to allow any of the parameters to float.
We should also include the name of the propagator in the name of the parameters so that if we have more than one K-matrix in a given fit we don't get identically named parameters appearing - this will cause problems with the sim-fit for example.
See the inline comments for details.

I tested the patch and it does the job.

• Update release notes

Looks good to me