Changeset 743 for sans/Dev/trunk/NCNR_User_Procedures/Reduction/USANS/COR_Graph.ipf

Timestamp:

Sep 16, 2010 5:13:31 PM (12 years ago)

Author:

srkline

Message:

ticket #281: added a check for SAM and EMP data to both be present when updating the USANS transmission. An alert is presented if one or the other is missing.

ticket #194: added two more options for curve fitting information. users can no with checkboxes add residuals to the fit graph, and add a textbox of fit information. unchecking the boxes provides the option for removing them from the graph.

-- still need to make sure that the residuals stay in sync. if they are on the graph and then use is un-selected, the residual won't update with the new fit. The textbox is fine - it's automatically killed if not selected.

File:

• sans/Dev/trunk/NCNR_User_Procedures/Reduction/USANS/COR_Graph.ipf (modified) (1 diff)

sans/Dev/trunk/NCNR_User_Procedures/Reduction/USANS/COR_Graph.ipf

@@ -360 +360 @@
         SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder
         
-        Wave samCts=$(USANSFolder+":SAM:DetCts")
-        Wave empCts=$(USANSFolder+":EMP:DetCts")
+        Wave/Z samCts=$(USANSFolder+":SAM:DetCts")
+        Wave/Z empCts=$(USANSFolder+":EMP:DetCts")
         if((WaveExists(samCts)==0) || (WaveExists(empCts)==0))
+                DoAlert 0,"Sample and Empty data must both be plotted before you can calculate the transmission"
                 Variable/G $(USANSFolder+":Globals:MainPanel:gTransWide")=NaN           //error
                 Variable/G $(USANSFolder+":Globals:MainPanel:gTransRock")=NaN