Changeset 972 for sans/Dev

Timestamp:

Dec 4, 2015 3:51:48 PM (7 years ago)

Author:

srkline

Message:

more additions to the basic infrastructure for VSANS

Location:

sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS

Files:

• VSANS_Includes.ipf (modified) (1 diff)
• V_HDF5_RW_Utils.ipf (modified) (1 diff)
• V_MainPanel.ipf (modified) (4 diffs)
• V_WorkFolderUtils.ipf (added)

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

@@ -45 +45 @@
 #include "V_Menu"
 #include "V_VSANS_Preferences"
+#include "V_WorkFolderUtils"
 

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

@@ -28 +28 @@
 End
 
-// TODO -- move the initializtion of the raw data folder to be in the as-yet unwritten initialization routine for
+// TODO:
+//  x- move the initializtion of the raw data folder to be in the as-yet unwritten initialization routine for
 // reduction. be sure that it's duplicated in the VCALC initialization too.
 //
-Proc V_LoadHDF5Data(file)
+Function V_LoadHDF5Data(file)
         String file
 
-        NewDataFolder/O/S root:Packages:NIST:VSANS:RawVSANS
+        SetDataFolder root:Packages:NIST:VSANS:RawVSANS
 //      SetDataFolder root:
         Variable err= V_LoadHDF5_NoAtt(file)    // reads into current folder
         SetDataFolder root:
+        return(err)
 End
 

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

@@ -51 +51 @@
         String ctrlName
 
-        Variable err=   LoadRawSANSData("Select a Raw SANS data file")
+        Variable err=   V_LoadHDF5Data("")                      // load the data into RawVSANS storage folder (why am I doing this?)
         if(!err)
-                UpdateDisplayInformation("RAW")
+                String hdfDF = root:file_name                   // last file loaded, may not be the safest way to pass
+                CopyHDFToWorkFolder(hdfDF,"RAW")                // copy what is needed for data processing (not the DAS_logs)
+                UpdateDisplayInformation("RAW")         // plot the data in whatever folder type
         endif
 End
@@ -189 +191 @@
 Proc HelpMainButtonProc(ctrlName) : ButtonControl
         String ctrlName
-        DisplayHelpTopic/Z/K=1 "SANS Data Reduction Tutorial"
+        DisplayHelpTopic/Z/K=1 "VSANS Data Reduction Tutorial"
         if(V_flag !=0)
-                DoAlert 0,"The SANS Data Reduction Tutorial Help file could not be found"
+                DoAlert 0,"The VSANS Data Reduction Tutorial Help file could not be found"
         endif
 End
@@ -293 +295 @@
         PauseUpdate; Silent 1           // building window...
         NewPanel /W=(500,60,924,320) /K=2 as "VSANS Reduction Controls"
-        ModifyPanel cbRGB=(65535,58981,27524)
+        ModifyPanel cbRGB=(47748,57192,54093)
         ModifyPanel fixedSize=1
 //////
@@ -310 +312 @@
         TabControl MainTab,value=0
         //
-        TabControl MainTab labelBack=(65535,58981,27524)
+        TabControl MainTab labelBack=(47748,57192,54093)
         
 //on tab(0) - Raw Data - initially visible