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

Pileup peaks added #275

Merged
merged 15 commits into from
Jun 24, 2015
Merged

Pileup peaks added #275

merged 15 commits into from
Jun 24, 2015

Conversation

licode
Copy link
Contributor

@licode licode commented May 5, 2015

In this PR, I added pileup peaks for fitting. Pileup peak is the combination of two different elemental lines.

licode added 4 commits April 26, 2015 17:26
… file. The parameters are defined in xrf_model. There will be some conflicts if define values in multiple places. Change in trim function to include boundary values.
…x, y sent to this function are within interested range already
@@ -237,7 +237,8 @@
'bound_type': 'lohi',
'description': 'Incident E [keV]',
'max': 13.0,
'min': 9.0, 'value': 11.0},
'min': 9.0,
'value': 10.0},
Copy link
Member

Choose a reason for hiding this comment

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

Why the value change?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Actually 10keV is the most common value. Not typo.

tacaswell and others added 4 commits May 5, 2015 15:25
This function sets the parameter hints on one model given a second model
and a list of parameter names to copy.
if k_temp in fit_results.values:
param[k]['value'] = float(fit_results.values[k_temp])
elif k == 'non_fitting_values':
Copy link
Member

Choose a reason for hiding this comment

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

I thought that non_fitting_values had been removed all together.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The current plan is to save all the values in one config file.

@licode licode mentioned this pull request Jun 10, 2015
@licode
Copy link
Contributor Author

licode commented Jun 10, 2015

I think this is ready to go. @tacaswell ?

@licode
Copy link
Contributor Author

licode commented Jun 17, 2015

Ready to review, @tacaswell ?

tacaswell added a commit that referenced this pull request Jun 24, 2015
@tacaswell tacaswell merged commit 056e586 into scikit-beam:master Jun 24, 2015
@licode licode deleted the elastic_peak branch September 19, 2015 15:35
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

3 participants