Skip to content

Commit ffec12f

Browse files
gfrngfrn
authored
Remove references to pixelsPerMicron in stored procedures (#321)
* Update references to pixels per micron in SPs * Update changelog * Update schema
1 parent 269934f commit ffec12f

8 files changed

Lines changed: 63 additions & 67 deletions

‎HISTORY.rst‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,12 @@ Breaking changes:
1616

1717
- Remove ``pixelsPerMicronX`` and ``pixelsPerMicronY`` columns from ``GridInfo``
1818
- Remove ``pixelsPerMicronX`` and ``pixelsPerMicronY`` columns from ``upsert_dcg_grid``
19+
- Remove ``pixelsPerMicronX`` and ``pixelsPerMicronY`` columns from ``retrieve_grid_info_for_dc``
20+
- Remove ``pixelsPerMicronX`` and ``pixelsPerMicronY`` columns from ``retrieve_grid_info_for_dc_ids``
21+
- Remove ``pixelsPerMicronX`` and ``pixelsPerMicronY`` columns from ``retrieve_grid_info_for_dcg``
22+
- Remove ``pixelsPerMicronX`` and ``pixelsPerMicronY`` columns from ``retrieve_grid_info_for_dcg_v2``
23+
- Remove ``pixelsPerMicronX`` and ``pixelsPerMicronY`` columns from ``upsert_dc_grid``
24+
- Remove ``pixelsPerMicronX`` and ``pixelsPerMicronY`` columns from ``upsert_dcg_grid``
1925

2026
4.13.0 (2026-04-13)
2127
-------------------

‎schemas/ispyb/routines.sql‎

Lines changed: 31 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -4310,8 +4310,8 @@ BEGIN
43104310
gi.steps_x,
43114311
gi.steps_y,
43124312
gi.meshAngle,
4313-
gi.pixelsPerMicronX,
4314-
gi.pixelsPerMicronY,
4313+
gi.micronsPerPixelX,
4314+
gi.micronsPerPixelY,
43154315
gi.snapshot_offsetXPixel,
43164316
gi.snapshot_offsetYPixel,
43174317
gi.orientation,
@@ -4328,8 +4328,8 @@ BEGIN
43284328
gi.steps_x,
43294329
gi.steps_y,
43304330
gi.meshAngle,
4331-
gi.pixelsPerMicronX,
4332-
gi.pixelsPerMicronY,
4331+
gi.micronsPerPixelX,
4332+
gi.micronsPerPixelY,
43334333
gi.snapshot_offsetXPixel,
43344334
gi.snapshot_offsetYPixel,
43354335
gi.orientation,
@@ -4343,8 +4343,8 @@ BEGIN
43434343
gi.steps_x,
43444344
gi.steps_y,
43454345
gi.meshAngle,
4346-
gi.pixelsPerMicronX,
4347-
gi.pixelsPerMicronY,
4346+
gi.micronsPerPixelX,
4347+
gi.micronsPerPixelY,
43484348
gi.snapshot_offsetXPixel,
43494349
gi.snapshot_offsetYPixel,
43504350
gi.orientation,
@@ -4384,8 +4384,8 @@ BEGIN
43844384
gi.steps_x,
43854385
gi.steps_y,
43864386
gi.meshAngle,
4387-
gi.pixelsPerMicronX,
4388-
gi.pixelsPerMicronY,
4387+
gi.micronsPerPixelX,
4388+
gi.micronsPerPixelY,
43894389
gi.snapshot_offsetXPixel,
43904390
gi.snapshot_offsetYPixel,
43914391
gi.orientation,
@@ -4425,8 +4425,8 @@ BEGIN
44254425
gi.steps_x,
44264426
gi.steps_y,
44274427
gi.meshAngle,
4428-
gi.pixelsPerMicronX,
4429-
gi.pixelsPerMicronY,
4428+
gi.micronsPerPixelX,
4429+
gi.micronsPerPixelY,
44304430
gi.snapshot_offsetXPixel,
44314431
gi.snapshot_offsetYPixel,
44324432
gi.orientation,
@@ -4442,23 +4442,23 @@ BEGIN
44424442
gi.steps_x,
44434443
gi.steps_y,
44444444
gi.meshAngle,
4445-
gi.pixelsPerMicronX,
4446-
gi.pixelsPerMicronY,
4445+
gi.micronsPerPixelX,
4446+
gi.micronsPerPixelY,
44474447
gi.snapshot_offsetXPixel,
44484448
gi.snapshot_offsetYPixel,
44494449
gi.orientation,
44504450
gi.snaked
44514451
ORDER BY gi.gridInfoId ASC;
4452-
ELSE
4452+
ELSE
44534453
SELECT
44544454
gi.gridInfoId,
44554455
gi.dx_mm,
44564456
gi.dy_mm,
44574457
gi.steps_x,
44584458
gi.steps_y,
44594459
gi.meshAngle,
4460-
gi.pixelsPerMicronX,
4461-
gi.pixelsPerMicronY,
4460+
gi.micronsPerPixelX,
4461+
gi.micronsPerPixelY,
44624462
gi.snapshot_offsetXPixel,
44634463
gi.snapshot_offsetYPixel,
44644464
gi.orientation,
@@ -4477,7 +4477,7 @@ DELIMITER ;
44774477
/*!50003 SET character_set_results = @saved_cs_results */ ;
44784478
/*!50003 SET collation_connection = @saved_col_connection */ ;
44794479
/*!50003 SET @saved_sql_mode = @@sql_mode */ ;
4480-
/*!50003 SET sql_mode = '' */ ;
4480+
/*!50003 SET sql_mode = 'STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION' */ ;
44814481
/*!50003 DROP PROCEDURE IF EXISTS `retrieve_grid_info_for_dc_ids` */;
44824482
/*!50003 SET @saved_cs_client = @@character_set_client */ ;
44834483
/*!50003 SET @saved_cs_results = @@character_set_results */ ;
@@ -4488,7 +4488,7 @@ DELIMITER ;
44884488
DELIMITER ;;
44894489
CREATE PROCEDURE `retrieve_grid_info_for_dc_ids`(IN p_dcIds TEXT)
44904490
READS SQL DATA
4491-
COMMENT 'Return multi-row result-set with dc ID, grid info and some addit'
4491+
COMMENT 'Return multi-row result-set with dc ID, grid info and some additional related dc values'
44924492
BEGIN
44934493
IF NOT (p_dcIds IS NULL) THEN
44944494
SELECT
@@ -4497,8 +4497,8 @@ BEGIN
44974497
gi.dy_mm,
44984498
gi.steps_x,
44994499
gi.steps_y,
4500-
gi.pixelsPerMicronX,
4501-
gi.pixelsPerMicronY,
4500+
gi.micronsPerPixelX,
4501+
gi.micronsPerPixelY,
45024502
gi.snapshot_offsetXPixel,
45034503
gi.snapshot_offsetYPixel,
45044504
gi.orientation,
@@ -9130,8 +9130,8 @@ CREATE PROCEDURE `upsert_dcg_grid`(
91309130
p_stepsX double,
91319131
p_stepsY double,
91329132
p_meshAngle double,
9133-
p_pixelsPerMicronX float,
9134-
p_pixelsPerMicronY float,
9133+
p_micronsPerPixelX float,
9134+
p_micronsPerPixelY float,
91359135
p_snapshotOffsetXPixel float,
91369136
p_snapshotOffsetYPixel float,
91379137
p_orientation enum('vertical','horizontal'),
@@ -9141,10 +9141,10 @@ CREATE PROCEDURE `upsert_dcg_grid`(
91419141
BEGIN
91429142
IF p_dcgId IS NOT NULL THEN
91439143
INSERT INTO GridInfo (gridInfoId, dataCollectionGroupId, dx_mm, dy_mm, steps_x, steps_y, meshAngle,
9144-
pixelsPerMicronX, pixelsPerMicronY, micronsPerPixelX, micronsPerPixelY,
9144+
micronsPerPixelX, micronsPerPixelY,
91459145
snapshot_offsetXPixel, snapshot_offsetYPixel, orientation, snaked)
91469146
VALUES (p_id, p_dcgId, p_dxInMm, p_dyInMm, p_stepsX, p_stepsY, p_meshAngle,
9147-
p_pixelsPerMicronX, p_pixelsPerMicronY, p_pixelsPerMicronX, p_pixelsPerMicronY,
9147+
p_micronsPerPixelX, p_micronsPerPixelY,
91489148
p_snapshotOffsetXPixel, p_snapshotOffsetYPixel, p_orientation, p_snaked)
91499149
ON DUPLICATE KEY UPDATE
91509150
dataCollectionGroupId = IFNULL(p_dcgId, dataCollectionGroupId),
@@ -9153,10 +9153,8 @@ BEGIN
91539153
steps_x = IFNULL(p_stepsX, steps_x),
91549154
steps_y = IFNULL(p_stepsY, steps_y),
91559155
meshAngle = IFNULL(p_meshAngle, meshAngle),
9156-
pixelsPerMicronX = IFNULL(p_pixelsPerMicronX, pixelsPerMicronX),
9157-
pixelsPerMicronY = IFNULL(p_pixelsPerMicronY, pixelsPerMicronY),
9158-
micronsPerPixelX = IFNULL(p_pixelsPerMicronX, micronsPerPixelX),
9159-
micronsPerPixelY = IFNULL(p_pixelsPerMicronY, micronsPerPixelY),
9156+
micronsPerPixelX = IFNULL(p_micronsPerPixelX, micronsPerPixelX),
9157+
micronsPerPixelY = IFNULL(p_micronsPerPixelY, micronsPerPixelY),
91609158
snapshot_offsetXPixel = IFNULL(p_snapshotOffsetXPixel, snapshot_offsetXPixel),
91619159
snapshot_offsetYPixel = IFNULL(p_snapshotOffsetYPixel, snapshot_offsetYPixel),
91629160
orientation = IFNULL(p_orientation, orientation),
@@ -9229,8 +9227,8 @@ CREATE PROCEDURE `upsert_dc_grid`(
92299227
p_stepsX double,
92309228
p_stepsY double,
92319229
p_meshAngle double,
9232-
p_pixelsPerMicronX float,
9233-
p_pixelsPerMicronY float,
9230+
p_micronsPerPixelX float,
9231+
p_micronsPerPixelY float,
92349232
p_snapshotOffsetXPixel float,
92359233
p_snapshotOffsetYPixel float,
92369234
p_orientation enum('vertical','horizontal'),
@@ -9240,22 +9238,18 @@ CREATE PROCEDURE `upsert_dc_grid`(
92409238
BEGIN
92419239
IF p_dcId IS NOT NULL THEN
92429240
INSERT INTO GridInfo (gridInfoId, dataCollectionId, dx_mm, dy_mm, steps_x, steps_y, meshAngle,
9243-
pixelsPerMicronX, pixelsPerMicronY, micronsPerPixelX, micronsPerPixelY,
9244-
snapshot_offsetXPixel, snapshot_offsetYPixel, orientation, snaked)
9241+
micronsPerPixelX, micronsPerPixelY, snapshot_offsetXPixel, snapshot_offsetYPixel, orientation, snaked)
92459242
VALUES (p_id, p_dcId, p_dxInMm, p_dyInMm, p_stepsX, p_stepsY, p_meshAngle,
9246-
p_pixelsPerMicronX, p_pixelsPerMicronY, p_pixelsPerMicronX, p_pixelsPerMicronY,
9247-
p_snapshotOffsetXPixel, p_snapshotOffsetYPixel, p_orientation, p_snaked)
9243+
p_micronsPerPixelX, p_micronsPerPixelY, p_snapshotOffsetXPixel, p_snapshotOffsetYPixel, p_orientation, p_snaked)
92489244
ON DUPLICATE KEY UPDATE
92499245
dataCollectionId = IFNULL(p_dcId, dataCollectionId),
92509246
dx_mm = IFNULL(p_dxInMm, dx_mm),
92519247
dy_mm = IFNULL(p_dyInMm, dy_mm),
92529248
steps_x = IFNULL(p_stepsX, steps_x),
92539249
steps_y = IFNULL(p_stepsY, steps_y),
92549250
meshAngle = IFNULL(p_meshAngle, meshAngle),
9255-
pixelsPerMicronX = IFNULL(p_pixelsPerMicronX, pixelsPerMicronX),
9256-
pixelsPerMicronY = IFNULL(p_pixelsPerMicronY, pixelsPerMicronY),
9257-
micronsPerPixelX = IFNULL(p_pixelsPerMicronX, micronsPerPixelX),
9258-
micronsPerPixelY = IFNULL(p_pixelsPerMicronY, micronsPerPixelY),
9251+
micronsPerPixelX = IFNULL(p_micronsPerPixelX, micronsPerPixelX),
9252+
micronsPerPixelY = IFNULL(p_micronsPerPixelY, micronsPerPixelY),
92599253
snapshot_offsetXPixel = IFNULL(p_snapshotOffsetXPixel, snapshot_offsetXPixel),
92609254
snapshot_offsetYPixel = IFNULL(p_snapshotOffsetYPixel, snapshot_offsetYPixel),
92619255
orientation = IFNULL(p_orientation, orientation),

‎schemas/ispyb/stored_programs/sp_retrieve_grid_info_for_dc.sql‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
DELIMITER ;;
2-
CREATE PROCEDURE `retrieve_grid_info_for_dc`(IN p_dcId int unsigned, p_authLogin varchar(45))
2+
CREATE OR REPLACE DEFINER=`ispyb_root`@`%` PROCEDURE `retrieve_grid_info_for_dc`(IN p_dcId int unsigned, p_authLogin varchar(45))
33
READS SQL DATA
44
COMMENT 'Return multi-row result-set with grid info values for the dc'
55
BEGIN
@@ -12,8 +12,8 @@ BEGIN
1212
gi.steps_x,
1313
gi.steps_y,
1414
gi.meshAngle,
15-
gi.pixelsPerMicronX,
16-
gi.pixelsPerMicronY,
15+
gi.micronsPerPixelX,
16+
gi.micronsPerPixelY,
1717
gi.snapshot_offsetXPixel,
1818
gi.snapshot_offsetYPixel,
1919
gi.orientation,
@@ -30,8 +30,8 @@ BEGIN
3030
gi.steps_x,
3131
gi.steps_y,
3232
gi.meshAngle,
33-
gi.pixelsPerMicronX,
34-
gi.pixelsPerMicronY,
33+
gi.micronsPerPixelX,
34+
gi.micronsPerPixelY,
3535
gi.snapshot_offsetXPixel,
3636
gi.snapshot_offsetYPixel,
3737
gi.orientation,
@@ -45,8 +45,8 @@ BEGIN
4545
gi.steps_x,
4646
gi.steps_y,
4747
gi.meshAngle,
48-
gi.pixelsPerMicronX,
49-
gi.pixelsPerMicronY,
48+
gi.micronsPerPixelX,
49+
gi.micronsPerPixelY,
5050
gi.snapshot_offsetXPixel,
5151
gi.snapshot_offsetYPixel,
5252
gi.orientation,
@@ -59,4 +59,4 @@ BEGIN
5959
SIGNAL SQLSTATE '45000' SET MYSQL_ERRNO=1644, MESSAGE_TEXT='Mandatory argument p_dcId is NULL';
6060
END IF;
6161
END ;;
62-
DELIMITER ;
62+
DELIMITER ;

‎schemas/ispyb/stored_programs/sp_retrieve_grid_info_for_dc_ids.sql‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ BEGIN
1010
gi.dy_mm,
1111
gi.steps_x,
1212
gi.steps_y,
13-
gi.pixelsPerMicronX,
14-
gi.pixelsPerMicronY,
13+
gi.micronsPerPixelX,
14+
gi.micronsPerPixelY,
1515
gi.snapshot_offsetXPixel,
1616
gi.snapshot_offsetYPixel,
1717
gi.orientation,

‎schemas/ispyb/stored_programs/sp_retrieve_grid_info_for_dcg.sql‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ BEGIN
1111
gi.steps_x,
1212
gi.steps_y,
1313
gi.meshAngle,
14-
gi.pixelsPerMicronX,
15-
gi.pixelsPerMicronY,
14+
gi.micronsPerPixelX,
15+
gi.micronsPerPixelY,
1616
gi.snapshot_offsetXPixel,
1717
gi.snapshot_offsetYPixel,
1818
gi.orientation,

‎schemas/ispyb/stored_programs/sp_retrieve_grid_info_for_dcg_v2.sql‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ BEGIN
1212
gi.steps_x,
1313
gi.steps_y,
1414
gi.meshAngle,
15-
gi.pixelsPerMicronX,
16-
gi.pixelsPerMicronY,
15+
gi.micronsPerPixelX,
16+
gi.micronsPerPixelY,
1717
gi.snapshot_offsetXPixel,
1818
gi.snapshot_offsetYPixel,
1919
gi.orientation,
@@ -29,8 +29,8 @@ BEGIN
2929
gi.steps_x,
3030
gi.steps_y,
3131
gi.meshAngle,
32-
gi.pixelsPerMicronX,
33-
gi.pixelsPerMicronY,
32+
gi.micronsPerPixelX,
33+
gi.micronsPerPixelY,
3434
gi.snapshot_offsetXPixel,
3535
gi.snapshot_offsetYPixel,
3636
gi.orientation,
@@ -44,8 +44,8 @@ BEGIN
4444
gi.steps_x,
4545
gi.steps_y,
4646
gi.meshAngle,
47-
gi.pixelsPerMicronX,
48-
gi.pixelsPerMicronY,
47+
gi.micronsPerPixelX,
48+
gi.micronsPerPixelY,
4949
gi.snapshot_offsetXPixel,
5050
gi.snapshot_offsetYPixel,
5151
gi.orientation,

‎schemas/ispyb/stored_programs/sp_upsert_dc_grid.sql‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ CREATE OR REPLACE DEFINER=`ispyb_root`@`%` PROCEDURE `upsert_dc_grid`(
77
p_stepsX double,
88
p_stepsY double,
99
p_meshAngle double,
10-
p_pixelsPerMicronX float,
11-
p_pixelsPerMicronY float,
10+
p_micronsPerPixelX float,
11+
p_micronsPerPixelY float,
1212
p_snapshotOffsetXPixel float,
1313
p_snapshotOffsetYPixel float,
1414
p_orientation enum('vertical','horizontal'),
@@ -18,22 +18,18 @@ CREATE OR REPLACE DEFINER=`ispyb_root`@`%` PROCEDURE `upsert_dc_grid`(
1818
BEGIN
1919
IF p_dcId IS NOT NULL THEN
2020
INSERT INTO GridInfo (gridInfoId, dataCollectionId, dx_mm, dy_mm, steps_x, steps_y, meshAngle,
21-
pixelsPerMicronX, pixelsPerMicronY, micronsPerPixelX, micronsPerPixelY,
22-
snapshot_offsetXPixel, snapshot_offsetYPixel, orientation, snaked)
21+
micronsPerPixelX, micronsPerPixelY, snapshot_offsetXPixel, snapshot_offsetYPixel, orientation, snaked)
2322
VALUES (p_id, p_dcId, p_dxInMm, p_dyInMm, p_stepsX, p_stepsY, p_meshAngle,
24-
p_pixelsPerMicronX, p_pixelsPerMicronY, p_pixelsPerMicronX, p_pixelsPerMicronY,
25-
p_snapshotOffsetXPixel, p_snapshotOffsetYPixel, p_orientation, p_snaked)
23+
p_micronsPerPixelX, p_micronsPerPixelY, p_snapshotOffsetXPixel, p_snapshotOffsetYPixel, p_orientation, p_snaked)
2624
ON DUPLICATE KEY UPDATE
2725
dataCollectionId = IFNULL(p_dcId, dataCollectionId),
2826
dx_mm = IFNULL(p_dxInMm, dx_mm),
2927
dy_mm = IFNULL(p_dyInMm, dy_mm),
3028
steps_x = IFNULL(p_stepsX, steps_x),
3129
steps_y = IFNULL(p_stepsY, steps_y),
3230
meshAngle = IFNULL(p_meshAngle, meshAngle),
33-
pixelsPerMicronX = IFNULL(p_pixelsPerMicronX, pixelsPerMicronX),
34-
pixelsPerMicronY = IFNULL(p_pixelsPerMicronY, pixelsPerMicronY),
35-
micronsPerPixelX = IFNULL(p_pixelsPerMicronX, micronsPerPixelX),
36-
micronsPerPixelY = IFNULL(p_pixelsPerMicronY, micronsPerPixelY),
31+
micronsPerPixelX = IFNULL(p_micronsPerPixelX, micronsPerPixelX),
32+
micronsPerPixelY = IFNULL(p_micronsPerPixelY, micronsPerPixelY),
3733
snapshot_offsetXPixel = IFNULL(p_snapshotOffsetXPixel, snapshot_offsetXPixel),
3834
snapshot_offsetYPixel = IFNULL(p_snapshotOffsetYPixel, snapshot_offsetYPixel),
3935
orientation = IFNULL(p_orientation, orientation),

‎schemas/ispyb/stored_programs/sp_upsert_dcg_grid.sql‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ BEGIN
3434
steps_x = IFNULL(p_stepsX, steps_x),
3535
steps_y = IFNULL(p_stepsY, steps_y),
3636
meshAngle = IFNULL(p_meshAngle, meshAngle),
37-
micronsPerPixelX = IFNULL(p_pixelsPerMicronX, micronsPerPixelX),
38-
micronsPerPixelY = IFNULL(p_pixelsPerMicronY, micronsPerPixelY),
37+
micronsPerPixelX = IFNULL(p_micronsPerPixelX, micronsPerPixelX),
38+
micronsPerPixelY = IFNULL(p_micronsPerPixelY, micronsPerPixelY),
3939
snapshot_offsetXPixel = IFNULL(p_snapshotOffsetXPixel, snapshot_offsetXPixel),
4040
snapshot_offsetYPixel = IFNULL(p_snapshotOffsetYPixel, snapshot_offsetYPixel),
4141
orientation = IFNULL(p_orientation, orientation),

0 commit comments

Comments
 (0)