LIMS-1463: Combine if clauses

DiamondLightSource · Oct 9, 2024 · 1b8c2b3 · 1b8c2b3
1 parent f1bc51d
commit 1b8c2b3
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/api/src/Page/DC.php b/api/src/Page/DC.php
@@ -992,13 +992,12 @@ function _data_collections($single = null)
                         $dc['DCT'] = 'Data Collection';
                 }
 
-                if ($dc['DCT'] == 'Mesh' || $dc['DCT'] == 'Mesh3D') {
+                if ($dc['DCT'] == 'Mesh' || $dc['DCT'] == 'Mesh3D' ||
+                    ($dc['DCT'] != 'Serial Fixed' && $dc['DCT'] != 'Serial Jet' && $dc['AXISRANGE'] == 0 && $dc['NI'] > 1)
+                ) {
                     $dc['DCT'] = 'Grid Scan';
                     $dc['TYPE'] = 'grid';
                 }
-                if ($dc['DCT'] != 'Serial Fixed' && $dc['DCT'] != 'Serial Jet' && $dc['AXISRANGE'] == 0 && $dc['NI'] > 1) {
-                    $dc['TYPE'] = 'grid';
-                }
                 //$this->profile('dc');
 
                 // Edge Scans