Ignore:
Timestamp:
Jun 23, 2009 6:06:24 PM (13 years ago)
Author:
srkline
Message:

A bunch of random changes:
-SASCALC - added the 2.5 cm aperture NG3/7g/polarizer back in, but made the 5 cm the default
-Some fiddling with 2D functionality to enable 2D resolution smearing. Still a work in progress
-Added two new model functions, and added them to the list.
-Changes to the wrapper for the new release to generate kw=val strings as needed for each function
and its coefficients and parameters. This behavior has been changed in the new release, so this
fix should keep old analysis experiments compatible with the new version.

Location:
sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS
Files:
2 edited

Legend:

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

    r509 r515  
    255255        kap = 2*pi/lambda 
    256256        a_val = (L1+L2)*g/2/(h_m)^2 
    257          
     257 
     258//      lambdaWidth = 0.5        
    258259        SigmaQX = 3*(S1/L1)^2 + 3*(S2/LP)^2 + 2*(DDet/L2)^2 + 2*(r_dist/L2)^2*(lambdaWidth)^2*(cos(phi))^2 
    259260 
    260261        SigmaQY = 3*(S1/L1)^2 + 3*(S2/LP)^2 + 2*(DDet/L2)^2 + 2*(r_dist/L2)^2*(lambdaWidth)^2*(sin(phi))^2 + 8*(a_val/L2)^2*lambda^4*lambdaWidth^2 
     262//      SigmaQY = 3*(S1/L1)^2 + 3*(S2/LP)^2 + 2*(DDet/L2)^2 + 2*(r_dist/L2)^2*(lambdaWidth)^2*(sin(phi))^2 
    261263 
    262264        SigmaQX = sqrt(kap*kap/12*SigmaQX) 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/SASCALC.ipf

    r492 r515  
    179179        Variable/G a1_0_1 = 2.54 
    180180        Variable/G a1_0_2 = 3.81 
    181         Variable/G a1_7_0 = 2.5 // after the polarizer          //removed as an option in 2009 
     181        Variable/G a1_7_0 = 2.5 // after the polarizer           
    182182        Variable/G a1_7_1 = 5.0 
    183183        Variable/G a1_def = 5.00 
     
    415415                                mode=1 
    416416                                break 
    417 //                      case 7:                                                 // removed as option in 2009 
    418 //                              A1Str = "2.50 cm;5.00 cm;" 
    419 //                              mode = 1 
    420 //                              break 
     417                        case 7:                                                 // switched order in 2009 to keep 5 cm as default, 2.5 cm for polarizer 
     418                                A1Str = "5.00 cm;2.50 cm;" 
     419                                mode = 1 
     420                                break 
    421421                        default: 
    422422                                A1str = "5 cm;" 
Note: See TracChangeset for help on using the changeset viewer.