diff --git a/api/src/Page/DC.php b/api/src/Page/DC.php index 4ab4da7d2..07924aae6 100644 --- a/api/src/Page/DC.php +++ b/api/src/Page/DC.php @@ -483,8 +483,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, @@ -621,8 +621,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,