Changeset 1033 for sans/Dev/trunk

Timestamp:

Apr 24, 2017 2:04:29 PM (6 years ago)

Author:

srkline

Message:

Adding utilities to calculate transmission. Added V_Transmission.ipf file. Getting the functionality to work, user interface or incorporation into the data reduction protocol is still to be decided.

Location:

sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS

Files:

• VSANS_Includes.ipf (modified) (1 diff)
• V_DIVUtils.ipf (modified) (2 diffs)
• V_MainPanel.ipf (modified) (1 diff)
• V_PatchFiles.ipf (modified) (4 diffs)
• V_Transmission.ipf (added)
• V_Utilities_General.ipf (modified) (2 diffs)

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

@@ -92 +92 @@
 #include "V_RealTimeUpdate"
 #include "V_Combine_1D"
+#include "V_Transmission"
 
 

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

@@ -10 +10 @@
 //   JAN 2017
 //
+// TODO:
+// -- complete the description of the steps needed...
+// Data needs to be reduced to the "COR" level - that means that the 
+// PLEX data has been added to work files, and the empty and blocked beam have been
+// subtracted off.
+// -- but what detector corrections should/ should not be done?
+// -- non-linear corrections are not needed, since this will strictly be a per-pixel correction
+// -- solid angle?
+// -- dead time?
+// -- efficiency?
+// -- large angle transmission?
 //
-//
+// we may need to think more carefully about some of these since the front carriage may need to be 
+// closer than the nominal 4m distance on SANS that was deemed far enough back to be "safe" from 
+// the high angle issues.
 //
 //
@@ -25 +38 @@
 //
 //
+
+
+
+
+
 
 //works on the data in "type" folder (expecting data to be reduced to the COR level)

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

@@ -82 +82 @@
         String ctrlName
 
-         CalcTrans()
+         V_InitTransmissionPanel()
 End
 

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

@@ -313 +313 @@
         fname = S_path + fname
 
-        Variable nRows = 13
+        Variable nRows = 14
         Redimension/N=(nRows,3) ListWave
         Redimension/N=(nRows,3) selWave
@@ -349 +349 @@
         listWave[8][1] = "group_id (sample)"
         listWave[8][2] = num2str(V_getSample_group_ID(fname))
-
-        listWave[9][1] = "box_count"
-        listWave[9][2] = num2str(V_getBoxCounts(fname))
-        
-        listWave[10][1] = "box_count_error"
-        listWave[10][2] = num2str(V_getBoxCountsError(fname))
-        
-        listWave[11][1] = "whole_trans"
-        listWave[11][2] = num2str(V_getSampleTransWholeDetector(fname))
-        
-        listWave[12][1] = "whole_trans_error"
-        listWave[12][2] = num2str(V_getSampleTransWholeDetErr(fname))
-        
-        
+        
+        listWave[9][1] = "Box Coordinates"
+        WAVE boxCoord = V_getBoxCoordinates(fname)
+        listWave[9][2] = V_NumWave2List(boxCoord,";")
+
+        listWave[10][1] = "box_count"
+        listWave[10][2] = num2str(V_getBoxCounts(fname))
+        
+        listWave[11][1] = "box_count_error"
+        listWave[11][2] = num2str(V_getBoxCountsError(fname))
+        
+        listWave[12][1] = "whole_trans"
+        listWave[12][2] = num2str(V_getSampleTransWholeDetector(fname))
+        
+        listWave[13][1] = "whole_trans_error"
+        listWave[13][2] = num2str(V_getSampleTransWholeDetErr(fname))   
                 
         
@@ -970 +972 @@
         switch(V_Value) // numeric switch
                 case 0: // execute if case matches expression
-                        V_WriteHeaderForPatch_0(tempName)
+                        V_WriteHeaderForPatch_0(tempName)               //control
                         break           // exit from switch
                 case 1: 
-                        V_WriteHeaderForPatch_1(tempName)
+                        V_WriteHeaderForPatch_1(tempName)               //reduction
                         break
                 case 2: 
-                        V_WriteHeaderForPatch_2(tempName)
+                        V_WriteHeaderForPatch_2(tempName)               // sample
                         break
                 case 3: 
-                        V_WriteHeaderForPatch_3(tempName)
+                        V_WriteHeaderForPatch_3(tempName)               // instrument
                         break
                 case 4: 
-                        V_WriteHeaderForPatch_4(tempName)
+                        V_WriteHeaderForPatch_4(tempName)               //detectors
                         break
                 case 5: 
-                        V_WriteHeaderForPatch_5(tempName)
+                        V_WriteHeaderForPatch_5(tempName)               // polSANS
                         break
                 default:                        // optional default expression executed
@@ -1099 +1101 @@
                 err = V_writeSample_GroupID(fname,val)
         endif   
-        
-        if ((selWave[9][0] & 2^4) != 0)         //"box_count"
-                val = str2num(listWave[9][2])
+
+
+
+        if ((selWave[9][0] & 2^4) != 0)         //"box coordinates"
+                str = listWave[9][2]
+                err = V_writeBoxCoordinates(fname,V_List2NumWave(str,";","inW"))
+        endif   
+        
+
+        
+        if ((selWave[10][0] & 2^4) != 0)                //"box_count"
+                val = str2num(listWave[10][2])
                 err = V_writeBoxCounts(fname,val)
         endif   
         
-        if ((selWave[10][0] & 2^4) != 0)                //"box_count_error"
-                val = str2num(listWave[10][2])
+        if ((selWave[11][0] & 2^4) != 0)                //"box_count_error"
+                val = str2num(listWave[11][2])
                 err = V_writeBoxCountsError(fname,val)
         endif   
         
-        if ((selWave[11][0] & 2^4) != 0)                //"whole_trans"
-                val = str2num(listWave[11][2])
+        if ((selWave[12][0] & 2^4) != 0)                //"whole_trans"
+                val = str2num(listWave[12][2])
                 err = V_writeSampleTransWholeDetector(fname,val)
         endif   
         
-        if ((selWave[12][0] & 2^4) != 0)                //"whole_trans_error"
-                val = str2num(listWave[12][2])
+        if ((selWave[13][0] & 2^4) != 0)                //"whole_trans_error"
+                val = str2num(listWave[13][2])
                 err = V_writeSampleTransWholeDetErr(fname,val)
         endif   

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

@@ -387 +387 @@
         
         return outputPath
+End
+
+
+
+//
+// this will only load the data into RAW, overwriting whatever is there. no copy is put in rawVSANS
+//
+Function V_LoadAndPlotRAW_wName(fname)
+        String fname
+
+        Variable err=   V_LoadHDF5Data(fname,"RAW")                     // load the data 
+//      Print "Load err = "+num2str(err)
+        if(!err)
+                SVAR hdfDF = root:file_name                     // last file loaded, may not be the safest way to pass
+                String folder = StringFromList(0,hdfDF,".")
+                
+                // this (in SANS) just passes directly to fRawWindowHook()
+                V_UpdateDisplayInformation("RAW")               // plot the data in whatever folder type
+                                
+                // set the global to display ONLY if the load was called from here, not from the 
+                // other routines that load data (to read in values)
+                SVAR gLastFile =        root:Packages:NIST:VSANS:Globals:gLastLoadedFile
+                gLastFile = hdfDF
+        endif
 End
 
@@ -1120 +1144 @@
 End
 
+//*********************
+// List utilities
+//*********************
+Function/WAVE V_List2TextWave(list,sep,waveStr)
+        String list,sep,waveStr
+        
+        Variable n= ItemsInList(list,sep)
+        Make/O/T/N=(n) $waveStr= StringFromList(p,list,sep)
+        return $waveStr
+End
+
+Function/WAVE V_List2NumWave(list,sep,waveStr)
+        String list,sep,waveStr
+        
+        Variable n= ItemsInList(list,sep)
+        Make/O/D/N=(n) $waveStr= str2num( StringFromList(p,list,sep) )
+        return $waveStr
+End
+
+Function /S V_TextWave2List(w,sep)
+        Wave/T w
+        String sep
+        
+        String newList=""
+        Variable n=numpnts(w),ii=0
+        do
+                newList += w[ii] + sep
+                ii+=1
+        while(ii<n)
+        return(newList)
+End
+
+//for numerical waves
+Function/S V_NumWave2List(w,sep)
+        Wave w
+        String sep
+        
+        String newList="",temp=""
+        Variable n=numpnts(w),ii=0,val
+        do
+                val=w[ii]
+                temp=""
+                sprintf temp,"%g",val
+                newList += temp
+                newList += sep
+                ii+=1
+        while(ii<n)
+        return(newList)
+End