Ignore:
Timestamp:
Nov 25, 2009 2:40:15 PM (13 years ago)
Author:
srkline
Message:

USANS:

  • added warning for mutliple scattering to the panel (red if trouble)
  • improved handling of .bt5 files if the peak can't be found
  • added a routine to save the fake "cor" file along with the .bt5 files. The cor file is much more useful.

SANS:

  • updated (again) the SASCALC flux numbers. Also made some more of the flux paramters to be instrument specific globals to make future changes easier.
File:
1 edited

Legend:

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

    r588 r605  
    484484                        //rad is the distance of pixel ij from the sample 
    485485                        //domega is the ratio of the solid angle of pixel ij versus center pixel 
     486                        // product xy = 1 for a detector with a linear spatial response (modern Ordela) 
     487                        // solid angle calculated, dW^3 >=1, so multiply data to raise measured values to correct values. 
    486488                        rad = sqrt(dtdis2 + xd^2 + yd^2) 
    487489                        domega = rad/dtdist 
    488490                        ratio = domega^3 
    489 //                      solidAngle[ii][jj] = ratio              //testing only   
    490491                        xy = xx[ii]*yy[jj] 
    491492                        data[ii][jj] *= xy*ratio 
     493//                      solidAngle[ii][jj] = xy*ratio           //testing only   
     494 
    492495                         
    493                         // multiplicative correction for detector efficiency JBG memo det_eff_cor2.doc 3/20/07 
     496                        // correction factor for detector efficiency JBG memo det_eff_cor2.doc 3/20/07 
    494497                        // correction inserted 11/2007 SRK 
    495                         // large angle detector efficiency correction is >= 1 and will "bump up" the highest angles 
     498                        // large angle detector efficiency is >= 1 and will "bump up" the measured value at the highest angles 
    496499                        // so divide here to get the correct answer (5/22/08 SRK) 
    497500                        if(doEfficiency) 
     
    501504#else 
    502505                                data[ii][jj] /= DetEffCorr(lambda,dtdist,xd,yd) 
    503         //                      solidAngle[ii][jj] = DetEffCorr(lambda,dtdist,xd,yd)            //testing only 
     506//                              solidAngle[ii][jj] /= DetEffCorr(lambda,dtdist,xd,yd)           //testing only 
    504507#endif 
    505508                        endif 
    506509                         
    507                         // large angle transmission correction is <= 1 and will "bump up" the highest angles 
     510                        // large angle transmission calculation is <= 1 and will "bump down" the measured value at the highest angles 
     511                        // so divide here to get the correct answer 
    508512                        if(doTrans) 
    509513                         
     
    520524                                         
    521525                                data[ii][jj] /= LargeAngleTransmissionCorr(trans,dtdist,xd,yd)          //moved from 1D avg SRK 11/2007 
    522                                 solidAngle[ii][jj] = LargeAngleTransmissionCorr(trans,dtdist,xd,yd)             //testing only 
     526//                              solidAngle[ii][jj] /= LargeAngleTransmissionCorr(trans,dtdist,xd,yd)            //testing only 
    523527                        endif 
    524528                         
Note: See TracChangeset for help on using the changeset viewer.