Changeset a9e04aa in sasview

Timestamp:

Sep 30, 2008 10:33:02 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:

8bbab51

Parents:

3755d77

Message:

added fitting selection methods

Location:

park_integration

Files:

• AbstractFitEngine.py (modified) (6 diffs)
• Fitting.py (modified) (1 diff)
• ParkFitting.py (modified) (2 diffs)
• ScipyFitting.py (modified) (1 diff)

park_integration/AbstractFitEngine.py

@@ -50 +50 @@
         self._model.details[self.name][1:] = r
     range = property(_getrange,_setrange)
-
-
-class Model(object):
+    
+class Model(park.Model):
     """
         PARK wrapper for SANS models.
@@ -60 +59 @@
             @param sans_model: the sans model to wrap using park interface
         """
+        park.Model.__init__(self, **kw)
         self.model = sans_model
         self.name = sans_model.name
@@ -108 +108 @@
    
    
+
+
 class Data(object):
     """ Wrapper class  for SANS data """
@@ -314 +316 @@
         if self.fitArrangeDict.has_key(Uid):
             del self.fitArrangeDict[Uid]
-
+            
+    def select_problem_for_fit(self,Uid,value):
+        """
+            select a couple of model and data at the Uid position in dictionary
+            and set in self.selected value to value
+            @param value: the value to allow fitting. can only have the value one or zero
+        """
+        if self.fitArrangeDict.has_key(Uid):
+             self.fitArrangeDict[Uid].set_to_fit( value)
+    def get_problem_to_fit(self,Uid):
+        """
+            return the self.selected value of the fit problem of Uid
+           @param Uid: the Uid of the problem
+        """
+        if self.fitArrangeDict.has_key(Uid):
+             self.fitArrangeDict[Uid].get_to_fit()
     
 class FitArrange:
@@ -328 +345 @@
         self.model = None
         self.dList =[]
+        #self.selected  is zero when this fit problem is not schedule to fit 
+        #self.selected is 1 when schedule to fit 
+        self.selected = 0
         
     def set_model(self,model):
@@ -359 +379 @@
         if data in self.dList:
             self.dList.remove(data)
-    
-
-
-    
+    def set_to_fit (self, value=0):
+        """
+           set self.selected to 0 or 1  for other values raise an exception
+           @param value: integer between 0 or 1
+        """
+        self.selected= value
+        
+    def get_to_fit(self):
+        """
+            @return self.selected value
+        """
+        return self.selected
+    
+
+
+    

park_integration/Fitting.py

@@ -69 +69 @@
         self._engine.remove_Fit_Problem(Uid)
         
+    def select_problem_for_fit(self,Uid,value):
+        """
+            select a couple of model and data at the Uid position in dictionary
+            and set in self.selected value to value
+            @param value: the value to allow fitting. can only have the value one or zero
+        """
+        self._engine.select_problem_for_fit(Uid,value)
         
+    def get_problem_to_fit(self,Uid):
+        """
+            return the self.selected value of the fit problem of Uid
+           @param Uid: the Uid of the problem
+        """
+        return self._engine.get_problem_to_fit(Uid)

park_integration/ParkFitting.py

@@ -58 +58 @@
         listmodel=[]
         i=0
-        for k,value in self.fitArrangeDict.iteritems():
-            parkmodel = value.get_model()
+        fitproblems=[]
+        for id ,fproblem in self.fitArrangeDict.iteritems():
+            if fproblem.get_to_fit()==1:
+                fitproblems.append(fproblem)
+                
+        if len(fitproblems)==0 : 
+            raise RuntimeError, "No Assembly scheduled for Park fitting."
+            return
+        for item in fitproblems:
+            parkmodel = item.get_model()
             for p in parkmodel.parameterset:
                 if p._getname()in self.paramList and not p.iscomputed():
@@ -66 +74 @@
                
             i+=1
-            Ldata=value.get_data()
+            Ldata=item.get_data()
             parkdata=self._concatenateData(Ldata)
             

park_integration/ScipyFitting.py

@@ -60 +60 @@
         self.paramList=[]
     def fit(self,qmin=None, qmax=None):
-         # Protect against simultanous fitting attempts
-        if len(self.fitArrangeDict)>1: 
+        # Protect against simultanous fitting attempts
+        #if len(self.fitArrangeDict)>1: 
+        #    raise RuntimeError, "Scipy can't fit more than a single fit problem at a time."
+        # fitproblem contains first fitArrange object(one model and a list of data)
+        #list of fitproblem
+        fitproblem=[]
+        for id ,fproblem in self.fitArrangeDict.iteritems():
+            print "ScipyFitting:fproblem.get_to_fit() ",fproblem.get_to_fit()
+            if fproblem.get_to_fit()==1:
+                fitproblem.append(fproblem)
+        if len(fitproblem)>1 : 
             raise RuntimeError, "Scipy can't fit more than a single fit problem at a time."
-        
-        # fitproblem contains first fitArrange object(one model and a list of data)
-        fitproblem=self.fitArrangeDict.values()[0]
+            return
+        elif len(fitproblem)==0 : 
+            raise RuntimeError, "No Assembly scheduled for Scipy fitting."
+            return
+    
         listdata=[]
-        model = fitproblem.get_model()
-        listdata = fitproblem.get_data()
+        model = fitproblem[0].get_model()
+        listdata = fitproblem[0].get_data()
         # Concatenate dList set (contains one or more data)before fitting
         data=self._concatenateData( listdata)