Changeset 05fb3d6b in sasview for src/sas/sascalc

Timestamp:

Mar 19, 2016 6:59:54 AM (9 years ago)

Author:

krzywon

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:

ef908db, a407a40

Parents:

3689302 (diff), 354524d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge remote-tracking branch 'origin/master'

File:

• src/sas/sascalc/dataloader/readers/sesans_reader.py (modified) (1 diff)

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

@@ -178 +178 @@
                 output.sample.name = paramvals[1]
                 output.sample.ID = paramvals[0]
+                zaccept_unit_split = paramnames[7].split("[")
+                zaccept_unit = zaccept_unit_split[1].replace("]","")
+                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.vars=varheader