[us-commits] [ehb54/ultrascan3] 20e4f1: Merge pull request #48 from ehb54/master

[Borries Demeler]

  Branch: refs/heads/master
  Home:   https://github.com/ehb54/ultrascan3
  Commit: 20e4f101f3681d8a03acc9f8687a7097e2b03bf1
      https://github.com/ehb54/ultrascan3/commit/20e4f101f3681d8a03acc9f8687a7097e2b03bf1
  Author: ehb54 <ehb54 at users.noreply.github.com>
  Date:   2022-09-29 (Thu, 29 Sep 2022)

  Changed paths:
    M gui/us_extinctfitter_gui.cpp
    M gui/us_extinctfitter_gui.h
    M gui/us_extinction_gui.cpp
    M gui/us_minimize.cpp
    M programs/us/us.cpp
    M programs/us_buoyancy/us_buoyancy.cpp
    M programs/us_buoyancy/us_buoyancy.h
    M programs/us_buoyancy/us_buoyancy.pro
    A programs/us_buoyancy/us_buoyancy_main.cpp
    A programs/us_buoyancy_auto/us_buoyancy_auto.pro
    A programs/us_buoyancy_auto/us_buoyancy_auto_main.cpp

  Log Message:
  -----------
  Merge pull request #48 from ehb54/master

Merge master to demeler-dev


  Commit: fee9e0361e453310e1bafacb17b4897cd05825a8
      https://github.com/ehb54/ultrascan3/commit/fee9e0361e453310e1bafacb17b4897cd05825a8
  Author: Borries Demeler <659499+demeler at users.noreply.github.com>
  Date:   2022-12-03 (Sat, 03 Dec 2022)

  Changed paths:
    M gui/us_extinctfitter_gui.cpp
    M gui/us_extinctfitter_gui.h
    M gui/us_load_auc.cpp
    M gui/us_load_auc.h
    M gui/us_minimize.cpp
    M gui/us_minimize.h
    M gui/us_plot.cpp
    M gui/us_plot.h
    A programs/us_abde/us_abde.pro
    A programs/us_abde/us_abde_main.cpp
    M programs/us_buoyancy/us_buoyancy.cpp
    M programs/us_buoyancy/us_buoyancy.h
    R programs/us_buoyancy_auto/us_buoyancy_auto.pro
    R programs/us_buoyancy_auto/us_buoyancy_auto_main.cpp
    M programs/us_convert/us_convert_gui.cpp
    M programs/us_helpdaemon/us_helpdaemon.cpp
    M programs/us_mpi_analysis/pcsa_master.cpp
    M programs/us_mpi_analysis/us_mpi_analysis.cpp
    M programs/us_pseudo_absorbance/us_convert_scan.cpp
    M programs/us_pseudo_absorbance/us_remove_ri.cpp
    M programs/us_reporter_gmp/us_reporter_gmp.cpp
    M us_somo/develop/src/us_hydrodyn_saxs_hplc_util.cpp

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into demeler-dev


  Commit: fb2edca055257ba0074952412a9bc48db37d5d5a
      https://github.com/ehb54/ultrascan3/commit/fb2edca055257ba0074952412a9bc48db37d5d5a
  Author: Borries Demeler <659499+demeler at users.noreply.github.com>
  Date:   2023-02-04 (Sat, 04 Feb 2023)

  Changed paths:
    M programs/us_rotor_calibration/us_rotor_calibration.cpp

  Log Message:
  -----------
  7-slot rotor calibration disc edge positions updated according to published values


  Commit: e1a0e9d7a090cb67358c6a547390a0da988cdfd8
      https://github.com/ehb54/ultrascan3/commit/e1a0e9d7a090cb67358c6a547390a0da988cdfd8
  Author: Borries Demeler <7659499+demeler at users.noreply.github.com>
  Date:   2023-02-04 (Sat, 04 Feb 2023)

  Changed paths:
    M programs/us_rotor_calibration/us_rotor_calibration.cpp

  Log Message:
  -----------
  Merge pull request #55 from ehb54/demeler-dev

Demeler dev


Compare: https://github.com/ehb54/ultrascan3/compare/42d853e39a71...e1a0e9d7a090