Changeset 971 for sans/Dev/trunk/NCNR_User_Procedures/Reduction

Timestamp:

Dec 2, 2015 1:24:05 PM (7 years ago)

Author:

srkline

Message:

Filling in missing "dummy" functions when XML xop is not present.

Added new V_ procedures for the beginning of the reduction steps - initialization, main panel, preferences, and a menu. These are lifted directly from the SANS routines and much still needs to be modified.

Location:

sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS

Files:

• VSANS_Includes.ipf (modified) (2 diffs)
• V_HDF5_RW_Utils.ipf (modified) (2 diffs)
• V_Initialize.ipf (added)
• V_MainPanel.ipf (added)
• V_Menu.ipf (added)
• V_VSANS_Preferences.ipf (added)

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

@@ -1 +1 @@
 #pragma rtGlobals=3             // Use modern global access method and strict wave access.
+
+// to properly set up the template for other facility reduction templates, 
+// function NCNR_VSANS() must exist here in the Includes file.
+//
+Function NCNR_VSANS()
+        //does nothing but define NCNR()
+        return(0)
+End
+
 
 #include "VC_DetectorBinning_Q"
@@ -30 +39 @@
 #include "V_HDF5_Write"
 #include "V_HDF5_RW_Utils"
+
+// start of VSANS reduction procedures
+#include "V_Initialize"
+#include "V_MainPanel"
+#include "V_Menu"
+#include "V_VSANS_Preferences"
+

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

@@ -314 +314 @@
 
                 if(!groupID)
-                        HDF5CreateGroup /Z fileID, groupName, groupID
-                        //err = 1
-                        //abort "HDF5 group does not exist"
+                // don't create the group it the name isn't right -- throw up an error
+                        //HDF5CreateGroup /Z fileID, groupName, groupID
+                        err = 1
+                        HDF5CloseFile /Z fileID
+                        DoAlert 0, "HDF5 group does not exist "+groupName+varname
+                        return(err)
                 else
                         // get attributes and save them
@@ -399 +402 @@
 
                 if(!groupID)
-                        HDF5CreateGroup /Z fileID, groupName, groupID
-                        //err = 1
-                        //abort "HDF5 group does not exist"
+                // don't create the group it the name isn't right -- throw up an error
+                        //HDF5CreateGroup /Z fileID, groupName, groupID
+                        err = 1
+                        HDF5CloseFile /Z fileID
+                        DoAlert 0, "HDF5 group does not exist "+groupName+varname
+                        return(err)
                 else
                         // get attributes and save them