Changeset 1207 for sans/Dev/branches/elliptical_averaging/NCNR_User_Procedures/Reduction/SANS/AvgGraphics.ipf

Timestamp:

Sep 6, 2019 2:29:24 PM (4 years ago)

Author:

krzywon

Message:

Add elliptical averaging as an option to the average parameters window. The method called currently performs an annular average.

File:

• sans/Dev/branches/elliptical_averaging/NCNR_User_Procedures/Reduction/SANS/AvgGraphics.ipf (modified) (12 diffs)

sans/Dev/branches/elliptical_averaging/NCNR_User_Procedures/Reduction/SANS/AvgGraphics.ipf

@@ -38 +38 @@
         Variable/G root:myGlobals:Drawing:gDrawQCtr = 0
         Variable/G root:myGlobals:Drawing:gDrawQDelta = 1
+        Variable/G root:myGlobals:Drawing:gDrawRAxes = 1
         
         //return to root
@@ -131 +132 @@
                         AnnularAverageTo1D(type)
                         break
+                case "Elliptical":
+                        EllipticalAverageTo1D(type)
+                        break
                 case "Circular":
                 case "Sector":
                         //circular or sector
                         CircularAverageTo1D(type)               //graph is drawn here
+                        break
+                case "2D_NXcanSAS":
+                        WriteNxCanSAS2D(type,"",1)
                         break
                 case "2D ASCII":
@@ -156 +163 @@
                         case "2D ASCII":
                         case "QxQy ASCII":
+                        case "2D_NXcanSAS":
                                 break
                         default:
@@ -225 +233 @@
                 case "2D ASCII":                // execute if case matches expression
                 case "QxQy ASCII":
+                case "2D_NXcanSAS":
                         String/G root:myGlobals:Drawing:gDrawInfoStr = ReplaceStringByKey("AVTYPE", tempStr, choice, "=", ";")
                         Button P_DoAvg,title="Save ASCII"
@@ -232 +241 @@
                 case "Sector_PlusMinus":
                 case "Rectangular":
+                case "Elliptical":
                 case "Annular":
                         String/G root:myGlobals:Drawing:gDrawInfoStr = ReplaceStringByKey("AVTYPE", tempStr, choice, "=", ";")
@@ -253 +263 @@
         strswitch(choice)       // string switch
                 case "2D ASCII":
-                case "QxQy ASCII":                                      
+                case "QxQy ASCII":      
+                case "2D_NXcanSAS":     
                 case "Circular":                //disable everything for these three choices
                         SetVariable Phi_p,disable=yes
@@ -260 +271 @@
                         SetVariable DPhi_p,disable=yes
                         SetVariable width_p,disable=yes
+                        SetVariable RAxes_p,disable=yes
                         popupmenu sides,disable=yes
                         break
@@ -269 +281 @@
                         SetVariable DPhi_p,disable=no
                         SetVariable width_p,disable=yes
+                        SetVariable RAxes_p,disable=yes
                         popupmenu sides,disable=no
                         break
@@ -277 +290 @@
                         SetVariable DPhi_p,disable=yes
                         SetVariable width_p,disable=no
+                        SetVariable RAxes_p,disable=yes
                         popupmenu sides,disable=no
                         break
@@ -285 +299 @@
                         SetVariable DPhi_p,disable=yes
                         SetVariable width_p,disable=yes
+                        SetVariable RAxes_p,disable=yes
                         popupmenu sides,disable=yes
+                        break
+                case "Elliptical":
+                        SetVariable Phi_p,disable=no
+                        SetVariable Qctr_p,disable=yes
+                        SetVariable Qdelta_p,disable=yes
+                        SetVariable DPhi_p,disable=yes
+                        SetVariable width_p,disable=yes
+                        SetVariable RAxes_p,disable=no
+                        popupmenu sides,disable=no
                         break
                 default:                                                        // optional default expression executed
@@ -307 +331 @@
         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;Sector_PlusMinus;\""
+        PopupMenu av_choice,mode=1,popvalue="Circular",value= #"\"Circular;Sector;Annular;Rectangular;Elliptical;2D_NXcanSAS;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"}
@@ -326 +350 @@
         SetVariable DPhi_p,help={"Enter the +/- range (0,45) of azimuthal angles to be included in the average.  The bounding angles will be drawin in blue."}
         SetVariable DPhi_p,limits={0,90,1},value= root:myGlobals:Drawing:gDrawDPhi
+        SetVariable RAxes_p,pos={166,176},size={110,15},proc=DeltaPhiSetVarProc,title="Axis Ratio"
+        SetVariable RAxes_p,help={"Enter the ratio of the minor to major axes for an isointensity contour.  By definition, this value should be less than 1."}
+        SetVariable RAxes_p,limits={0,1,0.001},value= root:myGlobals:Drawing:gDrawRAxes
         SetVariable width_p,pos={15,155},size={115,15},proc=WidthSetVarProc,title="Width (pixels)"
         SetVariable width_p,help={"Enter the total width of the rectangular section in pixels. The bounding lines will be drawn in blue."}