Changeset 855


Ignore:
Timestamp:
Feb 10, 2020 8:57:31 PM (20 months ago)
Author:
ilavsky
Message:

Created Beta versions after February2020 (now using X.YZ1-9 numbers.
Set for desktop USAXS default use of Gauss peak profile fitting.

Location:
trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/Igor Procedures/Boot Indra2.ipf

    r854 r855  
    11#pragma rtGlobals=1             // Use modern global access method.
    2 #pragma version = 1.97
     2#pragma version = 1.971
    33#pragma IgorVersion=7.05
    44
     5//1.971  Beta version after Feburary2020 release.
    56//1.97  February 2020 release.
    67//1.96   December 2018, updates 64 bit OSX xops, changes and fixes for 2018-03 cycle and general improvements.
  • trunk/Igor Procedures/Boot Irena1 modeling.ipf

    r854 r855  
    11#pragma rtGlobals=1             // Use modern global access method.
    2 #pragma version = 2.69
     2#pragma version = 2.691
    33#pragma IgorVersion=7.05
    44
     5//2.691 Beta version after February2020 release
    56//2.69  February 2020 release
    67//2.68   December 2018,new 64 bit OSX xops. Data Merge improvements, many other fixes.
  • trunk/Igor Procedures/Boot Nika.ipf

    r854 r855  
    11#pragma rtGlobals=1             // Use modern global access method.
    2 #pragma version = 1.82
     2#pragma version = 1.821
    33#pragma IgorVersion=7.05
    44
    5 
     5//1.821         Beta version after February2020 release
    66//1.82  February 2020 release. Maintenance, many small changes.
    77//1.81   December 2018. New OSX 64-bit xop version. 
  • trunk/User Procedures/Indra 2/IN2_DesktopUSAXS.ipf

    r837 r855  
    10151015                NewNumPnts=200
    10161016        endif
     1017        //need to set Guass as fitting function:   
     1018        //Added for David Londono 2020-02-10
     1019        variable/g root:Packages:Indra3:UseGauss
     1020        variable/g root:Packages:Indra3:UseModifiedGauss
     1021        variable/g root:Packages:Indra3:UseLorenz
     1022        NewDataFolder/O root:Packages:Indra3
     1023        NVAR UseGauss = root:Packages:Indra3:UseGauss
     1024        NVAR UseModGauss = root:Packages:Indra3:UseModifiedGauss
     1025        NVAR UseLor = root:Packages:Indra3:UseLorenz
     1026        UseGauss = 1
     1027        UseModGauss = 0
     1028        UseLor = 0
     1029        //end of fix to use Gauss
    10171030        setDataFolder OldDf
    10181031end
  • trunk/User Procedures/Indra 2/IN2_GeneralProcedures.ipf

    r853 r855  
    1515Constant TypicalPanelHorizontalSize = 350
    1616
    17       //For releases uncomment the next line and set to correct version number:
     17   //For releases uncomment the next line and set to correct version number:
    1818//Strconstant ManualVersionString = "en/1.4/"                                   //1.4 is December2018 release
    19       //For development version uncomment next line, it points to latest (development) version of manuals:
    20 Strconstant ManualVersionString = "en/1.4.1/"
    21 strconstant strConstVerCheckwwwAddress="http://usaxs.xray.aps.anl.gov/staff/ilavsky/IrenaNikaRecords/VersionCheck.php?"
    22 //strconstant strConstVerCheckwwwAddress="https://usaxs.xray.aps.anl.gov/staff/jan-ilavsky/IrenaNikaRecords/VersionCheck.php?"
     19//Strconstant ManualVersionString = "en/1.4.1/"         //this was for February2020 release.
     20   //For development version uncomment next line, it points to latest (development) version of manuals:
     21Strconstant ManualVersionString = "en/latest/"          //thsi is for beta version, so it sees current version of manual.
     22strconstant strConstVerCheckwwwAddress="https://usaxs.xray.aps.anl.gov/staff/jan-ilavsky/IrenaNikaRecords/VersionCheck.php?"
     23                //this is probably useless... strconstant strConstVerCheckwwwAddress="http://usaxs.xray.aps.anl.gov/staff/ilavsky/IrenaNikaRecords/VersionCheck.php?"
    2324//constant useUserFileNames = 0                 //this controls, if IN2G_ReturnUserSampleName(FolderPathToData) returns folder name (=0) or SmapleName (string, if exists, =1)
    2425//replaced with root:Packages:IrenaConfigFolder:UseUserNameString
    25 //constant useIgor8LongNames = 1                //this controls if on Igor 8 we will use short or long name
    26 // replaced with root:Packages:IrenaConfigFolder:Igor8UseLongNames
    27 //will need to change this later when the hdf5.xop is updated to handle long names...
    2826// Names handling:
    2927//  IN2G_ReturnUserSampleName(FolderPathToData) returns name, either folder name or content of UserName string
  • trunk/User Procedures/Indra 2/IN2_USAXS.ipf

    r853 r855  
    11#pragma TextEncoding = "UTF-8"
    22#pragma rtGlobals=3                     // Use modern global access method.
    3 //#pragma rtGlobals=1           // Use modern global access method.
    4                    // Use modern global access method.
    53#pragma IgorVersion=7.05   //requires Igor version 7.05 or higher
    6 #pragma version = 1.97
    7 
    8 constant CurrentIndraVersionNumber = 1.97
     4#pragma version = 1.971
     5
     6constant CurrentIndraVersionNumber = 1.971
    97//*************************************************************************\
    108//* Copyright (c) 2005 - 2019, Argonne National Laboratory
     
    1311//*************************************************************************/
    1412
     13//1.971         Beta version after February2020 release
    1514//1.97  Add print in history which version has compiled, Useful info later when debugging.
    1615//                      attempt to set automatically Qmin for the data. Increase default number of points to 500
  • trunk/User Procedures/Irena/IR1_Main.ipf

    r853 r855  
    11#pragma TextEncoding = "UTF-8"
    22#pragma rtGlobals = 3   // Use strict wave reference mode and runtime bounds checking
    3 //#pragma rtGlobals=21  // Use modern global access method.
    4 #pragma version=2.69
     3#pragma version=2.691
    54#pragma IgorVersion=7.05
    65
    76//DO NOT renumber Main files every time, these are main release numbers...
    87//define manual date and release verison
    9 constant CurrentIrenaVersionNumber = 2.69
     8constant CurrentIrenaVersionNumber = 2.691
    109
    1110//*************************************************************************\
     
    1514//*************************************************************************/
    1615
     16
     17//2.691 Beta version after February2020 release
    1718//2.69  Removed 14 ipf files to reduce clutter.
    1819//                      Combined with IR1_CreateFldrStrctr.ipf, IR1_Functions.ipf
  • trunk/User Procedures/Nika/NI1_Main.ipf

    r853 r855  
    22#pragma rtGlobals=3             // Use modern global access method.
    33//#pragma rtGlobals=1           // Use modern global access method.
    4 #pragma version=1.82
     4#pragma version=1.821
    55#pragma IgorVersion=7.05
    66
    77//DO NOT renumber Main files every time, these are main release numbers...
    88
    9 constant CurrentNikaVersionNumber = 1.82
     9constant CurrentNikaVersionNumber = 1.821
    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.821         Beta version after February2020 release
    1819//1.82  rtGLolab=3 forced for all
    1920//                      Added support for 12ID-C data.
Note: See TracChangeset for help on using the changeset viewer.