Ignore:
Timestamp:
Aug 30, 2007 4:24:41 PM (15 years ago)
Author:
srkline
Message:

Changed Plot* and PlotSmeared?* naming schemes to be all consistent prefixes for the actual function name, so that the macros can be constructed from the function name, or vice versa.

also some tweaks to the wrapper to make sure that plot and append really work

File:
1 edited

Legend:

Unmodified
Added
Removed
  • sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/CoreShell_and_Struct.ipf

    r151 r153  
    9191        //calculate each and combine 
    9292        Duplicate/O xw temp_CSS_HS_PQ,temp_CSS_HS_SQ            //make waves for the AAO 
    93         CoreShellForm(form_CSS_HS,temp_CSS_HS_PQ,xw) 
     93        CoreShellSphere(form_CSS_HS,temp_CSS_HS_PQ,xw) 
    9494        HardSphereStruct(struct_CSS_HS,temp_CSS_HS_SQ,xw) 
    9595        yw = temp_CSS_HS_PQ * temp_CSS_HS_SQ 
     
    186186        //calculate each and combine 
    187187        Duplicate/O xw temp_CSS_SW_PQ,temp_CSS_SW_SQ            //make waves for the AAO 
    188         CoreShellForm(form_CSS_SW,temp_CSS_SW_PQ,xw) 
     188        CoreShellSphere(form_CSS_SW,temp_CSS_SW_PQ,xw) 
    189189        SquareWellStruct(struct_CSS_SW,temp_CSS_SW_SQ,xw) 
    190190        yw = temp_CSS_SW_PQ * temp_CSS_SW_SQ 
     
    294294        //calculate each and combine 
    295295        Duplicate/O xw temp_CSS_SC_PQ,temp_CSS_SC_SQ            //make waves for the AAO 
    296         CoreShellForm(form_CSS_SC,temp_CSS_SC_PQ,xw) 
     296        CoreShellSphere(form_CSS_SC,temp_CSS_SC_PQ,xw) 
    297297        HayterPenfoldMSA(struct_CSS_SC,temp_CSS_SC_SQ,xw) 
    298298        yw = temp_CSS_SC_PQ * temp_CSS_SC_SQ 
     
    389389        //calculate each and combine 
    390390        Duplicate/O xw temp_CSS_SHS_PQ,temp_CSS_SHS_SQ          //make waves for the AAO 
    391         CoreShellForm(form_CSS_SHS,temp_CSS_SHS_PQ,xw) 
     391        CoreShellSphere(form_CSS_SHS,temp_CSS_SHS_PQ,xw) 
    392392        StickyHS_Struct(struct_CSS_SHS,temp_CSS_SHS_SQ,xw) 
    393393        yw = temp_CSS_SHS_PQ * temp_CSS_SHS_SQ 
Note: See TracChangeset for help on using the changeset viewer.