Changeset 842


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

Additions to SASCALC for the new sample apertures in boxes 6 and 7 @ NG3. Now 6 guides is an allowed configuration. A polarizer has been added to NG7 in box 2, but no changes have been made to SASCALC, as no guide configurations are excluded.

File:
1 edited

Legend:

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

    r811 r842  
    2020//                                               configuration. 17.2 can be typed in for lens/prism on NG3. Invalid conditions 
    2121//                                               will automatically uncheck the box 
     22// 03 MAR 2012 SRK - Added new source apertures in 6th and 7th boxes of NG3 
     23// 
    2224// 
    2325// calculate what q-values you get based on the instruments settings 
     
    204206        Variable/G a1_7_0 = 2.5 // after the polarizer           
    205207        Variable/G a1_7_1 = 5.0 
     208        Variable/G a1_7_1 = 0.95                // new Mar 2012 9.5 mm diameter source aperture 
    206209        Variable/G a1_def = 5.00 
    207210         
     
    469472                                A1str="1.43 cm;2.54 cm;3.81 cm;" 
    470473                                break 
    471                         case 6: 
    472                                 A1str = "! 6 Guides invalid;" 
    473                                 mode=1 
    474                                 break 
     474//                      case 6:                                                                 //Mar 2012 - 6 guides is OK now, 5 cm aperture present in 7th box 
     475//                              A1str = "! 6 Guides invalid;" 
     476//                              mode=1 
     477//                              break 
    475478                        case 7:                                                 // switched order in 2009 to keep 5 cm as default, 2.5 cm for polarizer 
    476                                 A1Str = "5.00 cm;2.50 cm;" 
     479                                A1Str = "5.00 cm;2.50 cm;0.95 cm;"              // Mar 2012 - 3rd aperture added 
    477480                                mode = 1 
    478481                                break 
Note: See TracChangeset for help on using the changeset viewer.