Changeset 631 for sans/Dev/trunk/NCNR_User_Procedures/Common/DataSetHandling.ipf

Timestamp:

Feb 19, 2010 10:18:56 AM (13 years ago)

Author:

srkline

Message:

Some changes to the installer files to look in new paths, not complete yet at all.

Added proper error handling for all 4 cases in the new 1D Arithmetic panel. Also fixed a typo that was always removing set 2 from the display when the result was calculated.

File:

• sans/Dev/trunk/NCNR_User_Procedures/Common/DataSetHandling.ipf (modified) (5 diffs)

sans/Dev/trunk/NCNR_User_Procedures/Common/DataSetHandling.ipf

@@ -605 +605 @@
                         // state of the checkbox
                         ControlInfo/W=$(win) DANoDS2_cb
-                        if(V_flag)
+                        if(V_Value)
                                 DS2 = "NullSolvent"
                         endif
@@ -976 +976 @@
         
         result_i = set1_i - (set2Scale*interp(set1_q[p],set2_q,set2_i))
-        result_s = sqrt(set1_s^2 + set2Scale^2*interp(set1_q[p],set2_q,set2_s))
+        result_s = sqrt(set1_s^2 + (set2Scale*interp(set1_q[p],set2_q,set2_s))^2 )
         //Calculate result error wave - can we produce corrected Q error? 
         
@@ -1004 +1004 @@
         //Do addition of I waves - including interpolation if necessary. 
         Wave result_i = $(resultPath+resultName+"_i")
+        Wave result_s = $(resultPath+resultName+"_s")
         Wave set1_i = $(set1Path+set1Name+"_i")
         Wave set1_q = $(set1Path+set1Name+"_q")
+        Wave set1_s = $(set1Path+set1Name+"_s")
         Wave set2_i = $(set2Path+set2Name+"_i")
         Wave set2_q = $(set2Path+set2Name+"_q")
+        Wave set2_s = $(set2Path+set2Name+"_s")
+        
         result_i =  set1_i + set2Scale*interp(set1_q[p],set2_q,set2_i)  
-        
-        //Calculate result error wave - can we produce corrected Q error? 
-
+        //Calculate result error wave (note that this is identical to subtraction)
+        result_s = sqrt(set1_s^2 + (set2Scale*interp(set1_q[p],set2_q,set2_s))^2 )
+
+        //  - can we produce corrected Q error? 
         //Generate history string to record what was done?
         return 0
@@ -1038 +1043 @@
         //Do multiplcation of I waves - including interpolation if necessary. 
         Wave result_i = $(resultPath+resultName+"_i")
+        Wave result_s = $(resultPath+resultName+"_s")
         Wave set1_i = $(set1Path+set1Name+"_i")
         Wave set1_q = $(set1Path+set1Name+"_q")
+        Wave set1_s = $(set1Path+set1Name+"_s")
         Wave set2_i = $(set2Path+set2Name+"_i")
         Wave set2_q = $(set2Path+set2Name+"_q")
+        Wave set2_s = $(set2Path+set2Name+"_s")
+        
         result_i =  set1_i*set2Scale*interp(set1_q[p],set2_q,set2_i)
-                
-        
-        //Calculate result error wave - can we produce corrected Q error? 
+        //Calculate result error wave
+        // sum each of the relative errors, interpolating set 2 intensity and error as needed
+        // then sqrt
+        result_s = (set2Scale*interp(set1_q[p],set2_q,set2_i)*set1_s)^2
+        result_s += (set2Scale*set1_i*interp(set1_q[p],set2_q,set2_s))^2
+        result_s = sqrt(result_s)
+
+        // - can we produce corrected Q error? 
 
         //Generate history string to record what was done?
@@ -1073 +1087 @@
         //Do division of I waves - including interpolation if necessary. 
         Wave result_i = $(resultPath+resultName+"_i")
+        Wave result_s = $(resultPath+resultName+"_s")
         Wave set1_i = $(set1Path+set1Name+"_i")
         Wave set1_q = $(set1Path+set1Name+"_q")
+        Wave set1_s = $(set1Path+set1Name+"_s")
         Wave set2_i = $(set2Path+set2Name+"_i")
         Wave set2_q = $(set2Path+set2Name+"_q")
+        Wave set2_s = $(set2Path+set2Name+"_s")
+        
         result_i =  set1_i/(set2Scale*interp(set1_q[p],set2_q,set2_i)   )
-        
-        //Calculate result error wave - can we produce corrected Q error? 
+        //Calculate result error wave
+        // sum each of the relative errors, interpolating set 2 intensity and error as needed
+        // then sqrt
+        result_s = (set1_s/set2Scale/interp(set1_q[p],set2_q,set2_i))^2
+        result_s += (interp(set1_q[p],set2_q,set2_s)*set1_i/set2Scale/interp(set1_q[p],set2_q,set2_i)^2)^2
+        result_s = sqrt(result_s)
+
+        // - can we produce corrected Q error? 
         
         //Generate history string to record what was done?