From 4c5098cac470ea0a367a8f92be0ed0ac428bcc12 Mon Sep 17 00:00:00 2001 From: Mathieu Doucet Date: Thu, 30 Mar 2017 09:41:12 -0400 Subject: [PATCH] Fixes #741 Remove P(Q), S(Q) feature --- src/sas/sasgui/perspectives/fitting/fitting.py | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/sas/sasgui/perspectives/fitting/fitting.py b/src/sas/sasgui/perspectives/fitting/fitting.py index abeb3763cb..bdb2103228 100755 --- a/src/sas/sasgui/perspectives/fitting/fitting.py +++ b/src/sas/sasgui/perspectives/fitting/fitting.py @@ -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