Changeset eef2e0ed in sasview for park_integration/AbstractFitEngine.py
- Timestamp:
- Mar 27, 2009 1:02:10 PM (15 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:
- ca7a626
- Parents:
- 1ae3fe1
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
park_integration/AbstractFitEngine.py
raed7c57 reef2e0ed 212 212 def setFitRange(self,qmin=None,qmax=None): 213 213 """ to set the fit range""" 214 self.qmin = qmin 215 self.qmax = qmax 214 if qmin!=None: 215 self.qmin = qmin 216 if qmax !=None: 217 self.qmax = qmax 216 218 217 219 … … 235 237 x,y,dy = [numpy.asarray(v) for v in (self.x,self.y,self.dy)] 236 238 237 # Find entries to consider238 if self.qmin==None:239 self.qmin= min(self.data.x)240 if self.qmax==None:241 self.qmin= max(self.data.x)242 243 239 idx = (x>=self.qmin) & (x <= self.qmax) 244 240 … … 292 288 def setFitRange(self,qmin=None,qmax=None): 293 289 """ to set the fit range""" 294 self.qmin= qmin 295 self.qmax= qmax 290 if qmin!=None: 291 self.qmin= qmin 292 if qmax!=None: 293 self.qmax= qmax 296 294 297 295 … … 308 306 """ 309 307 res=[] 310 #Here we define that qmin >=0 and qmax>=qmain311 x = max(self.data.xmin, self.data.xmax)312 y = max(self.data.ymin, self.data.ymax)313 314 ## fitting range315 if self.qmin == None:316 self.qmin = 0317 if self.qmax == None:318 self.qmax = math.sqrt(x*x +y*y)319 320 308 321 309 for i in range(len(self.y_bins)): … … 516 504 if self.fitArrangeDict.has_key(Uid): 517 505 self.fitArrangeDict[Uid].set_to_fit( value) 506 507 518 508 def get_problem_to_fit(self,Uid): 519 509 """
Note: See TracChangeset
for help on using the changeset viewer.