Changeset 849 for sans/Dev/trunk/NCNR_User_Procedures/Analysis/Alpha/Tinker/FFT_FillMatrixShapes.ipf

Timestamp:

Mar 26, 2012 11:26:28 AM (11 years ago)

Author:

srkline

Message:

Changes to the real-space modeling to sped up the drawing of cylinders, and to provide a few more examples of scritped, unattended calculations, and saving the 3D matrix.

File:

• sans/Dev/trunk/NCNR_User_Procedures/Analysis/Alpha/Tinker/FFT_FillMatrixShapes.ipf (modified) (10 diffs)

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

@@ -286 +286 @@
         numx=DimSize(mat,0)
         numy=DimSize(mat,1)
-        for(ii=0;ii<numx;ii+=1)
-                for(jj=0;jj<numy;jj+=1)
+        
+        Variable x1,x2,y1,y2
+        x1 = xc - trunc(rad/grid) - 2
+        x2 = xc + trunc(rad/grid) + 2
+        y1 = yc - trunc(rad/grid) - 2
+        y2 = yc + trunc(rad/grid) + 2
+
+        
+        y1 = y1 < 0 ? 0 : y1
+        x1 = x1 < 0 ? 0 : x1
+        
+        y2 = y2 > numy ? numy : y2
+        x2 = x2 > numx ? numx : x2
+        
+        for(ii=x1;ii<x2;ii+=1)
+                for(jj=y1;jj<y2;jj+=1)
                                 dik=sqrt( (ii-xc)^2+(jj-yc)^2)*grid
                                 if(dik<=rad)
@@ -294 +308 @@
                 endfor
         endfor
+        
+//      for(ii=0;ii<numx;ii+=1)
+//              for(jj=0;jj<numy;jj+=1)
+//                              dik=sqrt( (ii-xc)^2+(jj-yc)^2)*grid
+//                              if(dik<=rad)
+//                                      mat[ii][jj][zloc] = fill
+//                              endif
+//              endfor
+//      endfor
         
         return(0)       
@@ -307 +330 @@
         WAVE mat
         Variable grid,rad,xc,yc,zc,len,fill
-        
+
+//      Variable tref = startMSTimer
+                
         Variable ii,pts
         //put half the length above - half below
@@ -314 +339 @@
                 FillYZCircle(mat,grid,rad,yc,zc,ii,fill)
         endfor
-        
+
+//      Variable ms = stopMSTimer(tref)
+//      print "Time elapsed = ", ms/1e6, "s"
+                
         return(0)       
 End
@@ -328 +356 @@
         numy=DimSize(mat,0)
         numz=DimSize(mat,1)
-        for(ii=0;ii<numy;ii+=1)
-                for(jj=0;jj<numz;jj+=1)
+        
+        Variable y1,y2,z1,z2
+        y1 = yc - trunc(rad/grid) - 2
+        y2 = yc + trunc(rad/grid) + 2
+        z1 = zc - trunc(rad/grid) - 2
+        z2 = zc + trunc(rad/grid) + 2
+        
+        y1 = y1 < 0 ? 0 : y1
+        z1 = z1 < 0 ? 0 : z1
+        
+        y2 = y2 > numy ? numy : y2
+        z2 = z2 > numz ? numz : z2
+        
+
+        for(ii=y1;ii<y2;ii+=1)
+                for(jj=z1;jj<z2;jj+=1)
                                 dik=sqrt( (ii-yc)^2+(jj-zc)^2)*grid
                                 if(dik<=rad)
@@ -336 +378 @@
                 endfor
         endfor
-        
+
+
+////slow way            
+//      for(ii=0;ii<numy;ii+=1)
+//              for(jj=0;jj<numz;jj+=1)
+//                              dik=sqrt( (ii-yc)^2+(jj-zc)^2)*grid
+//                              if(dik<=rad)
+//                                      mat[xloc][ii][jj] = fill
+//                              endif
+//              endfor
+//      endfor
+
         return(0)       
 End
@@ -371 +424 @@
         numx=DimSize(mat,0)
         numz=DimSize(mat,1)
-        for(ii=0;ii<numx;ii+=1)
-                for(jj=0;jj<numz;jj+=1)
+        
+        Variable x1,x2,z1,z2
+        x1 = xc - trunc(rad/grid) - 2
+        x2 = xc + trunc(rad/grid) + 2
+        z1 = zc - trunc(rad/grid) - 2
+        z2 = zc + trunc(rad/grid) + 2
+
+        
+        z1 = z1 < 0 ? 0 : z1
+        x1 = x1 < 0 ? 0 : x1
+        
+        z2 = z2 > numz ? numz : z2
+        x2 = x2 > numx ? numx : x2
+        
+        for(ii=x1;ii<x2;ii+=1)
+                for(jj=z1;jj<z2;jj+=1)
                                 dik=sqrt( (ii-xc)^2+(jj-zc)^2)*grid
                                 if(dik<=rad)
@@ -379 +446 @@
                 endfor
         endfor
+        
+//      for(ii=0;ii<numx;ii+=1)
+//              for(jj=0;jj<numz;jj+=1)
+//                              dik=sqrt( (ii-xc)^2+(jj-zc)^2)*grid
+//                              if(dik<=rad)
+//                                      mat[ii][yloc][jj] = fill
+//                              endif
+//              endfor
+//      endfor
         
         return(0)       
@@ -564 +640 @@
 Function ParseMatrix3D_rho(mat)
         Wave mat
-        
+
+//      Variable tref = startMSTimer
+                
         Variable nptx,npty,nptz,ii,jj,kk,num
         
@@ -589 +667 @@
                 endfor
         endfor
-        
+
+
+//      Variable ms = stopMSTimer(tref)
+//      print "Time elapsed = ", ms/1e6, "s"
+                
         return(0)
 End