Changeset 1150 for sans

Timestamp:

May 13, 2019 11:20:55 AM (4 years ago)

Author:

srkline

Message:

added button for avg mask on main display panel

added more aperture fields to the patch panel

added time comparisons for potential use in aperture dimension change done in NICE in May shutdown

Location:

sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS

Files:

• V_HDF5_Read.ipf (modified) (1 diff)
• V_ISO8601_Util.ipf (modified) (2 diffs)
• V_PatchFiles.ipf (modified) (8 diffs)
• V_Protocol_Reduction.ipf (modified) (1 diff)
• V_RAW_Data_Panel.ipf (modified) (2 diffs)

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

@@ -1923 +1923 @@
 
 
+
+// MAY 2019 SRK
+//
+// there was a change in the GUI and NICE behavior during the shutdown, before startup
+// on 05/22/19 where the units of the sample Ap2 dimensions are changed. supposedly this
+// will ensure consistency of all units as [cm]. From what I found in the code, all the units
+// were already [cm], so I'm not sure what will happen.
+//
+// if I flag things here to switch on the date, I can force the output to always be [cm]
+// V_Compare_ISO_Dates("2019-05-10T13:36:54.200-04:00",fileDate)
+//
+// here the first date is a generic date during the shutdown, but before startup.
+// fileDate is the actual date of file collection
+// if fileDate is more recent (and thus affected by the change), then the function
+// will return a value == 2 (2nd date greater) and I can act on that
+//
+// this change only affects sampleAp2, and this value only affects the resolution calculation
+//
+//  V_Compare_ISO_Dates("2019-05-10T13:36:54.200-04:00",V_getDataStartTime(fname))
+//
+
+
 ///////  sample_aperture_2 (data folder)
 // sample aperture (2) is the external aperture, which may or may not be present
-
 Function/S V_getSampleAp2_Description(fname)
         String fname

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

@@ -82 +82 @@
         s2 = ISOstr[11,18]              // skip the "T" and take the next 8 chars HH:MM:SS
         // skip the time zone...
-        print s1
-        print s2
+//      print s1
+//      print s2
         
         Variable yr,mo,dy,hh,mm,ss
@@ -100 +100 @@
         return(secs)
 End
+
+
+// utility to compare two iso dates
+// returns
+// 1 if iso1 is greater than iso2 (meaning iso1 is more RECENT)
+// 2 if iso2 is greater than iso1 (meaning iso2 is more RECENT)
+// 0 if they are the same time
+//
+//
+Function V_Compare_ISO_Dates(iso1,iso2)
+        String iso1,iso2
+        
+        if(V_ISO8601_to_IgorTime(iso1) == V_ISO8601_to_IgorTime(iso2))
+                return(0)
+        endif
+
+        if(V_ISO8601_to_IgorTime(iso1) > V_ISO8601_to_IgorTime(iso2))
+                return(1)
+        else
+                return(2)
+        endif
+        
+        return(-1)
+End
+

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

@@ -413 +413 @@
         listWave[0][2] = V_getSampleDescription(fname)
         
-        listWave[1][1] = "thickness (cm)"
+        listWave[1][1] = "thickness [cm]"
         listWave[1][2] = num2str(V_getSampleThickness(fname))
         
@@ -447 +447 @@
         fname = S_path + fname
 
-        Variable nRows = 13
+        Variable nRows = 17
         Redimension/N=(nRows,3) ListWave
         Redimension/N=(nRows,3) selWave
@@ -471 +471 @@
         listWave[4][1] = "wavelength_spread"
         listWave[4][2] = num2str(V_getWavelength_spread(fname)) 
-
-        listWave[5][1] = "distance (source aperture to GV) (cm)"
-        listWave[5][2] = num2str(V_getSourceAp_distance(fname))         
-
-        listWave[6][1] = "source aperture size (mm)"
-        listWave[6][2] = V_getSourceAp_size(fname)
-        
-        listWave[7][1] = "sample aperture size (internal) (mm)"
-        listWave[7][2] = V_getSampleAp_size(fname)
-
-        listWave[8][1] = "sample aperture(2) diam (external) (cm)"
-        listWave[8][2] = num2str(V_getSampleAp2_size(fname))    
-
-        listWave[9][1] = "beam stop diameter (Middle) (mm)"
-//      listWave[9][2] = num2str(V_getBeamStopC2_size(fname))   
-        listWave[9][2] = num2str(V_DeduceBeamstopDiameter(fname,"MR"))  
-        
-        listWave[10][1] = "beam stop diameter (Back) (mm)"
-//      listWave[10][2] = num2str(V_getBeamStopC3_size(fname))  
-        listWave[10][2] = num2str(V_DeduceBeamstopDiameter(fname,"B"))  
-
-        listWave[11][1] = "sample aperture(2) to gate valve (cm)"
-        listWave[11][2] = num2str(V_getSampleAp2_distance(fname))       
-
-        listWave[12][1] = "sample to gate valve (cm)"
-        listWave[12][2] = num2str(V_getSampleTableOffset(fname))        
+        
+        listWave[5][1] = "Number of Guides OR COLLIMATION"
+        listWave[5][2] = V_getNumberOfGuides(fname)
+
+        listWave[6][1] = "distance (source aperture to GV) [cm]"
+        listWave[6][2] = num2str(V_getSourceAp_distance(fname))         
+
+        listWave[7][1] = "source aperture size [mm]"
+        listWave[7][2] = V_getSourceAp_size(fname)
+        
+        listWave[8][1] = "sample aperture size (internal) [mm]"
+        listWave[8][2] = V_getSampleAp_size(fname)
+
+        listWave[9][1] = "sample aperture(2) SHAPE (external)"
+        listWave[9][2] = V_getSampleAp2_shape(fname)
+                
+        listWave[10][1] = "sample aperture(2) diam (external) [cm]"
+        listWave[10][2] = num2str(V_getSampleAp2_size(fname))   
+        
+        listWave[11][1] = "sample aperture(2) height (external) [cm]"
+        listWave[11][2] = num2str(V_getSampleAp2_height(fname)) 
+
+        listWave[12][1] = "sample aperture(2) width (external) [cm]"
+        listWave[12][2] = num2str(V_getSampleAp2_width(fname))  
+
+        listWave[13][1] = "beam stop diameter (Middle) [mm]"
+//      listWave[13][2] = num2str(V_getBeamStopC2_size(fname))  
+        listWave[13][2] = num2str(V_DeduceBeamstopDiameter(fname,"MR")) 
+        
+        listWave[14][1] = "beam stop diameter (Back) [mm]"
+//      listWave[14][2] = num2str(V_getBeamStopC3_size(fname))  
+        listWave[14][2] = num2str(V_DeduceBeamstopDiameter(fname,"B"))  
+
+        listWave[15][1] = "sample aperture(2) to gate valve [cm]"
+        listWave[15][2] = num2str(V_getSampleAp2_distance(fname))       
+
+        listWave[16][1] = "sample to gate valve [cm]"
+        listWave[16][2] = num2str(V_getSampleTableOffset(fname))        
 
                                 
@@ -537 +549 @@
         String detStr = S_value
         
-        listWave[0][1] = "beam_center_x (cm)"
+        listWave[0][1] = "beam_center_x [cm]"
         listWave[0][2] = num2str(V_getDet_Beam_center_x(fname,detStr))  
 
-        listWave[1][1] = "beam_center_y (cm)"
+        listWave[1][1] = "beam_center_y [cm]"
         listWave[1][2] = num2str(V_getDet_Beam_center_y(fname,detStr))  
 
-        listWave[2][1] = "distance (nominal) (cm)"
+        listWave[2][1] = "distance (nominal) [cm]"
         listWave[2][2] = num2str(V_getDet_NominalDistance(fname,detStr))        
 
@@ -549 +561 @@
         listWave[3][2] = num2str(V_getDet_IntegratedCount(fname,detStr))        
 
-        listWave[4][1] = "pixel_fwhm_x (cm)"
+        listWave[4][1] = "pixel_fwhm_x [cm]"
         listWave[4][2] = num2str(V_getDet_pixel_fwhm_x(fname,detStr))   
 
-        listWave[5][1] = "pixel_fwhm_y (cm)"
+        listWave[5][1] = "pixel_fwhm_y [cm]"
         listWave[5][2] = num2str(V_getDet_pixel_fwhm_y(fname,detStr))   
 
@@ -561 +573 @@
         listWave[7][2] = num2str(V_getDet_pixel_num_y(fname,detStr))    
 
-        listWave[8][1] = "setback (cm)"
+        listWave[8][1] = "setback [cm]"
         listWave[8][2] = num2str(V_getDet_TBSetback(fname,detStr))      
 
         if(cmpstr(detStr,"B") == 0 ||cmpstr(detStr,"FR") == 0 || cmpstr(detStr,"FL") == 0 || cmpstr(detStr,"MR") == 0 || cmpstr(detStr,"ML") == 0)
-                listWave[9][1] = "lateral_offset (cm)"                  // "B" detector drops here
+                listWave[9][1] = "lateral_offset [cm]"                  // "B" detector drops here
                 listWave[9][2] = num2str(V_getDet_LateralOffset(fname,detStr))  
         else    
-                listWave[9][1] = "vertical_offset (cm)" 
+                listWave[9][1] = "vertical_offset [cm]" 
                 listWave[9][2] = num2str(V_getDet_VerticalOffset(fname,detStr)) 
         endif   
 
-        listWave[10][1] = "x_pixel_size (mm)"
+        listWave[10][1] = "x_pixel_size [mm]"
         listWave[10][2] = num2str(V_getDet_x_pixel_size(fname,detStr))  
 
-        listWave[11][1] = "y_pixel_size (mm)"
+        listWave[11][1] = "y_pixel_size [mm]"
         listWave[11][2] = num2str(V_getDet_y_pixel_size(fname,detStr))  
 
@@ -1255 +1267 @@
                 err = V_writeWavelength_spread(fname,val)
         endif   
-        
-        if ((selWave[5][0] & 2^4) != 0)         //"distance (source aperture)"
-                val = str2num(listWave[5][2])
+
+        if ((selWave[5][0] & 2^4) != 0)         //"number of guides (a string value)"
+                str = listWave[5][2]
+                err = V_writeNumberOfGuides(fname,str)
+        endif           
+        
+        if ((selWave[6][0] & 2^4) != 0)         //"distance (source aperture)"
+                val = str2num(listWave[6][2])
                 err = V_writeSourceAp_distance(fname,val)
         endif           
 
-        if ((selWave[6][0] & 2^4) != 0)         //"source aperture size (mm)" (a string with units)
-                str = listWave[6][2]
+        if ((selWave[7][0] & 2^4) != 0)         //"source aperture size [mm]" (a string with units)
+                str = listWave[7][2]
                 err = V_writeSourceAp_size(fname,str)
         endif           
 
-        if ((selWave[7][0] & 2^4) != 0)         //"sample aperture size (internal) (mm)" (a string with units)
-                str = listWave[7][2]
+        if ((selWave[8][0] & 2^4) != 0)         //"sample aperture size (internal) [mm]" (a string with units)
+                str = listWave[8][2]
                 err = V_writeSampleAp_size(fname,str)
         endif   
-                
-        if ((selWave[8][0] & 2^4) != 0)         //"sample aperture diam (external) (cm)"
-                val = str2num(listWave[8][2])
+
+        if ((selWave[9][0] & 2^4) != 0)         //"sample aperture SHAPE (external) [cm]"
+                str = listWave[9][2]
+                err = V_writeSampleAp2_shape(fname,str)
+        endif           
+        
+        if ((selWave[10][0] & 2^4) != 0)                //"sample aperture diam (external) [cm]"
+                val = str2num(listWave[10][2])
                 err = V_writeSampleAp2_size(fname,val)
         endif           
-
-        if ((selWave[9][0] & 2^4) != 0)         //"beam stop diameter (Middle) (mm)"
-                val = str2num(listWave[9][2])
+        
+        if ((selWave[11][0] & 2^4) != 0)                //"sample aperture height (external) [cm]"
+                val = str2num(listWave[11][2])
+                err = V_writeSampleAp2_height(fname,val)
+        endif           
+                
+        if ((selWave[12][0] & 2^4) != 0)                //"sample aperture width (external) [cm]"
+                val = str2num(listWave[12][2])
+                err = V_writeSampleAp2_width(fname,val)
+        endif           
+
+        if ((selWave[13][0] & 2^4) != 0)                //"beam stop diameter (Middle) [mm]"
+                val = str2num(listWave[13][2])
                 err = V_writeBeamStopC2_size(fname,val)
         endif           
         
-        if ((selWave[10][0] & 2^4) != 0)                //"beam stop diameter (Back) (mm)"
-                val = str2num(listWave[10][2])
+        if ((selWave[14][0] & 2^4) != 0)                //"beam stop diameter (Back) [mm]"
+                val = str2num(listWave[14][2])
                 err = V_writeBeamStopC3_size(fname,val)
         endif           
 
-        if ((selWave[11][0] & 2^4) != 0)                //"sample aperture to gate valve (cm)"
-                val = str2num(listWave[11][2])
+        if ((selWave[15][0] & 2^4) != 0)                //"sample aperture to gate valve [cm]"
+                val = str2num(listWave[15][2])
                 err = V_writeSampleAp_distance(fname,val)
         endif   
 
-        if ((selWave[12][0] & 2^4) != 0)                //"sample to gate valve (cm)"
-                val = str2num(listWave[12][2])
+        if ((selWave[16][0] & 2^4) != 0)                //"sample to gate valve [cm]"
+                val = str2num(listWave[16][2])
                 err = V_writeSampleTableOffset(fname,val)
         endif           
@@ -2342 +2374 @@
         DrawText 21,258,"Write to all files (inlcusive)"
         SetDrawEnv fsize= 14,fstyle= 1
-        DrawText 262,30,"Beam Center (cm)"
+        DrawText 262,30,"Beam Center [cm]"
         DrawText 20,133,"Run Number(s)"
         

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

@@ -1350 +1350 @@
 //      Prompt autoPlot,"Plot the averaged Data?",popup,"Yes;No"
         Prompt side,"Include detector halves?",popup,"both;right;left"
-        Prompt phi,"Orientation Angle (0,359) degrees (Rectangular or Sector)"
-        Prompt dphi, "Sector range (+/-) degrees (0,45) (Sector only)"
+        Prompt phi,"Orientation Angle (-90,90) degrees (Rectangular or Sector)"
+        Prompt dphi, "Sector range (+/-) degrees (0,90) (Sector only)"
 //      Prompt width, "Width of Rectangular average (1,128)"
         Prompt binType,"Binning Type?",popup,ksBinTypeStr

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

@@ -181 +181 @@
 
         Button button_sensor,pos={607,146+33},size={70,20},proc=V_SensorButtonProc,title="Sensors"
+        Button button_mask,pos={689,146+33},size={70,20},proc=V_AvgMaskButtonProc,title="Avg Mask"
 
 
@@ -820 +821 @@
 End
 
-
+//
+// opens up the graph of the masking options
+//
+Function V_AvgMaskButtonProc(ba) : ButtonControl
+        STRUCT WMButtonAction &ba
+
+        switch( ba.eventCode )
+                case 2: // mouse up
+                        // click code here
+                        Execute "V_Display_Four_Panels()"
+                        break
+                case -1: // control being killed
+                        break
+        endswitch
+
+        return 0
+End
 
 // See V_Detector_Isolate.ipf