Changeset 230
- Timestamp:
- Jan 8, 2008 4:59:18 PM (15 years ago)
- Location:
- sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/Models_2D
- Files:
-
- 1 added
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/Models_2D/CoreShellCyl2D.ipf
r202 r230 125 125 Variable p1,p2 126 126 127 #if exists("CoreShellCylinder Model_D") //to hide the function if XOP not installed127 #if exists("CoreShellCylinder_2DX") //to hide the function if XOP not installed 128 128 129 129 Make/O/D/N=15 CSCyl2D_tmp … … 132 132 CSCyl2D_tmp[7] = 0 //send a zero background to the calculation, add it in later 133 133 134 zw[p1,p2]= CoreShellCylinder Model_D(CSCyl2D_tmp,xw,yw) + cw[7]134 zw[p1,p2]= CoreShellCylinder_2DX(CSCyl2D_tmp,xw,yw) + cw[7] 135 135 136 136 #endif -
sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/Models_2D/Cylinder_2D.ipf
r202 r230 121 121 Variable p1,p2 122 122 123 #if exists("Cylinder Model_D") //to hide the function if XOP not installed123 #if exists("Cylinder_2DX") //to hide the function if XOP not installed 124 124 125 125 Make/O/D/N=11 Cyl2D_tmp // there seems to be no speed penalty for doing this... … … 128 128 Cyl2D_tmp[4] = 0 // send a background of zero 129 129 130 zw[p1,p2]= Cylinder Model_D(Cyl2D_tmp,xw,yw) + cw[4] //add in the proper background here130 zw[p1,p2]= Cylinder_2DX(Cyl2D_tmp,xw,yw) + cw[4] //add in the proper background here 131 131 132 132 #endif -
sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/Models_2D/Ellipsoid2D.ipf
r211 r230 124 124 Variable p1,p2 125 125 126 #if exists("Ellipsoid Model_D") //to hide the function if XOP not installed126 #if exists("Ellipsoid_2DX") //to hide the function if XOP not installed 127 127 128 128 Make/O/D/N=12 Ellip2D_tmp … … 131 131 Ellip2D_tmp[4] = 0 //pass in a zero background and add it in later 132 132 133 zw[p1,p2]= Ellipsoid Model_D(Ellip2D_tmp,xw,yw) + cw[4]133 zw[p1,p2]= Ellipsoid_2DX(Ellip2D_tmp,xw,yw) + cw[4] 134 134 135 135 #endif -
sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/Models_2D/EllipticalCylinder2D.ipf
r202 r230 125 125 Variable p1,p2 126 126 127 #if exists("EllipticalCylinder Model_D") //to hide the function if XOP not installed127 #if exists("EllipticalCylinder_2DX") //to hide the function if XOP not installed 128 128 129 129 Make/O/D/N=14 EllCyl2D_tmp … … 132 132 EllCyl2D_tmp[5] = 0 //pass in a zero background and add it in later 133 133 134 zw[p1,p2]= EllipticalCylinder Model_D(EllCyl2D_tmp,xw,yw) + cw[5]134 zw[p1,p2]= EllipticalCylinder_2DX(EllCyl2D_tmp,xw,yw) + cw[5] 135 135 136 136 #endif
Note: See TracChangeset
for help on using the changeset viewer.