maintenance release: pshell import, elog, documentation

* bugfixes in pshell import
* updates to elog interface: templates, login, separate persistent and volatile data
* new header and revision information in documentation

pearl/pearl-anglescan-process.ipf

@@ -1893,13 +1893,12 @@ end
 ///
 /// @param	x, y				projected Cartesian coordinate
 ///
-/// @param	projection		mapping function from polar to cartesian coordinates
+/// @param	projection		mapping function from polar to cartesian coordinates.
+/// 							projections 0-2 have no effect  on the azimuthal coordinate.
 ///	@arg	0				linear
 ///	@arg	1				stereographic (default)
 ///	@arg	2				azimuthal
 ///
-/// 							projections 0-2 have no effect on the azimuthal coordinate
-///
 /// @param	zeroAngle		zeroAngleWhere parameter of polar graphs
 ///	@arg	0 (default)		zero is at the 3 o'clock position
 ///	@arg	180				zero is at the 9 o'clock position

pearl/pearl-menu.ipf

@@ -55,10 +55,8 @@ menu "PEARL"
 	end
 	
 	submenu "Services"
-		PearlMenuEnableFunc("pearl_elog") + "ELOG Experiments", /Q, pearl_elog("Experiments")
-		help = {"Create entries in ELOG experiments logbook"}
-		PearlMenuEnableFunc("pearl_elog") + "ELOG Calculations", /Q, pearl_elog("Calculations")
-		help = {"Create entries in ELOG calculations logbook"}
+		PearlMenuEnableFunc("pearl_elog") + "Open ELOG Panel", /Q, pearl_elog("")
+		help = {"Open an ELOG panel to send entries to an ELOG logbook"}
 	end
 	
 	submenu "Sample Preparation"

pearl/pearl-pshell-import.ipf

@@ -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