Changeset 213

Timestamp:

Nov 29, 2007 5:25:04 PM (15 years ago)

Author:

srkline

Message:

Changed NSORT to have two new checkboxes:
1) Preview Only - if checked does the indicated scaling, does not write a file
2) Overlap warning - if AUTO overlap is 5% away from unity, a warning is presented. If you manually enter a number that is too big or small, that is your problem.

Defaults are for NO autoscale, NO preview, YES Warning. This has the effect of writing out files with all scalings == 1.

File:

• sans/SANSReduction/trunk/Put in User Procedures/SANS_Reduction_v5.00/NSORT.ipf (modified) (8 diffs)

sans/SANSReduction/trunk/Put in User Procedures/SANS_Reduction_v5.00/NSORT.ipf

@@ -372 +372 @@
         //Print "val = ",val
 
+        Variable tol=1.05                       //5% is the preferred number (for Andrew and Lionel, at least)
+
+        ControlInfo/W=NSORT_Panel WarningCheck
+        if(( V_Value==1 ) && ( (val > tol) || (val < 1/tol) ) )
+                String str=""
+                sprintf str,"The scaling factor is more than a factor of %g from 1. Proceed with caution.\r",tol
+                DoAlert 0,str
+        endif
+        
         Return val
 End
@@ -711 +720 @@
         DrawLine 0,363,346,363
         DrawText 31,357,"To Manually scale data, enter scale factors above"
-        Button NSORT_Done,pos={274,384},size={50,20},proc=NSORT_DoneButton,title="Done"
+        Button NSORT_Done,pos={274,387},size={50,20},proc=NSORT_DoneButton,title="Done"
         Button NSORT_Done,help={"closes the panel"}
         Button Plot_1,pos={279,63},size={50,20},proc=Plot_0_Button,title="Plot"
@@ -744 +753 @@
         SetVariable beg_3,fSize=10,help={"How many points to remove from the low-q end of this dataset"}
         SetVariable beg_3,limits={-Inf,Inf,0},value= root:myGlobals:NSORT:gPtsBeg3
-        Button DoCombine,pos={13,382},size={160,20},proc=WriteNSORTFileButton,title="Write Combined File"
+        Button DoCombine,pos={13,387},size={160,20},proc=WriteNSORTFileButton,title="Write Combined File"
         Button DoCombine,help={"Combine and normalize the selected files as specifed"}
         SetVariable scale_12,pos={159,305},size={160,14},proc=SetScale_12,title="Mult factor 1-2"
@@ -769 +778 @@
         CheckBox AutoCheck,pos={14,310},size={100,20},title="Auto Scale",value=0
         CheckBox AutoCheck,help={"If checked, the scale factor will be automatically determined, if not checked, the current values in the fields will be used"}
+        CheckBox PreviewCheck,pos={15,369},size={74,14},title="Preview Only",value= 0
+        CheckBox WarningCheck,pos={111,369},size={93,14},title="Overlap warning?",value= 1
 EndMacro
 
@@ -1061 +1072 @@
                         Variable/G root:myGlobals:NSORT:gScale2_3 = 1
                         //If any of them have three columns write three column data
-                        err=Write3ColNSORTedFile(q12,i12,sig12,name1,name2,name3,normToStr,norm12,norm23)
+                        
+                        ControlInfo/W=NSORT_Panel PreviewCheck
+                        if( V_Value==0 )                //if zero skip the preview and write out the file
+                                err=Write3ColNSORTedFile(q12,i12,sig12,name1,name2,name3,normToStr,norm12,norm23)
+                        endif
                         //cleanup waves before exiting
                         KillWaves/Z q12,i12,sig12
@@ -1143 +1158 @@
                 //write out the set here and stop
         
-                err=Write3ColNSORTedFile(q123,i123,sig123,name1,name2,name3,normToStr,norm12,norm23)
+                ControlInfo/W=NSORT_Panel PreviewCheck
+                if( V_Value==0 )                //if zero skip the preview and write out the file
+                        err=Write3ColNSORTedFile(q123,i123,sig123,name1,name2,name3,normToStr,norm12,norm23)
+                endif
                 //cleanup waves before exiting
                 KillWaves/Z q12,i12,sig12,q123,i123,sig123
@@ -1251 +1269 @@
                         norm23 = 1              //norm23 was not used
                         Variable/G root:myGlobals:NSORT:gScale2_3 = 1
-                        //If any of them have three columns write three column data
-                        err=Write6ColNSORTedFile(q12,i12,sig12,sq12,qb12,fs12,name1,name2,name3,normToStr,norm12,norm23)
-                        //cleanup waves before exiting
+                        
+                        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=Write6ColNSORTedFile(q12,i12,sig12,sq12,qb12,fs12,name1,name2,name3,normToStr,norm12,norm23)
+                        endif
+                        // always clean up waves before exiting
                         KillWaves/Z q12,i12,sig12,sq12,qb12,fs12
                         return err
@@ -1347 +1369 @@
                 //write out the set here and stop
         
-                err=Write6ColNSORTedFile(q123,i123,sig123,sq123,qb123,fs123,name1,name2,name3,normToStr,norm12,norm23)
+                ControlInfo/W=NSORT_Panel PreviewCheck
+                if( V_Value==0 )                //if zero skip the preview and write out the file
+                        err=Write6ColNSORTedFile(q123,i123,sig123,sq123,qb123,fs123,name1,name2,name3,normToStr,norm12,norm23)
+                endif
                 //cleanup waves before exiting
                 KillWaves/Z q12,i12,sig12,sq12,qb12,fs12,q123,i123,sig123,sq123,qb123,fs123