LIMS-1914: Fix resolution displayed on grid scan images (#1032)

Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>

Author: ndg63276

api/src/Page/DC.php

@@ -482,8 +482,8 @@ function _data_collections($single = null)
                     dc.phaseplate,
                     ses.beamlinename as bl,
                     dc.blsubsampleid,
-                    d.numberofpixelsx as detectornumberofpixelsx,
-                    d.numberofpixelsy as detectornumberofpixelsy,
+                    IF(dc.detectorMode = 'ROI', d.numberofroipixelsx, d.numberofpixelsx) as detectornumberofpixelsx,
+                    IF(dc.detectorMode = 'ROI', d.numberofroipixelsy, d.numberofpixelsy) as detectornumberofpixelsy,
                     ses.archived,
                     ses.purgedProcessedData,
                     IFNULL(dc.rotationaxis, 'Omega') as rotationaxis,
@@ -625,8 +625,8 @@ function _data_collections($single = null)
                     max(dc.phaseplate) as phaseplate,
                     max(ses.beamlinename) as bl,
                     max(dc.blsubsampleid) as blsubsampleid,
-                    max(d.numberofpixelsx) as detectornumberofpixelsx,
-                    max(d.numberofpixelsy) as detectornumberofpixelsy,
+                    IF(dc.detectorMode = 'ROI', max(d.numberofroipixelsx), max(d.numberofpixelsx)) as detectornumberofpixelsx,
+                    IF(dc.detectorMode = 'ROI', max(d.numberofroipixelsy), max(d.numberofpixelsy)) as detectornumberofpixelsy,
                     max(ses.archived) as archived,
                     max(ses.purgedProcessedData) as purgedProcessedData,
                     IFNULL(max(dc.rotationaxis), 'Omega') as rotationaxis,