pearl-public/igor-public
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

igor 8 compatibility

Browse Source
This commit is contained in:
muntwiler_m
2019-08-14 17:56:14 +02:00
parent 58135e4f4f
commit 6ab1cefec2
8 changed files with 339 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
pearl/pearl-pshell-import.ipf
View File

@ -2,6 +2,7 @@
#pragma IgorVersion = 6.36
#pragma ModuleName = PearlPShellImport
#include <HDF5 Browser>
#include "pearl-compat"
#include "pearl-gui-tools"
#include "pearl-area-import"
@ -83,7 +84,7 @@ strconstant kScientaScalingDatasets = "LensMode;ScientaChannelBegin;ScientaChann
strconstant kTransposedDatasets = "ScientaImage;"
/// multiply scienta detector intensity by this value to get actual counts.
constant kDetectorSensitivity = 4
constant kDetectorSensitivity = 1
/// open a HDF5 file created by the PShell data acquisition program and prepare the data folder.
///
@ -204,7 +205,7 @@ function /s psh5_load_complete(ANickName, APathName, AFileName, [load_data, load
sg = StringFromList(ig, s_scanpaths, ";")
folder = ReplaceString("/", sg, "")
folder = ReplaceString(" ", folder, "")
folder = CleanupName(folder, 0)
folder = PearlCleanupName(folder)
setdatafolder fileDF
newdatafolder /s /o $folder
psh5_load_scan_complete(fileID, sg, load_data=load_data, load_attr=load_attr)
@ -606,6 +607,9 @@ end
/// - Writables (ScanWritables)
/// - Readables (ScanReadables)
/// - Steps (ScanSteps)
/// - Iterations (ScanIterations) - if present (XPSSpectrum script)
/// - Step Size (ScanStepSize) - if present (XPSSpectrum script)
/// - Step Time (ScanStepTime) - if present (XPSSpectrum script)
///
/// if they are missing in the file, `ScanDimensions` and `ScanReadables` are set to default values
/// assuming the file contains a single spectrum.
@ -649,6 +653,20 @@ function /s psh5_load_scan_meta(fileID, scanpath)
endif
wavenames = ReplaceString(";;", wavenames, ";")
// additional attributes from XPSSpectrum.py
HDF5LoadData /O /Q /Z /A="Iterations" /N=ScanIterations /TYPE=1 fileID, scanpath
if (!v_flag)
wavenames = AddListItem(s_wavenames, wavenames, ";", inf)
endif
HDF5LoadData /O /Q /Z /A="Step Size" /N=ScanStepSize /TYPE=1 fileID, scanpath
if (!v_flag)
wavenames = AddListItem(s_wavenames, wavenames, ";", inf)
endif
HDF5LoadData /O /Q /Z /A="Step Time" /N=ScanStepTime /TYPE=1 fileID, scanpath
if (!v_flag)
wavenames = AddListItem(s_wavenames, wavenames, ";", inf)
endif
return wavenames
end
@ -1933,7 +1951,7 @@ function /s psh5_load_reduced(ANickName, APathName, AFileName, reduction_func, r
scanpath = StringFromList(ig, s_scanpaths)
folder = ReplaceString("/", scanpath, "")
folder = ReplaceString(" ", folder, "")
folder = CleanupName(folder, 0)
folder = PearlCleanupName(folder)
setdatafolder fileDF
newdatafolder /s /o $folder
dfref dataDF = GetDataFolderDFR()