-
Notifications
You must be signed in to change notification settings - Fork 9
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Beta versions of Irena 2.65, Indra 1.93 and Nika 1.78
Beta versions of Irena 2.65, Indra 1.93 and Nika 1.78. Code
- Loading branch information
Showing
10 changed files
with
87 additions
and
76 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,17 +1,17 @@ | ||
#pragma rtGlobals=1 // Use modern global access method. | ||
#pragma IgorVersion=7.05 //requires Igor version 7.05 or higher | ||
#pragma version = 1.92 | ||
|
||
#pragma version = 1.93 | ||
|
||
constant CurrentIndraVersionNumber = 1.93 | ||
//*************************************************************************\ | ||
//* Copyright (c) 2005 - 2017, Argonne National Laboratory | ||
//* This file is distributed subject to a Software License Agreement found | ||
//* in the file LICENSE that is included with this distribution. | ||
//*************************************************************************/ | ||
|
||
|
||
// Promoted requriements to 7.05 due to bug in HDF5 support at lower versions | ||
// added resize after recreating of the panels to prior user size. | ||
//1.93 Promoted requriements to 7.05 due to bug in HDF5 support at lower versions | ||
// added resize after recreating of the panels to prior user size. | ||
//1.92 is Igor 7 only release 5/1/2017 | ||
//1.91 is minor patch for Igor 6 on May 2017 | ||
//1.90 use Indra release numbers here, #pragma IgorVersion=7.00 | ||
|
@@ -475,7 +475,7 @@ Function IN2_AboutPanel() | |
DrawText 10,37,"Indra 2 macros for Igor Pro 7" | ||
SetDrawEnv fsize= 16,textrgb= (16384,28160,65280) | ||
DrawText 52,64,"@ Jan Ilavsky, 2017" | ||
DrawText 49,103,"release 1.92 from 5/1/2017" | ||
DrawText 49,103,"release "+num2str(CurrentIndraVersionNumber) | ||
DrawText 11,136,"To get help please contact: [email protected]" | ||
DrawText 11,156,"http://usaxs.xray.aps.anl.gov/" | ||
end | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,14 +1,17 @@ | ||
Read me for Indra2 - USAXS - data reduction macros. | ||
Indra2 - USAXS - data reduction macros. | ||
|
||
Modification history | ||
|
||
Jan Ilavsky, [email protected] | ||
************************************ | ||
|
||
This set of macros is developed for evaluation of USAXS data obtained on APS USAXS instrument beamline instrument. It runs on Wavemetrics Igor Pro version 6 and higher. | ||
This set of macros is developed for evaluation of USAXS data obtained on APS USAXS instrument beamline instrument. It runs on Wavemetrics Igor Pro version 7.05 and higher. | ||
|
||
|
||
Revision history: | ||
_____________________________________________________________________________________ | ||
1.93 XYZ | ||
1.93 10/15/2017 | ||
Promoted required minimum version to 7.05 due to bug in Igor prior of this version. | ||
Added restore of prior size of panels when user closes and reopens a tool. Data stored in the current Igor experiment. Size limited to 50% width and 90% height. Hold down any modifier key and size will be reset to original default state. | ||
Added Desmearing to Data reduction as final step. Saves both SMR and DSM data. Contains much less choices as USAXS is reasonably stable and choices are known. May fail for border cases. | ||
Added UserSamplename string to each folder for long names. | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,23 +1,24 @@ | ||
#pragma rtGlobals=1 // Use modern global access method. | ||
#pragma version=2.64 | ||
#pragma version=2.65 | ||
#pragma IgorVersion=7.05 | ||
|
||
//DO NOT renumber Main files every time, these are main release numbers... | ||
|
||
|
||
//define manual date and release verison | ||
constant CurrentManualDateInSecs= 3567096688 //this is mod date for Manual version 2.62, Thursday, January 12, 2017 | ||
constant CurrentVersionNumber = 2.64 | ||
constant CurrentIrenaVersionNumber = 2.65 | ||
|
||
//*************************************************************************\ | ||
//* Copyright (c) 2005 - 2017, Argonne National Laboratory | ||
//* This file is distributed subject to a Software License Agreement found | ||
//* in the file LICENSE that is included with this distribution. | ||
//*************************************************************************/ | ||
|
||
// Promoted requriements to 7.05 due to bug in HDF5 support at lower versions | ||
//2.65 Promoted requriements to 7.05 due to bug in HDF5 support at lower versions | ||
// Added simple recording to my web site about version checking for statistical purposes. Records Irena version, Igor platform and version. | ||
// added resizing back to prior size of panel after user closes and opens the panel. | ||
// Removed most DoWIndows/K and repalced with KillWIndow and number of smaller changes. | ||
//2.64 Updated CheckForUpdate to check on Github for latest release version | ||
// #pragma IgorVersion=7.00 | ||
// removed Modeling I cocde (IR1S_ functions). Moved stuff around. | ||
|
@@ -356,7 +357,7 @@ Function IR2C_SendEMailBugReport() | |
else | ||
separator="%0A" | ||
endif | ||
url="mailto:[email protected]?subject=Irena ver "+num2str(CurrentVersionNumber)+" bug or user comment" | ||
url="mailto:[email protected]?subject=Irena ver "+num2str(CurrentIrenaVersionNumber)+" bug or user comment" | ||
url+="&body=The problem or bug occurred on "+separator | ||
url+="IgorInfo(0) = "+IgorInfo(0)+separator | ||
url+="IgorInfo(3) = "+IgorInfo(3)+separator+separator | ||
|
@@ -733,7 +734,7 @@ Function IR1_AboutPanel() | |
DrawText 23,30,"Irena macros for Igor Pro 7" | ||
SetDrawEnv fsize= 16,textrgb= (16384,28160,65280) | ||
DrawText 100,60,"@ ANL, 2017" | ||
DrawText 10,80,"release "+num2str(CurrentVersionNumber) | ||
DrawText 10,80,"release "+num2str(CurrentIrenaVersionNumber) | ||
DrawText 11,100,"To get help please contact: [email protected]" | ||
SetDrawEnv textrgb= (0,0,65535) | ||
DrawText 11,120,"http://usaxs.xray.aps.anl.gov/staff/ilavsky/irena.htm" | ||
|
@@ -1759,12 +1760,12 @@ Function IR2C_CheckIrenaUpdate(CalledFromMenu) | |
if(datetime - LastUpdateCheckIrena >30 * 24 * 60 * 60 || CalledFromMenu) | ||
//call check version procedure and advise user on citations | ||
IR2C_CheckVersions() | ||
IN2G_SubmitCheckRecordToWeb("Irena "+num2str(CurrentVersionNumber)) | ||
IN2G_SubmitCheckRecordToWeb("Irena "+num2str(CurrentIrenaVersionNumber)) | ||
LastUpdateCheckIrena = datetime | ||
IN2G_SaveIrenaGUIPackagePrefs(0) | ||
endif | ||
if (str2num(stringByKey("IGORVERS",IgorInfo(0)))<7.02) | ||
DoAlert /T="Igor update message :" 0, "Igor has been updated to version 7.02 or higher. Please, update your Igor to the latest version." | ||
if (str2num(stringByKey("IGORVERS",IgorInfo(0)))<7.05) | ||
DoAlert /T="Igor update message :" 0, "Igor has been updated to version 7.05 or higher. Please, update your Igor to the latest version." | ||
BrowseURL "http://www.wavemetrics.com/support/versions.htm" | ||
endif | ||
|
||
|
@@ -1790,13 +1791,6 @@ static Function IR2C_CheckVersions() | |
variable/g InstalledIrenaVersion | ||
variable/g WebIrenaVersion | ||
InstalledIrenaVersion = IN2G_FindFileVersion("Boot Irena1 modeling.ipf") | ||
//now get the web based version. | ||
//NewPath /O/Q TempPath (SpecialDirPath("temporary", 0, 0, 0 )) | ||
//download the file | ||
//variable InstallHadFatalError | ||
//InstallHadFatalError = IN2G_DownloadFile("IgorCode/Igor Procedures/Boot Irena1 modeling.ipf","TempPath", "Boot Irena1 modeling.ipf") | ||
//sleep/s 1 | ||
//Igor 7 version, using Github. | ||
WebIrenaVersion = IN2G_CheckForNewVersion("Irena") | ||
if(numtype(WebIrenaVersion)!=0) | ||
Print "Check for latest Irena version failed. Check your Internet connection. Try later again..." | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,15 @@ | ||
Irena package | ||
Code modification history | ||
|
||
Modification history | ||
|
||
Jan Ilavsky, [email protected] | ||
************************************ | ||
|
||
|
||
-latest stuff first | ||
******************************************** | ||
|
||
2.65 10/15/2017 | ||
Promoted required minimum version to 7.05 due to bug in Igor prior of this version. | ||
Added restore of prior size of panels when user closes and reopens a tool. Data stored in the current Igor experiment. Size limited to 50% width and 90% height. Hold down any modifier key and size will be reset to original default state. | ||
Merge two data sets - added option of sorting qrs names by xyz_string, needed for Nika. Added SMR and DSM data to USAXS. | ||
Modeling - added calculation of Rg for size distributions. Requested by Dale Schaefer. | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,15 @@ | ||
Nika package | ||
Code modification history | ||
|
||
Modification history | ||
|
||
Jan Ilavsky, [email protected] | ||
************************************ | ||
|
||
|
||
-latest stuff first | ||
******************************************** | ||
1.78 XYZ | ||
1.78 10/15/2017 | ||
Promoted required minimum version to 7.05 due to bug in Igor prior of this version. | ||
Added restore of prior size of panels when user closes and reopens a tool. Data stored in the current Igor experiment. Size limited to 50% width and 90% height. Hold down any modifier key and size will be reset to original default state. | ||
Added ColorTable to preferences, Saved every time color table is changed and restored as needed. Should change the Panel GUI and colors of graph, if exists. | ||
Modified folder name length - now each segments (_C, sectors, etc) will use longest possible part of the input file name, previously was limited to 17 characters. This allows longest user input names, but different directions may have different length of name allowed as the strings are different length. _C is shortest, in this case the length of name is about 29 characters. | ||
|
Oops, something went wrong.