From 678936b95b5083a21d9853e6ea7af9b5d9e10b6d Mon Sep 17 00:00:00 2001 From: Jan Ilavsky Date: Tue, 11 Apr 2023 15:20:39 -0500 Subject: [PATCH] April2023 Beta Release beta to fix IP9.02 AxisTransform change --- User Procedures/Indra 2/IN2_USAXS.ipf | 5 +++-- User Procedures/Irena/IR1_Main.ipf | 7 ++++--- User Procedures/Nika/.DS_Store | Bin 6148 -> 6148 bytes User Procedures/Nika/NI1_ConvProc.ipf | 15 ++++++++------- User Procedures/Nika/NI1_Main.ipf | 8 +++++--- 5 files changed, 20 insertions(+), 15 deletions(-) diff --git a/User Procedures/Indra 2/IN2_USAXS.ipf b/User Procedures/Indra 2/IN2_USAXS.ipf index 9cc3123..cc5de67 100644 --- a/User Procedures/Indra 2/IN2_USAXS.ipf +++ b/User Procedures/Indra 2/IN2_USAXS.ipf @@ -3,13 +3,14 @@ #pragma IgorVersion=8.04 //requires Igor version 8.03 or higher #pragma version = 1.99 -constant CurrentIndraVersionNumber = 1.991 +constant CurrentIndraVersionNumber = 1.992 //*************************************************************************\ //* Copyright (c) 2005 - 2022, Argonne National Laboratory //* This file is distributed subject to a Software License Agreement found //* in the file LICENSE that is included with this distribution. //*************************************************************************/ +// 1.992 - USAXS fixes for 20IDB operations. April2023Beta //1.99 October2021 release // Sample Survey tool // Step scanning in BlueSky and other associated changes. @@ -536,7 +537,7 @@ Function IN2_AboutPanel() SetDrawEnv fsize= 18,fstyle= 1,textrgb= (16384,28160,65280) DrawText 10,37,"Indra 2 macros for Igor Pro 8.04 & 9.x" SetDrawEnv fsize= 16,textrgb= (16384,28160,65280) - DrawText 52,64,"@ Jan Ilavsky, 2021" + DrawText 52,64,"@ Jan Ilavsky, 2023" DrawText 49,103,"release "+num2str(CurrentIndraVersionNumber) DrawText 11,136,"To get help please contact: ilavsky@aps.anl.gov" DrawText 11,156,"https://usaxs.xray.aps.anl.gov/" diff --git a/User Procedures/Irena/IR1_Main.ipf b/User Procedures/Irena/IR1_Main.ipf index e1502f3..b05c874 100644 --- a/User Procedures/Irena/IR1_Main.ipf +++ b/User Procedures/Irena/IR1_Main.ipf @@ -5,7 +5,7 @@ //DO NOT renumber Main files every time, these are main release numbers... //define manual date and release verison -constant CurrentIrenaVersionNumber = 2.712 //change version of Boot Irena1 modeling.ipf to get proper check version. +constant CurrentIrenaVersionNumber = 2.713 //change version of Boot Irena1 modeling.ipf to get proper check version. //************************************************************************* //* Copyright (c) 2005 - 2022, Argonne National Laboratory @@ -13,7 +13,8 @@ constant CurrentIrenaVersionNumber = 2.712 //change version of Boot Irena1 mode //* in the file LICENSE that is included with this distribution. //************************************************************************* -//2.711 Developement version, 2021/11 +//2.713 April2023Beta, minor changes +//2.711 Development version, 2021/11 // System specific models, added Hermans/UBG models for polymers. // //2.71 October 2021 release. @@ -885,7 +886,7 @@ Function IR1_AboutPanel() SetDrawEnv fsize= 20,fstyle= 1,textrgb= (16384,28160,65280) DrawText 23,30,"Irena macros for Igor Pro 8.04 & 9.x" SetDrawEnv fsize= 16,textrgb= (16384,28160,65280) - DrawText 100,60,"@ ANL, 2021" + DrawText 100,60,"@ ANL, 2023" DrawText 10,80,"release "+num2str(CurrentIrenaVersionNumber) DrawText 11,100,"To get help please contact: ilavsky@aps.anl.gov" SetDrawEnv textrgb= (0,0,65535) diff --git a/User Procedures/Nika/.DS_Store b/User Procedures/Nika/.DS_Store index 266823b16d7634664a9bc9fd76f14ec7f546e24d..9a709034457bc2db7fbd641c9012b2959b7f1f94 100644 GIT binary patch delta 58 zcmZoMXfc@J&&awlU^gQp>tr6LKuG}xKL$?*Lxy+;XNG)+Jccrc0EQwUD|zw;CiTs+ NOj)d(**X650|1uS4mbb+ delta 31 ncmZoMXfc@J&&aYdU^gQp%VZv=z|C`+vREfJIBaI;_{$Ffn^+0q diff --git a/User Procedures/Nika/NI1_ConvProc.ipf b/User Procedures/Nika/NI1_ConvProc.ipf index 1126294..0d9bf74 100755 --- a/User Procedures/Nika/NI1_ConvProc.ipf +++ b/User Procedures/Nika/NI1_ConvProc.ipf @@ -1,7 +1,7 @@ #pragma TextEncoding = "UTF-8" #pragma rtGlobals=3 // Use modern global access method. //#pragma rtGlobals=1 // Use modern global access method. -#pragma version=2.74 +#pragma version=2.75 #include //*************************************************************************\ @@ -10,6 +10,7 @@ //* in the file LICENSE that is included with this distribution. //*************************************************************************/ +//2.75 fix for TransformAxis1.2 Ticks change done at version 9.02 //2.74 ~2022 sometimes. // added ability to calculate transmission using semi transparent beamstop. // removed use of calibrated data, let's see if anyone complains. I do nto think there is any use for this. @@ -7071,21 +7072,21 @@ Function NI1U_UpdateQAxisInImage() string ImgRecreationStr=WinRecreation("CCDImageToConvertFig", 0 ) //and now we need to add the transform axes to the image - //this is woraround to change in TransforAxis1.2 starting with Igor 6.21 + //this is workaround to change in TransforAxis1.2 starting with Igor 9.02 -#if IgorVersion() >= 6.21 +#if IgorVersion() >= 9.02 if(stringmatch(ImgRecreationStr, "*MT_left*" )) - TicksForTransformAxis("CCDImageToConvertFig", "left", 7, 1, 5,"MT_left", 0,1) + TicksForTransformAxis("CCDImageToConvertFig", "left", 7, 1, 5,"MT_left", 0,1,0) endif if(stringmatch(ImgRecreationStr, "*MT_top*" )) - TicksForTransformAxis("CCDImageToConvertFig", "top", 7, 1, 5,"MT_top",0 ,1) + TicksForTransformAxis("CCDImageToConvertFig", "top", 7, 1, 5,"MT_top",0 ,1,0) endif #else if(stringmatch(ImgRecreationStr, "*MT_left*" )) - TicksForTransformAxis("CCDImageToConvertFig", "left", 7, 1, 5,"MT_left", 0) + TicksForTransformAxis("CCDImageToConvertFig", "left", 7, 1, 5,"MT_left", 0,1) endif if(stringmatch(ImgRecreationStr, "*MT_top*" )) - TicksForTransformAxis("CCDImageToConvertFig", "top", 7, 1, 5,"MT_top",0 ) + TicksForTransformAxis("CCDImageToConvertFig", "top", 7, 1, 5,"MT_top",0 ,1) endif #endif end diff --git a/User Procedures/Nika/NI1_Main.ipf b/User Procedures/Nika/NI1_Main.ipf index 864fe50..8fe5bf1 100755 --- a/User Procedures/Nika/NI1_Main.ipf +++ b/User Procedures/Nika/NI1_Main.ipf @@ -5,7 +5,7 @@ //DO NOT renumber Main files every time, these are main release numbers... -constant CurrentNikaVersionNumber = 1.842 +constant CurrentNikaVersionNumber = 1.843 constant FixBackgroundOversubScale=1.05 //this is used to fix oversubtracted background. Adds FixBackgroundOversubScale*abs(V_min) to all intensity value. constant NikaNumberOfQCirclesDisp=15 constant NikaLengthOfPathForPanelDisplay=100 @@ -16,7 +16,9 @@ constant NikaLengthOfPathForPanelDisplay=100 //*************************************************************************/ //1.85 Fix NI1_SetAllPathsInNIka which failed to setup properly very long paths. -//1.84 Ocotber2021 version +// 1.843 Fix IP9.02 issue with AxisTransform1.2 change. April2023Beta +// 1.842 February2023 Beta +//1.84 October2021 version // Fixes for some loaders where users found failures. //1.83 require Igor 8.03 now. Not testing Igor 7 anymore. // Improve NXcanSAS 2D calibrated data import for NSLS-SMI beamline. @@ -357,7 +359,7 @@ Function NI1_AboutPanel() SetDrawEnv fsize= 18,fstyle= 1,textrgb= (16384,28160,65280) DrawText 10,37,"Nika 1 macros for Igor Pro 8.04 & 9.x" SetDrawEnv fsize= 16,textrgb= (16384,28160,65280) - DrawText 52,64,"@ ANL, 2021" + DrawText 52,64,"@ ANL, 2023" DrawText 49,103,"Release "+num2str(CurrentNikaVersionNumber) DrawText 11,136,"To get help please contact: ilavsky@aps.anl.gov" DrawText 11,156,"https://usaxs.xray.aps.anl.gov/software-description"