Changeset 628 for sans/Dev

Timestamp:

Jan 30, 2010 1:19:41 AM (13 years ago)

Author:

ajj

Message:

Added pixel number and size to 2D output
resolved #247

Location:

sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS

Files:

• NSORT.ipf (modified) (1 diff)
• WriteQIS.ipf (modified) (2 diffs)

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

@@ -293 +293 @@
         Return err
 End
-
-
-
 
 

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

@@ -404 +404 @@
         labelWave[5] = num2str(rw[16])+"  "+num2str(rw[17])+"  "+num2str(rw[23])+"  "+num2str(rw[24])+"  "
         labelWave[5] += num2str(rw[25])+"  "+num2str(rw[27])+"  "+num2str(rw[21])+"  "+textW[9]
-        labelWave[6] =  "SAM: "+rawTag+samFiles
-        labelWave[7] =  "BGD: "+proto[0]
-        labelWave[8] =  "EMP: "+proto[1]
-        labelWave[9] =  "DIV: "+proto[2]
-        labelWave[10] =  "MASK: "+proto[3]
-        labelWave[11] =  "ABS Parameters (3-6): "+proto[4]
-        labelWave[12] = "Average Choices: "+proto[5]
-        labelWave[13] = ""
-        labelWave[14] = "*** Data written from "+type+" folder and may not be a fully corrected data file ***"
-        labelWave[15] = "The detector image is a standard X-Y coordinate system"
-        labelWave[16] = "Data is written by row, starting with Y=1 and X=(1->128)"
-        labelWave[17] = "ASCII data created " +date()+" "+time()
+        labelWave[6] = "PIXELS(X)    PIXELS(Y)   PIXELSIZE X (mm)  PIXELSIZE Y (mm)"
+        labelWave[7] += num2str(pixelsX)+"    "+num2str(pixelsY)+"    "+num2str(rw[10])+"    "+num2str(rw[13])
+        labelWave[8] =  "SAM: "+rawTag+samFiles
+        labelWave[9] =  "BGD: "+proto[0]
+        labelWave[10] =  "EMP: "+proto[1]
+        labelWave[11] =  "DIV: "+proto[2]
+        labelWave[12] =  "MASK: "+proto[3]
+        labelWave[13] =  "ABS Parameters (3-6): "+proto[4]
+        labelWave[14] = "Average Choices: "+proto[5]
+        labelWave[15] = ""
+        labelWave[16] = "*** Data written from "+type+" folder and may not be a fully corrected data file ***"
+        labelWave[17] = "The detector image is a standard X-Y coordinate system"
+        labelWave[18] = "Data is written by row, starting with Y=1 and X=(1->128)"
+        labelWave[19] = "ASCII data created " +date()+" "+time()
         //strings can be too long to print-- must trim to 255 chars
         Variable ii
@@ -863 +865 @@
         return(0)
 End
-