Changeset 1053

Timestamp:

Jul 14, 2017 3:14:20 PM (6 years ago)

Author:

srkline

Message:

a few quick bug fixes

Location:

sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS

Files:

• V_FileCatalog.ipf (modified) (1 diff)
• V_HDF5_RW_Utils.ipf (modified) (1 diff)
• V_HDF5_Read.ipf (modified) (1 diff)
• V_Instrument_Resolution.ipf (modified) (1 diff)
• V_RAW_Data_Panel.ipf (modified) (2 diffs)

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

@@ -482 +482 @@
         
         //Attenuators
-        // TODO -- this is not really the number -- but rather the thickness
+        // TODO -- this is the "number" of the attenuator, but what is its relation to the
+        //   stack of 4 plates? binary representation?
         InsertPoints lastPoint,1,GNumAttens
-        GNumAttens[lastPoint]=V_getAttenThickness(fname)
+        GNumAttens[lastPoint]=V_getAtten_number(fname)
         
         //Transmission

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

@@ -516 +516 @@
         // save a global string with the file name to be picked up for the status on the display
         // this string can be carried around as the data is moved to other folders
-        Print curDF+"gFileList"
+//      Print curDF+"gFileList"
         String/G $(curDF+"gFileList") = fileName
 

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

@@ -530 +530 @@
 //End
 
-//// this is equivalent to "status" - if anything is dropped in the beam
-//Function V_getAtten_number(fname)
-//      String fname
-//      
-//      String path = "entry:instrument:attenuator:num_atten_dropped"   
-//      return(V_getRealValueFromHDF5(fname,path))
-//end
+//// this is the "number" of attenuators dropped in the beam - and should be 
+// what I can use to lookup the actual attenuator transmission
+Function V_getAtten_number(fname)
+        String fname
+        
+        String path = "entry:instrument:attenuator:num_atten_dropped"   
+        return(V_getRealValueFromHDF5(fname,path))
+end
 
 // thickness of the attenuator (PMMA) - units??

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

@@ -28 +28 @@
 
 
+// TODO:
+// -- some of the input geometry is hidden in other locations:
+// Sample Aperture to Gate Valve (cm)  == /instrument/sample_aperture/distance
+// Sample [position] to Gate Valve (cm) = /instrument/sample_table/offset_distance
+//
+// -- the dimensions and the units for the beam stops are very odd, and what is written to the
+//   file is not what is noted in the GUI - so verify the units that I'm actually reading.
+// 
 
 

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

@@ -663 +663 @@
         endswitch
 
+
+// update the status when the tab is clicked                    
+        STRUCT WMButtonAction sa
+        sa.eventCode = 2
+        V_StatusButtonProc(sa)
+                        
+                        
         return 0
 End
@@ -759 +766 @@
                         V_FakeTabClick(V_Value)
 
-// update the status when the tab is clicked                    
-                        STRUCT WMButtonAction sa
-                        sa.eventCode = 2
-                        V_StatusButtonProc(sa)
+// now part of every tab click
+//// update the status when the tab is clicked                  
+//                      STRUCT WMButtonAction sa
+//                      sa.eventCode = 2
+//                      V_StatusButtonProc(sa)
 
                         break