Changeset 914a499 in sasview for park_integration

Timestamp:

Mar 10, 2009 4:50:56 PM (16 years ago)

Author:

Jae Cho <jhjcho@…>

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:

5150250

Parents:

bc3dd65d

Message:

Added dx

File:

• park_integration/AbstractFitEngine.py (modified) (4 diffs)

park_integration/AbstractFitEngine.py

@@ -413 +413 @@
             ytemp=[]
             dytemp=[]
+            dxtemp=[]
             self.mini=None
             self.maxi=None
@@ -436 +437 @@
                     else:
                         raise RuntimeError, "Fit._concatenateData: y-errors missing"
-            data= Data(x=xtemp,y=ytemp,dy=dytemp)
+                    if data.dx is not None and len(data.dx)==len(data.x):   
+                        dxtemp.append(data.dx[i])
+                    else:
+                        raise RuntimeError, "Fit._concatenateData: dQ-errors missing"
+            data= Data(x=xtemp,y=ytemp,dy=dytemp, dx=dxtemp)
             data.setFitRange(self.mini, self.maxi)
             return data
@@ -482 +487 @@
         else:
             fitdata=FitData1D(data, smearer)
-       
         fitdata.setFitRange(qmin=qmin,qmax=qmax, ymin=ymin,ymax=ymax)
         #A fitArrange is already created but contains model only at Uid
@@ -492 +496 @@
             fitproblem.add_data(fitdata)
             self.fitArrangeDict[Uid]=fitproblem    
-   
+
     def get_model(self,Uid):
         """