-
Notifications
You must be signed in to change notification settings - Fork 61
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
Conversation
@tacaswell I rebased this branch , test are not passing because some lines are not covered (coverage issue) |
g2 : array | ||
normalized intensity-intensity time autocorreltion | ||
|
||
Note : |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Needs to be
Notes
-----
Conflicts: skxray/core/correlation.py
…rror Conflicts: skxray/core/tests/test_correlation.py
Conflicts: skxray/core/correlation.py
Ipython notebook for one time correlation experimental data fitted with ISF equation |
Manually merged to deal with conflict: Conflicts: skxray/core/tests/test_correlation.py Issue was imports
Thanks Tom |
Is lmfit used in correlation.py? I didn't find it implemented yet, maybe in a new PR? |
@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). @licode Therefore, following line in the correlation.py can be removed, |
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. |
@licode yes I took that out, we don't need it anymore |
Can you put in a PR against scikit-xray-examples with that ipython notebook? |
@ericdill sure I will |
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. |
No description provided.