Changeset 230


Ignore:
Timestamp:
Jan 8, 2008 4:59:18 PM (13 years ago)
Author:
srkline
Message:

2D model functions now use the new XOPs named in SANSAnalysis.xop, which now includes the DANSE code. Also added a trivial example of 2D scattering from a sphere.

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  
    125125        Variable p1,p2 
    126126         
    127 #if exists("CoreShellCylinderModel_D")                  //to hide the function if XOP not installed 
     127#if exists("CoreShellCylinder_2DX")                     //to hide the function if XOP not installed 
    128128 
    129129        Make/O/D/N=15 CSCyl2D_tmp 
     
    132132        CSCyl2D_tmp[7] = 0              //send a zero background to the calculation, add it in later 
    133133 
    134         zw[p1,p2]= CoreShellCylinderModel_D(CSCyl2D_tmp,xw,yw) + cw[7] 
     134        zw[p1,p2]= CoreShellCylinder_2DX(CSCyl2D_tmp,xw,yw) + cw[7] 
    135135         
    136136#endif 
  • sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/Models_2D/Cylinder_2D.ipf

    r202 r230  
    121121        Variable p1,p2 
    122122         
    123 #if exists("CylinderModel_D")                   //to hide the function if XOP not installed 
     123#if exists("Cylinder_2DX")                      //to hide the function if XOP not installed 
    124124 
    125125        Make/O/D/N=11 Cyl2D_tmp                         // there seems to be no speed penalty for doing this... 
     
    128128        Cyl2D_tmp[4] = 0                                                // send a background of zero 
    129129         
    130         zw[p1,p2]= CylinderModel_D(Cyl2D_tmp,xw,yw) + cw[4]             //add in the proper background here 
     130        zw[p1,p2]= Cylinder_2DX(Cyl2D_tmp,xw,yw) + cw[4]                //add in the proper background here 
    131131 
    132132#endif 
  • sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/Models_2D/Ellipsoid2D.ipf

    r211 r230  
    124124        Variable p1,p2 
    125125         
    126 #if exists("EllipsoidModel_D")                  //to hide the function if XOP not installed 
     126#if exists("Ellipsoid_2DX")                     //to hide the function if XOP not installed 
    127127 
    128128        Make/O/D/N=12 Ellip2D_tmp 
     
    131131        Ellip2D_tmp[4] = 0              //pass in a zero background and add it in later 
    132132         
    133         zw[p1,p2]= EllipsoidModel_D(Ellip2D_tmp,xw,yw) + cw[4] 
     133        zw[p1,p2]= Ellipsoid_2DX(Ellip2D_tmp,xw,yw) + cw[4] 
    134134         
    135135#endif 
  • sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/Models_2D/EllipticalCylinder2D.ipf

    r202 r230  
    125125        Variable p1,p2 
    126126         
    127 #if exists("EllipticalCylinderModel_D")                 //to hide the function if XOP not installed 
     127#if exists("EllipticalCylinder_2DX")                    //to hide the function if XOP not installed 
    128128 
    129129        Make/O/D/N=14 EllCyl2D_tmp 
     
    132132        EllCyl2D_tmp[5] = 0             //pass in a zero background and add it in later 
    133133         
    134         zw[p1,p2]= EllipticalCylinderModel_D(EllCyl2D_tmp,xw,yw) + cw[5] 
     134        zw[p1,p2]= EllipticalCylinder_2DX(EllCyl2D_tmp,xw,yw) + cw[5] 
    135135         
    136136#endif 
Note: See TracChangeset for help on using the changeset viewer.