Changeset 627 for sans/Dev

Timestamp:

Jan 30, 2010 12:45:29 AM (13 years ago)

Author:

ajj

Message:

Fix to remove writing of headers from NSORTed files into output as this was broken if the NSORTed files were XML. Could fix it but would be very painful.

File:

• sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/NSORT.ipf (modified) (2 diffs)

sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/NSORT.ipf

@@ -235 +235 @@
         Endif
         
-        // read in the header information from each of the combined files and put this information in the file header
-        String dum,hdr1="none\r\n",hdr2="none\r\n",hdr3="none\r\n"
-        PathInfo catPathName
-        
-        // the first file exists, check anyways
-        if(cmpstr(firstFileName,"none") !=0)
-                Open/R refNum as S_Path+firstFileName
-                FReadLine refNum, dum
-                FReadLine refNum, hdr1                  //just grab the second line
-                Close refNum
-        endif
-        //second file
-        if(cmpstr(secondFileName,"none") !=0)
-                Open/R refNum as S_Path+secondFileName
-                FReadLine refNum, dum
-                FReadLine refNum, hdr2                  //just grab the second line
-                Close refNum
-        endif
-        // third file
-        if(cmpstr(thirdFileName,"none") !=0)
-                Open/R refNum as S_Path+thirdFileName
-                FReadLine refNum, dum
-                FReadLine refNum, hdr3                  //just grab the second line
-                Close refNum
-        endif
+//      // read in the header information from each of the combined files and put this information in the file header
+//      String dum,hdr1="none\r\n",hdr2="none\r\n",hdr3="none\r\n"
+//      PathInfo catPathName
+//      
+//      // the first file exists, check anyways
+//      if(cmpstr(firstFileName,"none") !=0)
+//              Open/R refNum as S_Path+firstFileName
+//              FReadLine refNum, dum
+//              FReadLine refNum, hdr1                  //just grab the second line
+//              Close refNum
+//      endif
+//      //second file
+//      if(cmpstr(secondFileName,"none") !=0)
+//              Open/R refNum as S_Path+secondFileName
+//              FReadLine refNum, dum
+//              FReadLine refNum, hdr2                  //just grab the second line
+//              Close refNum
+//      endif
+//      // third file
+//      if(cmpstr(thirdFileName,"none") !=0)
+//              Open/R refNum as S_Path+thirdFileName
+//              FReadLine refNum, dum
+//              FReadLine refNum, hdr3                  //just grab the second line
+//              Close refNum
+//      endif
 
         
@@ -267 +267 @@
         fprintf refnum, "COMBINED FILE CREATED: %s \r\n",date()
         
-        fprintf refnum, "FIRST File %s",hdr1            //new, Mar 2008
-        fprintf refnum, "SECOND File %s",hdr2           //new, Mar 2008
-        fprintf refnum, "THIRD File %s",hdr3            //new, Mar 2008
+//      fprintf refnum, "FIRST File %s",hdr1            //new, Mar 2008
+//      fprintf refnum, "SECOND File %s",hdr2           //new, Mar 2008
+//      fprintf refnum, "THIRD File %s",hdr3            //new, Mar 2008
         
         fprintf refNum, "NSORT-ed   %s \t  +  %s\t  + %s\r\n",firstFileName, secondFileName,thirdFileName