Changeset f8ce013 in sasview for park_integration

Timestamp:

Oct 16, 2008 11:25:21 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:

bcd6d51

Parents:

fee780b

Message:

set_data modified

Location:

park_integration

Files:

• AbstractFitEngine.py (modified) (1 diff)
• ScipyFitting.py (modified) (1 diff)

park_integration/AbstractFitEngine.py

@@ -395 +395 @@
             @param Uid: unique key corresponding to a fitArrange object with data
         """
+        if data.__class__.__name__=='MetaData2D':
+            fitdata=FitData2D(data)
+        else:
+            fitdata=FitData1D(data)
         if qmin !=None and qmax !=None:
-            data.setFitRange(mini=qmin,maxi=qmax)
+            fitdata.setFitRange(mini=qmin,maxi=qmax)
         #A fitArrange is already created but contains model only at Uid
         if self.fitArrangeDict.has_key(Uid):
-            self.fitArrangeDict[Uid].add_data(data)
+            self.fitArrangeDict[Uid].add_data(fitdata)
         else:
         #no fitArrange object has been create with this Uid
             fitproblem= FitArrange()
-            fitproblem.add_data(data)
+            fitproblem.add_data(fitdata)
             self.fitArrangeDict[Uid]=fitproblem    
    

park_integration/ScipyFitting.py

@@ -84 +84 @@
         data=listdata
         #Assign a fit range is not boundaries were given
-        if data.__class__.__name__=='Data1D':
+        if not hasattr(data, 'image'):
             if qmin==None:
                 qmin= min(data.x)