-
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.
Prepare September2020 release.
- Loading branch information
Showing
23 changed files
with
161 additions
and
117 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
Binary file not shown.
Binary file not shown.
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,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. | ||
|
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,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 | ||
|
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
Oops, something went wrong.