Changeset 843


Ignore:
Timestamp:
Mar 2, 2012 10:56:30 AM (11 years ago)
Author:
srkline
Message:

Corrected the FFT fit functions to use the 10-7 multiplier for the SLD. Included the MixedDumbbell? model to the included model list. Tested all of the functions.

Location:
sans/Dev/trunk/NCNR_User_Procedures
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Alpha/Tinker/FFT_Fit_Cylinder.ipf

    r798 r843  
    9797        NVAR FFT_N = root:FFT_N 
    9898        NVAR FFT_SolventSLD = root:FFT_SolventSLD 
     99        NVAR FFT_delRho = root:FFT_delRho               //the SLD multiplier, should have been initialized to 1e-7 
    99100         
    100         FFT_SolventSLD = trunc(sldSolv*1e6)             //spits back an integer, maybe not correct 
     101        FFT_SolventSLD = trunc(sldSolv/FFT_delRho)              //spits back an integer, maybe not correct 
    101102 
    102103// generate the matrix and erase it 
     
    110111// with the input parameters, build the structure 
    111112        ctr = trunc(FFT_N/2) 
    112         fill = trunc(sldCyl*1e6) 
     113        fill = trunc(sldCyl/FFT_delRho) 
    113114         
    114115        FillXCylinder(m,FFT_T,radius,ctr,ctr,ctr,length,fill) 
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Alpha/Tinker/FFT_Fit_Includes.ipf

    r798 r843  
    55#include "FFT_Fit_Sphere" 
    66#include "FFT_Fit_Cylinder" 
     7#include "FFT_Fit_MixedDumbbell" 
    78 
    89//K. Rubinson 
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Alpha/Tinker/FFT_Fit_MixedDumbbell.ipf

    r816 r843  
    9797        NVAR FFT_N = root:FFT_N 
    9898        NVAR FFT_SolventSLD = root:FFT_SolventSLD 
    99          
    100         FFT_SolventSLD = trunc(rhos*1e6)                //spits back an integer, maybe not correct 
     99        NVAR FFT_delRho = root:FFT_delRho               //the SLD multiplier, should have been initialized to 1e-7 
     100 
     101         
     102        FFT_SolventSLD = trunc(rhos/FFT_delRho)         //spits back an integer, maybe not correct 
    101103 
    102104// generate the matrix and erase it 
     
    110112// with the input parameters, build the structure 
    111113        ctr = trunc(FFT_N/2) 
    112         fill1 = trunc(rho1*1e6) 
    113         fill2 = trunc(rho2*1e6) 
     114        fill1 = trunc(rho1/FFT_delRho) 
     115        fill2 = trunc(rho2/FFT_delRho) 
    114116         
    115117        FillSphereRadius(m,FFT_T,radius1,ctr,ctr,ctr,fill1) 
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Alpha/Tinker/FFT_Fit_Sphere.ipf

    r798 r843  
    9696        NVAR FFT_N = root:FFT_N 
    9797        NVAR FFT_SolventSLD = root:FFT_SolventSLD 
     98        NVAR FFT_delRho = root:FFT_delRho               //the SLD multiplier, should have been initialized to 1e-7 
    9899         
    99         FFT_SolventSLD = trunc(sldSolv*1e6)             //spits back an integer, maybe not correct 
     100        FFT_SolventSLD = trunc(sldSolv/FFT_delRho)              //spits back an integer, maybe not correct 
    100101 
    101102// generate the matrix and erase it 
     
    109110// with the input parameters, build the structure 
    110111        ctr = trunc(FFT_N/2) 
    111         fill = trunc(sldSph*1e6) 
     112        fill = trunc(sldSph/FFT_delRho) 
    112113         
    113114        err = FillSphereRadiusNoOverlap(m,grid,radius,ctr,ctr,ctr,fill) 
  • sans/Dev/trunk/NCNR_User_Procedures/Common/Packages/PlotManager/PlotUtilsMacro_v40.ipf

    r838 r843  
    11941194        list = RemoveFromList("FillYZCircle;FillZCylinder;PadMatrix;RandomFill3DMat;RandomPoints2D;SobolFill3DMat;SphereAtEachPoint;UnConnectedRodFill;XYZV_toByteVoxels;",list,";") 
    11951195        list = RemoveFromList("MakeTriplet;SobolPoints2D;X_CylindersAtPoints;X_CylindersHexagonalGrid;X_CylindersSquareGrid;maxDistance_Threaded;KR_MultiCylinder;",list,";") 
    1196         list = RemoveFromList("X_CoreShellCylinderHexGrid;",list,";") 
     1196        list = RemoveFromList("X_CoreShellCylinderHexGrid;FillPlaneHexagonal;FillPlaneSquareGrid;",list,";") 
    11971197         
    11981198         
Note: See TracChangeset for help on using the changeset viewer.