Changeset 570 for sans/Dev/trunk/NCNR_User_Procedures/Reduction/USANS/BT5_AddFiles.ipf

Timestamp:

Oct 14, 2009 2:30:17 PM (13 years ago)

Author:

srkline

Message:

Change (1):
In preparation for release, updated pragma IgorVersion?=6.1 in all procedures

Change (2):
As a side benefit of requiring 6.1, we can use the MultiThread? keyword to thread any model function we like. The speed benefit is only noticeable on functions that require at least one integration and at least 100 points (resolution smearing is NOT threaded, too many threadSafe issues, too little benefit). I have chosen to use the MultiThread? only on the XOP assignment. In the Igor code there are too many functions that are not explicitly declared threadsafe, making for a mess.

File:

• sans/Dev/trunk/NCNR_User_Procedures/Reduction/USANS/BT5_AddFiles.ipf (modified) (6 diffs)

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

@@ -1 +1 @@
 #pragma rtGlobals=1             // Use modern global access method.
+#pragma IgorVersion=6.1
 
 
@@ -15 +16 @@
 //  -- but how to save the data? At this point, errCR != sqrt(CR)
 //
+// - Why can't I just use the whole set of files from the main USANS panel, and add what needs
+//   to be added? Because if there is an angle shift, I have no way of knowing which files to apply
+//   the shift to...
+//
+//
+// - need a global for the tolerance (and a good reason to use that particular value)
+//
+// - do I have anything hard-wired in the code that needs to be generalized before release? 
+//
+// - add descriptions of this to the help files
+//
 
 
@@ -20 +32 @@
 // - allow user to input Qpeak (maybe of no use?) If so, do it right away with a dialog
 //   if no peak was found.
-//
-
-Macro mShowUSANSAddPanel()
-ShowUSANSAddPanel()
-end
-
-Macro mSelectFilesToAdd()
-        SelectFilesToAdd()
-end
+
+
 
 Proc ShowUSANSAddPanel()
@@ -723 +728 @@
         Prompt file2, "Second File", popup, BT5FileList("*.bt5*")
         
-        Print file1,file2
+//      Print file1,file2
         
         LoadAndAddUSANS(file1,file2)
@@ -761 +766 @@
         Make/O/T/N=200 tw1,tw2
         
-        String fname="",fpath=""
+        String fname="",fpath="",fullPath=""
         Variable ctTime1,ang11,ang21
         Variable ctTime2,ang12,ang22
-        
-        PathInfo bt5PathName
+        Variable dialog=1
+        
+        PathInfo/S savePathName
         fpath = S_Path
+        
+        if(strlen(S_Path)==0)
+                DoAlert 0,"You must select a Save Path... from the main USANS_Panel"
+                return(0)
+        endif
         
         fname = fpath + file1
@@ -857 +868 @@
         // write out the final file (=tw3)
         filen = file1[0,strlen(file1)-5]+"_SUM.bt5"
-        Open refNum as filen
+        
+        if(dialog)
+                PathInfo/S savePathName
+                fullPath = DoSaveFileDialog("Save data as",fname=filen)
+                If(cmpstr(fullPath,"")==0)
+                        //user cancel, don't write out a file
+                        Close/A
+                        Abort "no data file was written"
+                Endif
+                //Print "dialog fullpath = ",fullpath
+        Endif
+        
+        Open refNum as fullPath
         wfprintf refnum, "%s",tw3
         Close refnum
-        
+                
         //killwaves/Z tw1,tw2,tw3