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

Timestamp:

Jun 10, 2011 2:03:45 PM (12 years ago)

Author:

srkline

Message:

Initial separation of facility-specific initialization from the USANS reduction procedures. This is being done to enable the KIST-USANS instrument to use the NCNR reduction scheme. KIST will duplicate the .bt5 file structure but use a different extension.

For this, files for KIST have been created for USANS-specifc, and for some SANS-specific procedures that are entangled with the XML writing and with the USANS simulator.

Corresponding changes (new U_NCNR_Utils) have been added for NCNR-specific USANS initialization.

More will need to be done to disentangle the U_CALC, but at a later date. See ticket #334.

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

@@ -751 +751 @@
 Proc SelectFilesToAdd(file1,file2)
         String file1,file2
-        Prompt file1, "First File", popup, BT5FileList("*.bt5*")
-        Prompt file2, "Second File", popup, BT5FileList("*.bt5*")
+        Prompt file1, "First File", popup, BT5FileList("")
+        Prompt file2, "Second File", popup, BT5FileList("")
         
 //      Print file1,file2
@@ -763 +763 @@
         String filter
         
+        SVAR ext = root:Packages:NIST:USANS:Globals:MainPanel:gUExt
+        filter = "*"+ext+"*"
         
         //get all the files, then trim the list
@@ -789 +791 @@
         String file1,file2
         
+        SVAR ext = root:Packages:NIST:USANS:Globals:MainPanel:gUExt
+
         //load each file into a textWave
         Make/O/T/N=200 tw1,tw2
@@ -893 +897 @@
         
         // write out the final file (=tw3)
-        filen = file1[0,strlen(file1)-5]+"_SUM.bt5"
+        filen = file1[0,strlen(file1)-5]+"_SUM"+ext
         
         if(dialog)