Changeset 629 for sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/NSORT.ipf

Timestamp:

Feb 4, 2010 10:21:53 PM (13 years ago)

Author:

srkline

Message:

1 - added function in HPMSA to calculate U(r). See the function for details of usage.

2 - fixed bug in NSORT to trim the _res wave at the point when it is loaded.

File:

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

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

@@ -133 +133 @@
                 Duplicate/O $(typPrefix+"_res") $(trimPrefix+"_res")
                 //Trimmed data set
-                Duplicate/O $(typPrefix+"_q"),$(trimPrefix+"_q")
-                Duplicate/O $(typPrefix+"_i"),$(trimPrefix+"_i")
-                Duplicate/O $(typPrefix+"_s"),$(trimPrefix+"_s")
+//              Duplicate/O $(typPrefix+"_q"),$(trimPrefix+"_q")
+//              Duplicate/O $(typPrefix+"_i"),$(trimPrefix+"_i")
+//              Duplicate/O $(typPrefix+"_s"),$(trimPrefix+"_s")
                 WaveStats/Q $(typPrefix+"_q")                   //get info about the original q-values read in
                 pt = V_npnts-endPts
-                DeletePoints pt,endPts,$(trimPrefix+"_q"),$(trimPrefix+"_i"),$(trimPrefix+"_s") //delete end points first
-                DeletePoints 0,begPts,$(trimPrefix+"_q"),$(trimPrefix+"_i"),$(trimPrefix+"_s")  //then delete points from beginning                     
+                DeletePoints pt,endPts,$(trimPrefix+"_q"),$(trimPrefix+"_i"),$(trimPrefix+"_s"),$(trimPrefix+"_res")    //delete end points first
+                DeletePoints 0,begPts,$(trimPrefix+"_q"),$(trimPrefix+"_i"),$(trimPrefix+"_s"),$(trimPrefix+"_res")     //then delete points from beginning                     
         else
                 //Assume
@@ -149 +149 @@
                 Duplicate/O $(typPrefix+"_s") $(trimPrefix+"_s")                
                 //Trimmed data set
-                Duplicate/O $(typPrefix+"_q"),$(trimPrefix+"_q")
-                Duplicate/O $(typPrefix+"_i"),$(trimPrefix+"_i")
-                Duplicate/O $(typPrefix+"_s"),$(trimPrefix+"_s")
+//              Duplicate/O $(typPrefix+"_q"),$(trimPrefix+"_q")
+//              Duplicate/O $(typPrefix+"_i"),$(trimPrefix+"_i")
+//              Duplicate/O $(typPrefix+"_s"),$(trimPrefix+"_s")
                 WaveStats/Q $(typPrefix+"_q")                   //get info about the original q-values read in
                 pt = V_npnts-endPts
@@ -1266 +1266 @@
                         ControlInfo/W=NSORT_Panel PreviewCheck
                         if( V_Value==0 )                //if zero skip the preview and write out the file
-                                //If any of them have three columns write three column data
-                                err=WriteNSORTedFile(q12,i12,sig12,name1,name2,name3,normToStr,norm12,norm23)
+                                res12[][0] = sq12[p]
+                                res12[][1] = qb12[p]
+                                res12[][2] = fs12[p]
+                                err=WriteNSORTedFile(q12,i12,sig12,name1,name2,name3,normToStr,norm12,norm23,res=res12)
                         endif
                         // always clean up waves before exiting