Changeset 200 for sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/Models_2D/Cylinder_2D.ipf
 Timestamp:
 Nov 15, 2007 11:27:16 AM (15 years ago)
 File:

 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
r198 r200 2 2 #pragma IgorVersion=6.0 3 3 4 // "simple" version of 2D function5 4 // 6 5 // The plotting macro sets up TWO dependencies … … 25 24 SetDataFolder $("root:"+str) 26 25 27 28 26 // NOTE THAT THE COEFFICIENTS [N] ARE IN A DIFFERENT ORDER !!! 29 27 // Setup parameter table for model function 30 make/O/T/N=11 parameters_Cyl2D 31 Make/O/D/N=11 coef_Cyl2D 28 // make/O/T/N=11 parameters_Cyl2D 29 // Make/O/D/N=11 coef_Cyl2D 30 make/O/T/N=10 parameters_Cyl2D 31 Make/O/D/N=10 coef_Cyl2D 32 32 coef_Cyl2D[0] = 1.0 33 33 coef_Cyl2D[1] = 20.0 … … 40 40 coef_Cyl2D[8] = 0.0 41 41 coef_Cyl2D[9] = 0.0 42 coef_Cyl2D[10] = 25 42 43 // currently, the number of integration points is hardwired to be 25 in Cylinder2D_T 44 //coef_Cyl2D[10] = 25 43 45 // 44 46 parameters_Cyl2D[0] = "Scale" … … 54 56 parameters_Cyl2D[7] = "Sigma of polydisp in Radius [A]" //***** 55 57 56 parameters_Cyl2D[10] = "number of integration points"58 // parameters_Cyl2D[10] = "number of integration points" 57 59 58 60 Edit parameters_Cyl2D,coef_Cyl2D … … 99 101 // 100 102 //#if exists("CylinderModel_D") 101 // zw = CylinderModel_D(cw,xw,yw) 103 // 104 // Make/O/D/N=11 Cyl2D_tmp // there seems to be no speed penalty for doing this... 105 // Cyl2D_tmp = cw 106 // Cyl2D_tmp[10] = 25 // hardwire the number of integration points 107 // 108 // zw= CylinderModel_D(Cyl2D_tmp,xw,yw) 109 // 110 // //zw = CylinderModel_D(cw,xw,yw) 102 111 //#else 103 112 // Abort "You do not have the SANS Analysis XOP installed" … … 113 122 114 123 #if exists("CylinderModel_D") //to hide the function if XOP not installed 115 zw[p1,p2]= CylinderModel_D(cw,xw,yw) 124 125 Make/O/D/N=11 Cyl2D_tmp // there seems to be no speed penalty for doing this... 126 Cyl2D_tmp = cw 127 Cyl2D_tmp[10] = 25 // hardwire the number of integration points 128 129 zw[p1,p2]= CylinderModel_D(Cyl2D_tmp,xw,yw) 130 116 131 #endif 117 132 … … 134 149 variable mt= ThreadGroupCreate(nthreads) 135 150 151 // Variable t1=StopMSTimer(2) 152 136 153 for(i=0;i<nthreads;i+=1) 137 154 // Print (i*npt/nthreads),((i+1)*npt/nthreads1) … … 145 162 variable dummy= ThreadGroupRelease(mt) 146 163 164 // Print "elapsed time = ",(StopMSTimer(2)  t1)/1e6 165 147 166 return(0) 148 167 End
Note: See TracChangeset
for help on using the changeset viewer.