Changeset 89f3b66 in sasview for park_integration/ParkFitting.py
- Timestamp:
- Oct 19, 2010 9:02:08 PM (14 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:
- 4ddb7a4
- Parents:
- 74b1770
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
park_integration/ParkFitting.py
raa36f96 r89f3b66 7 7 simple fit with park optimizer. 8 8 """ 9 import time10 import numpy9 #import time 10 #import numpy 11 11 import park 12 from park import fit, fitresult12 from park import fit, fitresult 13 13 from park import assembly 14 14 from park.fitmc import FitSimplex, FitMC … … 52 52 with Uid as keys 53 53 """ 54 self.fitArrangeDict ={}55 self.paramList =[]54 self.fitArrangeDict = {} 55 self.paramList = [] 56 56 57 57 def createAssembly(self): … … 61 61 create an assembly self.problem= park.Assembly([(parkmodel,parkdata)]) 62 62 """ 63 mylist =[]64 listmodel =[]65 i =066 fitproblems =[]67 for id 68 if fproblem.get_to_fit() ==1:63 mylist = [] 64 listmodel = [] 65 i = 0 66 fitproblems = [] 67 for id,fproblem in self.fitArrangeDict.iteritems(): 68 if fproblem.get_to_fit() == 1: 69 69 fitproblems.append(fproblem) 70 71 if len(fitproblems)==0 : 70 if len(fitproblems) == 0: 72 71 raise RuntimeError, "No Assembly scheduled for Park fitting." 73 72 return … … 76 75 for p in parkmodel.parameterset: 77 76 ## does not allow status change for constraint parameters 78 if p.status != 'computed':77 if p.status != 'computed': 79 78 if p._getname()in item.pars: 80 79 ## make parameters selected for fit will be between boundaries 81 p.set( p.range ) 82 80 p.set(p.range) 83 81 else: 84 p.status= 'fixed' 85 86 i+=1 87 Ldata=item.get_data() 82 p.status = 'fixed' 83 i += 1 84 Ldata = item.get_data() 88 85 #parkdata=self._concatenateData(Ldata) 89 parkdata =Ldata90 fitness =(parkmodel,parkdata)86 parkdata = Ldata 87 fitness = (parkmodel, parkdata) 91 88 mylist.append(fitness) 89 self.problem = park.Assembly(mylist) 92 90 93 self.problem = park.Assembly(mylist) 94 95 def fit(self,q=None,handler=None, curr_thread= None): 91 def fit(self, q=None, handler=None, curr_thread=None): 96 92 """ 97 93 Performs fit with park.fit module.It can perform fit with one model … … 112 108 """ 113 109 self.createAssembly() 114 115 110 localfit = FitSimplex() 116 111 localfit.ftol = 1e-8 … … 119 114 fitter = FitMC(localfit=localfit, start_points=1) 120 115 if handler == None: 121 handler= fitresult.ConsoleUpdate(improvement_delta=0.1) 122 123 116 handler = fitresult.ConsoleUpdate(improvement_delta=0.1) 124 117 result = fit.fit(self.problem, 125 118 fitter=fitter, 126 handler= 119 handler=handler) 127 120 self.problem.all_results(result) 128 if result != None:129 if q != None:121 if result != None: 122 if q != None: 130 123 q.put(result) 131 124 return q
Note: See TracChangeset
for help on using the changeset viewer.