Ignore:
Timestamp:
Jun 17, 2016 11:43:46 AM (6 years ago)
Author:
srkline
Message:

main changes here are the addition of a first pass at the file catalog, and patch panel. each of these is based on the old SANS file (for now) and has been updated to at least compile.

Much more work needs to be done to get the functionality to be what VSANS needs, both in what is important to report in the file catalog, and how to best present the patch GUI for different situations

File:
1 edited

Legend:

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

    r999 r1002  
    9999 
    100100 
    101 Macro V_Combine1DData() 
     101Proc V_Combine1DData() 
    102102 
    103103// get the current display type 
     
    107107 
    108108// trim the data if needed 
     109        // remove the q=0 point from the back detector, if it's there 
     110        V_RemoveQ0_B(type) 
     111 
    109112 
    110113// concatenate the data sets 
     114        // clear the old tmp waves first, if they still exist 
     115        SetDataFolder $("root:Packages:NIST:VSANS:"+type) 
     116        Killwaves/Z tmp_q,tmp_i,tmp_s 
     117        setDataFolder root: 
    111118        V_1DConcatenate(type) 
    112119         
     
    125132        String/G saveName=str 
    126133End 
     134 
     135 
     136// blindly assumes that there is only one zero at the top of the wave 
     137// could be more sophisticated in the future... 
     138Function V_RemoveQ0_B(type) 
     139        String type 
     140         
     141        SetDataFolder $("root:Packages:NIST:VSANS:"+type) 
     142 
     143        WAVE/Z qBin = qBin_qxqy_B 
     144        WAVE/Z iBin = iBin_qxqy_B 
     145        WAVE/Z eBin = eBin_qxqy_B 
     146        WAVE/Z nBin = nBin_qxqy_B 
     147        WAVE/Z iBin2 = iBin2_qxqy_B 
     148 
     149        if(qBin[0] == 0) 
     150                DeletePoints 0, 1, qBin,iBin,eBin,nBin,iBin2 
     151        endif 
     152         
     153        SetDataFolder root: 
     154        return(0) 
     155end 
    127156 
    128157 
     
    136165//    although waves may exist, they may not be the right ones to use. There 
    137166//    will be a somewhat complex selection process 
    138 // -- detector B is currently skipped 
     167// x- detector B is currently skipped 
    139168// 
    140169// this seems like a lot of extra work to do something so simple... 
     
    207236//      Duplicate/O tmp_res3 $("root:"+folder2+":res3") 
    208237 
     238// Can't kill here, since they are still needed to sort and write out! 
    209239//      KillWaves/Z tmp_q,tmp_i,tmp_s,tmp_res0,tmp_res1,tmp_res2,tmp_res3        
    210240         
     
    215245 
    216246// TODO: 
    217 // -- resolution waves are ignored 
     247// -- resolution waves are ignored, since they don't exist (yet) 
    218248// -- only a sort is done, no rescaling of data sets 
    219249//    (it's too late now anyways, since the data was concatenated 
     
    241271 
    242272 
    243 // trims the beamstop out (based on shadow) 
    244 // trims num from the highQ end 
    245 // splits the res wave into individual waves in anticipation of concatenation 
     273// TODO 
     274// -- currently, this function is NOT called by anything 
     275// needs: 
     276// -- trim the beamstop out (based on shadow) 
     277// -- trim out zero q from the file (bad actor in analysis functions) 
     278// -- trim num from the highQ end or lowQ end? 
     279// -- splits the res wave into individual waves in anticipation of concatenation 
     280//   -- or -- deal with the res wave after? 
     281// 
     282// 
    246283// 
    247284Function V_Trim1DData(folderStr,nEnd) 
Note: See TracChangeset for help on using the changeset viewer.