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

Timestamp:

Feb 5, 2019 3:13:21 PM (4 years ago)

Author:

srkline

Message:

adding procedures for calculating sector averages of the data

still need to add overlay of sector angles.

Location:

sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS

Files:

• VSANS_Includes.ipf (modified) (1 diff)
• V_IQ_Utilities.ipf (modified) (4 diffs)
• V_MaskUtils.ipf (modified) (1 diff)
• V_Protocol_Reduction.ipf (modified) (8 diffs)
• V_Sector_Average.ipf (added)
• V_Write_VSANS_QIS.ipf (modified) (5 diffs)

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

@@ -130 +130 @@
 
 #include "V_Utilities_Comparisons"
+#include "V_Sector_Average"
 
 

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

@@ -496 +496 @@
         Wave qb = tmp_qb
         Wave fs = tmp_fs
+        
+        // zero point waves can be generated from sector averages, exit now
+        if(numpnts(qw) == 0)
+                SetDataFolder root:
+                return(1)
+        endif
         
         Variable q1,q2,tol,ii
@@ -748 +754 @@
         SetDataFolder $("root:Packages:NIST:VSANS:"+folderStr)
 
-        Printf "%d points removed from beginning, %d points from the end  of %s \r",nbeg,nend,detStr
 
 // TODO 
@@ -768 +773 @@
                 Wave/Z qBar = $("qBar_qxqy_"+detStr)
                 Wave/Z fSubS = $("fSubS_qxqy_"+detStr)
-                        
+
+// check for the existence of every wave + non-zero length
+// zero length/null waves can be generated with sector averages
+// exit if something is wrong
+                if(waveExists(qw) == 0 || numpnts(qw) == 0)
+                        SetDataFolder root:
+                        return(1)
+                endif
+                if(waveExists(iw) == 0 || numpnts(iw) == 0)
+                        SetDataFolder root:
+                        return(1)
+                endif
+                if(waveExists(ew) == 0 || numpnts(ew) == 0)
+                        SetDataFolder root:
+                        return(1)
+                endif
+                if(waveExists(sigQ) == 0 || numpnts(sigQ) == 0)
+                        SetDataFolder root:
+                        return(1)
+                endif
+                if(waveExists(qBar) == 0 || numpnts(qBar) == 0)
+                        SetDataFolder root:
+                        return(1)
+                endif
+                if(waveExists(fSubS) == 0 || numpnts(fSubS) == 0)
+                        SetDataFolder root:
+                        return(1)
+                endif
+
+
+        // waves all exist              
                 DeletePoints 0,nBeg, qw,iw,ew,sigQ,qBar,fSubS
 
@@ -775 +810 @@
                 DeletePoints npt-nEnd,nEnd, qw,iw,ew,sigQ,qBar,fSubS
         
+                Printf "%d points removed from beginning, %d points from the end  of %s \r",nbeg,nend,detStr
+                SetDataFolder root:
         return(0)
 End

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

@@ -741 +741 @@
                                 AppendImage/W=MaskEditPanel currentTube
 //                              ModifyImage/W=MaskEditPanel#DetData overlay ctab= {0.9,1,BlueRedGreen,0}        ,minRGB=NaN,maxRGB=0
-                                ModifyImage/W=MaskEditPanel overlay ctab= {0.9,0.95,BlueRedGreen,0}     ,minRGB=NaN,maxRGB=(0,65000,0,40000)
+                                ModifyImage/W=MaskEditPanel overlay ctab= {0.9,0.95,BlueRedGreen,0}     ,minRGB=NaN,maxRGB=(0,65000,0,35000)
                                 ModifyImage/W=MaskEditPanel currentTube ctab= {0.9,1,CyanMagenta,0}     ,minRGB=NaN,maxRGB=0
                 //              ModifyImage/W=MaskEditPanel#DetData overlay ctab= {0,*,BlueRedGreen,0}  

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

@@ -1318 +1318 @@
         SVAR gAvgInfoStr = root:Packages:NIST:VSANS:Globals:Protocols:gAvgInfoStr
         
-        String av_typ,autoSave,AutoName,binType
-//      Variable phi=0,dphi=10,width=10,Qctr = 0.01,qDelta=10
-        Variable Qctr,qDelta
+        String av_typ,autoSave,AutoName,binType,side
+        Variable phi,dphi,width=10,Qctr = 0.01,qDelta=10
         String detGroup
         
@@ -1334 +1333 @@
         qDelta = NumberByKey("QDELTA", gAvgInfoStr  ,"=",";")
         detGroup = StringByKey("DETGROUP", gAvgInfoStr  ,"=",";")
+        phi = NumberByKey("PHI", gAvgInfoStr  ,"=",";")
+        dphi = NumberByKey("DPHI", gAvgInfoStr  ,"=",";")
+
 //      Execute "V_GetAvgInfo_Full()"
 //              Execute "V_GetAvgInfo()"
@@ -1340 +1342 @@
 
 //      Prompt av_typ, "Type of Average",popup,"Circular;Sector;Rectangular;Annular;2D_ASCII;QxQy_ASCII;PNG_Graphic;Sector_PlusMinus;"
-        Prompt av_typ, "Type of Average",popup,"Circular;Narrow_Slit;Annular;QxQy_ASCII;"
+        Prompt av_typ, "Type of Average",popup,"Circular;Narrow_Slit;Annular;Sector;QxQy_ASCII;"
 
 // comment out above line in DEMO_MODIFIED version, and uncomment the line below (to disable PNG save)
@@ -1347 +1349 @@
         Prompt autoName,"Auto-Name files?",popup,"Auto;Manual"
 //      Prompt autoPlot,"Plot the averaged Data?",popup,"Yes;No"
-//      Prompt side,"Include detector halves?",popup,"both;right;left"
-//      Prompt phi,"Orientation Angle (-90,90) degrees (Rectangular or Sector)"
-//      Prompt dphi, "Azimuthal range (0,45) degrees (Sector only)"
+        Prompt side,"Include detector halves?",popup,"both;right;left"
+        Prompt phi,"Orientation Angle (-90,90) degrees (Rectangular or Sector)"
+        Prompt dphi, "Azimuthal range (0,45) degrees (Sector only)"
 //      Prompt width, "Width of Rectangular average (1,128)"
         Prompt binType,"Binning Type?",popup,ksBinTypeStr
@@ -1358 +1360 @@
 
         
-        DoPrompt "Enter Averaging Parameters",av_typ,autoSave,autoName,binType,qCtr,qDelta,detGroup
+        DoPrompt "Enter Averaging Parameters",av_typ,autoSave,autoName,binType,qCtr,qDelta,detGroup,side,phi,dphi
         if (V_Flag)
                 return(0)                                                               // User canceled
@@ -1381 +1383 @@
         gAvgInfoStr += "BINTYPE=" + binType + ";"
         
-//      if(cmpstr(av_typ,"Sector")==0 || cmpstr(av_typ,"Sector_PlusMinus")==0)
-//              gAvgInfoStr += "SIDE=" + side + ";"
-//              gAvgInfoStr += "PHI=" + num2str(phi) + ";"
-//              gAvgInfoStr += "DPHI=" + num2str(dphi) + ";"
-//      Endif
+        if(cmpstr(av_typ,"Sector")==0 || cmpstr(av_typ,"Sector_PlusMinus")==0)
+                gAvgInfoStr += "SIDE=" + side + ";"
+                gAvgInfoStr += "PHI=" + num2str(phi) + ";"
+                gAvgInfoStr += "DPHI=" + num2str(dphi) + ";"
+        Endif
 //      
 //      if(cmpstr(av_typ,"Rectangular")==0)
@@ -3162 +3164 @@
                         
                 case "Sector":
-//                      CircularAverageTo1D(activeType)
+                        String side = StringByKey("SIDE",avgStr,"=",";")
+                        Variable phi_rad = (Pi/180)*NumberByKey("PHI",avgStr,"=",";")           //in radians 
+                        Variable dphi_rad = (Pi/180)*NumberByKey("DPHI",avgStr,"=",";")
+                        V_QBinAllPanels_Sector(activeType,binType,collimationStr,side,phi_rad,dphi_rad)
                         break
                 case "Sector_PlusMinus":
@@ -3218 +3223 @@
 
                         case "Circular":
+                        case "Sector":
                                 V_PlotData_Panel()              //this brings the plot window to the front, or draws it (ONLY)
                                 V_Update1D_Graph(activeType,binType)            //update the graph, data was already binned                             
-                                break
-                        case "Sector":
-        //                      CircularAverageTo1D(activeType)
                                 break
                         case "Sector_PlusMinus":

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

@@ -394 +394 @@
         String a1Str
         Variable pixX,pixY
-        Variable numTextLines=19,ii,jj,kk
-
+        Variable numTextLines,ii,jj,kk
+        Variable pixSizeX,pixSizeY
+
+        numTextLines = 23
         Make/O/T/N=(numTextLines) labelWave
 
@@ -443 +445 @@
         // or -- V_getBeamStopC3_size(type)
                 bstop = V_getBeamStopC2_size(type)
+
+                pixSizeX = V_getDet_x_pixel_size(type,detStr)
+                pixSizeY = V_getDet_y_pixel_size(type,detStr)
                 
         /////////
@@ -461 +466 @@
                 labelWave[12] = "Average Choices: "+proto[5]
                 labelWave[13] = "Collimation type: "+proto[9]
-                labelWave[14] = ""
-                labelWave[15] = "*** Data written from "+type+" folder and may not be a fully corrected data file ***"
-//              labelWave[16] = "Data columns are Qx - Qy - Qz - I(Qx,Qy) - Err I(Qx,Qy)"
-        //      labelWave[16] = "Data columns are Qx - Qy - I(Qx,Qy) - Qz - SigmaQ_parall - SigmaQ_perp - fSubS(beam stop shadow)"
-                labelWave[16] = "Data columns are Qx - Qy - I(Qx,Qy) - err(I) - Qz - SigmaQ_parall - SigmaQ_perp - fSubS(beam stop shadow)"
-                labelWave[17] = "The error wave may not be properly propagated (1/2019)"
-                labelWave[18] = "ASCII data created " +date()+" "+time()
+                labelWave[14] = "Panel = "+detStr
+                labelWave[15] = "NumXPixels="+num2str(pixX)
+                labelWave[16] = "XPixelSize_mm="+num2str(pixSizeX)
+                labelWave[17] = "NumYPixels="+num2str(pixY)
+                labelWave[18] = "YPixelSize_mm="+num2str(pixSizeY)
+                labelWave[19] = "*** Data written from "+type+" folder and may not be a fully corrected data file ***"
+//              labelWave[20] = "Data columns are Qx - Qy - Qz - I(Qx,Qy) - Err I(Qx,Qy)"
+        //      labelWave[20] = "Data columns are Qx - Qy - I(Qx,Qy) - Qz - SigmaQ_parall - SigmaQ_perp - fSubS(beam stop shadow)"
+                labelWave[20] = "Data columns are Qx - Qy - I(Qx,Qy) - err(I) - Qz - SigmaQ_parall - SigmaQ_perp - fSubS(beam stop shadow)"
+                labelWave[21] = "The error wave may not be properly propagated (1/2019)"
+                labelWave[22] = "ASCII data created " +date()+" "+time()
                 //strings can be too long to print-- must trim to 255 chars
                 for(jj=0;jj<numTextLines;jj+=1)
@@ -518 +527 @@
         //      qval = CalcQval(p+1,q+1,rw[16],rw[17],rw[18],rw[26],rw[13]/10)
                 Duplicate/O qTot,phi,r_dist
-                Variable pixSizeX,pixSizeY,xctr,yctr
-                pixSizeX = V_getDet_x_pixel_size(type,detStr)
-                pixSizeY = V_getDet_y_pixel_size(type,detStr)
+                Variable xctr,yctr
+
 
                 xctr = V_getDet_beam_center_x_pix(type,detStr)
@@ -603 +611 @@
 End
 
-// this assumes that:
-// --QxQy data was written out in the format specified by the Igor macros, that is the x varies most rapidly
-//
-// TODO -- this needs to be made generic for reading in different panels with different XY dimensions
-// -- add the XY dimensions to the QxQyASCII file header somewhere so that it can be read in and used here
-//
-// the SANS analysis 2D loader assumes that the matrix is square, mangling the VSANS data.
-// the column data (for fitting) is still fine, but the matrix representation is incorrect.
-//
-Function V_ConvertQxQy2Mat(Qx,Qy,inten,matStr)
-        Wave Qx,Qy,inten
-        String matStr
-        
-        String folderStr=GetWavesDataFolder(Qx,1)
-        
-        Variable numX,numY
-        numX=48
-        numY=128
-        Make/O/D/N=(numX,numY) $(folderStr + matStr)
-        Wave mat=$(folderStr + matStr)
-        
-        WaveStats/Q Qx
-        SetScale/I x, V_min, V_max, "", mat
-        WaveStats/Q Qy
-        SetScale/I y, V_min, V_max, "", mat
-        
-        Variable xrows=numX
-        
-        mat = inten[q*xrows+p]
-        
-        return(0)
-End
-
-
+