diff --git a/beamtime/nappFileList.m b/beamtime/nappFileList.m index 24cb438..144ee1f 100755 --- a/beamtime/nappFileList.m +++ b/beamtime/nappFileList.m @@ -103,6 +103,7 @@ function ListFiles = nappFileList(dataPath,varargin) % NEXAFS/ - NEXAFS maps in HDF5 (.h5) format % Photos/ - Sample photographs in BMP (.bmp) format % Pressure/ - LabView pressure and temperature logs +% PShell/ - XPS data in h5 format (from PShell) % % Full path convention: % LOCAL: ~/Forschung_Einsam/PSI_SLS/NAPP/SC Data/YYYY/BeamtimeName @@ -255,11 +256,9 @@ function ListFiles = nappFileList(dataPath,varargin) % * March 2022, input now using varargin % * March 2022, strict data structure required for local and remote sources % * November 2025, PShell h5 files for NEXAFS have a new structure; -% % November 2025, added creation date to mac for NEXAFS. -%% ToDo -% -% * Check if jpg are imported. Before Nov25 standard format was bitmap -% * replace the hard coded table consistency with function. +% * November 2025, added creation date to mac for NEXAFS. +% * March 2026, added movie import from photos folder, added jpg as photo +% file %% Input % Define conditions and defaults of input @@ -419,6 +418,10 @@ else dir([dataPath_Photo filesep '**' filesep '*.bmp']) dir([dataPath_Photo filesep '**' filesep '*.jpg']) dir([dataPath_Photo filesep '**' filesep '*.JPG']) + dir([dataPath_Photo filesep '**' filesep '*.mov']) + dir([dataPath_Photo filesep '**' filesep '*.avi']) + dir([dataPath_Photo filesep '**' filesep '*.mp4']) + dir([dataPath_Photo filesep '**' filesep '*.wmv']) ]; TmpFileList{3} = TmpFileList{3}(find(~cellfun(@isempty,regexp({TmpFileList{3}.name},'^[a-zA-Z0-9]\w*')))); %#ok