Changeset 853


Ignore:
Timestamp:
Feb 8, 2020 8:51:23 PM (21 months ago)
Author:
ilavsky
Message:

February 2020 release, submit changes 1

Location:
trunk/User Procedures
Files:
8 edited

Legend:

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

    r852 r853  
    1818//Strconstant ManualVersionString = "en/1.4/"                                   //1.4 is December2018 release
    1919      //For development version uncomment next line, it points to latest (development) version of manuals:
    20 Strconstant ManualVersionString = "en/latest/"
     20Strconstant ManualVersionString = "en/1.4.1/"
    2121strconstant strConstVerCheckwwwAddress="http://usaxs.xray.aps.anl.gov/staff/ilavsky/IrenaNikaRecords/VersionCheck.php?"
    2222//strconstant strConstVerCheckwwwAddress="https://usaxs.xray.aps.anl.gov/staff/jan-ilavsky/IrenaNikaRecords/VersionCheck.php?"
  • trunk/User Procedures/Indra 2/IN2_USAXS.ipf

    r840 r853  
    66#pragma version = 1.97
    77
    8 constant CurrentIndraVersionNumber = 1.96
     8constant CurrentIndraVersionNumber = 1.97
    99//*************************************************************************\
    1010//* Copyright (c) 2005 - 2019, Argonne National Laboratory
     
    1414
    1515//1.97  Add print in history which version has compiled, Useful info later when debugging.
    16 //                      attempt to set automatically Qmin for the data.
     16//                      attempt to set automatically Qmin for the data. Increase default number of points to 500
    1717//1.96   December 2018 release. Updtaes 64 bit OSX xops.
    1818//1.95  Igor 8 release, ongoing fixes for USAXS software changes. Modified behavior of Automatic blank selection in GUI.
  • trunk/User Procedures/Indra 2/Readme.txt

    r805 r853  
    1313Modification history:
    1414_____________________________________________________________________________________
    15 1.97 beta 2 - 5/22/2019
     151.97 2/9/2020
    1616Many tools - changed code compiler instruction to rtGLobals=3, this is less forgiving compile which prevents more accidental bugs, but may generate new errors in old code. Report as many errors as possible to author, please. 
    1717Added ability of Flyscanniong data reduction to guess minimum useable q for data reduction. Based on intensity ratio between sample and blank - note, it is q dependent ratio. Black magic. 
     18Changed default number of USAXS points to 500, seems reasonable now.
    1819
    1920
  • trunk/User Procedures/Irena/IR1_Main.ipf

    r849 r853  
    196196        SubMenu "3D Models"
    197197                "Mass Fractal Aggregate", IR3A_MassFractalAggregate()
    198                 "Two Phase Solids", IR3T_TwoPhaseSystem()
    199                 "Display 3D data", IR3A_Display3DData()
    200                 "Import POV or PDB", IR3P_ImportPOVPDB()
     198                //"Two Phase Solids", IR3T_TwoPhaseSystem()
     199                //"Display 3D data", IR3A_Display3DData()
     200                //"Import POV or PDB", IR3P_ImportPOVPDB()
    201201        end
    202202        SubMenu "Anisotropy"
  • trunk/User Procedures/Irena/Modification history.txt

    r808 r853  
    1111Modification history:
    1212********************************************
    13 2.69 - beta 2 - 5/22/2019
     132.69 2/9/2020
    14143D models - added new set of tools : 3DAggregate, 2PhaseSolid and support for import of data from SAXSMorph (POV) and ATSAS (PDB) for visualization
     15Due to verification issues, SAXSMorph code in release version of Irena is disabled. use Master version if you want to test the code.
    1516Many tools - changed code compiler instruction to rtGLobals=3, this is less forgiving compile which prevents more accidental bugs, but may generate new errors in old code. Report as many errors as possible to author, please. 
    1617Scripting tool - added save individual Populations data when running from Scripting tool.
  • trunk/User Procedures/Irena/ReadMe.txt

    r6 r853  
    1 Small-angle scattering modeling package for IgorPro 6.22
     1Small-angle scattering modeling package
    22
    3 "Irena", version 2, release 2.48
    43
    5 Date: 8/13/2012
     4"Irena"
    65
    7 Jan Ilavsky, ilavsky@aps.anl.gov
    8 
    9 These macros were written to aid our USAXS users in evaluation of small-angle scattering data. The package is, however, written as independent program, useful for evaluation and modeling of small-angle X-ray and neutron scattering in general.
    10 
    11 These macros are written for IgorPro, version 6 (Wavemetrics inc., www.wavemetrics.com). The code should work on both PC and Mac platforms.
    12 
    13 What this code should do:
    14 Read the manual, the list is getting too long...
    15 
    16 Distribution:
    17 Distributed as zip file or installation Igor experiment.
    18 
    19 Both distributions contain same Igor procedures, manual in pdf format and examples...
    20 
    21 For zip file usersÉ You should have one zip file with number of files. The zip file contains the paths, which show where the files belong with respect to "Igor Pro Folder". Placement of the files is important, please, make sure the right files are where indicated. Generally there is one file which belong into the "Igor Procedures" and all other belong into subfolder into the "User Procedures".
    22 
    23 Appropriate use:
    24 This code is free for use in open science by anyone. If you would like to use this code for proprietary work, please contact me: ilavsky@aps.anl.gov with respect to permission for the use of these macros.
    25 
    26 Warranties:
    27 I make no warranties with respect to functionality of these macros. I will make every attempt to make sure these macros work properly and will attempt to fix any bugs reported to me. I will attempt to provide reasonable support to users of this software. However, I make no guarantees that I will be able to do so...
     6Check web site: https://usaxs.xray.aps.anl.gov/software-description
    287
    298
    309
    3110
     11
  • trunk/User Procedures/Nika/Modification history.txt

    r816 r853  
    1313Modification history:
    1414********************************************
    15 1.82 beta 2 - 5/22/2019
     151.82 - 2/9/2020
    1616Many tools - changed code compiler instruction to rtGLobals=3, this is less forgiving compile which prevents more accidental bugs, but may generate new errors in old code. Report as many errors as possible to author, please.
    1717Main code - added Batch processing - this prevents display of images and all graphing updates. Speeds up code by 2-3x in my testing. Added info window when in use and comments in History since else it looks like Nika hangs. 
  • trunk/User Procedures/Nika/NI1_Main.ipf

    r848 r853  
    77//DO NOT renumber Main files every time, these are main release numbers...
    88
    9 constant CurrentNikaVersionNumber = 1.81
     9constant CurrentNikaVersionNumber = 1.82
    1010constant FixBackgroundOversubScale=1.05                 //this is used to fix oversubtracted background. Adds FixBackgroundOversubScale*abs(V_min) to all intensity value.
    1111constant NikaNumberOfQCirclesDisp=15
     
    1616//*************************************************************************/
    1717
    18 //1.82  April 1 BETA release, rtGLolab=3 forced for all
     18//1.82  rtGLolab=3 forced for all
    1919//                      Added support for 12ID-C data.
    2020//                      Add print in history which version has compiled, Useful info later when debugging.
Note: See TracChangeset for help on using the changeset viewer.