Skip to content

Commit 27c180f

Browse files
author
Arthur Glowacki
committed
Merge branch 'master' of github.com:/aglowacki/XRF-Maps
2 parents 3d0d3ce + fc49421 commit 27c180f

16 files changed

Lines changed: 40 additions & 41 deletions

‎src/data_struct/analysis_job.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change

‎src/data_struct/element_info.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change

‎src/data_struct/fit_element_map.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change

‎src/data_struct/fit_element_map.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change

‎src/fitting/models/gaussian_model.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change

‎src/fitting/optimizers/nlopt_optimizer.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change

‎src/fitting/routines/param_optimized_fit_routine.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change

‎src/io/file/hdf5_io.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change

‎src/io/file/hdf5_io.h‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change

‎src/quantification/models/quantification_model.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change

0 commit comments

Comments
 (0)