bugfixes in pshell import and preview

changes: - fix null string exception in preview - fix transposition of two-dimensional datasets
bugfix release: pshell import and preview
2016-09-23 19:11:07 +02:00 · 2016-09-22 14:15:09 +02:00 · 2016-08-17 12:12:52 +02:00 · 2016-06-06 16:07:19 +02:00 · 2016-06-06 16:04:56 +02:00
6 changed files with 601 additions and 181 deletions
--- a/README.md
+++ b/README.md
@ -14,13 +14,15 @@ PEARL Procedures should be installed according to the regular Igor Pro guideline
 - Find the `HDF5.XOP` extension in the `Igor Pro Folder` under `More Extensions/File Loaders`, create a shortcut, and move the shortcut to the `Igor Extensions` folder next to your `User Procedures` folder.
 - Find the `HDF5 Help.ihf` next to `HDF5.XOP`, create a shortcut, and move the shortcut to the `Igor Help Files` folder next to your `User Procedures` folder.

+PEARL Procedures has been tested under Igor Pro version 6.37 (32-bit). Older versions (particularly prior to 6.34) may not be compatible. Please update to the latest Igor Pro version before reporting any problems.
+

 License
 =======

 The source code of PEARL Procedures is available under the [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0) at <https://git.psi.ch/pearl-public/igor-procs>.
-Users of PEARL Procedures are requested to coordinate and share the development of the code with the original author.
 Please read and respect the respective license agreements.
+Please share your extensions of the code with the original author.

 Author
 ------
@ -32,3 +34,12 @@ Copyright

 Copyright 2009-2016 by [Paul Scherrer Institut](http://www.psi.ch)

+
+Release Notes
+=============
+
+## rev-distro-1.1.1 
+
+- If you have upgraded PEARL Procedures from pre-1.1.1 and Igor breaks in pearl-elog.ipf while opening an experiment, please delete the ELOG preferences file `pearl-elog/preferences.pxp`. (Check the Igor Help to find the package preferences folder on your system.)
+
+
--- a/pearl/pearl-anglescan-process.ipf
+++ b/pearl/pearl-anglescan-process.ipf
@ -6,14 +6,14 @@
 #include "pearl-polar-coordinates"
 #include <New Polar Graphs>

-// $Id$
-//
-// copyright (c) 2013-15 Paul Scherrer Institut
+// copyright (c) 2013-16 Paul Scherrer Institut
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 //   you may not use this file except in compliance with the License.
 //   You may obtain a copy of the License at
 //   http:///www.apache.org/licenses/LICENSE-2.0
+//
+// Please acknowledge the use of this code.

 /// @file
 /// @brief processing and holographic mapping of angle scanned XPD data.
@ -64,7 +64,7 @@
 ///
 /// @author matthias muntwiler, matthias.muntwiler@psi.ch
 ///
-/// @copyright 2013-15 Paul Scherrer Institut @n
+/// @copyright 2013-16 Paul Scherrer Institut @n
 /// Licensed under the Apache License, Version 2.0 (the "License"); @n
 ///   you may not use this file except in compliance with the License. @n
 ///   You may obtain a copy of the License at
@ -79,15 +79,38 @@
 ///
 /// PearlAnglescanProcess is declared in @ref pearl-anglescan-process.ipf.

-/// @warning experimental
-function strip_remove_frames(strip, yscale, ylo, yhi)
-	wave strip // 2D data, X-axis = analyser angle, Y-axis = arbitrary manipulator scan
-	wave /z yscale // Y scaling, e.g. ManipulatorPhi
-		// if unassigned, point scaling is assumed
-	variable ylo
-	variable yhi

-	if (ylo > yhi)
+/// delete a contiguous range of frames from a strip.
+///
+/// this can be used to remove a region of bad frames due to, e.g., measurement problems.
+/// the function operates on 2D intensity data and manipulator coordinates at the same time.
+///
+/// @param[in,out]	strip			2D data, X-axis = analyser angle, Y-axis = arbitrary manipulator scan.
+///								the result is written to the original wave.
+///
+/// @param[in,out]	theta		1D data, manipulator scan.
+///								the result is written to the original wave.
+///
+/// @param[in,out]	tilt			1D data, manipulator scan.
+///								the result is written to the original wave.
+///
+/// @param[in,out]	phi			1D data, manipulator scan.
+///								the result is written to the original wave.
+///
+/// @param[in]		qlo			point index of first frame to delete.
+///
+/// @param[in]		qhi			point index of last frame to delete.
+///								qhi must be greater or equal than qlo.
+///
+function strip_delete_frames(strip, qlo, qhi, theta, tilt, phi)
+	wave strip // 2D data, X-axis = analyser angle, Y-axis = arbitrary manipulator scan
+	variable qlo
+	variable qhi
+	wave theta
+	wave tilt
+	wave phi
+	
+	if (qlo > qhi)
 		return -1
 	endif
 	
@ -95,8 +118,8 @@ function strip_remove_frames(strip, yscale, ylo, yhi)
 	variable snx = dimsize(strip, 0)
 	variable sny = dimsize(strip, 1)
 	variable sq1lo = 0
-	variable sq1hi = max(round((ylo - dimoffset(strip, 1)) / dimdelta(strip, 1)), 0)
-	variable sq2lo = min(round((ylo - dimoffset(strip, 1)) / dimdelta(strip, 1)), sny - 1)
+	variable sq1hi = max(qlo-1, 0)
+	variable sq2lo = min(qhi+1, sny - 1)
 	variable sq2hi = dimsize(strip, 1) - 1
 	
 	// dest indices
@ -111,10 +134,24 @@ function strip_remove_frames(strip, yscale, ylo, yhi)
 	
 	duplicate /free strip, strip_copy
 	redimension /n=(dnx,dny) strip
-	
 	strip[][dq1lo,dq1hi] = strip_copy[p][q + q1ofs]
 	strip[][dq2lo,dq2hi] = strip_copy[p][q + q2ofs]
 	
+	duplicate /free theta, theta_copy
+	redimension /n=(dny) theta
+	theta[dq1lo,dq1hi] = theta_copy[p + q1ofs]
+	theta[dq2lo,dq2hi] = theta_copy[p + q2ofs]
+	
+	duplicate /free tilt, tilt_copy
+	redimension /n=(dny) tilt
+	tilt[dq1lo,dq1hi] = tilt_copy[p + q1ofs]
+	tilt[dq2lo,dq2hi] = tilt_copy[p + q2ofs]
+	
+	duplicate /free phi, phi_copy
+	redimension /n=(dny) phi
+	phi[dq1lo,dq1hi] = phi_copy[p + q1ofs]
+	phi[dq2lo,dq2hi] = phi_copy[p + q2ofs]
+	
 	return 0
 end

@ -144,6 +181,7 @@ end
 /// @return if check waves are enabled, the following waves are created (overwritten if existing):
 /// @arg check_dist average X distribution
 /// @arg check_smoo smoothed distribution used to normalize the strip
+///
 function normalize_strip_x(strip, [smooth_method, smooth_factor, check])
 	wave strip
 	variable smooth_method
@ -233,6 +271,7 @@ end
 /// @return if check waves are enabled, the following waves are created (overwritten if existing):
 ///	@arg check_dist average theta distribution
 ///	@arg check_smoo smoothed distribution used to normalize the strip
+///
 function normalize_strip_theta(strip, theta, [theta_offset, smooth_method, smooth_factor, check])
 	wave strip
 	wave theta
@ -300,6 +339,70 @@ function normalize_strip_theta(strip, theta, [theta_offset, smooth_method, smoot
 	endif
 end

+/// divide the strip by a two-dimensional normalization function.
+///
+/// @warning experimental. this function is under development.
+///
+/// @param check enable output of intermediate results
+///	@arg 0 (default)  don't create additional waves
+/// 	@arg 1 create check waves in the current folder
+///	@arg 2 calculate check waves only, do not modify strip
+///
+/// @return if check waves are enabled, the following waves are created (overwritten if existing):
+///	@arg check_dist average theta distribution
+///	@arg check_smoo smoothed distribution used to normalize the strip
+///
+function normalize_strip_2d(strip, theta, [theta_offset, smooth_method, smooth_factor, check])
+	wave strip
+	wave theta
+	variable theta_offset
+	variable smooth_method
+	variable smooth_factor
+	variable check
+	
+	if (ParamIsDefault(check))
+		check = 0
+	endif
+	if (ParamIsDefault(theta_offset))
+		theta_offset = 0
+	endif
+	if (ParamIsDefault(smooth_method))
+		smooth_method = 4
+	endif
+	if (ParamIsDefault(smooth_factor))
+		smooth_factor = 0.5
+	endif
+
+	variable nx = dimsize(strip, 0)
+	variable ny = dimsize(strip, 1)
+	
+	duplicate /free strip, dist, alpha_int, theta_int
+	theta_int = theta[q] - theta_offset
+	alpha_int = dimoffset(strip, 0) + p * dimdelta(strip, 0)
+	redimension /n=(nx * ny) dist, alpha_int, theta_int
+	
+	switch(smooth_method)
+		case 4:
+			loess /dest=dist_smoo /smth=(smooth_factor) srcWave=dist, factors={alpha_int, theta_int}
+			redimension /n=(nx, ny) dist_smoo
+			break
+		default:
+			Abort "undefined smooth method"
+			break
+	endswitch
+	
+	// divide
+	if (check != 2)
+		strip /= dist_smoo
+	endif
+	
+	// check
+	if (check)
+		//duplicate /o dist, check_dist
+		duplicate /o dist_smoo, check_smoo
+	endif
+end
+
 /// crop a strip at the sides.
 ///
 /// the strip is cropped in place, data outside the region of interest is lost.
--- a/pearl/pearl-area-display.ipf
+++ b/pearl/pearl-area-display.ipf
@ -52,6 +52,25 @@
 /// PearlAreaDisplay is declared in @ref pearl-area-display.ipf.
 ///

+/// compose a valid and unique graph name from a data folder reference
+static function /s graphname_from_dfref(df, prefix)
+	dfref df
+	string prefix
+
+	string name
+
+	name = GetDataFolder(1, df)
+	name = ReplaceString("root:", name, "")
+	name = name[0, strlen(name) - 2]
+	name = ReplaceString(" ", name, "")
+	name = CleanupName(prefix + name, 0)
+	if (CheckName(name, 6))
+		name = UniqueName(name, 6, 0)
+	endif
+	
+	return name
+end
+
 /// open a new graph window with a 2D image.
 ///
 /// this is essentially <code>display; appendimage</code>.
@ -72,7 +91,7 @@ function /s ad_display(image)

 	string dfname = ReplaceString("root:", GetDataFolder(1, imagedf), "")
 	string graphtitle = dfname + " View"
-	string /g view_graphname = CleanupName("view_" + dfname, 0)
+	string /g view_graphname = graphname_from_dfref(imagedf, "view_")
 	svar graphname = view_graphname
 	display /k=1/n=$graphname as graphtitle
 	graphname = s_name
@ -104,7 +123,7 @@ function /s ad_display_histogram(image)

 	string dfname = ReplaceString("root:", GetDataFolder(1, imagedf), "")
 	string graphtitle = dfname + " Histogram"
-	string /g hist_graphname = CleanupName("hist_" + dfname, 0)
+	string /g hist_graphname = graphname_from_dfref(imagedf, "hist_")
 	svar graphname = hist_graphname
 	display /k=1/n=$graphname as graphtitle
 	graphname = s_name
@ -171,16 +190,15 @@ function /s ad_display_profiles(image, [filter])
 	duplicate /o image, $viewname /wave=view
 	make /n=(3,3)/o xprofiles // NX x 3 wave with 3 one-dimensional profiles along Y dimension
 	make /n=(3,3)/o yprofiles // NY x 3 wave with 3 one-dimensional profiles along X dimension
-	make /n=(1)/o hist // histogram
 	string /g view_filter
 	string /g view_filter_options
 	view_filter = filter
 	view_filter_options = ""
 	variable /g view_filter_smoothing_x = 1
 	variable /g view_filter_smoothing_y = 1
-	string dfname = GetDataFolder(0, imagedf)
-	string graphtitle = dfname + ":" + NameOfWave(image) + " Profiles"
-	string /g prof_graphname = CleanupName("prof_" + dfname, 0)
+	string dfname = ReplaceString("root:", GetDataFolder(1, imagedf), "")
+	string graphtitle = dfname + NameOfWave(image) + " Profiles"
+	string /g prof_graphname = graphname_from_dfref(imagedf, "prof_")
 	svar graphname = prof_graphname
 	variable /g graph_avg // average value in ROI (ROI is defined by the crosshairs A and B)
 	variable /g graph_min // minimum value in ROI
@ -193,16 +211,13 @@ function /s ad_display_profiles(image, [filter])
 	graphname = s_name
 	AppendToGraph /w=$graphname /L=xprofiles xprofiles[*][0],xprofiles[*][1],xprofiles[*][2]
 	AppendToGraph /w=$graphname /VERT/B=yprofiles yprofiles[*][0],yprofiles[*][1],yprofiles[*][2]
-	AppendToGraph /w=$graphname /R=hist/B=yprofiles hist
 	AppendImage /w=$graphname view
 	string imgname = StringFromList(0, ImageNameList(graphname, ";"))
 	ModifyImage /w=$graphname $imgname ctab= {*,*,BlueGreenOrange,0}
 	ModifyGraph /w=$graphname rgb(xprofiles)=(39168,0,0),rgb(yprofiles)=(39168,0,0)
 	ModifyGraph /w=$graphname rgb(xprofiles#1)=(0,26112,0),rgb(yprofiles#1)=(0,26112,0)
 	ModifyGraph /w=$graphname rgb(xprofiles#2)=(0,9472,39168),rgb(yprofiles#2)=(0,9472,39168)
-	ModifyGraph /w=$graphname rgb(hist)=(43520,43520,43520)
-	ModifyGraph /w=$graphname mode(hist)=5,hbFill(hist)=2
-	ModifyGraph /w=$graphname mirror(xprofiles)=0,mirror(bottom)=3,mirror(yprofiles)=3,mirror(left)=3
+	ModifyGraph /w=$graphname mirror(xprofiles)=2,mirror(bottom)=3,mirror(yprofiles)=2,mirror(left)=3
 	ModifyGraph /w=$graphname nticks=3
 	ModifyGraph /w=$graphname minor=1
 	ModifyGraph /w=$graphname axThick=0.5
@ -210,21 +225,33 @@ function /s ad_display_profiles(image, [filter])
 	ModifyGraph /w=$graphname btLen=4
 	ModifyGraph /w=$graphname freePos(xprofiles)=0
 	ModifyGraph /w=$graphname freePos(yprofiles)=0
-	ModifyGraph /w=$graphname freePos(hist)=0
 	ModifyGraph /w=$graphname axisEnab(xprofiles)={0.64,1}
-	ModifyGraph /w=$graphname axisEnab(hist)={0.64,1}
 	ModifyGraph /w=$graphname axisEnab(bottom)={0,0.6}
 	ModifyGraph /w=$graphname axisEnab(yprofiles)={0.64,1}
 	ModifyGraph /w=$graphname axisEnab(left)={0,0.6}
 	ModifyGraph /w=$graphname zero(left)=8
 	ModifyGraph /w=$graphname margin(left)=40,margin(bottom)=30,margin(top)=20,margin(right)=40
 	ModifyGraph /w=$graphname gfSize=10
-	Label /w=$graphname xprofiles "value (\\U)"
-	Label /w=$graphname bottom "X (\\U)"
-	Label /w=$graphname yprofiles "value (\\U)"
-	Label /w=$graphname left "Y (\\U)"
-	Label /w=$graphname hist "\\Epixels"
-	SetAxis /w=$graphname /A /E=1 hist
+
+	// axis labels	
+	string labels = note(image)
+	string lab
+	lab = StringByKey("AxisLabelX", labels, "=", "\r")
+	if (!strlen(lab))
+		lab = "X"
+	endif
+	Label /w=$graphname bottom lab + " (\\U)"
+	lab = StringByKey("AxisLabelY", labels, "=", "\r")
+	if (!strlen(lab))
+		lab = "Y"
+	endif
+	Label /w=$graphname left lab + " (\\U)"
+	lab = StringByKey("AxisLabelD", labels, "=", "\r")
+	if (!strlen(lab))
+		lab = "value"
+	endif
+	Label /w=$graphname xprofiles lab + " (\\U)"
+	Label /w=$graphname yprofiles lab + " (\\U)"
 	
 	// legend
 	if (show_legend)
@ -233,13 +260,18 @@ function /s ad_display_profiles(image, [filter])
 		AppendText /w=$graphname "\\s(xprofiles#2)\tROI average"
 		AppendText /w=$graphname "min\t\\{" + s_viewdf + "graph_min}"
 		AppendText /w=$graphname "max\t\\{" + s_viewdf + "graph_max}"
-		AppendText /w=$graphname "avg\t\\{" + s_viewdf + "graph_avg}"
 		AppendText /w=$graphname "sum\t\\{" + s_viewdf + "graph_sum}"
+		AppendText /w=$graphname "avg\t\\{" + s_viewdf + "graph_avg}"
 		AppendText /w=$graphname "sdev\t\\{" + s_viewdf + "graph_sdev}"
 	else
-		TextBox /w=$graphname /C/N=text_sum/F=0/B=1/X=1.00/Y=1.00 "sum \\{" + s_viewdf + "graph_sum}"
-		TextBox /w=$graphname /C/N=text_avg/F=0/B=1/X=1.00/Y=6.00 "avg \\{" + s_viewdf + "graph_avg}"
-		TextBox /w=$graphname /C/N=text_sdev/F=0/B=1/X=1.00/Y=11.00 "sdev \\{" + s_viewdf + "graph_sdev}"
+		TextBox /w=$graphname /C/N=text0 /F=0 /B=1 /X=1.00 /Y=1.00
+		lab = StringByKey("Dataset", labels, "=", "\r")
+		if (strlen(lab))
+			AppendText /w=$graphname lab
+		endif
+		AppendText /w=$graphname "sum\t\\{" + s_viewdf + "graph_sum}"
+		AppendText /w=$graphname "avg\t\\{" + s_viewdf + "graph_avg}"
+		AppendText /w=$graphname "sdev\t\\{" + s_viewdf + "graph_sdev}"
 	endif
 	
 	// interactive elements
@ -991,7 +1023,7 @@ function /s ad_display_brick(data)
 	setdatafolder viewdf
 	string dfname = ReplaceString("root:", s_datadf, "")
 	string graphtitle = dfname + " Gizmo"
-	string /g gizmo_graphname = CleanupName("giz_" + dfname, 0)
+	string /g gizmo_graphname = graphname_from_dfref(datadf, "giz_")
 	svar graphname = gizmo_graphname

 	if ((strlen(graphname) > 0) && (wintype(graphname) == 13))
@ -1116,12 +1148,31 @@ function ad_brick_slicer(data)
 	variable /g y_autoinc = 0
 	variable /g z_autoinc = 0

+	// axis labels	
+	string labels = note(data)
+	string xlabel = StringByKey("AxisLabelX", labels, "=", "\r")
+	if (!strlen(xlabel))
+		xlabel = "X"
+	endif
+	string ylabel = StringByKey("AxisLabelY", labels, "=", "\r")
+	if (!strlen(ylabel))
+		ylabel = "Y"
+	endif
+	string zlabel = StringByKey("AxisLabelZ", labels, "=", "\r")
+	if (!strlen(zlabel))
+		zlabel = "Z"
+	endif
+	string dlabel = StringByKey("Dataset", labels, "=", "\r")
+	if (!strlen(dlabel))
+		dlabel = NameOfWave(data)
+	endif
+	
 	// this section copied from slicer panel	
 	NewPanel /k=1 /W=(500,600,890,940) /N=SlicerPanel as "Brick Slicer"
 	string /g slicer_panelname = S_name
 	string panel = s_name

-	GroupBox g_xslice win=$panel,pos={8,8},size={376,96},title="X Slice"
+	GroupBox g_xslice win=$panel,pos={8,8},size={376,96},title=xlabel
 	Slider sl_xslice_position win=$panel,pos={16,32},size={240,56},proc=PearlAreaDisplay#slp_slice_position
 	Slider sl_xslice_position win=$panel,limits={0,100,1},variable=x_slice_pos,vert= 0
 	SetVariable sv_xslice_position win=$panel,pos={20,80},size={92,16},proc=PearlAreaDisplay#svp_slice_position,title="X"
@ -1141,7 +1192,7 @@ function ad_brick_slicer(data)
 	Button b_xslice_stop win=$panel,pos={336,48},size={20,20},proc=PearlAreaDisplay#bp_move_slice,title="\\W616"
 	Button b_xslice_stop win=$panel,help={"stop animation"}
 	
-	GroupBox g_yslice win=$panel,pos={8,108},size={376,96},title="Y Slice"
+	GroupBox g_yslice win=$panel,pos={8,108},size={376,96},title=ylabel
 	Slider sl_yslice_position win=$panel,pos={16,132},size={240,56},proc=PearlAreaDisplay#slp_slice_position
 	Slider sl_yslice_position win=$panel,limits={0,100,1},variable=y_slice_pos,vert= 0
 	SetVariable sv_yslice_position win=$panel,pos={20,180},size={92,16},proc=PearlAreaDisplay#svp_slice_position,title="Y"
@ -1161,7 +1212,7 @@ function ad_brick_slicer(data)
 	Button b_yslice_stop win=$panel,pos={336,148},size={20,20},proc=PearlAreaDisplay#bp_move_slice,title="\\W616"
 	Button b_yslice_stop win=$panel,help={"stop animation"}
 	
-	GroupBox g_zslice win=$panel,pos={8,208},size={376,96},title="Z Slice"
+	GroupBox g_zslice win=$panel,pos={8,208},size={376,96},title=zlabel
 	Slider sl_zslice_position win=$panel,pos={16,232},size={240,56},proc=PearlAreaDisplay#slp_slice_position
 	Slider sl_zslice_position win=$panel,limits={0,100,1},variable=z_slice_pos,vert= 0
 	SetVariable sv_zslice_position win=$panel,pos={20,280},size={92,16},proc=PearlAreaDisplay#svp_slice_position,title="Z"
@ -1181,7 +1232,7 @@ function ad_brick_slicer(data)
 	Button b_zslice_stop win=$panel,pos={336,248},size={20,20},proc=PearlAreaDisplay#bp_move_slice,title="\\W616"
 	Button b_zslice_stop win=$panel,help={"stop animation"}

-	TitleBox t_slicerpath win=$panel,pos={8,316},size={128,20},disable=2,title=GetDataFolder(1,viewdf)
+	TitleBox t_slicerpath win=$panel,pos={8,316},size={128,20},disable=2,title=dlabel
 	//SetVariable setvar0 win=$panel,pos={240,316},size={120,16},title="slab thickness"
 	//SetVariable setvar0 win=$panel,limits={1,inf,1},value=slab_thickness
 	
--- a/pearl/pearl-area-profiles.ipf
+++ b/pearl/pearl-area-profiles.ipf
@ -613,3 +613,36 @@ threadsafe function calc_y_profile_mins(image)
 		yminlocs[ix] = v_minloc
 	endfor
 end
+
+/// collect profiles from a multi-scan.
+///
+/// @warning experimental: name and interface of this function may change.
+///
+function ad_collect_multiscan_y(dataset, positions, destwave, [noavg])
+	wave dataset
+	wave positions
+	wave destwave
+	variable noavg
+	
+	variable tol = (wavemax(positions) - wavemin(positions)) / numpnts(positions) / 100
+	
+	duplicate /free positions, positions_sorted
+	sort positions_sorted, positions_sorted
+	duplicate /free positions_sorted, positions_diff
+	differentiate /p /meth=2 positions_sorted /d=positions_diff
+	positions_diff[0] = 1
+	extract /free positions_sorted, positions_unique, positions_diff > tol
+	variable n_unique = numpnts(positions_unique)
+	redimension /n=(dimsize(dataset, 0), n_unique) destwave
+	
+	variable i
+	variable nx, ny
+	for (i = 0; i < n_unique; i += 1)
+		extract /free dataset, data_extract, abs(positions[q] - positions_unique[i]) < tol
+		nx = dimsize(dataset, 0)
+		ny = dimsize(data_extract, 0) / nx
+		redimension /n=(nx, ny) data_extract
+		wave profile = ad_profile_x(data_extract, -inf, inf, "", noavg=noavg)
+		destwave[][i] = profile[p]
+	endfor
+end
--- a/pearl/pearl-data-explorer.ipf
+++ b/pearl/pearl-data-explorer.ipf
@ -759,18 +759,21 @@ static function /s show_preview_graph(data, [xdata])
 	svar s_profiles_graph
 	svar s_preview_file
 	svar s_preview_source
+	svar s_preview_trace_graph
+	
+	if ((strlen(s_profiles_graph) > 0) && (WinType(s_profiles_graph) == 1))
+		KillWindow $s_profiles_graph
+	endif
+	if ((strlen(s_preview_trace_graph) > 0) && (WinType(s_preview_trace_graph) == 1))
+		KillWindow $s_preview_trace_graph
+	endif

 	string graphname
 	if (wavedims(data) == 2)
-		if ((strlen(s_profiles_graph) > 0) && (WinType(s_profiles_graph) == 1))
-			ad_update_profiles(data)
-		else
-			s_profiles_graph = ad_display_profiles(data)
-			ModifyGraph /w=$s_profiles_graph /z wbRGB=(48640,56832,60160)
-		endif
+		s_profiles_graph = ad_display_profiles(data)
+		ModifyGraph /w=$s_profiles_graph /z wbRGB=(48640,56832,60160)
 		graphname = s_profiles_graph
 	elseif (wavedims(data) == 1)
-		svar s_preview_trace_graph
 		duplicate /o data, preview_trace
 		if (!ParamIsDefault(xdata))
 			duplicate /o xdata, preview_trace_x
@ -779,20 +782,8 @@ static function /s show_preview_graph(data, [xdata])
 			preview_trace_x = x
 			setscale d 0, 0, WaveUnits(data, 0), preview_trace_x
 		endif
-		if ((strlen(s_preview_trace_graph) == 0) || (WinType(s_preview_trace_graph) != 1))
-			display /n=pearl_explorer_1d /k=1 preview_trace vs preview_trace_x as "Preview"
-			s_preview_trace_graph = s_name
-			ModifyGraph /w=$s_preview_trace_graph wbRGB=(48640,56832,60160)
-			ModifyGraph /w=$s_preview_trace_graph rgb[0]=(0,0,0)
-			ModifyGraph /w=$s_preview_trace_graph grid=2
-			ModifyGraph /w=$s_preview_trace_graph mirror=1
-			ModifyGraph /w=$s_preview_trace_graph minor=1
-			ModifyGraph /w=$s_preview_trace_graph axThick=0.5
-			ModifyGraph /w=$s_preview_trace_graph gridRGB=(52224,52224,52224)
-			ModifyGraph /w=$s_preview_trace_graph gridHair=0
-			ModifyGraph /w=$s_preview_trace_graph tick=0
-			ModifyGraph /w=$s_preview_trace_graph btLen=4
-		endif
+		s_preview_trace_graph = display_preview_trace(preview_trace_x, preview_trace)
+		ModifyGraph /w=$s_preview_trace_graph wbRGB=(48640,56832,60160)
 		graphname = s_preview_trace_graph
 	else
 		return ""
@ -808,6 +799,39 @@ static function /s show_preview_graph(data, [xdata])
 	return graphname
 end

+static function /s display_preview_trace(xtrace, ytrace)
+	wave xtrace
+	wave ytrace
+	
+	display /n=pearl_explorer_1d /k=1 ytrace vs xtrace as "Preview"
+	string graphname = s_name
+	ModifyGraph /w=$graphname rgb[0]=(0,0,0)
+	ModifyGraph /w=$graphname grid=2
+	ModifyGraph /w=$graphname mirror=1
+	ModifyGraph /w=$graphname minor=1
+	ModifyGraph /w=$graphname axThick=0.5
+	ModifyGraph /w=$graphname gridRGB=(52224,52224,52224)
+	ModifyGraph /w=$graphname gridHair=0
+	ModifyGraph /w=$graphname tick=0
+	ModifyGraph /w=$graphname btLen=4
+	
+	// axis labels	
+	string labels = note(ytrace)
+	string lab
+	lab = StringByKey("AxisLabelX", labels, "=", "\r")
+	if (!strlen(lab))
+		lab = "X"
+	endif
+	Label /w=$graphname bottom lab + " (\\U)"
+	lab = StringByKey("AxisLabelD", labels, "=", "\r")
+	if (!strlen(lab))
+		lab = "value"
+	endif
+	Label /w=$graphname left lab + " (\\U)"
+	
+	return s_name
+end
+
 static function load_selected_files([options])
 	string options
 	
@ -1426,6 +1450,9 @@ static function bp_dataset_folder(ba) : ButtonControl
 				string cmd
 				sprintf cmd, "setdatafolder root:%s", PossiblyQuoteName(dataset)
 				execute /q /z cmd
+				cmd = "setdatafolder :scan1"
+				execute /q /z cmd
+				sprintf cmd, "setdatafolder %s", GetDataFolder(1)
 				print cmd
 			endif
 			break
--- a/pearl/pearl-pshell-import.ipf
+++ b/pearl/pearl-pshell-import.ipf
@ -1,5 +1,5 @@
 #pragma rtGlobals=3		// Use modern global access method and strict wave access.
-#pragma IgorVersion = 6.2
+#pragma IgorVersion = 6.36
 #pragma ModuleName = PearlPShellImport
 #pragma version = 1.02
 #include <HDF5 Browser>
@ -66,6 +66,15 @@ strconstant kScanDimLabel = "scan"
 /// This label may be used to store the parameters for the `setscale d` operation.
 strconstant kDataDimLabel = "data"

+/// List of preferred datasets to load for preview
+strconstant kPreviewDatasets = "ScientaImage;ScientaSpectrum;ImageAngleDistribution;ImageEnergyDistribution;Counts;SampleCurrent;"
+
+/// List of datasets that must be loaded to determine the axis scaling of a Scienta image
+strconstant kScientaScalingDatasets = "LensMode;ScientaChannelBegin;ScientaChannelEnd;ScientaSliceBegin;ScientaSliceEnd;"
+
+/// List of datasets that should be transposed upon loading
+strconstant kTransposedDatasets = "ScientaImage;"
+
 /// open a HDF5 file created by the PShell data acquisition program and prepare the data folder.
 ///
 /// the function opens a specified or interactively selected HDF5 file,
@ -183,7 +192,9 @@ function /s psh5_load_complete(ANickName, APathName, AFileName, [load_data, load
 		
 		for (ig = 0; ig < ng; ig += 1)
 			sg = StringFromList(ig, s_scanpaths, ";")
-			folder = CleanupName(ReplaceString("/", sg, ""), 0)
+			folder = ReplaceString("/", sg, "")
+			folder = ReplaceString(" ", folder, "")
+			folder = CleanupName(folder, 0)
 			setdatafolder fileDF
 			newdatafolder /s /o $folder
 			psh5_load_scan_complete(fileID, sg, load_data=load_data, load_attr=load_attr)
@ -219,14 +230,26 @@ end
 /// @param load_attr			1 (default): load attributes; 0: do not load attributes
 ///							note: for correct scaling of the image, the attributes need to be loaded
 ///
+/// @param pref_scans			semicolon-separated list of preferred scans.
+///							the items of the list are match strings for the Igor StringMatch function.
+///							the first matching scan (i.e. top-level HDF5 group with a matching name) is loaded from the file.
+///							if no match is found, the first scan is loaded.
+///
+/// @param pref_datasets		semicolon-separated list of preferred datasets.
+///							the items of the list are match strings for the Igor StringMatch function.
+///							the first matching dataset is loaded from the file.
+///							if no match is found, the first dataset listed in the file is loaded.
+///
 /// @return					name of loaded preview wave.
 ///
-function /s psh5_load_preview(ANickName, APathName, AFileName, [load_data, load_attr])
+function /s psh5_load_preview(ANickName, APathName, AFileName, [load_data, load_attr, pref_scans, pref_datasets])
 	string ANickName
 	string APathName
 	string AFileName
 	variable load_data
 	variable load_attr
+	string pref_scans
+	string pref_datasets
 		
 	if (ParamIsDefault(load_data))
 		load_data = 1
@ -234,6 +257,12 @@ function /s psh5_load_preview(ANickName, APathName, AFileName, [load_data, load_
 	if (ParamIsDefault(load_attr))
 		load_attr = 1
 	endif
+	if (ParamIsDefault(pref_scans))
+		pref_scans = "*scan1*;"
+	endif
+	if (ParamIsDefault(pref_datasets))
+		pref_datasets = ""
+	endif
 	
 	dfref saveDF = GetDataFolderDFR()
 	setdatafolder root:
@ -253,26 +282,53 @@ function /s psh5_load_preview(ANickName, APathName, AFileName, [load_data, load_
 	if (v_flag == 0)
 		AFileName = s_path + s_filename
 		dfref fileDF = GetDataFolderDFR()
+
 		scanpaths = psh5_list_scans(fileID)
+		variable ng = ItemsInList(scanpaths)
 		variable ig
 		string sg
-		ig = 0
-		sg = StringFromList(ig, scanpaths, ";")
-		dataname = psh5_load_scan_preview(fileID, sg, set_scale=load_attr)
+		variable np = ItemsInList(pref_scans)
+		variable ip
+		string sp
+		variable found = 0
+		if (ng > 0)
+			for (ip = 0; ip < np; ip += 1)
+				for (ig = 0; ig < ng; ig += 1)
+					sg = StringFromList(ig, scanpaths)
+					sp = StringFromList(ip, pref_scans)
+					if (StringMatch(sg, sp))
+						found = 1
+						break
+					endif
+				endfor
+				if (found)
+					break
+				endif
+			endfor
+			if (!found)
+				ig = 0
+			endif
+			sg = StringFromList(ig, scanpaths)
+			dataname = psh5_load_scan_preview(fileID, sg, set_scale=load_attr, pref_datasets=pref_datasets)

-		wave /z data = $dataname
-		string destpath = GetDataFolder(1, saveDF) + ANickName
-		if (waveexists(data))
-			duplicate /o data, $destpath
-			wave /z data = $destpath
-		endif
+			wave /z data = $dataname
+			string destpath = GetDataFolder(1, saveDF) + ANickName
+			if (waveexists(data))
+				duplicate /o data, $destpath
+				wave /z data = $destpath
+			else
+				print "no data found in file " + AFileName
+			endif

-		if (load_attr)
-			setdatafolder saveDF
-			newdatafolder /o/s attr
-			killwaves /a/z
-			psh5_load_scan_attrs(fileID, sg)
-			setdatafolder ::
+			if (load_attr)
+				setdatafolder saveDF
+				newdatafolder /o/s attr
+				killwaves /a/z
+				psh5_load_scan_attrs(fileID, sg)
+				setdatafolder ::
+			endif
+		else
+			print "no scans found in file " + AFileName
 		endif

 		HDF5CloseFile fileID
@ -396,6 +452,9 @@ end
 ///
 /// data is loaded into the current data folder.
 ///
+/// this function does not scale the datasets.
+/// call ps_scale_datasets() separately.
+///
 /// @param	fileID			ID of open HDF5 file from psh5_open_file().
 ///
 /// @param	scanpath		path to the scan group in the HDF5 file, e.g. "/scan 1".
@ -464,17 +523,21 @@ function /s psh5_load_scan_attrs(fileID, scanpath, [attr_sets])
 		endif
 	endif
 	
+	variable ids
+	variable nds
+	string sds
+
 	if (attr_sets & 2)
-		attr_list = AddListItem("LensMode", attr_list, ";", inf)
-		attr_list = AddListItem("ScientaChannelBegin", attr_list, ";", inf)
-		attr_list = AddListItem("ScientaChannelEnd", attr_list, ";", inf)
-		attr_list = AddListItem("ScientaSliceBegin", attr_list, ";", inf)
-		attr_list = AddListItem("ScientaSliceEnd", attr_list, ";", inf)
+		nds = ItemsInList(kScientaScalingDatasets, ";")
+		for (ids = 0; ids < nds; ids += 1)
+			sds = StringFromList(ids, kScientaScalingDatasets)
+			if (WhichListItem(sds, attr_list) < 0)
+				attr_list = AddListItem(sds, attr_list, ";", inf)
+			endif
+		endfor
 	endif

-	variable ids
-	variable nds = ItemsInList(attr_list, ";")
-	string sds
+	nds = ItemsInList(attr_list, ";")
 	string wavenames = ""
 	for (ids = 0; ids < nds; ids += 1)
 		sds = StringFromList(ids, attr_list, ";")
@ -483,6 +546,7 @@ function /s psh5_load_scan_attrs(fileID, scanpath, [attr_sets])
 			wavenames = AddListItem(s_wavenames, wavenames, ";", inf)
 		endif
 	endfor
+	wavenames = ReplaceString(";;", wavenames, ";")
 	
 	return wavenames
 end
@ -517,26 +581,28 @@ function /s psh5_load_scan_meta(fileID, scanpath)
 	HDF5LoadData /O /Q /Z /A="Dimensions" /N=ScanDimensions /TYPE=1 fileID, scanpath
 	if (!v_flag)
 		wavenames = AddListItem(s_wavenames, wavenames, ";", inf)
-		HDF5LoadData /O /Q /Z /A="Writables" /N=ScanWritables /TYPE=1 fileID, scanpath
-		if (!v_flag)
-			wavenames = AddListItem(s_wavenames, wavenames, ";", inf)
-		endif
-		HDF5LoadData /O /Q /Z /A="Readables" /N=ScanReadables /TYPE=1 fileID, scanpath
-		if (!v_flag)
-			wavenames = AddListItem(s_wavenames, wavenames, ";", inf)
-		endif
-		HDF5LoadData /O /Q /Z /A="Steps" /N=ScanSteps /TYPE=1 fileID, scanpath
-		if (!v_flag)
-			wavenames = AddListItem(s_wavenames, wavenames, ";", inf)
-		endif
 	else
 		make /n=1 /o ScanDimensions
 		ScanDimensions = 0
 		wavenames = AddListItem("ScanDimensions", wavenames, ";", inf)
+	endif
+	HDF5LoadData /O /Q /Z /A="Readables" /N=ScanReadables /TYPE=1 fileID, scanpath
+	if (!v_flag)
+		wavenames = AddListItem(s_wavenames, wavenames, ";", inf)
+	else
 		make /n=1 /o /t ScanReadables
 		ScanReadables[0] = "ScientaSpectrum"
 		wavenames = AddListItem("ScanReadables", wavenames, ";", inf)
 	endif
+	HDF5LoadData /O /Q /Z /A="Writables" /N=ScanWritables /TYPE=1 fileID, scanpath
+	if (!v_flag)
+		wavenames = AddListItem(s_wavenames, wavenames, ";", inf)
+	endif
+	HDF5LoadData /O /Q /Z /A="Steps" /N=ScanSteps /TYPE=1 fileID, scanpath
+	if (!v_flag)
+		wavenames = AddListItem(s_wavenames, wavenames, ";", inf)
+	endif
+	wavenames = ReplaceString(";;", wavenames, ";")

 	return wavenames
 end
@ -572,6 +638,10 @@ function /s psh5_load_dataset(fileID, scanpath, datasetname, [set_scale])
 	string datasetname
 	variable set_scale

+	if (ParamIsDefault(set_scale))
+		set_scale = 1
+	endif
+	
 	string datasetpath
 	datasetpath = scanpath + "/" + datasetname
 	datasetpath = ReplaceString("//", datasetpath, "/")
@ -585,7 +655,7 @@ function /s psh5_load_dataset(fileID, scanpath, datasetname, [set_scale])
 	endif
 	
 	string dataname
-	if (di.ndims < 3)
+	if (di.ndims < 2)
 		HDF5LoadData /O /Q /Z fileID, datasetpath
 		dataname = StringFromList(0, S_waveNames)
 	else
@ -625,42 +695,68 @@ end
 ///			@arg	1		(default) set the wave scaling.
 ///			@arg	0		do not set the wave scaling.
 ///
+/// @param pref_datasets		semicolon-separated list of preferred datasets.
+///							the items of the list are match strings for the Igor StringMatch function.
+///							the first matching dataset is loaded from the file.
+///							if no match is found, the first dataset listed in the file is loaded.
+///							if empty, a hard-coded default preference list is used.
+///
 /// @return	name of loaded wave if successful. empty string otherwise.
 ///
-function /s psh5_load_scan_preview(fileID, scanpath, [set_scale])
+function /s psh5_load_scan_preview(fileID, scanpath, [set_scale, pref_datasets])
 	variable fileID
 	string scanpath
 	variable set_scale
+	string pref_datasets
+
+	if (ParamIsDefault(set_scale))
+		set_scale = 1
+	endif
+	if (ParamIsDefault(pref_datasets) || (strlen(pref_datasets) == 0))
+		pref_datasets = kPreviewDatasets
+	endif

 	dfref saveDF = GetDataFolderDFR()
 	dfref dataDF = saveDF
 	
 	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"
-	elseif (strsearch(datasets, "ScientaSpectrum", 0) >= 0)
-		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"
+
+	variable nds = ItemsInList(datasets)
+	variable ids
+	string sds
+	variable np = ItemsInList(pref_datasets)
+	variable ip
+	string sp
+	variable found = 0
+	if (nds > 0)
+		for (ip = 0; ip < np; ip += 1)
+			for (ids = 0; ids < nds; ids += 1)
+				sds = StringFromList(ids, datasets)
+				index = ItemsInList(sds, "/") - 1
+				sds = StringFromList(index, sds, "/")
+				sp = StringFromList(ip, pref_datasets)
+				if (StringMatch(sds, sp))
+					found = 1
+					break
+				endif
+			endfor
+			if (found)
+				break
+			endif
+		endfor
+		if (!found)
+			ids = 0
+			sds = StringFromList(ids, datasets)
+			index = ItemsInList(sds, "/") - 1
+			sds = StringFromList(index, sds, "/")
+		endif
 	else
-		datasetname = StringFromList(0, datasets)
-		index = ItemsInList(datasetname, "/") - 1
-		datasetname = StringFromList(index, datasetname, "/")
-	endif
-	if (strlen(datasetname) == 0)
 		return ""
 	endif

 	string datasetpath
+	string datasetname = sds
 	datasetpath = scanpath + "/" + datasetname
 	datasetpath = ReplaceString("//", datasetpath, "/")
 	STRUCT HDF5DataInfo di	// Defined in HDF5 Browser.ipf.
@ -672,7 +768,7 @@ function /s psh5_load_scan_preview(fileID, scanpath, [set_scale])
 	endif
 	
 	string dataname
-	if (di.ndims < 3)
+	if (di.ndims < 2)
 		HDF5LoadData /O /Q /Z fileID, datasetpath
 		dataname = StringFromList(0, S_waveNames)
 		wave /z data = $dataname
@ -699,6 +795,21 @@ function /s psh5_load_scan_preview(fileID, scanpath, [set_scale])
 	wave /z data = $dataname
 	if (waveexists(data))
 		if (set_scale)
+			setdatafolder dataDF
+			string positioners
+			string positioner
+			string positionerpath
+			positioners = psh5_load_scan_meta(fileID, scanpath)
+			wave /t /z ScanWritables
+			if (waveexists(ScanWritables) && (numpnts(ScanWritables) >= 1))
+				positioner = ScanWritables[0]
+				if (strlen(positioner) > 0)
+					positionerpath = scanpath + "/" + positioner
+					positionerpath = ReplaceString("//", positionerpath, "/")
+					HDF5LoadData /O /Q /Z fileID, positionerpath
+				endif
+			endif
+			
 			setdatafolder dataDF
 			newdatafolder /o/s attr
 			killwaves /a/z
@ -814,11 +925,19 @@ function /s psh5_load_dataset_slabs(fileID, datapath, datasetname, [progress])
 	if (di.ndims < 2)
 		print "error: rank of dataset < 2"
 		return ""
+	elseif (di.ndims < 3)
+		progress = 0
 	endif
 	
 	variable idx, idy, idz, idt, izt
-	idx = 1
-	idy = 0
+	variable transpose = WhichListItem(datawavename, kTransposedDatasets) >= 0
+	if (transpose)
+		idx = 1
+		idy = 0
+	else
+		idx = 0
+		idy = 1
+	endif
 	idz = 2
 	idt = 3
 	
@ -855,7 +974,11 @@ function /s psh5_load_dataset_slabs(fileID, datapath, datasetname, [progress])
 			slab[idt][%Start] = it
 			HDF5LoadData /O /Q /Z /SLAB=slab /N=slabdata fileID, datasetpath
 			wave slabdata // 2D, 3D, or 4D with singletons
-			data[][][iz][it] = slabdata[q][p][0][0]
+			if (transpose)
+				data[][][iz][it] = slabdata[q][p][0][0]
+			else
+				data[][][iz][it] = slabdata[p][q][0][0]
+			endif
 			
 			// progress window
 			izt += 1
@ -939,8 +1062,14 @@ function /s psh5_load_dataset_slab(fileID, datapath, datasetname, dim2start, dim
 	endif
 	
 	variable idx, idy, idz, idt
-	idx = 1
-	idy = 0
+	variable transpose = WhichListItem(datawavename, kTransposedDatasets) >= 0
+	if (transpose)
+		idx = 1
+		idy = 0
+	else
+		idx = 0
+		idy = 1
+	endif
 	idz = 2
 	idt = 3

@ -971,7 +1100,11 @@ function /s psh5_load_dataset_slab(fileID, datapath, datasetname, dim2start, dim
 			HDF5LoadData /O /Q /Z /SLAB=slab /N=slabdata fileID, datasetpath
 			if (!v_flag)
 				wave slabdata
-				data += slabdata[q][p][0][0]
+				if (transpose)
+					data += slabdata[q][p][0][0]
+				else
+					data += slabdata[p][q][0][0]
+				endif
 				navg += 1
 			endif
 		endfor
@ -994,36 +1127,63 @@ end
 ///
 /// dimension labels are required by scaling functions.
 ///
+/// @param	data				data wave as loaded from PShell file
+///
+/// @return	@arg 0			all labels set successfully.
+///			@arg 1			unidentified data source.
+///			@arg 2			wave does not contain data.
+///
 function ps_set_dimlabels(data)
 	wave data
 	
 	string name = NameOfWave(data)
+	variable dummy

-	// intrinsic dimensions
-	strswitch(name)
-		case "ScientaImage":
-			setdimlabel 0, -1, $kEnergyDimLabel, data
-			setdimlabel 1, -1, $kAngleDimLabel, data
-			if (WaveDims(data) >= 3)
-				setdimlabel 2, -1, $kScanDimLabel, data
-			endif
-			break
-		case "ScientaSpectrum":
-			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
-		default:
-			setdimlabel 0, -1, $kScanDimLabel, data
-	endswitch
+	try	
+		// intrinsic dimensions
+		strswitch(name)
+			case "ScientaImage":
+				setdimlabel 0, -1, $kEnergyDimLabel, data
+				setdimlabel 1, -1, $kAngleDimLabel, data
+				if (WaveDims(data) >= 3)
+					setdimlabel 2, -1, $kScanDimLabel, data
+				endif
+				AbortOnRTE
+				break
+			case "ImageAngleDistribution":
+			case "ScientaAngleDistribution":
+				if (WaveDims(data) >= 2)
+					setdimlabel 0, -1, $kScanDimLabel, data
+					setdimlabel 1, -1, $kAngleDimLabel, data
+				else
+					setdimlabel 0, -1, $kAngleDimLabel, data
+				endif
+				AbortOnRTE
+				break
+			case "ScientaSpectrum":
+			case "ImageEnergyDistribution":
+			case "ScientaEnergyDistribution":
+				if (WaveDims(data) >= 2)
+					setdimlabel 0, -1, $kScanDimLabel, data
+					setdimlabel 1, -1, $kEnergyDimLabel, data
+				else
+					setdimlabel 0, -1, $kEnergyDimLabel, data
+				endif
+				AbortOnRTE
+				break
+			default:
+				if (WaveDims(data) == 1)
+					setdimlabel 0, -1, $kScanDimLabel, data
+					AbortOnRTE
+				else
+					return 1
+				endif
+		endswitch
+	catch
+		dummy = GetRTError(1)
+		return 2
+	endtry
+	return 0
 end

 /// set the dimension scales of loaded PShell Scienta datasets according to attributes.
@ -1040,8 +1200,8 @@ function ps_scale_datasets()
 	dfref attrDF = :attr
 	
 	make /n=3 /free lo, hi
-	make /n=3 /t /free un
-	ps_detect_scale(lo, hi, un)
+	make /n=3 /t /free ax, un
+	ps_detect_scale(ax, lo, hi, un)

 	wave /t /z /SDFR=dataDF ScanReadables
 	if (WaveExists(ScanReadables))
@ -1051,7 +1211,7 @@ function ps_scale_datasets()
 		for (isr = 0; isr < nsr; isr += 1)
 			wave /z /SDFR=dataDF wsr = $ScanReadables[isr]
 			if (WaveExists(wsr))
-				ps_scale_dataset_2(wsr, lo, hi, un)
+				ps_scale_dataset_2(wsr, ax, lo, hi, un)
 			endif
 		endfor
 	endif
@ -1078,9 +1238,9 @@ function ps_scale_dataset(data)
 	setdatafolder dataDF
 	
 	make /n=3 /free lo, hi
-	make /n=3 /t /free un
-	ps_detect_scale(lo, hi, un)
-	ps_scale_dataset_2(data, lo, hi, un)
+	make /n=3 /t /free ax, un
+	ps_detect_scale(ax, lo, hi, un)
+	ps_scale_dataset_2(data, ax, lo, hi, un)
 	
 	setdatafolder saveDF
 end
@ -1096,7 +1256,7 @@ end
 /// @arg		`lo[%%energy]`	analyser energy dimension.
 /// @arg		`lo[%%angle]`	analyser angle dimension.
 /// @arg		`lo[%%scan]`	scan dimension.
-/// @arg		`lo[%%data]`		data dimension (units).
+/// @arg		`lo[%%data]`		data dimension.
 ///
 /// the function tries to read the following waves, 
 /// and may fall back to more or less reasonable default values if they are not found.
@ -1108,15 +1268,18 @@ end
 /// @arg		`ScanWritables`
 /// @arg		wave referenced by `ScanWritables[0]`
 ///
+/// @param	ax				text wave to receive the axis labels.
+///
 /// @param	lo				wave to receive the lower limits.
 ///
 /// @param	hi				wave to receive the upper limits.
 ///
 /// @param	un				text wave to receive the unit labels.
 ///
-/// @return					the function results are written to the lo, hi, un waves.
+/// @return					the function results are written to the lo, hi, un, and ax waves.
 ///
-function ps_detect_scale(lo, hi, un)
+function ps_detect_scale(ax, lo, hi, un)
+	wave /t ax
 	wave lo
 	wave hi
 	wave /t un
@ -1124,28 +1287,32 @@ function ps_detect_scale(lo, hi, un)
 	dfref dataDF = GetDataFolderDFR()
 	dfref attrDF = :attr
 	
-	redimension /n=4 lo, hi, un
-	setdimlabel 0, 0, $kEnergyDimLabel, lo, hi, un
-	setdimlabel 0, 1, $kAngleDimLabel, lo, hi, un
-	setdimlabel 0, 2, $kScanDimLabel, lo, hi, un
-	setdimlabel 0, 3, $kDataDimLabel, lo, hi, un
+	redimension /n=4 lo, hi, un, ax
+	setdimlabel 0, 0, $kEnergyDimLabel, lo, hi, un, ax
+	setdimlabel 0, 1, $kAngleDimLabel, lo, hi, un, ax
+	setdimlabel 0, 2, $kScanDimLabel, lo, hi, un, ax
+	setdimlabel 0, 3, $kDataDimLabel, lo, hi, un, ax

 	// default values
 	lo[%$kEnergyDimLabel] = 0
 	hi[%$kEnergyDimLabel] = 1
 	un[%$kEnergyDimLabel] = "eV"
+	ax[%$kEnergyDimLabel] = "Ekin"

 	lo[%$kAngleDimLabel] = -1
 	hi[%$kAngleDimLabel] = 1
-	un[%$kAngleDimLabel] = ""
+	un[%$kAngleDimLabel] = "arb."
+	un[%$kAngleDimLabel] = "slice"

 	lo[%$kScanDimLabel] = 0
 	hi[%$kScanDimLabel] = 1
-	un[%$kScanDimLabel] = ""
+	un[%$kScanDimLabel] = "arb."
+	ax[%$kScanDimLabel] = "scan"
 	
 	lo[%$kDataDimLabel] = 0
 	hi[%$kDataDimLabel] = 0
 	un[%$kDataDimLabel] = "arb."
+	ax[%$kDataDimLabel] = "value"
 	
 	wave /SDFR=attrDF /T /Z LensMode
 	wave /SDFR=attrDF /Z ChannelBegin = ScientaChannelBegin
@ -1160,14 +1327,17 @@ function ps_detect_scale(lo, hi, un)
 				lo[%$kAngleDimLabel] = -45/2
 				hi[%$kAngleDimLabel] = +45/2
 				un[%$kAngleDimLabel] = "deg"
+				ax[%$kAngleDimLabel] = "angle"
 				break
 			case "Angular60":
 				lo[%$kAngleDimLabel] = -60/2
 				hi[%$kAngleDimLabel] = +60/2
 				un[%$kAngleDimLabel] = "deg"
+				ax[%$kAngleDimLabel] = "angle"
 				break
 			case "Transmission":
 				un[%$kAngleDimLabel] = "arb."
+				ax[%$kAngleDimLabel] = "offset"
 				break
 		endswitch
 	endif
@ -1187,9 +1357,10 @@ function ps_detect_scale(lo, hi, un)
 		if (!WaveExists(scanner))
 			wave /z /SDFR=attrDF scanner = $ScanWritables[0]
 		endif
-		if (WaveExists(scanner))
+		if (WaveExists(scanner) && (numpnts(scanner) >= 1))
 			lo[%$kScanDimLabel] = scanner[0]
 			hi[%$kScanDimLabel] = scanner[numpnts(scanner)-1]
+			ax[%$kScanDimLabel] = NameOfWave(scanner)
 		endif
 	endif
 end
@ -1211,14 +1382,23 @@ end
 /// @param	data				data wave to be scaled.
 ///							dimension labels (index -1) must be set to match the limit waves.
 ///
+/// @param	ax				axis labels.
+///							the axis labels are written to the wave note in the format `AxisLabel%%s=%%s`
+///							where `X`, `Y`, `Z`, `D` is substituted for the first place holder
+///							and the label for the second one.
+///
 /// @param	lo				lower limits.
+///							the lower limits are applied using the SetScale operation.
 ///
 /// @param	hi				upper limits.
+///							the upper limits are applied using the SetScale operation.
 ///
 /// @param	un				unit labels.
+///							the unit labels are applied using the SetScale operation.
 ///
-function ps_scale_dataset_2(data, lo, hi, un)
+function ps_scale_dataset_2(data, ax, lo, hi, un)
 	wave data
+	wave /t ax
 	wave lo
 	wave hi
 	wave /t un
@ -1227,19 +1407,24 @@ function ps_scale_dataset_2(data, lo, hi, un)
 	sdim = GetDimLabel(data, 0, -1)
 	if (strlen(sdim))
 		setscale /i x lo[%$sdim], hi[%$sdim], un[%$sdim], data
+		Note data, "AxisLabelX=" + ax[%$sdim]
 	endif

 	sdim = GetDimLabel(data, 1, -1)
 	if (strlen(sdim))
 		setscale /i y lo[%$sdim], hi[%$sdim], un[%$sdim], data
+		Note data, "AxisLabelY=" + ax[%$sdim]
 	endif
 	
 	sdim = GetDimLabel(data, 2, -1)
 	if (strlen(sdim))
 		setscale /i z lo[%$sdim], hi[%$sdim], un[%$sdim], data
+		Note data, "AxisLabelZ=" + ax[%$sdim]
 	endif
 	
 	setscale d 0, 0, un[%$kDataDimLabel], data
+	Note data, "AxisLabelD=" + ax[%$kDataDimLabel]
+	Note data, "Dataset=" + NameOfWave(data)
 end

 /// load and reduce the ScientaImage dataset of the first scan of a PShell data file.
@ -1315,7 +1500,9 @@ function /s psh5_load_reduced(ANickName, APathName, AFileName, reduction_func, r
 		string folder
 		
 		sg = StringFromList(ig, s_scanpaths)
-		folder = CleanupName(ReplaceString("/", sg, ""), 0)
+		folder = ReplaceString("/", sg, "")
+		folder = ReplaceString(" ", folder, "")
+		folder = CleanupName(folder, 0)
 		setdatafolder fileDF
 		newdatafolder /s /o $folder
 		dfref dataDF = GetDataFolderDFR()
@ -1417,11 +1604,19 @@ function /s psh5_load_dataset_reduced(fileID, scanpath, datasetname, reduction_f
 		print "error: rank of dataset < 2"
 		result = -2
 		return wavenames
+	elseif (di.ndims < 3)
+		progress = 0
 	endif
 	
 	variable idx, idy, idz, idt
-	idx = 1
-	idy = 0
+	variable transpose = WhichListItem(datawavename, kTransposedDatasets) >= 0
+	if (transpose)
+		idx = 1
+		idy = 0
+	else
+		idx = 0
+		idy = 1
+	endif
 	idz = 2
 	idt = 3
Author	SHA1	Message	Date
matthias muntwiler	600061f684	bugfixes in pshell import and preview changes: - fix null string exception in preview - fix transposition of two-dimensional datasets	2016-09-23 19:11:07 +02:00
matthias muntwiler	0dc6ca820b	bugfix release: pshell import and preview changes: - catch runtime errors due to empty datasets - improve window titles and graph names - fix scaling of scienta image from XPSSpectrum script - remove unnecessary spaces and underscores from folder names	2016-09-22 14:15:09 +02:00
matthias muntwiler	a87975d1e6	update data explorer: axis scale and labels in preview	2016-08-17 12:12:52 +02:00
matthias muntwiler	86cf328961	README.md: fix heading levels	2016-06-06 16:07:19 +02:00
matthias muntwiler	2479582c08	README.md: add release notes	2016-06-06 16:04:56 +02:00