Ignore:
Timestamp:
Feb 26, 2018 3:31:01 PM (5 years ago)
Author:
srkline
Message:

corrected bad logic in reduction when reducing to 2D. Nothing was wrong, just a meaningless error dialog was presented.

updated the beamstop sizes in SASCALC for the NGB-10m SANS instrument. Now the 4 beamstops are 1", 1.5", 2" and 3".

File:
1 edited

Legend:

Unmodified
Added
Removed
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_Protocol_Reduction.ipf

    r1084 r1088  
     1#pragma TextEncoding = "MacRoman" 
    12#pragma rtGlobals=1             // Use modern global access method. 
    23#pragma version=5.0 
    3 #pragma IgorVersion=6.1 
     4#pragma IgorVersion=7 
    45 
    56//************************ 
     
    23372338// 
    23382339 
     2340// 
     2341// (DONE) 
     2342// -x this generates a "Bin Type Not Found" error if reducing only to a 2D level (like for DIV) 
     2343//              because binTypeStr is null 
    23392344        String binTypeStr = StringByKey("BINTYPE",prot[5],"=",";") 
    23402345        // plotting is not really necessary, and the graph may not be open - so skip for now? 
    23412346        Variable binType 
    2342         binType = V_BinTypeStr2Num(binTypeStr) 
    2343         if(binType == 0) 
    2344                         Abort "Binning mode not found in V_QBinAllPanels() "// when no case matches 
     2347        // only get the binning type if user asks for averaging 
     2348        If(cmpstr(av_type,"none") != 0) 
     2349                binType = V_BinTypeStr2Num(binTypeStr) 
     2350                if(binType == 0) 
     2351                                Abort "Binning mode not found in V_QBinAllPanels() "// when no case matches 
     2352                endif 
    23452353        endif 
    2346  
    23472354 
    23482355// 
     
    24032410// -- BAD logic here, skipping the normal graph if annular is chosen. Go back and see how I do this 
    24042411// in SANS for a better and more foolproof way to do this 
     2412// x- don't draw the graph if "none" is the average type! 
    24052413        // 
    2406         if(cmpstr(av_type,"Annular") != 0) 
     2414        if(cmpstr(av_type,"Annular") != 0 && (cmpstr(av_type,"none") != 0) ) 
    24072415                V_PlotData_Panel()              //this brings the plot window to the front, or draws it (ONLY) 
    24082416                V_Update1D_Graph(activeType,binType)            //update the graph, data was already binned 
Note: See TracChangeset for help on using the changeset viewer.