Skip to content

fix incrementing in Mapped PDF | fix parameter index in LASS function | fix Amp3Body normalisation #259

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 23 commits into from
Jun 4, 2021
Merged

fix incrementing in Mapped PDF | fix parameter index in LASS function | fix Amp3Body normalisation #259

merged 23 commits into from
Jun 4, 2021

Conversation

FlorianReiss
Copy link
Member

@FlorianReiss FlorianReiss commented Feb 15, 2021 •
edited
Loading

addresses #258, #261
Changes:

  • add functionality in MappedPdf to count the number of functions mapped to, including their subfunctions. The parameter container is then increased when MappedPdf is executed until all subfunctions are passed. This should ensure that the indices are increased correctly by MappedPdf even if the functions have several layers of subfunctions
  • small fix to incrementIndex in LASS.cu
  • add additional check to inDalitz that m23 can not be negative
  • make sure that normalisation binning is copied in Amp3Body if there is more than one instance

Files changed:

  • src/PDFs/combine/MappedPdf.cu
  • src/PDFs/physics/resonances/LASS.cu
  • src/PDFs/physics/DalitzPlotHelpers.cu
  • src/PDFs/physics/Amp3Body.cu
    currently the MR also includes unrelated changes from another branch

danielsibemol and others added 17 commits July 31, 2020 14:41
@danielsibemol
checking matrix inversion
08658e6
complete cpp kMatrix, shuffled parameters
08e3998
adding other files
7dae5c6
adding other files
a1f4735
adding other files
a71d26e
@danielsibemol
cpp kMatrix working code, compared to Ampgen
c845c2f
Cleaning kMatrix.cu
c7bc20c
@danielsibemol
Merge branch 'master' into daniel_goofitXampgen_comp
1d2c401 
extern packages are not properly compiling
@danielsibemol
Passing kMatrix to 4Body decays
0319322
@danielsibemol
Merge branch 'master' into daniel_goofitXampgen_comp
061e422 
updating branch with latest master changes
@danielsibemol
updating with latest changes from master
ea56333
brute force to make fit work
1801c45
Merge remote-tracking branch 'origin/master' into freiss_fittest
aca2cf6
first try to fix MappedPDf index issues
abdc405
fix parameter index in LASS resonance
c1f4e38
remove debug comments
0e18cf5
try to fix Amp3Body normalisation issues
189b54e
@FlorianReiss FlorianReiss changed the title WIP: fix incrementing in Mapped PDF | fix parameter index in LASS function WIP: fix incrementing in Mapped PDF | fix parameter index in LASS function | fix Amp3Body normalisation Mar 26, 2021
@FlorianReiss FlorianReiss changed the title WIP: fix incrementing in Mapped PDF | fix parameter index in LASS function | fix Amp3Body normalisation fix incrementing in Mapped PDF | fix parameter index in LASS function | fix Amp3Body normalisation Mar 29, 2021
@FlorianReiss
Copy link
Member Author

@danielsibemol I think the only test still failing is the "Travis CI build". It seems to suggest some changes to make the code look nicer

@danielsibemol
Copy link
Contributor

@danielsibemol I think the only test still failing is the "Travis CI build". It seems to suggest some changes to make the code look nicer

@FlorianReiss, it should be simple to fix those things but it took me a while because I had to figure out how to install clang-tidy locally. In principle the test should work now, but it recommended a bunch of additional changes when running locally. I'll push the commit, let's see what comes out of it.

@danielsibemol danielsibemol merged commit b8ce992 into GooFit:master Jun 4, 2021
@FlorianReiss FlorianReiss mentioned this pull request Jun 9, 2021
Closed
@FlorianReiss FlorianReiss mentioned this pull request Jul 27, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@FlorianReiss @danielsibemol