Skip to content

Commit eee113e

Browse files
authored
Merge pull request #255 from DiamondLightSource/pre-release-updates
Changes in preparation for release of v4.4.0
2 parents ad5857b + 5556935 commit eee113e

File tree

3 files changed

+18
-3
lines changed

3 files changed

+18
-3
lines changed

HISTORY.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,14 @@ History
55
Unreleased / master
66
-------------------
77

8+
4.4.0 (2025-29-01)
9+
-------------------
10+
11+
New or modified tables and columns:
12+
13+
- Add ``binnedPixelSize`` column to the ``ParticleClassificationGroup`` table
14+
- Add ``gridSquareId`` column to the ``Tomogram`` table
15+
816
4.3.0 (2024-12-05)
917
-------------------
1018

schemas/ispyb/lookups.sql

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
1212

1313
/*!40000 ALTER TABLE `AdminVar` DISABLE KEYS */;
14-
INSERT INTO `AdminVar` (`varId`, `name`, `value`) VALUES (4,'schemaVersion','4.3.0');
14+
INSERT INTO `AdminVar` (`varId`, `name`, `value`) VALUES (4,'schemaVersion','4.4.0');
1515
/*!40000 ALTER TABLE `AdminVar` ENABLE KEYS */;
1616

1717
/*!40000 ALTER TABLE `SchemaStatus` DISABLE KEYS */;
@@ -270,7 +270,10 @@ INSERT INTO `SchemaStatus` (`schemaStatusId`, `scriptName`, `schemaStatus`, `rec
270270
(298,'2024_09_25_AutoProcProgram_processingPipelineId.sql','DONE','2024-12-05 13:27:18'),
271271
(299,'2024_10_15_BLSample_unique_index.sql','DONE','2024-12-05 13:27:18'),
272272
(300,'2024_12_04_AutoProcProgramAttachment_deleted.sql','DONE','2024-12-05 13:27:18'),
273-
(301,'2024_12_05_AdminVar_bump_version.sql','DONE','2024-12-05 13:27:18');
273+
(301,'2024_12_05_AdminVar_bump_version.sql','DONE','2024-12-05 13:27:18'),
274+
(302,'2025_01_08_ParticleClassificationGroup_binnedPixelSize.sql','DONE','2025-01-29 10:29:27'),
275+
(303,'2025_01_24_Tomogram_gridSquare.sql','DONE','2025-01-29 10:29:27'),
276+
(304,'2025_01_29_AdminVar_bump_version.sql','DONE','2025-01-29 10:29:27');
274277
/*!40000 ALTER TABLE `SchemaStatus` ENABLE KEYS */;
275278

276279
/*!40000 ALTER TABLE `ComponentType` DISABLE KEYS */;

schemas/ispyb/tables.sql

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2409,6 +2409,7 @@ CREATE TABLE `ParticleClassificationGroup` (
24092409
`numberOfParticlesPerBatch` int(10) unsigned DEFAULT NULL COMMENT 'total number of particles per batch (a large integer)',
24102410
`numberOfClassesPerBatch` int(10) unsigned DEFAULT NULL,
24112411
`symmetry` varchar(20) DEFAULT NULL,
2412+
`binnedPixelSize` float DEFAULT NULL COMMENT 'Binned pixel size. Unit: Angstroms',
24122413
PRIMARY KEY (`particleClassificationGroupId`),
24132414
KEY `ParticleClassificationGroup_fk_particlePickerId` (`particlePickerId`),
24142415
KEY `ParticleClassificationGroup_fk_programId` (`programId`),
@@ -3566,11 +3567,14 @@ CREATE TABLE `Tomogram` (
35663567
`projXZ` varchar(255) DEFAULT NULL COMMENT 'XZ projection file',
35673568
`recordTimeStamp` datetime DEFAULT current_timestamp() COMMENT 'Creation or last update date/time',
35683569
`globalAlignmentQuality` float DEFAULT NULL COMMENT 'Quality of fit metric for the alignment of the tilt series corresponding to this tomogram',
3570+
`gridSquareId` int(11) unsigned DEFAULT NULL COMMENT 'FK, references medium mag map in GridSquare',
35693571
PRIMARY KEY (`tomogramId`),
35703572
KEY `Tomogram_fk_dataCollectionId` (`dataCollectionId`),
35713573
KEY `Tomogram_fk_autoProcProgramId` (`autoProcProgramId`),
3574+
KEY `Tomogram_fk_gridSquareId` (`gridSquareId`),
35723575
CONSTRAINT `Tomogram_fk_autoProcProgramId` FOREIGN KEY (`autoProcProgramId`) REFERENCES `AutoProcProgram` (`autoProcProgramId`) ON DELETE SET NULL ON UPDATE CASCADE,
3573-
CONSTRAINT `Tomogram_fk_dataCollectionId` FOREIGN KEY (`dataCollectionId`) REFERENCES `DataCollection` (`dataCollectionId`) ON DELETE CASCADE ON UPDATE CASCADE
3576+
CONSTRAINT `Tomogram_fk_dataCollectionId` FOREIGN KEY (`dataCollectionId`) REFERENCES `DataCollection` (`dataCollectionId`) ON DELETE CASCADE ON UPDATE CASCADE,
3577+
CONSTRAINT `Tomogram_fk_gridSquareId` FOREIGN KEY (`gridSquareId`) REFERENCES `GridSquare` (`gridSquareId`)
35743578
) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMMENT='For storing per-sample, per-position data analysis results (reconstruction)';
35753579
/*!40101 SET character_set_client = @saved_cs_client */;
35763580
DROP TABLE IF EXISTS `UserGroup`;

0 commit comments

Comments
 (0)