Changeset 392056d in sasview

Timestamp:

Oct 11, 2016 7:38:13 AM (8 years ago)

Author:

jhbakker

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, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

9087214

Parents:

1fac6c0

Message:

This version of SESANS integration will be merged to master

Location:

src/sas/sascalc

Files:

• data_util/qsmearing.py (modified) (1 diff)
• dataloader/readers/sesans_reader.py (modified) (2 diffs)

src/sas/sascalc/data_util/qsmearing.py

@@ -167 +167 @@
     #Need function to calculate this based on model
     #Here assume a number
-    Rmax = 50000
+    Rmax = 1000000
     q_calc = sesans.make_q(data.sample.zacceptance, Rmax)
     return PySmear(SESANS1D(data,q_calc),model)

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

@@ -170 +170 @@
                 output.x, output.x_unit = self._unit_conversion(x, lam_unit, default_z_unit)
                 output.y = y
-                output.y_unit = 'pol' # output y_unit erbij
+                output.y_unit = '\AA^{-2} cm^{-1}' # output y_unit erbij
                 output.dx, output.dx_unit = self._unit_conversion(dx, lam_unit, default_z_unit)
                 output.dy = dy
@@ -177 +177 @@
 
                 output.xaxis("\\rm{z}", output.x_unit)
-                output.yaxis("\\rm{P/P0}", output.y_unit) # Adjust label to ln P/(lam^2 t), remove lam column refs
+                output.yaxis("\\rm{ln(P)/(t \lambda^2)}", output.y_unit) # Adjust label to ln P/(lam^2 t), remove lam column refs
                 # Store loading process information
                 output.meta_data['loader'] = self.type_name