Changeset 946


Ignore:
Timestamp:
May 24, 2020 11:19:43 AM (2 years ago)
Author:
ilavsky
Message:

Revmeo absolute paths to #include files, should nto be necessary.

Location:
trunk/User Procedures
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/User Procedures/Indra 2/IN2_Load Indra 2.ipf

    r938 r946  
    11#pragma rtGlobals=3                     // Use modern global access method.
    22#pragma IgorVersion=7.05        //requires Igor version 7.05 or higher
    3 #pragma version=1.97
     3#pragma version=1.972
    44
    55
     
    1010//*************************************************************************/
    1111
     12//1.972 current beta
    1213//1.97 February 2020 release.
    1314//1.96 December 2018 release.
     
    4041
    4142//this is in Indra2 folder
    42 #include ":IN2_ConversionProcedure", version>=1.10
    43 #include ":IN2_DesktopUSAXS", version>=0.3
    44 #include ":IN2_GeneralProcedures", version>=2.20
    45 #include ":IN2_NotebookLogging", version>=1.10
    46 #include ":IN2_PlottingTools", version>=1.14
    47 #include ":IN2_SpecInput", version>=1.21
    48 #include ":IN2_StandardPlots", version>=1.13
    49 #include ":IN2_USAXS", version>=1.97
    50 #include ":IN2_XtalCalculations", version>=1.1
    51 #include ":IN3_CalcScattering", version>=1.01
    52 #include ":IN3_Calculations", version>=1.41
    53 #include ":IN3_FlyScan", version>=1.06
    54 #include ":IN3_Main", version>=1.97
    55 #include ":IN3_Rwave", version>=1
    56 #include ":IN3_SupportFnct", version>=1.13
    57 #include ":spec", version>=2.21
     43#include "IN2_ConversionProcedure", version>=1.10
     44#include "IN2_DesktopUSAXS", version>=0.3
     45#include "IN2_GeneralProcedures", version>=2.20
     46#include "IN2_NotebookLogging", version>=1.10
     47#include "IN2_PlottingTools", version>=1.14
     48#include "IN2_SpecInput", version>=1.21
     49#include "IN2_StandardPlots", version>=1.13
     50#include "IN2_USAXS", version>=1.97
     51#include "IN2_XtalCalculations", version>=1.1
     52#include "IN3_CalcScattering", version>=1.01
     53#include "IN3_Calculations", version>=1.41
     54#include "IN3_FlyScan", version>=1.06
     55#include "IN3_Main", version>=1.97
     56#include "IN3_Rwave", version>=1
     57#include "IN3_SupportFnct", version>=1.13
     58#include "spec", version>=2.21
    5859//#include ":IN2_XtalCalculations", version>=1
    59 #include ":IonChamber3.1", version>=3.1
     60#include "IonChamber3.1", version>=3.1
    6061
    61 #include "::Irena:IR2_PanelCntrlProcs", version>=1.53
    62 #include "::CanSAS:IRNI_NexusSupport", version>=1.14
     62#include "IR2_PanelCntrlProcs", version>=1.53
     63#include "IRNI_NexusSupport", version>=1.14
    6364
    6465#if(IgorVersion()<9)    //no need to include, Igor 9 has this by default. 
  • trunk/User Procedures/Indra 2/Readme.txt

    r936 r946  
    1414_____________________________________________________________________________________
    15151.972 beta
    16 Added for every graph right click option to export as jpg and pxp. Also to duplicate, but that fails on some error bars fro now. 
     16DataBrowser - Igor 8 - dded Buttons to display w1 vs w2 and extract info from USAXS Folder name strings. Same tools are in Igor 9 right click.
     17Added for every graph right click option to export as jpg and pxp. Also to duplicate graph (which Igor does on ctrl/cmd-D) but with duplicate of all data in the graph. 1D graphs only.   
    1718
    1819
  • trunk/User Procedures/Irena/IR1_Loader.ipf

    r881 r946  
    22//#pragma rtGlobals=2           // Use modern global access method.
    33#pragma IgorVersion=7.05        //requires Igor version 7.00 or higher
    4 #pragma version=2.23
     4#pragma version=2.24
    55
    66//*************************************************************************\
     
    1010//*************************************************************************/
    1111
    12 //2.24 added IRB1_bioSAXS
     12//2.24 added IRB1_bioSAXS, removed absolute paths to these included files.
    1313//2.23 February 2020 release
    1414//2.22 added 3DSupportFunctions, February 2019
     
    4848
    4949//these should be all in /User Procedures/Irena folder
    50 #include ":IR1_CromerLiberman", version>=2.05                                           //cannot be rtG=1, runtime error in Cromer_Get_fp
    51 #include ":IR1_DataManipulation", version>=2.68
    52 #include ":IR1_Desmearing", version>=2.13
    53 #include ":IR1_EvaluationGraph", version>=2.11
    54 #include ":IR1_FormFactors", version>=2.29
    55 #include ":IR1_Fractals", version>=2.10
    56 #include ":IR1_ImportData", version>=2.40
    57 #include ":IR1_Main", version>=2.69
    58 #include ":IR1_PlotingToolI", version >=2.34
    59 #include ":IR1_PlotingToolI2", version >=2.24
    60 #include ":IR1_ScattContrast", version>=2.27
    61 #include ":IR1_Sizes", version>=2.31
    62 #include ":IR1_UnifiedFitFncts", version>=2.33
    63 #include ":IR1_UnifiedFitPanel", version>=2.26
    64 #include ":IR2_AnalyticalModels", version>=4.16
    65 #include ":IR2_DataExport", version>=1.13
    66 #include ":IR2_DataMiner", version >=1.13
    67 #include ":IR2_ModelingMain", version>=1.31
    68 #include ":IR2_ModelingSupport", version>=1.51
    69 #include ":IR2_PanelCntrlProcs", version>=1.53
    70 #include ":IR2_PlotingToolII", version>=1.1
    71 #include ":IR2_Reflectivity", version >=1.21
    72 #include ":IR2_ScriptingTool", version>=1.30
    73 #include ":IR2_SmallAngleDiffraction", version>=1.19
    74 #include ":IR2_StructureFactors", version>=1.07
    75 #include ":IR2_PDDF", version>=1.15
    76 #include ":IR3_3DModels", version>=1.01
    77 #include ":IR3_3DSupportFunctions", version>=1.00
    78 #include ":IR3_3DTwoPhaseSolid", version>=1.02
    79 #include ":IR3_Anisotropy", version>=1.00
    80 #include ":IR3_GuinierPorodModel", version>=1.11
    81 #include ":IR3_MergingData", version>=1.19
    82 #include ":IR3_MultiDataPlot", version>=1
    83 #include ":IR3_SimpleFits", version>=1.10
    84 #include ":IR3_WAXSDiffraction", version>=1.14
     50#include "IR1_CromerLiberman", version>=2.05                                            //cannot be rtG=1, runtime error in Cromer_Get_fp
     51#include "IR1_DataManipulation", version>=2.68
     52#include "IR1_Desmearing", version>=2.13
     53#include "IR1_EvaluationGraph", version>=2.11
     54#include "IR1_FormFactors", version>=2.29
     55#include "IR1_Fractals", version>=2.10
     56#include "IR1_ImportData", version>=2.40
     57#include "IR1_Main", version>=2.69
     58#include "IR1_PlotingToolI", version >=2.34
     59#include "IR1_PlotingToolI2", version >=2.24
     60#include "IR1_ScattContrast", version>=2.27
     61#include "IR1_Sizes", version>=2.31
     62#include "IR1_UnifiedFitFncts", version>=2.33
     63#include "IR1_UnifiedFitPanel", version>=2.26
     64#include "IR2_AnalyticalModels", version>=4.16
     65#include "IR2_DataExport", version>=1.13
     66#include "IR2_DataMiner", version >=1.13
     67#include "IR2_ModelingMain", version>=1.31
     68#include "IR2_ModelingSupport", version>=1.51
     69#include "IR2_PanelCntrlProcs", version>=1.53
     70#include "IR2_PlotingToolII", version>=1.1
     71#include "IR2_Reflectivity", version >=1.21
     72#include "IR2_ScriptingTool", version>=1.30
     73#include "IR2_SmallAngleDiffraction", version>=1.19
     74#include "IR2_StructureFactors", version>=1.07
     75#include "IR2_PDDF", version>=1.15
     76#include "IR3_3DModels", version>=1.01
     77#include "IR3_3DSupportFunctions", version>=1.00
     78#include "IR3_3DTwoPhaseSolid", version>=1.02
     79#include "IR3_Anisotropy", version>=1.00
     80#include "IR3_GuinierPorodModel", version>=1.11
     81#include "IR3_MergingData", version>=1.19
     82#include "IR3_MultiDataPlot", version>=1
     83#include "IR3_SimpleFits", version>=1.10
     84#include "IR3_WAXSDiffraction", version>=1.14
    8585
    86 #include ":IRB1_bioSAXS", version>=0.1
     86#include "IRB1_bioSAXS", version>=0.1
    8787
    8888//these are in different folders...
    89 #include "::CanSAS:cansasXML_GUI", version>=1.04
    90 #include "::CanSAS:cansasXML", version>=1.12
     89#include "cansasXML_GUI", version>=1.04
     90#include "cansasXML", version>=1.12
    9191
    92 #include "::Indra 2:IN2_GeneralProcedures", version>=2.20
     92#include "IN2_GeneralProcedures", version>=2.20
    9393
    94 #include "::CanSAS:IRNI_NexusSupport", version>=1.14
     94#include "IRNI_NexusSupport", version>=1.14
    9595
    9696
  • trunk/User Procedures/Irena/Modification history.txt

    r936 r946  
    1212********************************************
    13132.262 (beta)
    14 Added for every graph right click option to export as jpg and pxp. Also to duplicate, but that fails on some error bars fro now. 
     14DataBrowser - Igor 8 - dded Buttons to display w1 vs w2 and extract info from USAXS Folder name strings. Same tools are in Igor 9 right click.
     15Added for every graph right click option to export as jpg and pxp. Also to duplicate graph (which Igor does on ctrl/cmd-D) but with duplicate of all data in the graph. 1D graphs only.   
    1516WAXS - changed how JCPDS cards are named (using chemical name or formula+PDF number) + enabled long name support for Igor 8 and when user chooses.
    1617WAXS - added "Distance correction" for sticks. Tweaks calculated 2Theta angle using distance ratio correction. 
  • trunk/User Procedures/Nika/Modification history.txt

    r936 r946  
    1414********************************************
    15151.822 beta
    16 Added for every graph right click option to export as jpg and pxp. Also to duplicate, but that fails on some error bars fro now. 
     16DataBrowser - Igor 8 - dded Buttons to display w1 vs w2 and extract info from USAXS Folder name strings. Same tools are in Igor 9 right click.
     17Added for every graph right click option to export as jpg and pxp. Also to duplicate graph (which Igor does on ctrl/cmd-D) but with duplicate of all data in the graph. 1D graphs only.   
    1718Main panel - change sorting option "_001". This will now look from the end of name for first number. This si to help with NSLS samples names MyName_00001_waxs.ext etc. Will work for normal files Myname_0001.ext also.
    1819Attempt to fix NXcanSAS data importer. WIP, no data to test against.
  • trunk/User Procedures/Nika/NI1_loader.ipf

    r865 r946  
    11#pragma rtGlobals=3             // Use modern global access method.
    22//#pragma rtGlobals=1           // Use modern global access method.
    3 #pragma IgorVersion=7   .05     //requires Igor version 7.05 or higher
    4 #pragma version=1.80
     3#pragma IgorVersion=7.05        //requires Igor version 7.05 or higher
     4#pragma version=1.802
    55
    66
     
    1515//      1.80 February 2020 release
    1616
    17 #include ":NI1_BeamCenterUtils",version>=2.29
    18 #include ":NI1_ConvProc", version>=2.69
    19 #include ":NI1_DNDCATsupport",version>=1.12
    20 #include ":NI1_FileLoaders",version>=2.51
    21 #include ":NI1_FITSLoader",version>=2.17
    22 #include ":NI1_HDF5Browser",version>=1.01
    23 #include ":NI1_InstrumentSupport",version>=1.22
    24 #include ":NI1_LineProfile", version>=2.07
    25 #include ":NI1_Main", version>=1.82
    26 #include ":NI1_MainPanel", version>=2.68
    27 #include ":NI1_mask", version>=1.29
    28 #include ":NI1_pix2Dsensitivity",version>=1.07
    29 #include ":NI1_SaveRecallConfig", version>=1.03
    30 #include ":NI1_SquareMatrix", version>=1.04
    31 #include ":NI1_USAXSSupport",version>=1.51
    32 #include ":NI1_WinView",version>=1.87
     17#include "NI1_BeamCenterUtils",version>=2.29
     18#include "NI1_ConvProc", version>=2.69
     19#include "NI1_DNDCATsupport",version>=1.12
     20#include "NI1_FileLoaders",version>=2.51
     21#include "NI1_FITSLoader",version>=2.17
     22#include "NI1_HDF5Browser",version>=1.01
     23#include "NI1_InstrumentSupport",version>=1.22
     24#include "NI1_LineProfile", version>=2.07
     25#include "NI1_Main", version>=1.82
     26#include "NI1_MainPanel", version>=2.68
     27#include "NI1_mask", version>=1.29
     28#include "NI1_pix2Dsensitivity",version>=1.07
     29#include "NI1_SaveRecallConfig", version>=1.03
     30#include "NI1_SquareMatrix", version>=1.04
     31#include "NI1_USAXSSupport",version>=1.51
     32#include "NI1_WinView",version>=1.87
    3333
    34 #include "::Indra 2:IN2_GeneralProcedures", version>=2.20
     34#include "IN2_GeneralProcedures", version>=2.20
    3535
    36 #include "::CanSAS:IRNI_NexusSupport", version>=1.14
     36#include "IRNI_NexusSupport", version>=1.14
    3737
    3838//#include ":NI1_LineProfCalcs",version>=2.12
Note: See TracChangeset for help on using the changeset viewer.