update pshell explorer and data import, misc. improvements
FEATURES - pshell: convert scienta data to true counts - pre-process: add gauss2_reduction data reduction function - anglescan: add set_contrast and normalize_strip_phi functions - explorer: show info about multi-region scans - documentation: add detailed instructions for angle-scan processing BUGFIXES - explorer: fix attributes notebook - pshell: fix progress bar - elog: increase the number of accepted attachments
This commit is contained in:
@ -308,31 +308,44 @@ static function /wave preview_pshell_file(filename)
|
||||
string filename
|
||||
|
||||
dfref saveDF = GetDataFolderDFR()
|
||||
|
||||
setdatafolder $package_path
|
||||
dfref previewDF = GetDataFolderDFR()
|
||||
svar s_preview_file
|
||||
svar s_preview_source
|
||||
psh5_load_preview("preview_image", "pearl_explorer_filepath", filename)
|
||||
s_preview_file = filename
|
||||
s_preview_source = ""
|
||||
wave /z preview_image
|
||||
|
||||
svar /z s_file_info
|
||||
if (! svar_exists(s_file_info))
|
||||
string /g s_file_info
|
||||
endif
|
||||
|
||||
dfref tempDF = NewFreeDataFolder()
|
||||
setdatafolder tempDF
|
||||
string dataname
|
||||
dataname = psh5_load_preview("pearl_explorer_filepath", filename)
|
||||
|
||||
s_preview_file = filename
|
||||
s_preview_source = ""
|
||||
|
||||
wave /z data = $dataname
|
||||
if (waveexists(data))
|
||||
duplicate /o data, previewDF:preview_image
|
||||
else
|
||||
print "no data found in file " + filename
|
||||
endif
|
||||
|
||||
if (strlen(s_preview_file) > 0)
|
||||
s_file_info = psh5_load_info("pearl_explorer_filepath", filename)
|
||||
else
|
||||
s_file_info = ""
|
||||
endif
|
||||
|
||||
if (DataFolderExists("attr"))
|
||||
setdatafolder attr
|
||||
preview_attributes(GetDataFolderDFR())
|
||||
setdatafolder ::
|
||||
dfref attrDF = tempDF:attr
|
||||
if (DataFolderRefStatus(attrDF))
|
||||
preview_attributes(attrDF)
|
||||
endif
|
||||
|
||||
setdatafolder saveDF
|
||||
wave /z /sdfr=previewDF preview_image
|
||||
return preview_image
|
||||
end
|
||||
|
||||
@ -654,7 +667,6 @@ static function preview_attributes(attr_folder, [dest_folder, attr_filter, inclu
|
||||
attr_names = ""
|
||||
attr_values = ""
|
||||
|
||||
string /g s_attr_folder = GetDataFolder(1, attr_folder)
|
||||
setdatafolder attr_folder
|
||||
wave /t /z IN
|
||||
wave /t /z ID
|
||||
|
Reference in New Issue
Block a user