Changeset 589


Ignore:
Timestamp:
Nov 3, 2009 1:08:00 PM (13 years ago)
Author:
srkline
Message:

Updated the SingleModelTemplate? to be compatible with the new release

Location:
sans/Dev/trunk
Files:
1 added
1 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • sans/Dev/trunk/NCNR_SANS_Utilities/Single_Model_Template/My_Model_v40.ipf

    r360 r589  
    3030// v 2.1 -- Jul 2007 SRK 
    3131//                              converted to use structures, AAO, like the rest of the package 
     32// v 2.2 -- Nov 2009 SRK 
     33//                              updated AddModelToStrings() for the new release 
    3234// 
    3335//////////////////////////////////////////////////// 
     
    4850        Edit parameters_MyModel, coef_MyModel 
    4951         
    50         Variable/G root:g_MyModel 
    51         g_MyModel := MyModel(coef_MyModel, ywave_MyModel, xwave_MyModel) 
     52        Variable/G root:g_MyModel=0 
     53        root:g_MyModel := MyModel(coef_MyModel, ywave_MyModel, xwave_MyModel) 
    5254        Display ywave_MyModel vs xwave_MyModel 
    5355        ModifyGraph marker=29, msize=2, mode=4 
     
    5759        AutoPositionWindow/M=1/R=$(WinName(0,1)) $WinName(0,2) 
    5860         
    59         AddModelToStrings("MyModel","coef_MyModel","MyModel") 
     61        AddModelToStrings("MyModel","coef_MyModel","parameters_MyModel","MyModel") 
    6062// 
    6163End 
     
    100102         
    101103        SetDataFolder root: 
    102         AddModelToStrings("SmearedMyModel","smear_coef_MyModel","MyModel") 
     104        AddModelToStrings("SmearedMyModel","smear_coef_MyModel","smear_parameters_MyModel","MyModel") 
    103105End 
    104106 
  • sans/Dev/trunk/NCNR_SANS_Utilities/Single_Model_Template/ReadMe_SingleModelTemplate.txt

    r323 r589  
    88 
    9901 OCT 2007 SRK 
     10 
     11Updated to latest release 
     12 
     1303 NOV 2009 SRK 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/MultScatter_MonteCarlo_2D.ipf

    r588 r589  
    720720        xPixel = round(xCtr + dx/pixSize) 
    721721 
     722        NVAR pixelsX = root:myGlobals:gNPixelsX 
     723        NVAR pixelsY = root:myGlobals:gNPixelsY 
     724         
    722725        //if on detector, return xPix and yPix values, otherwise -1 
    723         if(yPixel > 127 || yPixel < 0) 
     726        if(yPixel > pixelsY || yPixel < 0) 
    724727                yPixel = -1 
    725728        endif 
    726         if(xPixel > 127 || xPixel < 0) 
     729        if(xPixel > pixelsX || xPixel < 0) 
    727730                xPixel = -1 
    728731        endif 
Note: See TracChangeset for help on using the changeset viewer.