Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Detector channels #1252

Merged
merged 24 commits into from
Dec 20, 2023
Merged

Detector channels #1252

merged 24 commits into from
Dec 20, 2023

Commits on Mar 13, 2023

  1. Add new datatype, the union of NX_CHAR and NX_NUMBER

    @phyy-nx
    phyy-nx committed Mar 13, 2023
    Configuration menu
    Copy the full SHA
    7157d25 View commit details
    Browse the repository at this point in the history

  2. Change AXISNAME field of NXdata to allow character values

    @phyy-nx
    phyy-nx committed Mar 13, 2023
    Configuration menu
    Copy the full SHA
    db047de View commit details
    Browse the repository at this point in the history

  3. Whitespace

    @phyy-nx
    phyy-nx committed Mar 13, 2023
    Configuration menu
    Copy the full SHA
    3dc02ba View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2023

  1. Add NXdata attribute default_slice 

    Which slice of data to show in a plot by default. This is useful especially for datasets with more than 2 dimensions.
    @phyy-nx
    phyy-nx committed Mar 17, 2023
    Configuration menu
    Copy the full SHA
    6d23703 View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2023

  1. Add NX_CHAR_OR_NUMBER to the primitiveType enum 

    Co-authored-by: Sophie Hotz sophie.hotz@dectris.com
    @phyy-nx
    phyy-nx committed Apr 18, 2023
    Configuration menu
    Copy the full SHA
    6b2a84f View commit details
    Browse the repository at this point in the history

  2. Whitespace 

    Co-authored-by: soph-dec <73243774+soph-dec@users.noreply.github.com>
    @phyy-nx @soph-dec
    phyy-nx and soph-dec committed Apr 18, 2023
    Configuration menu
    Copy the full SHA
    4f3c73a View commit details
    Browse the repository at this point in the history

  3. Add NXdetector_channel as a base class 

    Also add it as optional for NXmx

See original Dectris proposal:
https://github.com/dectris/documentation/tree/main/filewriter_v2#user-content-multi-channel-data

Closes #940

Co-authored-by: Sophie Hotz <sophie.hotz@dectris.com>
    @phyy-nx @soph-dec
    phyy-nx and soph-dec committed Apr 18, 2023
    Configuration menu
    Copy the full SHA
    81388d1 View commit details
    Browse the repository at this point in the history

  4. Apply suggestions from code review 

    Co-authored-by: soph-dec <73243774+soph-dec@users.noreply.github.com>
    @phyy-nx @soph-dec
    phyy-nx and soph-dec committed Apr 18, 2023
    Configuration menu
    Copy the full SHA
    3382235 View commit details
    Browse the repository at this point in the history

  5. Add NXdetector_channel to NXdetector and NXmx 

    Co-authored-by: Sophie Hotz <sophie.hotz@dectris.com>
    @phyy-nx @soph-dec
    phyy-nx and soph-dec committed Apr 18, 2023
    Configuration menu
    Copy the full SHA
    ab45175 View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2023

  1. Merge branch 'main' into dimension_as_char

    @phyy-nx
    phyy-nx committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    1168f00 View commit details
    Browse the repository at this point in the history

  2. Fix formatting

    @phyy-nx
    phyy-nx committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    4ba9645 View commit details
    Browse the repository at this point in the history

  3. Add example of default_sice using an integer as a string

    @phyy-nx
    phyy-nx committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    6f2a056 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'dimension_as_char' into detector_channel

    @phyy-nx
    phyy-nx committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    65b8c8e View commit details
    Browse the repository at this point in the history

  5. Bring in additional fields from NXdetector into NXchannel

    @phyy-nx
    phyy-nx committed Jun 19, 2023
    Configuration menu
    Copy the full SHA
    146a96a View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2023

  1. Update base_classes/NXdetector_channel.nxdl.xml 

    Co-authored-by: soph-dec <73243774+soph-dec@users.noreply.github.com>
    @phyy-nx @soph-dec
    phyy-nx and soph-dec committed Jun 20, 2023
    Configuration menu
    Copy the full SHA
    355b408 View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2023

  1. Bugfix in description 

    Co-authored-by: Sophie Hotz <sophie.hotz@dectris.com>

Co-authored-by: soph-dec <73243774+soph-dec@users.noreply.github.com>
    @phyy-nx @soph-dec
    phyy-nx and soph-dec committed Sep 20, 2023
    Configuration menu
    Copy the full SHA
    48a82e4 View commit details
    Browse the repository at this point in the history

  2. Full example

    @phyy-nx
    phyy-nx committed Sep 20, 2023
    Configuration menu
    Copy the full SHA
    ac8c5d0 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'dimension_as_char' into detector_channel

    @phyy-nx
    phyy-nx committed Sep 20, 2023
    Configuration menu
    Copy the full SHA
    6e924a0 View commit details
    Browse the repository at this point in the history

  4. Better example

    @phyy-nx
    phyy-nx committed Sep 20, 2023
    Configuration menu
    Copy the full SHA
    8ff58ed View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2023

  1. Typo

    @phyy-nx
    phyy-nx committed Oct 19, 2023
    Configuration menu
    Copy the full SHA
    bb6906e View commit details
    Browse the repository at this point in the history

  2. Added NX_CHAR as type for default_slice

    @phyy-nx
    phyy-nx committed Oct 19, 2023
    Configuration menu
    Copy the full SHA
    d7ae84c View commit details
    Browse the repository at this point in the history

  3. Actually use NXCHAR_OR_NUMBER

    @phyy-nx
    phyy-nx committed Oct 19, 2023
    Configuration menu
    Copy the full SHA
    78566e1 View commit details
    Browse the repository at this point in the history

Commits on Nov 21, 2023

  1. Merge branch 'main' into dimension_as_char 

    Fix conflicts, adjusting phrase "Most dimensions scales will be sequences of numbers" to "Most AXISNAME fields will be sequences of numbers"
    @phyy-nx
    phyy-nx committed Nov 21, 2023
    Configuration menu
    Copy the full SHA
    ad0a129 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'dimension_as_char' into detector_channel

    @phyy-nx
    phyy-nx committed Nov 21, 2023
    Configuration menu
    Copy the full SHA
    d71b5f2 View commit details
    Browse the repository at this point in the history