Changeset 975 for sans

Timestamp:

Jan 22, 2016 11:40:40 AM (7 years ago)

Author:

srkline

Message:

adding more functions for VSANS infrastructure

Location:

sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS

Files:

• BroadPeak_Pix_2D.ipf (deleted)
• VSANS_Includes.ipf (modified) (2 diffs)
• V_BroadPeak_Pix_2D.ipf (added)
• V_DetectorCorrections.ipf (added)
• V_MainPanel.ipf (modified) (1 diff)
• V_Test_RAW_Panel.ipf (added)
• V_TubeAdjustments.ipf (modified) (1 diff)
• V_WorkFolderUtils.ipf (modified) (4 diffs)

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

@@ -26 +26 @@
 
 // for possible peak fitting
-#include "BroadPeak_Pix_2D"
+#include "V_BroadPeak_Pix_2D"
 #include "VC_BeamCenter"
 
@@ -47 +47 @@
 #include "V_WorkFolderUtils"
 
+// start of raw data display panel
+#include "V_Test_RAW_Panel"             // rename this later when it's done
+//#include "V_WorkFileUtils"            // not ready to add yet

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

@@ -55 +55 @@
                 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)
+                
+                // this (in SANS) just passes directly to fRawWindowHook()
                 UpdateDisplayInformation("RAW")         // plot the data in whatever folder type
+                
         endif
 End

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

@@ -1 +1 @@
 #pragma rtGlobals=3             // Use modern global access method and strict wave access.
 
-
+//
+// functions for testing and then actually applying the nonlinear corrections to the
+// tube detectors. These routines are for a test bank of 8 tubes (vertical) that were
+// run at a subdivision of 1024. VSANS will be different in practice
+//
+// but the fundamental process is the same, and can be translated into proper functions as needed
+//
 
 

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

@@ -7 +7 @@
 //
 
-
+// TODO: write function
+//              KillVANSObjects()               //Kills (/Z) the list of objects that I generate
+//                      !! but I must maintain the list
+//
 
 
@@ -20 +23 @@
 //       what I know that I don't need
 //
+// TODO !!! DuplicateDataFolder will FAIL - in the base case of RAW data files, the
+//  data is actually in use - so it will fail every time. need an alternate solution. in SANS,
+// there are a limited number of waves to carry over, so Dupliate/O is used for rw, tw, data, etc.
+//
+//
+//
+// TODO : I also need a list of what is generated during processing that may be hanging around - that I need to
+//     be sure to get rid of - like the calibration waves, solidAngle, etc.
 //
 // hdfDF is the name only of the data in storage. May be full file name with extension (clean as needed)
@@ -38 +49 @@
         // copy the folders
         KillDataFolder/Z toDF                   //DuplicateDataFolder will not overwrite, so Kill
+        // this will fail if something was in use
         DuplicateDataFolder $fromDF,$toDF
         
@@ -48 +60 @@
         // reduction
         // sample
+        
+        
+        
+        KillDataFolder/Z toDF+":control"
+        Print V_flag
+        // if not OK, need to duplicate/O
+        
+        
         
         // ***what about the variables @ the top level?