Skip to content

[WIP] Indexing adjustments #91

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
Closed
wants to merge 95 commits into from
Closed

[WIP] Indexing adjustments #91

wants to merge 95 commits into from

Conversation

galapaegos
Copy link
Contributor

@galapaegos galapaegos commented Jun 7, 2017 •
edited by henryiii
Loading

These changes relate to Issue #71.

galapaegos and others added 30 commits June 4, 2017 10:51
@galapaegos
Initial commit for indices. Data structure, applied to gauss/add/prod…
b15cc36 
…/polynomial.
@galapaegos
Fixed changes with normalisation 'off by 1' indexing issues.
f84aca0
@galapaegos
Fixed some issues with indexing.
a076049
@galapaegos
Rebase changes
0b01d1a
@galapaegos
Rebase changes(2)
c864e5a
@galapaegos
Fixed changes with normalisation 'off by 1' indexing issues.
94b5b9e
@galapaegos
Fixed some issues with indexing.
1870321
@galapaegos
Updates Variables from Minuit to internal structures correctly.
2464b3e
@galapaegos
Changed constants to fptype.
8f7c715
@galapaegos
Fixed indexing offsets and ordering
a37349f
@galapaegos
constants now fptype. removed copyParams from getCompProbsAtDataPoints
b09bb2a
@galapaegos
Corrected Indexing for events.
2b94d7d
@galapaegos
Converted Exponential indexing.
f91771d
@galapaegos
Fixed indexing for ProdPdf. GaussianPdf controls which evt to load by…
11ea847 
… the number of events passed.
@galapaegos
Indexing fixes to support chisquare.
4f736d7
@galapaegos
Committing indexing changes for product example.
72d06af
@galapaegos
Temp commit for rebase.
0429fa8
@galapaegos
Fixing added files in rebase.
2a11fab
@galapaegos
Finished merger from rebase master
af91ea1
@galapaegos
Merge branch 'indexing' of https://github.com/galapaegos/GooFit into …
a803c1a 
…indexing

Conflicts:
	extern/MCBooster
	include/goofit/PDFs/AddPdf.h
	include/goofit/PDFs/GaussianPdf.h
	include/goofit/PDFs/GooPdf.h
	include/goofit/PDFs/PolynomialPdf.h
	include/goofit/PDFs/ProdPdf.h
	include/goofit/PdfBase.h
	src/PDFs/AddPdf.cu
	src/PDFs/GaussianPdf.cu
	src/PDFs/GooPdf.cu
	src/PDFs/MetricTaker.cu
	src/PDFs/PdfBase.cu
	src/PDFs/PolynomialPdf.cu
	src/PDFs/ProdPdf.cu
	src/goofit/Abort.cc
	src/goofit/FCN.cc
	src/goofit/PdfBase.cc
@galapaegos
Convolution example works. Observable index is fetched from first par…
fc4b143 
…t of constant list.
@galapaegos
Fixed incrementing issue with Argus. Fixed Argus & Gaussian tests.
0ee732c
@galapaegos
Added changes for ExpGaussPdf with test. Removing mislocated files fr…
5d7e26d 
…om merge.
@galapaegos
missing header file changes for ExpGausPdf.
aecd39b
@galapaegos
Fixed indexing with BifurGauss.
67b44f7
@galapaegos
Fixed return value from ExpGaussTest.
596ad3d
@galapaegos
Added tests to CMake.
42640cd
@galapaegos
Fixed Binned by using functionIdx, no longer passing funcId as argument.
b69b63c
@galapaegos
Merge branch 'master' into indexing
1713999
@galapaegos
Fixed indexing for ScaledGaussianPdf, added test.
456d11a
@henryiii henryiii added this to the v2.2 milestone Oct 21, 2017
@henryiii henryiii changed the base branch from master to preindex November 3, 2017 15:18
galapaegos and others added 16 commits November 3, 2017 17:06
@henryiii henryiii changed the base branch from preindex to master November 4, 2017 01:43
@henryiii henryiii mentioned this pull request Nov 6, 2017
Merged
@henryiii henryiii closed this Nov 16, 2017
@henryiii henryiii modified the milestones: v2.3, v2.2 Dec 8, 2017
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
v2.2
Development

Successfully merging this pull request may close these issues.
2 participants
@galapaegos @henryiii