Skip to content

Commit 1757b1c

Browse files
committed
not working, but this was an attempt to only plot the data (no background) upon data loading
1 parent e164254 commit 1757b1c

File tree

2 files changed

+37
-34
lines changed

2 files changed

+37
-34
lines changed

src/sas/qtgui/Perspectives/SizeDistribution/SizeDistributionLogic.py

Lines changed: 36 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -105,43 +105,47 @@ def newDataPlot(self):
105105
Create a new 1D data instance
106106
"""
107107
# Background plot
108-
backgd_plot = Data1D(self.background.x, self.background.y)
109-
backgd_plot.is_data = False
110-
backgd_plot.plot_role = DataRole.ROLE_DATA
108+
backgd_plot = None
109+
if self.background is not None:
110+
backgd_plot = Data1D(self.background.x, self.background.y)
111+
backgd_plot.is_data = False
112+
backgd_plot.plot_role = DataRole.ROLE_DATA
111113

112-
backgd_plot.id = BACKGD_PLOT_LABEL
113-
backgd_plot.group_id = GROUP_ID_SIZE_DISTR_DATA
114-
backgd_plot.name = BACKGD_PLOT_LABEL + f"[{self._data.name}]"
114+
backgd_plot.id = BACKGD_PLOT_LABEL
115+
backgd_plot.group_id = GROUP_ID_SIZE_DISTR_DATA
116+
backgd_plot.name = BACKGD_PLOT_LABEL + f"[{self._data.name}]"
115117

116-
backgd_plot.title = backgd_plot.name
117-
backgd_plot.xaxis("\\rm{Q}", "A^{-1}")
118-
backgd_plot.yaxis("\\rm{Intensity} ", "cm^{-1}")
118+
backgd_plot.title = backgd_plot.name
119+
backgd_plot.xaxis("\\rm{Q}", "A^{-1}")
120+
backgd_plot.yaxis("\\rm{Intensity} ", "cm^{-1}")
119121

120-
backgd_plot.symbol = "Line"
121-
backgd_plot.show_errors = False
122+
backgd_plot.symbol = "Line"
123+
backgd_plot.show_errors = False
122124

123125
# Background subtracted plot
124-
y_sub = self.data.y - self.background.y
125-
backgd_subtr_plot = Data1D(self.data.x, y_sub, dy=self._data.dy)
126-
backgd_subtr_plot.is_data = False
127-
backgd_subtr_plot.plot_role = DataRole.ROLE_DATA
128-
129-
backgd_subtr_plot.id = BACKGD_SUBTR_PLOT_LABEL
130-
backgd_subtr_plot.group_id = GROUP_ID_SIZE_DISTR_DATA
131-
backgd_subtr_plot.name = BACKGD_SUBTR_PLOT_LABEL + f"[{self._data.name}]"
132-
133-
backgd_subtr_plot.title = backgd_subtr_plot.name
134-
backgd_subtr_plot.xaxis("\\rm{Q}", "A^{-1}")
135-
backgd_subtr_plot.yaxis("\\rm{Intensity} ", "cm^{-1}")
136-
137-
backgd_subtr_plot.symbol = "Circle"
138-
backgd_subtr_plot.show_errors = True
139-
backgd_subtr_plot.show_q_range_sliders = True
140-
# Suppress the GUI update until the move is finished to limit model calculations
141-
backgd_subtr_plot.slider_update_on_move = False
142-
backgd_subtr_plot.slider_perspective_name = "SizeDistribution"
143-
backgd_subtr_plot.slider_low_q_input = ["txtMinRange"]
144-
backgd_subtr_plot.slider_high_q_input = ["txtMaxRange"]
126+
backgd_subtr_plot = None
127+
if self.background is not None:
128+
y_sub = self.data.y - self.background.y
129+
backgd_subtr_plot = Data1D(self.data.x, y_sub, dy=self._data.dy)
130+
backgd_subtr_plot.is_data = False
131+
backgd_subtr_plot.plot_role = DataRole.ROLE_DATA
132+
133+
backgd_subtr_plot.id = BACKGD_SUBTR_PLOT_LABEL
134+
backgd_subtr_plot.group_id = GROUP_ID_SIZE_DISTR_DATA
135+
backgd_subtr_plot.name = BACKGD_SUBTR_PLOT_LABEL + f"[{self._data.name}]"
136+
137+
backgd_subtr_plot.title = backgd_subtr_plot.name
138+
backgd_subtr_plot.xaxis("\\rm{Q}", "A^{-1}")
139+
backgd_subtr_plot.yaxis("\\rm{Intensity} ", "cm^{-1}")
140+
141+
backgd_subtr_plot.symbol = "Circle"
142+
backgd_subtr_plot.show_errors = True
143+
backgd_subtr_plot.show_q_range_sliders = True
144+
# Suppress the GUI update until the move is finished to limit model calculations
145+
backgd_subtr_plot.slider_update_on_move = False
146+
backgd_subtr_plot.slider_perspective_name = "SizeDistribution"
147+
backgd_subtr_plot.slider_low_q_input = ["txtMinRange"]
148+
backgd_subtr_plot.slider_high_q_input = ["txtMaxRange"]
145149

146150
# Fit plot
147151
fit_plot = None

src/sas/qtgui/Perspectives/SizeDistribution/SizeDistributionPerspective.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
NUM_DIAMETER_BINS = 100
3232
LOG_BINNING = "true"
3333
CONTRAST = 1.0
34-
BACKGROUND = 1e-6
34+
BACKGROUND = "" # initially no background subtraction
3535
SKY_BACKGROUND = 1e-6
3636
SUBTRACT_LOW_Q = "false"
3737
POWER_LOW_Q = 4
@@ -446,7 +446,6 @@ def setData(self, data_item=None, is_batch=False):
446446

447447
self.logic.data = logic_data
448448
self.model.item(WIDGETS.W_NAME).setData(self._model_item.text())
449-
self.updateBackground()
450449

451450
try:
452451
name = self.logic.data.name

0 commit comments

Comments
 (0)