Update SP upsert_dcg_grid to use only micronsPerPixelX,Y

Author: KarlLevik

schemas/ispyb/stored_programs/sp_upsert_dcg_grid.sql

@@ -11,8 +11,8 @@ CREATE OR REPLACE DEFINER=`ispyb_root`@`%` PROCEDURE `upsert_dcg_grid`(
   p_stepsX double,
   p_stepsY double,
   p_meshAngle double,
-  p_pixelsPerMicronX float,
-  p_pixelsPerMicronY float,
+  p_micronsPerPixelX float,
+  p_micronsPerPixelY float,
   p_snapshotOffsetXPixel float,
   p_snapshotOffsetYPixel float,
   p_orientation enum('vertical','horizontal'),
@@ -21,10 +21,10 @@ CREATE OR REPLACE DEFINER=`ispyb_root`@`%` PROCEDURE `upsert_dcg_grid`(
     MODIFIES SQL DATA
 BEGIN
 	IF p_dcgId IS NOT NULL THEN
-      INSERT INTO GridInfo (gridInfoId, dataCollectionGroupId, dx_mm, dy_mm, steps_x, steps_y, meshAngle, 
+      INSERT INTO GridInfo (gridInfoId, dataCollectionGroupId, dx_mm, dy_mm, steps_x, steps_y, meshAngle,
         pixelsPerMicronX, pixelsPerMicronY, micronsPerPixelX, micronsPerPixelY,
         snapshot_offsetXPixel, snapshot_offsetYPixel, orientation, snaked)
-        VALUES (p_id, p_dcgId, p_dxInMm, p_dyInMm, p_stepsX, p_stepsY, p_meshAngle, 
+        VALUES (p_id, p_dcgId, p_dxInMm, p_dyInMm, p_stepsX, p_stepsY, p_meshAngle,
         p_pixelsPerMicronX, p_pixelsPerMicronY, p_pixelsPerMicronX, p_pixelsPerMicronY,
         p_snapshotOffsetXPixel, p_snapshotOffsetYPixel, p_orientation, p_snaked)
         ON DUPLICATE KEY UPDATE
@@ -34,10 +34,8 @@ BEGIN
 		  steps_x = IFNULL(p_stepsX, steps_x),
 		  steps_y = IFNULL(p_stepsY, steps_y),
 		  meshAngle = IFNULL(p_meshAngle, meshAngle),
-		  pixelsPerMicronX = IFNULL(p_pixelsPerMicronX, pixelsPerMicronX),
-		  pixelsPerMicronY = IFNULL(p_pixelsPerMicronY, pixelsPerMicronY),
-      micronsPerPixelX = IFNULL(p_pixelsPerMicronX, micronsPerPixelX),
-      micronsPerPixelY = IFNULL(p_pixelsPerMicronY, micronsPerPixelY),
+      micronsPerPixelX = IFNULL(p_micronsPerPixelX, micronsPerPixelX),
+      micronsPerPixelY = IFNULL(p_micronsPerPixelY, micronsPerPixelY),
 		  snapshot_offsetXPixel = IFNULL(p_snapshotOffsetXPixel, snapshot_offsetXPixel),
 		  snapshot_offsetYPixel = IFNULL(p_snapshotOffsetYPixel, snapshot_offsetYPixel),
 		  orientation = IFNULL(p_orientation, orientation),