From 9147677e3624f04823b333096ca9c21efcdab601 Mon Sep 17 00:00:00 2001 From: Guilherme de Freitas Date: Fri, 21 Mar 2025 13:32:47 +0000 Subject: [PATCH 1/6] Drop pixelsPerMicron columns --- .../ispyb/updates/2025_03_21_GridInfo_pixelsPerMicron.sql | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 schemas/ispyb/updates/2025_03_21_GridInfo_pixelsPerMicron.sql diff --git a/schemas/ispyb/updates/2025_03_21_GridInfo_pixelsPerMicron.sql b/schemas/ispyb/updates/2025_03_21_GridInfo_pixelsPerMicron.sql new file mode 100644 index 0000000..6e9515b --- /dev/null +++ b/schemas/ispyb/updates/2025_03_21_GridInfo_pixelsPerMicron.sql @@ -0,0 +1,7 @@ +INSERT IGNORE INTO SchemaStatus (scriptName, schemaStatus) VALUES ('2025_03_21_GridInfo_pixelsPerMicron.sql', 'ONGOING'); + +ALTER TABLE GridInfo + DROP COLUMN pixelsPerMicronX, + DROP COLUMN pixelsPerMicronY; + +UPDATE SchemaStatus SET schemaStatus = 'DONE' WHERE scriptName = '2025_03_21_GridInfo_pixelsPerMicron.sql'; From 8b2e33ea5f21def68f20d9455ca8afd3a070039e Mon Sep 17 00:00:00 2001 From: KarlLevik Date: Wed, 26 Mar 2025 10:38:43 +0000 Subject: [PATCH 2/6] Add update statements to save any missing values before dropping cols --- .../ispyb/updates/2025_03_21_GridInfo_pixelsPerMicron.sql | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/schemas/ispyb/updates/2025_03_21_GridInfo_pixelsPerMicron.sql b/schemas/ispyb/updates/2025_03_21_GridInfo_pixelsPerMicron.sql index 6e9515b..b4df7fc 100644 --- a/schemas/ispyb/updates/2025_03_21_GridInfo_pixelsPerMicron.sql +++ b/schemas/ispyb/updates/2025_03_21_GridInfo_pixelsPerMicron.sql @@ -1,6 +1,9 @@ INSERT IGNORE INTO SchemaStatus (scriptName, schemaStatus) VALUES ('2025_03_21_GridInfo_pixelsPerMicron.sql', 'ONGOING'); -ALTER TABLE GridInfo +UPDATE GridInfo SET micronsPerPixelX = pixelsPerMicronX WHERE micronsPerPixelX IS NULL; +UPDATE GridInfo SET micronsPerPixelY = pixelsPerMicronY WHERE micronsPerPixelY IS NULL; + +ALTER TABLE GridInfo DROP COLUMN pixelsPerMicronX, DROP COLUMN pixelsPerMicronY; From e014bc0863174f1382a14485a278c72815a4861b Mon Sep 17 00:00:00 2001 From: KarlLevik Date: Wed, 26 Mar 2025 10:40:16 +0000 Subject: [PATCH 3/6] Update SP upsert_dcg_grid to use only micronsPerPixelX,Y --- .../ispyb/stored_programs/sp_upsert_dcg_grid.sql | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/schemas/ispyb/stored_programs/sp_upsert_dcg_grid.sql b/schemas/ispyb/stored_programs/sp_upsert_dcg_grid.sql index 477123e..40bf014 100644 --- a/schemas/ispyb/stored_programs/sp_upsert_dcg_grid.sql +++ b/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), From 8016bf3a4b5c7e74c60e3022dcb623941b2b401b Mon Sep 17 00:00:00 2001 From: Guilherme Francisco Date: Wed, 26 Nov 2025 13:06:11 +0000 Subject: [PATCH 4/6] Apply suggestions from code review --- schemas/ispyb/stored_programs/sp_upsert_dcg_grid.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schemas/ispyb/stored_programs/sp_upsert_dcg_grid.sql b/schemas/ispyb/stored_programs/sp_upsert_dcg_grid.sql index 40bf014..d48793d 100644 --- a/schemas/ispyb/stored_programs/sp_upsert_dcg_grid.sql +++ b/schemas/ispyb/stored_programs/sp_upsert_dcg_grid.sql @@ -22,7 +22,7 @@ CREATE OR REPLACE DEFINER=`ispyb_root`@`%` PROCEDURE `upsert_dcg_grid`( BEGIN IF p_dcgId IS NOT NULL THEN INSERT INTO GridInfo (gridInfoId, dataCollectionGroupId, dx_mm, dy_mm, steps_x, steps_y, meshAngle, - pixelsPerMicronX, pixelsPerMicronY, micronsPerPixelX, micronsPerPixelY, + micronsPerPixelX, micronsPerPixelY, snapshot_offsetXPixel, snapshot_offsetYPixel, orientation, snaked) VALUES (p_id, p_dcgId, p_dxInMm, p_dyInMm, p_stepsX, p_stepsY, p_meshAngle, p_pixelsPerMicronX, p_pixelsPerMicronY, p_pixelsPerMicronX, p_pixelsPerMicronY, From 997fcad5f578393109c315bdcb97b4e68a9cf964 Mon Sep 17 00:00:00 2001 From: Guilherme Francisco Date: Wed, 26 Nov 2025 13:07:32 +0000 Subject: [PATCH 5/6] Update schemas/ispyb/stored_programs/sp_upsert_dcg_grid.sql --- schemas/ispyb/stored_programs/sp_upsert_dcg_grid.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schemas/ispyb/stored_programs/sp_upsert_dcg_grid.sql b/schemas/ispyb/stored_programs/sp_upsert_dcg_grid.sql index d48793d..4d5fade 100644 --- a/schemas/ispyb/stored_programs/sp_upsert_dcg_grid.sql +++ b/schemas/ispyb/stored_programs/sp_upsert_dcg_grid.sql @@ -25,7 +25,7 @@ BEGIN micronsPerPixelX, micronsPerPixelY, snapshot_offsetXPixel, snapshot_offsetYPixel, orientation, snaked) VALUES (p_id, p_dcgId, p_dxInMm, p_dyInMm, p_stepsX, p_stepsY, p_meshAngle, - p_pixelsPerMicronX, p_pixelsPerMicronY, p_pixelsPerMicronX, p_pixelsPerMicronY, + p_micronsPerPixelX, p_micronsPerPixelY, p_snapshotOffsetXPixel, p_snapshotOffsetYPixel, p_orientation, p_snaked) ON DUPLICATE KEY UPDATE dataCollectionGroupId = IFNULL(p_dcgId, dataCollectionGroupId), From 34d4c736e67188b4921222b6fe7336e0f1443789 Mon Sep 17 00:00:00 2001 From: Guilherme de Freitas Date: Wed, 26 Nov 2025 13:12:23 +0000 Subject: [PATCH 6/6] Fix indentation --- schemas/ispyb/stored_programs/sp_upsert_dcg_grid.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/schemas/ispyb/stored_programs/sp_upsert_dcg_grid.sql b/schemas/ispyb/stored_programs/sp_upsert_dcg_grid.sql index 4d5fade..2f187f3 100644 --- a/schemas/ispyb/stored_programs/sp_upsert_dcg_grid.sql +++ b/schemas/ispyb/stored_programs/sp_upsert_dcg_grid.sql @@ -34,8 +34,8 @@ BEGIN steps_x = IFNULL(p_stepsX, steps_x), steps_y = IFNULL(p_stepsY, steps_y), meshAngle = IFNULL(p_meshAngle, meshAngle), - micronsPerPixelX = IFNULL(p_micronsPerPixelX, micronsPerPixelX), - micronsPerPixelY = IFNULL(p_micronsPerPixelY, micronsPerPixelY), + micronsPerPixelX = IFNULL(p_pixelsPerMicronX, micronsPerPixelX), + micronsPerPixelY = IFNULL(p_pixelsPerMicronY, micronsPerPixelY), snapshot_offsetXPixel = IFNULL(p_snapshotOffsetXPixel, snapshot_offsetXPixel), snapshot_offsetYPixel = IFNULL(p_snapshotOffsetYPixel, snapshot_offsetYPixel), orientation = IFNULL(p_orientation, orientation),