Changeset 198 for sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/Models_2D
- Timestamp:
- Nov 8, 2007 5:05:14 PM (15 years ago)
- Location:
- sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/Models_2D
- Files:
-
- 3 added
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/Models_2D/Cylinder_2D.ipf
r197 r198 13 13 // 14 14 15 16 15 /// REQUIRES DANSE XOP for 2D FUNCTIONS 17 16 … … 23 22 String str 24 23 Prompt str,"Pick the data folder containing the 2D data",popup,getAList(4) 25 26 // if any of the resolution waves are missing => abort27 // if(ResolutionWavesMissingDF(str)) //updated to NOT use global strings (in GaussUtils)28 // Abort29 // endif30 24 31 25 SetDataFolder $("root:"+str) … … 77 71 ModifyGraph width={Aspect,1} 78 72 ModifyGraph lowTrip=0.001 79 Label bottom "q (\\S-1\\M)"80 Label left "q (\\S-1\\M)"73 Label bottom "qx (A\\S-1\\M)" 74 Label left "qy (A\\S-1\\M)" 81 75 AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 82 76 … … 86 80 // _mat is for display, _lin is the real calculation 87 81 82 // not a function evaluation - this simply keeps the matrix for display in sync with the triplet calculation 88 83 Variable/G gs_Cyl2Dmat=0 89 84 gs_Cyl2Dmat := UpdateQxQy2Mat(xwave_Cyl2D,ywave_Cyl2D,zwave_Cyl2D,Cyl2D_lin,Cyl2D_mat) … … 121 116 #endif 122 117 123 // return stopMSTimer(-2) // time when we finished124 118 return 0 125 119 End 126 120 127 //function that is actually a wrapper to dispatch the calculation to N threads 121 // 122 // Fit function that is actually a wrapper to dispatch the calculation to N threads 123 // 124 // nthreads is 1 or an even number, typically 2 125 // it doesn't matter if npt is odd. In this case, fractional point numbers are passed 126 // and the wave indexing works just fine - I tested this with test waves of 7 and 8 points 127 // and the points "2.5" and "3.5" evaluate correctly as 2 and 3 128 128 // 129 129 Function Cylinder2D(cw,zw,xw,yw) : FitFunc … … 135 135 136 136 for(i=0;i<nthreads;i+=1) 137 //Print (i*npt/nthreads),((i+1)*npt/nthreads-1)137 // Print (i*npt/nthreads),((i+1)*npt/nthreads-1) 138 138 ThreadStart mt,i,Cylinder2D_T(cw,zw,xw,yw,(i*npt/nthreads),((i+1)*npt/nthreads-1)) 139 139 endfor
Note: See TracChangeset
for help on using the changeset viewer.