minor bug fixes in angle-scan import and documentation

- find attributes of region scans in angle-scan panel
- more detailed description of reduced import with regions
This commit is contained in:
2018-03-13 12:43:29 +01:00
parent fda49c3195
commit 17036e1daa
115 changed files with 345 additions and 328 deletions

View File

@ -200,6 +200,12 @@ function asp_import_raw(raw_data)
dfref saveDF = GetDataFolderDFR()
dfref datadf = GetWavesDataFolderDFR(raw_data)
dfref attrdf = datadf:attr
if (!DataFolderRefStatus(attrdf))
setdatafolder datadf
setdatafolder ::
dfref parentdf = GetDataFolderDFR()
dfref attrdf = parentdf:attr
endif
setdatafolder $(package_path)
// todo : check dimensions and scales
@ -208,9 +214,20 @@ function asp_import_raw(raw_data)
source_path = GetWavesDataFolder(raw_data, 2)
duplicate /o raw_data, raw, process_data
duplicate /o attrdf:ManipulatorTheta, raw_theta, process_theta
duplicate /o attrdf:ManipulatorTilt, raw_tilt, process_tilt
duplicate /o attrdf:ManipulatorPhi, raw_phi, process_phi
wave /sdfr=attrdf /z ManipulatorTheta
wave /sdfr=attrdf /z ManipulatorTilt
wave /sdfr=attrdf /z ManipulatorPhi
if (WaveExists(ManipulatorTheta) && WaveExists(ManipulatorTilt) && WaveExists(ManipulatorPhi))
duplicate /o attrdf:ManipulatorTheta, raw_theta, process_theta
duplicate /o attrdf:ManipulatorTilt, raw_tilt, process_tilt
duplicate /o attrdf:ManipulatorPhi, raw_phi, process_phi
else
DoAlert 0, "Can't find manipulator angle waves.\rCheck that the attr folder exists, or provide values in the following table."
make /n=(dimsize(raw_data, 1)) /o raw_theta, raw_tilt, raw_phi
make /n=(dimsize(raw_data, 1)) /o process_theta, process_tilt, process_phi
edit /k=1 raw_theta, raw_tilt, raw_phi
endif
make /o /n=(dimsize(raw_data, 0)) dist_x, dist_x_smoo
make /o /n=(dimsize(raw_data, 1)) dist_y, dist_y_smoo