Changeset 1073 for sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_Utilities_General.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_Utilities_General.ipf (modified) (8 diffs)

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

@@ -6 +6 @@
 //
 // for use by multiple panels and packages
-
-
-//prompts user to choose the local folder that contains the SANS Data
+//
+
+
+//prompts user to choose the local folder that contains the VSANS Data
 //only one folder can be used, and its path is catPathName (and is a NAME, not a string)
 //this will overwrite the path selection
@@ -76 +77 @@
         return(WaveExists(w))
 end
+
+
 //
 // tests if two values are close enough to each other
@@ -94 +97 @@
 
 
-// TODO:
-// -- this must be called as needed to force a re-read of the data from disk
+// (DONE):
+// x- this must be called as needed to force a re-read of the data from disk
 //    "as needed" means that when an operation is done that needs to ensure
 //     a fresh read from disk, it must take care of the kill.
-// -- the ksBaseDFPath needs to be removed. It's currently pointing to RawVSANS, which is
+// x- the ksBaseDFPath needs to be removed. It's currently pointing to RawVSANS, which is
 //    really not used as intended anymore.
+//
+// *** this appears to be unused, in favor of V_CleanupData_w_Progress(0,1)  **********
 //
 Function V_KillNamedDataFolder(fname)
@@ -115 +120 @@
 end
 
-// TODO:
+// (DONE)
 // x- this still does not quite work. If there are no sub folders present in the RawVSANS folder
 //    it still thinks there is (1) item there.
-// -- if I replace the semicolon with a comma, it thinks there are two folders present and appears
+// x- if I replace the semicolon with a comma, it thinks there are two folders present and appears
 //    to delete the RawVSANS folder itself! seems very dangerous...this is because DataFolderDir returns
 //    a comma delimited list, but with a semicolon and \r at the end. need to remove these...
@@ -212 +217 @@
                 endif
                 
-                ValDisplay valdisp0,win=ProgressPanel,value= _NUM:num,win=ProgressPanel
+                ValDisplay valdisp0,win=ProgressPanel,value= _NUM:num
                 DoUpdate /W=ProgressPanel
         while(1)
@@ -501 +506 @@
         V_PlotData_Panel()              // read the binType from 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 default circular binning and updates the graph
 
 
@@ -607 +613 @@
 //      (check the instrument name...)
 
-// TODO -- as was written by SANS, this function is expecting fname to be the path:fileName
+// (DONE) x- as was written by SANS, this function is expecting fname to be the path:fileName
 // - but are the V_get() functions OK with getting a full path, and what do they
 //  do when they fail? I don't want them to spit up another open file dialog
 //
-// -- problem -- if "sans1234.abs" is passed, then V_getStringFromHDF5(fname,path,num)
+// x- problem -- if "sans1234.abs" is passed, then V_getStringFromHDF5(fname,path,num)
 //  will remove the extension and look for the sans1234 folder -- which may or may not be present.
 //  If it is present, then sans1234 validates as RAW data -- which is incorrect!
-// -- so I need a way to exclude everything that does not have the proper extension...
+// x- so I need a way to exclude everything that does not have the proper extension...
 //
 //
@@ -673 +679 @@
 
 
-// TODO -- the file name structure for VSANS file is undecided
+// (DONE) x- the file name structure for VSANS file is undecided
 // so some of these base functions will need to change
 //