Changeset 1073 for sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_RAW_Data_Panel.ipf

Timestamp:

Nov 16, 2017 10:57:32 AM (5 years ago)

Author:

srkline

Message:

lots of changes here:
many little fixes to clean up TODO items and marke them DONE

changed the handling of the panel "gap" to split the gap evenly. Q-calculations have been re-verified with this change.

re-named the list of "bin Type" values, and added a few more choices. Streamlined how the averaging and plotting works with this list so that it can be more easily modified as different combinations of binning are envisioned. This resulted in a lot of excess code being cut out and replaced with cleaner logic. This change has also been verified to work as intended.

Attenuation is now always calculated from the table. The table also by (NEW) definition has values for the white beam (one waelength) and graphite (multiple possible wavelengths) where the wavelengths are artificially scaled (*1000) or *1e6) so that the interpolations can be done internally without the need for multiple attenuator tables.

File:

• sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_RAW_Data_Panel.ipf (modified) (4 diffs)

sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_RAW_Data_Panel.ipf

@@ -179 +179 @@
         TitleBox title_file,pos={606,178},size={76,20},variable= root:Packages:NIST:VSANS:Globals:gLastLoadedFile
         TitleBox title_dataPresent,pos={606,210},size={76,20},variable= root:Packages:NIST:VSANS:Globals:gCurDispFile
-        TitleBox title_status,pos={606,240},size={200,200},variable= root:Packages:NIST:VSANS:Globals:gStatusText
+        TitleBox title_status,pos={606,240},size={200,200},fsize=12,variable= root:Packages:NIST:VSANS:Globals:gStatusText
         
 //      Button button_tagFile,pos={720,412},size={70,20},proc=V_TagFileButtonProc,title="Tag File"
@@ -832 +832 @@
 
 
-// TODO
+//
 //
 // opens a separate panel with the I(q) representation of the data
-// ? controls here to select how the data is processed/grouped/saved, etc.
-//
-// -- currently just the graph, no controls
-// -- this re-bins the data every time by calling V_QBinAllPanels(folderStr,binType) from inside V_BinningModePopup()
+//  controls on the panel select how the data is processed/grouped, etc.
+//
+//
 Function V_IvsQPanelButtonProc(ba) : ButtonControl
         STRUCT WMButtonAction &ba
@@ -848 +847 @@
                         V_PlotData_Panel()              //-9999 requests a read from the popup on the panel
                         Variable binType = V_GetBinningPopMode()
-                        V_BinningModePopup("",binType,"")               // does default circular binning and updates the graph
+                        ControlInfo/W=V_1D_Data popup0
+                        V_BinningModePopup("",binType,S_Value)          // does binning of current popString and updates the graph
                         
                         break
@@ -864 +864 @@
 //  see the file V_IQ_Annular.ipf for all of the features yet to be added.
 //
-// -- currently just the graph, no controls
-// -- this re-bins the data every time by calling V_QBinAllPanels(folderStr,binType) from inside V_BinningModePopup()
+// x- currently just the graph, no controls
+//
 Function V_annularAvgButtonProc(ba) : ButtonControl
         STRUCT WMButtonAction &ba