Changeset 8d27cac in sasview

Timestamp:

Jan 3, 2012 10:15:48 AM (12 years ago)

Author:

Jae Cho <jhjcho@…>

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:

e38e335

Parents:

c668b1b

Message:

added more scales related to y*x⁴

Location:

plottools/src/danse/common/plottools

Files:

• PlotPanel.py (modified) (3 diffs)
• PropertyDialog.py (modified) (2 diffs)
• transform.py (modified) (2 diffs)

plottools/src/danse/common/plottools/PlotPanel.py

@@ -1611 +1611 @@
                 _xscale = 'log'
                 self.graph._xaxis_transformed("%s" % xname, "%s" % xunits)
+            if(self.xLabel == "log10(x^(4))"):
+                item.transformX(transform.toX4, transform.errToX4)
+                xunits = convertUnit(4,xunits) 
+                self.graph._xaxis_transformed("%s^{4}" % xname, "%s" % xunits)
+                _xscale = 'log'
             if(self.yLabel == "ln(y)"):
                 item.transformY(transform.toLogX, transform.errToLogX)
@@ -1629 +1634 @@
                 yunits = convertUnit(-1, yunits)
                 self.graph._yaxis_transformed("1/%s" % yname, "%s" % yunits)
+            if(self.yLabel == "y*x^(4)"):
+                item.transformY(transform.toYX4, transform.errToYX4)
+                xunits = convertUnit(4, xunits) 
+                self.graph._yaxis_transformed("%s \ \ %s^{4}" % (yname,xname), 
+                                               "%s%s" % (yunits,xunits))
             if(self.yLabel == "1/sqrt(y)"):
                 item.transformY(transform.toOneOverSqrtX,
@@ -1647 +1657 @@
                 xunits = convertUnit(4, xunits) 
                 self.graph._yaxis_transformed("\ln (%s \ \ %s^{4})" % (yname,xname), 
+                                               "%s%s" % (yunits,xunits))
+            if(self.yLabel == "log10(y*x^(4))"):
+                item.transformY(transform.toYX4, transform.errToYX4)
+                xunits = convertUnit(4, xunits) 
+                _yscale = 'log' 
+                self.graph._yaxis_transformed("%s \ \ %s^{4}" % (yname,xname), 
                                                "%s%s" % (yunits,xunits))
             if(self.viewModel == "Guinier lny vs x^(2)"):

plottools/src/danse/common/plottools/PropertyDialog.py

@@ -62 +62 @@
         self.xvalue.Insert("ln(x)", 3)
         self.xvalue.Insert("log10(x)", 4)
+        self.xvalue.Insert("log10(x^(4))", 5)
         
         # scale value for y
@@ -69 +70 @@
         self.yvalue.Insert("ln(y)", 2)
         self.yvalue.Insert("y^(2)", 3)
-        self.yvalue.Insert("1/sqrt(y)", 4)
-        self.yvalue.Insert("log10(y)", 5)
-        self.yvalue.Insert("ln(y*x)", 6)
-        self.yvalue.Insert("ln(y*x^(2))", 7)
-        self.yvalue.Insert("ln(y*x^(4))", 8)
+        self.yvalue.Insert("y*x^(4)", 4)
+        self.yvalue.Insert("1/sqrt(y)", 5)
+        self.yvalue.Insert("log10(y)", 6)
+        self.yvalue.Insert("ln(y*x)", 7)
+        self.yvalue.Insert("ln(y*x^(2))", 8)
+        self.yvalue.Insert("ln(y*x^(4))", 9)
+        self.yvalue.Insert("log10(y*x^(4))", 10)
         # type of view or model used 
         self.view.SetValue("--")

plottools/src/danse/common/plottools/transform.py

@@ -118 +118 @@
     else:
          raise ValueError,"transform.toLogYX4: input error"
+     
+def toYX4(y, x):
+    """
+    """
+    return math.pow(x, 4) * y
 
 def toLogXY(y, x):
@@ -360 +365 @@
     return err 
 
+def errToYX4(x, y=None, dx=None, dy=None):
+    """
+    error for (y*x^(4))
+    
+    :param x: float value
+    
+    """
+    # Check that the point on the graph is positive
+    # within errors
+
+    if dx == None:
+        dx = 0
+    if dy == None:
+        dy = 0
+    err = math.sqrt((dy * pow(x, 4))**2  + (4 * y * dx * math.pow(x, 3))**2)
+    return err