Changeset 1c0e3b0 in sasview

Timestamp:

Mar 21, 2016 8:30:32 AM (9 years ago)

Author:

awashington

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:

25427d9

Parents:

76d905f

Message:

Better reading of units in sesans_reader

File:

• src/sas/sascalc/dataloader/readers/sesans_reader.py (modified) (3 diffs)

src/sas/sascalc/dataloader/readers/sesans_reader.py

@@ -142 +142 @@
                 default_p_unit = " "
                 lam_unit = lam_header[1].replace("[","").replace("]","")
-                for i,x_val in output.x:
-                    output.x[i], output.x_unit = self._unit_conversion(x_val, lam_unit, default_z_unit)
-                for i,y_val in output.y:
-                    output.y[i], output.y_unit = self._unit_conversion(y_val, " ", default_p_unit)
                 varheader=[zvals[0],dzvals[0],lamvals[0],dlamvals[0],Pvals[0],dPvals[0]]
                 valrange=range(1, len(zvals))
@@ -163 +159 @@
                 input_f.close()
 
-                #Data
-                output.x = x #[x != 0]
-                output.y = y #[x != 0]
+                output.x, output.x_unit = self._unit_conversion(x, lam_unit, default_z_unit)
+                output.y = y
+                output.dx, output.dx_unit = self._unit_conversion(dx, lam_unit, default_z_unit)
                 output.dy = dy
-                output.dx = dx
-                output.lam = lam
-                output.dlam = dlam
+                output.lam, output.lam_unit = self._unit_conversion(lam, lam_unit, default_z_unit)
+                output.dlam, output.dlam_unit = self._unit_conversion(dlam, lam_unit, default_z_unit)
 
                 output.xaxis("\rm{z}", output.x_unit)
@@ -182 +177 @@
                 if zaccept_unit.strip() == '\AA^-1':
                     zaccept_unit = "1/A"
-                output.sample.zacceptance=float(paramvals[7])
-                output.sample.zacceptance=self._unit_conversion(output.sample.zacceptance,
-                                                                zaccept_unit, "1/" + default_z_unit)
+                output.sample.zacceptance=(float(paramvals[7]),zaccept_unit)
                 output.vars=varheader