Skip to content

Commit

Permalink
Fixes #741 Remove P(Q), S(Q) feature
Browse files Browse the repository at this point in the history
  • Loading branch information
mdoucet authored Mar 30, 2017
1 parent 2de2352 commit 4c5098c
Showing 1 changed file with 8 additions and 9 deletions.
17 changes: 8 additions & 9 deletions src/sas/sasgui/perspectives/fitting/fitting.py
Original file line number Diff line number Diff line change
Expand Up @@ -1754,15 +1754,14 @@ def _complete1D(self, x, y, page_id, elapsed, index, model,
data_description="Data unsmeared",
data_id="Data " + data.name + " unsmeared",
dy=unsmeared_error)

if sq_model is not None and pq_model is not None:
self.create_theory_1D(x, sq_model, page_id, model, data, state,
data_description=model.name + " S(q)",
data_id=str(page_id) + " " + data.name + " S(q)")
self.create_theory_1D(x, pq_model, page_id, model, data, state,
data_description=model.name + " P(q)",
data_id=str(page_id) + " " + data.name + " P(q)")

# Comment this out until we can get P*S models with correctly populated parameters
#if sq_model is not None and pq_model is not None:
# self.create_theory_1D(x, sq_model, page_id, model, data, state,
# data_description=model.name + " S(q)",
# data_id=str(page_id) + " " + data.name + " S(q)")
# self.create_theory_1D(x, pq_model, page_id, model, data, state,
# data_description=model.name + " P(q)",
# data_id=str(page_id) + " " + data.name + " P(q)")

current_pg = self.fit_panel.get_page_by_id(page_id)
title = new_plot.title
Expand Down

0 comments on commit 4c5098c

Please sign in to comment.