Ignore:
Timestamp:
Nov 24, 2008 12:54:13 PM (14 years ago)
Author:
srkline
Message:

Two changes: (1) remove threading of Cyl-PolyRad? model until WM can fix the crashing bug related to compiling/threadsafe...
(2) fixed bug in the calculation of the random deviate for MC calculations. The wrong scattering cross section was calculated depending on wavelength. This has been corrected.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/MultScatter_MonteCarlo_2D.ipf

    r454 r455  
    572572        Integrate/METH=1 Gq/D=Gq_INT 
    573573         
    574         SASxs = lam*lam/2/pi*Gq_INT[nPts_ran-1] 
     574//      SASxs = lam*lam/2/pi*Gq_INT[nPts_ran-1]                 //if the approximation is used 
     575        SASxs = lam*Gq_INT[nPts_ran-1] 
    575576         
    576577        Gq_INT /= Gq_INT[nPts_ran-1] 
     
    687688        list = RemoveFromList("BinaryHS_PSF11;BinaryHS_PSF12;BinaryHS_PSF22;EllipCyl_Integrand;PP_Inner;PP_Outer;Phi_EC;TaE_Inner;TaE_Outer;",list,";") 
    688689//////////////// 
     690 
     691        //more functions from analysis models (2008) 
     692        tmp = "Barbell_Inner;Barbell_Outer;Barbell_integrand;BCC_Integrand;Integrand_BCC_Inner;Integrand_BCC_Outer;" 
     693        list = RemoveFromList(tmp, list  ,";") 
     694        tmp = "CapCyl;CapCyl_Inner;CapCyl_Outer;ConvLens;ConvLens_Inner;ConvLens_Outer;" 
     695        list = RemoveFromList(tmp, list  ,";") 
     696        tmp = "Dumb;Dumb_Inner;Dumb_Outer;FCC_Integrand;Integrand_FCC_Inner;Integrand_FCC_Outer;" 
     697        list = RemoveFromList(tmp, list  ,";") 
     698        tmp = "Integrand_SC_Inner;Integrand_SC_Outer;SC_Integrand;SphCyl;SphCyl_Inner;SphCyl_Outer;" 
     699        list = RemoveFromList(tmp, list  ,";") 
    689700 
    690701        //simplify the display, forcing smeared calculations behind the scenes 
Note: See TracChangeset for help on using the changeset viewer.