Changeset 764 for sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/AvgGraphics.ipf

Timestamp:

Nov 24, 2010 4:23:13 PM (12 years ago)

Author:

srkline

Message:

• fixed a few bugs with GenCurveFit?, and how the reports are generated

• the DEFAULT.MASK file is automatically loaded when the path is set, if it can be found. this only happens from the main (yellow) panel. Nothing happens if that exact file is not found.

• a "Sector_PlusMinus" averaging option is added. This defines the LEFT sector as being "negative" q-values. Everything else behaves as a normal sector average. This is from Lionel, a very old ticket #31

• if sectors or annular regions are drawn on RAW data files, the drawn lines are re-drawn correctly as the data is scrolled using the < and > buttons.

• a super secret option for a "histogram pair" has been added. May be useful for alignment, may ditch if Jeff and Cedric don't like it. To do this, put cursor A on the 2D image at the center of where you want the vertical and horizontal swath to be. +-5 pixels is hard-wired. draw any marquee(size, location is ignored) and select SANS Histogram, and you get the pair. If cursor A is not on the graph, you get the normal histogram as defined by the marquee.

• arrow buttons on RAW 2D data display now search +- 10 data files for "next", in case there are missing file numbers.

• Incorporated Lionel's changes to ILL_* files for his generation of a "DIV" file for D22

• Added the offset traces checkbox back to the SASCALC panel. previously it was hidden on the simulation panels.

• loosened the tolerance for SDD matching onn the MRED panel to 0.1 m

File:

• sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/AvgGraphics.ipf (modified) (7 diffs)

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

@@ -159 +159 @@
                         QxQy_Export(type,"",1)
                         break
+                case "Sector_PlusMinus":
+                        Sector_PlusMinus1D(type)
+                        If(doSave)
+                                if (useXMLOutput == 1)
+                                        WriteXMLWaves_W_Protocol(type,"",1)
+                                else
+                                        WriteWaves_W_Protocol(type,"",1)                //"" is an empty path, 1 will force a dialog
+                                endif
+                        Endif
+                        break
                 default:                                                
                         Abort "no case match in average dispatch"
@@ -174 +184 @@
                 String/G root:myGlobals:Protocols:gProtoStr = ""
         Endif
-        
         
         return(0)
@@ -226 +235 @@
                 case "Circular":
                 case "Sector":
+                case "Sector_PlusMinus":
                 case "Rectangular":
                 case "Annular":
@@ -258 +268 @@
                         break
                 case "Sector":
+                case "Sector_PlusMinus":
                         SetVariable Phi_p,disable=no
                         SetVariable Qctr_p,disable=yes
@@ -301 +312 @@
         PopupMenu av_choice,pos={61,7},size={144,20},proc=AvTypePopMenuProc,title="AverageType"
         PopupMenu av_choice,help={"Select the type of average to perform, then make the required selections below and click \"DoAverage\" to plot the results"}
-        PopupMenu av_choice,mode=1,popvalue="Circular",value= #"\"Circular;Sector;Annular;Rectangular;2D ASCII;QxQy ASCII\""
+        PopupMenu av_choice,mode=1,popvalue="Circular",value= #"\"Circular;Sector;Annular;Rectangular;2D ASCII;QxQy ASCII;Sector_PlusMinus;\""
         Button ave_help,pos={260,7},size={25,20},proc=ShowAvePanelHelp,title="?"
         Button ave_help,help={"Show the help file for averaging options"}
@@ -446 +457 @@
         //else sector or rectangular - draw the lines
         
-        //if sector or rectangular, draw the phi line (on the desired side)
-        if( (cmpstr(av_type,"Sector")==0) || (cmpstr(av_type,"Rectangular")==0))
+        //if sector, sector_plusminus, or rectangular, draw the phi line (on the desired side)
+        if( (cmpstr(av_type,"Sector")==0) || (cmpstr(av_type,"Rectangular")==0) || (cmpstr(av_type,"Sector_PlusMinus")==0))
                 if( (cmpstr(side,"left")==0) || (cmpstr(side,"both")==0) )
                         //draw the phi line on the left side
@@ -467 +478 @@
         
         //if Sector, draw the +/- dphi lines
-        if (cmpstr(av_type,"Sector")==0)
+        if (cmpstr(av_type,"Sector")==0  || cmpstr(av_type,"Sector_PlusMinus")==0)
                 if( (cmpstr(side,"left")==0) || (cmpstr(side,"both")==0) )
                         //draw the deltaPhi lines +/- lines