Changeset 37d9521 in sasview

Timestamp:

Aug 5, 2008 8:28:24 AM (16 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

99d1af6

Parents:

43723aa

Message:

fit wih park notes added

Location:

park_integration

Files:

• AbstractFitEngine.py (modified) (2 diffs)
• ParkFitting.py (modified) (3 diffs)
• docs/notes.txt (added)

park_integration/AbstractFitEngine.py

@@ -46 +46 @@
             
         """
+        print "fitting parmater",pars
+        temp=[]
         if pars !={}:
             self.parameters=[]
@@ -56 +58 @@
                     param = Parameter(model, key, value)
                     self.parameters.append(param)
-                    self.paramList.append(key)
-            
+                    temp.append(key)
+            self.paramList.append(temp)
+            print "self.paramList2", self.paramList
             #A fitArrange is already created but contains dList only at Uid
             if self.fitArrangeList.has_key(Uid):

park_integration/ParkFitting.py

@@ -142 +142 @@
         self.fitArrangeList={}
         
+        
     def createProblem(self):
         """
@@ -151 +152 @@
         mylist=[]
         listmodel=[]
-        
+        i=0
         for k,value in self.fitArrangeList.iteritems():
             sansmodel=value.get_model()
@@ -159 +160 @@
             for p in parkmodel.parameterset:
                 #self.param_list.append(p._getname())
-                if p.isfixed():
-                #if p.isfixed() and p._getname()in self.paramList:
+                #if p.isfixed():
+                #print 'parameters',p.name
+                #print "self.paramList",self.paramList
+                if p.isfixed() and p._getname()in self.paramList:
                     p.set([-numpy.inf,numpy.inf])
-            
+            i+=1    
             Ldata=value.get_data()
             x,y,dy=self._concatenateData(Ldata)