Commit Graph
78 Commits
Author SHA1 Message Date
bartels-rausch fffa2fb334 Added info how to copy files without changing the timestamps 2026-03-12 14:12:57 +01:00
bartels-rausch a26847b332 Good to know I'm smarter than google gemini. That code did not run. fixed it. Also fixed a time issue. Start aquisition is now taken from the logged time in the data file or if that is not present the OS creation date. the end aquisition time is the last modification time of the os for that file. 2026-03-12 13:35:27 +01:00
bartels-rausch 938eea27e8 feat: add unified functionSignatures.json for MATLAB auto-complete
Adds native IDE parameter suggestions, name-value pair tracking, and enum choices for all NAPP functions based on their current inputParser configurations.
2026-03-12 10:50:30 +01:00
bartels-rausch d7bc516442 Bug fix. The excitation energy for our offline XPS is wrong in the xy files. Set it to 1253.6 eV during import 2026-03-12 10:26:31 +01:00
bartels-rausch 00d34110db MAJOR UPDATE: Add support for Specs .xy files from offline XPS (Soleil/Luca)
Both Scienta (.ibw) and SpecsLab (.xy) raw files capture multidimensional XPS data but use different terminology to structure it. Scienta uses "Region Iterations" and "Sequence Iterations". SpecsLab organizes data by "Groups" or "Regions" (different elemental energy sweeps), "Scans" (time-resolved repetitions), and "Curves". Scienta Region Iterations are automatically averaged to improve the signal-to-noise ratio, while Scienta Sequence Iterations and SpecsLab Scans are  preserved to keep the time-resolved data. For SpecsLab files specifically, distinct Regions are split into separate table rows. Ultimately, the preserved time-resolved data is saved in the table's image variable as a 2D matrix ([Energy bins × Sequence iterations/Scans]).

File type handling: Added .xy as a recognized XPS format. Currently, the script differentiates data types strictly by file extension (NEXAFS: .h5, XPS: .ibw and .xy). This extension-based differentiation needs to be improved in future updates.

Metadata parsing: Implemented global header scanning for .xy files to correctly extract instrument parameters (Acquisition Mode, Lens Mode, Slit, Workfunction) located before the first region block.

Timezone alignment: Added timestamp conversion for .xy files from UTC to local time (Europe/Zurich) to ensure synchronization with LabView logs.

Region separation: Modified .xy parsing to append a _RegX suffix to filenames. This correctly splits single .xy files that contain multiple elements or energy sweeps into distinct table rows so they can be processed individually.

Import efficiency: Added an originalFileName variable. The script now cross-references the input DataTable and skips files that have already been imported to reduce execution time on re-runs.

Testing status: Processing of .xy data has currently only been tested and debugged with nappGenerateSpectra and nappPlot. Compatibility with other functions in the suite remains untested.
2026-03-12 10:08:47 +01:00
bartels-rausch a4ba161146 When using linear fit, the plot somehow reversed the excluded points. This is fixed now, those data labeled excluded are indeed excluded from the fit. Second, the input is now the same for kinetic and binding energy. 2 salars define the range to be excluded (the central peak), adding additional energies add excluded regions at the edge of the spectra. 2026-03-05 13:04:49 +01:00
bartels-rausch 0e07d2972b Finally, several spectra can be fitted with same constraints again...function now loops through any number of spectra 2026-03-05 11:11:37 +01:00
bartels-rausch 3a7ae3dcbd Added possibility to exlclude peak, plus a range at end of the spectrum. Updated the documentation. Bug fixes. 2026-03-05 07:32:53 +01:00
bartels-rausch d521db8cb8 Now uses helper function to merge data tables with different columns 2026-03-04 17:04:02 +01:00
bartels-rausch 5402439ac9 Adds data origin (that is which spectra are combined) and mean of sample settings 2026-03-04 17:02:45 +01:00
bartels-rausch ad7ac0e6ee Bug fix: Now handles also ibw files, not only h5. 2026-03-03 11:32:47 +01:00
bartels-rausch 5fa8c7fa68 But fixes 2026-03-02 17:40:06 +01:00
bartels-rausch 06927702c7 updated the documentation 2026-03-02 14:28:26 +01:00
bartels-rausch 07e414c3ef Now, the function can also deal with columns that have different numbers of entires (such as from peak fitting results) 2026-03-02 14:27:28 +01:00
bartels-rausch 23e49b4330 Addes a model for gas and condensed 2p spectra (2 doublets). Small improvements and bug fixes 2026-03-02 14:26:05 +01:00
bartels-rausch 67e75cde2e Added video to file list 2026-03-02 14:24:50 +01:00
bartels-rausch 6b3c96ff27 nappFileList now supports image formats of new camera. createBEamtimeFolder is a little helper to create empty folders in the beamtime folder. Folder PShell added for h5 data that are not NEXAFS but XPS aquired with PShell. 2026-02-26 13:08:16 +01:00
bartels-rausch 66a11d47f4 first Jeti plotting function 2026-01-23 09:38:15 +01:00
bartels-rausch 484c84e5f0 Major refactor - generic model architecture with full Shirley background support
BREAKING CHANGES:
- Single-spectrum fitting only (enforces exactly one row selected)
- Gauss fitting now uses FWHM parameter instead of Gaussian width sigma
- Removed multi-row batch processing capability

NEW FEATURES:
- Generic model architecture: arbitrary number of peaks (determined by length of FitParameter.peakArea)
- Full Shirley background support for both Gaussian and Pseudo-Voigt peak shapes
- Comprehensive parameter validation system with detailed error messages
- Support for shared vs per-peak Shirley K parameters
- New fitting modes: 'positionShirley', 'widthShirley', 'widthPositionShirley'
- New custom mode: 'TwoSpinOrbitDoubletPseudoVoigtShirley'
- Automatic field name typo correction ('Bond' → 'Bound')
- Enhanced results export: now includes peakEta and peakShirleyK columns

REFACTORING:
- Centralized peak and background equations in helper functions
  - gaussPeak(), lorentzPeak(), pseudoVoigtPeak()
  - linearBackground(), activeShirleyBackgroundFwhm()
  - fwhm2w() conversion utility
- Extracted model generation to genericModelGenerator()
- Modular validation helpers: checkFieldDimension(), checkBoundsPair()
- Standardized parameter vector layouts documented for all mode/background/peak-type combinations
- Improved column resizing logic with resizeColumnHelper()
- Enhanced plotting integration with nappPlot.m and nappAddFitToPlot.m

ARCHITECTURE:
- Unified parameter extraction for all fitting modes in centralized switch-case structure
- Consistent FWHM-based width parameterization across all peak types
- Mode-specific Shirley K sizing (scalar for shared modes, array for per-peak modes)
- Comprehensive inline documentation of parameter vector layouts (50+ combinations)

IMPROVEMENTS:
- Backward compatibility for 'gauss' width mode (auto-converts to FWHM)
- Robust bounds checking with detailed diagnostic messages
- Enhanced figure generation: residuals plot + fit visualization in tiledlayout
- Better error handling for empty/malformed data structures
- NaN-padded result arrays for variable peak counts

FILE SIZE: ~73KB → ~152KB (107% increase due to comprehensive documentation and generic architecture)
2026-01-23 08:02:53 +01:00
bartels-rausch 7d37326785 import and plot function for Jeti spectrometer data and for the pressure logging at ISS. 2025-12-17 23:59:20 +01:00
bartels-rausch bf1eb85f88 added export figure description 2025-12-07 16:09:14 +01:00
bartels-rausch 484648b648 Added a function to export figure data into ascii txt files (and to plot ascii text files to check if export worked) 2025-12-07 16:05:59 +01:00
bartels-rausch 5dcb0a9119 Added list of helper functions in utils subfolder 2025-12-07 12:59:34 +01:00
bartels-rausch 74dbdda5e8 Added a list of all functions and added information on a function to join data tables with differences in column number and type. 2025-12-07 12:41:19 +01:00
bartels-rausch 38a62bf560 Updated the HowDoI: Added how to merge tables with different columns into one. 2025-12-07 11:41:12 +01:00
bartels-rausch bbfab45787 Added Example Matlab script with most common during beamtime processing 2025-12-05 15:35:30 +01:00
bartels-rausch 53dd8c6080 Added links to matlab documentation 2025-12-05 10:42:44 +01:00
bartels-rausch 1b89885447 Added documentation to readme file. Re-arranged folder content slightly 2025-12-05 10:28:16 +01:00
bartels-rausch 7677ad8668 Residuals are now plotted. And added the option to change weight for a section of data in fitting routine 2025-12-01 12:04:35 +01:00
bartels-rausch aac4e834c3 added Auger-Meitner plots and interactive NEXAFS 2025-11-24 19:08:38 +01:00
bartels-rausch 5a65fa13c4 initial commit 2025-11-21 20:03:47 +01:00
bartels-rausch efff7c29f5 Updated to new PShell file structure and added abiltiy to read several spectra in each h5 file 2025-11-21 19:51:44 +01:00
bartels-rausch 723714c85d Added some helper tools 2025-11-21 11:02:23 +01:00
bartels-rausch 74292eebd3 Small changes 2025-07-07 08:53:30 +02:00
bartels-rausch 4f21681cf6 Color scheme now a shared function. Small changes 2025-07-06 12:40:23 +02:00
bartels-rausch e48baa9d41 Specs data are now divided by number of scans (bug fix) 2025-03-04 16:18:51 +01:00
bartels-rausch 2e5f3eaf1c Started to include Speces lab XPS data. nappFileList, nappPlot, and peakFit should work 2025-03-04 15:24:55 +01:00
bartels-rausch fa1323b96d Added peak area ratio as fitting constrain. Additional small bug fixes (not sure what I did) 2025-02-27 08:59:53 +01:00
bartels-rausch 7633f3a741 First version import-export to h5 file 2024-05-23 07:16:38 +02:00
bartels-rausch 683e0198e6 Added feature to merge 2 tables, not only to add a row to a table 2024-05-23 07:08:40 +02:00
bartels-rausch 20577d00be Don't remember what I changed 2024-05-23 07:07:44 +02:00
bartels-rausch 0c5c4f6ed9 Added linear background fit. 2024-05-23 07:07:13 +02:00
bartels-rausch 43889de25b Import is now backward compatible with files dating 2018 2024-04-23 12:50:06 +02:00
bartels-rausch 3f0d9be72a Add a function to merge two tables that might have different columns. Both sets of columns are preserved 2024-02-29 16:15:00 +01:00
bartels-rausch f61e1113b0 Added more options to exclude data in background fit and made the call to nappFitGAussXps more consitent 2024-02-20 15:17:04 +01:00
bartels-rausch 81d49ccbbd Added exponential fit and divide for binding energy scale. Needs testing. 2024-01-27 15:32:27 +01:00
bartels-rausch a61f4b7141 Bug fix in using the input parser of the NappFitGaussXPS.m function. This impacts the functions calls in all scripts and functions
git push
2024-01-26 09:06:53 +01:00
bartels-rausch 7729717da5 small bug fixes and 2023-11-28 14:36:44 +01:00
bartels-rausch 8b55810fc6 Added exponential fit. Added divide by background to normalise intensity. 2023-11-16 07:17:37 +01:00
bartels-rausch 4ad9ccbd35 Added Gauss Fit to determine peak positions. Uses nappFitGaussXps.m 2023-11-16 07:16:11 +01:00