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

Timestamp:

Jul 6, 2012 5:29:38 PM (10 years ago)

Author:

srkline

Message:

Added support for reading 4-column data into the 2D reader

Calculation of kappa for ABS now does a specific byte check for ensuring a "good" DIV file. hopefully this will eliminate errors where incorrect DIV files are selected and bad kappa values are generated - and the program thinks (incorrectly) that there is a valid DVI file present, when there really isn't one (and then there is no easy recovery from this)

Added CheckIfDIVData() functions to NCNR_Utils and to FACILITY_Utils, and to other (facility)_Utils

Changed the calls to writing BT5 files after adding so that it could be more easily scripted in the future.

File:

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

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

@@ -12 +12 @@
 //      - it can be repeated multiple times to add more than two files together
 //      - the two added files are listed in the title of the summed file.
+// -- see AddBT5AndSave() if you want something that cen be automated to bypass the user dialogs.
 
 // Adding two data sets:
@@ -758 +759 @@
         LoadAndAddUSANS(file1,file2)
         
-End
+        String filen = file1[0,strlen(file1)-5]+"_SUM"+".BT5"
+        
+        GetAddedFileName(filen)
+End
+
+Proc GetAddedFileName(newName)
+        String newName
+        Prompt newName, "Enter new FileName"
+        
+        SaveAddedBT5Files(newName,1)                    // 1 asks to confirm the name w/ a dialog
+End
+
+
+// this procedure will add two and name without any dialogs. Pass it the three names
+// if the save name is null, you'll get a dialog
+Proc AddBT5AndSave(file1,file2,filen)
+        String file1,file2,filen="TMP.BT5"
+        Prompt file1, "First File", popup, BT5FileList("")
+        Prompt file2, "Second File", popup, BT5FileList("")
+        Prompt filen, "output file name"
+        
+        LoadAndAddUSANS(file1,file2)
+        
+//      String filen = file1[0,strlen(file1)-5]+"_SUM"+".BT5"
+
+        PathInfo savePathName   
+        filen = S_Path + filen 
+        SaveAddedBT5Files(filen,0)              //0==no dialog
+
+End
+
+
 
 Function/S BT5FileList(filter)
@@ -896 +928 @@
         endfor
         
-        // write out the final file (=tw3)
-        filen = file1[0,strlen(file1)-5]+"_SUM"+ext
+//      // write out the final file (=tw3)
+//      filen = file1[0,strlen(file1)-5]+"_SUM"+ext
+//      
+//      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
+        
+        return(0)
+end
+
+// if you bypass the dialog, newname needs to be a full path
+Function SaveAddedBT5Files(newName,dialog)
+        String newName
+        Variable dialog
+        
+        Variable refnum
+        String fullPath
+        
+        WAVE/T tw3=tw3
         
         if(dialog)
                 PathInfo/S savePathName
-                fullPath = DoSaveFileDialog("Save data as",fname=filen)
+                fullPath = DoSaveFileDialog("Save data as",fname=newName)
                 If(cmpstr(fullPath,"")==0)
                         //user cancel, don't write out a file
@@ -907 +969 @@
                         Abort "no data file was written"
                 Endif
+                newName=FullPath
                 //Print "dialog fullpath = ",fullpath
         Endif
-        
-        Open refNum as fullPath
+
+
+        Open refNum as newName
         wfprintf refnum, "%s",tw3
         Close refnum
-                
-        //killwaves/Z tw1,tw2,tw3
-        
+
         return(0)
-end
+End
 
 //returns count time and start/stop angles as written in header