Ignore:
Timestamp:
Jun 2, 2017 11:29:54 AM (5 years ago)
Author:
srkline
Message:

moved dead time correction to before the solid angle correction, so that the dead time would be correcting counts, not counts per solid angle

added a routine to kill all of the waves and folders possible, if the overall DF kill failed. This is to prevent stray folders and waves from being present if different data files are loaded - since different data blocks are present for say, 3He data, data with temperature logging, etc.
This kill routine is used every time, before raw data is loaded, DIV or MASK loaded, or data is converted to WORK.

changed the "Save I(q)" button on the data display panel to save as ITX format, since the data has not been processed, and data can more easily be used for trimming input.

picking protocols in dialogs now excludes/includes appropriate waves

menus are consolidated

Fixed bug in SANS macros where the DRK[] item in the protocol could be null, and force the read of a DRK file, even if it was not desired.

File:
1 edited

Legend:

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

    r1041 r1042  
    14641464Proc V_PickAProtocol(protocol) 
    14651465        String Protocol 
    1466         Prompt Protocol "Pick A Protocol",popup, WaveList("*",";","TEXT:1,MAXROWS:13") 
     1466        Prompt Protocol "Pick A Protocol",popup, V_RecallableProtocols() 
    14671467         
    14681468        String/G  root:Packages:NIST:VSANS:Globals:Protocols:gProtoStr = protocol 
     
    14841484        list= RemoveFromList("CreateNew", list  , ";") 
    14851485        list= RemoveFromList("tempProtocol", list  , ";") 
     1486        list= RemoveFromList("wTTmpWrite", list  , ";") 
    14861487        if(cmpstr(list,"")==0) 
    14871488                list = "_no_protocols_;" 
     
    14901491        return(list) 
    14911492End 
     1493 
     1494Function/S V_RecallableProtocols() 
     1495        String list=WaveList("*",";","TEXT:1,MAXROWS:13") 
     1496 
     1497//      list= RemoveFromList("Base", list  , ";") 
     1498//      list= RemoveFromList("DoAll", list  , ";") 
     1499        list= RemoveFromList("CreateNew", list  , ";") 
     1500        list= RemoveFromList("tempProtocol", list  , ";") 
     1501        list= RemoveFromList("wTTmpWrite", list  , ";") 
     1502        if(cmpstr(list,"")==0) 
     1503                list = "_no_protocols_;" 
     1504        endif 
     1505         
     1506        return(list) 
     1507End 
     1508 
    14921509 
    14931510//missing parameter dialog to solicit user for a waveStr for the protocol  
     
    25072524                                        // does not trim any of the data 
    25082525                                        V_RemoveQ0_B(activeType) 
    2509                                         V_Write1DData_NoConcat("root:Packages:NIST:VSANS:",activeType,newFileName,binType) 
     2526                                        V_Write1DData_ITX("root:Packages:NIST:VSANS:",activeType,newFileName,binType) 
    25102527                                endif 
    25112528 
     
    27722789        String Protocol="" 
    27732790        SetDataFolder root:Packages:NIST:VSANS:Globals:Protocols 
    2774         Prompt Protocol "Pick A Protocol",popup, WaveList("*",";","") 
     2791        Prompt Protocol "Pick A Protocol",popup, V_DeletableProtocols() 
    27752792        DoPrompt "Pick A Protocol to Export",Protocol 
    27762793        if(V_flag==1) 
Note: See TracChangeset for help on using the changeset viewer.