Changeset 1080

Timestamp:

Jan 22, 2018 9:39:17 AM (5 years ago)

Author:

srkline

Message:

some of the changes for smearing calculations.

Location:

sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS

Files:

• V_Combine_1D.ipf (modified) (1 diff)
• V_DetectorCorrections.ipf (modified) (1 diff)
• V_USANS_SlitSmearing_v40.ipf (modified) (1 diff)

sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_Combine_1D.ipf

@@ -114 +114 @@
         endif
         
-        // last, set up the dependency
-        Make/O/D/N=1 trimUpdate
-        trimUpdate := V_TrimTestUpdate(Beg_pts, End_pts)
-        
+        // last, set up the dependency (but don't set it up twice!)
+        if(exists("root:Packages:NIST:VSANS:Globals:Protocols:trimUpdate") == 0)
+                Make/O/D/N=1 root:Packages:NIST:VSANS:Globals:Protocols:trimUpdate
+                root:Packages:NIST:VSANS:Globals:Protocols:trimUpdate := V_TrimTestUpdate(Beg_pts, End_pts)
+        else
+                string dependencyStr = GetFormula(root:Packages:NIST:VSANS:Globals:Protocols:trimUpdate)
+                if(strlen(dependencyStr)==0)
+                        root:Packages:NIST:VSANS:Globals:Protocols:trimUpdate := V_TrimTestUpdate(Beg_pts, End_pts)
+                endif
+        endif
         
         SetDataFolder root:

sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_DetectorCorrections.ipf

@@ -1358 +1358 @@
         // if the DIV workfile doesn't exist, let the user know,and abort
 
-        WAVE/Z div_data = $("root:Packages:NIST:VSANS:DIV:entry:instrument:detector_"+detStr+":data")
+        WAVE/Z div_data_err = V_getDetectorDataErrW("DIV",detStr)
+        WAVE/Z div_data = V_getDetectorDataW("DIV",detStr)
+
+//      WAVE/Z div_data = $("root:Packages:NIST:VSANS:DIV:entry:instrument:detector_"+detStr+":data")
         if(WaveExists(div_data) == 0)
                 Print "The DIV wave does not exist in V_DIVCorrection()"
                 Return(1)               //error condition
         Endif
+        if(WaveExists(div_data_err) == 0)
+                Print "The DIV error wave does not exist in V_DIVCorrection()"
+                Return(1)               //error condition
+        Endif
         //files exist, proceed
 
+// do the error propagation first, since data is changed by the correction
+        data_err = sqrt(data_err^2/div_data^2 + div_data_err^2 * data^2/div_data^4 )
+
+// then the correction
         data /= div_data
 
-// TODO: -- correct the error propagation       
-        data_err /= div_data
         
         Return(0)

sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_USANS_SlitSmearing_v40.ipf

@@ -18 +18 @@
 //
 
+//
+// TODO --this needs to be made completely separate from USANS, or MERGE
+//    with USANS if the per-Q definition of dQv is valid for the matrix solution
+//