Skip to content
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.

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

one time correlation experimental data fitted with ISF equation #295

Merged
merged 11 commits into from Aug 29, 2015
Merged

one time correlation experimental data fitted with ISF equation #295

merged 11 commits into from Aug 29, 2015

Conversation

sameera2004
Copy link
Member

No description provided.

@sameera2004
Copy link
Member Author

@tacaswell I rebased this branch , test are not passing because some lines are not covered (coverage issue)

@sameera2004
Copy link
Member Author

g2 : array
normalized intensity-intensity time autocorreltion

Note :
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Needs to be

Notes
-----

@sameera2004
Copy link
Member Author

Ipython notebook for one time correlation experimental data fitted with ISF equation

http://nbviewer.ipython.org/github/sameera2004/my_ipy_notebook/blob/master/Time_Correlation/XPCS_ISF_fitting_using_lmfit_model.ipynb

@ericdill ericdill modified the milestone: Next point release Aug 27, 2015
@tacaswell tacaswell merged commit 24dfe09 into scikit-beam:master Aug 29, 2015
tacaswell added a commit that referenced this pull request Aug 29, 2015
Manually merged to deal with conflict:

Conflicts:
    skxray/core/tests/test_correlation.py

Issue was imports
@sameera2004
Copy link
Member Author

Thanks Tom

@licode
Copy link
Contributor

licode commented Sep 1, 2015

Is lmfit used in correlation.py? I didn't find it implemented yet, maybe in a new PR?

@sameera2004
Copy link
Member Author

@licode Not implemented, users can use lmfit to fit the experimental data with the intermediate scattering factor(ISF) equation. In the ipython notebook I showed it as an example.

Before I used to put residual functions using lmfit to get the experiment data and the model. using parameter class, (http://lmfit.github.io/lmfit-py/parameters.html).
After discussing with @danielballan, I took out those functions and only keep the model. (http://lmfit.github.io/lmfit-py/model.html#the-model-class)

@licode Therefore, following line in the correlation.py can be removed,
from lmfit import minimize, Model, Parameters

@licode
Copy link
Contributor

licode commented Sep 1, 2015

I see. Because in the first ipython notebook example, corr.fit_auto_corr was implemented as a fitting function in correlation.py, but I couldn't find that function.

@sameera2004
Copy link
Member Author

@licode yes I took that out, we don't need it anymore

@ericdill
Copy link
Member

ericdill commented Sep 1, 2015

Can you put in a PR against scikit-xray-examples with that ipython notebook?

@sameera2004
Copy link
Member Author

@ericdill sure I will

@licode
Copy link
Contributor

licode commented Sep 1, 2015

It is better to define that function in ipython notebook if you took it out from source code, so users can understand which function is used for fitting. If that function is standard in the field, I suggest to include it in lineshapes.py.

@sameera2004 sameera2004 deleted the 1time_fit branch September 28, 2015 14:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants