Skip to content
Snippets Groups Projects

condition worker_version_4

Merged Edgar Gutierrez requested to merge pyfai_worker_v4 into main

This merge is needed to be release before the next pyFAI release, in which the worker configuration will have the key "poni" with the poni parameters

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • assigned to @edgar

  • Edgar Gutierrez mentioned in merge request bliss/blissoda!191

    mentioned in merge request bliss/blissoda!191

  • Related to #55

    1. With this MR, ewokxrpd will be able to handle the config objects from the next version of pyFAI

    2. Release of pyFAI with the new version of the worker and a correct normalization of the configuration object if it comes from a .poni file

    3. Once it's release, a small change in blissoda will mark the configuration objects coming from a .poni file with the flag application = poni so pyFAI will normalize the object correctly

  • For reference: before change

    {
        "application": "pyfai-integrate",
        "version": 3,
        "wavelength": 1.0289145098190892e-10,
        "dist": 0.15076599933727855,
        "poni1": 0.10013130550666806,
        "poni2": 0.09994766335934371,
        "rot1": 0.1736275115996921,
        "rot2": -0.0007669000467813245,
        "rot3": 0.0,
        "detector": "Pilatus1M",
        "detector_config": {
            "orientation": 3
        },
        "do_mask": false,
        "mask_file": "",
        "do_dark": false,
        "dark_current": null,
        "do_flat": false,
        "flat_field": null,
        "do_polarization": false,
        "polarization_factor": 0.0,
        "do_dummy": false,
        "val_dummy": null,
        "delta_dummy": null,
        "do_2D": false,
        "unit": "q_A^-1",
        "do_radial_range": false,
        "radial_range_min": null,
        "radial_range_max": null,
        "do_azimuthal_range": false,
        "azimuth_range_min": null,
        "azimuth_range_max": null,
        "chi_discontinuity_at_0": false,
        "do_solid_angle": true,
        "error_model": null
    }

    after change

    {
        "application": "pyfai-integrate",
        "version": 4,
        "poni": {
            "wavelength": 1.0289145098190892e-10,
            "dist": 0.15076599933727855,
            "poni1": 0.10013130550666806,
            "poni2": 0.09994766335934371,
            "rot1": 0.1736275115996921,
            "rot2": -0.0007669000467813245,
            "rot3": 0.0,
            "detector": "Pilatus1M",
            "detector_config": {
                "orientation": 3
            }
        },
        "do_mask": false,
        "mask_file": "",
        "do_dark": false,
        "dark_current": null,
        "do_flat": false,
        "flat_field": null,
        "do_polarization": false,
        "polarization_factor": 0.0,
        "do_dummy": false,
        "val_dummy": null,
        "delta_dummy": null,
        "do_2D": false,
        "unit": "2th_deg",
        "do_radial_range": false,
        "radial_range_min": null,
        "radial_range_max": null,
        "do_azimuthal_range": false,
        "azimuth_range_min": null,
        "azimuth_range_max": null,
        "chi_discontinuity_at_0": false,
        "do_solid_angle": true,
        "error_model": null
    }
  • Wout De Nolf mentioned in commit e86e2133

    mentioned in commit e86e2133

  • merged

  • Version 0.12.0 was released with this included.

Please register or sign in to reply
Loading