September2020 release prep

Prepare September2020 release.
jilavsky · Sep 3, 2020 · 7340527 · 7340527
1 parent fcd8db0
commit 7340527
Show file tree

Hide file tree

Showing 23 changed files with 161 additions and 117 deletions.
diff --git a/Igor Procedures/Boot Indra2.ipf b/Igor Procedures/Boot Indra2.ipf
@@ -1,9 +1,9 @@
 #pragma rtGlobals=1		// Use modern global access method.
-#pragma version = 1.976
-#pragma IgorVersion=7.05
+#pragma version = 1.98
+#pragma IgorVersion=8.03
 
-//1.976  Beta version July2020 release. 
-//1.97 	February 2020 release. 
+//1.98   September2020 release. 
+//1.97   February 2020 release. 
 //1.96   December 2018, updates 64 bit OSX xops, changes and fixes for 2018-03 cycle and general improvements. 
 //1.95 	July 2018 release, first official Igor 8 release
 //1.94	Converted all procedure files to UTF8 to prevent text encoding issues. 

diff --git a/Igor Procedures/Boot Irena1 modeling.ipf b/Igor Procedures/Boot Irena1 modeling.ipf
@@ -1,8 +1,8 @@
 #pragma rtGlobals=1		// Use modern global access method.
-#pragma version = 2.696
-#pragma IgorVersion=7.05
+#pragma version = 2.70
+#pragma IgorVersion=8.03
 
-//2.695	Beta version July2020 release
+//2.70 	September2020 release
 //2.69		February 2020 release
 //2.68   December 2018,new 64 bit OSX xops. Data Merge improvements, many other fixes. 
 //2.67   July 2018 release, first official Igor 8 release

diff --git a/Igor Procedures/Boot Nika.ipf b/Igor Procedures/Boot Nika.ipf
@@ -1,8 +1,8 @@
 #pragma rtGlobals=1		// Use modern global access method.
-#pragma version = 1.826
-#pragma IgorVersion=7.05
+#pragma version = 1.83
+#pragma IgorVersion=8.03
 
-//1.826 	Beta version July2020 release
+//1.83 	September2020 release
 //1.82		February 2020 release. Maintenance, many small changes. 
 //1.81   December 2018. New OSX 64-bit xop version.  
 //1.80 	July 2018 release, first official Igor 8 release

diff --git a/InstallMessage.ifn b/InstallMessage.ifn
diff --git a/UpdateMessage.ifn b/UpdateMessage.ifn
diff --git a/User Procedures/Indra 2/IN2_GeneralProcedures.ipf b/User Procedures/Indra 2/IN2_GeneralProcedures.ipf
@@ -16,9 +16,9 @@ Constant TypicalPanelHorizontalSize = 350
 
    //For releases uncomment the next line and set to correct version number:
 //Strconstant ManualVersionString = "en/1.4/"					//1.4 is December2018 release
-//Strconstant ManualVersionString = "en/1.4.1/"				//this was for February2020 release. 
+Strconstant ManualVersionString = "en/1.5.1/"				//this was for September2020 release. 
    //For development version uncomment next line, it points to latest (development) version of manuals:
-Strconstant ManualVersionString = "en/latest/"		//this is for beta version, so it sees current version of manual. 
+//Strconstant ManualVersionString = "en/latest/"		//this is for beta version, so it sees current version of manual. 
 strconstant strConstVerCheckwwwAddress="https://usaxs.xray.aps.anl.gov/staff/jan-ilavsky/IrenaNikaRecords/VersionCheck.php?"
 		//this is probably useless... strconstant strConstVerCheckwwwAddress="http://usaxs.xray.aps.anl.gov/staff/ilavsky/IrenaNikaRecords/VersionCheck.php?"
 //constant useUserFileNames = 0			//this controls, if IN2G_ReturnUserSampleName(FolderPathToData) returns folder name (=0) or SmapleName (string, if exists, =1)

diff --git a/User Procedures/Indra 2/IN2_Load Indra 2.ipf b/User Procedures/Indra 2/IN2_Load Indra 2.ipf
@@ -1,15 +1,15 @@
 #pragma rtGlobals=3			// Use modern global access method.
 #pragma IgorVersion=8.03  	//requires Igor version 8.03 or higher
-#pragma version=1.976
+#pragma version=1.98
 
 
 //*************************************************************************\
-//* Copyright (c) 2005 - 2019, Argonne National Laboratory
+//* Copyright (c) 2005 - 2020, 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.976  Beta version July2020 release. 
+//1.98 September2020 release. 
 //1.97 February 2020 release. 
 //1.96 December 2018 release. 
 //1.95 July 2018 release
@@ -31,7 +31,7 @@
 // 1.74 update, Added new Crystal calculator, 15/1/2012
 
 //	Jan Ilavsky, [email protected], phone 630 252 0866
-//	These macros allow evaluation of data obatined on Bonse-Hartman camera at 15ID beamline at APS
+//	These macros allow evaluation of data obatined on Bonse-Hartman camera at 9ID beamline at APS
 //	The data are collected through spec program.
 //	Report any bugs promptly to me, I'll try to fix them ASAP
 //	The macros hould run fine on PC platform and with less ideal graphic on Mac platform too.
@@ -42,25 +42,25 @@
 //this is in Indra2 folder
 #include "IN2_ConversionProcedure", version>=1.10
 #include "IN2_DesktopUSAXS", version>=0.3
-#include "IN2_GeneralProcedures", version>=2.20
+#include "IN2_GeneralProcedures", version>=2.25
 #include "IN2_NotebookLogging", version>=1.10
 #include "IN2_PlottingTools", version>=1.14
 #include "IN2_SpecInput", version>=1.21
 #include "IN2_StandardPlots", version>=1.13
-#include "IN2_USAXS", version>=1.97
+#include "IN2_USAXS", version>=1.98
 #include "IN2_XtalCalculations", version>=1.1
 #include "IN3_CalcScattering", version>=1.01
-#include "IN3_Calculations", version>=1.41
+#include "IN3_Calculations", version>=1.42
 #include "IN3_FlyScan", version>=1.06
-#include "IN3_Main", version>=1.97
+#include "IN3_Main", version>=1.98
 #include "IN3_Rwave", version>=1
 #include "IN3_SupportFnct", version>=1.13
-#include "IN3_SamplePlate", version>=0.2
+#include "IN3_SamplePlate", version>=1.0
 #include "spec", version>=2.21
 //#include ":IN2_XtalCalculations", version>=1
 #include "IonChamber3.1", version>=3.1
 
-#include "IR2_PanelCntrlProcs", version>=1.53
+#include "IR2_PanelCntrlProcs", version>=1.61
 #include "IRNI_NexusSupport", version>=1.14
 
 #if(IgorVersion()<9)  	//no need to include, Igor 9 has this by default.  

diff --git a/User Procedures/Indra 2/IN2_USAXS.ipf b/User Procedures/Indra 2/IN2_USAXS.ipf
@@ -1,20 +1,21 @@
 #pragma TextEncoding = "UTF-8"
 #pragma rtGlobals=3			// Use modern global access method.
 #pragma IgorVersion=8.03   //requires Igor version 8.03 or higher
-#pragma version = 1.976
+#pragma version = 1.98
 
-constant CurrentIndraVersionNumber = 1.976
+constant CurrentIndraVersionNumber = 1.98
 //*************************************************************************\
 //* Copyright (c) 2005 - 2019, Argonne National Laboratory
 //* This file is distributed subject to a Software License Agreement found
 //* in the file LICENSE that is included with this distribution. 
 //*************************************************************************/
 
-//			require Igor 8.03, no testing for Igor 7 anymore. 
+//1.98		require Igor 8.03, no testing for Igor 7 anymore. 
+//			step scanning from BS still not fully supported, needs more developement. 
 //1.976 	Beta version after February2020 release
 //1.97 	Add print in history which version has compiled, Useful info later when debugging.
 //			attempt to set automatically Qmin for the data. Increase default number of points to 500
-//1.96   December 2018 release. Updtaes 64 bit OSX xops.
+//1.96   December 2018 release. Updates 64 bit OSX xops.
 //1.95 	Igor 8 release, ongoing fixes for USAXS software changes. Modified behavior of Automatic blank selection in GUI. 
 //1.94	Converted all procedure files to UTF8 to prevent text encoding issues. 
 //			Fixed Case spelling of USAXS Error data to SMR_Error and DSM_Error.
@@ -156,6 +157,8 @@ Menu "USAXS"
 	help={"Removes USAXS macros from current experiment"}
 
 
+	"Open Readme", IN2_OpenReadme()
+	help={"Open notes about recent changes in the code. "}
 	"About", IN2_AboutPanel()
 	help={"Information about the version"}
 end
@@ -261,6 +264,19 @@ Function IN3_UpdatePanelVersionNumber(panelName, CurentProcVersion)
 end
 //***********************************************************
 ////***********************************************************
+
+Function IN2_OpenReadme()
+	DoWIndow IndraReadme
+	if(V_Flag)
+		DoWIndow/F IndraReadme
+	else
+		string PathToReadMe= RemoveListItem(ItemsInList(FunctionPath("IN2_OpenReadme"),":")-1, FunctionPath("IN2_OpenReadme"), ":")
+		PathToReadMe = PathToReadMe+"Readme.txt"
+		OpenNotebook /K=1 /R /N=IndraReadme /ENCG=3 /W=(20,20,720,600) /Z PathToReadMe
+	endif
+end
+
+
 //Function IN3_PanelAppendSizeRecordNote(panelName)
 //	string panelName
 //	string PanelRecord=""

diff --git a/User Procedures/Indra 2/IN3_Main.ipf b/User Procedures/Indra 2/IN3_Main.ipf
@@ -1,6 +1,6 @@
 #pragma TextEncoding = "UTF-8"
 #pragma rtGlobals=3			// Use modern global access method.
-#pragma version = 1.976
+#pragma version = 1.98
 #pragma IgorVersion=7.05
 
 //DO NOT renumber Main files every time, these are main release numbers...
@@ -11,7 +11,7 @@
 //* in the file LICENSE that is included with this distribution. 
 //*************************************************************************/
 
-//1.976  Beta version July2020 release. 
+//1.98  September2020 release. 
 //1.97 February 2020, fix GUI for step scanning
 	//1.97 add controls if to remove vibrations or not, seems sometimes is not vibrations which causes less points to be recorded... 
 	//1.97 add is2DCollimated and fix sbFLyscan handling. few more fixes. 

diff --git a/User Procedures/Indra 2/IN3_SamplePlate.ipf b/User Procedures/Indra 2/IN3_SamplePlate.ipf
@@ -1,7 +1,7 @@
 #pragma TextEncoding = "UTF-8"
 #pragma rtGlobals=3				// Use modern global access method and strict wave access
 #pragma DefaultTab={3,20,4}		// Set default tab width in Igor Pro 9 and later
-#pragma version = 0.61
+#pragma version = 1.0
 #pragma IgorVersion=8.03
 
 
@@ -13,6 +13,7 @@
 
 //this is tool to setup Sample Plates for USAXS, survey sample positions, and generate Command files. 
 
+//1.0 September2020, first release. 
 //0.6 many fixes
 //0.4 developement, with beamline survey code... 
 

diff --git a/User Procedures/Indra 2/Readme.txt b/User Procedures/Indra 2/Readme.txt
@@ -1,4 +1,3 @@
-
 ****  I n d r a  *****
 
 USAXS - data reduction macros.
@@ -7,18 +6,18 @@ Jan Ilavsky, [email protected]
 
 ************************************
 This set of macros is developed for data reduction of USAXS data obtained on APS USAXS instrument beamline instrument. 
-It runs on Wavemetrics Igor Pro version 7.05 and higher.
+It runs on Wavemetrics Igor Pro version 8.03 and higher.
 
 
 Modification history:
 _____________________________________________________________________________________
-1.975 beta 
+1.98 9/3/2020
 Require Igor 8.03 or higher. 
 Added "Smart select Blank" for selection of Blank measured BEFORE the sample measurements. 
-DataBrowser - 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. 
+DataBrowser - Igor 8 - added Buttons to display w1 vs w2 and extract info from USAXS Folder name strings. Same tools are in Igor 9 right click. 
 Added 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.  
 Added new samplePlate tool for users to prepare command files.  
-
+Working on step scan data reduction from BlueSky, it is not tested yet. Needs another round of development of both data collection and code development. 
 
 
 1.97 2/9/2020

diff --git a/User Procedures/Irena/IR1_Loader.ipf b/User Procedures/Irena/IR1_Loader.ipf
@@ -1,14 +1,14 @@
 #pragma rtGlobals = 3	// Use strict wave reference mode and runtime bounds checking
-//#pragma rtGlobals=2		// Use modern global access method.
-#pragma IgorVersion=7.05 	//requires Igor version 7.00 or higher
-#pragma version=2.24
+#pragma IgorVersion=8.03 	//requires Igor version 8.03 or higher
+#pragma version=2.25
 
 //*************************************************************************\
 //* Copyright (c) 2005 - 2020, Argonne National Laboratory
 //* This file is distributed subject to a Software License Agreement found
 //* in the file LICENSE that is included with this distribution. 
 //*************************************************************************/
 
+//2.25 September2020 release
 //2.24 added IRB1_bioSAXS, removed absolute paths to these included files. 
 //2.23 February 2020 release
 //2.22 added 3DSupportFunctions, February 2019
@@ -47,26 +47,26 @@
 //this function loads the modeling of Distribution modeling macros...
 
 //these should be all in /User Procedures/Irena folder
-#include "IR1_CromerLiberman", version>=2.05						//cannot be rtG=1, runtime error in Cromer_Get_fp
-#include "IR1_DataManipulation", version>=2.68
+#include "IR1_CromerLiberman", version>=2.05		//cannot be rtG=1, runtime error in Cromer_Get_fp
+#include "IR1_DataManipulation", version>=2.70
 #include "IR1_Desmearing", version>=2.13
 #include "IR1_EvaluationGraph", version>=2.11
 #include "IR1_FormFactors", version>=2.29
-#include "IR1_Fractals", version>=2.10
+#include "IR1_Fractals", version>=2.11
 #include "IR1_ImportData", version>=2.40
-#include "IR1_Main", version>=2.69
+#include "IR1_Main", version>=2.70
 #include "IR1_PlotingToolI", version >=2.34
 #include "IR1_PlotingToolI2", version >=2.24
 #include "IR1_ScattContrast", version>=2.27
 #include "IR1_Sizes", version>=2.31
-#include "IR1_UnifiedFitFncts", version>=2.33
-#include "IR1_UnifiedFitPanel", version>=2.26
+#include "IR1_UnifiedFitFncts", version>=2.34
+#include "IR1_UnifiedFitPanel", version>=2.27
 #include "IR2_AnalyticalModels", version>=4.16
-#include "IR2_DataExport", version>=1.13
-#include "IR2_DataMiner", version >=1.13
-#include "IR2_ModelingMain", version>=1.31
+#include "IR2_DataExport", version>=1.14
+#include "IR2_DataMiner", version >=1.14
+#include "IR2_ModelingMain", version>=1.32
 #include "IR2_ModelingSupport", version>=1.51
-#include "IR2_PanelCntrlProcs", version>=1.53
+#include "IR2_PanelCntrlProcs", version>=1.61
 #include "IR2_PlotingToolII", version>=1.1
 #include "IR2_Reflectivity", version >=1.21
 #include "IR2_ScriptingTool", version>=1.30
@@ -78,19 +78,19 @@
 #include "IR3_3DTwoPhaseSolid", version>=1.02
 #include "IR3_Anisotropy", version>=1.00
 #include "IR3_GuinierPorodModel", version>=1.11
-#include "IR3_MergingData", version>=1.19
+#include "IR3_MergingData", version>=1.20
 #include "IR3_MultiDataPlot", version>=1
-#include "IR3_SimpleFits", version>=1.10
-#include "IR3_WAXSDiffraction", version>=1.14
+#include "IR3_SimpleFits", version>=1.11
+#include "IR3_WAXSDiffraction", version>=1.16
 
-#include "IRB1_bioSAXS", version>=0.1
-#include "IRB1_EvaluationTools", version>=0.5
+#include "IRB1_bioSAXS", version>=1
+#include "IRB1_EvaluationTools", version>=1.0
 
 //these are in different folders... 
 #include "cansasXML_GUI", version>=1.04
 #include "cansasXML", version>=1.12
 
-#include "IN2_GeneralProcedures", version>=2.20
+#include "IN2_GeneralProcedures", version>=2.25
 
 #include "IRNI_NexusSupport", version>=1.14
 

diff --git a/User Procedures/Irena/IR1_Main.ipf b/User Procedures/Irena/IR1_Main.ipf
@@ -1,19 +1,19 @@
 #pragma TextEncoding = "UTF-8"
 #pragma rtGlobals = 3	// Use strict wave reference mode and runtime bounds checking
-#pragma version=2.696
+#pragma version=2.70
 #pragma IgorVersion=8.03
 
 //DO NOT renumber Main files every time, these are main release numbers...
 //define manual date and release verison 
-constant CurrentIrenaVersionNumber = 2.696
+constant CurrentIrenaVersionNumber = 2.70
 
 //*************************************************************************\
 //* Copyright (c) 2005 - 2020, Argonne National Laboratory
 //* This file is distributed subject to a Software License Agreement found
 //* in the file LICENSE that is included with this distribution. 
 //*************************************************************************/
 
-//			Require Igor 8.03 and higher. No testing for Igor 7. 
+//2.70		Require Igor 8.03 and higher. No testing for Igor 7 anymore. 
 //2.696	Beta version after February2020 release
 //			New bioSAXS tools
 //			New Metadata Browser tool
@@ -234,6 +234,8 @@ Menu "SAS"
 		Submenu "Help, About, Manuals, Remove Irena"
 			"About", IR1_AboutPanel()
 			help={"Get Panel with info about this release of Irena macros"}
+			"Open Readme", IR1_OpenReadme()
+			help={"Open notes about recent changes in the code. "}
 			"Check for updates", IR2C_CheckIrenaUpdate(1)
 			help={"Run Check for update and present citations to use in publications"}	
 			"Check Igor display size", IN2G_CheckForGraphicsSetting(1)
@@ -381,7 +383,16 @@ end
 // further variables and strings can be added, but need to be added to control panel too...
 //	see example in : IR1_LogLogPlotU()  in this procedure file... 
 
-
+Function IR1_OpenReadme()
+	DoWIndow IrenaReadme
+	if(V_Flag)
+		DoWIndow/F IrenaReadme
+	else
+		string PathToReadMe= RemoveListItem(ItemsInList(FunctionPath("IR1_OpenReadme"),":")-1, FunctionPath("IR1_OpenReadme"), ":")
+		PathToReadMe = PathToReadMe+"Modification history.txt"
+		OpenNotebook /K=1 /R /N=IrenaReadme /ENCG=3 /W=(20,20,720,600) /Z PathToReadMe
+	endif
+end
 //***********************************************************
 //***********************************************************
 //*********************************************************** 

diff --git a/User Procedures/Irena/IR2_PDDF.ipf b/User Procedures/Irena/IR2_PDDF.ipf
@@ -861,19 +861,19 @@ Function IR2Pr_SelectAndCopyData()		//this function selects data to be used and
 
 
 
-	Duplicate/O $(DataFolderName+Intname), root:Packages:Irena_PDDF:IntensityOriginal			//here goes original Intensity
+	Duplicate/O $(DataFolderName+possiblyQuoteName(Intname)), root:Packages:Irena_PDDF:IntensityOriginal			//here goes original Intensity
 	Redimension/D root:Packages:Irena_PDDF:IntensityOriginal
-	Duplicate/O $(DataFolderName+Intname), root:Packages:Irena_PDDF:Intensity					//and its second copy, for fixing
+	Duplicate/O $(DataFolderName+possiblyQuoteName(Intname)), root:Packages:Irena_PDDF:Intensity					//and its second copy, for fixing
 	Redimension/D root:Packages:Irena_PDDF:Intensity
-	Duplicate/O $(DataFolderName+Qname), root:Packages:Irena_PDDF:Q_vec					//Q vector 
+	Duplicate/O $(DataFolderName+possiblyQuoteName(Qname)), root:Packages:Irena_PDDF:Q_vec					//Q vector 
 	Redimension/D root:Packages:Irena_PDDF:Q_vec
-	Duplicate/O $(DataFolderName+Qname), root:Packages:Irena_PDDF:Q_vecOriginal				//second copy of the Q vector
+	Duplicate/O $(DataFolderName+possiblyQuoteName(Qname)), root:Packages:Irena_PDDF:Q_vecOriginal				//second copy of the Q vector
 	Redimension/D root:Packages:Irena_PDDF:Q_vecOriginal
-	Wave/Z ErrorOrg=$(DataFolderName+Ename)
+	Wave/Z ErrorOrg=$(DataFolderName+possiblyQuoteName(Ename))
 	if(WaveExists(ErrorOrg))
-		Duplicate/O $(DataFolderName+Ename), root:Packages:Irena_PDDF:Errors						//errors
+		Duplicate/O $(DataFolderName+possiblyQuoteName(Ename)), root:Packages:Irena_PDDF:Errors						//errors
 		Redimension/D root:Packages:Irena_PDDF:Errors
-		Duplicate/O $(DataFolderName+Ename), root:Packages:Irena_PDDF:ErrorsOriginal
+		Duplicate/O $(DataFolderName+possiblyQuoteName(Ename)), root:Packages:Irena_PDDF:ErrorsOriginal
 		Redimension/D root:Packages:Irena_PDDF:ErrorsOriginal
 //		UseNoErrors = 0
 		UseUserErrors=1