Changeset ed09638 in sasview

Timestamp:

Jun 4, 2012 3:03:44 PM (12 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:

fe9cb70e

Parents:

225ed2d

Message:

fixing pylint warnings

File:

• sansdataloader/src/sans/dataloader/readers/danse_reader.py (modified) (2 diffs)

sansdataloader/src/sans/dataloader/readers/danse_reader.py

@@ -14 +14 @@
 import math
 import os
-#import copy
+import sys
 import numpy
 import logging
@@ -137 +137 @@
                             err = float(toks[1])
                             if data_conv_i is not None:
-                                val = data_conv_i(val, units=output.y_unit)
-                                err = data_conv_i(err, units=output.y_unit)
+                                val = data_conv_i(val, units=output._yunit)
+                                err = data_conv_i(err, units=output._yunit)
                             data.append(val)
                             error.append(err)