Skip to content

Remove references to pixelsPerMicron in stored procedures #321

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gfrn merged 3 commits into from
Apr 21, 2026
Merged

Remove references to pixelsPerMicron in stored procedures #321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9101b80
Update references to pixels per micron in SPs
gfrn Apr 21, 2026
f562234
Update changelog
gfrn Apr 21, 2026
c67fa9b
Update schema
gfrn Apr 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions HISTORY.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,12 @@ Breaking changes:

- Remove ``pixelsPerMicronX`` and ``pixelsPerMicronY`` columns from ``GridInfo``
- Remove ``pixelsPerMicronX`` and ``pixelsPerMicronY`` columns from ``upsert_dcg_grid``
- Remove ``pixelsPerMicronX`` and ``pixelsPerMicronY`` columns from ``retrieve_grid_info_for_dc``
- Remove ``pixelsPerMicronX`` and ``pixelsPerMicronY`` columns from ``retrieve_grid_info_for_dc_ids``
- Remove ``pixelsPerMicronX`` and ``pixelsPerMicronY`` columns from ``retrieve_grid_info_for_dcg``
- Remove ``pixelsPerMicronX`` and ``pixelsPerMicronY`` columns from ``retrieve_grid_info_for_dcg_v2``
- Remove ``pixelsPerMicronX`` and ``pixelsPerMicronY`` columns from ``upsert_dc_grid``
- Remove ``pixelsPerMicronX`` and ``pixelsPerMicronY`` columns from ``upsert_dcg_grid``

4.13.0 (2026-04-13)
-------------------
Expand Down
68 changes: 31 additions & 37 deletions schemas/ispyb/routines.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4310,8 +4310,8 @@ BEGIN
gi.steps_x,
gi.steps_y,
gi.meshAngle,
gi.pixelsPerMicronX,
gi.pixelsPerMicronY,
gi.micronsPerPixelX,
gi.micronsPerPixelY,
gi.snapshot_offsetXPixel,
gi.snapshot_offsetYPixel,
gi.orientation,
Expand All @@ -4328,8 +4328,8 @@ BEGIN
gi.steps_x,
gi.steps_y,
gi.meshAngle,
gi.pixelsPerMicronX,
gi.pixelsPerMicronY,
gi.micronsPerPixelX,
gi.micronsPerPixelY,
gi.snapshot_offsetXPixel,
gi.snapshot_offsetYPixel,
gi.orientation,
Expand All @@ -4343,8 +4343,8 @@ BEGIN
gi.steps_x,
gi.steps_y,
gi.meshAngle,
gi.pixelsPerMicronX,
gi.pixelsPerMicronY,
gi.micronsPerPixelX,
gi.micronsPerPixelY,
gi.snapshot_offsetXPixel,
gi.snapshot_offsetYPixel,
gi.orientation,
Expand Down Expand Up @@ -4384,8 +4384,8 @@ BEGIN
gi.steps_x,
gi.steps_y,
gi.meshAngle,
gi.pixelsPerMicronX,
gi.pixelsPerMicronY,
gi.micronsPerPixelX,
gi.micronsPerPixelY,
gi.snapshot_offsetXPixel,
gi.snapshot_offsetYPixel,
gi.orientation,
Expand Down Expand Up @@ -4425,8 +4425,8 @@ BEGIN
gi.steps_x,
gi.steps_y,
gi.meshAngle,
gi.pixelsPerMicronX,
gi.pixelsPerMicronY,
gi.micronsPerPixelX,
gi.micronsPerPixelY,
gi.snapshot_offsetXPixel,
gi.snapshot_offsetYPixel,
gi.orientation,
Expand All @@ -4442,23 +4442,23 @@ BEGIN
gi.steps_x,
gi.steps_y,
gi.meshAngle,
gi.pixelsPerMicronX,
gi.pixelsPerMicronY,
gi.micronsPerPixelX,
gi.micronsPerPixelY,
gi.snapshot_offsetXPixel,
gi.snapshot_offsetYPixel,
gi.orientation,
gi.snaked
ORDER BY gi.gridInfoId ASC;
ELSE
ELSE
SELECT
gi.gridInfoId,
gi.dx_mm,
gi.dy_mm,
gi.steps_x,
gi.steps_y,
gi.meshAngle,
gi.pixelsPerMicronX,
gi.pixelsPerMicronY,
gi.micronsPerPixelX,
gi.micronsPerPixelY,
gi.snapshot_offsetXPixel,
gi.snapshot_offsetYPixel,
gi.orientation,
Expand All @@ -4477,7 +4477,7 @@ DELIMITER ;
/*!50003 SET character_set_results = @saved_cs_results */ ;
/*!50003 SET collation_connection = @saved_col_connection */ ;
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
/*!50003 SET sql_mode = '' */ ;
/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
/*!50003 DROP PROCEDURE IF EXISTS `retrieve_grid_info_for_dc_ids` */;
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
Expand All @@ -4488,7 +4488,7 @@ DELIMITER ;
DELIMITER ;;
CREATE PROCEDURE `retrieve_grid_info_for_dc_ids`(IN p_dcIds TEXT)
READS SQL DATA
COMMENT 'Return multi-row result-set with dc ID, grid info and some addit'
COMMENT 'Return multi-row result-set with dc ID, grid info and some additional related dc values'
BEGIN
IF NOT (p_dcIds IS NULL) THEN
SELECT
Expand All @@ -4497,8 +4497,8 @@ BEGIN
gi.dy_mm,
gi.steps_x,
gi.steps_y,
gi.pixelsPerMicronX,
gi.pixelsPerMicronY,
gi.micronsPerPixelX,
gi.micronsPerPixelY,
gi.snapshot_offsetXPixel,
gi.snapshot_offsetYPixel,
gi.orientation,
Expand Down Expand Up @@ -9130,8 +9130,8 @@ CREATE 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'),
Expand All @@ -9141,10 +9141,10 @@ CREATE 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,
p_micronsPerPixelX, p_micronsPerPixelY,
p_snapshotOffsetXPixel, p_snapshotOffsetYPixel, p_orientation, p_snaked)
ON DUPLICATE KEY UPDATE
dataCollectionGroupId = IFNULL(p_dcgId, dataCollectionGroupId),
Expand All @@ -9153,10 +9153,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),
Expand Down Expand Up @@ -9229,8 +9227,8 @@ CREATE PROCEDURE `upsert_dc_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'),
Expand All @@ -9240,22 +9238,18 @@ CREATE PROCEDURE `upsert_dc_grid`(
BEGIN
IF p_dcId IS NOT NULL THEN
INSERT INTO GridInfo (gridInfoId, dataCollectionId, dx_mm, dy_mm, steps_x, steps_y, meshAngle,
pixelsPerMicronX, pixelsPerMicronY, micronsPerPixelX, micronsPerPixelY,
snapshot_offsetXPixel, snapshot_offsetYPixel, orientation, snaked)
micronsPerPixelX, micronsPerPixelY, snapshot_offsetXPixel, snapshot_offsetYPixel, orientation, snaked)
VALUES (p_id, p_dcId, 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)
p_micronsPerPixelX, p_micronsPerPixelY, p_snapshotOffsetXPixel, p_snapshotOffsetYPixel, p_orientation, p_snaked)
ON DUPLICATE KEY UPDATE
dataCollectionId = IFNULL(p_dcId, dataCollectionId),
dx_mm = IFNULL(p_dxInMm, dx_mm),
dy_mm = IFNULL(p_dyInMm, dy_mm),
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),
Expand Down
16 changes: 8 additions & 8 deletions schemas/ispyb/stored_programs/sp_retrieve_grid_info_for_dc.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
DELIMITER ;;
CREATE PROCEDURE `retrieve_grid_info_for_dc`(IN p_dcId int unsigned, p_authLogin varchar(45))
CREATE OR REPLACE DEFINER=`ispyb_root`@`%` PROCEDURE `retrieve_grid_info_for_dc`(IN p_dcId int unsigned, p_authLogin varchar(45))
READS SQL DATA
COMMENT 'Return multi-row result-set with grid info values for the dc'
BEGIN
Expand All @@ -12,8 +12,8 @@ BEGIN
gi.steps_x,
gi.steps_y,
gi.meshAngle,
gi.pixelsPerMicronX,
gi.pixelsPerMicronY,
gi.micronsPerPixelX,
gi.micronsPerPixelY,
gi.snapshot_offsetXPixel,
gi.snapshot_offsetYPixel,
gi.orientation,
Expand All @@ -30,8 +30,8 @@ BEGIN
gi.steps_x,
gi.steps_y,
gi.meshAngle,
gi.pixelsPerMicronX,
gi.pixelsPerMicronY,
gi.micronsPerPixelX,
gi.micronsPerPixelY,
gi.snapshot_offsetXPixel,
gi.snapshot_offsetYPixel,
gi.orientation,
Expand All @@ -45,8 +45,8 @@ BEGIN
gi.steps_x,
gi.steps_y,
gi.meshAngle,
gi.pixelsPerMicronX,
gi.pixelsPerMicronY,
gi.micronsPerPixelX,
gi.micronsPerPixelY,
gi.snapshot_offsetXPixel,
gi.snapshot_offsetYPixel,
gi.orientation,
Expand All @@ -59,4 +59,4 @@ BEGIN
SIGNAL SQLSTATE '45000' SET MYSQL_ERRNO=1644, MESSAGE_TEXT='Mandatory argument p_dcId is NULL';
END IF;
END ;;
DELIMITER ;
DELIMITER ;
4 changes: 2 additions & 2 deletions schemas/ispyb/stored_programs/sp_retrieve_grid_info_for_dc_ids.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ BEGIN
gi.dy_mm,
gi.steps_x,
gi.steps_y,
gi.pixelsPerMicronX,
gi.pixelsPerMicronY,
gi.micronsPerPixelX,
gi.micronsPerPixelY,
gi.snapshot_offsetXPixel,
gi.snapshot_offsetYPixel,
gi.orientation,
Expand Down
4 changes: 2 additions & 2 deletions schemas/ispyb/stored_programs/sp_retrieve_grid_info_for_dcg.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ BEGIN
gi.steps_x,
gi.steps_y,
gi.meshAngle,
gi.pixelsPerMicronX,
gi.pixelsPerMicronY,
gi.micronsPerPixelX,
gi.micronsPerPixelY,
gi.snapshot_offsetXPixel,
gi.snapshot_offsetYPixel,
gi.orientation,
Expand Down
12 changes: 6 additions & 6 deletions schemas/ispyb/stored_programs/sp_retrieve_grid_info_for_dcg_v2.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ BEGIN
gi.steps_x,
gi.steps_y,
gi.meshAngle,
gi.pixelsPerMicronX,
gi.pixelsPerMicronY,
gi.micronsPerPixelX,
gi.micronsPerPixelY,
gi.snapshot_offsetXPixel,
gi.snapshot_offsetYPixel,
gi.orientation,
Expand All @@ -29,8 +29,8 @@ BEGIN
gi.steps_x,
gi.steps_y,
gi.meshAngle,
gi.pixelsPerMicronX,
gi.pixelsPerMicronY,
gi.micronsPerPixelX,
gi.micronsPerPixelY,
gi.snapshot_offsetXPixel,
gi.snapshot_offsetYPixel,
gi.orientation,
Expand All @@ -44,8 +44,8 @@ BEGIN
gi.steps_x,
gi.steps_y,
gi.meshAngle,
gi.pixelsPerMicronX,
gi.pixelsPerMicronY,
gi.micronsPerPixelX,
gi.micronsPerPixelY,
gi.snapshot_offsetXPixel,
gi.snapshot_offsetYPixel,
gi.orientation,
Expand Down
16 changes: 6 additions & 10 deletions schemas/ispyb/stored_programs/sp_upsert_dc_grid.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ CREATE OR REPLACE DEFINER=`ispyb_root`@`%` PROCEDURE `upsert_dc_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'),
Expand All @@ -18,22 +18,18 @@ CREATE OR REPLACE DEFINER=`ispyb_root`@`%` PROCEDURE `upsert_dc_grid`(
BEGIN
IF p_dcId IS NOT NULL THEN
INSERT INTO GridInfo (gridInfoId, dataCollectionId, dx_mm, dy_mm, steps_x, steps_y, meshAngle,
pixelsPerMicronX, pixelsPerMicronY, micronsPerPixelX, micronsPerPixelY,
snapshot_offsetXPixel, snapshot_offsetYPixel, orientation, snaked)
micronsPerPixelX, micronsPerPixelY, snapshot_offsetXPixel, snapshot_offsetYPixel, orientation, snaked)
VALUES (p_id, p_dcId, 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)
p_micronsPerPixelX, p_micronsPerPixelY, p_snapshotOffsetXPixel, p_snapshotOffsetYPixel, p_orientation, p_snaked)
ON DUPLICATE KEY UPDATE
dataCollectionId = IFNULL(p_dcId, dataCollectionId),
dx_mm = IFNULL(p_dxInMm, dx_mm),
dy_mm = IFNULL(p_dyInMm, dy_mm),
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),
Expand Down
4 changes: 2 additions & 2 deletions schemas/ispyb/stored_programs/sp_upsert_dcg_grid.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_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),
Expand Down
Loading