Changeset bc6532e in sasview for src/sas/sascalc/dataloader

Timestamp:

Apr 4, 2017 5:59:47 PM (8 years ago)

Author:

Adam Washington <adam.washington@…>

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

Children:

56e2e3e

Parents:

35009a0

Message:

Try switch type annotation styles in sesans_reader.py

File:

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

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

@@ -120 +120 @@
 
         :param value: The magnitude of the measurement
-        :type value: Number
         :param value_unit: a string containing the final desired unit
-        :type value_unit: String
         :param default_unit: a string containing the units of the original measurement
-        :type default_unit: String
         :return: The magnitude of the measurement in the new units
         """
+        # (float, string, string) -> float
         if has_converter and value_unit != default_unit:
             data_conv_q = Converter(value_unit)
@@ -144 +142 @@
 
         :param header: A dictionary of values
-        :type header: Dictionary
         :param key: A string which is a prefix for one of the keys in the dict
-        :type key: String
         :return: The value of the dictionary for the specified key
         """
+        # (dict<string, x>, string) -> x
         index = [k for k in headers.keys()
                  if k.startswith(key)][0]
@@ -164 +161 @@
         with the units for the values appended onto the string within square
         brackets (See the example above)
-        :type header: Dictionary
         :param key: A string with the prefix of the dictionary key whose unit
         is being fetched
-        :type key: String
         :return: A string containing the unit specifed in the header
         """
+        # (dict<string, _>, string) -> string
         index = [k for k in params.keys()
                  if k.startswith(key)][0]