Changeset 3fb5e68 in sasview for fittingview/src
- Timestamp:
- Oct 3, 2011 12:57:12 PM (13 years ago)
- Branches:
- master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
- Children:
- 68a921f
- Parents:
- 342dc442
- Location:
- fittingview/src/sans/perspectives/fitting
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
fittingview/src/sans/perspectives/fitting/fitpage.py
r342dc442 r3fb5e68 1243 1243 1244 1244 # more disables for 2D 1245 #self._set_smear_buttons()1245 self._set_smear_buttons() 1246 1246 1247 1247 try: … … 2170 2170 """ 2171 2171 self.weightbt_string = event.GetEventObject().GetLabelText() 2172 self._set_weight() 2173 2174 def _set_weight(self, is_2D=None): 2175 """ 2176 Set weight in fit problem 2177 """ 2172 2178 # compute weight for the current data 2173 2179 from .utils import get_weight 2174 2180 flag_weight = self.get_weight_flag() 2181 if is_2D == None: 2182 is_2D = self._is_2D() 2175 2183 weight = get_weight(data=self.data, 2176 is2d= self._is_2D(),2184 is2d=is_2D, 2177 2185 flag=flag_weight) 2178 2186 self._manager.set_fit_weight(uid=self.uid, 2179 2187 flag=flag_weight, 2180 is2d= self._is_2D(),2188 is2d=is_2D, 2181 2189 fid=None) 2182 2190 … … 2602 2610 self.sizer_set_smearer.Layout() 2603 2611 self.Layout() 2604 2605 # compute weight for the current data 2606 from .utils import get_weight 2607 flag_weight = self.get_weight_flag() 2608 weight = get_weight(data=self.data, 2609 is2d=self._is_2D(), 2610 flag=flag_weight) 2611 self._manager.set_fit_weight(uid=self.uid, 2612 flag=flag_weight, 2613 is2d=self._is_2D(), 2614 fid=None) 2612 self._set_weight() 2615 2613 2616 2614 ## set smearing value whether or not the data contain the smearing info … … 3174 3172 self.enable2D = False 3175 3173 self.create_default_data() 3174 self._manager.store_data(self.uid, data_list=[self.data]) 3175 3176 3176 self.set_model_param_sizer(self.model) 3177 3177 self._set_sizer_dispersion() 3178 self._set_weight(is_2D= self.enable2D) 3178 3179 self._set_smear_buttons() 3179 3180 self._draw_model() -
fittingview/src/sans/perspectives/fitting/fitproblem.py
r62f851f r3fb5e68 566 566 :param data: list of data selected 567 567 """ 568 self.original_data = None 569 self.fit_data = None 568 570 # original data: should not be modified 569 571 self.original_data = copy.deepcopy(data)
Note: See TracChangeset
for help on using the changeset viewer.