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

maintenance release: pshell import, elog, documentation

Browse Source 
* bugfixes in pshell import
* updates to elog interface: templates, login, separate persistent and volatile data
* new header and revision information in documentation
This commit is contained in:
muntwiler_m
2016-06-03 12:06:04 +02:00
parent 724c73ef19
commit 02709fd4df
11 changed files with 740 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -637,6 +637,7 @@ function /s psh5_load_scan_preview(fileID, scanpath, [set_scale])
string datasets = psh5_list_scan_datasets(fileID, scanpath)
string datasetname = ""
variable index
// todo: this should be generalized
if (strsearch(datasets, "ScientaImage", 0) >= 0)
datasetname = "ScientaImage"
@ -644,17 +645,24 @@ function /s psh5_load_scan_preview(fileID, scanpath, [set_scale])
datasetname = "ScientaSpectrum"
elseif (strsearch(datasets, "ScientaEnergyDistribution", 0) >= 0)
datasetname = "ScientaEnergyDistribution"
elseif (strsearch(datasets, "ImageEnergyDistribution", 0) >= 0)
datasetname = "ImageEnergyDistribution"
elseif (strsearch(datasets, "Counts", 0) >= 0)
datasetname = "Counts"
elseif (strsearch(datasets, "SampleCurrent", 0) >= 0)
datasetname = "SampleCurrent"
else
datasetname = StringFromList(0, datasets)
index = ItemsInList(datasetname, "/") - 1
datasetname = StringFromList(index, datasetname, "/")
endif
if (strlen(datasetname) == 0)
return ""
endif
string datasetpath
datasetpath = scanpath + "/" + datasetname
datasetpath = ReplaceString("//", datasetpath, "/")
STRUCT HDF5DataInfo di // Defined in HDF5 Browser.ipf.
InitHDF5DataInfo(di)
variable err = HDF5DatasetInfo(fileID, datasetpath, 0, di)
@ -667,6 +675,10 @@ function /s psh5_load_scan_preview(fileID, scanpath, [set_scale])
if (di.ndims < 3)
HDF5LoadData /O /Q /Z fileID, datasetpath
dataname = StringFromList(0, S_waveNames)
wave /z data = $dataname
if (waveexists(data))
ps_set_dimlabels(data)
endif
else
variable dim2start = 0
variable dim2count = 1
@ -1000,10 +1012,12 @@ function ps_set_dimlabels(data)
setdimlabel 0, -1, $kEnergyDimLabel, data
break
case "ImageAngleDistribution":
case "ScientaAngleDistribution":
setdimlabel 0, -1, $kScanDimLabel, data
setdimlabel 1, -1, $kAngleDimLabel, data
break
case "ImageEnergyDistribution":
case "ScientaEnergyDistribution":
setdimlabel 0, -1, $kScanDimLabel, data
setdimlabel 1, -1, $kEnergyDimLabel, data
break