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

Timestamp:

May 22, 2013 10:50:04 AM (10 years ago)

Author:

mjw

Message:

Fixed an issue with additng two raw BT5 files.

File:

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

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

@@ -842 +842 @@
         
         fname = fpath + file1
-        LoadBT5_toWave(fname,tw1,ctTime1,ang11,ang21)           //redimensions tw1
+        LoadBT5_toWave(file1,fpath,tw1,ctTime1,ang11,ang21)             //redimensions tw1
         Print "File 1: time, angle1, angle2",ctTime1,ang11,ang21
         
         fname = fpath + file2
-        LoadBT5_toWave(fname,tw2,ctTime2,ang12,ang22)           //redimensions tw2
+        LoadBT5_toWave(file2,fpath,tw2,ctTime2,ang12,ang22)             //redimensions tw2
         Print "File 2: time, angle1, angle2",ctTime2,ang12,ang22
 
@@ -856 +856 @@
                 DoAlert 0,"Files are not the same length and can't be directly added"
                 //Killwaves/Z tw1,tw2,tw3
+                abort
                 return(0)
         endif
@@ -861 +862 @@
                 DoAlert 0,"Files don't start at the same angle and can't be directly added"
                 //Killwaves/Z tw1,tw2,tw3
+                abort
                 return(0)
         endif
@@ -866 +868 @@
                 DoAlert 0,"Files don't end at the same angle and can't be directly added"
                 //Killwaves/Z tw1,tw2,tw3
+                abort
                 return(0)
         endif
@@ -910 +913 @@
                         DoAlert 0,"Angles don't match and can't be directly added"
                         //Killwaves/Z tw1,tw2,tw3
+                        abort
                         return(0)
                 endif
@@ -984 +988 @@
 // number of lines in the file is a separate check
 //
-Function LoadBT5_toWave(fname,tw,ctTime,a1,a2)
-        String fname
+Function LoadBT5_toWave(fname,fpath,tw,ctTime,a1,a2)
+        String fname,fpath
         WAVE/T tw
         Variable &ctTime,&a1,&a2
@@ -994 +998 @@
         String s1,s2,s3,s4,s5,s6,s7,s8,s9,s10
         
-        Open/R refNum as fname
+        Open/R/P=bt5PathName refNum as fname
         
         //read the data until EOF - assuming always a pair or lines