Changeset 962


Ignore:
Timestamp:
Jun 8, 2020 4:30:54 PM (2 years ago)
Author:
ilavsky
Message:

Promote Igor version

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/User Procedures/Irena/IRB1_bioSAXS.ipf

    r955 r962  
    11#pragma TextEncoding = "UTF-8"
    22#pragma rtGlobals=3             // Use modern global access method and strict wave access.
    3 #pragma version=0.1
    4 #pragma IgorVersion = 7.08
     3#pragma version=0.2
     4#pragma IgorVersion = 8.03
    55
    66
     
    1717//
    1818//version summary
     19//0.2 Beta version June 2020
    1920//0.1 early beta version
    2021
     
    695696                        if(tab==1)
    696697                                InvertGrepSearch = 0
    697                                 DataMatchString="ave"
     698                                DataMatchString="avg"
    698699                        elseif(tab==0)
    699700                                InvertGrepSearch = 1
    700                                 DataMatchString="ave|sub"
     701                                DataMatchString="avg|sub"
    701702                        elseif(tab==2)
    702703                                InvertGrepSearch = 0
     
    832833       
    833834        TraceNames= TraceNameList("IRB1_DataManipulationPanel#LogLogDataDisplay",";",3)
    834         TraceNames=GrepList(TraceNames, "_ave",1 , ";" )                                                                                        //this removes any _ave waves which user may have generated by multiple push of the button.
     835        TraceNames=GrepList(TraceNames, "_avg",1 , ";" )                                                                                        //this removes any _ave waves which user may have generated by multiple push of the button.
    835836        NewNote = "Averaged Data;"+date()+";"+time()+";List of Data waves="+TraceNames
    836837        numTraces = ItemsInList(TraceNames)
     
    851852        //take first folder name, append the user appendix and create new strings here...
    852853        string FirstFolderShortName=StringFromList(ItemsInList(FldrNamesTWv[0], ":")-1, FldrNamesTWv[0], ":")
    853         string OutputWaveNameMain = RemoveListItem(ItemsInList(FirstFolderShortName,"_")-1, FirstFolderShortName, "_") +"ave"
     854        string OutputWaveNameMain = RemoveListItem(ItemsInList(FirstFolderShortName,"_")-1, FirstFolderShortName, "_") +"avg"
    854855        OutYWvNm = "r_"+OutputWaveNameMain
    855856        OutEWvNm = "s_"+OutputWaveNameMain
     
    977978                tempStr = FolderNameStr
    978979        endif
    979         AverageOutputFolderString = RemoveListItem(ItemsInList(tempStr,"_")-1, tempStr, "_") +"ave"
     980        AverageOutputFolderString = RemoveListItem(ItemsInList(tempStr,"_")-1, tempStr, "_") +"avg"
    980981        IR3C_SelectWaveNamesData("Irena:BioSAXSDataMan", FolderNameStr)                 //this routine will preset names in strings as needed,
    981982        Wave/Z SourceIntWv=$(DataFolderName+IntensityWaveName)
Note: See TracChangeset for help on using the changeset viewer.