Changeset 953 for sans/Dev/trunk/NCNR_User_Procedures/Analysis/Alpha

Timestamp:

Mar 10, 2015 10:50:03 AM (8 years ago)

Author:

srkline

Message:

some minor changes to the FFT filling procedures to help out Abhiram

Replaced cansasXML.ipf v1.11 with v1.12 (current version)

some restructuring of the VSANS file names.

Location:

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Alpha/Tinker

Files:

• FFT_FillMatrixShapes.ipf (modified) (4 diffs)
• FFT_KR_Parser.ipf (modified) (1 diff)

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Alpha/Tinker/FFT_FillMatrixShapes.ipf

@@ -350 +350 @@
         y1 = yc - trunc(rad/grid) - 2
         y2 = yc + trunc(rad/grid) + 2
-
         
         y1 = y1 < 0 ? 0 : y1
@@ -807 +806 @@
 Function XYZV_FillMat_Centered(xx,yy,zz,xc,yc,zc,rad,len,val,erase)
         Wave xx,yy,zz
-        Variable xc,yc,zc,rad,len
-        Wave val
-        Variable erase
+        Variable xc,yc,zc,rad,len,val,erase
         
         Variable x1,x2,y1,y2,z1,z2,ii,jj,kk,num,npt,minp,maxp
@@ -817 +814 @@
         NVAR FFT_T=root:FFT_T
 
-        if(erase)
+        if(erase == 1)
                 mat = solventSLD
         endif
@@ -824 +821 @@
         
         for(ii=0;ii<num;ii+=1)
-                mat[xx[ii]][yy[ii]][zz[ii]] = val[ii]
+                mat[xx[ii]][yy[ii]][zz[ii]] = val
         endfor
         

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Alpha/Tinker/FFT_KR_Parser.ipf

@@ -61 +61 @@
         KR_MultiCylinder_Units(xx,yy,zz,rri,hti,sbp,rotx,roty,sld)
 
-        XYZV_FillMat_Centered(xoutW,youtW,ZoutW,xc,yc,zc,rad,len,sldW,0)                        //last 1 will erase the matrix, 0 retains matrix
+        XYZV_FillMat_Centered(xoutW,youtW,ZoutW,xc,yc,zc,rad,len,fill,0)                        //last 1 will erase the matrix, 0 retains matrix
 
         //force a redraw (re-coloring) of the gizmo window