Changeset cb62bd5 in sasview for src/sas/sascalc/pr/invertor.py
- Timestamp:
- Aug 4, 2017 4:22:51 AM (7 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.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
- Children:
- 1abd19c
- Parents:
- a0e6b1b
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/sas/sascalc/pr/invertor.py
r45dffa69 rcb62bd5 121 121 self.q_min, self.q_max, 122 122 self.x, self.y, 123 self.err, self. has_bck,123 self.err, self.est_bck, 124 124 self.slit_height, self.slit_width) = state 125 125 … … 133 133 self.q_min, self.q_max, 134 134 self.x, self.y, 135 self.err, self. has_bck,135 self.err, self.est_bck, 136 136 self.slit_height, self.slit_width, 137 137 ) … … 175 175 elif name == 'slit_width': 176 176 return self.set_slit_width(value) 177 elif name == ' has_bck':177 elif name == 'est_bck': 178 178 if value == True: 179 return self.set_ has_bck(1)179 return self.set_est_bck(1) 180 180 elif value == False: 181 return self.set_ has_bck(0)181 return self.set_est_bck(0) 182 182 else: 183 raise ValueError, "Invertor: has_bck can only be True or False"183 raise ValueError, "Invertor: est_bck can only be True or False" 184 184 185 185 return Cinvertor.__setattr__(self, name, value) … … 220 220 elif name == 'slit_width': 221 221 return self.get_slit_width() 222 elif name == ' has_bck':223 value = self.get_ has_bck()222 elif name == 'est_bck': 223 value = self.get_est_bck() 224 224 if value == 1: 225 225 return True … … 248 248 invertor.y = self.y 249 249 invertor.err = self.err 250 invertor.has_bck = self.has_bck 250 invertor.est_bck = self.est_bck 251 invertor.background = self.background 251 252 invertor.slit_height = self.slit_height 252 253 invertor.slit_width = self.slit_width … … 290 291 """ 291 292 # Reset the background value before proceeding 292 self.background = 0.0 293 return self.lstsq(nfunc, nr=nr) 293 # self.background = 0.0 294 if not self.est_bck: 295 self.y -= self.background 296 out, cov = self.lstsq(nfunc, nr=nr) 297 if not self.est_bck: 298 self.y += self.background 299 return out, cov 294 300 295 301 def iq(self, out, q): … … 454 460 455 461 # If we need to fit the background, add a term 456 if self. has_bck == True:462 if self.est_bck == True: 457 463 nfunc_0 = nfunc 458 464 nfunc += 1 … … 500 506 501 507 # Keep a copy of the last output 502 if self.has_bck == False: 503 self.background = 0 508 if self.est_bck == False: 504 509 self.out = c 505 510 self.cov = err … … 653 658 file.write("#slit_width=%g\n" % self.slit_width) 654 659 file.write("#background=%g\n" % self.background) 655 if self. has_bck == True:660 if self.est_bck == True: 656 661 file.write("#has_bck=1\n") 657 662 else: … … 734 739 toks = line.split('=') 735 740 if int(toks[1]) == 1: 736 self. has_bck = True741 self.est_bck = True 737 742 else: 738 self. has_bck = False743 self.est_bck = False 739 744 740 745 # Now read in the parameters
Note: See TracChangeset
for help on using the changeset viewer.