Ignore:
Timestamp:
Jul 23, 2008 1:11:58 PM (14 years ago)
Author:
srkline
Message:

Several changes:

New version of ILL_DataReadWrite. Some changes added to Lionel's work to get the transmission calculation working corectly.

Changes to the wrapper to get the cursors on/off working correctly, as well as USANS matrix recalculation during normal fitting and during Global fitting. It may ask to recalculate the matrix occasionally when using the full data set - even though it really doesn't need to - but this is as a precaution.

Re-worked the header of the GRASP-export ASCII data to much more closely match the VAX output. I couldn't find any problem with the data block, so maybe GRASP was having trouble with the header.

File:
1 edited

Legend:

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

    r369 r394  
    452452                        // large angle transmission correction is <= 1 and will "bump up" the highest angles 
    453453                        if(doTrans) 
     454                         
     455                                if(trans<0.1 && ii==0 && jj==0) 
     456                                        Print "***transmission is less than 0.1*** and is a significant correction" 
     457                                endif 
     458                                 
     459                                if(trans==0) 
     460                                        if(ii==0 && jj==0) 
     461                                                Print "***transmission is ZERO*** and has been reset to 1.0 for the averaging calculation" 
     462                                        endif 
     463                                        trans = 1 
     464                                endif 
     465                                         
    454466                                data[ii][jj] /= LargeAngleTransmissionCorr(trans,dtdist,xd,yd)          //moved from 1D avg SRK 11/2007 
    455467                                solidAngle[ii][jj] = LargeAngleTransmissionCorr(trans,dtdist,xd,yd)             //testing only 
     
    535547         
    536548        ////this section is the trans_correct() VAX routine 
    537         if(trans<0.1) 
    538                 Print "***transmission is less than 0.1*** and is a significant correction" 
    539         endif 
    540         if(trans==0) 
    541                 Print "***transmission is ZERO*** and has been reset to 1.0 for the averaging calculation" 
    542                 trans = 1 
    543         endif 
     549//      if(trans<0.1) 
     550//              Print "***transmission is less than 0.1*** and is a significant correction" 
     551//      endif 
     552//      if(trans==0) 
     553//              Print "***transmission is ZERO*** and has been reset to 1.0 for the averaging calculation" 
     554//              trans = 1 
     555//      endif 
    544556         
    545557        theta = atan( (sqrt(xd^2 + yd^2))/dtdist )              //theta at the input pixel 
Note: See TracChangeset for help on using the changeset viewer.