Changeset 992199e in sasview for Invariant

Timestamp:

Jan 12, 2011 12:38:35 PM (14 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

a01c743

Parents:

b7c7a1c

Message:

modify invariant wrapper bring the pylint score 10/10

Location:

Invariant

Files:

• invariant.py (modified) (1 diff)
• invariant_mapper.py (modified) (1 diff)

Invariant/invariant.py

@@ -626 +626 @@
         # Systematic error
         # If we have smearing, the shape of the I(q) distribution at low Q will
-        # may not be a Guinier or simple power law. The following is a conservative
-        # estimation for the systematic error.
+        # may not be a Guinier or simple power law. The following is 
+        # a conservative estimation for the systematic error.
         err = qmin*qmin*math.fabs((qmin-self._low_q_limit)*\
                                   (data.y[0] - data.y[INTEGRATION_NSTEPS-1]))

Invariant/invariant_mapper.py

@@ -4 +4 @@
 """
 
-class InvariantMapper:
+
+def get_qstar(inv, extrapolation=None):
     """
-    Wrapper for invariant module for map interface
+    Get invariant value (Q*)
     """
-    def __init__(self):
-        """
-        Initialize the wrapper
-        """
-    def get_qstar(self, inv, extrapolation=None):
-        """
-        Get invariant value (Q*)
-        """
-        return inv.get_qstar(extrapolation)
-    
-    def get_qstar_with_error(self, inv, extrapolation=None):
-        """
-        Get invariant value with uncertainty
-        """
-        return inv.get_qstar_with_error(extrapolation)
-    
-    def get_volume_fraction(self, inv, contrast, extrapolation=None):
-        """
-        Get volume fraction
-        """
-        return inv.get_volume_fraction(contrast, extrapolation)
-    
-    def get_volume_fraction_with_error(self, inv, contrast, extrapolation=None):
-        """
-        Get volume fraction with uncertainty
-        """
-        return inv.get_volume_fraction_with_error(contrast,
-                                                        extrapolation)
-    
-    def get_surface(self, inv, contrast, porod_const, extrapolation=None):
-        """
-        Get surface with uncertainty
-        """
-        return inv.get_surface(contrast=contrast,
-                                          porod_const=porod_const,
-                                          extrapolation=extrapolation)
-    
-    def get_surface_with_error(self, inv, contrast, 
-                               porod_const, extrapolation=None):
-        """
-        Get surface with uncertainty
-        """
-        return inv.get_surface_with_error(contrast=contrast,
-                                          porod_const=porod_const,
-                                          extrapolation=extrapolation)
-    
-    
+    return inv.get_qstar(extrapolation)
+
+def get_qstar_with_error(inv, extrapolation=None):
+    """
+    Get invariant value with uncertainty
+    """
+    return inv.get_qstar_with_error(extrapolation)
+
+def get_volume_fraction(inv, contrast, extrapolation=None):
+    """
+    Get volume fraction
+    """
+    return inv.get_volume_fraction(contrast, extrapolation)
+
+def get_volume_fraction_with_error(inv, contrast, extrapolation=None):
+    """
+    Get volume fraction with uncertainty
+    """
+    return inv.get_volume_fraction_with_error(contrast,
+                                                    extrapolation)
+
+def get_surface(inv, contrast, porod_const, extrapolation=None):
+    """
+    Get surface with uncertainty
+    """
+    return inv.get_surface(contrast=contrast,
+                                      porod_const=porod_const,
+                                      extrapolation=extrapolation)
+
+def get_surface_with_error(inv, contrast, 
+                           porod_const, extrapolation=None):
+    """
+    Get surface with uncertainty
+    """
+    return inv.get_surface_with_error(contrast=contrast,
+                                      porod_const=porod_const,
+                                      extrapolation=extrapolation)
+