Manage orientation of detector #2001

kif · 2023-11-21T16:08:07Z

This is likely to be a beefy one ...

close #1994

loichuder · 2023-11-21T16:36:02Z

src/pyFAI/detectors/orientation.py

+    Rotate90 = 8
+
+Orientation(0).__doc__ = "An orientation flag is not set."
+Orientation(1).__doc__ = "Camera default. Origin at the top left of the image when looking at the sample."


So origin at top right when looking from the sample ?

This enum is the default one used in EXIF, for visible light cameras.

In pyFAI, the origin is at the bottom left when looking from the sample. Thus the orientation should be flipped-ud for the origin at the bottom and flipped-rl to change the direction of sight. This makes the default orientation used in pyFAI to 3 or Rotate180.

I just got the answer from Dectris that their detector have to be seen from the sample and not from the other side.

At this stage, orientation is just shipped around and used nowhere ...

Ok.

When speaking about images, looking at the detector from the sample makes sense. Looking at the sample from the detector is a bit harder to figure out.

Looking at the sample is the standard when considering camera ... outside the X-ray scattering world.

https://www.researchgate.net/profile/Romain-Neuville/publication/330564129/figure/fig2/AS:718599043952648@1548338771876/The-virtual-camera-settings-camera-position-camera-orientation-focal-length-and.jpg

https://www.researchgate.net/profile/Sunil-Kumar-Kopparapu/publication/220632389/figure/fig2/AS:883184350789637@1587578966909/Orientation-angles-rotation-about-the-camera-x-y-z-axes-are-referred-to-as-pitch.pbm

Yeah. After thinking again about it this morning, this is indeed just a personal feeling.

remains 2 failures 2 errors

linked to silx-kit#2003

kif · 2023-11-23T09:07:40Z

I believe this PR is beefy enough -> ready for merge (once test pass)
Related issues are linked in the project

kif · 2023-11-23T10:52:55Z

Checked with Edgar that flipped image can be processed as expected. "just" declare an orientation different from "3"

src/pyFAI/detectors/_common.py

src/pyFAI/detectors/_dectris.py

loichuder · 2023-11-23T11:44:49Z

src/pyFAI/detectors/_rayonix.py

@@ -640,4 +643,5 @@ def set_config(self, config):
                raise err
        self.set_pixel1(config.get("pixel1"))
        self.set_pixel2(config.get("pixel2"))
+        self.orientation = Orientation(config.get("orientatio", 3))


Suggested change

self.orientation = Orientation(config.get("orientatio", 3))

self.orientation = Orientation(config.get("orientation", 3))

src/pyFAI/detectors/orientation.py

loichuder · 2023-11-23T11:46:45Z

src/pyFAI/test/test_geometry.py

@@ -348,6 +361,8 @@ def test_corner_array(self):
        for data, space in params:
            with self.subTest(data=data, space=space):
                geo = geometry.Geometry(**data)
+                print(data)
+                print(geo.detector.orientation)


To be removed, I guess.

src/pyFAI/test/test_detector.py

this means one fiddles with it at ones' own risk

Co-authored-by: Loïc Huder <[email protected]>

EdgarGF93 · 2023-11-23T12:51:50Z

It does fix the dioptas incompatibility.
I did the calibration with dioptas and pyFAI on the same .edf file, from a Pilatus1M.
As we said, the PONI and rotation values generated by pyFAI-calib2 and dioptas are different, therefore the result of AzimuthalIntegrator.integrate2d is wrong for the dioptas file. After resetting the azimuthal integrator instance and changing manually the orientation of the detector instance to '2', we get a good reshaping of the pattern (with the azimuthal axis inverted):

EdgarGF93 · 2023-11-21T17:11:02Z

src/pyFAI/detectors/orientation.py

+Orientation(0).__doc__ = "An orientation flag is not set."
+Orientation(1).__doc__ = "Camera default. Origin at the top left of the image when looking at the sample."
+Orientation(2).__doc__ = "Origin at the top left of the image when looking from the sample."
+Orientation(3).__doc__ = "Native orientation of pyFAI. Origin at the bottom left when looking from the sample"


Looks ok to me. If I understood, choosing the orientation 3 (native pyFAI) would be equal to 0 (default, non-defined) during the calculation of pixel coordinates?

Edit: Yes :)

well spotted

src/pyFAI/detectors/_rayonix.py

Co-authored-by: Edgar Gutierrez <[email protected]>

t20100 · 2023-12-11T09:13:23Z

attn @CPrescher, a "detector orientation tag" has been added to pyFAI to deal with image flip (not released yet).

kif added 4 commits November 21, 2023 16:44

Orientation enum for the different possibilities

edc9e6a

Orientation handling

588ea12

fix test

40111f8

propagate orientation

3682efc

kif added the work in progress Don't review label Nov 21, 2023

kif requested review from loichuder and EdgarGF93 November 21, 2023 16:09

kif added 3 commits November 21, 2023 17:25

Orientation from Dectris detector (by default)

8ee15ae

Update version number: this is PR is a big change

e4b1cab

propagate the orientation all over pyFAI code baase

9b36f0e

loichuder reviewed Nov 21, 2023

View reviewed changes

kif added 11 commits November 21, 2023 17:55

provide orientation value in addition to the name

9ddc20c

typo

be56102

The default orientation in pyFAI is "3"

54ba377

typo

5d9af22

typo

d11e441

default orientation is 3

508c153

Most tests are passing again ...

dff8865

remains 2 failures 2 errors

Fix instanciation test

aff21ad

fix a test (typo)

3de2ada

fix tests

fef14aa

Include non regression tests

bc0be18

Revert detector orientation for dectris for now

25bf9dd

linked to silx-kit#2003

kif added ready to merge Please review and removed work in progress Don't review labels Nov 23, 2023

loichuder reviewed Nov 23, 2023

View reviewed changes

remove debug statement

e1d5f52

kif and others added 9 commits November 23, 2023 13:08

Make orientation a property

40bfd07

this means one fiddles with it at ones' own risk

copy _orientation instead of orientation

ebe33e8

Update src/pyFAI/detectors/_common.py

ee163a4

Co-authored-by: Loïc Huder <[email protected]>

Update src/pyFAI/detectors/_common.py

4bce579

Co-authored-by: Loïc Huder <[email protected]>

Update src/pyFAI/detectors/_dectris.py

0dbd972

Co-authored-by: Loïc Huder <[email protected]>

Update src/pyFAI/detectors/orientation.py

abd5ac4

Co-authored-by: Loïc Huder <[email protected]>

Update src/pyFAI/test/test_detector.py

26fccfd

Co-authored-by: Loïc Huder <[email protected]>

Update src/pyFAI/test/test_detector.py

7538d06

Co-authored-by: Loïc Huder <[email protected]>

Update src/pyFAI/test/test_detector.py

f68cc43

Co-authored-by: Loïc Huder <[email protected]>

kif force-pushed the 1994_orientation branch from 7d9e966 to f68cc43 Compare November 23, 2023 12:42

typo

97b2fe3

EdgarGF93 requested changes Nov 23, 2023

View reviewed changes

Update src/pyFAI/detectors/_rayonix.py

dc06fc4

Co-authored-by: Edgar Gutierrez <[email protected]>

EdgarGF93 approved these changes Nov 23, 2023

View reviewed changes

orientation is now a property

5f563f4

kif merged commit 965f6d3 into silx-kit:main Nov 23, 2023

t20100 mentioned this pull request Apr 16, 2024

Added compatibility with pyFAI .poni files thanks to the orientation information Dioptas/Dioptas#193

Draft

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Manage orientation of detector #2001

Manage orientation of detector #2001

kif commented Nov 21, 2023 •

edited

Loading

loichuder Nov 21, 2023

kif Nov 21, 2023

loichuder Nov 21, 2023

kif Nov 22, 2023

kif Nov 22, 2023

loichuder Nov 22, 2023

kif commented Nov 23, 2023

kif commented Nov 23, 2023

loichuder Nov 23, 2023

loichuder Nov 23, 2023

EdgarGF93 commented Nov 23, 2023 •

edited

Loading

EdgarGF93 Nov 21, 2023 •

edited

Loading

kif Nov 23, 2023

t20100 commented Dec 11, 2023

	self.orientation = Orientation(config.get("orientatio", 3))
	self.orientation = Orientation(config.get("orientation", 3))

Manage orientation of detector #2001

Manage orientation of detector #2001

Conversation

kif commented Nov 21, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

kif commented Nov 23, 2023

kif commented Nov 23, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

EdgarGF93 commented Nov 23, 2023 • edited Loading

EdgarGF93 Nov 21, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

t20100 commented Dec 11, 2023

kif commented Nov 21, 2023 •

edited

Loading

EdgarGF93 commented Nov 23, 2023 •

edited

Loading

EdgarGF93 Nov 21, 2023 •

edited

Loading