Ignore:
Timestamp:
Sep 19, 2013 2:24:48 PM (9 years ago)
Author:
srkline
Message:

Changes to:
Polarization - to correct naming errors when saving polarization panel states. Names were too long.

Event Mode - improved the re-loading of split oscillatory data sets. Also allows easier editing of the list of split files to re-load for decimation.

FFT/real space - Modified gizmo to automatically color the different SLDs present. Limitied to 5 different SLDs due to a limitation of the voxelgram. If more than 5 SLDs are present (solvent does not count), then the extra ones are not displayed. Also modified KR-3Cyl procedures to be able to save/import a table of coordinates.

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

Legend:

Unmodified
Added
Removed
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/Polarization/Pol_FlipperPanel.ipf

    r915 r923  
    12241224        Variable num,ii,refnum 
    12251225         
    1226         fname = "CellDecayPanelSaveState" 
     1226        fname = "CellDecaySaveState" 
    12271227         
    12281228        // get a list of the Decay waves 
     
    13371337        Variable num,ii,refnum 
    13381338         
    1339         fname = "FlipperPanelSaveState" 
     1339        fname = "FlipperSaveState" 
    13401340         
    13411341        // get a list of the "Condition" waves 
     
    13521352        Endif 
    13531353         
    1354         Open/P=home refnum      // as fname             // creates a new file, or overwrites the existing file   
     1354        Open/P=home refnum      as fname                // creates a new file, or overwrites the existing file   
    13551355        fprintf refNum,"IGOR\r" 
    13561356                         
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/Polarization/Pol_PolarizationCorrection.ipf

    r915 r923  
    152152         
    153153         
    154         Open/P=home refnum// as fname           // creates a new file, or overwrites the existing file   
     154        Open/P=home refnum as fname             // creates a new file, or overwrites the existing file   
    155155        fprintf refNum,"IGOR\r" 
    156156                         
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/EventModeProcessing.ipf

    r918 r923  
    247247        Button button14,pos={488,350},size={120,20},proc=Stream_LoadDecim,title="Load Split List" 
    248248        Button button19,pos={619,350},size={120,20},proc=Stream_LoadAdjustedList,title="Load Edited List" 
     249        Button button20,pos={650,376},size={90,20},proc=ShowList_ToLoad,title="Show List" 
    249250        SetVariable setvar3,pos={487,378},size={150,16},title="Decimation factor" 
    250251        SetVariable setvar3,fSize=10 
     
    11081109                 
    11091110        SetDataFolder root:Packages:NIST:Event 
     1111         
     1112        Wave slicedData = slicedData 
     1113        Wave logSlicedData = logSlicedData 
     1114        Wave dispSliceData = dispSliceData 
     1115         
    11101116        if(checked) 
     1117                logslicedData = log(slicedData) 
    11111118                Duplicate/O logslicedData dispsliceData 
    11121119        else 
     
    23712378                         
    23722379                        // load in the waves, saved as Igor text to preserve the data type 
    2373                         LoadWave/T/O 
     2380                        LoadWave/T/O/P=catPathName 
    23742381                        filePathStr = S_fileName 
    23752382                        if(strlen(S_fileName) == 0) 
     
    29832990        SVAR str = root:Packages:NIST:Event:gSplitFileList 
    29842991         
    2985         Make/O/T/N=1 root:Packages:NIST:Event:SplitFileWave 
    2986         WAVE tw = root:Packages:NIST:Event:SplitFileWave 
    2987          
     2992        WAVE/T/Z tw = root:Packages:NIST:Event:SplitFileWave 
     2993        if(waveExists(tw) != 1)  
     2994                Make/O/T/N=1 root:Packages:NIST:Event:SplitFileWave 
     2995                WAVE/T/Z tw = root:Packages:NIST:Event:SplitFileWave 
     2996        endif 
     2997 
    29882998        List2TextWave(str,tw) 
    29892999        Edit tw 
     
    30383048                case 2: 
    30393049                        DoAlert 0,"The accumulated data is now the display data and is ready for display or export." 
    3040                         Duplicate/O accumulatedData slicedData           
     3050                        Duplicate/O accumulatedData slicedData 
     3051                        // do something to "touch" the display to force it to update 
     3052                        NVAR gLog = root:Packages:NIST:Event:gEvent_logint 
     3053                        LogIntEvent_Proc("",gLog) 
    30413054                        break 
    30423055                default:                         
     
    33673380End 
    33683381 
     3382Function ShowList_ToLoad(ctrlName) 
     3383        String ctrlName 
     3384         
     3385        ShowSplitFileTable() 
     3386         
     3387        return(0) 
     3388End 
    33693389 
    33703390 
Note: See TracChangeset for help on using the changeset viewer.