Ignore:
Timestamp:
Oct 22, 2009 11:04:32 AM (13 years ago)
Author:
srkline
Message:

Fixed logic error in writing the XY box count values to the empty beam header that could result in INF transmission.

Updated critera for "RAW" data files to include "SIM" as well.

Added NCNR_Utils to the includes list for Analysis.

Location:
sans/Dev/trunk/NCNR_User_Procedures/Reduction/USANS
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/USANS/BT5_AddFiles.ipf

    r570 r577  
    494494                //drawing a new graph 
    495495                Legend 
    496                 Label left "(Counts/sec)/(MON*10\\S6\\M)" 
     496                Label left "(Counts/sec)/(MON)*10\\S6\\M" 
    497497                Label bottom "Angle (deg)" 
    498498        endif 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/USANS/COR_Graph.ipf

    r570 r577  
    9393        ModifyGraph log(left)=1,mirror=2,grid=1,standoff=0 
    9494        ModifyGraph tickUnit=1 
    95         Label left "(Counts/sec)/(MON*10\\S6\\M)" 
     95        Label left "(Counts/sec)/(MON)*10\\S6\\M" 
    9696        Label bottom "q (A\\S-1\\M)" 
    9797         
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/USANS/U_CALC.ipf

    r570 r577  
    15571557                        // click code here 
    15581558                         
    1559                         Variable num,ii,baseNumber=100,firstSet=0 
     1559                        Variable num,ii,baseNumber=101,firstSet=0 
    15601560                        String pathStr="root:Packages:NIST:USANS:Globals:U_Sim:gCtTime" 
    15611561                        SVAR USANSFolder = root:Packages:NIST:USANS:Globals:gUSANSFolder 
     
    16611661        fprintf refnum,"%s"+termStr,"  6       0.00000    0.00000    0.00000" 
    16621662        fprintf refnum,"%s"+termStr," Mot:    Start       Step      End" 
    1663         fprintf refnum,"%s"+termStr,"     A2       MIN       COUNTS " 
     1663        fprintf refnum,"%s"+termStr,"     A2       MIN      MONITOR      COUNTS      EXTRA " 
    16641664 
    16651665        //loop over the waves, picking out the desired set 
    16661666        //write 2 lines each time 
    16671667        for(ii=first;ii<=last;ii+=1) 
    1668                 sprintf str,"      %6.3f    %6.2f         %d",angle[ii],ctTime/60,DetCts[ii] 
     1668                sprintf str,"      %6.3f    %6.2f    %d     %d     %d",angle[ii],ctTime/60,MonCt,DetCts[ii]*ctTime,transDet 
    16691669                fprintf refnum,"%s"+termStr,str 
    16701670 
    1671                 sprintf str,"%d,%d,0,%d,0,0,0,0",MonCt,DetCts[ii],transDet 
     1671                sprintf str,"%d,%d,0,%d,0,0,0,0",MonCt,DetCts[ii]*ctTime,transDet 
    16721672                fprintf refnum,"%s"+termStr,str 
    16731673        endfor 
Note: See TracChangeset for help on using the changeset viewer.