deb

Move merge command decision to common.sh and check whether DISPLAY is set
2025-11-25 20:46:33 +01:00 · 2025-03-30 17:55:39 +02:00
14 changed files with 325 additions and 1202 deletions
--- a/.config/Code/User/settings.json
+++ b/.config/Code/User/settings.json
@ -4,6 +4,7 @@
    "window.customMenuBarAltFocus": false,
    "window.titleBarStyle": "custom",
    "window.menuBarVisibility": "visible",
+    "workbench.colorTheme": "papercolor-vscode-dark",
    "workbench.startupEditor": "none",
    "task.problemMatchers.neverPrompt": {
        "shell": true
@ -58,11 +59,7 @@
    ],
    "window.zoomLevel": 1,
    "C_Cpp.loggingLevel": "Information",
-    "editor.tabSize": 2,
+    "editor.tabSize": 4,
    "terminal.integrated.scrollback": 10000,
    "files.insertFinalNewline": true,
-    "python.analysis.typeCheckingMode": "strict",
-    "[json]": {
-        "editor.defaultFormatter": "vscode.json-language-features"
-    },
 }
--- a/.config/alacritty/alacritty.toml
+++ b/.config/alacritty/alacritty.toml
@ -1,72 +0,0 @@
-# Alacritty Configuration
-# Ported from ~/.Xresources (xterm)
-
-[general]
-live_config_reload = true
-import = ["~/.config/alacritty/themes/current-theme.toml"]
-
-[window]
-decorations = "Full"
-dynamic_padding = true
-
-[window.padding]
-x = 4
-y = 4
-
-[scrolling]
-history = 100000
-
-[terminal]
-osc52 = "CopyPaste"
-
-# Font - Monospace size 12
-[font]
-size = 12.0
-
-[font.normal]
-family = "Monospace"
-style = "Regular"
-
-[font.bold]
-style = "Bold"
-
-[font.italic]
-style = "Italic"
-
-# Cursor
-[cursor.style]
-shape = "Block"
-blinking = "Never"
-
-[cursor]
-vi_mode_style = { shape = "Block", blinking = "Never" }
-
-# Selection
-[selection]
-save_to_clipboard = true
-
-# URL hints - Ctrl+Shift+O to label URLs, click to open
-[[hints.enabled]]
-command = "xdg-open"
-hyperlinks = true
-post_processing = true
-persist = false
-regex = "(ipfs:|ipns:|magnet:|mailto:|gemini://|gopher://|https://|http://|news:|file:|git://|ssh:|ftp://)[^\\u0000-\\u001F\\u007F-\\u009F<>\"\\\\s{-}\\\\^⟨⟩`\\\\\\\\]+"
-
-[hints.enabled.binding]
-key = "O"
-mods = "Control|Shift"
-
-[hints.enabled.mouse]
-enabled = true
-
-# Keybindings
-[[keyboard.bindings]]
-key = "Space"
-mods = "Control|Shift"
-action = "ToggleViMode"
-
-# Toggle light/dark theme with F12
-[[keyboard.bindings]]
-key = "F12"
-command = { program = "/bin/sh", args = ["-c", "$HOME/.config/alacritty/toggle-theme.sh"] }
--- a/.config/alacritty/themes/dark.toml
+++ b/.config/alacritty/themes/dark.toml
@ -1,31 +0,0 @@
-# Dark theme - Alacritty defaults
-[colors]
-draw_bold_text_with_bright_colors = false
-
-[colors.primary]
-background = "#181818"
-foreground = "#d8d8d8"
-
-[colors.cursor]
-cursor = "#d8d8d8"
-text = "#181818"
-
-[colors.normal]
-black   = "#181818"
-red     = "#ac4242"
-green   = "#90a959"
-yellow  = "#f4bf75"
-blue    = "#6a9fb5"
-magenta = "#aa759f"
-cyan    = "#75b5aa"
-white   = "#d8d8d8"
-
-[colors.bright]
-black   = "#6b6b6b"
-red     = "#c55555"
-green   = "#aac474"
-yellow  = "#feca88"
-blue    = "#82b8c8"
-magenta = "#c28cb8"
-cyan    = "#93d3c3"
-white   = "#f8f8f8"
--- a/.config/alacritty/themes/light.toml
+++ b/.config/alacritty/themes/light.toml
@ -1,31 +0,0 @@
-# Light theme - ported from .Xresources
-[colors]
-draw_bold_text_with_bright_colors = false
-
-[colors.primary]
-background = "#eeeeee"
-foreground = "#444444"
-
-[colors.cursor]
-cursor = "#005f87"
-text = "#eeeeee"
-
-[colors.normal]
-black   = "#eeeeee"
-red     = "#af0000"
-green   = "#008700"
-yellow  = "#5f8700"
-blue    = "#0087af"
-magenta = "#878787"
-cyan    = "#005f87"
-white   = "#444444"
-
-[colors.bright]
-black   = "#bcbcbc"
-red     = "#d70000"
-green   = "#d70087"
-yellow  = "#8700af"
-blue    = "#d75f00"
-magenta = "#d75f00"
-cyan    = "#005faf"
-white   = "#005f87"
--- a/.config/alacritty/toggle-theme.sh
+++ b/.config/alacritty/toggle-theme.sh
@ -1,17 +0,0 @@
-#!/bin/sh
-# Toggle Alacritty between light and dark themes
-
-THEME_DIR="$HOME/.config/alacritty/themes"
-CURRENT="$THEME_DIR/current-theme.toml"
-
-# Read current theme by checking the symlink target
-if [ -L "$CURRENT" ]; then
-    target=$(readlink "$CURRENT")
-    case "$target" in
-        *light*) ln -sf "$THEME_DIR/dark.toml" "$CURRENT" ;;
-        *)       ln -sf "$THEME_DIR/light.toml" "$CURRENT" ;;
-    esac
-else
-    # No symlink yet, default to dark
-    ln -sf "$THEME_DIR/dark.toml" "$CURRENT"
-fi
--- a/.config/darktable/darktablerc
+++ b/.config/darktable/darktablerc
@ -1,13 +1,11 @@
 accel/assign_instance=FALSE
 accel/enable_fallbacks=false
-accel/hide_notice=false
 accel/load_defaults=TRUE
 accel/prefer_enabled=FALSE
 accel/prefer_expanded=FALSE
 accel/prefer_focused=TRUE
 accel/prefer_unmasked=FALSE
 accel/select_order=last instance
-accel/show_tab_in_prefs=true
 accel/slider_precision=0
 allow_lab_output=false
 ask_before_copy=TRUE
@ -16,10 +14,6 @@ ask_before_discard=TRUE
 ask_before_move=TRUE
 ask_before_remove=TRUE
 ask_before_rmdir=FALSE
-autosave_interval=10
-backthumbs_inactivity=5,000000
-backthumbs_initialize=FALSE
-backthumbs_mipsize=never
 bauhaus/scale=1,400000
 bauhaus/zoom_step=TRUE
 brush_smoothing=medium
@ -27,23 +21,8 @@ cache_color_managed=true
 cache_disk_backend=TRUE
 cache_disk_backend_full=FALSE
 channel_display=false color
-cldevice_v5_nvidiacudanvidiageforcertx2070super=0 250 0 16 16 128 0 0 0.000 0.000 0.250
-cldevice_v5_nvidiacudanvidiageforcertx2070super_building=-cl-fast-relaxed-math
-cldevice_v5_nvidiacudanvidiageforcertx2070super_id0=600
-clplatform_amdacceleratedparallelprocessing=TRUE
-clplatform_apple=FALSE
-clplatform_intelropenclhdgraphics=TRUE
-clplatform_nvidiacuda=TRUE
-clplatform_openclon12=FALSE
-clplatform_other=FALSE
-clplatform_rusticl=FALSE
 codepaths/openmp_simd=false
 codepaths/sse2=true
-colorlabel/blue=
-colorlabel/green=
-colorlabel/purple=
-colorlabel/red=
-colorlabel/yellow=
 compress_xmp_tags=only large entries
 context_help/url=https://docs.darktable.org/usermanual/
 context_help/use_default_url=true
@ -52,20 +31,16 @@ darkroom/modules/channelmixerrgb/optimization=0
 darkroom/modules/channelmixerrgb/safety=0,500000
 darkroom/modules/exposure/lightness=50,000000
 darkroom/mouse/middle_button_cycle_zoom_to_200_percent=TRUE
-darkroom/ui/0/bottom_size=122
 darkroom/ui/0/bottom_visible=TRUE
 darkroom/ui/0/header_visible=TRUE
-darkroom/ui/0/left_size=388
 darkroom/ui/0/left_visible=TRUE
 darkroom/ui/0/panel_collaps_state=
 darkroom/ui/0/panels_collapse_controls=TRUE
-darkroom/ui/0/right_size=459
 darkroom/ui/0/right_visible=TRUE
 darkroom/ui/0/toolbar_bottom_visible=TRUE
-darkroom/ui/0/toolbar_top_visible=FALSE
+darkroom/ui/0/toolbar_top_visible=TRUE
 darkroom/ui/activate_expand=FALSE
 darkroom/ui/auto_module_name_update=TRUE
-darkroom/ui/develop_mask=false
 darkroom/ui/hide_header_buttons=always
 darkroom/ui/iso12464_border=4,000000
 darkroom/ui/iso12464_ratio=0,400000
@ -74,8 +49,8 @@ darkroom/ui/overexposed/colorscheme=1
 darkroom/ui/overexposed/lower=-12.689999580383301
 darkroom/ui/overexposed/mode=0
 darkroom/ui/overexposed/upper=99.989997863769531
-darkroom/ui/overlay_color=1
-darkroom/ui/overlay_contrast=1,000000
+darkroom/ui/overlay_color=0
+darkroom/ui/overlay_contrast=0,500000
 darkroom/ui/rawoverexposed/colorscheme=0
 darkroom/ui/rawoverexposed/mode=0
 darkroom/ui/rawoverexposed/threshold=1
@ -100,7 +75,6 @@ database_cache_quality=89
 dt_cpubenchmark=0.23144501447677612
 font_prefs_align_right=
 font_size=12
-full_window/iso_12646=
 guides/darkroom/0/ashift/autoshow=TRUE
 guides/darkroom/0/atrous/autoshow=
 guides/darkroom/0/bilat/autoshow=
@ -108,20 +82,15 @@ guides/darkroom/0/borders/autoshow=
 guides/darkroom/0/channelmixerrgb/autoshow=
 guides/darkroom/0/clipping/autoshow=
 guides/darkroom/0/colorbalancergb/autoshow=
-guides/darkroom/0/colorequal/autoshow=
 guides/darkroom/0/colorzones/autoshow=
-guides/darkroom/0/crop/autoshow=TRUE
-guides/darkroom/0/defringe/autoshow=
+guides/darkroom/0/crop/autoshow=
 guides/darkroom/0/denoiseprofile/autoshow=
 guides/darkroom/0/diffuse/autoshow=
 guides/darkroom/0/dither/autoshow=
 guides/darkroom/0/exposure/autoshow=
 guides/darkroom/0/filmicrgb/autoshow=
 guides/darkroom/0/flip/autoshow=
-guides/darkroom/0/global/grid_nbh=2
-guides/darkroom/0/global/grid_nbv=2
-guides/darkroom/0/global/grid_subdiv=2
-guides/darkroom/0/global/guide=grid
+guides/darkroom/0/global/guide=rules of thirds
 guides/darkroom/0/global/show=
 guides/darkroom/0/hazeremoval/autoshow=
 guides/darkroom/0/lens/autoshow=
@ -131,18 +100,15 @@ guides/darkroom/0/tonecurve/autoshow=
 guides/darkroom/0/toneequal/autoshow=
 guides/lighttable/1/global/show=
 guides/lighttable/preview/global/show=
-guides/print/global/show=
-guides/slideshow/global/show=
 libraw_extensions=
-lighttable/ui/1/bottom_visible=FALSE
-lighttable/ui/1/header_visible=FALSE
-lighttable/ui/1/left_size=559
+lighttable/ui/1/bottom_visible=TRUE
+lighttable/ui/1/header_visible=TRUE
+lighttable/ui/1/left_size=462
 lighttable/ui/1/left_visible=TRUE
 lighttable/ui/1/panel_collaps_state=0
 lighttable/ui/1/panels_collapse_controls=TRUE
-lighttable/ui/1/right_size=316
 lighttable/ui/1/right_visible=TRUE
-lighttable/ui/1/toolbar_bottom_visible=FALSE
+lighttable/ui/1/toolbar_bottom_visible=TRUE
 lighttable/ui/1/toolbar_top_visible=TRUE
 lighttable/ui/expose_statuses=false
 lighttable/ui/milliseconds=FALSE
@ -160,10 +126,9 @@ lighttable/ui/single_module=FALSE
 lighttable/zoomable/last_offset=1
 lighttable/zoomable/last_pos_x=0
 lighttable/zoomable/last_pos_y=0
-lua/_scripts_install/debug=FALSE
 lua/_scripts_install/dont_show=FALSE
 lua/_scripts_install/remind=
-lua/autogrouper/active_gap=12
+lua/autogrouper/active_gap=1
 lua/executable_paths/git='/usr/bin/git'
 lua/script_manager/category_selector=1
 lua/script_manager/check_update=TRUE
@ -207,7 +172,6 @@ lua/script_manager/contrib/select_untagged=
 lua/script_manager/contrib/slideshowMusic=
 lua/script_manager/contrib/transfer_hierarchy=
 lua/script_manager/contrib/video_ffmpeg=
-lua/script_manager/dt-group-view/group-view=FALSE
 lua/script_manager/examples/api_version=
 lua/script_manager/examples/darkroom_demo=
 lua/script_manager/examples/gettextExample=
@ -219,7 +183,7 @@ lua/script_manager/examples/panels_demo=
 lua/script_manager/examples/preferenceExamples=
 lua/script_manager/examples/printExamples=
 lua/script_manager/examples/running_os=
-lua/script_manager/installed_repos=1,lua-scripts,/home/oke/.config/darktable/lua,2,dt-group-view,/home/oke/.config/darktable/lua/dt-group-view,
+lua/script_manager/installed_repos=1,lua-scripts,/home/oke/.config/darktable/lua,
 lua/script_manager/main_menu_action=3
 lua/script_manager/num_buttons=10
 lua/script_manager/official/check_for_updates=
@ -241,30 +205,27 @@ lua/script_manager/update_script_choices=1
 lua/script_manager/use_color=
 masks_scroll_down_increases=FALSE
 max_panel_height=400
-max_panel_width=1500
 metadata/resolution=300
 min_panel_height=64
-min_panel_width=150
 modules/default_presets_first=TRUE
 omit_tag_hierarchy=FALSE
 opencl=TRUE
-opencl_checksum=3494082353
+opencl_checksum=
 opencl_device_priority=*/!0,*/*/*/!0,*
 opencl_library=
 opencl_mandatory_timeout=400
 opencl_scheduling_profile=default
-opencl_tune_headroom=FALSE
 opencl_tuning_mode=nothing
 panel_scrollbars_always_visible=TRUE
-performance_configuration_version_completed=17
+performance_configuration_version_completed=14
 pixelpipe_synchronization_timeout=200
 plugins/capture/camera/live_view_fps=15
 plugins/capture/mode=0
 plugins/capture/storage/basedirectory=$(PICTURES_FOLDER)/darktable
 plugins/capture/storage/namepattern=$(YEAR)$(MONTH)$(DAY)_$(SEQUENCE).$(FILE_EXTENSION)
 plugins/capture/storage/subpath=$(YEAR)$(MONTH)$(DAY)_$(JOBCODE)
-plugins/collect/descending=TRUE
-plugins/collect/filmroll_sort=folder name
+plugins/collect/descending=true
+plugins/collect/filmroll_sort=id
 plugins/collection/colors_filter=80000000
 plugins/collection/descending=false
 plugins/collection/film_id=1
@ -283,18 +244,17 @@ plugins/darkroom/0/masks_visible=TRUE
 plugins/darkroom/0/metadata_view_visible=TRUE
 plugins/darkroom/0/snapshots_visible=TRUE
 plugins/darkroom/0/tagging_visible=TRUE
-plugins/darkroom/active=atrous
+plugins/darkroom/active=denoiseprofile
 plugins/darkroom/ashift/autocrop_value=2
-plugins/darkroom/ashift/expand_values=TRUE
+plugins/darkroom/ashift/expand_values=false
 plugins/darkroom/ashift/expanded=FALSE
 plugins/darkroom/ashift/favorite=FALSE
 plugins/darkroom/ashift/near_delta=20,000000
 plugins/darkroom/ashift/near_delta_draw=5,000000
 plugins/darkroom/ashift/visible=FALSE
 plugins/darkroom/atrous/aspect_percent=56
-plugins/darkroom/atrous/expanded=TRUE
+plugins/darkroom/atrous/expanded=FALSE
 plugins/darkroom/atrous/favorite=FALSE
-plugins/darkroom/atrous/graphheight=200
 plugins/darkroom/atrous/gui_channel=0
 plugins/darkroom/atrous/visible=FALSE
 plugins/darkroom/basecurve/auto_apply_percamera_presets=FALSE
@ -304,7 +264,7 @@ plugins/darkroom/basecurve/visible=TRUE
 plugins/darkroom/basicadj/expanded=FALSE
 plugins/darkroom/basicadj/favorite=FALSE
 plugins/darkroom/basicadj/visible=FALSE
-plugins/darkroom/bilat/expanded=FALSE
+plugins/darkroom/bilat/expanded=TRUE
 plugins/darkroom/bilat/favorite=FALSE
 plugins/darkroom/bilat/visible=TRUE
 plugins/darkroom/bilateral/expanded=FALSE
@ -364,7 +324,6 @@ plugins/darkroom/colorbalancergb/checker2/green=0.18000000715255737
 plugins/darkroom/colorbalancergb/checker2/red=0.18000000715255737
 plugins/darkroom/colorbalancergb/expanded=FALSE
 plugins/darkroom/colorbalancergb/favorite=FALSE
-plugins/darkroom/colorbalancergb/graphheight=200
 plugins/darkroom/colorbalancergb/visible=FALSE
 plugins/darkroom/colorchecker/expanded=FALSE
 plugins/darkroom/colorchecker/favorite=FALSE
@ -375,13 +334,6 @@ plugins/darkroom/colorcontrast/visible=FALSE
 plugins/darkroom/colorcorrection/expanded=FALSE
 plugins/darkroom/colorcorrection/favorite=FALSE
 plugins/darkroom/colorcorrection/visible=FALSE
-plugins/darkroom/colorequal/expand_options=
-plugins/darkroom/colorequal/expanded=FALSE
-plugins/darkroom/colorequal/favorite=FALSE
-plugins/darkroom/colorequal/graphheight=200
-plugins/darkroom/colorequal/gui_page=1
-plugins/darkroom/colorequal/show_sliders=
-plugins/darkroom/colorequal/visible=FALSE
 plugins/darkroom/colorin/expanded=FALSE
 plugins/darkroom/colorin/favorite=FALSE
 plugins/darkroom/colorin/visible=TRUE
@ -406,16 +358,14 @@ plugins/darkroom/colorzones/aspect_percent=56
 plugins/darkroom/colorzones/bg_sat_factor=0,500000
 plugins/darkroom/colorzones/expanded=FALSE
 plugins/darkroom/colorzones/favorite=FALSE
-plugins/darkroom/colorzones/graphheight=200
 plugins/darkroom/colorzones/gui_channel=0
 plugins/darkroom/colorzones/visible=FALSE
 plugins/darkroom/crop/expand_margins=TRUE
 plugins/darkroom/crop/expanded=FALSE
 plugins/darkroom/crop/favorite=FALSE
-plugins/darkroom/crop/ratio_d=1
-plugins/darkroom/crop/ratio_n=1
+plugins/darkroom/crop/ratio_d=0
+plugins/darkroom/crop/ratio_n=0
 plugins/darkroom/crop/visible=TRUE
-plugins/darkroom/default_presets_first=
 plugins/darkroom/defringe/expanded=FALSE
 plugins/darkroom/defringe/favorite=FALSE
 plugins/darkroom/defringe/visible=FALSE
@ -424,9 +374,8 @@ plugins/darkroom/demosaic/favorite=FALSE
 plugins/darkroom/demosaic/fdc_xover_iso=1600
 plugins/darkroom/demosaic/visible=TRUE
 plugins/darkroom/denoiseprofile/aspect_percent=56
-plugins/darkroom/denoiseprofile/expanded=FALSE
+plugins/darkroom/denoiseprofile/expanded=TRUE
 plugins/darkroom/denoiseprofile/favorite=FALSE
-plugins/darkroom/denoiseprofile/graphheight=300
 plugins/darkroom/denoiseprofile/show_compute_variance_mode=false
 plugins/darkroom/denoiseprofile/visible=TRUE
 plugins/darkroom/diffuse/expanded=FALSE
@ -437,14 +386,11 @@ plugins/darkroom/dither/favorite=FALSE
 plugins/darkroom/dither/visible=FALSE
 plugins/darkroom/duplicate/expanded=TRUE
 plugins/darkroom/duplicate/windowheight=400
-plugins/darkroom/enlargecanvas/expanded=FALSE
-plugins/darkroom/enlargecanvas/favorite=FALSE
-plugins/darkroom/enlargecanvas/visible=FALSE
 plugins/darkroom/equalizer/expanded=FALSE
 plugins/darkroom/equalizer/favorite=FALSE
 plugins/darkroom/equalizer/visible=FALSE
 plugins/darkroom/export/expanded=TRUE
-plugins/darkroom/export/last_preset=blog
+plugins/darkroom/export/last_preset=cewe
 plugins/darkroom/export/visible=true
 plugins/darkroom/exposure/expanded=FALSE
 plugins/darkroom/exposure/favorite=FALSE
@ -458,7 +404,6 @@ plugins/darkroom/filmicrgb/expanded=FALSE
 plugins/darkroom/filmicrgb/favorite=FALSE
 plugins/darkroom/filmicrgb/graph_show_labels=
 plugins/darkroom/filmicrgb/graph_view=
-plugins/darkroom/filmicrgb/graphheight=200
 plugins/darkroom/filmicrgb/visible=FALSE
 plugins/darkroom/finalscale/favorite=FALSE
 plugins/darkroom/finalscale/visible=FALSE
@ -476,7 +421,7 @@ plugins/darkroom/graduatednd/visible=FALSE
 plugins/darkroom/grain/expanded=FALSE
 plugins/darkroom/grain/favorite=FALSE
 plugins/darkroom/grain/visible=FALSE
-plugins/darkroom/groups=4
+plugins/darkroom/groups=3
 plugins/darkroom/hazeremoval/expanded=FALSE
 plugins/darkroom/hazeremoval/favorite=FALSE
 plugins/darkroom/hazeremoval/visible=TRUE
@ -488,9 +433,8 @@ plugins/darkroom/highpass/expanded=FALSE
 plugins/darkroom/highpass/favorite=FALSE
 plugins/darkroom/highpass/visible=FALSE
 plugins/darkroom/histogram/aspect_percent=56
-plugins/darkroom/histogram/graphheight=201
 plugins/darkroom/histogram/histogram=logarithmic
-plugins/darkroom/histogram/mode=RGB parade
+plugins/darkroom/histogram/mode=waveform
 plugins/darkroom/histogram/orient=horizontal
 plugins/darkroom/histogram/panel_position=right
 plugins/darkroom/histogram/show_blue=true
@ -504,7 +448,7 @@ plugins/darkroom/histogram/vectorscope/harmony_type=none
 plugins/darkroom/histogram/vectorscope/harmony_width=normal
 plugins/darkroom/histogram/vectorscope/scale=logarithmic
 plugins/darkroom/histogram/waveform=overlaid
-plugins/darkroom/history/expanded=TRUE
+plugins/darkroom/history/expanded=FALSE
 plugins/darkroom/history/windowheight=1000
 plugins/darkroom/hotpixels/expanded=FALSE
 plugins/darkroom/hotpixels/favorite=FALSE
@ -515,15 +459,12 @@ plugins/darkroom/invert/expanded=FALSE
 plugins/darkroom/invert/favorite=FALSE
 plugins/darkroom/invert/visible=FALSE
 plugins/darkroom/ioporder/expanded=FALSE
-plugins/darkroom/lens/expand_fine_tune=
-plugins/darkroom/lens/expand_vignette=TRUE
 plugins/darkroom/lens/expanded=FALSE
 plugins/darkroom/lens/favorite=FALSE
 plugins/darkroom/lens/visible=TRUE
 plugins/darkroom/levels/aspect_percent=56
 plugins/darkroom/levels/expanded=FALSE
 plugins/darkroom/levels/favorite=FALSE
-plugins/darkroom/levels/graphheight=200
 plugins/darkroom/levels/visible=FALSE
 plugins/darkroom/liquify/expanded=FALSE
 plugins/darkroom/liquify/favorite=FALSE
@ -531,7 +472,6 @@ plugins/darkroom/liquify/visible=FALSE
 plugins/darkroom/lowlight/aspect_percent=56
 plugins/darkroom/lowlight/expanded=FALSE
 plugins/darkroom/lowlight/favorite=FALSE
-plugins/darkroom/lowlight/graphheight=200
 plugins/darkroom/lowlight/visible=FALSE
 plugins/darkroom/lowpass/expanded=FALSE
 plugins/darkroom/lowpass/favorite=FALSE
@ -545,8 +485,8 @@ plugins/darkroom/mask_manager/visible=FALSE
 plugins/darkroom/masks/brush/border=0,050000
 plugins/darkroom/masks/brush/density=1,000000
 plugins/darkroom/masks/brush/hardness=0,660000
-plugins/darkroom/masks/circle/border=0,292555
-plugins/darkroom/masks/circle/size=0,500000
+plugins/darkroom/masks/circle/border=0,050000
+plugins/darkroom/masks/circle/size=0,050000
 plugins/darkroom/masks/ellipse/border=0,050000
 plugins/darkroom/masks/ellipse/flags=0
 plugins/darkroom/masks/ellipse/radius_a=0,050000
@ -554,22 +494,21 @@ plugins/darkroom/masks/ellipse/radius_b=0,035350
 plugins/darkroom/masks/ellipse/rotation=90,000000
 plugins/darkroom/masks/expand_properties=
 plugins/darkroom/masks/expanded=FALSE
-plugins/darkroom/masks/gradient/compression=0,035526
+plugins/darkroom/masks/gradient/compression=0,069389
 plugins/darkroom/masks/gradient/curvature=0
-plugins/darkroom/masks/gradient/rotation=0,143463
+plugins/darkroom/masks/gradient/rotation=350,891296
 plugins/darkroom/masks/gradient/steepness=0,000000
 plugins/darkroom/masks/heightview=300
-plugins/darkroom/masks/opacity=1,000000
-plugins/darkroom/masks/path/border=0,054109
+plugins/darkroom/masks/opacity=0,650000
+plugins/darkroom/masks/path/border=0,001600
 plugins/darkroom/metadata_view/expanded=FALSE
-plugins/darkroom/modulegroups/last_preset=oke
+plugins/darkroom/modulegroups/last_preset=workflow: scene-referred
 plugins/darkroom/modulegroups_basics_sections_labels=true
-plugins/darkroom/modulegroups_preset=oke
+plugins/darkroom/modulegroups_preset=workflow: scene-referred
 plugins/darkroom/monochrome/expanded=FALSE
 plugins/darkroom/monochrome/favorite=FALSE
 plugins/darkroom/monochrome/visible=FALSE
 plugins/darkroom/navigation/aspect_percent=56
-plugins/darkroom/navigation/graphheight=200
 plugins/darkroom/negadoctor/expanded=FALSE
 plugins/darkroom/negadoctor/favorite=FALSE
 plugins/darkroom/negadoctor/visible=FALSE
@ -578,21 +517,12 @@ plugins/darkroom/nlmeans/favorite=FALSE
 plugins/darkroom/nlmeans/visible=FALSE
 plugins/darkroom/overexposed/favorite=FALSE
 plugins/darkroom/overexposed/visible=FALSE
-plugins/darkroom/overlay/expanded=FALSE
-plugins/darkroom/overlay/favorite=FALSE
-plugins/darkroom/overlay/visible=FALSE
-plugins/darkroom/panel_swap=false
-plugins/darkroom/primaries/expanded=FALSE
-plugins/darkroom/primaries/favorite=FALSE
-plugins/darkroom/primaries/visible=FALSE
 plugins/darkroom/profile_gamma/expanded=FALSE
 plugins/darkroom/profile_gamma/favorite=FALSE
 plugins/darkroom/profile_gamma/visible=FALSE
-plugins/darkroom/quick_preset_list=(null)
 plugins/darkroom/rawdenoise/aspect_percent=56
 plugins/darkroom/rawdenoise/expanded=FALSE
 plugins/darkroom/rawdenoise/favorite=FALSE
-plugins/darkroom/rawdenoise/graphheight=200
 plugins/darkroom/rawdenoise/gui_channel=0
 plugins/darkroom/rawdenoise/visible=FALSE
 plugins/darkroom/rawoverexposed/favorite=FALSE
@ -614,7 +544,6 @@ plugins/darkroom/rgbcurve/visible=FALSE
 plugins/darkroom/rgblevels/aspect_percent=56
 plugins/darkroom/rgblevels/expanded=FALSE
 plugins/darkroom/rgblevels/favorite=FALSE
-plugins/darkroom/rgblevels/graphheight=200
 plugins/darkroom/rgblevels/visible=TRUE
 plugins/darkroom/rotatepixels/expanded=FALSE
 plugins/darkroom/rotatepixels/favorite=FALSE
@ -630,7 +559,6 @@ plugins/darkroom/sharpen/favorite=FALSE
 plugins/darkroom/sharpen/visible=TRUE
 plugins/darkroom/show_guides_in_ui=TRUE
 plugins/darkroom/show_warnings=TRUE
-plugins/darkroom/sigmoid/expand_primaries=
 plugins/darkroom/sigmoid/expand_values=
 plugins/darkroom/sigmoid/expanded=FALSE
 plugins/darkroom/sigmoid/favorite=FALSE
@ -646,13 +574,13 @@ plugins/darkroom/splittoning/visible=FALSE
 plugins/darkroom/spots/brush_border=0,050000
 plugins/darkroom/spots/brush_density=1,000000
 plugins/darkroom/spots/brush_hardness=0,660000
-plugins/darkroom/spots/circle_border=0,001000
-plugins/darkroom/spots/circle_size=0,001025
-plugins/darkroom/spots/ellipse_border=1,000000
-plugins/darkroom/spots/ellipse_flags=1
-plugins/darkroom/spots/ellipse_radius_a=0,002000
-plugins/darkroom/spots/ellipse_radius_b=0,001784
-plugins/darkroom/spots/ellipse_rotation=131,147766
+plugins/darkroom/spots/circle_border=0,001749
+plugins/darkroom/spots/circle_size=0,002245
+plugins/darkroom/spots/ellipse_border=0,020000
+plugins/darkroom/spots/ellipse_flags=0
+plugins/darkroom/spots/ellipse_radius_a=0,020000
+plugins/darkroom/spots/ellipse_radius_b=0,014140
+plugins/darkroom/spots/ellipse_rotation=90,000000
 plugins/darkroom/spots/expanded=FALSE
 plugins/darkroom/spots/favorite=FALSE
 plugins/darkroom/spots/path_border=0,050000
@ -699,7 +627,7 @@ plugins/darkroom/zonesystem/favorite=FALSE
 plugins/darkroom/zonesystem/visible=FALSE
 plugins/imageio/format/avif/bit_depth=
 plugins/imageio/format/avif/bpp=8
-plugins/imageio/format/avif/color_mode=false
+plugins/imageio/format/avif/color_mode=0
 plugins/imageio/format/avif/compression_type=0
 plugins/imageio/format/avif/quality=92
 plugins/imageio/format/avif/tiling=true
@ -708,8 +636,7 @@ plugins/imageio/format/exr/compression=4
 plugins/imageio/format/j2k/format=
 plugins/imageio/format/j2k/preset=
 plugins/imageio/format/j2k/quality=95
-plugins/imageio/format/jpeg/quality=95
-plugins/imageio/format/jpeg/subsample=3
+plugins/imageio/format/jpeg/quality=97
 plugins/imageio/format/jxl/bpp=8
 plugins/imageio/format/jxl/effort=7
 plugins/imageio/format/jxl/original=false
@ -733,15 +660,14 @@ plugins/imageio/format/tiff/bpp=8
 plugins/imageio/format/tiff/compress=2
 plugins/imageio/format/tiff/compresslevel=7
 plugins/imageio/format/tiff/pixelformat=false
-plugins/imageio/format/tiff/shortfile=false
+plugins/imageio/format/tiff/shortfile=1
 plugins/imageio/format/webp/comp_type=0
 plugins/imageio/format/webp/hint=0
 plugins/imageio/format/webp/quality=95
 plugins/imageio/format/xcf/bpp=32
-plugins/imageio/storage/disk/file_directory=/home/oke/Desktop/bilderrahmen_copy/2$(FILE_NAME)_$(ID)
+plugins/imageio/storage/disk/file_directory=/home/oke/Nextcloud/Fotobuch/St neu/bbb_$(FILE_NAME)
 plugins/imageio/storage/disk/overwrite=0
 plugins/imageio/storage/email/client=
-plugins/imageio/storage/export/piwigo/filename_pattern=
 plugins/imageio/storage/export/piwigo/server=
 plugins/imageio/storage/gallery/file_directory=$(HOME)/darktable_gallery/img_$(SEQUENCE)
 plugins/imageio/storage/gallery/title=darktable gallery
@ -772,22 +698,22 @@ plugins/lighttable/autogrouper/expanded=FALSE
 plugins/lighttable/base_layout=1
 plugins/lighttable/change_group_leader/expanded=FALSE
 plugins/lighttable/collect/expanded=TRUE
-plugins/lighttable/collect/history0=1:0:0:/home/oke/Pictures/Darktable/20240215$
-plugins/lighttable/collect/history1=1:0:0:/home/oke/Pictures/Darktable/20240205$
-plugins/lighttable/collect/history2=1:0:0:/home/oke/Pictures/Darktable/20240124$
-plugins/lighttable/collect/history3=1:0:0:/home/oke/Pictures/Darktable/20240106$
-plugins/lighttable/collect/history4=1:0:0:/home/oke/Pictures/Darktable/20231217$
-plugins/lighttable/collect/history5=1:0:0:/home/oke/Pictures/Darktable/20231107$
-plugins/lighttable/collect/history6=1:0:0:/home/oke/Pictures/Darktable/20231009$
-plugins/lighttable/collect/history7=1:0:0:/home/oke/Pictures/Darktable/20231006$
-plugins/lighttable/collect/history8=1:0:0:/home/oke/Desktop/asdf$
-plugins/lighttable/collect/history9=1:0:0:/home/oke/Pictures/Darktable/20240827$
-plugins/lighttable/collect/history_hide=FALSE
+plugins/lighttable/collect/history0=1:0:1:%$
+plugins/lighttable/collect/history1=1:0:0:%$
+plugins/lighttable/collect/history2=1:0:17:tmb$
+plugins/lighttable/collect/history3=1:0:17:%$
+plugins/lighttable/collect/history4=1:0:1:/home/oke/Pictures/Darktable/20231008$
+plugins/lighttable/collect/history5=1:0:1:/home/oke/Pictures/Darktable/20231017$
+plugins/lighttable/collect/history6=1:0:0:/home/oke/Pictures/Darktable/20231018$
+plugins/lighttable/collect/history7=1:0:0:/home/oke/Pictures/Darktable/20231005$
+plugins/lighttable/collect/history8=1:0:0:/home/oke/Pictures/Darktable/20230929$
+plugins/lighttable/collect/history9=1:0:0:/home/oke/Pictures/Darktable/20230927$
+plugins/lighttable/collect/history_hide=false
 plugins/lighttable/collect/history_max=10
 plugins/lighttable/collect/history_next_pos=0
 plugins/lighttable/collect/history_pos0=1
 plugins/lighttable/collect/history_pos1=1
-plugins/lighttable/collect/history_pos2=1
+plugins/lighttable/collect/history_pos2=16
 plugins/lighttable/collect/history_pos3=1
 plugins/lighttable/collect/history_pos4=1
 plugins/lighttable/collect/history_pos5=1
@ -795,8 +721,8 @@ plugins/lighttable/collect/history_pos6=1
 plugins/lighttable/collect/history_pos7=1
 plugins/lighttable/collect/history_pos8=1
 plugins/lighttable/collect/history_pos9=1
-plugins/lighttable/collect/item0=0
-plugins/lighttable/collect/item1=0
+plugins/lighttable/collect/item0=1
+plugins/lighttable/collect/item1=17
 plugins/lighttable/collect/item2=0
 plugins/lighttable/collect/item3=0
 plugins/lighttable/collect/item4=0
@ -819,7 +745,7 @@ plugins/lighttable/collect/mode9=0
 plugins/lighttable/collect/mode99999=
 plugins/lighttable/collect/num_rules=1
 plugins/lighttable/collect/single-click=FALSE
-plugins/lighttable/collect/string0=/home/oke/Pictures/Darktable/20240215
+plugins/lighttable/collect/string0=
 plugins/lighttable/collect/string1=
 plugins/lighttable/collect/string2=
 plugins/lighttable/collect/string3=
@ -830,10 +756,8 @@ plugins/lighttable/collect/string7=
 plugins/lighttable/collect/string8=
 plugins/lighttable/collect/string9=
 plugins/lighttable/collect/windowheight=500
-plugins/lighttable/collect_visible=TRUE
 plugins/lighttable/copy_history/expanded=FALSE
-plugins/lighttable/copy_history/pastemode=1
-plugins/lighttable/copy_history_visible=TRUE
+plugins/lighttable/copy_history/pastemode=0
 plugins/lighttable/copy_metadata/colors=
 plugins/lighttable/copy_metadata/geotags=
 plugins/lighttable/copy_metadata/metadata=
@ -846,12 +770,12 @@ plugins/lighttable/culling_zoom_mode=0
 plugins/lighttable/draw_group_borders=true
 plugins/lighttable/export/ask_before_export_overwrite=TRUE
 plugins/lighttable/export/dimensions_type=0
-plugins/lighttable/export/expanded=FALSE
+plugins/lighttable/export/expanded=TRUE
 plugins/lighttable/export/export_masks=FALSE
 plugins/lighttable/export/force_lcms2=FALSE
-plugins/lighttable/export/format_name=copy
-plugins/lighttable/export/height=2160
-plugins/lighttable/export/high_quality_processing=TRUE
+plugins/lighttable/export/format_name=tiff
+plugins/lighttable/export/height=0
+plugins/lighttable/export/high_quality_processing=FALSE
 plugins/lighttable/export/iccintent=-1
 plugins/lighttable/export/iccprofile=
 plugins/lighttable/export/icctype=-1
@ -864,34 +788,33 @@ plugins/lighttable/export/resizing_factor=1
 plugins/lighttable/export/storage_name=disk
 plugins/lighttable/export/style=
 plugins/lighttable/export/style_append=FALSE
-plugins/lighttable/export/upscale=FALSE
-plugins/lighttable/export/width=2160
-plugins/lighttable/export_visible=TRUE
+plugins/lighttable/export/upscale=TRUE
+plugins/lighttable/export/width=0
 plugins/lighttable/extended_pattern=$(FILE_NAME).$(FILE_EXTENSION)$(NL)$(EXIF_EXPOSURE) • f/$(EXIF_APERTURE) • $(EXIF_FOCAL_LENGTH)mm • $(EXIF_ISO) ISO $(SIDECAR_TXT)
 plugins/lighttable/filtering/expanded=TRUE
-plugins/lighttable/filtering/history0=3:0:32:0:1:%$0:18:0:1:0x80000000$0:33:0:1:%$
-plugins/lighttable/filtering/history1=3:0:32:0:1:%$0:18:0:1:0x80000000$0:33:0:1:<=-1$
-plugins/lighttable/filtering/history2=3:0:32:0:1:%$0:18:0:1:0x80000000$0:33:0:1:[0;0]$
-plugins/lighttable/filtering/history3=4:0:32:0:1:%$0:18:0:1:0x80000000$0:33:0:1:%$0:11:1:0:%$
+plugins/lighttable/filtering/history0=4:0:32:0:1:>=0$0:18:0:1:0x80000000$0:33:0:1:%$0:11:0:0:>=2023:10:15 12:27:46$
+plugins/lighttable/filtering/history1=4:0:32:0:1:1$0:18:0:1:0x80000000$0:33:0:1:%$0:11:0:0:>=2023:10:15 12:27:46$
+plugins/lighttable/filtering/history2=4:0:32:0:1:%$0:18:0:1:0x80000000$0:33:0:1:%$0:11:0:0:>=2023:10:15 12:27:46$
+plugins/lighttable/filtering/history3=4:0:32:0:1:%$0:18:0:1:0x80000000$0:33:0:1:%tmb%$0:11:0:0:>=2023:10:15 12:27:46$
 plugins/lighttable/filtering/history4=4:0:32:0:1:%$0:18:0:1:0x80000000$0:33:0:1:%$0:11:0:0:%$
-plugins/lighttable/filtering/history5=4:0:32:0:1:%$0:18:0:1:0x80000002$0:33:0:1:%$0:11:0:0:%$
-plugins/lighttable/filtering/history6=4:0:32:0:1:>=5$0:18:0:1:0x80000002$0:33:0:1:%$0:11:0:0:%$
-plugins/lighttable/filtering/history7=4:0:32:0:1:%$0:18:0:1:0x80000003$0:33:0:1:%$0:11:0:0:%$
-plugins/lighttable/filtering/history8=4:0:32:0:1:%$0:18:0:1:0x80000001$0:33:0:1:%$0:11:0:0:%$
-plugins/lighttable/filtering/history9=4:0:32:0:1:%$0:18:0:1:0x80000010$0:33:0:1:%$0:11:0:0:%$
+plugins/lighttable/filtering/history5=4:0:32:0:1:%$0:18:0:1:0x80000000$0:33:0:1:%$0:11:0:0:<=2023:10:16 04:07:07$
+plugins/lighttable/filtering/history6=3:0:32:0:1:%$0:18:0:1:0x80000000$0:33:0:1:%$
+plugins/lighttable/filtering/history7=3:0:32:0:1:%$0:18:0:1:0x80000000$0:33:0:1:%20230216_2046_021%$
+plugins/lighttable/filtering/history8=3:0:32:0:1:%$0:18:0:1:0x80000000$0:33:0:1:%20230216_2046_0214%$
+plugins/lighttable/filtering/history9=3:0:32:0:1:>=0$0:18:0:1:0x80000000$0:33:0:1:%20230216_2046_0214%$
 plugins/lighttable/filtering/history_max=10
-plugins/lighttable/filtering/item0=18
-plugins/lighttable/filtering/item1=0
-plugins/lighttable/filtering/item2=0
-plugins/lighttable/filtering/item3=0
+plugins/lighttable/filtering/item0=32
+plugins/lighttable/filtering/item1=18
+plugins/lighttable/filtering/item2=33
+plugins/lighttable/filtering/item3=11
 plugins/lighttable/filtering/item4=0
 plugins/lighttable/filtering/item5=0
 plugins/lighttable/filtering/item6=0
 plugins/lighttable/filtering/item7=0
 plugins/lighttable/filtering/item8=0
 plugins/lighttable/filtering/item9=
-plugins/lighttable/filtering/lastsort=2
-plugins/lighttable/filtering/lastsortorder=1
+plugins/lighttable/filtering/lastsort=0
+plugins/lighttable/filtering/lastsortorder=0
 plugins/lighttable/filtering/mode0=0
 plugins/lighttable/filtering/mode1=0
 plugins/lighttable/filtering/mode2=0
@ -902,7 +825,7 @@ plugins/lighttable/filtering/mode6=0
 plugins/lighttable/filtering/mode7=0
 plugins/lighttable/filtering/mode8=0
 plugins/lighttable/filtering/mode9=
-plugins/lighttable/filtering/num_rules=1
+plugins/lighttable/filtering/num_rules=4
 plugins/lighttable/filtering/num_sort=1
 plugins/lighttable/filtering/off0=0
 plugins/lighttable/filtering/off1=0
@ -915,40 +838,22 @@ plugins/lighttable/filtering/off7=0
 plugins/lighttable/filtering/off8=0
 plugins/lighttable/filtering/off9=
 plugins/lighttable/filtering/sort0=1
-plugins/lighttable/filtering/sort1=0
-plugins/lighttable/filtering/sort2=0
-plugins/lighttable/filtering/sort3=0
-plugins/lighttable/filtering/sort4=0
-plugins/lighttable/filtering/sort5=0
-plugins/lighttable/filtering/sort6=0
-plugins/lighttable/filtering/sort7=0
-plugins/lighttable/filtering/sort8=0
-plugins/lighttable/filtering/sort9=
 plugins/lighttable/filtering/sort_history0=1:1:0$
 plugins/lighttable/filtering/sort_history1=1:1:1$
-plugins/lighttable/filtering/sort_history2=1:2:1$
-plugins/lighttable/filtering/sort_history3=1:2:0$
-plugins/lighttable/filtering/sort_history4=1:4:1$
-plugins/lighttable/filtering/sort_history5=1:11:0$
-plugins/lighttable/filtering/sort_history6=2:1:0$13:0$
-plugins/lighttable/filtering/sort_history7=2:11:0$13:0$
-plugins/lighttable/filtering/sort_history8=2:11:0$15:0$
-plugins/lighttable/filtering/sort_history9=2:0:0$15:0$
+plugins/lighttable/filtering/sort_history2=1:0:1$
+plugins/lighttable/filtering/sort_history3=1:10:1$
+plugins/lighttable/filtering/sort_history4=1:14:1$
+plugins/lighttable/filtering/sort_history5=1:2:1$
+plugins/lighttable/filtering/sort_history6=1:2:0$
+plugins/lighttable/filtering/sort_history7=1:3:0$
+plugins/lighttable/filtering/sort_history8=1:0:0$
+plugins/lighttable/filtering/sort_history9=
 plugins/lighttable/filtering/sort_history_max=10
 plugins/lighttable/filtering/sortorder0=0
-plugins/lighttable/filtering/sortorder1=0
-plugins/lighttable/filtering/sortorder2=0
-plugins/lighttable/filtering/sortorder3=0
-plugins/lighttable/filtering/sortorder4=0
-plugins/lighttable/filtering/sortorder5=0
-plugins/lighttable/filtering/sortorder6=0
-plugins/lighttable/filtering/sortorder7=0
-plugins/lighttable/filtering/sortorder8=0
-plugins/lighttable/filtering/sortorder9=
-plugins/lighttable/filtering/string0=0x80000000
-plugins/lighttable/filtering/string1=
+plugins/lighttable/filtering/string0=>=0
+plugins/lighttable/filtering/string1=0x80000000
 plugins/lighttable/filtering/string2=
-plugins/lighttable/filtering/string3=
+plugins/lighttable/filtering/string3=>=2023:10:15 12:27:46
 plugins/lighttable/filtering/string4=
 plugins/lighttable/filtering/string5=
 plugins/lighttable/filtering/string6=
@ -956,8 +861,8 @@ plugins/lighttable/filtering/string7=
 plugins/lighttable/filtering/string8=
 plugins/lighttable/filtering/string9=
 plugins/lighttable/filtering/top0=1
-plugins/lighttable/filtering/top1=0
-plugins/lighttable/filtering/top2=0
+plugins/lighttable/filtering/top1=1
+plugins/lighttable/filtering/top2=1
 plugins/lighttable/filtering/top3=0
 plugins/lighttable/filtering/top4=0
 plugins/lighttable/filtering/top5=0
@ -965,17 +870,13 @@ plugins/lighttable/filtering/top6=0
 plugins/lighttable/filtering/top7=0
 plugins/lighttable/filtering/top8=0
 plugins/lighttable/filtering/top9=
-plugins/lighttable/filtering_visible=TRUE
 plugins/lighttable/geotagging/expanded=FALSE
 plugins/lighttable/geotagging/heighttracklist=50
 plugins/lighttable/geotagging/tz=UTC
-plugins/lighttable/geotagging_visible=TRUE
 plugins/lighttable/hide_default_presets=FALSE
 plugins/lighttable/image/expanded=TRUE
-plugins/lighttable/image_visible=TRUE
 plugins/lighttable/images_in_row=5
 plugins/lighttable/import/expanded=TRUE
-plugins/lighttable/import_visible=TRUE
 plugins/lighttable/layout=1
 plugins/lighttable/live_view/overlay_imgid=
 plugins/lighttable/live_view/overlay_mode=
@ -988,7 +889,6 @@ plugins/lighttable/metadata/expanded=FALSE
 plugins/lighttable/metadata/image id_flag=4
 plugins/lighttable/metadata/notes_flag=4
 plugins/lighttable/metadata/notes_text_height=1
-plugins/lighttable/metadata/preserved filename_flag=5
 plugins/lighttable/metadata/publisher_flag=4
 plugins/lighttable/metadata/publisher_text_height=1
 plugins/lighttable/metadata/rights_flag=4
@ -1001,8 +901,6 @@ plugins/lighttable/metadata_view/expanded=FALSE
 plugins/lighttable/metadata_view/pretty_location=TRUE
 plugins/lighttable/metadata_view/visible=
 plugins/lighttable/metadata_view/windowheight=1000
-plugins/lighttable/metadata_view_visible=TRUE
-plugins/lighttable/metadata_visible=TRUE
 plugins/lighttable/overlay_timeout=3
 plugins/lighttable/overlays/0/0=0
 plugins/lighttable/overlays/0/1=1
@ -1036,7 +934,7 @@ plugins/lighttable/preview/styles_visible=TRUE
 plugins/lighttable/preview/tagging_visible=TRUE
 plugins/lighttable/preview/timeline_visible=FALSE
 plugins/lighttable/recentcollect/expanded=FALSE
-plugins/lighttable/recentcollect/hide=TRUE
+plugins/lighttable/recentcollect/hide=true
 plugins/lighttable/recentcollect/line0=
 plugins/lighttable/recentcollect/line1=
 plugins/lighttable/recentcollect/line2=
@ -1051,13 +949,11 @@ plugins/lighttable/recentcollect/max_items=10
 plugins/lighttable/recentcollect/num_items=0
 plugins/lighttable/recentcollect/windowheight=1000
 plugins/lighttable/script_manager/expanded=FALSE
-plugins/lighttable/select/expanded=TRUE
-plugins/lighttable/select_visible=TRUE
+plugins/lighttable/select/expanded=FALSE
 plugins/lighttable/style/applymode=
 plugins/lighttable/style/ask_before_delete_style=TRUE
 plugins/lighttable/style/windowheight=400
-plugins/lighttable/styles/expanded=TRUE
-plugins/lighttable/styles_visible=TRUE
+plugins/lighttable/styles/expanded=FALSE
 plugins/lighttable/tagging/ask_before_delete_tag=TRUE
 plugins/lighttable/tagging/case_sensitivity=insensitive
 plugins/lighttable/tagging/confidence=50
@ -1068,13 +964,12 @@ plugins/lighttable/tagging/heightdictionarywindow=200
 plugins/lighttable/tagging/hidehierarchy=false
 plugins/lighttable/tagging/listsortedbycount=false
 plugins/lighttable/tagging/nb_recent_tags=20
-plugins/lighttable/tagging/no_uncategorized=FALSE
+plugins/lighttable/tagging/no_uncategorized=false
 plugins/lighttable/tagging/nosuggestion=false
-plugins/lighttable/tagging/recent_tags=blog_generated','tmb','rechts','4','fingerabdruck','1','2','3','links','r1','Standesamt','Nordhörn','Deko&Essen','Aufgaben','Stina','Fotografin
+plugins/lighttable/tagging/recent_tags=tmb','rechts','4','fingerabdruck','1','2','3','links','r1','Standesamt','Nordhörn','Deko&Essen','Aufgaben','Stina','Fotografin
 plugins/lighttable/tagging/treeview=false
-plugins/lighttable/tagging_visible=TRUE
 plugins/lighttable/thumbnail_hq_min_level=720p
-plugins/lighttable/thumbnail_raw_min_level=always
+plugins/lighttable/thumbnail_raw_min_level=never
 plugins/lighttable/thumbnail_sizes=120|400
 plugins/lighttable/thumbnail_tooltip_pattern=<b>$(FILE_NAME).$(FILE_EXTENSION)</b>$(NL)$(EXIF.DATE.REGIONAL) $(EXIF.TIME.REGIONAL)$(NL)$(EXIF_EXPOSURE) • f/$(EXIF_APERTURE) • $(EXIF_FOCAL_LENGTH) mm • $(EXIF_ISO) ISO
 plugins/lighttable/timeline/last_zoom=0
@ -1084,7 +979,7 @@ plugins/lighttable/tooltips/0/2=false
 plugins/lighttable/tooltips/1/0=TRUE
 plugins/lighttable/tooltips/1/1=TRUE
 plugins/lighttable/tooltips/1/2=true
-plugins/lighttable/tooltips/2/0=TRUE
+plugins/lighttable/tooltips/2/0=true
 plugins/lighttable/tooltips/2/1=TRUE
 plugins/lighttable/tooltips/2/2=false
 plugins/lighttable/tooltips/culling/0=false
@ -1093,9 +988,9 @@ plugins/map/epsilon_factor=25
 plugins/map/filter_images_drawn=false
 plugins/map/geotagging_search_url=https://nominatim.openstreetmap.org/search/%s?format=xml&limit=%d&polygon_text=1
 plugins/map/images_thumbnail=thumbnail
-plugins/map/latitude=-12.970474243164062
+plugins/map/latitude=50.304294586181641
 plugins/map/locationshape=
-plugins/map/longitude=-38.507820129394531
+plugins/map/longitude=7.3950681686401367
 plugins/map/map_source=OpenStreetMap I
 plugins/map/max_images_drawn=100
 plugins/map/max_outline_nodes=10000
@ -1103,14 +998,8 @@ plugins/map/min_images_per_group=1
 plugins/map/show_map_osd=true
 plugins/map/show_outline=true
 plugins/map/showalllocations=FALSE
-plugins/map/zoom=6
+plugins/map/zoom=1
 plugins/midi/devices=
-plugins/print/collect/expanded=FALSE
-plugins/print/collect_visible=TRUE
-plugins/print/filtering/expanded=FALSE
-plugins/print/filtering_visible=TRUE
-plugins/print/metadata_view/expanded=FALSE
-plugins/print/metadata_view_visible=TRUE
 plugins/print/print/black_point_compensation=TRUE
 plugins/print/print/bottom_margin=17,000000
 plugins/print/print/grid_size=10,000000
@ -1119,66 +1008,41 @@ plugins/print/print/iccprofile=
 plugins/print/print/icctype=-1
 plugins/print/print/left_margin=17,000000
 plugins/print/print/lock_borders=
-plugins/print/print/medium=
-plugins/print/print/paper=A4
-plugins/print/print/printer=Brother-MFC-L2710DW-series
 plugins/print/print/right_margin=17,000000
 plugins/print/print/style=
 plugins/print/print/style_append=
 plugins/print/print/top_margin=17,000000
 plugins/print/print/unit=mm
-plugins/print/print_settings/expanded=TRUE
-plugins/print/print_settings_visible=TRUE
 plugins/print/printer/iccintent=
 plugins/print/printer/iccprofile=
 plugins/print/printer/icctype=-1
 plugins/pwstorage/pwstorage_backend=none
 plugins/session/jobcode=capture job
-plugins/slideshow/metadata_view/expanded=FALSE
-plugins/slideshow/metadata_view_visible=TRUE
 pressure_sensitivity=off
 preview_downsampling=original
-print/ui/bottom_visible=TRUE
-print/ui/header_visible=TRUE
-print/ui/left_visible=TRUE
-print/ui/panel_collaps_state=
-print/ui/panels_collapse_controls=TRUE
-print/ui/right_visible=TRUE
-print/ui/toolbar_bottom_visible=TRUE
-print/ui/toolbar_top_visible=TRUE
 rating_one_double_tap=FALSE
 resource_default=512 8 128 700
 resource_large=700 16 128 900
 resource_small=128 4 64 400
 resource_unrestricted=16384 1024 128 900
 resourcelevel=default
-run_crawler_on_start=TRUE
+run_crawler_on_start=FALSE
 screen_dpi_overwrite=-1,000000
-second_window/fullscreen=FALSE
-second_window/iso_12646=
 second_window/last_visible=FALSE
-second_window/maximized=FALSE
-second_window/window_h=1327
-second_window/window_w=2558
-second_window/window_x=0
-second_window/window_y=112
 send_to_trash=TRUE
 session/base_directory_pattern=$(PICTURES_FOLDER)/Darktable
 session/filename_pattern=$(EXIF.YEAR)$(EXIF.MONTH)$(EXIF.DAY)_$(EXIF.HOUR)$(EXIF.MINUTE)_$(SEQUENCE).$(FILE_EXTENSION)
 session/sub_directory_pattern=$(EXIF.YEAR)$(EXIF.MONTH)$(EXIF.DAY)
 session/use_filename=FALSE
-setup_import_directory=TRUE
 shortcuts/window_split=322
 show_folder_levels=1
-show_splash_screen=true
 slideshow/ui/panel_collaps_state=1
-slideshow/ui/panels_collapse_controls=FALSE
+slideshow/ui/panels_collapse_controls=false
 slideshow_delay=5
 storage/piwigo/conflict=0
 storage/piwigo/last_album=
 storage/piwigo/overwrite=0
 themes/usercss=false
-thumbtable_fractional_scrolling=false
 ui/detect_mono_exif=FALSE
 ui/hide_tooltips=
 ui/performance=FALSE
@ -1201,8 +1065,6 @@ ui_last/colorpicker_large=false
 ui_last/colorpicker_mode=mean
 ui_last/colorpicker_model=RGB
 ui_last/colorpicker_restrict_histogram=false
-ui_last/copy_path=/home/oke/Desktop/asdf
-ui_last/display2_profile_source=
 ui_last/display_profile_source=all
 ui_last/expander_histogram=-1
 ui_last/expander_history=-1
@ -1210,7 +1072,7 @@ ui_last/expander_import=FALSE
 ui_last/expander_metadata=0
 ui_last/expander_navigation=-1
 ui_last/expander_snapshots=-1
-ui_last/fullscreen=TRUE
+ui_last/fullscreen=FALSE
 ui_last/grouping=TRUE
 ui_last/ignore_exif_rating=false
 ui_last/import_apply_metadata=false
@ -1219,24 +1081,22 @@ ui_last/import_datetime_override=
 ui_last/import_dialog_height=600
 ui_last/import_dialog_paned_places_pos=150
 ui_last/import_dialog_paned_pos=260
-ui_last/import_dialog_show_home=TRUE
-ui_last/import_dialog_show_mounted=TRUE
-ui_last/import_dialog_show_pictures=TRUE
+ui_last/import_dialog_show_home=true
+ui_last/import_dialog_show_mounted=true
+ui_last/import_dialog_show_pictures=true
 ui_last/import_dialog_width=800
 ui_last/import_ignore_jpegs=false
-ui_last/import_ignore_nonraws=FALSE
 ui_last/import_initial_rating=1
 ui_last/import_jobcode=no_name
 ui_last/import_keep_open=false
 ui_last/import_last_creator=
 ui_last/import_last_description=
-ui_last/import_last_directory=/home/oke/Desktop/bilderrahmen_copy
+ui_last/import_last_directory=/run/media/oke/disk/DCIM/102MSDCF
 ui_last/import_last_folder_descending=FALSE
-ui_last/import_last_image=181670
+ui_last/import_last_image=75653
 ui_last/import_last_image id=
 ui_last/import_last_notes=
-ui_last/import_last_place=/home/oke
-ui_last/import_last_preserved filename=
+ui_last/import_last_place=/run/media/oke/disk
 ui_last/import_last_publisher=
 ui_last/import_last_rights=
 ui_last/import_last_root=
@ -1244,12 +1104,12 @@ ui_last/import_last_tags=
 ui_last/import_last_tags_imported=true
 ui_last/import_last_title=
 ui_last/import_last_version name=
-ui_last/import_recursive=TRUE
+ui_last/import_recursive=false
 ui_last/import_select_new=TRUE
-ui_last/maximized=TRUE
+ui_last/maximized=FALSE
 ui_last/modulegroups_dialog_height=700
 ui_last/modulegroups_dialog_width=1100
-ui_last/move_path=/home/oke/Pictures/Darktable/20240625
+ui_last/move_path=/home/oke/moved2
 ui_last/no_april1st=true
 ui_last/panel_bottom=0
 ui_last/panel_left=-1
@ -1263,9 +1123,9 @@ ui_last/shortcuts_dialog_width=1100
 ui_last/styles_create_duplicate=
 ui_last/theme=darktable-elegant-grey
 ui_last/view=0
-ui_last/window_h=1440
-ui_last/window_w=2560
+ui_last/window_h=1088
+ui_last/window_w=958
 ui_last/window_x=0
-ui_last/window_y=0
+ui_last/window_y=111
 use_system_font=TRUE
 write_sidecar_files=on import
--- a/.config/i3/config
+++ b/.config/i3/config
@ -9,12 +9,11 @@
 #
 # Please see https://i3wm.org/docs/userguide.html for a complete reference!

-set $terminal alacritty
+set $terminal xterm
 set $mod Mod3
 set $screenlock  ~/.dotfiles/scripts/i3lock_oke

-exec --no-startup-id inputplug -d -0 -c ~/.dotfiles/scripts/inputplug_handler
-bindsym Mod1+k exec --no-startup-id ~/.dotfiles/scripts/mod_keys
+exec_always --no-startup-id ~/.dotfiles/scripts/mod_keys

 exec --no-startup-id ~/.dotfiles/scripts/clear_red
 exec --no-startup-id xidlehook --detect-sleep --not-when-fullscreen --timer 60 'xbacklight -get > .last_backlight; xbacklight -set 1' 'xbacklight -set $(cat .last_backlight)'
@ -153,7 +152,7 @@ exec --no-startup-id protonmail-bridge --no-window
 exec --no-startup-id nextcloud

 # must be last
-exec --no-startup-id i3-msg 'workspace $ws1; exec "$terminal -e \\"$HOME/.winfo.sh; zsh\\""'
+exec --no-startup-id i3-msg 'workspace $ws1; exec "xterm -e \\"$HOME/.winfo.sh; zsh\\""'

 # switch to workspace
 bindsym $mod+1 workspace number $ws1
--- a/.zshrc
+++ b/.zshrc
@ -105,7 +105,4 @@ source $ZSH/oh-my-zsh.sh

 if [[ -z $DISPLAY ]] && [[ $(tty) = /dev/tty1 ]]; then exec startx; fi

-PATH="$HOME/.dotfiles/scripts:$HOME/.local/bin:${PATH}"
-
-# opencode
-export PATH=/home/oke/.opencode/bin:$PATH
+PATH="$HOME/.dotfiles/scripts:${PATH}"
--- a/common.sh
+++ b/common.sh
@ -8,6 +8,15 @@ WORKSTATION=0
 SYSTEM=0


+if [[ -n "$DISPLAY" ]] && command -v meld &> /dev/null;
+then
+    merge_cmd=(meld)
+else
+    merge_cmd=(vim -d)
+fi
+
+
+
 if [[ -n "$DISPLAY" ]] && command -v meld &> /dev/null;
 then
    merge_cmd=(meld)
--- a/install_dotfiles.sh
+++ b/install_dotfiles.sh
@ -134,14 +134,6 @@ if [ "${WORKSTATION}" -eq 1 ]; then
    install .xinitrc
    install .config/i3/config
    install .config/i3status-rust/config.toml
-    install .config/alacritty/alacritty.toml
-    install .config/alacritty/toggle-theme.sh
-    install .config/alacritty/themes/light.toml
-    install .config/alacritty/themes/dark.toml
-    # Create default theme symlink (dark) if it doesn't exist
-    if [ ! -e "${HOME}/.config/alacritty/themes/current-theme.toml" ]; then
-        ln -s "${HOME}/.config/alacritty/themes/dark.toml" "${HOME}/.config/alacritty/themes/current-theme.toml"
-    fi
 fi

 if [ "${SYSTEM}" -eq 1 ] && [ "${WORKSTATION}" -eq 1 ]; then
@ -150,14 +142,14 @@ if [ "${SYSTEM}" -eq 1 ] && [ "${WORKSTATION}" -eq 1 ]; then
    install -r etc/acpi/handler.sh
    install -r etc/acpi/toggle_mute.sh
    install -r etc/acpi/volume.sh
-    install -r usr/share/X11/xorg.conf.d/40-libinput.conf
+    install -r usr/share/X11/xorg.conf.d/40-libinput.confxml
    install -r etc/udev/rules.d/backlight.rules
 fi

 if [ "${EXTRA}" -eq 1 ] && [ "${WORKSTATION}" -eq 1 ]; then
    install .config/darktable/darktablerc
    install -r usr/share/darktable/noiseprofiles.json
-    install -r usr/share/lensfun/version_1/compact-sony.xml
+    install -r usr/share/lensfun/version_1/compact-sony.
 fi

 if [ "${DEV}" -eq 1 ] && [ "${WORKSTATION}" -eq 1 ]; then
--- a/install_packages_arch.sh
+++ b/install_packages_arch.sh
@ -61,7 +61,6 @@ declare -ar pkgs_i3_environment=(
    i3-gaps
    i3status-rust
    i3lock-color
-    inputplug
    network-manager-applet
    playerctl
    rofi
--- a/install_packages_debian.sh
+++ b/install_packages_debian.sh
@ -0,0 +1,187 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
+
+source "${SCRIPT_DIR}/common.sh"
+
+# No AUR helper needed on Debian, so cleanup is a no-op for symmetry
+trap cleanup EXIT
+cleanup () {
+    :
+}
+
+# ---------- Package groups (Debian names) ----------
+
+declare -ar pkgs_system_base=(
+    autoconf
+    automake
+    build-essential
+    cmake
+    ethtool
+    gcc
+    gdb
+    git
+    htop
+    lshw
+    make
+    pkg-config
+    pv
+    sshfs
+    tcpdump
+    tmux
+    tree
+    vim
+    wget
+    zsh
+)
+
+declare -ar pkgs_system_workstation=(
+    alsa-utils
+    network-manager
+    network-manager-gnome
+    pulseaudio
+)
+
+declare -ar pkgs_tools_dev=(
+    man-db
+    manpages
+)
+
+declare -ar pkgs_tools_dev_extra=(
+    cargo
+    golang
+    llvm
+    ninja-build
+    nodejs
+    npm
+    linux-perf
+    rustc
+)
+
+declare -ar pkgs_i3_environment=(
+    dmenu
+    i3-wm
+    i3status
+    i3lock
+    network-manager-gnome
+    playerctl
+    rofi
+    fonts-font-awesome
+    wmctrl
+    xss-lock
+    xterm
+    xserver-xorg
+    xinit
+    x11-xserver-utils
+)
+
+declare -ar pkgs_apps_core=(
+    chromium
+    firefox-esr
+    pavucontrol
+    thunar
+    gvfs
+    gvfs-backends
+    thunar-archive-plugin
+    thunar-media-tags-plugin
+    tumbler
+    ffmpegthumbnailer
+)
+
+declare -ar pkgs_apps_dev=(
+    meld
+    tk
+    # Visual Studio Code requires the Microsoft repository; install manually.
+    # code
+)
+
+declare -ar pkgs_apps_extra=(
+    audacity
+    darktable
+    gimp
+    gnucash
+    keepassxc
+    nextcloud-desktop
+    thunderbird
+    vlc
+    # The following require external repositories or vendor .deb files:
+    # protonmail-bridge
+    # spotify-client
+)
+
+# ---------- Group-selection plumbing (unchanged logic) ----------
+
+mapfile -t pkgl_all < <( compgen -v pkgs_ )
+
+declare -a pkgl_not_used=("${pkgl_all[@]}")
+declare -a packages_to_install=()
+declare -a pkgl_used=()
+
+add_pkg_list() {
+    local -r list_name="$1"
+    local -n list_packages="$1"
+
+    for i in "${!pkgl_not_used[@]}"; do
+        if [[ ${pkgl_not_used[i]} = "${list_name}" ]]; then
+            unset 'pkgl_not_used[i]'
+        fi
+    done
+
+    pkgl_used+=("${list_name}")
+    packages_to_install+=("${list_packages[@]}")
+}
+
+if [ "${CORE}" -eq 1 ]; then
+    add_pkg_list pkgs_system_base
+fi
+
+if [ "${WORKSTATION}" -eq 1 ]; then
+    add_pkg_list pkgs_system_workstation
+    add_pkg_list pkgs_i3_environment
+    add_pkg_list pkgs_apps_core
+fi
+
+if [ "${DEV}" -eq 1 ]; then
+    add_pkg_list pkgs_tools_dev
+fi
+if [ "${DEV}" -eq 1 ] && [ "${EXTRA}" -eq 1 ]; then
+    add_pkg_list pkgs_tools_dev_extra
+fi
+if [ "${DEV}" -eq 1 ] && [ "${WORKSTATION}" -eq 1 ]; then
+    add_pkg_list pkgs_apps_dev
+fi
+
+if [ "${EXTRA}" -eq 1 ] && [ "${WORKSTATION}" -eq 1 ]; then
+    add_pkg_list pkgs_apps_extra
+fi
+
+# Allow passing extra group names as positional arguments
+for arg in "${@:1}"; do
+    add_pkg_list "${arg}"
+done
+
+printf "Packages to install:\n"
+printf "\t%s\n" "${packages_to_install[@]}"
+
+printf "\nNot installed groups:\n"
+printf "\t%s\n" "${pkgl_not_used[@]}"
+
+printf "\nInstalled groups:\n"
+printf "\t%s\n" "${pkgl_used[@]}"
+
+# ---------- Install phase (Debian / apt) ----------
+
+if ((${#packages_to_install[@]} > 0)); then
+    export DEBIAN_FRONTEND=noninteractive
+    sudo apt-get update
+    sudo apt-get install -y --no-install-recommends "${packages_to_install[@]}"
+else
+    echo "No package groups selected, nothing to install."
+fi
+
+if [ "${CORE}" -eq 1 ]; then
+    # Same as Arch script; generic
+    sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" || true
+fi
--- a/scripts/inputplug_handler
+++ b/scripts/inputplug_handler
@ -1,8 +0,0 @@
-#!/usr/bin/bash
-
-event="$1"
-type="$3"
-
-if [[ "$event" == "XIDeviceEnabled" && "$type" == "XISlaveKeyboard" ]]; then
-    ~/.dotfiles/scripts/mod_keys
-fi
--- a/usr/share/darktable/noiseprofiles.json
+++ b/usr/share/darktable/noiseprofiles.json
@ -36,20 +36,6 @@
            {"name": "IXY 220F iso 3200", "iso": 3200, "a": [0.000581800258227409, 0.000323576628227893, 0.000680762287769163], "b": [1.12738411344584e-06, 9.60673392753119e-07, 1.0287098657334e-06]}
          ]
        },
-        {
-          "comment": "powershot g1 x contributed by sven",
-          "model": "PowerShot G1 X",
-          "profiles": [
-            {"name": "PowerShot G1 X iso 100", "iso": 100, "a": [7.23315327393553e-06, 3.05140478560944e-06, 6.46360450766905e-06], "b": [4.36189314053801e-08, 3.51186203141436e-08, 4.64923909823008e-08]},
-            {"name": "PowerShot G1 X iso 200", "iso": 200, "a": [1.31823472028414e-05, 5.62785401632696e-06, 1.19150928190435e-05], "b": [4.53381296066937e-08, 3.69706634268798e-08, 4.91266421789412e-08]},
-            {"name": "PowerShot G1 X iso 400", "iso": 400, "a": [2.59665120297901e-05, 1.09326376971241e-05, 2.31890570993803e-05], "b": [6.16859987701471e-08, 4.95736404192471e-08, 6.50685329927374e-08]},
-            {"name": "PowerShot G1 X iso 800", "iso": 800, "a": [5.19604984860413e-05, 2.20503722607163e-05, 4.66220379283918e-05], "b": [9.84587815584904e-08, 7.73038437145856e-08, 1.02029825386974e-07]},
-            {"name": "PowerShot G1 X iso 1600", "iso": 1600, "a": [9.92516462843896e-05, 4.18554169474595e-05, 8.86924281387316e-05], "b": [2.46351306566411e-07, 1.99287555402834e-07, 2.60967960810219e-07]},
-            {"name": "PowerShot G1 X iso 3200", "iso": 3200, "a": [0.000215861979259178, 8.99447650074106e-05, 0.000191874379886368], "b": [5.8539349137307e-07, 4.90273756158638e-07, 6.17233911834618e-07]},
-            {"name": "PowerShot G1 X iso 6400", "iso": 6400, "a": [0.000467402490558955, 0.000192611874670613, 0.000410343158547466], "b": [1.62329421171041e-06, 1.38166800596929e-06, 1.74490897853065e-06]},
-            {"name": "PowerShot G1 X iso 12800", "iso": 12800, "a": [0.000849122851196953, 0.000361889083361049, 0.000738598834093283], "b": [3.35840463407555e-06, 3.06506900559479e-06, 3.82303515878541e-06]}
-          ]
-        },
        {
          "comment": "powershot s100 contributed by Stig Inge Lea Bjørnsen",
          "model": "PowerShot S100",
@ -809,18 +795,6 @@
            {"name": "EOS-1D X Mark II iso 409600", "iso": 409600, "a": [0.00391720435728197, 0.00205530969911315, 0.00368824194437042], "b": [2.58176323528839e-05, 3.35067794572544e-05, 2.05649789779584e-05]}
          ]
        },
-        {
-          "comment": "Canon EOS 10D, contributed by piratenpanda",
-          "model": "EOS 10D",
-          "profiles": [
-            {"name": "Canon EOS 10D iso 100", "iso": 100, "a": [3.38781663332529e-06, 1.83490842845184e-06, 4.12142231891243e-06], "b": [6.79094475402787e-09, 5.74315267258559e-09, 6.58627941378056e-09]},
-            {"name": "Canon EOS 10D iso 200", "iso": 200, "a": [5.6187330940314e-06, 2.941336891113e-06, 6.7345576642702e-06], "b": [3.17912645918936e-08, 2.13406629123869e-08, 2.83859571115712e-08]},
-            {"name": "Canon EOS 10D iso 400", "iso": 400, "a": [1.09190955981471e-05, 5.40591567636342e-06, 1.26846698113572e-05], "b": [8.37931631721548e-08, 5.92071600442185e-08, 7.73295819838119e-08]},
-            {"name": "Canon EOS 10D iso 800", "iso": 800, "a": [2.82577264001743e-05, 1.30021542074351e-05, 3.10056439869911e-05], "b": [2.72445733197376e-07, 2.01837520878952e-07, 2.66018539591352e-07]},
-            {"name": "Canon EOS 10D iso 1600", "iso": 1600, "a": [6.71236767252697e-05, 2.9084647083142e-05, 7.34597687045716e-05], "b": [1.20007305514982e-06, 8.52375694935461e-07, 1.12883599355973e-06]},
-            {"name": "Canon EOS 10D iso 3200", "iso": 3200, "a": [7.75167905218549e-05, 3.29209167838507e-05, 8.35064292908693e-05], "b": [1.11725779028816e-06, 7.9379038568127e-07, 1.06340336714868e-06]}
-          ]
-        },        
        {
          "comment": "Canon EOS 20D, contributed by Jean-Sébastien Pédron <jean-sebastien.pedron@dumbbell.fr>.",
          "model": "EOS 20D",
@ -1198,44 +1172,6 @@
            {"name": "Canon EOS 5DS R iso 6400", "iso": 6400, "a": [0.000182870387839005, 0.000129171546154818, 0.00019351051065462], "b": [4.89216995732489e-07, 3.52248199525925e-07, 5.94428337284862e-07]}
          ]
        },
-        {
-          "comment": "eos r1 contributed by kris",
-          "model": "EOS R1",
-          "profiles": [
-            {"name": "EOS R1 iso 50", "iso": 50, "a": [1.79691453428611e-06, 7.53345201954332e-07, 1.5914475592511e-06], "b": [3.25550811618253e-10, 3.31656297529261e-10, 5.74633547484367e-10]},
-            {"name": "EOS R1 iso 100", "iso": 100, "a": [1.67230859572155e-06, 6.98800069398081e-07, 1.48252772756501e-06], "b": [3.10318967967744e-10, 3.14429077415097e-10, 5.23985802061624e-10]},
-            {"name": "EOS R1 iso 125", "iso": 125, "a": [2.00989859001924e-06, 8.37978067407449e-07, 1.77937005115299e-06], "b": [9.28177918715547e-10, 7.62344578271327e-10, 1.27476436734277e-09]},
-            {"name": "EOS R1 iso 160", "iso": 160, "a": [2.44943937695004e-06, 1.02266660651556e-06, 2.16612386007305e-06], "b": [1.71819240024576e-09, 1.36452691558039e-09, 2.21907892310696e-09]},
-            {"name": "EOS R1 iso 200", "iso": 200, "a": [2.62229167653537e-06, 1.09197887320894e-06, 2.31720782036801e-06], "b": [4.80204069421061e-10, 4.10929115039263e-10, 7.79669851036987e-10]},
-            {"name": "EOS R1 iso 250", "iso": 250, "a": [3.19202251211857e-06, 1.32667807571358e-06, 2.83146475072277e-06], "b": [1.15844542493059e-09, 9.26086189414229e-10, 1.55651954863735e-09]},
-            {"name": "EOS R1 iso 320", "iso": 320, "a": [3.95849345740251e-06, 1.64145057912975e-06, 3.49054457856603e-06], "b": [2.05117258914495e-09, 1.65145198808471e-09, 2.60337380854034e-09]},
-            {"name": "EOS R1 iso 400", "iso": 400, "a": [5.39800017879111e-06, 2.23853047989153e-06, 4.74863671191951e-06], "b": [3.13830769634333e-09, 2.49755306484757e-09, 3.99084357993932e-09]},
-            {"name": "EOS R1 iso 500", "iso": 500, "a": [6.60968521135375e-06, 2.73183245304734e-06, 5.82287632141291e-06], "b": [5.44968591177349e-09, 4.11750018436802e-09, 6.41741577636715e-09]},
-            {"name": "EOS R1 iso 640", "iso": 640, "a": [8.21185094416578e-06, 3.38403108021715e-06, 7.23823895399246e-06], "b": [8.38547164436353e-09, 6.33124778783872e-09, 9.76165707440655e-09]},
-            {"name": "EOS R1 iso 800", "iso": 800, "a": [1.00720574956258e-05, 4.16176611493651e-06, 8.9105707967089e-06], "b": [9.83577456875703e-09, 7.62396569159269e-09, 1.17752069709682e-08]},
-            {"name": "EOS R1 iso 1000", "iso": 1000, "a": [1.24484837132613e-05, 5.1389449641293e-06, 1.10064205077887e-05], "b": [1.53154171651533e-08, 1.1340207034924e-08, 1.75890608552963e-08]},
-            {"name": "EOS R1 iso 1250", "iso": 1250, "a": [1.54490047063504e-05, 6.37908855125652e-06, 1.37099611396176e-05], "b": [2.26149461613423e-08, 1.65215780506714e-08, 2.56825915066493e-08]},
-            {"name": "EOS R1 iso 1600", "iso": 1600, "a": [1.89597195321031e-05, 7.76533599293623e-06, 1.66426661696539e-05], "b": [8.54427683614573e-09, 6.323095026378e-09, 1.00358034404935e-08]},
-            {"name": "EOS R1 iso 2000", "iso": 2000, "a": [2.37748688062701e-05, 9.69639959492009e-06, 2.08282720674176e-05], "b": [1.22264550532059e-08, 8.97196511846314e-09, 1.41930675114062e-08]},
-            {"name": "EOS R1 iso 2500", "iso": 2500, "a": [2.97026082428976e-05, 1.21227603422862e-05, 2.60134786113658e-05], "b": [1.75971963105003e-08, 1.26274582320605e-08, 1.97922432981003e-08]},
-            {"name": "EOS R1 iso 3200", "iso": 3200, "a": [3.68275388167353e-05, 1.50558615504964e-05, 3.2511037736161e-05], "b": [2.09908075066733e-08, 1.54528000426883e-08, 2.37562517240706e-08]},
-            {"name": "EOS R1 iso 4000", "iso": 4000, "a": [4.61189323856896e-05, 1.8908949208804e-05, 4.07365497822987e-05], "b": [3.01208595147912e-08, 2.0969818066514e-08, 3.30829766855108e-08]},
-            {"name": "EOS R1 iso 5000", "iso": 5000, "a": [5.77454277052103e-05, 2.35939475370333e-05, 5.09368324559549e-05], "b": [4.14407719312806e-08, 2.91654107480463e-08, 4.61156936491008e-08]},
-            {"name": "EOS R1 iso 6400", "iso": 6400, "a": [7.23705272893831e-05, 2.96204692248935e-05, 6.40821013032106e-05], "b": [5.6500674032791e-08, 3.87230697825594e-08, 5.95920188077734e-08]},
-            {"name": "EOS R1 iso 8000", "iso": 8000, "a": [9.10533393797813e-05, 3.73080102517874e-05, 8.06095121131478e-05], "b": [7.65568392213008e-08, 5.20425360843434e-08, 8.19458759721133e-08]},
-            {"name": "EOS R1 iso 10000", "iso": 10000, "a": [0.00011435119275809, 4.69110115385781e-05, 0.000101509923662847], "b": [1.088437356085e-07, 7.18274201085815e-08, 1.13859878434976e-07]},
-            {"name": "EOS R1 iso 12800", "iso": 12800, "a": [0.000143735202025618, 5.89510879338144e-05, 0.000127596353395428], "b": [1.34790954824659e-07, 9.06149802567508e-08, 1.43054059759258e-07]},
-            {"name": "EOS R1 iso 16000", "iso": 16000, "a": [0.000181205630510795, 7.44581149755125e-05, 0.000160769139527362], "b": [1.91634101333171e-07, 1.25427736309445e-07, 2.0215878537285e-07]},
-            {"name": "EOS R1 iso 20000", "iso": 20000, "a": [0.000228446043260064, 9.36709895650793e-05, 0.000203118649482294], "b": [2.68135077887047e-07, 1.75190439486205e-07, 2.79533037982213e-07]},
-            {"name": "EOS R1 iso 25600", "iso": 25600, "a": [0.000291963496888041, 0.000119738691964578, 0.000260165236198902], "b": [3.82339227807582e-07, 2.53606332521822e-07, 3.90474660311897e-07]},
-            {"name": "EOS R1 iso 32000", "iso": 32000, "a": [0.00036918031181064, 0.000151648727206463, 0.000329200773357987], "b": [5.48689617053326e-07, 3.61896614057908e-07, 5.65869382939759e-07]},
-            {"name": "EOS R1 iso 40000", "iso": 40000, "a": [0.000468298818828066, 0.000192380308381756, 0.000418012069566584], "b": [8.39415910871634e-07, 5.46814470235539e-07, 8.64293995048237e-07]},
-            {"name": "EOS R1 iso 51200", "iso": 51200, "a": [0.000597902959266981, 0.000245067866857606, 0.000533353232185729], "b": [1.27567382906469e-06, 8.20818077205002e-07, 1.33451970884068e-06]},
-            {"name": "EOS R1 iso 64000", "iso": 64000, "a": [0.000758852105408674, 0.000311303029440665, 0.000676457207165687], "b": [1.97322901039808e-06, 1.27073137389184e-06, 2.13027327708602e-06]},
-            {"name": "EOS R1 iso 80000", "iso": 80000, "a": [0.000958103756433289, 0.000394270469865756, 0.000854176259443403], "b": [3.07387361308357e-06, 2.01089161227702e-06, 3.43883874330219e-06]},
-            {"name": "EOS R1 iso 102400", "iso": 102400, "a": [0.00121285706083304, 0.000498674774236791, 0.00107898397147934], "b": [4.67480609932105e-06, 3.17737242663029e-06, 5.4151840755171e-06]}
-          ]
-        },
        {
          "comment": "eos r3 contributed by stevengorrell",
          "model": "EOS R3",
@ -1309,42 +1245,6 @@
            {"name": "EOS R5 iso 102400", "iso": 102400, "a": [0.00167358553329457, 0.000928928853956615, 0.00184333631364247], "b": [1.16941552565296e-05, 1.0271707798498e-05, 1.23725431598948e-05]}
          ]
        },
-        {
-          "comment": "eos r5m2 contributed by piratenpanda",
-          "model": "EOS R5 Mark II",
-          "profiles": [
-            {"name": "EOS R5 Mark II iso 50", "iso": 50, "a": [2.86945416467941e-06, 1.49258403677072e-06, 3.95231070843668e-06], "b": [-2.35658991712539e-08, -2.13086844531235e-08, -2.98294233137761e-08]},
-            {"name": "EOS R5 Mark II iso 100", "iso": 100, "a": [2.87288310400671e-06, 1.490630100565e-06, 3.93625261390207e-06], "b": [-2.25959657913351e-08, -2.07159742853957e-08, -2.90299900005474e-08]},
-            {"name": "EOS R5 Mark II iso 125", "iso": 125, "a": [3.31028390256389e-06, 1.73658579839465e-06, 4.55164284019929e-06], "b": [-2.60470664665947e-08, -2.6463729649814e-08, -3.86062579605152e-08]},
-            {"name": "EOS R5 Mark II iso 160", "iso": 160, "a": [3.97521285808793e-06, 2.11795885205476e-06, 5.49231540142454e-06], "b": [-2.32414814843598e-08, -2.80685172540802e-08, -3.68703503766014e-08]},
-            {"name": "EOS R5 Mark II iso 200", "iso": 200, "a": [5.05656691795315e-06, 2.61530725140539e-06, 6.91569285989122e-06], "b": [-3.85182562561869e-08, -3.57049255267829e-08, -5.19411280447027e-08]},
-            {"name": "EOS R5 Mark II iso 250", "iso": 250, "a": [5.89037254949854e-06, 3.10121254708778e-06, 8.24340830213302e-06], "b": [-1.58405204104137e-08, -2.38788054830276e-08, -4.03927494222228e-08]},
-            {"name": "EOS R5 Mark II iso 320", "iso": 320, "a": [7.30426167706521e-06, 3.83642897820093e-06, 1.00244928707257e-05], "b": [-1.92200600369738e-08, -2.94289356740795e-08, -4.0493518835404e-08]},
-            {"name": "EOS R5 Mark II iso 400", "iso": 400, "a": [1.00222349585282e-05, 5.2971137023543e-06, 1.3909644574132e-05], "b": [-1.98699921442025e-08, -4.10665036299864e-08, -5.66269752050064e-08]},
-            {"name": "EOS R5 Mark II iso 500", "iso": 500, "a": [1.09513199955067e-05, 5.58113295435005e-06, 1.48895150793078e-05], "b": [6.44853423656138e-09, -1.55796894276751e-08, -2.1720156146764e-08]},
-            {"name": "EOS R5 Mark II iso 640", "iso": 640, "a": [1.37184039462737e-05, 6.92648834964819e-06, 1.84321234519728e-05], "b": [1.04486159065064e-08, -1.30520553395805e-08, -1.34096240171596e-08]},
-            {"name": "EOS R5 Mark II iso 800", "iso": 800, "a": [1.73825604850882e-05, 8.87320182695081e-06, 2.37327022098223e-05], "b": [1.31761064249657e-08, -2.57076148435876e-08, -3.58385753056581e-08]},
-            {"name": "EOS R5 Mark II iso 1000", "iso": 1000, "a": [2.18412031032246e-05, 1.09972553390552e-05, 2.92656285965481e-05], "b": [1.50337396756146e-08, -2.26887778536201e-08, -2.18038766634489e-08]},
-            {"name": "EOS R5 Mark II iso 1250", "iso": 1250, "a": [2.68251767959041e-05, 1.37031824568664e-05, 3.64210317820266e-05], "b": [5.24702395686266e-08, -1.90802852147153e-08, -9.70564880510855e-09]},
-            {"name": "EOS R5 Mark II iso 1600", "iso": 1600, "a": [3.39146096761862e-05, 1.72798730181955e-05, 4.62750146955681e-05], "b": [6.53963854879126e-08, -2.12378232970876e-08, -2.72293078003178e-08]},
-            {"name": "EOS R5 Mark II iso 2000", "iso": 2000, "a": [4.29896090223404e-05, 2.1498091228013e-05, 5.72543339671241e-05], "b": [7.29718751233042e-08, -4.99576735108854e-09, 2.06778456903279e-08]},
-            {"name": "EOS R5 Mark II iso 2500", "iso": 2500, "a": [5.29312439257769e-05, 2.66190518827471e-05, 7.12298863004146e-05], "b": [1.69352478131905e-07, 3.55295696130991e-08, 7.37236451292108e-08]},
-            {"name": "EOS R5 Mark II iso 3200", "iso": 3200, "a": [6.77105525708519e-05, 3.39324310922687e-05, 9.08934563758949e-05], "b": [2.25123655075666e-07, 5.83719366556748e-08, 1.05982402905631e-07]},
-            {"name": "EOS R5 Mark II iso 4000", "iso": 4000, "a": [8.57549048154064e-05, 4.2628685034429e-05, 0.000113062362486648], "b": [2.68198628247774e-07, 8.85975087258251e-08, 2.35052684295301e-07]},
-            {"name": "EOS R5 Mark II iso 5000", "iso": 5000, "a": [0.00010654424275204, 5.32460558702954e-05, 0.000141489404578997], "b": [4.7631299515039e-07, 1.78539494822375e-07, 3.96031104470373e-07]},
-            {"name": "EOS R5 Mark II iso 6400", "iso": 6400, "a": [0.000137588696367842, 6.77391271572462e-05, 0.000181312911812178], "b": [5.44074741507163e-07, 2.7010811887391e-07, 5.23604021025698e-07]},
-            {"name": "EOS R5 Mark II iso 8000", "iso": 8000, "a": [0.000172047272241089, 8.58083246295045e-05, 0.000228002547210839], "b": [8.61586457769931e-07, 3.54690017616597e-07, 8.05147125364063e-07]},
-            {"name": "EOS R5 Mark II iso 10000", "iso": 10000, "a": [0.000212977724255233, 0.00010791195302763, 0.000284600350465989], "b": [1.37656565605468e-06, 4.91127729990273e-07, 1.24722878513877e-06]},
-            {"name": "EOS R5 Mark II iso 12800", "iso": 12800, "a": [0.000268822314415643, 0.00013322921727904, 0.000355206908860295], "b": [2.12344509854327e-06, 1.14375723889132e-06, 2.17144373362112e-06]},
-            {"name": "EOS R5 Mark II iso 16000", "iso": 16000, "a": [0.000337312826544808, 0.00016701228140191, 0.000444939960569485], "b": [3.28886157312123e-06, 1.84943357976578e-06, 3.4309589471496e-06]},
-            {"name": "EOS R5 Mark II iso 20000", "iso": 20000, "a": [0.000412492492880337, 0.000203807732327163, 0.000535960246554416], "b": [5.66897643247087e-06, 3.36332997561101e-06, 6.35696881787214e-06]},
-            {"name": "EOS R5 Mark II iso 25600", "iso": 25600, "a": [0.000520508604721722, 0.000256646540551598, 0.000671724689485541], "b": [8.55108897253974e-06, 5.37396781468292e-06, 9.83150156060105e-06]},
-            {"name": "EOS R5 Mark II iso 32000", "iso": 32000, "a": [0.000638617924376829, 0.000312445153845541, 0.000809337923361578], "b": [1.28325149065156e-05, 8.58045651982067e-06, 1.54229917227639e-05]},
-            {"name": "EOS R5 Mark II iso 40000", "iso": 40000, "a": [0.000776265614728267, 0.000377072381325033, 0.000964471367370293], "b": [1.9078808188679e-05, 1.33147628017669e-05, 2.32078591675833e-05]},
-            {"name": "EOS R5 Mark II iso 51200", "iso": 51200, "a": [0.000943314388748538, 0.000454711296827838, 0.0011489581383212], "b": [2.75274611847719e-05, 2.04012455192039e-05, 3.32644145949684e-05]},
-            {"name": "EOS R5 Mark II iso 102400", "iso": 102400, "a": [0.00218400481347139, 0.000978570550813359, 0.00244085455802336], "b": [9.14476723275642e-05, 9.04543758286034e-05, 0.00012893191311311]}
-          ]
-        },
        {
          "comment": "eos r6 contributed by martinstraeten",
          "model": "EOS R6",
@ -1456,43 +1356,6 @@
            {"name": "EOS R7 iso 51200", "iso": 51200, "a": [0.00168431165753951, 0.000785032270751805, 0.00138115893131765], "b": [1.87606675393788e-06, 3.44095108772333e-06, 3.5926270331361e-06]}
          ]
        },
-        {
-          "comment": "eos r8 contributed by sven",
-          "model": "EOS R8",
-          "profiles": [
-            {"name": "EOS R8 iso 100", "iso": 100, "a": [2.37631098514357e-06, 9.05184115012055e-07, 1.69240792814131e-06], "b": [3.54099706019373e-09, 2.52708237141569e-09, 3.88895308537344e-09]},
-            {"name": "EOS R8 iso 125", "iso": 125, "a": [2.64360884261258e-06, 9.99156163138699e-07, 1.86940375548007e-06], "b": [6.8801152110096e-09, 5.26443721137199e-09, 7.86553408012086e-09]},
-            {"name": "EOS R8 iso 160", "iso": 160, "a": [3.16593176795735e-06, 1.1987094340231e-06, 2.26361866509154e-06], "b": [1.11045857786232e-08, 8.41911047197057e-09, 1.14506838537447e-08]},
-            {"name": "EOS R8 iso 200", "iso": 200, "a": [3.84739904023148e-06, 1.46907220258953e-06, 2.7473743189783e-06], "b": [4.57937242612968e-09, 3.15982191810057e-09, 4.79978152478144e-09]},
-            {"name": "EOS R8 iso 250", "iso": 250, "a": [4.63990758928975e-06, 1.76632737444444e-06, 3.3022172135815e-06], "b": [8.64855559848978e-09, 6.6279787218198e-09, 8.94376219429766e-09]},
-            {"name": "EOS R8 iso 320", "iso": 320, "a": [5.59754266170745e-06, 2.13917165079893e-06, 4.01314888760986e-06], "b": [1.42349325460405e-08, 1.09155923637518e-08, 1.48142543090047e-08]},
-            {"name": "EOS R8 iso 400", "iso": 400, "a": [7.56951190273914e-06, 2.90040077788209e-06, 5.44691789896729e-06], "b": [5.32463882715222e-09, 3.60071223068588e-09, 5.45745895787881e-09]},
-            {"name": "EOS R8 iso 500", "iso": 500, "a": [9.24856373480313e-06, 3.52696578010028e-06, 6.64375607975614e-06], "b": [1.02184575928484e-08, 7.78544904061749e-09, 1.04331605122959e-08]},
-            {"name": "EOS R8 iso 640", "iso": 640, "a": [1.12150890813725e-05, 4.29255190526523e-06, 8.09002247381795e-06], "b": [1.55429379601033e-08, 1.1765588802101e-08, 1.57558302844546e-08]},
-            {"name": "EOS R8 iso 800", "iso": 800, "a": [1.39602783075025e-05, 5.32338814272733e-06, 1.00622217240629e-05], "b": [8.70350062606893e-09, 5.92503614861797e-09, 8.76839673869301e-09]},
-            {"name": "EOS R8 iso 1000", "iso": 1000, "a": [1.71918264030983e-05, 6.58501561283493e-06, 1.24620942154847e-05], "b": [1.45857053299818e-08, 1.08476567581053e-08, 1.4617170814945e-08]},
-            {"name": "EOS R8 iso 1250", "iso": 1250, "a": [2.12600866648926e-05, 8.12955993852145e-06, 1.52659205152472e-05], "b": [2.00433696051513e-08, 1.38270696356965e-08, 1.97638213081736e-08]},
-            {"name": "EOS R8 iso 1600", "iso": 1600, "a": [2.59676451799647e-05, 9.88946818190713e-06, 1.87760895709262e-05], "b": [1.5690690338626e-08, 1.07326923227101e-08, 1.52183243391347e-08]},
-            {"name": "EOS R8 iso 2000", "iso": 2000, "a": [3.24163909599843e-05, 1.2369539817652e-05, 2.33789598823327e-05], "b": [2.36513083019658e-08, 1.70739632708565e-08, 2.30629080051029e-08]},
-            {"name": "EOS R8 iso 2500", "iso": 2500, "a": [4.03647603668442e-05, 1.53426533112101e-05, 2.91375500051079e-05], "b": [3.27403836067003e-08, 2.25761186760266e-08, 3.1471000300877e-08]},
-            {"name": "EOS R8 iso 3200", "iso": 3200, "a": [5.03659084187092e-05, 1.90852345830668e-05, 3.63143860991019e-05], "b": [3.02331931818016e-08, 2.02866073226571e-08, 2.80809217280171e-08]},
-            {"name": "EOS R8 iso 4000", "iso": 4000, "a": [6.3389638391091e-05, 2.39490636739692e-05, 4.54825794811432e-05], "b": [4.32654518690332e-08, 2.91864779746418e-08, 4.04442762443769e-08]},
-            {"name": "EOS R8 iso 5000", "iso": 5000, "a": [7.93919816631869e-05, 2.98569705354214e-05, 5.7138896082844e-05], "b": [6.17570964117027e-08, 4.10661465615241e-08, 5.76313417140613e-08]},
-            {"name": "EOS R8 iso 6400", "iso": 6400, "a": [9.9644214731401e-05, 3.76350199210017e-05, 7.1725514850598e-05], "b": [6.3009507439023e-08, 4.06192776761057e-08, 5.95295281529352e-08]},
-            {"name": "EOS R8 iso 8000", "iso": 8000, "a": [0.000125909495132237, 4.72846345547755e-05, 9.00419974405054e-05], "b": [8.58892182718343e-08, 5.59382463731848e-08, 8.18778312130301e-08]},
-            {"name": "EOS R8 iso 10000", "iso": 10000, "a": [0.000157164308239415, 5.86926144445869e-05, 0.000112456961110466], "b": [1.22128885902838e-07, 7.74608819580915e-08, 1.14206659638989e-07]},
-            {"name": "EOS R8 iso 12800", "iso": 12800, "a": [0.000198170140407409, 7.4020577196868e-05, 0.000142258882658811], "b": [1.66873187880342e-07, 1.07638650559711e-07, 1.59202561579369e-07]},
-            {"name": "EOS R8 iso 16000", "iso": 16000, "a": [0.000250012729646012, 9.39324871805204e-05, 0.000179674965911118], "b": [2.34712932652449e-07, 1.55087993482065e-07, 2.28805671841589e-07]},
-            {"name": "EOS R8 iso 20000", "iso": 20000, "a": [0.000316640930381744, 0.000118332060856885, 0.000227138631172725], "b": [3.19395398693647e-07, 2.17692137107463e-07, 3.14489353438306e-07]},
-            {"name": "EOS R8 iso 25600", "iso": 25600, "a": [0.000406851617871275, 0.000152216761653321, 0.000292257208958412], "b": [4.29305023550643e-07, 3.12891907373188e-07, 4.44465303882833e-07]},
-            {"name": "EOS R8 iso 32000", "iso": 32000, "a": [0.000517908644560846, 0.000193863818675707, 0.000372456363374532], "b": [5.80339306849993e-07, 4.61042535326168e-07, 6.49959559177591e-07]},
-            {"name": "EOS R8 iso 40000", "iso": 40000, "a": [0.00066534476336383, 0.000249746407355618, 0.000480735177968656], "b": [7.63827066754632e-07, 6.87409251161977e-07, 9.78008017861868e-07]},
-            {"name": "EOS R8 iso 51200", "iso": 51200, "a": [0.00085455694787526, 0.000320830953872512, 0.000617291817753935], "b": [1.0237850273187e-06, 1.0309557121827e-06, 1.47861457925004e-06]},
-            {"name": "EOS R8 iso 64000", "iso": 64000, "a": [0.00108929517646553, 0.000413283782145296, 0.000792951118705499], "b": [1.28976527551591e-06, 1.5261279179509e-06, 2.1674304522023e-06]},
-            {"name": "EOS R8 iso 80000", "iso": 80000, "a": [0.00137806334208709, 0.000533977464294837, 0.00101803506511244], "b": [1.62530401837089e-06, 2.29851756466383e-06, 3.22139587051992e-06]},
-            {"name": "EOS R8 iso 102400", "iso": 102400, "a": [0.00171731768737806, 0.000682030029265921, 0.00129835663995897], "b": [2.18493471986355e-06, 3.45491082831748e-06, 4.73025400394687e-06]}
-          ]
-        },
        {
          "comment": "eos r10 contributed by root",
          "model": "EOS R10",
@ -2752,37 +2615,6 @@
            {"name": "X-S10 iso 51200", "iso": 51200, "a": [0.00049226295663964, 0.000200610480047238, 0.000357139673459085], "b": [3.20542083452615e-07, 4.2667496690762e-07, 3.38788636996224e-07]}
          ]
        },
-        {
-          "comment": "x-s20 contributed by rbnscr",
-          "model": "X-S20",
-          "profiles": [
-            {"name": "X-S20 iso 80", "iso": 80, "a": [4.59989476619493e-06, 1.81525506409437e-06, 3.28656814750472e-06], "b": [1.57128720369521e-09, 1.55186017449352e-09, 1.97400010962057e-09]},
-            {"name": "X-S20 iso 100", "iso": 100, "a": [5.79965339758054e-06, 2.3044420500845e-06, 4.12001342292823e-06], "b": [2.49903559672117e-09, 2.2165136030107e-09, 2.93832134668977e-09]},
-            {"name": "X-S20 iso 125", "iso": 125, "a": [7.09415069827292e-06, 2.84760660591648e-06, 5.10193858771301e-06], "b": [3.29627697831295e-09, 3.03985397873409e-09, 4.01805804335741e-09]},
-            {"name": "X-S20 iso 160", "iso": 160, "a": [4.42598654903476e-06, 1.73491667530199e-06, 3.17223493766601e-06], "b": [1.29148586771988e-09, 1.28752012523933e-09, 1.61490604749918e-09]},
-            {"name": "X-S20 iso 200", "iso": 200, "a": [5.47891110428441e-06, 2.14084861627039e-06, 3.93010725371326e-06], "b": [1.67696446667747e-09, 1.67572991411313e-09, 2.04457423620231e-09]},
-            {"name": "X-S20 iso 250", "iso": 250, "a": [6.83205638208116e-06, 2.68260057827933e-06, 4.89267323803082e-06], "b": [2.20079040068347e-09, 2.29604842916698e-09, 2.63161796841736e-09]},
-            {"name": "X-S20 iso 320", "iso": 320, "a": [8.67483571630067e-06, 3.39727049450954e-06, 6.25450472919091e-06], "b": [2.766008907529e-09, 2.89411478753971e-09, 3.36788320830092e-09]},
-            {"name": "X-S20 iso 400", "iso": 400, "a": [1.0862628412536e-05, 4.25354824101862e-06, 7.82026007553544e-06], "b": [3.53850730766765e-09, 3.93564288135998e-09, 4.36291271373883e-09]},
-            {"name": "X-S20 iso 500", "iso": 500, "a": [1.39542829369952e-05, 5.44715514045958e-06, 1.00434476843169e-05], "b": [2.22642092986737e-09, 2.61817787815873e-09, 2.93897468278819e-09]},
-            {"name": "X-S20 iso 640", "iso": 640, "a": [1.7683886536891e-05, 6.89582931746222e-06, 1.27777686064601e-05], "b": [2.33749641653046e-09, 3.23809695021699e-09, 3.23437439741534e-09]},
-            {"name": "X-S20 iso 800", "iso": 800, "a": [2.21518257523396e-05, 8.66755215876237e-06, 1.59733788420304e-05], "b": [2.96373139471165e-09, 4.19424858164117e-09, 4.0847205934928e-09]},
-            {"name": "X-S20 iso 1000", "iso": 1000, "a": [2.78898150126881e-05, 1.09367617964786e-05, 2.00814946345091e-05], "b": [4.00711494308283e-09, 5.29174689515248e-09, 5.19727921523272e-09]},
-            {"name": "X-S20 iso 1250", "iso": 1250, "a": [3.53569927250762e-05, 1.38651796202782e-05, 2.54885574695989e-05], "b": [5.4326101570865e-09, 7.18426620741038e-09, 6.90985804836158e-09]},
-            {"name": "X-S20 iso 1600", "iso": 1600, "a": [4.43875200497264e-05, 1.73884356816042e-05, 3.20091574545509e-05], "b": [7.51885150168181e-09, 9.41602942619798e-09, 9.17307752043343e-09]},
-            {"name": "X-S20 iso 2000", "iso": 2000, "a": [5.60109997529822e-05, 2.1895881694049e-05, 4.03244335199939e-05], "b": [1.00163830034964e-08, 1.25972422144974e-08, 1.18859470319362e-08]},
-            {"name": "X-S20 iso 2500", "iso": 2500, "a": [7.12531299407399e-05, 2.78497694696707e-05, 5.1212887189037e-05], "b": [1.44132405806248e-08, 1.75364108602825e-08, 1.65199771250653e-08]},
-            {"name": "X-S20 iso 3200", "iso": 3200, "a": [8.99952862701071e-05, 3.50850402626658e-05, 6.47690202629667e-05], "b": [1.77844685285438e-08, 2.15731639776666e-08, 1.99991157072842e-08]},
-            {"name": "X-S20 iso 4000", "iso": 4000, "a": [0.000112641549309532, 4.39590259482494e-05, 8.10401537476625e-05], "b": [2.65772093691342e-08, 3.04013519274611e-08, 2.87553948778427e-08]},
-            {"name": "X-S20 iso 5000", "iso": 5000, "a": [0.000142267753523932, 5.55351606073117e-05, 0.000102342994036459], "b": [3.46028435015106e-08, 3.96789856167036e-08, 3.6095871089671e-08]},
-            {"name": "X-S20 iso 6400", "iso": 6400, "a": [0.000179654777531786, 7.03087404190124e-05, 0.000129782541991924], "b": [5.03173216037383e-08, 5.73068708117978e-08, 5.10079766941788e-08]},
-            {"name": "X-S20 iso 8000", "iso": 8000, "a": [0.000226514073602412, 8.83732075688931e-05, 0.000163010047483796], "b": [7.29730869434966e-08, 8.12788945936782e-08, 7.340893300623e-08]},
-            {"name": "X-S20 iso 10000", "iso": 10000, "a": [0.000289812948104194, 0.000113446239618206, 0.000209344401118666], "b": [1.07951479238698e-07, 1.17293642276274e-07, 1.0553920640279e-07]},
-            {"name": "X-S20 iso 12800", "iso": 12800, "a": [0.000362928922396094, 0.000142262476264352, 0.000262405308768318], "b": [1.54874158465168e-07, 1.70122653228916e-07, 1.49564688854538e-07]},
-            {"name": "X-S20 iso 25600", "iso": 25600, "a": [0.000477220722241805, 0.000185490248070803, 0.000345830459193758], "b": [3.42329095720384e-07, 4.49694193790874e-07, 3.51168302076305e-07]},
-            {"name": "X-S20 iso 51200", "iso": 51200, "a": [0.000483898660551378, 0.000187994458428669, 0.000350206056820096], "b": [3.36180726520028e-07, 4.24296554022023e-07, 3.36651850117861e-07]}
-          ]
-        },
        {
          "comment": "x-t2 contributed by sami",
          "model": "X-T2",
@ -3253,40 +3085,6 @@
            {"name": "X-E4 iso 51200", "iso": 51200, "a": [0.000340767840088576, 0.000159602273086359, 0.000343216967661919], "b": [5.32405189221632e-06, 3.17783792385171e-06, 5.72873427136929e-06]}
          ]
        },
-        {
-          "comment": "x-e5 contributed by jssfr",
-          "model": "X-E5",
-          "profiles": [
-            {"name": "X-E5 iso 64", "iso": 64, "a": [5.97666555456745e-06, 2.64847504641951e-06, 5.1801345471745e-06], "b": [5.47634740479142e-09, 2.5676788232254e-09, 4.74480433044149e-09]},
-            {"name": "X-E5 iso 80", "iso": 80, "a": [7.52389149253226e-06, 3.32522019516055e-06, 6.49925796495685e-06], "b": [7.33399985618027e-09, 3.82636842956845e-09, 6.79192082589268e-09]},
-            {"name": "X-E5 iso 100", "iso": 100, "a": [9.31796583229971e-06, 4.1034374865968e-06, 8.04939269825059e-06], "b": [1.00406015688309e-08, 5.66017319641934e-09, 9.20360835730019e-09]},
-            {"name": "X-E5 iso 125", "iso": 125, "a": [6.018348453692e-06, 2.64365137135587e-06, 5.19601733006303e-06], "b": [4.75724981280585e-09, 2.20176266225738e-09, 4.27196746051342e-09]},
-            {"name": "X-E5 iso 125", "iso": 125, "a": [6.02567749298468e-06, 2.64730003930589e-06, 5.19074481311022e-06], "b": [4.72423459456733e-09, 2.22415532132623e-09, 4.36924672288845e-09]},
-            {"name": "X-E5 iso 125", "iso": 125, "a": [6.03256460760382e-06, 2.64688053117205e-06, 5.19088278828064e-06], "b": [4.75822048852318e-09, 2.22064083035018e-09, 4.35342433019263e-09]},
-            {"name": "X-E5 iso 160", "iso": 160, "a": [7.62327138879134e-06, 3.33969297076787e-06, 6.56355906309075e-06], "b": [6.36146597492754e-09, 3.26130027447761e-09, 5.82087929153203e-09]},
-            {"name": "X-E5 iso 200", "iso": 200, "a": [9.48797016455348e-06, 4.15807335767251e-06, 8.18941346892879e-06], "b": [8.62714392956333e-09, 4.75616464473429e-09, 7.91184941804723e-09]},
-            {"name": "X-E5 iso 250", "iso": 250, "a": [1.18471002436721e-05, 5.21097232960682e-06, 1.02107535639295e-05], "b": [1.18117763545611e-08, 6.61174844481065e-09, 1.08881519250682e-08]},
-            {"name": "X-E5 iso 320", "iso": 320, "a": [1.48517804308461e-05, 6.51192256323721e-06, 1.27969408255209e-05], "b": [1.54441970724204e-08, 9.47295470646545e-09, 1.44193365139141e-08]},
-            {"name": "X-E5 iso 400", "iso": 400, "a": [1.85696195006426e-05, 8.15141093332967e-06, 1.60045500598035e-05], "b": [1.98854155591479e-08, 1.22764988440032e-08, 1.87228743579696e-08]},
-            {"name": "X-E5 iso 500", "iso": 500, "a": [2.32894760449835e-05, 1.01717718957437e-05, 2.00688238676403e-05], "b": [1.92581082686727e-08, 1.14545917260349e-08, 1.76937440319796e-08]},
-            {"name": "X-E5 iso 640", "iso": 640, "a": [2.9347963472372e-05, 1.27932793471835e-05, 2.52446175681562e-05], "b": [2.31432610915682e-08, 1.42801102879122e-08, 2.17767532979154e-08]},
-            {"name": "X-E5 iso 800", "iso": 800, "a": [3.66687798349781e-05, 1.59620370478767e-05, 3.15947283198367e-05], "b": [2.8463440833975e-08, 1.76469560190614e-08, 2.67364607277632e-08]},
-            {"name": "X-E5 iso 1000", "iso": 1000, "a": [4.62255013075804e-05, 2.01365645460715e-05, 3.98713980401836e-05], "b": [3.49105918080397e-08, 2.20721375092698e-08, 3.24615547540452e-08]},
-            {"name": "X-E5 iso 1250", "iso": 1250, "a": [5.83707491712503e-05, 2.54470867585834e-05, 5.03630192310906e-05], "b": [4.46776133872263e-08, 2.89469213333652e-08, 4.17969640453519e-08]},
-            {"name": "X-E5 iso 1600", "iso": 1600, "a": [7.35806031796168e-05, 3.19875147545617e-05, 6.33164722165224e-05], "b": [5.69801145380824e-08, 3.84606713731484e-08, 5.35165348391047e-08]},
-            {"name": "X-E5 iso 2000", "iso": 2000, "a": [9.29667406013959e-05, 4.04790263379312e-05, 8.00406677166591e-05], "b": [7.38878417699815e-08, 5.08991743902141e-08, 6.99147449452709e-08]},
-            {"name": "X-E5 iso 2500", "iso": 2500, "a": [0.000117862795539767, 5.13656635484011e-05, 0.00010168028728324], "b": [9.62784997275485e-08, 6.80718126506042e-08, 9.07321606062209e-08]},
-            {"name": "X-E5 iso 3200", "iso": 3200, "a": [0.000147529007260371, 6.42554806096568e-05, 0.000126986754376885], "b": [1.24356300280936e-07, 8.98324564119646e-08, 1.18456959052908e-07]},
-            {"name": "X-E5 iso 4000", "iso": 4000, "a": [0.00018642287950548, 8.15125322805453e-05, 0.000159972742016334], "b": [1.67387157915344e-07, 1.24405638874084e-07, 1.61577531072072e-07]},
-            {"name": "X-E5 iso 5000", "iso": 5000, "a": [0.000237634798093029, 0.000103979839679037, 0.000204870467469636], "b": [2.20091580301162e-07, 1.73434061238614e-07, 2.14212875580364e-07]},
-            {"name": "X-E5 iso 6400", "iso": 6400, "a": [0.000293963307102713, 0.000129253468869348, 0.000253239153025223], "b": [3.66864885802973e-07, 3.24314896345877e-07, 3.79171016727258e-07]},
-            {"name": "X-E5 iso 8000", "iso": 8000, "a": [0.000374033680099066, 0.000165745577650328, 0.000324466486764875], "b": [4.97703412249745e-07, 4.65584239514703e-07, 5.16453360948371e-07]},
-            {"name": "X-E5 iso 10000", "iso": 10000, "a": [0.000473046430051307, 0.00021016416984486, 0.000409791403115635], "b": [6.2292577399217e-07, 6.52841258520316e-07, 6.84512342927688e-07]},
-            {"name": "X-E5 iso 12800", "iso": 12800, "a": [0.000492499175740675, 0.000220436912051642, 0.00043014033089181], "b": [6.29283195123834e-07, 6.78706660174606e-07, 6.86742095119899e-07]},
-            {"name": "X-E5 iso 25600", "iso": 25600, "a": [0.000446156494685072, 0.000200776730072695, 0.000387776474155721], "b": [5.7327837534891e-07, 6.25019801755705e-07, 6.18733537954498e-07]},
-            {"name": "X-E5 iso 51200", "iso": 51200, "a": [0.000451871993173866, 0.000201700871637206, 0.000391614775304344], "b": [4.45291539328207e-07, 4.9494087305531e-07, 4.62819660899638e-07]}
-          ]
-        },
        {
          "comment": "x-m1 contributed by denis",
          "model": "X-M1",
@ -3309,37 +3107,6 @@
            {"name": "X-M1 iso 6400", "iso": 6400, "a": [3.7516389489917e-05, 2.36110268483642e-05, 5.33146531294855e-05], "b": [1.30460910383993e-07, 1.17390034010813e-07, 1.47324620225674e-07]}
          ]
        },
-{
-          "comment": "x-m5 contributed by mpece",
-          "model": "X-M5",
-          "profiles": [
-            {"name": "X-M5 iso 80", "iso": 80, "a": [4.81030717609823e-06, 1.95883656686279e-06, 3.94600813095631e-06], "b": [4.76496428435716e-09, 2.97943899573004e-09, 4.51969615725444e-09]},
-            {"name": "X-M5 iso 100", "iso": 100, "a": [5.88068870236946e-06, 2.38240491909526e-06, 4.85606161163208e-06], "b": [5.97055051859633e-09, 4.07814078215747e-09, 5.85174132936485e-09]},
-            {"name": "X-M5 iso 125", "iso": 125, "a": [7.2619443262119e-06, 2.93027783282084e-06, 6.00101265207611e-06], "b": [7.64174591112548e-09, 5.32568859018848e-09, 7.69817254468926e-09]},
-            {"name": "X-M5 iso 160", "iso": 160, "a": [5.00823560559309e-06, 1.97860205303118e-06, 3.90867567603564e-06], "b": [3.31158387542995e-09, 2.4235525015443e-09, 3.61168345191892e-09]},
-            {"name": "X-M5 iso 200", "iso": 200, "a": [6.10460369664788e-06, 2.39277830948496e-06, 4.72954709926808e-06], "b": [4.17075947576575e-09, 3.30236471378101e-09, 4.6957177793947e-09]},
-            {"name": "X-M5 iso 250", "iso": 250, "a": [7.50751636584199e-06, 2.94144676217977e-06, 5.83863858855832e-06], "b": [5.76722841981685e-09, 4.47005003487501e-09, 6.22438945583675e-09]},
-            {"name": "X-M5 iso 320", "iso": 320, "a": [9.43646756970235e-06, 3.67622361092303e-06, 7.34105675505789e-06], "b": [7.2237986931418e-09, 5.9339483014745e-09, 8.12318267835277e-09]},
-            {"name": "X-M5 iso 400", "iso": 400, "a": [1.18283022897634e-05, 4.62138794330286e-06, 9.22744595130973e-06], "b": [9.20529641481347e-09, 7.91434219499379e-09, 1.04645438638695e-08]},
-            {"name": "X-M5 iso 500", "iso": 500, "a": [1.54044817132079e-05, 5.95673326129716e-06, 1.19842192868991e-05], "b": [7.79276253512874e-09, 6.60506150305958e-09, 8.97263113549558e-09]},
-            {"name": "X-M5 iso 640", "iso": 640, "a": [1.93262951835963e-05, 7.50824643820901e-06, 1.50316914222404e-05], "b": [1.00206263041253e-08, 8.63255487205837e-09, 1.16216641186175e-08]},
-            {"name": "X-M5 iso 800", "iso": 800, "a": [2.42303249104201e-05, 9.37627629852442e-06, 1.88619380948586e-05], "b": [1.22063076576965e-08, 1.07991212620788e-08, 1.431514662292e-08]},
-            {"name": "X-M5 iso 1000", "iso": 1000, "a": [3.03017870023541e-05, 1.17295326312954e-05, 2.35853557141402e-05], "b": [1.54624314091602e-08, 1.39339975908772e-08, 1.79942602845681e-08]},
-            {"name": "X-M5 iso 1250", "iso": 1250, "a": [3.81794194556025e-05, 1.47856492814078e-05, 2.97081355886395e-05], "b": [1.97537163406913e-08, 1.83838341442891e-08, 2.29742980228253e-08]},
-            {"name": "X-M5 iso 1600", "iso": 1600, "a": [4.76876375236394e-05, 1.83989179279382e-05, 3.69940038614584e-05], "b": [2.5175351721828e-08, 2.39576619599062e-08, 2.9492417497433e-08]},
-            {"name": "X-M5 iso 2000", "iso": 2000, "a": [5.94795872804534e-05, 2.29925474508059e-05, 4.61938581488131e-05], "b": [3.30778025861172e-08, 3.15026950973834e-08, 3.81979105471391e-08]},
-            {"name": "X-M5 iso 2500", "iso": 2500, "a": [7.47576127301126e-05, 2.88864290562561e-05, 5.80945175367991e-05], "b": [4.0703282123056e-08, 4.07842880154053e-08, 4.74587593257411e-08]},
-            {"name": "X-M5 iso 3200", "iso": 3200, "a": [9.33268872985703e-05, 3.5893864673772e-05, 7.2552654602314e-05], "b": [5.35634320642027e-08, 5.34643092806371e-08, 6.10142670061391e-08]},
-            {"name": "X-M5 iso 4000", "iso": 4000, "a": [0.000116609703865953, 4.48583275680149e-05, 9.06140298526765e-05], "b": [6.58477903866211e-08, 6.79466739047059e-08, 7.57019333968046e-08]},
-            {"name": "X-M5 iso 5000", "iso": 5000, "a": [0.000145547606943955, 5.60755948614313e-05, 0.000112697190460446], "b": [8.72432176797892e-08, 8.924486217587e-08, 9.85796692139417e-08]},
-            {"name": "X-M5 iso 6400", "iso": 6400, "a": [0.000184300443934045, 7.10062511047373e-05, 0.000143452497890467], "b": [1.16177151086677e-07, 1.21038634525461e-07, 1.30693222326633e-07]},
-            {"name": "X-M5 iso 8000", "iso": 8000, "a": [0.000231680816172768, 8.93849006798439e-05, 0.00017997396593724], "b": [1.492292273556e-07, 1.58997953243604e-07, 1.66345322902751e-07]},
-            {"name": "X-M5 iso 10000", "iso": 10000, "a": [0.000293333584480957, 0.000112884493550186, 0.000227540178889889], "b": [1.97750053532373e-07, 2.20739337657903e-07, 2.21858857342429e-07]},
-            {"name": "X-M5 iso 12800", "iso": 12800, "a": [0.000370005211524868, 0.000142850992040974, 0.000288529869609788], "b": [2.64475962693678e-07, 3.03148329672538e-07, 2.95124500181391e-07]},
-            {"name": "X-M5 iso 25600", "iso": 25600, "a": [0.000450609831685421, 0.000172848451406704, 0.000351584020954563], "b": [4.63313222144441e-07, 5.84806250827145e-07, 5.20072325121757e-07]},
-            {"name": "X-M5 iso 51200", "iso": 51200, "a": [0.000478784408002672, 0.000182504290235143, 0.000376095304530887], "b": [4.24966458240393e-07, 5.09541307576515e-07, 4.62096424100912e-07]}
-          ]
-        },
        {
          "comment": "fujifilm x-t1 by ulrich",
          "model": "X-T1",
@ -3431,66 +3198,6 @@
            {"name": "X100V iso 12800", "iso": 12800, "a": [0.000321490100417519, 0.000140744217280993, 0.000260722740054755], "b": [3.26173914450377e-07, 3.93263963321113e-07, 3.70884217191373e-07]}
          ]
        },
-        {
-          "comment": "x100vi contributed by prama",
-          "model": "X100VI",
-          "profiles": [
-            {"name": "X100VI iso 64", "iso": 64, "a": [6.56951328260695e-06, 2.35091212000446e-06, 4.11986816690801e-06], "b": [1.15519832304968e-08, 1.7769256275406e-09, 4.35065785520004e-09]},
-            {"name": "X100VI iso 80", "iso": 80, "a": [8.16123214784975e-06, 2.95008126261748e-06, 5.09379087455284e-06], "b": [1.5250163198859e-08, 2.50215484248149e-09, 6.15928440385305e-09]},
-            {"name": "X100VI iso 100", "iso": 100, "a": [1.00749276410493e-05, 3.68010521518993e-06, 6.37592707869885e-06], "b": [1.94026756358824e-08, 3.56420950852585e-09, 7.94492851617552e-09]},
-            {"name": "X100VI iso 125", "iso": 125, "a": [7.73118446682305e-06, 2.53998856427485e-06, 3.75684222286484e-06], "b": [1.00279154331384e-08, 2.07442585565483e-09, 7.08293059856131e-09]},
-            {"name": "X100VI iso 160", "iso": 160, "a": [9.29962110332268e-06, 3.09003184927668e-06, 4.63897807858611e-06], "b": [1.2863969296073e-08, 3.19122465231949e-09, 9.07807549132952e-09]},
-            {"name": "X100VI iso 200", "iso": 200, "a": [1.13334573819434e-05, 3.80139745169572e-06, 5.72844747185529e-06], "b": [1.6443756846124e-08, 4.30635047208411e-09, 1.17482708808263e-08]},
-            {"name": "X100VI iso 250", "iso": 250, "a": [7.98098278818611e-06, 2.62310992684099e-06, 3.96695806147666e-06], "b": [6.799126812565e-09, 3.75013311650086e-09, 6.13083908779481e-09]},
-            {"name": "X100VI iso 320", "iso": 320, "a": [9.66745723555539e-06, 3.19099807938009e-06, 4.89847578645924e-06], "b": [8.92128707624313e-09, 4.80473220184476e-09, 7.80991302174013e-09]},
-            {"name": "X100VI iso 400", "iso": 400, "a": [1.16473438892116e-05, 3.89732147758804e-06, 6.01679267047134e-06], "b": [1.11369325933258e-08, 6.34965399543634e-09, 1.01074306285294e-08]},
-            {"name": "X100VI iso 500", "iso": 500, "a": [7.991894740851e-06, 2.71650738672953e-06, 3.98442501623907e-06], "b": [3.44640979594526e-09, 2.55184315767142e-09, 3.71290280855236e-09]},
-            {"name": "X100VI iso 640", "iso": 640, "a": [9.73386042243406e-06, 3.31363754628611e-06, 4.95768290868136e-06], "b": [4.45222865985421e-09, 3.42934545497372e-09, 4.75307648517812e-09]},
-            {"name": "X100VI iso 800", "iso": 800, "a": [1.19163512699227e-05, 4.03146358181001e-06, 6.05065463150951e-06], "b": [5.43382982522256e-09, 4.43352930371186e-09, 5.92250067807038e-09]},
-            {"name": "X100VI iso 1000", "iso": 1000, "a": [1.44793789355487e-05, 4.95198926236959e-06, 7.50591050255305e-06], "b": [7.01327726247248e-09, 5.71639524528997e-09, 7.73626457610633e-09]},
-            {"name": "X100VI iso 1250", "iso": 1250, "a": [1.79903916816055e-05, 6.14104022984162e-06, 9.38887998128298e-06], "b": [9.16868921527565e-09, 7.6723263589748e-09, 1.01967160208927e-08]},
-            {"name": "X100VI iso 1600", "iso": 1600, "a": [2.2224755801356e-05, 7.6646685331593e-06, 1.16771571904976e-05], "b": [1.2051101940653e-08, 1.03062100299685e-08, 1.36880229396431e-08]},
-            {"name": "X100VI iso 2000", "iso": 2000, "a": [2.77630435254764e-05, 9.50437325311189e-06, 1.46838186023507e-05], "b": [1.13961360235976e-08, 1.01168016603667e-08, 1.34521541934228e-08]},
-            {"name": "X100VI iso 2500", "iso": 2500, "a": [3.44031705223493e-05, 1.17749806380441e-05, 1.84570575855124e-05], "b": [1.41104801813589e-08, 1.31328468005234e-08, 1.66407830621279e-08]},
-            {"name": "X100VI iso 3200", "iso": 3200, "a": [4.26782053053495e-05, 1.47268616781985e-05, 2.30427264830385e-05], "b": [1.68470340880815e-08, 1.65536481715599e-08, 2.04543754454681e-08]},
-            {"name": "X100VI iso 4000", "iso": 4000, "a": [5.29243544233581e-05, 1.81201641567885e-05, 2.84352567382226e-05], "b": [2.18458816022173e-08, 2.15422817972405e-08, 2.66018391239557e-08]},
-            {"name": "X100VI iso 5000", "iso": 5000, "a": [6.6560835739553e-05, 2.28305690968372e-05, 3.59678613892833e-05], "b": [2.78409609534655e-08, 2.85139680170025e-08, 3.39136321802757e-08]},
-            {"name": "X100VI iso 6400", "iso": 6400, "a": [8.23632371403399e-05, 2.82772903786275e-05, 4.4579032853723e-05], "b": [3.27219409499641e-08, 3.61735269892318e-08, 4.09201880116357e-08]},
-            {"name": "X100VI iso 8000", "iso": 8000, "a": [0.000102785810640211, 3.53926215964227e-05, 5.57946815876197e-05], "b": [4.32311095937854e-08, 4.72470157604045e-08, 5.26213986307088e-08]},
-            {"name": "X100VI iso 10000", "iso": 10000, "a": [0.000128300124337336, 4.4186965336221e-05, 7.0049660276037e-05], "b": [5.61498631486799e-08, 6.13443621859559e-08, 6.68397050862821e-08]},
-            {"name": "X100VI iso 12800", "iso": 12800, "a": [0.000158235634061307, 5.459951669755e-05, 8.67916025708252e-05], "b": [6.40045900079618e-08, 7.27779909132234e-08, 7.59383885299704e-08]},
-            {"name": "X100VI iso 25600", "iso": 25600, "a": [0.000519695228021285, 0.000196685999171664, 0.000311324958275022], "b": [3.57010043473498e-07, 5.15931390891423e-07, 4.85155162655835e-07]},
-            {"name": "X100VI iso 51200", "iso": 51200, "a": [0.000537181851474428, 0.000194393490379855, 0.00030762609275018], "b": [2.88839890986485e-07, 4.12832900392008e-07, 3.62191556998363e-07]}
-          ]
-        },
-        {
-          "comment": "gfx 100 contributed by karsten",
-          "model": "GFX 100",
-          "profiles": [
-            {"name": "GFX 100 iso 100", "iso": 100, "a": [2.48411617899134e-06, 1.1488878678279e-06, 2.52058136296402e-06], "b": [2.9919722337491e-09, 1.79727271817946e-09, 2.73888492124164e-09]},
-            {"name": "GFX 100 iso 125", "iso": 125, "a": [3.07315004575794e-06, 1.39704489806662e-06, 3.09656331698762e-06], "b": [3.81023877840404e-09, 2.35516232381055e-09, 3.64983627904061e-09]},
-            {"name": "GFX 100 iso 160", "iso": 160, "a": [3.83610942843425e-06, 1.7311406098909e-06, 3.84242702565393e-06], "b": [5.01301492258228e-09, 3.0824460744953e-09, 4.68831220443851e-09]},
-            {"name": "GFX 100 iso 200", "iso": 200, "a": [4.34263302513405e-06, 1.94034252911077e-06, 4.33540724654541e-06], "b": [5.45739523808856e-09, 3.35204394921469e-09, 5.12966720658605e-09]},
-            {"name": "GFX 100 iso 250", "iso": 250, "a": [5.41239604276171e-06, 2.40248670730872e-06, 5.37215706077891e-06], "b": [6.8823152208753e-09, 4.35914639557542e-09, 6.68678443914853e-09]},
-            {"name": "GFX 100 iso 320", "iso": 320, "a": [6.8008228261295e-06, 2.99079558934944e-06, 6.72712988641057e-06], "b": [9.2166702635455e-09, 5.78764869785513e-09, 8.80247620564645e-09]},
-            {"name": "GFX 100 iso 400", "iso": 400, "a": [8.5017595023547e-06, 3.70274680891675e-06, 8.37376423024259e-06], "b": [1.21133257412027e-08, 7.60644700352293e-09, 1.16624805845825e-08]},
-            {"name": "GFX 100 iso 500", "iso": 500, "a": [1.08124593272446e-05, 4.72261117907349e-06, 1.06988517261656e-05], "b": [1.16945298802149e-08, 7.55622470652334e-09, 1.12157960693023e-08]},
-            {"name": "GFX 100 iso 640", "iso": 640, "a": [1.36611544756239e-05, 5.91001354436346e-06, 1.34748958713397e-05], "b": [1.47185826113474e-08, 9.80621079976925e-09, 1.44207773336768e-08]},
-            {"name": "GFX 100 iso 800", "iso": 800, "a": [1.71180992447481e-05, 7.35485015217552e-06, 1.68194537020258e-05], "b": [1.88596674611177e-08, 1.25759439799497e-08, 1.82870833599069e-08]},
-            {"name": "GFX 100 iso 1000", "iso": 1000, "a": [2.14279501178677e-05, 9.21614454063024e-06, 2.11749482993119e-05], "b": [2.4504681353169e-08, 1.64270811505826e-08, 2.38434397890216e-08]},
-            {"name": "GFX 100 iso 1250", "iso": 1250, "a": [2.70537077577217e-05, 1.15700603778738e-05, 2.65375095218983e-05], "b": [3.12349595893651e-08, 2.11176923375806e-08, 3.01929742664923e-08]},
-            {"name": "GFX 100 iso 1600", "iso": 1600, "a": [3.40284036109227e-05, 1.4511059942638e-05, 3.34652142600593e-05], "b": [3.92389749791741e-08, 2.74160913524917e-08, 3.80579006904051e-08]},
-            {"name": "GFX 100 iso 2000", "iso": 2000, "a": [4.26414432621766e-05, 1.81423814800657e-05, 4.19219043609297e-05], "b": [4.87036160879038e-08, 3.50755105821089e-08, 4.82026171273542e-08]},
-            {"name": "GFX 100 iso 2500", "iso": 2500, "a": [5.41030140593284e-05, 2.29322221436505e-05, 5.29325912098957e-05], "b": [6.20296363899932e-08, 4.4777052793848e-08, 6.14866667809718e-08]},
-            {"name": "GFX 100 iso 3200", "iso": 3200, "a": [6.82903604751036e-05, 2.88148012522632e-05, 6.66560011229594e-05], "b": [7.77088870482165e-08, 5.69473920094585e-08, 7.61745073313747e-08]},
-            {"name": "GFX 100 iso 4000", "iso": 4000, "a": [8.59830474929304e-05, 3.63919705846353e-05, 8.41840781589897e-05], "b": [9.89782869754955e-08, 7.23662486402538e-08, 9.6645878436453e-08]},
-            {"name": "GFX 100 iso 5000", "iso": 5000, "a": [0.000108575964492923, 4.60886988487144e-05, 0.000106779007487533], "b": [1.22625120386207e-07, 8.96692518508576e-08, 1.1976173061365e-07]},
-            {"name": "GFX 100 iso 6400", "iso": 6400, "a": [0.000136991064949627, 5.77959836523174e-05, 0.000134006639161681], "b": [1.55988577029538e-07, 1.14980036466338e-07, 1.53523095307574e-07]},
-            {"name": "GFX 100 iso 8000", "iso": 8000, "a": [0.000173369991936434, 7.31706298904898e-05, 0.000169223206603267], "b": [1.97123674283128e-07, 1.46819263311051e-07, 1.93708720039262e-07]},
-            {"name": "GFX 100 iso 10000", "iso": 10000, "a": [0.000219010613172868, 9.2460411002171e-05, 0.000213743520516438], "b": [2.4141128355277e-07, 1.85294956914206e-07, 2.38779170870821e-07]},
-            {"name": "GFX 100 iso 12800", "iso": 12800, "a": [0.000275504584953931, 0.000116220028041122, 0.000268330930208631], "b": [2.90387446078616e-07, 2.31333795423187e-07, 2.88068974632345e-07]}
-          ]
-        },
        {
          "comment": "gfx100s contributed by nick",
          "model": "GFX100S",
@ -3522,68 +3229,6 @@
            {"name": "GFX100S iso 51200", "iso": 51200, "a": [0.00227441558789677, 0.00123523013696829, 0.00265541832699027], "b": [1.12079120775072e-06, 3.07725137539058e-06, 6.50506667362039e-07]},
            {"name": "GFX100S iso 102400", "iso": 102400, "a": [0.00232512114964316, 0.00136035807309057, 0.00259037932363741], "b": [6.18562851329871e-09, 1.46297417392059e-06, 1.34076570133806e-07]}
          ]
-        },
-        {
-          "comment": "gfx100s ii contributed by mckajvah",
-          "model": "GFX100S II",
-          "profiles": [
-            {"name": "GFX100S II iso 40", "iso": 40, "a": [2.34247637233179e-06, 9.93287574366949e-07, 2.23032497845829e-06], "b": [3.27200817486161e-09, 1.25964772203042e-09, 2.12024225217659e-09]},
-            {"name": "GFX100S II iso 80", "iso": 80, "a": [2.45382126235269e-06, 1.0043117171579e-06, 2.2135310026329e-06], "b": [2.10991140652691e-09, 1.06095643616011e-09, 1.90005570484918e-09]},
-            {"name": "GFX100S II iso 100", "iso": 100, "a": [2.98400808319653e-06, 1.20450933563866e-06, 2.672542384673e-06], "b": [2.83434906410461e-09, 1.46172275608278e-09, 2.6122605176601e-09]},
-            {"name": "GFX100S II iso 125", "iso": 125, "a": [3.37855428483013e-06, 1.34746805490648e-06, 2.98218925130433e-06], "b": [3.1439770927269e-09, 1.75175670328237e-09, 3.03563160290553e-09]},
-            {"name": "GFX100S II iso 160", "iso": 160, "a": [4.17630425869797e-06, 1.6464951016647e-06, 3.67454922583945e-06], "b": [4.2518036571231e-09, 2.42677805488451e-09, 4.13595496023781e-09]},
-            {"name": "GFX100S II iso 200", "iso": 200, "a": [5.15238596684033e-06, 2.01752482602723e-06, 4.51874471258474e-06], "b": [5.37851748368651e-09, 3.10763980444796e-09, 5.3025875919044e-09]},
-            {"name": "GFX100S II iso 250", "iso": 250, "a": [6.36080760765585e-06, 2.47101390406058e-06, 5.56286941013485e-06], "b": [7.15429644304628e-09, 4.26757213345841e-09, 7.11360025279877e-09]},
-            {"name": "GFX100S II iso 320", "iso": 320, "a": [7.94209954824152e-06, 3.06398974682796e-06, 6.94601833386438e-06], "b": [9.54032648120468e-09, 5.86651342086649e-09, 9.54236553859136e-09]},
-            {"name": "GFX100S II iso 400", "iso": 400, "a": [9.89740196052266e-06, 3.79764092027935e-06, 8.63198818191334e-06], "b": [1.24927311172541e-08, 7.91503664665068e-09, 1.30137007178484e-08]},
-            {"name": "GFX100S II iso 500", "iso": 500, "a": [1.25781852207416e-05, 4.80492428993914e-06, 1.09756441900432e-05], "b": [1.11708878532174e-08, 6.83115143478519e-09, 1.14922784884808e-08]},
-            {"name": "GFX100S II iso 640", "iso": 640, "a": [1.57968138168574e-05, 6.00906459561482e-06, 1.37300536751287e-05], "b": [1.38557931134045e-08, 8.86214499919501e-09, 1.46179218164173e-08]},
-            {"name": "GFX100S II iso 800", "iso": 800, "a": [1.97276462381227e-05, 7.48220105946194e-06, 1.71795379107811e-05], "b": [1.78974033181487e-08, 1.15514144501927e-08, 1.88155115665387e-08]},
-            {"name": "GFX100S II iso 1000", "iso": 1000, "a": [2.46796917804072e-05, 9.3244813944464e-06, 2.14724746775963e-05], "b": [2.24871100358833e-08, 1.51248965569852e-08, 2.43172369422299e-08]},
-            {"name": "GFX100S II iso 1250", "iso": 1250, "a": [3.09137865683379e-05, 1.16334856773592e-05, 2.68662223508457e-05], "b": [2.8616432163e-08, 1.98936792087984e-08, 3.09766884661503e-08]},
-            {"name": "GFX100S II iso 1600", "iso": 1600, "a": [3.86853545042368e-05, 1.45129029440502e-05, 3.35270750756206e-05], "b": [3.67817528779398e-08, 2.59815631121589e-08, 3.97729369950875e-08]},
-            {"name": "GFX100S II iso 2000", "iso": 2000, "a": [4.81564576294897e-05, 1.80183080271019e-05, 4.1678904127258e-05], "b": [4.73810496817455e-08, 3.41343333464019e-08, 5.17902122557612e-08]},
-            {"name": "GFX100S II iso 2500", "iso": 2500, "a": [6.03895685266849e-05, 2.24625611852341e-05, 5.21564499170778e-05], "b": [6.24728899888265e-08, 4.56152802816285e-08, 6.7598504006798e-08]},
-            {"name": "GFX100S II iso 3200", "iso": 3200, "a": [7.53156747314421e-05, 2.79124474860633e-05, 6.51978803630632e-05], "b": [8.02963042080143e-08, 6.00120714241272e-08, 8.71726449320288e-08]},
-            {"name": "GFX100S II iso 4000", "iso": 4000, "a": [9.3734588940378e-05, 3.47816075691437e-05, 8.15467232564132e-05], "b": [1.04554056048688e-07, 7.89203196760883e-08, 1.13106219437921e-07]},
-            {"name": "GFX100S II iso 5000", "iso": 5000, "a": [0.000118703037558278, 4.37664742654435e-05, 0.000103054401086168], "b": [1.33480105617177e-07, 1.03077419289472e-07, 1.44573731781454e-07]},
-            {"name": "GFX100S II iso 6400", "iso": 6400, "a": [0.000149659032190459, 5.52985361189194e-05, 0.000130347641057432], "b": [1.75174775831963e-07, 1.35925693435858e-07, 1.87933634711002e-07]},
-            {"name": "GFX100S II iso 8000", "iso": 8000, "a": [0.00018905804493594, 6.93998678474455e-05, 0.000163919349829339], "b": [2.20383803923394e-07, 1.74848088690222e-07, 2.37567218571308e-07]},
-            {"name": "GFX100S II iso 10000", "iso": 10000, "a": [0.000239384881833792, 8.82029480591208e-05, 0.000207828919641039], "b": [2.7892752100584e-07, 2.26616851337695e-07, 3.02066102676161e-07]},
-            {"name": "GFX100S II iso 12800", "iso": 12800, "a": [0.000304766296557737, 0.000112142320732256, 0.000264127854113568], "b": [3.46341476963967e-07, 2.9750258548634e-07, 3.81143187483313e-07]},
-            {"name": "GFX100S II iso 25600", "iso": 25600, "a": [0.000493657562150679, 0.000181566701131466, 0.000420230800958785], "b": [4.30375041966128e-07, 4.37726455476686e-07, 5.35137874337451e-07]}
-          ]
-        },
-        {
-          "comment": "gfx100 ii contributed by karsten",
-          "model": "GFX100 II",
-          "profiles": [
-            {"name": "GFX100 II iso 40", "iso": 40, "a": [2.28833112837853e-06, 1.096521289618e-06, 2.49672782015323e-06], "b": [-3.99891195606517e-09, -6.85007694245231e-09, -6.84546699418591e-09]},
-            {"name": "GFX100 II iso 80", "iso": 80, "a": [2.30428209663152e-06, 1.11018123462402e-06, 2.53229491349959e-06], "b": [-1.86451844424538e-09, -4.73135712494066e-09, -3.99366909834765e-09]},
-            {"name": "GFX100 II iso 100", "iso": 100, "a": [2.57952719502622e-06, 1.23398904938817e-06, 2.80319613958251e-06], "b": [-1.037304615075e-09, -4.35965151521421e-09, -3.04969337956567e-09]},
-            {"name": "GFX100 II iso 125", "iso": 125, "a": [3.15697408356476e-06, 1.48608542573145e-06, 3.38592097433335e-06], "b": [-2.90583353591413e-10, -3.99948026819546e-09, -2.05763010929973e-09]},
-            {"name": "GFX100 II iso 160", "iso": 160, "a": [2.30523829780491e-06, 1.07690504051732e-06, 2.43162687114921e-06], "b": [1.1933934336437e-10, -1.82799007797492e-09, -6.42887059228295e-10]},
-            {"name": "GFX100 II iso 200", "iso": 200, "a": [2.57431828010077e-06, 1.19037023086526e-06, 2.70613018361526e-06], "b": [8.4608391865388e-10, -1.31772285935088e-09, 5.69134324463052e-12]},
-            {"name": "GFX100 II iso 250", "iso": 250, "a": [3.15365163267395e-06, 1.44499299614719e-06, 3.28649128297403e-06], "b": [1.68926593013366e-09, -9.25768743309316e-10, 8.86397271265665e-10]},
-            {"name": "GFX100 II iso 320", "iso": 320, "a": [3.90025269023692e-06, 1.76892010172081e-06, 4.02863296622813e-06], "b": [2.81864328759822e-09, -3.1627378619087e-10, 2.30639819135282e-09]},
-            {"name": "GFX100 II iso 400", "iso": 400, "a": [4.81096866483669e-06, 2.17063263028132e-06, 4.9598027976421e-06], "b": [4.45755441268259e-09, 4.51945241898386e-10, 3.77669455444338e-09]},
-            {"name": "GFX100 II iso 500", "iso": 500, "a": [5.96098330495254e-06, 2.66820991815135e-06, 6.1018625241568e-06], "b": [6.52770447202891e-09, 1.59157271973957e-09, 6.08408898592304e-09]},
-            {"name": "GFX100 II iso 640", "iso": 640, "a": [7.44051677210403e-06, 3.3173087720401e-06, 7.59145796208106e-06], "b": [9.44439122096434e-09, 3.24443508693403e-09, 9.06693411621602e-09]},
-            {"name": "GFX100 II iso 800", "iso": 800, "a": [9.30044681366534e-06, 4.12582297605644e-06, 9.49290963932165e-06], "b": [1.30911709251097e-08, 5.12179347623028e-09, 1.287620759334e-08]},
-            {"name": "GFX100 II iso 1000", "iso": 1000, "a": [1.19561380125449e-05, 5.28325397128924e-06, 1.22292667457386e-05], "b": [1.11515721862318e-08, 2.93164085455438e-09, 1.11848320196067e-08]},
-            {"name": "GFX100 II iso 1250", "iso": 1250, "a": [1.49306419433186e-05, 6.57407681055918e-06, 1.52415126401379e-05], "b": [1.51602589413705e-08, 5.1983645739351e-09, 1.56498888851383e-08]},
-            {"name": "GFX100 II iso 1600", "iso": 1600, "a": [1.86940689501298e-05, 8.18634145990276e-06, 1.89918513948405e-05], "b": [2.03788472317363e-08, 8.08223607594878e-09, 2.17721241199514e-08]},
-            {"name": "GFX100 II iso 2000", "iso": 2000, "a": [2.32538710847953e-05, 1.01880241932766e-05, 2.36112220371483e-05], "b": [2.77856959584883e-08, 1.19100437764306e-08, 2.93755516553768e-08]},
-            {"name": "GFX100 II iso 2500", "iso": 2500, "a": [2.92495923508875e-05, 1.27828817808386e-05, 2.95868436243489e-05], "b": [3.75750961625057e-08, 1.77105110964225e-08, 4.00707267942196e-08]},
-            {"name": "GFX100 II iso 3200", "iso": 3200, "a": [3.65959331446815e-05, 1.59011866013472e-05, 3.69259014452126e-05], "b": [5.10815068963371e-08, 2.65870117840671e-08, 5.45562180867878e-08]},
-            {"name": "GFX100 II iso 4000", "iso": 4000, "a": [4.55147989612558e-05, 1.97184772532378e-05, 4.57864083061327e-05], "b": [6.76498834215557e-08, 3.81620015016581e-08, 7.41171932821573e-08]},
-            {"name": "GFX100 II iso 5000", "iso": 5000, "a": [5.72272420261894e-05, 2.46392222390726e-05, 5.74758314146495e-05], "b": [9.40365385147151e-08, 5.67757034083446e-08, 1.01384349669064e-07]},
-            {"name": "GFX100 II iso 6400", "iso": 6400, "a": [7.09560093116082e-05, 3.05550099580362e-05, 7.14186149977879e-05], "b": [1.29474788253725e-07, 8.01025343391172e-08, 1.36676896202304e-07]},
-            {"name": "GFX100 II iso 8000", "iso": 8000, "a": [8.85558608079171e-05, 3.80436142816067e-05, 8.90455551612183e-05], "b": [1.72215735684071e-07, 1.10888061374656e-07, 1.80983054902198e-07]},
-            {"name": "GFX100 II iso 10000", "iso": 10000, "a": [0.00011165093415418, 4.78894721331965e-05, 0.000112587426723222], "b": [2.26142429281417e-07, 1.46674689136045e-07, 2.30893176654862e-07]},
-            {"name": "GFX100 II iso 12800", "iso": 12800, "a": [0.000139737545386545, 6.01175101715155e-05, 0.00014144682098378], "b": [2.94775528703222e-07, 1.92373851880289e-07, 2.99412766370081e-07]},
-            {"name": "GFX100 II iso 25600", "iso": 25600, "a": [0.00041790959641966, 0.000181830616328107, 0.000422995976619627], "b": [8.43079115212206e-07, 5.89449098371453e-07, 8.69441852572731e-07]}
-          ]
        }
      ]
    },
@ -5112,48 +4757,6 @@
            {"name": "Z 6_2 iso 204800", "iso": 204800, "a": [0.00267302865999845, 0.00119738998970602, 0.00194839134581313], "b": [8.89230402492932e-07, 5.27808643926236e-06, 6.99898555258066e-06]}
          ]
        },
-        {
-          "comment": "z6_3 contributed by chapmrd1",
-          "model": "Z6_3",
-          "profiles": [
-            {"name": "Z6_3 iso 50", "iso": 50, "a": [1.32246183005311e-06, 5.86457042333647e-07, 1.0770890792372e-06], "b": [2.36653258453653e-09, 1.38980342557636e-09, 2.24103764594806e-09]},
-            {"name": "Z6_3 iso 64", "iso": 64, "a": [1.30731185609314e-06, 6.21072597054262e-07, 1.06861847807265e-06], "b": [2.25068388828492e-09, 1.31399380575363e-09, 2.23166201007188e-09]},
-            {"name": "Z6_3 iso 80", "iso": 80, "a": [1.37371811462949e-06, 5.83246283910179e-07, 1.10425717154656e-06], "b": [1.87203307605792e-09, 1.35911923332843e-09, 2.07241919678189e-09]},
-            {"name": "Z6_3 iso 100", "iso": 100, "a": [1.30043530216136e-06, 5.45711807975247e-07, 1.04295316542875e-06], "b": [1.68055030961952e-09, 1.33066026080512e-09, 1.94142965344414e-09]},
-            {"name": "Z6_3 iso 125", "iso": 125, "a": [1.66080452759811e-06, 6.90342452504765e-07, 1.31678276851129e-06], "b": [2.15814878252169e-09, 1.78504060342909e-09, 2.37637290791781e-09]},
-            {"name": "Z6_3 iso 160", "iso": 160, "a": [2.11919528707843e-06, 8.77317994614284e-07, 1.67812314433847e-06], "b": [2.58502491567119e-09, 2.29809922392815e-09, 2.93932659834167e-09]},
-            {"name": "Z6_3 iso 200", "iso": 200, "a": [2.71313859840436e-06, 1.1171358116762e-06, 2.12955963751749e-06], "b": [3.29099906876602e-09, 2.87858855968518e-09, 3.70542875060438e-09]},
-            {"name": "Z6_3 iso 250", "iso": 250, "a": [3.47240698718596e-06, 1.4227423081673e-06, 2.71262149807442e-06], "b": [4.08105110747217e-09, 3.64368113976069e-09, 4.55142941113926e-09]},
-            {"name": "Z6_3 iso 320", "iso": 320, "a": [4.4448765440494e-06, 1.81326644748331e-06, 3.45704579672246e-06], "b": [4.98843329639954e-09, 4.37534485801943e-09, 5.65203220830847e-09]},
-            {"name": "Z6_3 iso 400", "iso": 400, "a": [5.76762015961212e-06, 2.34745519093115e-06, 4.45128649885267e-06], "b": [6.4280047080517e-09, 5.30665946299426e-09, 6.88343493067873e-09]},
-            {"name": "Z6_3 iso 500", "iso": 500, "a": [7.85824172483153e-06, 3.18106960138261e-06, 6.06688032816032e-06], "b": [1.36019747438457e-08, 1.03674421194728e-08, 1.37176077390595e-08]},
-            {"name": "Z6_3 iso 640", "iso": 640, "a": [9.95975390878694e-06, 4.03426590899182e-06, 7.6835444711528e-06], "b": [1.98740155481704e-08, 1.46408463987673e-08, 1.96883506702141e-08]},
-            {"name": "Z6_3 iso 800", "iso": 800, "a": [1.20231865707208e-05, 4.85409222608254e-06, 9.28960351300328e-06], "b": [4.79782981132225e-09, 4.02358912517977e-09, 5.26393619045661e-09]},
-            {"name": "Z6_3 iso 1000", "iso": 1000, "a": [1.51639579489411e-05, 6.12074173597946e-06, 1.16800439744276e-05], "b": [6.15181565801863e-09, 4.99512871165861e-09, 6.83517702072102e-09]},
-            {"name": "Z6_3 iso 1250", "iso": 1250, "a": [1.90095101389999e-05, 7.68450489945893e-06, 1.46303378583661e-05], "b": [8.18647231780244e-09, 6.4116802523131e-09, 8.5511328170127e-09]},
-            {"name": "Z6_3 iso 1600", "iso": 1600, "a": [2.40746264257473e-05, 9.72814455024298e-06, 1.85174005450924e-05], "b": [1.08273352480049e-08, 8.52436664399608e-09, 1.13828248077544e-08]},
-            {"name": "Z6_3 iso 2000", "iso": 2000, "a": [3.03388682202722e-05, 1.22559300883419e-05, 2.33073427835028e-05], "b": [1.41763926806659e-08, 1.07841790897036e-08, 1.45010010253841e-08]},
-            {"name": "Z6_3 iso 2500", "iso": 2500, "a": [3.81155863643039e-05, 1.54254039775208e-05, 2.92722149173977e-05], "b": [1.86835994202852e-08, 1.41688796547753e-08, 1.87376311347131e-08]},
-            {"name": "Z6_3 iso 3200", "iso": 3200, "a": [4.82947178274082e-05, 1.94990457452657e-05, 3.69521593211971e-05], "b": [2.47984938568556e-08, 1.82377287987145e-08, 2.44712045897862e-08]},
-            {"name": "Z6_3 iso 4000", "iso": 4000, "a": [6.09115181700586e-05, 2.46271570263929e-05, 4.69519250547889e-05], "b": [3.25415403545871e-08, 2.34637084184286e-08, 3.15228288451887e-08]},
-            {"name": "Z6_3 iso 5000", "iso": 5000, "a": [7.72804770882108e-05, 3.10989686429035e-05, 5.93061607283576e-05], "b": [4.29136948475469e-08, 3.04066188813957e-08, 4.08906828387765e-08]},
-            {"name": "Z6_3 iso 6400", "iso": 6400, "a": [9.83000850448843e-05, 3.96305015254918e-05, 7.53200762478455e-05], "b": [5.86262266298293e-08, 4.142715458958e-08, 5.55258367651835e-08]},
-            {"name": "Z6_3 iso 8000", "iso": 8000, "a": [0.000122968028259154, 4.9800128364102e-05, 9.43763974063998e-05], "b": [8.12641805719535e-08, 5.59646349862048e-08, 7.57228319452885e-08]},
-            {"name": "Z6_3 iso 10000", "iso": 10000, "a": [0.000154225663645763, 6.25920402671922e-05, 0.0001185414829501], "b": [1.10950320853984e-07, 7.56992234190562e-08, 1.02163695229982e-07]},
-            {"name": "Z6_3 iso 12800", "iso": 12800, "a": [0.000196748126850036, 7.94482440513507e-05, 0.000150863866089227], "b": [1.59410985377093e-07, 1.08337437365137e-07, 1.50287885188377e-07]},
-            {"name": "Z6_3 iso 16000", "iso": 16000, "a": [0.000243984186479671, 9.83865061556584e-05, 0.000187912684514267], "b": [2.02908397185646e-07, 1.36145183069811e-07, 1.88719651689154e-07]},
-            {"name": "Z6_3 iso 20000", "iso": 20000, "a": [0.000309019959149715, 0.000124751093105722, 0.000237740552005513], "b": [2.83735267725942e-07, 1.98586135726537e-07, 2.65053336050092e-07]},
-            {"name": "Z6_3 iso 25600", "iso": 25600, "a": [0.000392557599775454, 0.000158050301963446, 0.000300735785545887], "b": [3.8355393660036e-07, 2.81479928686151e-07, 3.63433195342064e-07]},
-            {"name": "Z6_3 iso 32000", "iso": 32000, "a": [0.000498158086173646, 0.000200363446303702, 0.000382785299017043], "b": [5.17663382663746e-07, 4.00644773687706e-07, 4.94134625116024e-07]},
-            {"name": "Z6_3 iso 40000", "iso": 40000, "a": [0.000632226265567143, 0.000254226638465587, 0.00048450877069507], "b": [7.08817954362841e-07, 5.87024363446895e-07, 7.20781197708503e-07]},
-            {"name": "Z6_3 iso 51200", "iso": 51200, "a": [0.000806371907652381, 0.000323945227451449, 0.000615465774320104], "b": [9.69982371274829e-07, 8.44743619756302e-07, 1.04806258100969e-06]},
-            {"name": "Z6_3 iso 64000", "iso": 64000, "a": [0.00102871077424216, 0.000413824499682102, 0.00078692815525959], "b": [1.30630196487942e-06, 1.23735061384722e-06, 1.52574864222749e-06]},
-            {"name": "Z6_3 iso 80000", "iso": 80000, "a": [0.00130544789865275, 0.000525964647557166, 0.000998208648828631], "b": [1.71927327097066e-06, 1.89708888885977e-06, 2.29244387089251e-06]},
-            {"name": "Z6_3 iso 102400", "iso": 102400, "a": [0.00167424193386635, 0.000673048446066719, 0.00127471371265852], "b": [2.24347652147553e-06, 2.83552681772256e-06, 3.34709245020909e-06]},
-            {"name": "Z6_3 iso 128000", "iso": 128000, "a": [0.0021488883826838, 0.000869329651916447, 0.00163927140490758], "b": [2.41147833278521e-06, 4.23048406755267e-06, 4.75545289254646e-06]},
-            {"name": "Z6_3 iso 204800", "iso": 204800, "a": [0.0035380698675626, 0.00141321407620688, 0.00267771100152395], "b": [2.58640793218024e-06, 9.94797173484848e-06, 9.89008575824193e-06]}
-          ]
-        },
        {
          "comment": "z 7 contributed by Wolfgang Goetz",
          "model": "Z 7",
@ -5347,40 +4950,6 @@
            {"name": "Z f iso 128000", "iso": 128000, "a": [0.00183956378316105, 0.000749073433089036, 0.00150047076311758], "b": [4.75216057696834e-07, 1.78803242265804e-06, 1.9241182322145e-06]},
            {"name": "Z f iso 204800", "iso": 204800, "a": [0.00301886781168965, 0.0012386301980822, 0.0024545719361193], "b": [-1.37149644794568e-06, 3.41002128913365e-06, 2.85395961412615e-06]}
          ]
-        },
-        {
-          "comment": "z fc contributed by simon",
-          "model": "Z fc",
-          "profiles": [
-            {"name": "Z fc iso 100", "iso": 100, "a": [2.57430395935486e-06, 9.72653047344708e-07, 1.71353655443572e-06], "b": [2.20999521271305e-09, 1.43030086750578e-09, 2.35114114715295e-09]},
-            {"name": "Z fc iso 125", "iso": 125, "a": [3.04351278223101e-06, 1.14189646014817e-06, 2.01849069588642e-06], "b": [3.24023515045354e-09, 2.16689191603496e-09, 3.51858218490513e-09]},
-            {"name": "Z fc iso 160", "iso": 160, "a": [3.96665056099282e-06, 1.47228866338906e-06, 2.59886111516093e-06], "b": [3.19789819884127e-09, 2.25300521598521e-09, 3.63236523177573e-09]},
-            {"name": "Z fc iso 200", "iso": 200, "a": [4.66967438079984e-06, 1.72583972764497e-06, 3.04579807719483e-06], "b": [4.43849480212604e-09, 3.27680116612732e-09, 5.20896452318545e-09]},
-            {"name": "Z fc iso 250", "iso": 250, "a": [5.41049356439416e-06, 1.99398306243466e-06, 3.54116207758988e-06], "b": [6.25343601770488e-09, 4.91910950941358e-09, 7.64396599508604e-09]},
-            {"name": "Z fc iso 320", "iso": 320, "a": [7.17775087231361e-06, 2.61895549222022e-06, 4.62798100243551e-06], "b": [7.05423427085134e-09, 5.05939439317878e-09, 7.50752222792462e-09]},
-            {"name": "Z fc iso 400", "iso": 400, "a": [8.93305393764463e-06, 3.26316787326854e-06, 5.66419531520315e-06], "b": [6.8665862740387e-09, 4.95952611909167e-09, 8.08646804124208e-09]},
-            {"name": "Z fc iso 500", "iso": 500, "a": [1.04599763280512e-05, 3.81120594796631e-06, 6.67789971051823e-06], "b": [9.33639886604745e-09, 7.27459304883229e-09, 1.1644420415187e-08]},
-            {"name": "Z fc iso 640", "iso": 640, "a": [1.8488997984141e-05, 6.88453569367338e-06, 1.17184423608085e-05], "b": [8.69676523809205e-09, 6.20607028436039e-09, 1.00436891220061e-08]},
-            {"name": "Z fc iso 800", "iso": 800, "a": [2.31515697115782e-05, 8.65898431131987e-06, 1.47170573418656e-05], "b": [1.29615229771486e-08, 9.32803938692027e-09, 1.49739241524276e-08]},
-            {"name": "Z fc iso 1000", "iso": 1000, "a": [2.91136999152021e-05, 1.08916847846718e-05, 1.84869609084657e-05], "b": [1.84050733872934e-08, 1.36188213244927e-08, 2.14700585738903e-08]},
-            {"name": "Z fc iso 1250", "iso": 1250, "a": [3.6920626339818e-05, 1.37174714756999e-05, 2.32923961534966e-05], "b": [1.87240518409595e-08, 1.3170225103605e-08, 2.07577297016833e-08]},
-            {"name": "Z fc iso 1600", "iso": 1600, "a": [4.64504287757664e-05, 1.72776949334378e-05, 2.94007069805647e-05], "b": [2.68470811144392e-08, 1.94605935321142e-08, 3.08482203365801e-08]},
-            {"name": "Z fc iso 2000", "iso": 2000, "a": [5.80097904625369e-05, 2.17009098557463e-05, 3.68562913426485e-05], "b": [4.07763092456368e-08, 2.86019556253937e-08, 4.47822289495753e-08]},
-            {"name": "Z fc iso 2500", "iso": 2500, "a": [7.42196915929427e-05, 2.75109496392433e-05, 4.68309342352006e-05], "b": [4.23414570767217e-08, 2.84903919701984e-08, 4.43911467181787e-08]},
-            {"name": "Z fc iso 3200", "iso": 3200, "a": [9.27384578640431e-05, 3.45614680834228e-05, 5.86670578437048e-05], "b": [5.74530537725386e-08, 3.96086469630567e-08, 6.12443878478972e-08]},
-            {"name": "Z fc iso 4000", "iso": 4000, "a": [0.000116918460977059, 4.36774128900188e-05, 7.41198320000867e-05], "b": [8.59725317396685e-08, 5.79962347825179e-08, 8.91186893963683e-08]},
-            {"name": "Z fc iso 5000", "iso": 5000, "a": [0.00014939303114758, 5.52898905590487e-05, 9.39527444439296e-05], "b": [9.1698989747005e-08, 5.76089635910884e-08, 8.9872571177837e-08]},
-            {"name": "Z fc iso 6400", "iso": 6400, "a": [0.000186668334965561, 6.94256572813713e-05, 0.000117885424377236], "b": [1.34181691046839e-07, 8.63898985025395e-08, 1.32717157664163e-07]},
-            {"name": "Z fc iso 8000", "iso": 8000, "a": [0.000233902849081441, 8.69264130465904e-05, 0.000148320447679038], "b": [1.8446706619632e-07, 1.22243135543111e-07, 1.82332444228446e-07]},
-            {"name": "Z fc iso 10000", "iso": 10000, "a": [0.000299745531980251, 0.000111093126587911, 0.000189511462670531], "b": [2.22476679863266e-07, 1.39608270710988e-07, 2.03924367490336e-07]},
-            {"name": "Z fc iso 12800", "iso": 12800, "a": [0.000241589330428511, 8.73357710404202e-05, 0.000154382730257725], "b": [2.56959718698796e-07, 1.68281123016584e-07, 2.51955243210957e-07]},
-            {"name": "Z fc iso 16000", "iso": 16000, "a": [0.000302486856062459, 0.000109427005350627, 0.000193106208409227], "b": [3.489260469535e-07, 2.41320171776603e-07, 3.5488949112893e-07]},
-            {"name": "Z fc iso 20000", "iso": 20000, "a": [0.000400892161621002, 0.000145126070438683, 0.000255307642194102], "b": [3.90308010614631e-07, 2.75955574252752e-07, 4.01597976129239e-07]},
-            {"name": "Z fc iso 25600", "iso": 25600, "a": [0.0004940260705045, 0.000179461917013242, 0.000316342672021704], "b": [5.0413022380646e-07, 4.02186316977871e-07, 5.66134030680743e-07]},
-            {"name": "Z fc iso 32000", "iso": 32000, "a": [0.000615169675137708, 0.000224038352792817, 0.000393505509270613], "b": [5.94331869135039e-07, 5.4534870265455e-07, 7.66241673043593e-07]},
-            {"name": "Z fc iso 40000", "iso": 40000, "a": [0.000812302623203856, 0.000293390918793732, 0.000516733567002007], "b": [6.49962100998711e-07, 6.70456727931735e-07, 9.48268831711847e-07]},
-            {"name": "Z fc iso 51200", "iso": 51200, "a": [0.00100839758759898, 0.000366904452476897, 0.000649035953321123], "b": [7.20075210827347e-07, 9.2854912062417e-07, 1.32228800833795e-06]}
-          ]
        }
      ]
    },
@ -6289,24 +5858,6 @@
            {"name": "OM-1 Mark II iso 102400", "iso": 102400, "a": [0.00340118433678803, 0.00127839578786132, 0.00221698772131594], "b": [2.97339351312398e-06, 6.50048915357512e-06, 9.85577922415482e-06]}
          ]
        },
-        {
-          "comment": "om-3 contributed by ereliai",
-          "model": "OM-3",
-          "profiles": [
-            {"name": "OM-3 iso 80", "iso": 80, "a": [6.2290447323575e-06, 2.22310240927457e-06, 5.34007979782167e-06], "b": [8.93735666542922e-09, 6.16627217503172e-09, 8.2867243851556e-09]},
-            {"name": "OM-3 iso 100", "iso": 100, "a": [7.7220958152463e-06, 2.75302829393803e-06, 6.5771427181942e-06], "b": [8.94145321189339e-09, 6.15547281465465e-09, 8.11497548408994e-09]},
-            {"name": "OM-3 iso 200", "iso": 200, "a": [7.10556840923564e-06, 2.54645469254092e-06, 6.01655795776238e-06], "b": [7.44470548169333e-09, 5.59679342568696e-09, 1.20598326290946e-08]},
-            {"name": "OM-3 iso 400", "iso": 400, "a": [1.35403688047167e-05, 4.77477690528567e-06, 1.1306228790005e-05], "b": [1.90183535587667e-08, 1.31622847972558e-08, 2.76892456896002e-08]},
-            {"name": "OM-3 iso 800", "iso": 800, "a": [2.65206756207691e-05, 9.29649958376966e-06, 2.20774942222157e-05], "b": [4.24483544888477e-08, 3.0296164977412e-08, 5.67513312905471e-08]},
-            {"name": "OM-3 iso 1600", "iso": 1600, "a": [5.29124465751692e-05, 1.85538968217089e-05, 4.52890406453039e-05], "b": [5.96129233840603e-08, 4.27618113091784e-08, 4.69233202303924e-08]},
-            {"name": "OM-3 iso 3200", "iso": 3200, "a": [0.000105765047287639, 3.71554280268864e-05, 9.0569501038229e-05], "b": [9.85070716420686e-08, 7.42692685610883e-08, 8.45721097775999e-08]},
-            {"name": "OM-3 iso 6400", "iso": 6400, "a": [0.000214240431315307, 7.47958497018665e-05, 0.000178133812677298], "b": [2.37280607119505e-07, 1.85515705583797e-07, 2.1214148440919e-07]},
-            {"name": "OM-3 iso 12800", "iso": 12800, "a": [0.000430339474683301, 0.00015042623213513, 0.000358379437202508], "b": [3.91004288877848e-07, 3.75753106533863e-07, 4.24888023826195e-07]},
-            {"name": "OM-3 iso 25600", "iso": 25600, "a": [0.00087602839166538, 0.000305619749391096, 0.000730280616883842], "b": [3.07827178802986e-07, 5.43717356679174e-07, 5.46020456918352e-07]},
-            {"name": "OM-3 iso 51200", "iso": 51200, "a": [0.00176093754007439, 0.000623026733431986, 0.00142915335024971], "b": [-7.64095091502542e-07, 1.19533909521668e-06, 7.14558115831669e-07]},
-            {"name": "OM-3 iso 102400", "iso": 102400, "a": [0.00350282811578931, 0.00126383470847506, 0.00291016294969596], "b": [-3.96478066685098e-06, 2.85547072977049e-06, 6.96789593845021e-07]}
-          ]
-        },
        {
          "comment": "om-5 contributed by jebinge",
          "model": "OM-5",
@ -6448,37 +5999,6 @@
            {"name": "DC-G9 iso 25600", "iso": 25600, "a": [0.000353216353876942, 0.000218344097509516, 0.000331715419746587], "b": [1.22300614394111e-06, 1.25021613404068e-06, 1.020801517733e-06]}
          ]
        },
-        {
-          "comment": "dc-g9m2 contributed by Chris Rogers",
-          "model": "DC-G9M2",
-          "profiles": [
-            {"name": "DC-G9M2 iso 100", "iso": 100, "a": [9.85968052868924e-06, 2.91615855685793e-06, 4.33359507066844e-06], "b": [7.896262339185e-09, 2.67020171292138e-09, 3.7778714597454e-09]},
-            {"name": "DC-G9M2 iso 125", "iso": 125, "a": [1.18364274550072e-05, 3.55605533175001e-06, 5.35259009072212e-06], "b": [9.39056750629975e-09, 3.88491001162229e-09, 5.17993378581318e-09]},
-            {"name": "DC-G9M2 iso 160", "iso": 160, "a": [1.41669535872409e-05, 4.30765256356412e-06, 6.60728829382012e-06], "b": [1.19089370302603e-08, 4.67432689553372e-09, 6.10888118719364e-09]},
-            {"name": "DC-G9M2 iso 200", "iso": 200, "a": [1.50451630533297e-05, 4.55926612311153e-06, 6.97556524572368e-06], "b": [1.44794881104398e-08, 6.14517000834833e-09, 8.49634176506145e-09]},
-            {"name": "DC-G9M2 iso 250", "iso": 250, "a": [1.85609984093108e-05, 5.62628751543003e-06, 8.707381803486e-06], "b": [1.75396773263117e-08, 8.47798544944044e-09, 1.1749432809472e-08]},
-            {"name": "DC-G9M2 iso 320", "iso": 320, "a": [2.27660599907775e-05, 6.95765727243353e-06, 1.08204064218478e-05], "b": [2.12307431542863e-08, 1.05988754555089e-08, 1.4587143298649e-08]},
-            {"name": "DC-G9M2 iso 400", "iso": 400, "a": [2.60128983733725e-05, 8.0454013546089e-06, 1.26780367115278e-05], "b": [2.74061222203672e-08, 1.48453775168993e-08, 2.0442991107805e-08]},
-            {"name": "DC-G9M2 iso 500", "iso": 500, "a": [3.12856790311524e-05, 1.00206397955916e-05, 1.59470587592585e-05], "b": [3.33281880177967e-08, 1.85514280241429e-08, 2.48267711211364e-08]},
-            {"name": "DC-G9M2 iso 640", "iso": 640, "a": [3.84989685957478e-05, 1.24241445541945e-05, 1.97378769085453e-05], "b": [4.24606860804296e-08, 2.39806785260814e-08, 3.13389392697564e-08]},
-            {"name": "DC-G9M2 iso 800", "iso": 800, "a": [4.53096334513513e-05, 1.45193444204471e-05, 2.31662325792797e-05], "b": [5.10342769478841e-08, 3.03444881263015e-08, 4.14163453500439e-08]},
-            {"name": "DC-G9M2 iso 1000", "iso": 1000, "a": [5.52061330386512e-05, 1.79719626094328e-05, 2.85915797499327e-05], "b": [6.35789173693556e-08, 3.87197950539009e-08, 5.25830603111886e-08]},
-            {"name": "DC-G9M2 iso 1250", "iso": 1250, "a": [6.69153725902165e-05, 2.21202601162168e-05, 3.51232650653546e-05], "b": [8.07586364034053e-08, 4.99464371255342e-08, 6.84679563253225e-08]},
-            {"name": "DC-G9M2 iso 1600", "iso": 1600, "a": [8.03419341697693e-05, 2.6354182176615e-05, 4.21072992571521e-05], "b": [9.8945156982103e-08, 6.4814210887097e-08, 8.92753900402335e-08]},
-            {"name": "DC-G9M2 iso 2000", "iso": 2000, "a": [8.66814505247621e-05, 2.87086330113072e-05, 4.60125728908354e-05], "b": [1.24709149304336e-07, 8.84547911033817e-08, 1.21503607438391e-07]},
-            {"name": "DC-G9M2 iso 2500", "iso": 2500, "a": [8.73792444132947e-05, 2.79127891585416e-05, 4.5622372871318e-05], "b": [1.67212233957599e-07, 1.28979115774229e-07, 1.73742759606285e-07]},
-            {"name": "DC-G9M2 iso 3200", "iso": 3200, "a": [9.75628532644022e-05, 2.95625867505674e-05, 4.96759761559191e-05], "b": [1.24663505502244e-07, 7.50794413825709e-08, 1.00529748472272e-07]},
-            {"name": "DC-G9M2 iso 4000", "iso": 4000, "a": [0.000122679104790092, 3.90355134967433e-05, 6.20237715366243e-05], "b": [1.60058187985492e-07, 9.28993704683351e-08, 1.28104926172306e-07]},
-            {"name": "DC-G9M2 iso 5000", "iso": 5000, "a": [0.000155444856461965, 4.90481555590473e-05, 7.75942631645636e-05], "b": [1.73651889086858e-07, 1.17252789668802e-07, 1.5728895785713e-07]},
-            {"name": "DC-G9M2 iso 6400", "iso": 6400, "a": [0.000194417184370254, 6.16319918384601e-05, 9.75438716413919e-05], "b": [2.34760743136705e-07, 1.60259455189578e-07, 2.12973152945659e-07]},
-            {"name": "DC-G9M2 iso 8000", "iso": 8000, "a": [0.000245143251472576, 7.75149797093574e-05, 0.000123161320959588], "b": [2.68979649433676e-07, 1.99717421325772e-07, 2.56076477932565e-07]},
-            {"name": "DC-G9M2 iso 10000", "iso": 10000, "a": [0.000308284368702448, 9.8218196105381e-05, 0.000155290126861708], "b": [3.19096883639322e-07, 2.60530539974314e-07, 3.23148469750247e-07]},
-            {"name": "DC-G9M2 iso 12800", "iso": 12800, "a": [0.000385992147860653, 0.000123318497038811, 0.0001984346434044], "b": [3.64692325755353e-07, 3.27198926928442e-07, 3.85623618762297e-07]},
-            {"name": "DC-G9M2 iso 16000", "iso": 16000, "a": [0.00048355789723227, 0.000154705149226928, 0.000250921497076453], "b": [4.12723759333416e-07, 4.56025342571735e-07, 5.26736124314858e-07]},
-            {"name": "DC-G9M2 iso 20000", "iso": 20000, "a": [0.000614249594544257, 0.000199211962327953, 0.000320702530880674], "b": [4.88077223353221e-07, 5.69428969038428e-07, 6.43942254679576e-07]},
-            {"name": "DC-G9M2 iso 25600", "iso": 25600, "a": [0.000770540863219948, 0.000249119091248143, 0.000411401950524648], "b": [4.48663992263919e-07, 7.92166981119354e-07, 8.70556875548493e-07]}
-          ]
-        },
        {
          "comment": "dc-gx9 contributed by corentin",
          "model": "DC-GX9",
@ -7428,41 +6948,6 @@
            {"name": "DC-S1R iso 51200", "iso": 51200, "a": [0.00217290327558976, 0.000904221245405589, 0.00168425526697212], "b": [4.51870654155855e-06, 4.13077934945906e-06, 5.3387497141688e-06]}
          ]
        },
-        {
-          "comment": "dc-s1rm2 contributed by Jordan Neumeyer",
-          "model": "DC-S1RM2",
-          "profiles": [
-            {"name": "DC-S1RM2 iso 80", "iso": 80, "a": [2.34281316024862e-06, 8.72415795000961e-07, 1.78516260792465e-06], "b": [1.19122759392564e-09, 9.46877639345334e-10, 1.20155236440843e-09]},
-            {"name": "DC-S1RM2 iso 100", "iso": 100, "a": [2.85424192248194e-06, 1.0592035047458e-06, 2.17300824608936e-06], "b": [1.4837026445139e-09, 1.27997076433847e-09, 1.57402238217615e-09]},
-            {"name": "DC-S1RM2 iso 125", "iso": 125, "a": [3.48790504705738e-06, 1.28918745035779e-06, 2.64312426968667e-06], "b": [1.98767368781965e-09, 1.66463776003367e-09, 2.09087037618691e-09]},
-            {"name": "DC-S1RM2 iso 160", "iso": 160, "a": [4.26331522501248e-06, 1.57294483946536e-06, 3.2294782812487e-06], "b": [2.66571498036887e-09, 2.19218075425505e-09, 2.67948505637279e-09]},
-            {"name": "DC-S1RM2 iso 200", "iso": 200, "a": [5.24454299512428e-06, 1.91840104491626e-06, 3.96328035763379e-06], "b": [3.44491126158657e-09, 3.00789712009564e-09, 3.57525134330047e-09]},
-            {"name": "DC-S1RM2 iso 250", "iso": 250, "a": [6.49035849333747e-06, 2.36916587760899e-06, 4.88079492621749e-06], "b": [4.58964923319253e-09, 3.82779293423763e-09, 4.74341188427982e-09]},
-            {"name": "DC-S1RM2 iso 320", "iso": 320, "a": [7.9702608860415e-06, 2.90823960846017e-06, 6.01158138087214e-06], "b": [6.05367696540263e-09, 5.0244472766808e-09, 5.91391597408495e-09]},
-            {"name": "DC-S1RM2 iso 400", "iso": 400, "a": [9.82118367053666e-06, 3.55757911140829e-06, 7.39418532222184e-06], "b": [1.99187979131583e-09, 1.74945546450843e-09, 2.19606654318085e-09]},
-            {"name": "DC-S1RM2 iso 500", "iso": 500, "a": [1.21790187765706e-05, 4.41611175143045e-06, 9.15844242472255e-06], "b": [2.56820237942566e-09, 2.28918735128854e-09, 2.69934202434582e-09]},
-            {"name": "DC-S1RM2 iso 640", "iso": 640, "a": [1.51980118137607e-05, 5.49825555623877e-06, 1.14164275669957e-05], "b": [3.22158665181241e-09, 2.90153008010436e-09, 3.47967804144177e-09]},
-            {"name": "DC-S1RM2 iso 800", "iso": 800, "a": [1.89869576758419e-05, 6.87296880072608e-06, 1.42786173046063e-05], "b": [4.06996962236938e-09, 3.58594420190744e-09, 4.3570170340058e-09]},
-            {"name": "DC-S1RM2 iso 1000", "iso": 1000, "a": [2.36518073262055e-05, 8.52886443004246e-06, 1.77464656329931e-05], "b": [5.30249617526241e-09, 4.6102827123362e-09, 5.49145912537716e-09]},
-            {"name": "DC-S1RM2 iso 1250", "iso": 1250, "a": [2.94883676445099e-05, 1.06266404486362e-05, 2.21630553517927e-05], "b": [6.73728049959021e-09, 5.77602710535254e-09, 6.9285916359922e-09]},
-            {"name": "DC-S1RM2 iso 1600", "iso": 1600, "a": [3.67053320296415e-05, 1.32412296434047e-05, 2.75186073872612e-05], "b": [8.6684737538576e-09, 7.39151077612217e-09, 8.71140694899524e-09]},
-            {"name": "DC-S1RM2 iso 2000", "iso": 2000, "a": [4.59305298219401e-05, 1.65614860775222e-05, 3.44559248249228e-05], "b": [1.12731642704716e-08, 9.60770887451437e-09, 1.13146037121251e-08]},
-            {"name": "DC-S1RM2 iso 2500", "iso": 2500, "a": [5.74766145438499e-05, 2.07633464107449e-05, 4.30518242524795e-05], "b": [1.52239101004278e-08, 1.27725847896312e-08, 1.47708110961774e-08]},
-            {"name": "DC-S1RM2 iso 3200", "iso": 3200, "a": [7.16867925226947e-05, 2.58683967466525e-05, 5.38339552741148e-05], "b": [2.06046719106063e-08, 1.64099878694206e-08, 1.97926838131958e-08]},
-            {"name": "DC-S1RM2 iso 4000", "iso": 4000, "a": [8.72667604985884e-05, 3.16309300579752e-05, 6.54872167762544e-05], "b": [2.61875939964478e-08, 2.10729162561236e-08, 2.46483426952712e-08]},
-            {"name": "DC-S1RM2 iso 5000", "iso": 5000, "a": [0.000109601594219554, 3.95022108287909e-05, 8.19454950441704e-05], "b": [3.5701510593884e-08, 2.76515906650802e-08, 3.2822924628106e-08]},
-            {"name": "DC-S1RM2 iso 6400", "iso": 6400, "a": [0.000136177309387138, 4.92039802288642e-05, 0.000101858840231559], "b": [4.63113928785106e-08, 3.50452112125176e-08, 4.19489275484204e-08]},
-            {"name": "DC-S1RM2 iso 8000", "iso": 8000, "a": [0.000169810854887531, 6.15723147158316e-05, 0.000127579637038905], "b": [5.9810374997166e-08, 4.37964107168719e-08, 5.37411267717192e-08]},
-            {"name": "DC-S1RM2 iso 10000", "iso": 10000, "a": [0.000214317725400598, 7.73448233782032e-05, 0.000159905358491154], "b": [8.20358043936997e-08, 5.92927064365138e-08, 7.34752759023866e-08]},
-            {"name": "DC-S1RM2 iso 12800", "iso": 12800, "a": [0.000271332164042221, 9.77228445906056e-05, 0.00020249685056138], "b": [1.13430375613056e-07, 8.23200226699291e-08, 1.01720565772285e-07]},
-            {"name": "DC-S1RM2 iso 16000", "iso": 16000, "a": [0.000340815416353824, 0.000123222467592285, 0.000255437087012936], "b": [1.52063266731791e-07, 1.08565186747462e-07, 1.36556804263431e-07]},
-            {"name": "DC-S1RM2 iso 20000", "iso": 20000, "a": [0.000429178683727784, 0.000155447020039392, 0.000322846058231293], "b": [1.88779391738433e-07, 1.41244735577681e-07, 1.73319103313765e-07]},
-            {"name": "DC-S1RM2 iso 25600", "iso": 25600, "a": [0.000542610330191887, 0.000196991064357946, 0.000407723768292938], "b": [1.92513743776601e-07, 1.6204534870842e-07, 1.94938726940838e-07]},
-            {"name": "DC-S1RM2 iso 32000", "iso": 32000, "a": [0.000684170514308886, 0.000249487563150478, 0.000515483206521871], "b": [1.7781777691585e-07, 1.88332802817439e-07, 2.13240640872917e-07]},
-            {"name": "DC-S1RM2 iso 40000", "iso": 40000, "a": [0.000862222499340591, 0.000316460112706464, 0.000651649053323798], "b": [9.49639012925072e-08, 2.1714740832708e-07, 2.08228996824587e-07]},
-            {"name": "DC-S1RM2 iso 51200", "iso": 51200, "a": [0.00109260981990224, 0.000402544776531109, 0.0008289218174146], "b": [-1.1279016694484e-07, 2.27214753740488e-07, 1.41300093864567e-07]}
-          ]
-        },
        {
          "comment": "dc-s5 contributed by Jordan Neumeyer",
          "model": "DC-S5",
@ -7496,65 +6981,6 @@
            {"name": "DC-S5 iso 40000", "iso": 40000, "a": [0.000427212042587717, 0.000184707302089775, 0.000520639748008906], "b": [7.99072846104537e-07, 7.81984152544813e-07, 8.93113277740946e-07]},
            {"name": "DC-S5 iso 51200", "iso": 51200, "a": [0.000542394308982757, 0.000236112495855268, 0.000664511690110758], "b": [9.90201690715009e-07, 1.0470880629487e-06, 1.10684171681978e-06]}
          ]
-        },
-        {
-          "comment": "dc-s5m2x contributed by opcode",
-          "model": "DC-S5M2X",
-          "profiles": [
-            {"name": "DC-S5M2X iso 100", "iso": 100, "a": [1.42751014730088e-06, 5.84371568223633e-07, 1.01281267415713e-06], "b": [1.59910190648308e-09, 1.00439616880967e-09, 1.44005088971786e-09]},
-            {"name": "DC-S5M2X iso 125", "iso": 125, "a": [1.77614755848137e-06, 7.15087642846844e-07, 1.25002975545926e-06], "b": [2.02155454239447e-09, 1.3494281637735e-09, 1.85422316052295e-09]},
-            {"name": "DC-S5M2X iso 160", "iso": 160, "a": [2.2093796732919e-06, 8.83467580717377e-07, 1.5443767124812e-06], "b": [2.94468532849803e-09, 1.89754980737123e-09, 2.70003456920313e-09]},
-            {"name": "DC-S5M2X iso 200", "iso": 200, "a": [2.75262579408371e-06, 1.10203986477461e-06, 1.93517472109188e-06], "b": [3.4979325592606e-09, 2.2902136800902e-09, 3.16820105852721e-09]},
-            {"name": "DC-S5M2X iso 250", "iso": 250, "a": [3.46140969019634e-06, 1.37931624894243e-06, 2.42095723566194e-06], "b": [4.52103617535247e-09, 3.12152692312983e-09, 4.14031220370716e-09]},
-            {"name": "DC-S5M2X iso 320", "iso": 320, "a": [4.31843124611593e-06, 1.7185066768221e-06, 3.01722328648271e-06], "b": [5.98065916012519e-09, 4.08459042304511e-09, 5.54300948983669e-09]},
-            {"name": "DC-S5M2X iso 400", "iso": 400, "a": [5.43350039512965e-06, 2.1599847250286e-06, 3.7873727045965e-06], "b": [7.83382968408887e-09, 5.47598196114922e-09, 7.34009570458336e-09]},
-            {"name": "DC-S5M2X iso 500", "iso": 500, "a": [6.84528081620514e-06, 2.69882379152355e-06, 4.7500266340565e-06], "b": [1.01150377026996e-08, 7.23401677078191e-09, 9.5734378280382e-09]},
-            {"name": "DC-S5M2X iso 640", "iso": 640, "a": [8.7738584821104e-06, 3.45181429726633e-06, 6.08491815884339e-06], "b": [6.84022463160696e-09, 4.6378442998198e-09, 6.41770147626211e-09]},
-            {"name": "DC-S5M2X iso 800", "iso": 800, "a": [1.09712004344536e-05, 4.30017533976063e-06, 7.61835069254321e-06], "b": [8.50903024004269e-09, 5.98118115683456e-09, 8.01531548713458e-09]},
-            {"name": "DC-S5M2X iso 1000", "iso": 1000, "a": [1.37696927477628e-05, 5.41974939722912e-06, 9.59899584704197e-06], "b": [1.06657724312503e-08, 7.61979925346104e-09, 1.0153856869013e-08]},
-            {"name": "DC-S5M2X iso 1250", "iso": 1250, "a": [1.73183132242475e-05, 6.76170845957019e-06, 1.19773772941765e-05], "b": [1.36335779429249e-08, 9.740540786634e-09, 1.28155349300029e-08]},
-            {"name": "DC-S5M2X iso 1600", "iso": 1600, "a": [2.17645294147375e-05, 8.47285520139142e-06, 1.50243003619369e-05], "b": [1.6901260702711e-08, 1.22990766728981e-08, 1.62893301506701e-08]},
-            {"name": "DC-S5M2X iso 2000", "iso": 2000, "a": [2.74739442863416e-05, 1.07063998906188e-05, 1.89829814892762e-05], "b": [2.16625360869913e-08, 1.58824042224705e-08, 2.07270458632641e-08]},
-            {"name": "DC-S5M2X iso 2500", "iso": 2500, "a": [3.48145186792107e-05, 1.35586509354036e-05, 2.39974367863083e-05], "b": [2.74485617539497e-08, 2.0260770628793e-08, 2.61041428722153e-08]},
-            {"name": "DC-S5M2X iso 3200", "iso": 3200, "a": [4.36711738365258e-05, 1.6994403505649e-05, 2.99646090777148e-05], "b": [3.47369357252369e-08, 2.53032692332297e-08, 3.29361193491513e-08]},
-            {"name": "DC-S5M2X iso 4000", "iso": 4000, "a": [5.49520471585096e-05, 2.13748770990114e-05, 3.78223219113757e-05], "b": [4.37232732991095e-08, 3.20471279751201e-08, 4.14664947278357e-08]},
-            {"name": "DC-S5M2X iso 5000", "iso": 5000, "a": [6.9445178552188e-05, 2.69145248144542e-05, 4.77623016720525e-05], "b": [5.66144116109735e-08, 4.04212849074717e-08, 5.2710800055219e-08]},
-            {"name": "DC-S5M2X iso 6400", "iso": 6400, "a": [8.73159655183436e-05, 3.39169589563892e-05, 6.03233519708672e-05], "b": [7.24052057546535e-08, 5.18371476033369e-08, 6.7044799327428e-08]},
-            {"name": "DC-S5M2X iso 8000", "iso": 8000, "a": [0.000110246887664669, 4.29011432071097e-05, 7.61826013163914e-05], "b": [9.51917537737104e-08, 6.7586522125667e-08, 8.76150632850691e-08]},
-            {"name": "DC-S5M2X iso 10000", "iso": 10000, "a": [0.0001389245428593, 5.42904591233232e-05, 9.58560433778086e-05], "b": [1.22611482691875e-07, 8.5373766644978e-08, 1.12687921375149e-07]},
-            {"name": "DC-S5M2X iso 12800", "iso": 12800, "a": [0.000174635065212344, 6.847174001046e-05, 0.000120299236311298], "b": [1.61946766310847e-07, 1.13293902201238e-07, 1.49038016915832e-07]},
-            {"name": "DC-S5M2X iso 16000", "iso": 16000, "a": [0.000215438723133346, 8.51288707256662e-05, 0.000148244445490705], "b": [2.16074748137751e-07, 1.53140030760527e-07, 1.99865829645047e-07]},
-            {"name": "DC-S5M2X iso 20000", "iso": 20000, "a": [0.000254872058422916, 0.000101673028647156, 0.000175573020423522], "b": [3.01011693676125e-07, 2.18428668587354e-07, 2.82225833449579e-07]},
-            {"name": "DC-S5M2X iso 25600", "iso": 25600, "a": [0.000286550866818872, 0.0001154731159155, 0.000195102672715911], "b": [4.21181720191516e-07, 3.18116858910878e-07, 4.07142291984304e-07]},
-            {"name": "DC-S5M2X iso 32000", "iso": 32000, "a": [0.000354466064405632, 0.000141126789463924, 0.000242668396920169], "b": [5.52871378858611e-07, 4.40167558013648e-07, 5.48281670118814e-07]},
-            {"name": "DC-S5M2X iso 40000", "iso": 40000, "a": [0.000430934826241705, 0.000170439409105845, 0.000294879525937081], "b": [6.85115199425718e-07, 5.81533501874201e-07, 7.1543343839061e-07]},
-            {"name": "DC-S5M2X iso 51200", "iso": 51200, "a": [0.0005219141705126, 0.000208149772576544, 0.000360042341242759], "b": [7.72736097809772e-07, 6.85421246092122e-07, 8.38264800267814e-07]},
-            {"name": "DC-S5M2X iso 64000", "iso": 64000, "a": [0.00063681214976007, 0.000253960596005781, 0.00044716258149787], "b": [9.01242989122215e-07, 8.61556059484285e-07, 1.03104839110755e-06]},
-            {"name": "DC-S5M2X iso 80000", "iso": 80000, "a": [0.000783194056529541, 0.000310593088227408, 0.00055817669918082], "b": [1.06825408656527e-06, 1.10698833555871e-06, 1.30631950654607e-06]},
-            {"name": "DC-S5M2X iso 102400", "iso": 102400, "a": [0.000937500354381767, 0.000384152423506261, 0.000678182502032977], "b": [1.21991563989705e-06, 1.33685068663134e-06, 1.5822032800139e-06]},
-            {"name": "DC-S5M2X iso 128000", "iso": 128000, "a": [0.00112876999347247, 0.000471395823607574, 0.000833680478399486], "b": [1.44045109259627e-06, 1.70931592441015e-06, 2.0359685507045e-06]},
-            {"name": "DC-S5M2X iso 160000", "iso": 160000, "a": [0.00135907905014579, 0.000588034018005171, 0.00102355050092847], "b": [1.6925075719243e-06, 2.08303163292889e-06, 2.50331436963686e-06]},
-            {"name": "DC-S5M2X iso 204800", "iso": 204800, "a": [0.00156373609687554, 0.000728783089739648, 0.00123481626898206], "b": [2.08357375218079e-06, 2.58901388734473e-06, 3.19574427989767e-06]}
-          ]
-        },
-        {
-          "comment": "dc-s9 contributed by Šarūnas Burdulis",
-          "model": "DC-S9",
-          "profiles": [
-            {"name": "DC-S9 iso 50", "iso": 50, "a": [1.55647666750368e-06, 5.90041262373337e-07, 1.19608036149622e-06], "b": [5.90584625810185e-09, 3.93257724666637e-09, 6.79835436777861e-09]},
-            {"name": "DC-S9 iso 100", "iso": 100, "a": [1.52530584458053e-06, 5.88150971365476e-07, 1.2115179054967e-06], "b": [3.4771662659092e-09, 2.29174629874231e-09, 3.60271304381404e-09]},
-            {"name": "DC-S9 iso 200", "iso": 200, "a": [2.81738227040415e-06, 1.0703512253934e-06, 2.22923451102387e-06], "b": [6.80844919226035e-09, 4.64738827816431e-09, 6.63520976192906e-09]},
-            {"name": "DC-S9 iso 400", "iso": 400, "a": [5.35844733297191e-06, 2.01904672822106e-06, 4.21892516064889e-06], "b": [1.4802732606533e-08, 1.00636113052644e-08, 1.4080275493039e-08]},
-            {"name": "DC-S9 iso 800", "iso": 800, "a": [1.0713252675255e-05, 4.02119240371613e-06, 8.46054107279072e-06], "b": [1.39520473227981e-08, 9.90391056078298e-09, 1.40333304229399e-08]},
-            {"name": "DC-S9 iso 1600", "iso": 1600, "a": [2.10749508952535e-05, 7.80432189638281e-06, 1.639096005457e-05], "b": [2.97449969737117e-08, 2.02616493625017e-08, 2.42699400486328e-08]},
-            {"name": "DC-S9 iso 3200", "iso": 3200, "a": [4.13395496964206e-05, 1.53213977124643e-05, 3.23299957791157e-05], "b": [6.09085121309522e-08, 4.31531807373046e-08, 4.99012493084433e-08]},
-            {"name": "DC-S9 iso 6400", "iso": 6400, "a": [8.19136573540231e-05, 3.03118240951762e-05, 6.38296353877913e-05], "b": [1.10430326577434e-07, 8.38256021310632e-08, 9.5550503787493e-08]},
-            {"name": "DC-S9 iso 12800", "iso": 12800, "a": [0.000163216533070489, 6.04654030642798e-05, 0.000126702648937026], "b": [1.79495217253201e-07, 1.47728049372326e-07, 1.77467675132189e-07]},
-            {"name": "DC-S9 iso 25600", "iso": 25600, "a": [0.000327241629752877, 0.000120618376141736, 0.000254095769661076], "b": [1.73599003976477e-07, 2.31899281253023e-07, 2.92613623693175e-07]},
-            {"name": "DC-S9 iso 51200", "iso": 51200, "a": [0.000655545301821006, 0.00024409916542004, 0.000509384500797391], "b": [-8.42630288676037e-08, 3.02238584241948e-07, 3.37796754587034e-07]},
-            {"name": "DC-S9 iso 102400", "iso": 102400, "a": [0.00138789113861897, 0.000519705674363879, 0.00108167370321924], "b": [-2.09676268557785e-06, 2.09603012992279e-07, -7.71190113311764e-08]},
-            {"name": "DC-S9 iso 204800", "iso": 204800, "a": [0.00270679141322631, 0.00104516020625459, 0.00204670031103994], "b": [-1.03363428842454e-05, -6.15714686928554e-07, -1.87844608755383e-06]}
-          ]
        }
      ]
    },
@ -8000,17 +7426,6 @@
            {"name": "Pentax K-x iso 12800", "iso": 12800, "a": [0.000436333184304212, 0.000172418953534638, 0.000290077815985367], "b": [-2.6555286023e-06, -5.00216442638314e-06, 1.78363603676931e-06]}
          ]
        },
-        {
-          "comment": "*ist d contributed by charles",
-          "model": "*ist D",
-          "profiles": [
-            {"name": "*ist D iso 200", "iso": 200, "a": [4.8586008124672e-06, 2.0179132742245e-06, 3.64643424260564e-06], "b": [1.96157954249453e-08, 1.25037407455669e-08, 2.04905883549957e-08]},
-            {"name": "*ist D iso 400", "iso": 400, "a": [6.96125296302792e-06, 2.81672999025828e-06, 5.16914250818575e-06], "b": [2.8922036249269e-08, 1.72557954928565e-08, 2.79117459021898e-08]},
-            {"name": "*ist D iso 800", "iso": 800, "a": [1.46530086857856e-05, 5.76684237180421e-06, 1.08737329544445e-05], "b": [8.7437840068474e-08, 4.81991242279106e-08, 7.90555625873725e-08]},
-            {"name": "*ist D iso 1600", "iso": 1600, "a": [3.50851869698766e-05, 1.29838060417813e-05, 2.50214174485862e-05], "b": [2.2696415347212e-07, 1.23897798981141e-07, 2.15479716476517e-07]},
-            {"name": "*ist D iso 3200", "iso": 3200, "a": [9.28019517294354e-05, 3.20270584982306e-05, 6.31681521642426e-05], "b": [8.65986966557001e-07, 4.17213387362618e-07, 7.41989522409385e-07]}
-          ]
-        },
        {
          "comment": "pentax *ist DL by simon harhues",
          "model": "*ist DL",
@ -8607,46 +8022,6 @@
            {"name": "ILCE-1 iso 102400", "iso": 102400, "a": [0.00247895551155592, 0.00108066487412304, 0.00192748216209189], "b": [-4.25936926098191e-05, -7.27285133952347e-06, -2.4603647128004e-05]}
          ]
        },
-        {
-          "comment": "ilce-1m2 contributed by Moritz Lammerich",
-          "model": "ILCE-1M2",
-          "profiles": [
-            {"name": "ILCE-1M2 iso 50", "iso": 50, "a": [3.61335960435904e-06, 1.41012194379933e-06, 2.88840461723725e-06], "b": [1.34668375570653e-09, 1.20700410891076e-09, 1.66008657481339e-09]},
-            {"name": "ILCE-1M2 iso 64", "iso": 64, "a": [4.45404058155762e-06, 1.71770129635054e-06, 3.54475897269087e-06], "b": [1.83053665680013e-09, 1.6651683676402e-09, 2.28739104282313e-09]},
-            {"name": "ILCE-1M2 iso 80", "iso": 80, "a": [5.50561465797713e-06, 2.11759299387337e-06, 4.36928718962163e-06], "b": [2.58460817495937e-09, 2.28921448745205e-09, 3.23751474880325e-09]},
-            {"name": "ILCE-1M2 iso 100", "iso": 100, "a": [3.59356094559644e-06, 1.3614326972964e-06, 2.79325443488114e-06], "b": [8.17908137372602e-10, 7.68595412889083e-10, 1.01128832666969e-09]},
-            {"name": "ILCE-1M2 iso 125", "iso": 125, "a": [4.46060934982553e-06, 1.67900051353175e-06, 3.47424272769311e-06], "b": [1.13703868003294e-09, 1.00876726157245e-09, 1.35917255489542e-09]},
-            {"name": "ILCE-1M2 iso 160", "iso": 160, "a": [5.55345728736906e-06, 2.08753388436303e-06, 4.30993847613259e-06], "b": [1.66777479333394e-09, 1.50690920518737e-09, 2.02258925958713e-09]},
-            {"name": "ILCE-1M2 iso 200", "iso": 200, "a": [6.96877458303804e-06, 2.60748530316937e-06, 5.39848705824015e-06], "b": [2.39469051589908e-09, 2.01167657381072e-09, 2.92086873605648e-09]},
-            {"name": "ILCE-1M2 iso 250", "iso": 250, "a": [8.73056088509467e-06, 3.25217439910701e-06, 6.74836112004789e-06], "b": [3.14364600263354e-09, 2.79854023944446e-09, 3.73849003580895e-09]},
-            {"name": "ILCE-1M2 iso 320", "iso": 320, "a": [1.09089069689259e-05, 4.06340131421678e-06, 8.46995620181577e-06], "b": [5.20864013150478e-09, 4.34884545087896e-09, 5.65854358005826e-09]},
-            {"name": "ILCE-1M2 iso 400", "iso": 400, "a": [1.37481953830159e-05, 5.1010137230122e-06, 1.06300128452253e-05], "b": [6.76432101756517e-09, 5.47344444622572e-09, 7.27884136675885e-09]},
-            {"name": "ILCE-1M2 iso 500", "iso": 500, "a": [1.75061209391417e-05, 6.4690614854423e-06, 1.34992069027063e-05], "b": [1.66769401023149e-09, 1.57166648299879e-09, 2.22099503965149e-09]},
-            {"name": "ILCE-1M2 iso 640", "iso": 640, "a": [2.1859304836388e-05, 8.05203197432519e-06, 1.68611168291927e-05], "b": [2.30333135980537e-09, 2.18260604053282e-09, 2.94893107794904e-09]},
-            {"name": "ILCE-1M2 iso 800", "iso": 800, "a": [2.71924880748208e-05, 1.00122469080044e-05, 2.09845804817684e-05], "b": [3.28904048638259e-09, 2.89822998361605e-09, 3.91807902095026e-09]},
-            {"name": "ILCE-1M2 iso 1000", "iso": 1000, "a": [3.45508237337781e-05, 1.27178945970581e-05, 2.66306863986762e-05], "b": [4.67039266327591e-09, 4.07034876149799e-09, 5.56464679342819e-09]},
-            {"name": "ILCE-1M2 iso 1250", "iso": 1250, "a": [4.31065375282714e-05, 1.5804502849925e-05, 3.31917466387075e-05], "b": [6.65836457587679e-09, 5.46717998662692e-09, 7.71062583629396e-09]},
-            {"name": "ILCE-1M2 iso 1600", "iso": 1600, "a": [5.40567449379397e-05, 1.97881035095234e-05, 4.16280782377214e-05], "b": [9.76772291150736e-09, 7.92786561265367e-09, 1.06323643019049e-08]},
-            {"name": "ILCE-1M2 iso 2000", "iso": 2000, "a": [6.83700312434212e-05, 2.50506162230996e-05, 5.26799541946039e-05], "b": [1.25375800215586e-08, 9.81268691457705e-09, 1.34961624540835e-08]},
-            {"name": "ILCE-1M2 iso 2500", "iso": 2500, "a": [8.62318180188417e-05, 3.14848560898131e-05, 6.62685124683387e-05], "b": [1.85170667558966e-08, 1.39583817565693e-08, 1.91598840460197e-08]},
-            {"name": "ILCE-1M2 iso 3200", "iso": 3200, "a": [0.000107766023718015, 3.95042851628108e-05, 8.30916192021918e-05], "b": [2.64672531201595e-08, 1.93975517753693e-08, 2.6807590463602e-08]},
-            {"name": "ILCE-1M2 iso 4000", "iso": 4000, "a": [0.000134282156294269, 4.90486216935725e-05, 0.000103388138565188], "b": [3.54125791824894e-08, 2.54621157118121e-08, 3.50679442438877e-08]},
-            {"name": "ILCE-1M2 iso 5000", "iso": 5000, "a": [0.000166396528744908, 6.10059019381103e-05, 0.000128266962125782], "b": [4.88837498556898e-08, 3.384094340972e-08, 4.6231771138152e-08]},
-            {"name": "ILCE-1M2 iso 6400", "iso": 6400, "a": [0.000206355991403107, 7.52565556400457e-05, 0.000158702047165733], "b": [6.57173240429747e-08, 4.64406283384018e-08, 6.24717981642939e-08]},
-            {"name": "ILCE-1M2 iso 8000", "iso": 8000, "a": [0.000258020032239507, 9.43508766469769e-05, 0.000198970236980291], "b": [9.51726348041705e-08, 6.22514855022141e-08, 8.70006940386404e-08]},
-            {"name": "ILCE-1M2 iso 10000", "iso": 10000, "a": [0.000320796937767083, 0.00011715106842674, 0.000247541487984303], "b": [1.25241537297927e-07, 8.35016456611948e-08, 1.17746676785362e-07]},
-            {"name": "ILCE-1M2 iso 12800", "iso": 12800, "a": [0.000398272315124569, 0.000145745101766024, 0.000307454486512736], "b": [1.69443100378945e-07, 1.13115736623643e-07, 1.57781971310697e-07]},
-            {"name": "ILCE-1M2 iso 16000", "iso": 16000, "a": [0.000290063869411734, 0.00010475545819293, 0.000220206290768575], "b": [2.01882290351882e-07, 1.33569545568673e-07, 1.90820956249212e-07]},
-            {"name": "ILCE-1M2 iso 20000", "iso": 20000, "a": [0.000363205806105261, 0.000131617608395812, 0.000275859530149769], "b": [2.49453333845676e-07, 1.76963814315694e-07, 2.46324735741187e-07]},
-            {"name": "ILCE-1M2 iso 25600", "iso": 25600, "a": [0.000453945542365908, 0.000166859621158657, 0.000347521706343694], "b": [2.93739666229541e-07, 2.23061002084972e-07, 2.97135448591539e-07]},
-            {"name": "ILCE-1M2 iso 32000", "iso": 32000, "a": [0.000563724332500159, 0.000210911534716923, 0.00043583902027437], "b": [3.19449372659359e-07, 3.03194522097483e-07, 3.7121610734734e-07]},
-            {"name": "ILCE-1M2 iso 40000", "iso": 40000, "a": [0.000713691825827412, 0.000268395487034547, 0.000549751084731972], "b": [3.3229206668763e-07, 3.95572319033665e-07, 4.43916676538426e-07]},
-            {"name": "ILCE-1M2 iso 51200", "iso": 51200, "a": [0.00088241244881474, 0.000340130447817208, 0.000692718613435647], "b": [2.67133466600993e-07, 5.28117482427887e-07, 5.30380961291519e-07]},
-            {"name": "ILCE-1M2 iso 64000", "iso": 64000, "a": [0.00111097525502788, 0.000436591521748727, 0.00087716409111321], "b": [1.39749907342251e-07, 7.04451423690261e-07, 6.48204381805827e-07]},
-            {"name": "ILCE-1M2 iso 80000", "iso": 80000, "a": [0.00137627733611618, 0.000557931449251443, 0.00111096522831989], "b": [-1.07615481674062e-07, 9.48127489838713e-07, 8.09099861720655e-07]},
-            {"name": "ILCE-1M2 iso 102400", "iso": 102400, "a": [0.00174724736566321, 0.000739614725346644, 0.0014591651221042], "b": [-5.13981144380417e-07, 1.42782469587886e-06, 1.23009457246942e-06]}
-          ]
-        },
        {
          "comment": "ilce-7m2 contributed by François Tissandier",
          "model": "ILCE-7M2",
@ -9834,46 +9209,6 @@
            {"name": "ILCE-7R iso 25600", "iso": 25600, "a": [0.00050678243246595, 0.000636084182088242, 0.00064626458320255], "b": [1.97865744779501e-06, 9.96446223242457e-07, 2.03965206316811e-06]}
          ]
        },
-        {
-          "comment": "ilce-7cr contributed by w",
-          "model": "ILCE-7CR",
-          "profiles": [
-            {"name": "ILCE-7CR iso 50", "iso": 50, "a": [5.02053093056698e-06, 1.49705425573085e-06, 3.8554960154392e-06], "b": [5.99729303455992e-09, 6.0564067233103e-10, 1.77995461450132e-09]},
-            {"name": "ILCE-7CR iso 64", "iso": 64, "a": [6.06374898302287e-06, 1.82645948842395e-06, 4.65576290248138e-06], "b": [9.50752685691727e-09, 3.89598124585376e-10, 2.26469090136298e-09]},
-            {"name": "ILCE-7CR iso 80", "iso": 80, "a": [7.44331939381441e-06, 2.23027598662213e-06, 5.69617670621539e-06], "b": [1.07179515623735e-08, 2.4124149466277e-09, 4.99382326910909e-09]},
-            {"name": "ILCE-7CR iso 100", "iso": 100, "a": [5.17520017069018e-06, 1.49733692125045e-06, 3.75936004266518e-06], "b": [2.92310936632727e-09, 1.44951891552905e-09, 2.96789445196197e-09]},
-            {"name": "ILCE-7CR iso 125", "iso": 125, "a": [6.32875632746219e-06, 1.82464796940079e-06, 4.5769248893775e-06], "b": [4.07223831172753e-09, 2.22525100955932e-09, 4.25946130399935e-09]},
-            {"name": "ILCE-7CR iso 160", "iso": 160, "a": [7.78933117878994e-06, 2.23713310865937e-06, 5.62595913048981e-06], "b": [5.52706268508998e-09, 3.24249311044971e-09, 5.87410309451598e-09]},
-            {"name": "ILCE-7CR iso 200", "iso": 200, "a": [9.63768797691638e-06, 2.76186766544777e-06, 6.96029861704477e-06], "b": [7.51067871108157e-09, 4.51226095055131e-09, 8.09799153825795e-09]},
-            {"name": "ILCE-7CR iso 250", "iso": 250, "a": [1.20013911251761e-05, 3.43549728202923e-06, 8.63149687331285e-06], "b": [9.95683550500174e-09, 6.3114868415402e-09, 1.08962086791382e-08]},
-            {"name": "ILCE-7CR iso 320", "iso": 320, "a": [1.48967034859417e-05, 4.26036666220234e-06, 1.07424554165354e-05], "b": [1.3317361981574e-08, 8.80066158078589e-09, 1.48088572947924e-08]},
-            {"name": "ILCE-7CR iso 400", "iso": 400, "a": [1.93574711909205e-05, 5.46028533635278e-06, 1.38361326901235e-05], "b": [1.3488609827714e-08, 8.62960524624559e-09, 1.50931998991344e-08]},
-            {"name": "ILCE-7CR iso 500", "iso": 500, "a": [2.41860631488249e-05, 6.8234370616692e-06, 1.73470350893971e-05], "b": [1.74885874251581e-08, 1.13208870188682e-08, 1.97704748905646e-08]},
-            {"name": "ILCE-7CR iso 640", "iso": 640, "a": [3.00705851898957e-05, 8.46206966716436e-06, 2.15306835716813e-05], "b": [2.22081417731748e-08, 1.53595881046026e-08, 2.56544926095135e-08]},
-            {"name": "ILCE-7CR iso 800", "iso": 800, "a": [3.76211147977812e-05, 1.05688214584169e-05, 2.68599035350519e-05], "b": [2.8025034801348e-08, 2.05748785016556e-08, 3.30432341914721e-08]},
-            {"name": "ILCE-7CR iso 1000", "iso": 1000, "a": [4.71454153232548e-05, 1.32385470190294e-05, 3.36986407388189e-05], "b": [3.58018400454199e-08, 2.71614228784864e-08, 4.24579879797197e-08]},
-            {"name": "ILCE-7CR iso 1250", "iso": 1250, "a": [5.92347986804197e-05, 1.66013845572472e-05, 4.2218227894068e-05], "b": [4.43884179684207e-08, 3.58708822208791e-08, 5.37523129035959e-08]},
-            {"name": "ILCE-7CR iso 1600", "iso": 1600, "a": [7.39501374457027e-05, 2.07349065905479e-05, 5.27914895227271e-05], "b": [5.7540295807952e-08, 4.67724651760947e-08, 6.8200777572904e-08]},
-            {"name": "ILCE-7CR iso 2000", "iso": 2000, "a": [9.31063947860828e-05, 2.6040252119789e-05, 6.63996523924653e-05], "b": [7.18625292496999e-08, 6.10173012237245e-08, 8.55851084158602e-08]},
-            {"name": "ILCE-7CR iso 2500", "iso": 2500, "a": [0.000117303508700144, 3.27362791368902e-05, 8.41517948521122e-05], "b": [9.24650192492e-08, 7.83709685242675e-08, 1.07782112273244e-07]},
-            {"name": "ILCE-7CR iso 3200", "iso": 3200, "a": [0.000147385276264951, 4.11594335693152e-05, 0.000105066411380729], "b": [1.15480109765616e-07, 9.89703815825203e-08, 1.31056637512956e-07]},
-            {"name": "ILCE-7CR iso 4000", "iso": 4000, "a": [0.00018627660085011, 5.21514883748087e-05, 0.000132631753906753], "b": [1.48076887980346e-07, 1.25793612553688e-07, 1.6365032804065e-07]},
-            {"name": "ILCE-7CR iso 5000", "iso": 5000, "a": [0.000234968164997069, 6.57299151912467e-05, 0.000168821582569413], "b": [1.88906300836824e-07, 1.59626221848123e-07, 2.03686675584142e-07]},
-            {"name": "ILCE-7CR iso 6400", "iso": 6400, "a": [0.000295542510560366, 8.26533538654367e-05, 0.000210723524221072], "b": [2.37968499069292e-07, 1.98704801704552e-07, 2.4725855905514e-07]},
-            {"name": "ILCE-7CR iso 8000", "iso": 8000, "a": [0.000372955254786211, 0.000104143413388651, 0.000266579285791759], "b": [3.0051091936702e-07, 2.52702353384222e-07, 3.09412110266154e-07]},
-            {"name": "ILCE-7CR iso 10000", "iso": 10000, "a": [0.000473032357783469, 0.000132074984190293, 0.000341466257742115], "b": [3.70186588606126e-07, 3.17890361496536e-07, 3.76316864208036e-07]},
-            {"name": "ILCE-7CR iso 12800", "iso": 12800, "a": [0.000596615140176744, 0.000166494613311068, 0.000430375549766477], "b": [4.41491583825462e-07, 3.9131315252798e-07, 4.47258414601389e-07]},
-            {"name": "ILCE-7CR iso 16000", "iso": 16000, "a": [0.00042107887092127, 0.000117447555906848, 0.000296965294966224], "b": [4.51502546102915e-07, 3.8842778376349e-07, 4.74321968539981e-07]},
-            {"name": "ILCE-7CR iso 20000", "iso": 20000, "a": [0.000531275028539038, 0.000148095294274219, 0.000374029367697251], "b": [5.16472490489299e-07, 4.7102545518131e-07, 5.56190840270585e-07]},
-            {"name": "ILCE-7CR iso 25600", "iso": 25600, "a": [0.000666804147866025, 0.00018682239878955, 0.000470771477672607], "b": [5.71993784934093e-07, 5.70856965291837e-07, 6.51250804121965e-07]},
-            {"name": "ILCE-7CR iso 32000", "iso": 32000, "a": [0.000846619417810256, 0.000236088077270326, 0.000602208744060741], "b": [6.19480916481075e-07, 7.09937425885155e-07, 7.67877625958066e-07]},
-            {"name": "ILCE-7CR iso 40000", "iso": 40000, "a": [0.00106906415391289, 0.00029934270646857, 0.000762590697034969], "b": [5.94228180389266e-07, 8.7672854942734e-07, 9.01172383212813e-07]},
-            {"name": "ILCE-7CR iso 51200", "iso": 51200, "a": [0.00136278112663437, 0.000380623851443157, 0.000970428143328976], "b": [5.63757182902296e-07, 1.04154094219049e-06, 1.03156293505271e-06]},
-            {"name": "ILCE-7CR iso 64000", "iso": 64000, "a": [0.00172093715158709, 0.000482587891812503, 0.00122966822280787], "b": [2.64289593615837e-07, 1.54107457264195e-06, 1.29404416001938e-06]},
-            {"name": "ILCE-7CR iso 80000", "iso": 80000, "a": [0.0021834866711018, 0.000614520823736269, 0.00155784173915865], "b": [-1.60315718628074e-07, 2.16780250450749e-06, 1.75009256313651e-06]},
-            {"name": "ILCE-7CR iso 102400", "iso": 102400, "a": [0.00286234597349702, 0.000820145390597253, 0.00208201875303089], "b": [-9.77010102487207e-07, 3.14042633981105e-06, 2.1708564593795e-06]}
-          ]
-        },
        {
          "comment": "ilce-7s by Malte Cornils, bright regions underrepresented in image, slightly more noise there (like +10% at most)",
          "model": "ILCE-7S",
@ -10108,46 +9443,6 @@
            {"name": "ILCE-9M2 iso 25600", "iso": 25600, "a": [0.000625216717039015, 0.000229256293670015, 0.000359575223957349], "b": [4.02537312089151e-07, 3.21292087989088e-07, 4.25181920295531e-07]}
          ]
        },
-        {
-          "comment": "ilca-99m2 contributed by per",
-          "model": "ILCA-99M2",
-          "profiles": [
-            {"name": "ILCA-99M2 iso 50", "iso": 50, "a": [2.73703396362531e-06, 1.25090551476503e-06, 3.2632920634733e-06], "b": [6.31136696601859e-09, 3.24821995866069e-09, 5.67403674997843e-09]},
-            {"name": "ILCA-99M2 iso 64", "iso": 64, "a": [3.36476205535589e-06, 1.5293932981663e-06, 3.97269865736352e-06], "b": [7.67409214275033e-09, 4.00133866731755e-09, 6.82267872771231e-09]},
-            {"name": "ILCA-99M2 iso 80", "iso": 80, "a": [4.12671592885045e-06, 1.85467052747337e-06, 4.78537194484548e-06], "b": [9.94183234628166e-09, 5.36695987320558e-09, 8.98220475269551e-09]},
-            {"name": "ILCA-99M2 iso 100", "iso": 100, "a": [2.823602869041e-06, 1.21913552594432e-06, 3.05233697730536e-06], "b": [4.66946014790039e-09, 3.03848264999831e-09, 4.38395781551133e-09]},
-            {"name": "ILCA-99M2 iso 125", "iso": 125, "a": [3.44553015758418e-06, 1.48735943967938e-06, 3.74939091982601e-06], "b": [5.69494182525818e-09, 3.73994259055433e-09, 5.37022175249776e-09]},
-            {"name": "ILCA-99M2 iso 160", "iso": 160, "a": [4.33019222786869e-06, 1.85322515817869e-06, 4.67286315210864e-06], "b": [8.21423792939651e-09, 5.6819994717328e-09, 7.49231226694116e-09]},
-            {"name": "ILCA-99M2 iso 200", "iso": 200, "a": [5.29559707467307e-06, 2.27096945544119e-06, 5.72318770631266e-06], "b": [7.86613736514952e-09, 5.10840067337576e-09, 7.15507578926755e-09]},
-            {"name": "ILCA-99M2 iso 250", "iso": 250, "a": [6.59577310749388e-06, 2.81375486883607e-06, 7.1063778937714e-06], "b": [9.95152285104501e-09, 6.83670952572614e-09, 9.17376034521314e-09]},
-            {"name": "ILCA-99M2 iso 320", "iso": 320, "a": [8.18548557528609e-06, 3.48218860394363e-06, 8.82173825447193e-06], "b": [1.32066533023115e-08, 9.00178754242211e-09, 1.20965691097375e-08]},
-            {"name": "ILCA-99M2 iso 400", "iso": 400, "a": [1.02114012483011e-05, 4.35463483045013e-06, 1.10539711609969e-05], "b": [1.69313761938995e-08, 1.18879116012422e-08, 1.59060753934399e-08]},
-            {"name": "ILCA-99M2 iso 500", "iso": 500, "a": [1.31310289641448e-05, 5.57732532964872e-06, 1.40994373380354e-05], "b": [1.38336187306474e-08, 9.11944251981695e-09, 1.26988380448688e-08]},
-            {"name": "ILCA-99M2 iso 640", "iso": 640, "a": [1.62928126592654e-05, 6.89975149409791e-06, 1.74991583567722e-05], "b": [1.71375038528073e-08, 1.18411278517741e-08, 1.58687560255031e-08]},
-            {"name": "ILCA-99M2 iso 800", "iso": 800, "a": [2.02357396813097e-05, 8.57331814390426e-06, 2.17505918990495e-05], "b": [2.14032596974017e-08, 1.49602353044475e-08, 2.00066666165637e-08]},
-            {"name": "ILCA-99M2 iso 1000", "iso": 1000, "a": [2.5363923773854e-05, 1.0734593746385e-05, 2.72615172033881e-05], "b": [2.64119954678788e-08, 1.86822958528417e-08, 2.49301575358713e-08]},
-            {"name": "ILCA-99M2 iso 1250", "iso": 1250, "a": [3.17716794652493e-05, 1.34350707660662e-05, 3.40901520734912e-05], "b": [3.30558723952069e-08, 2.37697071658268e-08, 3.14018011728236e-08]},
-            {"name": "ILCA-99M2 iso 1600", "iso": 1600, "a": [3.97129625311628e-05, 1.67673079705808e-05, 4.26491534337661e-05], "b": [4.0921906144991e-08, 2.95563704279015e-08, 3.87419550804948e-08]},
-            {"name": "ILCA-99M2 iso 2000", "iso": 2000, "a": [5.00793312100412e-05, 2.11373921977933e-05, 5.36208445542928e-05], "b": [4.7873165326925e-08, 3.58531358272346e-08, 4.60157808265538e-08]},
-            {"name": "ILCA-99M2 iso 2500", "iso": 2500, "a": [6.21719774504552e-05, 2.62529415225445e-05, 6.67688235940041e-05], "b": [6.59197565924527e-08, 4.79943466963983e-08, 6.3201052803507e-08]},
-            {"name": "ILCA-99M2 iso 3200", "iso": 3200, "a": [7.83676218022161e-05, 3.31628407934253e-05, 8.44388288776472e-05], "b": [7.94485282017468e-08, 5.88328822524502e-08, 7.57994049873642e-08]},
-            {"name": "ILCA-99M2 iso 4000", "iso": 4000, "a": [9.87870683544691e-05, 4.17351268928093e-05, 0.000106261952123625], "b": [9.67278815869662e-08, 7.16702484976155e-08, 9.23540318476985e-08]},
-            {"name": "ILCA-99M2 iso 5000", "iso": 5000, "a": [0.000124089617068474, 5.23883546434008e-05, 0.000133828324637664], "b": [1.15632290140963e-07, 8.69374680181363e-08, 1.11576207384579e-07]},
-            {"name": "ILCA-99M2 iso 6400", "iso": 6400, "a": [0.000154716098219512, 6.52802145576661e-05, 0.000166827156337063], "b": [1.50169889946322e-07, 1.12754895909059e-07, 1.4513603464225e-07]},
-            {"name": "ILCA-99M2 iso 8000", "iso": 8000, "a": [0.000194468008913528, 8.22608983695721e-05, 0.000209723571941427], "b": [1.95506038734626e-07, 1.43821381055583e-07, 1.87324712788923e-07]},
-            {"name": "ILCA-99M2 iso 10000", "iso": 10000, "a": [0.000246339280388167, 0.00010398067882861, 0.000265528111652892], "b": [2.40270565491529e-07, 1.80141254872299e-07, 2.30933702624641e-07]},
-            {"name": "ILCA-99M2 iso 12800", "iso": 12800, "a": [0.000310818278092048, 0.000131098862738869, 0.000334995000861957], "b": [2.91679013749542e-07, 2.22722821400777e-07, 2.81123087620352e-07]},
-            {"name": "ILCA-99M2 iso 16000", "iso": 16000, "a": [0.000393178307627771, 0.0001659950296205, 0.000423722387149771], "b": [3.63031859241809e-07, 2.86625658386579e-07, 3.50083418862484e-07]},
-            {"name": "ILCA-99M2 iso 20000", "iso": 20000, "a": [0.000497685626150604, 0.000210471271332827, 0.000535664832937408], "b": [4.49437751347211e-07, 3.76095460400559e-07, 4.26668228199475e-07]},
-            {"name": "ILCA-99M2 iso 25600", "iso": 25600, "a": [0.000632090446849007, 0.000267285827494627, 0.000680758320936921], "b": [5.37349914392674e-07, 4.97434732316396e-07, 5.09410682467441e-07]},
-            {"name": "ILCA-99M2 iso 32000", "iso": 32000, "a": [0.000488248031880074, 0.000214107897029504, 0.000539934361901431], "b": [4.99822013710419e-07, 4.47828726393021e-07, 4.79472270500733e-07]},
-            {"name": "ILCA-99M2 iso 40000", "iso": 40000, "a": [0.000616483823549871, 0.000270049876541111, 0.000680664590334891], "b": [5.69474133261127e-07, 5.67056064015005e-07, 5.46488111149407e-07]},
-            {"name": "ILCA-99M2 iso 51200", "iso": 51200, "a": [0.00077794732737541, 0.000342338815927061, 0.000859641442002017], "b": [5.56579364640904e-07, 6.8913620384608e-07, 5.20596695722432e-07]},
-            {"name": "ILCA-99M2 iso 64000", "iso": 64000, "a": [0.000993224410811055, 0.000434921569409136, 0.00109520168787044], "b": [5.04822585037261e-07, 8.52364005770863e-07, 5.24964816343632e-07]},
-            {"name": "ILCA-99M2 iso 80000", "iso": 80000, "a": [0.00126101391679515, 0.000554728435000833, 0.00138731968201541], "b": [2.93229181524583e-07, 1.06217197603343e-06, 3.78623170383339e-07]},
-            {"name": "ILCA-99M2 iso 102400", "iso": 102400, "a": [0.00160044220823216, 0.000706050027915566, 0.00175463350363367], "b": [-2.60475299360813e-07, 1.34117588739041e-06, -1.37826466572793e-07]}
-          ]
-        },
        {
          "comment": "Sony nex-3 contributed by wolf kuehnel",
          "model": "NEX-3",
@ -10721,42 +10016,6 @@
            {"name": "M10 iso 50000", "iso": 50000, "a": [0.00124739070072079, 0.000422093796106419, 0.000859496582495616], "b": [1.4466043620215e-05, 1.18731042639518e-05, 1.65331509187252e-05]}
          ]
        },
-        {
-          "comment": "m11 contributed by rl-king",
-          "model": "M11",
-          "profiles": [
-            {"name": "M11 iso 64", "iso": 64, "a": [1.86409104997387e-06, 1.16256374079928e-06, 2.27252964837743e-06], "b": [6.83728425504045e-09, 1.31957513995808e-09, 1.78460357143223e-09]},
-            {"name": "M11 iso 80", "iso": 80, "a": [2.31531135047936e-06, 1.43987114602784e-06, 2.82030134329797e-06], "b": [8.63228474931169e-09, 1.80447382626128e-09, 2.4634753173939e-09]},
-            {"name": "M11 iso 100", "iso": 100, "a": [2.67186469465866e-06, 1.75384375699776e-06, 3.43487968232092e-06], "b": [1.10808045562677e-08, 2.54461382555029e-09, 3.52108791452544e-09]},
-            {"name": "M11 iso 125", "iso": 125, "a": [4.86085802894828e-06, 2.13285753881736e-06, 4.19885423618256e-06], "b": [1.24376805118027e-08, 3.4243837681531e-09, 4.90062843862315e-09]},
-            {"name": "M11 iso 160", "iso": 160, "a": [4.18463014194265e-06, 2.61599110754827e-06, 5.15721861308543e-06], "b": [1.69425520462053e-08, 4.53126250212073e-09, 6.49380590221542e-09]},
-            {"name": "M11 iso 200", "iso": 200, "a": [5.20882585217003e-06, 3.40040633536381e-06, 6.76520808154376e-06], "b": [2.04469399300948e-08, 4.65112422035792e-09, 6.23555407254749e-09]},
-            {"name": "M11 iso 250", "iso": 250, "a": [6.48593388565341e-06, 4.1945030607615e-06, 8.32077938998048e-06], "b": [2.50118612351181e-08, 5.96895153877462e-09, 8.21653903590979e-09]},
-            {"name": "M11 iso 320", "iso": 320, "a": [8.04941476805904e-06, 5.16314707787209e-06, 1.02714701090598e-05], "b": [3.08393628699952e-08, 7.75566965576072e-09, 1.07785943478962e-08]},
-            {"name": "M11 iso 400", "iso": 400, "a": [9.9265874243035e-06, 6.51735927770882e-06, 1.2952525207709e-05], "b": [3.87898885277445e-08, 1.0816972117828e-08, 1.49447238539446e-08]},
-            {"name": "M11 iso 500", "iso": 500, "a": [1.24214346566007e-05, 8.06623532508782e-06, 1.60574742516114e-05], "b": [4.85390061499815e-08, 1.3544055434656e-08, 1.87012408392131e-08]},
-            {"name": "M11 iso 640", "iso": 640, "a": [1.54857137874405e-05, 9.97561390679475e-06, 1.99022473598682e-05], "b": [5.96671699958295e-08, 1.75587685307025e-08, 2.44911484803359e-08]},
-            {"name": "M11 iso 800", "iso": 800, "a": [1.89652762482198e-05, 1.27126850202839e-05, 2.53728797769424e-05], "b": [7.73404582266048e-08, 2.35443384337967e-08, 3.24291672939809e-08]},
-            {"name": "M11 iso 1000", "iso": 1000, "a": [2.37015352448064e-05, 1.57668189861979e-05, 3.15132563009991e-05], "b": [9.55058023399082e-08, 3.02033457842969e-08, 4.16873394070023e-08]},
-            {"name": "M11 iso 1250", "iso": 1250, "a": [2.93499256513572e-05, 1.95826133011559e-05, 3.91997160786981e-05], "b": [1.18437402692794e-07, 3.80069109603055e-08, 5.28691688339909e-08]},
-            {"name": "M11 iso 1600", "iso": 1600, "a": [3.63174519372469e-05, 2.44164221638512e-05, 4.89665751779465e-05], "b": [1.49224030664954e-07, 5.01292406928166e-08, 6.81373761025259e-08]},
-            {"name": "M11 iso 2000", "iso": 2000, "a": [4.44832492320645e-05, 3.1214755157809e-05, 6.25418693139672e-05], "b": [1.93440002398591e-07, 6.45210037566703e-08, 8.81444128257927e-08]},
-            {"name": "M11 iso 2500", "iso": 2500, "a": [5.62328111186167e-05, 3.88114888994578e-05, 7.76538341867318e-05], "b": [2.3823486398292e-07, 7.97469754018314e-08, 1.09674383093431e-07]},
-            {"name": "M11 iso 3200", "iso": 3200, "a": [7.13062810370901e-05, 4.86517981540856e-05, 9.6926709619639e-05], "b": [3.02364277034909e-07, 1.04792304100568e-07, 1.44560798497877e-07]},
-            {"name": "M11 iso 4000", "iso": 4000, "a": [8.90179072457302e-05, 6.18834485709656e-05, 0.000123534409755153], "b": [3.90908795151293e-07, 1.33514811075464e-07, 1.83670594224539e-07]},
-            {"name": "M11 iso 5000", "iso": 5000, "a": [0.00011239345870021, 7.63037303066775e-05, 0.000152322300155795], "b": [4.83377416470012e-07, 1.62647328338701e-07, 2.22563364476569e-07]},
-            {"name": "M11 iso 6400", "iso": 6400, "a": [0.000143237114178243, 9.71106979555063e-05, 0.000194347743642067], "b": [6.4884275058194e-07, 2.15610397350755e-07, 2.92023425307473e-07]},
-            {"name": "M11 iso 8000", "iso": 8000, "a": [0.00018010195308804, 0.000124541778864453, 0.000249323970706877], "b": [8.66760112781935e-07, 2.75772177589624e-07, 3.63884700756019e-07]},
-            {"name": "M11 iso 10000", "iso": 10000, "a": [0.000218913374832082, 0.000153349181562152, 0.000306141137408538], "b": [1.11755823978635e-06, 3.41434955211349e-07, 4.39619520607969e-07]},
-            {"name": "M11 iso 12500", "iso": 12500, "a": [0.000286711536873775, 0.000194291509417607, 0.000388858335252571], "b": [1.58580485506152e-06, 4.76646657115953e-07, 5.99480468159884e-07]},
-            {"name": "M11 iso 16000", "iso": 16000, "a": [0.000364253929473803, 0.000243927030224043, 0.00048692456835949], "b": [2.08783383900693e-06, 5.75721506283731e-07, 6.99892814752957e-07]},
-            {"name": "M11 iso 20000", "iso": 20000, "a": [0.000452545389851142, 0.000305178342376898, 0.000607995619889522], "b": [2.76176962869939e-06, 6.92013615088005e-07, 8.19514303543242e-07]},
-            {"name": "M11 iso 25000", "iso": 25000, "a": [0.000609064465505895, 0.000391088815920656, 0.000787729926223547], "b": [4.17881141901037e-06, 1.06060630336086e-06, 1.20438277044666e-06]},
-            {"name": "M11 iso 32000", "iso": 32000, "a": [0.000903735839042719, 0.000527120394155192, 0.00105858365656451], "b": [5.59721331357863e-06, 1.40635013559935e-06, 1.49029944787932e-06]},
-            {"name": "M11 iso 40000", "iso": 40000, "a": [0.00110416734285238, 0.000661514932978668, 0.00132615553685878], "b": [7.4086224283411e-06, 1.6420014216455e-06, 1.62185079100023e-06]},
-            {"name": "M11 iso 50000", "iso": 50000, "a": [0.00144228773363344, 0.00088423043706682, 0.00176620536194848], "b": [1.12674530376129e-05, 2.27058931358499e-06, 1.89860828105515e-06]}
-          ]
-        },
        {
          "comment": "x2 contributed by m",
          "model": "X2",
@ -10811,23 +10070,6 @@
            {"name": "SL (Typ 601) iso 50000", "iso": 50000, "a": [0.00178150567383952, 0.000626071815489628, 0.00106082001209154], "b": [3.03728164985278e-06, 3.47199615120388e-06, 4.15258140545266e-06]}
          ]
        },
-        {
-          "comment": "sl2 contributed by rschwalk",
-          "model": "SL2",
-          "profiles": [
-            {"name": "SL2 iso 50", "iso": 50, "a": [3.33677593452989e-06, 1.28153241964121e-06, 2.30211303749704e-06], "b": [2.76561848891369e-09, 2.1626388484286e-09, 3.04418443100435e-09]},
-            {"name": "SL2 iso 100", "iso": 100, "a": [4.51969359984074e-06, 1.72291004729215e-06, 3.10053088731951e-06], "b": [2.9122948590895e-09, 2.55705694704288e-09, 3.88173750499942e-09]},
-            {"name": "SL2 iso 200", "iso": 200, "a": [8.68322484393319e-06, 3.29052890155796e-06, 5.95310980806492e-06], "b": [7.20348322690003e-09, 6.21211100061866e-09, 8.76376178952913e-09]},
-            {"name": "SL2 iso 400", "iso": 400, "a": [1.68685328124578e-05, 6.35745884501653e-06, 1.15831454415385e-05], "b": [1.76353772950519e-08, 1.40486814221583e-08, 1.92002603631866e-08]},
-            {"name": "SL2 iso 800", "iso": 800, "a": [3.50542165205641e-05, 1.31941215450001e-05, 2.40318836946724e-05], "b": [1.36742887348443e-08, 1.08987188163143e-08, 1.52389301576636e-08]},
-            {"name": "SL2 iso 1600", "iso": 1600, "a": [6.67532404476935e-05, 2.50429331509655e-05, 4.57761399714857e-05], "b": [3.37265190812432e-08, 2.35169953563683e-08, 3.25009925188999e-08]},
-            {"name": "SL2 iso 3200", "iso": 3200, "a": [0.000133670337224307, 4.97598168316386e-05, 9.09792250437135e-05], "b": [1.09191100799117e-07, 7.20065945773445e-08, 9.98134369710872e-08]},
-            {"name": "SL2 iso 6400", "iso": 6400, "a": [0.000274409634580982, 9.99918650751704e-05, 0.000184591756796621], "b": [2.25820395739214e-07, 1.42025189947435e-07, 1.92414565728241e-07]},
-            {"name": "SL2 iso 12500", "iso": 12500, "a": [0.000569536384743366, 0.000206792312954667, 0.00038100651316741], "b": [7.33458633169238e-07, 4.92026094175808e-07, 6.54489652264229e-07]},
-            {"name": "SL2 iso 25000", "iso": 25000, "a": [0.0011943366055313, 0.000425962461784178, 0.000789505331744172], "b": [2.39435743992609e-06, 1.88577076525599e-06, 2.67075568070859e-06]},
-            {"name": "SL2 iso 50000", "iso": 50000, "a": [0.00263898486218439, 0.000917635207804622, 0.00170582715555385], "b": [6.00755880096307e-06, 7.4522550909559e-06, 9.82584367685698e-06]}
-          ]
-        },
        {
          "comment": "q2 contributed by hanno",
          "model": "Q2",
Author	SHA1	Message	Date
Oke Hargens	20e8123c0b	deb	2025-11-25 20:46:33 +01:00
Oke Hargens	b391be3e49	Move merge command decision to common.sh and check whether DISPLAY is set	2025-03-30 17:55:39 +02:00