From 1c9cb877e03dc43d99b3925754dbcd263d21f985 Mon Sep 17 00:00:00 2001 From: KarlLevik Date: Thu, 17 Oct 2024 09:24:04 +0100 Subject: [PATCH 01/14] Check main rather than master when making PR for schema files --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7dea7392..c6e826a4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -44,7 +44,7 @@ jobs: - name: Create Pull Request uses: peter-evans/create-pull-request@v6 - if: github.ref == 'refs/heads/master' + if: github.ref == 'refs/heads/main' with: token: ${{ secrets.GITHUB_TOKEN }} commit-message: Update database sql files From 6e8831fea47c48b01c5cf331e66eb16018ca36e6 Mon Sep 17 00:00:00 2001 From: Karl Levik Date: Mon, 28 Oct 2024 15:57:41 +0000 Subject: [PATCH 02/14] Add new Expeye grants (#246) (#247) Co-authored-by: Guilherme Francisco --- grants/ispyb_expeye_samples_grants.sql | 3 +++ 1 file changed, 3 insertions(+) diff --git a/grants/ispyb_expeye_samples_grants.sql b/grants/ispyb_expeye_samples_grants.sql index e2643262..2585f012 100644 --- a/grants/ispyb_expeye_samples_grants.sql +++ b/grants/ispyb_expeye_samples_grants.sql @@ -8,6 +8,8 @@ CREATE ROLE IF NOT EXISTS ispyb_expeye_samples_role; GRANT SELECT ON Proposal TO ispyb_expeye_samples_role; GRANT SELECT ON BLSession TO ispyb_expeye_samples_role; +GRANT SELECT ON DataCollectionGroup TO ispyb_expeye_samples_role; +GRANT SELECT ON DataCollection TO ispyb_expeye_samples_role; GRANT SELECT, INSERT, UPDATE, DELETE ON Shipping TO ispyb_expeye_samples_role; GRANT SELECT, INSERT, UPDATE, DELETE ON ShippingHasSession TO ispyb_expeye_samples_role; @@ -44,6 +46,7 @@ GRANT SELECT, INSERT, UPDATE, DELETE ON Project_has_BLSample TO ispyb_expeye_sam GRANT SELECT ON Protein TO ispyb_expeye_samples_role; GRANT SELECT ON Crystal TO ispyb_expeye_samples_role; +GRANT SELECT, INSERT, UPDATE, DELETE ON XFEFluorescenceSpectrum TO ispyb_expeye_samples_role; GRANT SELECT, INSERT, UPDATE, DELETE ON DiffractionPlan TO ispyb_expeye_samples_role; From 6a760c32a343caacf77d4a0137340fd213d814d9 Mon Sep 17 00:00:00 2001 From: KarlLevik Date: Fri, 1 Nov 2024 11:59:48 +0000 Subject: [PATCH 03/14] Add roles and grants for MaxScale --- grants/maxscale.sql | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 grants/maxscale.sql diff --git a/grants/maxscale.sql b/grants/maxscale.sql new file mode 100644 index 00000000..c07bd12b --- /dev/null +++ b/grants/maxscale.sql @@ -0,0 +1,22 @@ +CREATE ROLE IF NOT EXISTS maxscale_role; +CREATE ROLE IF NOT EXISTS maxmon_role; + +-- You must also create database users and grant these roles to them, e.g. +-- CREATE USER maxscale_user@'%' IDENTIFIED BY 'the_password'; +-- CREATE USER maxmon_user@'%' IDENTIFIED BY 'the_password'; +-- GRANT maxscale_role to maxscale_user@'%'; +-- GRANT maxmon_role to maxmon_user@'%'; +-- SET DEFAULT ROLE maxscale_role FOR maxscale_user@'%'; +-- SET DEFAULT ROLE maxmon_role FOR maxmon_user@'%'; + +GRANT SHOW DATABASES ON *.* TO maxscale_role; +GRANT SELECT ON mysql.procs_priv TO maxscale_role; +GRANT SELECT ON mysql.tables_priv TO maxscale_role; +GRANT SELECT ON mysql.db TO maxscale_role; +GRANT SELECT ON mysql.roles_mapping TO maxscale_role; +GRANT SELECT ON mysql.columns_priv TO maxscale_role; +GRANT SELECT ON mysql.proxies_priv TO maxscale_role; +GRANT SELECT ON mysql.user TO maxscale_role; + +GRANT REPLICATION SLAVE, BINLOG MONITOR, SLAVE MONITOR ON *.* TO maxmon_role; +GRANT SELECT ON mysql.user TO maxmon_role; From 7543303b814f62975fa3556132935e2de4811de9 Mon Sep 17 00:00:00 2001 From: KarlLevik Date: Tue, 5 Nov 2024 13:59:11 +0000 Subject: [PATCH 04/14] Create fragment screening role with grants --- grants/ispyb_fragment_screening.sql | 32 +++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 grants/ispyb_fragment_screening.sql diff --git a/grants/ispyb_fragment_screening.sql b/grants/ispyb_fragment_screening.sql new file mode 100644 index 00000000..fc535d9e --- /dev/null +++ b/grants/ispyb_fragment_screening.sql @@ -0,0 +1,32 @@ +-- Create the fragment screening application role. +CREATE ROLE IF NOT EXISTS ispyb_fragment_screening; + +-- You must also create a database user and grant this role to them, e.g. +-- CREATE USER fragment_screening_user@'%' IDENTIFIED BY 'the_password'; +-- GRANT ispyb_fragment_screening to fragment_screening_user@'%'; +-- SET DEFAULT ROLE ispyb_fragment_screening FOR fragment_screening_user@'%'; + +-- Grants for ispyb_fragment_screening +GRANT SELECT ON AutoProcIntegration TO 'ispyb_fragment_screening'; +GRANT SELECT ON AutoProcProgram TO 'ispyb_fragment_screening'; +GRANT SELECT ON AutoProcProgramAttachment TO 'ispyb_fragment_screening'; +GRANT SELECT ON AutoProcScaling TO 'ispyb_fragment_screening'; +GRANT SELECT ON AutoProcScalingStatistics TO 'ispyb_fragment_screening'; +GRANT SELECT ON AutoProcScaling_has_Int TO 'ispyb_fragment_screening'; +GRANT SELECT ON BLSampleImage TO 'ispyb_fragment_screening'; +GRANT SELECT ON BLSampleImageAutoScoreClass TO 'ispyb_fragment_screening'; +GRANT SELECT ON BLSampleImageScore TO 'ispyb_fragment_screening'; +GRANT SELECT ON BLSampleImage_has_AutoScoreClass TO 'ispyb_fragment_screening'; +GRANT SELECT ON BLSession TO 'ispyb_fragment_screening'; +GRANT SELECT ON BLSubSample TO 'ispyb_fragment_screening'; +GRANT SELECT ON Container TO 'ispyb_fragment_screening'; +GRANT SELECT ON ContainerInspection TO 'ispyb_fragment_screening'; +GRANT SELECT ON Crystal TO 'ispyb_fragment_screening'; +GRANT SELECT ON DataCollection TO 'ispyb_fragment_screening'; +GRANT SELECT ON ProcessingJob TO 'ispyb_fragment_screening'; +GRANT SELECT ON ProcessingJobParameter TO 'ispyb_fragment_screening'; +GRANT SELECT ON Proposal TO 'ispyb_fragment_screening'; +GRANT SELECT ON Protein TO 'ispyb_fragment_screening'; +GRANT SELECT, INSERT, UPDATE ON BLSample TO 'ispyb_fragment_screening'; +GRANT SELECT, INSERT, UPDATE ON BLSampleGroup TO 'ispyb_fragment_screening'; +GRANT SELECT, INSERT, UPDATE ON BLSampleGroup_has_BLSample TO 'ispyb_fragment_screening'; From 88e46bc46762f2b7c60c5ea8557733779ed284e0 Mon Sep 17 00:00:00 2001 From: KarlLevik Date: Thu, 14 Nov 2024 12:33:43 +0000 Subject: [PATCH 05/14] Add scripts to delete DC and DCG rows and associated rows in other tables --- .../scripts/DataCollectionGroup_delete.sql | 34 +++++++++ .../ispyb/scripts/DataCollection_delete.sql | 69 +++++++++++++++++++ 2 files changed, 103 insertions(+) create mode 100644 schemas/ispyb/scripts/DataCollectionGroup_delete.sql create mode 100644 schemas/ispyb/scripts/DataCollection_delete.sql diff --git a/schemas/ispyb/scripts/DataCollectionGroup_delete.sql b/schemas/ispyb/scripts/DataCollectionGroup_delete.sql new file mode 100644 index 00000000..ffe6c437 --- /dev/null +++ b/schemas/ispyb/scripts/DataCollectionGroup_delete.sql @@ -0,0 +1,34 @@ +-- This is a script to delete a given DataCollectionGroup (by +-- dataCollectionGroupId) and all associated rows in other tables except +-- DataCollection. +-- To delete DataCollections, run the DataCollection_delete.sql script first +-- before you run this. +-- Change the value of @dcgId and @sessionId to the values of +-- dataCollectionGroupId and sessionId you would like to delete. +-- Disclaimer: +-- This script is not extensively tested. +-- Run this at your own risk and beware of cascading deletes. + +SET @dcgId := 1000; +SET @sessionId = 999; + +DELETE XrayCentringResult +FROM XrayCentringResult + JOIN XrayCentring +WHERE XrayCentring.xrayCentringId = XrayCentringResult.xrayCentringId AND + XrayCentring.dataCollectionGroupId = @dcgId; + +DELETE +FROM XrayCentring +WHERE dataCollectionGroupId = @dcgId; + +DELETE +FROM DataCollectionGroup +WHERE dataCollectionGroupId = @dcgId; + +DELETE RobotAction +FROM RobotAction + JOIN DataCollectionGroup +WHERE RobotAction.blsessionId = @sessionId AND + DataCollectionGroup.blSampleId = RobotAction.blSampleId AND + DataCollectionGroup.dataCollectionGroupId = @dcgId; diff --git a/schemas/ispyb/scripts/DataCollection_delete.sql b/schemas/ispyb/scripts/DataCollection_delete.sql new file mode 100644 index 00000000..886486d6 --- /dev/null +++ b/schemas/ispyb/scripts/DataCollection_delete.sql @@ -0,0 +1,69 @@ +-- This is a script to delete a given DataCollection (by dataCollectionId) and +-- all associated rows in other tables. +-- Change the value of @dcId to the dataCollectionId you would like to delete. +-- Disclaimer: +-- This script is not extensively tested. It also currently will leave behind +-- some orphaned rows. +-- Run this at your own risk and beware of cascading deletes. + +SET @dcId := 1000; + +DELETE +FROM ImageQualityIndicators +WHERE dataCollectionId = @dcId; + +DELETE ProcessingJobParameter +FROM ProcessingJobParameter + JOIN ProcessingJob +WHERE ProcessingJob.processingJobId = ProcessingJobParameter.processingJobId AND + ProcessingJob.dataCollectionId = @dcId; + +DELETE ProcessingJobImageSweep +FROM ProcessingJobImageSweep + JOIN ProcessingJob +WHERE ProcessingJob.processingJobId = ProcessingJobImageSweep.processingJobId AND + ProcessingJob.dataCollectionId = @dcId; + +DELETE AutoProcProgramMessage +FROM AutoProcProgramMessage + JOIN ProcessingJob + JOIN AutoProcProgram +WHERE ProcessingJob.processingJobId = AutoProcProgram.processingJobId AND + AutoProcProgramMessage.autoProcProgramId = AutoProcProgram.autoProcProgramId AND + ProcessingJob.dataCollectionId = @dcId; + +DELETE AutoProcProgram +FROM AutoProcProgram + JOIN ProcessingJob +WHERE ProcessingJob.processingJobId = AutoProcProgram.processingJobId AND + ProcessingJob.dataCollectionId = @dcId; + +DELETE +FROM ProcessingJob +WHERE dataCollectionId = @dcId; + +DELETE AutoProcProgramMessage +FROM AutoProcProgramMessage + JOIN AutoProcProgram + JOIN AutoProcIntegration +WHERE AutoProcIntegration.autoProcProgramId = AutoProcProgram.autoProcProgramId AND + AutoProcProgramMessage.autoProcProgramId = AutoProcProgram.autoProcProgramId AND + AutoProcIntegration.dataCollectionId = @dcId; + +DELETE AutoProcProgram +FROM AutoProcProgram + JOIN AutoProcIntegration +WHERE AutoProcIntegration.autoProcProgramId = AutoProcProgram.autoProcProgramId AND + AutoProcIntegration.dataCollectionId = @dcId; + +DELETE +FROM AutoProcIntegration +WHERE dataCollectionId = @dcId; + +DELETE +FROM GridInfo +WHERE dataCollectionId = @dcId; + +DELETE +FROM DataCollection +WHERE dataCollectionId = @dcId; From c43ce45e603ec6935f421a335634dd77dbb93723 Mon Sep 17 00:00:00 2001 From: Guilherme Francisco Date: Thu, 5 Dec 2024 13:12:16 +0000 Subject: [PATCH 06/14] Update Expeye core grants (#248) --- grants/ispyb_expeye.sql | 53 +++++++++++++++++++++++-- grants/ispyb_expeye_samples_grants.sql | 55 -------------------------- 2 files changed, 50 insertions(+), 58 deletions(-) delete mode 100644 grants/ispyb_expeye_samples_grants.sql diff --git a/grants/ispyb_expeye.sql b/grants/ispyb_expeye.sql index 569c77c4..4b112741 100644 --- a/grants/ispyb_expeye.sql +++ b/grants/ispyb_expeye.sql @@ -10,9 +10,56 @@ GRANT ispyb_propagation TO ispyb_expeye_core_role; CREATE ROLE ispyb_expeye_acquisition_role; -GRANT SELECT, INSERT, UPDATE ON RobotAction TO ispyb_expeye_acquisition_role; -GRANT SELECT, INSERT, UPDATE ON GridInfo TO ispyb_expeye_acquisition_role; -GRANT SELECT, INSERT, UPDATE ON DataCollection TO ispyb_expeye_acquisition_role; +GRANT SELECT ON Proposal TO ispyb_expeye_acquisition_role; +GRANT SELECT ON BLSession TO ispyb_expeye_acquisition_role; GRANT SELECT, INSERT, UPDATE ON DataCollectionGroup TO ispyb_expeye_acquisition_role; +GRANT SELECT, INSERT, UPDATE ON DataCollection TO ispyb_expeye_acquisition_role; GRANT SELECT, INSERT, UPDATE ON Position TO ispyb_expeye_acquisition_role; + +GRANT SELECT, INSERT, UPDATE, DELETE ON Shipping TO ispyb_expeye_acquisition_role; +GRANT SELECT, INSERT, UPDATE, DELETE ON ShippingHasSession TO ispyb_expeye_acquisition_role; +GRANT SELECT, INSERT, UPDATE, DELETE ON Project_has_Shipping TO ispyb_expeye_acquisition_role; + +GRANT SELECT, INSERT, UPDATE, DELETE ON LabContact TO ispyb_expeye_acquisition_role; + +GRANT SELECT, INSERT, UPDATE, DELETE ON Dewar TO ispyb_expeye_acquisition_role; +GRANT SELECT, INSERT, UPDATE, DELETE ON DewarLocation TO ispyb_expeye_acquisition_role; +GRANT SELECT, INSERT, UPDATE, DELETE ON DewarLocationList TO ispyb_expeye_acquisition_role; +GRANT SELECT, INSERT, UPDATE, DELETE ON DewarRegistry TO ispyb_expeye_acquisition_role; +GRANT SELECT, INSERT, UPDATE, DELETE ON DewarRegistry_has_Proposal TO ispyb_expeye_acquisition_role; +GRANT SELECT, INSERT, UPDATE, DELETE ON DewarReport TO ispyb_expeye_acquisition_role; +GRANT SELECT, INSERT, UPDATE ON DewarTransportHistory TO ispyb_expeye_acquisition_role; + +GRANT SELECT, INSERT, UPDATE, DELETE ON Container TO ispyb_expeye_acquisition_role; +GRANT SELECT, INSERT, UPDATE, DELETE ON ContainerInspection TO ispyb_expeye_acquisition_role; +GRANT SELECT, INSERT, UPDATE, DELETE ON ContainerQueue TO ispyb_expeye_acquisition_role; +GRANT SELECT, INSERT, UPDATE, DELETE ON ContainerQueueSample TO ispyb_expeye_acquisition_role; +GRANT SELECT, INSERT, UPDATE, DELETE ON ContainerRegistry TO ispyb_expeye_acquisition_role; +GRANT SELECT, INSERT, UPDATE, DELETE ON ContainerRegistry_has_Proposal TO ispyb_expeye_acquisition_role; +GRANT SELECT, INSERT, UPDATE, DELETE ON ContainerReport TO ispyb_expeye_acquisition_role; +GRANT SELECT, INSERT, UPDATE, DELETE ON ContainerType TO ispyb_expeye_acquisition_role; +GRANT SELECT, INSERT, UPDATE ON ContainerHistory TO ispyb_expeye_acquisition_role; + +GRANT SELECT ON ProcessingPipeline TO ispyb_expeye_acquisition_role; +GRANT SELECT ON ProcessingPipelineCategory TO ispyb_expeye_acquisition_role; + +GRANT SELECT, INSERT, UPDATE, DELETE ON BLSample TO ispyb_expeye_acquisition_role; +GRANT SELECT, INSERT, UPDATE, DELETE ON BLSampleGroup TO ispyb_expeye_acquisition_role; +GRANT SELECT, INSERT, UPDATE, DELETE ON BLSampleGroup_has_BLSample TO ispyb_expeye_acquisition_role; +GRANT SELECT, INSERT, UPDATE, DELETE ON BLSubSample TO ispyb_expeye_acquisition_role; +GRANT SELECT, INSERT, UPDATE, DELETE ON Project_has_BLSample TO ispyb_expeye_acquisition_role; + +GRANT SELECT ON Protein TO ispyb_expeye_acquisition_role; +GRANT SELECT ON Crystal TO ispyb_expeye_acquisition_role; +GRANT SELECT, INSERT, UPDATE, DELETE ON XFEFluorescenceSpectrum TO ispyb_expeye_acquisition_role; + +GRANT SELECT, INSERT, UPDATE, DELETE ON DiffractionPlan TO ispyb_expeye_acquisition_role; + +GRANT SELECT ON ComponentType TO ispyb_expeye_acquisition_role; +GRANT SELECT ON ComponentSubType TO ispyb_expeye_acquisition_role; +GRANT SELECT, INSERT, UPDATE, DELETE ON Component_has_SubType TO ispyb_expeye_acquisition_role; + +GRANT SELECT, INSERT, UPDATE ON RobotAction TO ispyb_expeye_acquisition_role; +GRANT SELECT, INSERT, UPDATE ON GridInfo TO ispyb_expeye_acquisition_role; + GRANT ispyb_expeye_acquisition_role TO ispyb_expeye_core_role; diff --git a/grants/ispyb_expeye_samples_grants.sql b/grants/ispyb_expeye_samples_grants.sql deleted file mode 100644 index 2585f012..00000000 --- a/grants/ispyb_expeye_samples_grants.sql +++ /dev/null @@ -1,55 +0,0 @@ --- Create the Exp-eye Samples API role. -CREATE ROLE IF NOT EXISTS ispyb_expeye_samples_role; - --- You must also create a database user and grant this role to them, e.g. --- CREATE USER ispyb_expeye_samples@'%' IDENTIFIED BY 'the_password'; --- GRANT ispyb_expeye_samples_role to ispyb_expeye_samples@'%'; --- SET DEFAULT ROLE ispyb_expeye_samples_role FOR ispyb_expeye_core@'%'; - -GRANT SELECT ON Proposal TO ispyb_expeye_samples_role; -GRANT SELECT ON BLSession TO ispyb_expeye_samples_role; -GRANT SELECT ON DataCollectionGroup TO ispyb_expeye_samples_role; -GRANT SELECT ON DataCollection TO ispyb_expeye_samples_role; - -GRANT SELECT, INSERT, UPDATE, DELETE ON Shipping TO ispyb_expeye_samples_role; -GRANT SELECT, INSERT, UPDATE, DELETE ON ShippingHasSession TO ispyb_expeye_samples_role; -GRANT SELECT, INSERT, UPDATE, DELETE ON Project_has_Shipping TO ispyb_expeye_samples_role; - -GRANT SELECT, INSERT, UPDATE, DELETE ON LabContact TO ispyb_expeye_samples_role; - -GRANT SELECT, INSERT, UPDATE, DELETE ON Dewar TO ispyb_expeye_samples_role; -GRANT SELECT, INSERT, UPDATE, DELETE ON DewarLocation TO ispyb_expeye_samples_role; -GRANT SELECT, INSERT, UPDATE, DELETE ON DewarLocationList TO ispyb_expeye_samples_role; -GRANT SELECT, INSERT, UPDATE, DELETE ON DewarRegistry TO ispyb_expeye_samples_role; -GRANT SELECT, INSERT, UPDATE, DELETE ON DewarRegistry_has_Proposal TO ispyb_expeye_samples_role; -GRANT SELECT, INSERT, UPDATE, DELETE ON DewarReport TO ispyb_expeye_samples_role; -GRANT SELECT, INSERT, UPDATE ON DewarTransportHistory TO ispyb_expeye_samples_role; - -GRANT SELECT, INSERT, UPDATE, DELETE ON Container TO ispyb_expeye_samples_role; -GRANT SELECT, INSERT, UPDATE, DELETE ON ContainerInspection TO ispyb_expeye_samples_role; -GRANT SELECT, INSERT, UPDATE, DELETE ON ContainerQueue TO ispyb_expeye_samples_role; -GRANT SELECT, INSERT, UPDATE, DELETE ON ContainerQueueSample TO ispyb_expeye_samples_role; -GRANT SELECT, INSERT, UPDATE, DELETE ON ContainerRegistry TO ispyb_expeye_samples_role; -GRANT SELECT, INSERT, UPDATE, DELETE ON ContainerRegistry_has_Proposal TO ispyb_expeye_samples_role; -GRANT SELECT, INSERT, UPDATE, DELETE ON ContainerReport TO ispyb_expeye_samples_role; -GRANT SELECT, INSERT, UPDATE, DELETE ON ContainerType TO ispyb_expeye_samples_role; -GRANT SELECT, INSERT, UPDATE ON ContainerHistory TO ispyb_expeye_samples_role; - -GRANT SELECT ON ProcessingPipeline TO ispyb_expeye_samples_role; -GRANT SELECT ON ProcessingPipelineCategory TO ispyb_expeye_samples_role; - -GRANT SELECT, INSERT, UPDATE, DELETE ON BLSample TO ispyb_expeye_samples_role; -GRANT SELECT, INSERT, UPDATE, DELETE ON BLSampleGroup TO ispyb_expeye_samples_role; -GRANT SELECT, INSERT, UPDATE, DELETE ON BLSampleGroup_has_BLSample TO ispyb_expeye_samples_role; -GRANT SELECT, INSERT, UPDATE, DELETE ON BLSubSample TO ispyb_expeye_samples_role; -GRANT SELECT, INSERT, UPDATE, DELETE ON Project_has_BLSample TO ispyb_expeye_samples_role; - -GRANT SELECT ON Protein TO ispyb_expeye_samples_role; -GRANT SELECT ON Crystal TO ispyb_expeye_samples_role; -GRANT SELECT, INSERT, UPDATE, DELETE ON XFEFluorescenceSpectrum TO ispyb_expeye_samples_role; - -GRANT SELECT, INSERT, UPDATE, DELETE ON DiffractionPlan TO ispyb_expeye_samples_role; - -GRANT SELECT ON ComponentType TO ispyb_expeye_samples_role; -GRANT SELECT ON ComponentSubType TO ispyb_expeye_samples_role; -GRANT SELECT, INSERT, UPDATE, DELETE ON Component_has_SubType TO ispyb_expeye_samples_role; From 09e78e5514b5ce5270e94b75cd9be67361ba428d Mon Sep 17 00:00:00 2001 From: Karl Levik Date: Thu, 5 Dec 2024 13:13:01 +0000 Subject: [PATCH 07/14] Add new boolean column "deleted" to the AutoProcProgramAttachment table (#249) --- .../2024_12_04_AutoProcProgramAttachment_deleted.sql | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 schemas/ispyb/updates/2024_12_04_AutoProcProgramAttachment_deleted.sql diff --git a/schemas/ispyb/updates/2024_12_04_AutoProcProgramAttachment_deleted.sql b/schemas/ispyb/updates/2024_12_04_AutoProcProgramAttachment_deleted.sql new file mode 100644 index 00000000..f58b535d --- /dev/null +++ b/schemas/ispyb/updates/2024_12_04_AutoProcProgramAttachment_deleted.sql @@ -0,0 +1,8 @@ +-- To undo: +-- ALTER TABLE AutoProcProgramAttachment DROP deleted, ALGORITHM=INSTANT; + +INSERT IGNORE INTO SchemaStatus (scriptName, schemaStatus) VALUES ('2024_12_04_AutoProcProgramAttachment_deleted.sql', 'ONGOING'); + +ALTER TABLE AutoProcProgramAttachment ADD deleted boolean DEFAULT FALSE COMMENT '1/TRUE if the file has been deleted', ALGORITHM=INSTANT; + +UPDATE SchemaStatus SET schemaStatus = 'DONE' WHERE scriptName = '2024_12_04_AutoProcProgramAttachment_deleted.sql'; From 29898a8ae3e8c1295ed37d3c4fc63880dfb7eb01 Mon Sep 17 00:00:00 2001 From: Karl Levik Date: Thu, 5 Dec 2024 17:14:37 +0000 Subject: [PATCH 08/14] Changes in preparation for release of v4.3.0 (#250) Changes in preparation for release of v4.3.0 * Use mariadb 10.6 (an LTS release) in CI builds as 10.8 is EOL * Updated HISTORY.md file * Tweaks to README.md * Update .sql to bump version of schema * Refreshed schema files --- .github/workflows/build.yml | 4 +- HISTORY.rst | 27 ++++++ README.md | 8 +- schemas/ispyb/data.sql | 86 ++++++++++--------- schemas/ispyb/lookups.sql | 65 +++++++------- schemas/ispyb/tables.sql | 6 +- .../2024_12_05_AdminVar_bump_version.sql | 5 ++ 7 files changed, 124 insertions(+), 77 deletions(-) create mode 100644 schemas/ispyb/updates/2024_12_05_AdminVar_bump_version.sql diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c6e826a4..b49cb575 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest services: mariadb: - image: mariadb:10.8 + image: mariadb:10.6 env: MYSQL_USER: test MYSQL_PASSWORD: test @@ -28,7 +28,7 @@ jobs: - uses: shogo82148/actions-setup-mysql@v1 with: distribution: 'mariadb' - mysql-version: '10.8' + mysql-version: '10.6' auto-start: false - name: Build database run: | diff --git a/HISTORY.rst b/HISTORY.rst index e900af57..8995ece7 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -5,6 +5,33 @@ History Unreleased / master ------------------- +4.3.0 (2024-12-05) +------------------- + +Note: The schema files now include a command in the first line to set the sanbox +mode which is incompatible with older clients. For more info and to disable, see: +https://mariadb.org/mariadb-dump-file-compatibility-change/ + +Admin: Changes to GitHub workflows as 'main' is now the default branch (previously 'master') + +New or modified tables and columns: + +- Add ``processingPipelineId`` column to the ``AutoProcProgram`` table +- Add new boolean column ``deleted`` to the ``AutoProcProgramAttachment`` table +- Add unique index on ``BLSample(containerId, location, subLocation)`` +- Update the ``ProcessedTomogram`` table comment + +Roles and permissions: + +- Add new grants for Expeye and combine grants into two roles instead of three +- Add roles and grants for MaxScale +- Add role with grants for fragment screening + +Scripts and data changes: + +- Trim trailing '1' in the ``SpaceGroup`` table's ``spaceGroupShortName`` column +- Add scripts that can delete ``DataCollection`` and ``DataCollectionGroup`` rows and referenced rows in other tables + 4.2.1 (2024-08-19) ------------------- diff --git a/README.md b/README.md index 4363e16d..cca80e77 100644 --- a/README.md +++ b/README.md @@ -2,19 +2,19 @@ # ispyb-database -This package provides everything needed to create the Diamond flavour of the ISPyB database schema. As the schema evolves the update scripts will also be published here, so other users of the schema should be able to stay up-to-date. +This repository provides everything needed to create the Diamond flavour of the ISPyB database schema. As the schema evolves the update scripts will also be published here, so other users of the schema should be able to stay up-to-date. ## Requirements -* Server and a client packages of MariaDB 10.3 or later. +* Server and a client packages of MariaDB 10.6 or later. * A Unix-like OS with `bash` shell. * The pandoc package (only required to build documentation at the end of the `build.sh` script.) * If binary logging is enabled in the DB system, then execute this before importing the test schema: `SET GLOBAL log_bin_trust_function_creators=ON;` ## Installation -1. Install MariaDB. See the Wiki for ideas on how to install in a particular environment. -2. Copy `.my.example.cnf` to `.my.cnf` and then edit that file to set the `user` and `password`, e.g. `user = root` and use the `password` you set when securing. Optionally, you can also set e.g. `host` and `port`. +1. Install MariaDB. Please see the Wiki for ideas on how to install in a particular environment. +2. Copy `.my.example.cnf` to `.my.cnf` and then edit that file to set the `user` and `password`, e.g. `user = root` and correspond `password`. Optionally, you can also set e.g. `host` and `port`. 3. In a test environment run the `build.sh` file. This creates the database schema and applies the grants as described in the "Schema" and "Grants" sections below. ### Schema diff --git a/schemas/ispyb/data.sql b/schemas/ispyb/data.sql index 1626a998..5e2a6f32 100644 --- a/schemas/ispyb/data.sql +++ b/schemas/ispyb/data.sql @@ -1,3 +1,4 @@ +/*M!999999\- enable the sandbox mode */ /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; @@ -49,47 +50,47 @@ INSERT INTO `AutoProcIntegration` (`autoProcIntegrationId`, `dataCollectionId`, /*!40000 ALTER TABLE `AutoProcIntegration` ENABLE KEYS */; /*!40000 ALTER TABLE `AutoProcProgram` DISABLE KEYS */; -INSERT INTO `AutoProcProgram` (`autoProcProgramId`, `processingCommandLine`, `processingPrograms`, `processingStatus`, `processingMessage`, `processingStartTime`, `processingEndTime`, `processingEnvironment`, `recordTimeStamp`, `processingJobId`) VALUES (56425592,'/dls_sw/apps/fast_dp/2395/src/fast_dp.py -a S -j 0 -J 18 /dls/i03/data/2016/cm14451-1/20160114/tlys_jan_4/tlys_jan_4_1_0001.cbf','fast_dp',1,NULL,NULL,NULL,NULL,'2016-01-14 12:46:22',NULL), -(56425944,'xia2 min_images=3 -3dii -xparallel -1 -atom s -blend -project cm14451v1 -crystal xtlysjan41 -ispyb_xml_out ispyb.xml image=/dls/i03/data/2016/cm14451-1/20160114/tlys_jan_4/tlys_jan_4_1_0001.cbf','xia2 3dii',1,NULL,NULL,NULL,NULL,'2016-01-14 13:09:51',NULL), -(56425952,'xia2 min_images=3 -dials -xparallel -1 -atom s -blend -project cm14451v1 -crystal xtlysjan41 -ispyb_xml_out ispyb.xml image=/dls/i03/data/2016/cm14451-1/20160114/tlys_jan_4/tlys_jan_4_1_0001.cbf','xia2 dials',1,NULL,NULL,NULL,NULL,'2016-01-14 13:24:22',NULL), -(56425963,'/dls_sw/apps/GPhL/autoPROC/20151214/autoPROC/bin/linux64/process -xml -Id xtlysjan41,/dls/i03/data/2016/cm14451-1/20160114/tlys_jan_4/,tlys_jan_4_1_####.cbf,1,3600 autoPROC_XdsKeyword_MAXIMUM_NUMBER_OF_PROCESSORS=12 autoPROC_XdsKeyword_MAXIMUM_NUMBER_OF_J','autoPROC 1.0.4 (see: http://www.globalphasing.com/autoproc/)',1,NULL,NULL,NULL,NULL,'2016-01-14 13:34:34',NULL), -(56426286,'xia2 min_images=3 -dials -atom s -blend -ispyb_xml_out ispyb.xml image=/dls/i03/data/2016/cm14451-1/20160114/tlys_jan_4/linediffraction_1_0001.cbf image=/dls/i03/data/2016/cm14451-1/20160114/tlys_jan_4/tlys_jan_4_1_0001.cbf','xia2 dials',1,NULL,NULL,NULL,NULL,'2016-01-14 14:01:57',NULL), -(56426287,'xia2 min_images=3 -3dii -atom s -blend -ispyb_xml_out ispyb.xml image=/dls/i03/data/2016/cm14451-1/20160114/tlys_jan_4/linediffraction_1_0001.cbf image=/dls/i03/data/2016/cm14451-1/20160114/tlys_jan_4/tlys_jan_4_1_0001.cbf','xia2 3dii',1,NULL,NULL,NULL,NULL,'2016-01-14 14:13:57',NULL), -(56983954,'/dls_sw/apps/fast_dp/2395/src/fast_dp.py -a S -j 0 -J 18 /dls/i03/data/2016/cm14451-1/20160122/gw/ins2/001/ins2_2_0001.cbf','fast_dp',1,NULL,NULL,NULL,NULL,'2016-01-22 11:34:03',NULL), -(56985584,'xia2 min_images=3 -3d -xparallel -1 -atom s -blend -project cm14451v1 -crystal xins22 -ispyb_xml_out ispyb.xml image=/dls/i03/data/2016/cm14451-1/20160122/gw/ins2/001/ins2_2_0001.cbf','xia2 3d',1,NULL,NULL,NULL,NULL,'2016-01-22 11:52:36',NULL), -(56985589,'/dls_sw/apps/GPhL/autoPROC/20151214/autoPROC/bin/linux64/process -xml -Id xins22,/dls/i03/data/2016/cm14451-1/20160122/gw/ins2/001/,ins2_2_####.cbf,1,7200 autoPROC_XdsKeyword_MAXIMUM_NUMBER_OF_PROCESSORS=12 autoPROC_XdsKeyword_MAXIMUM_NUMBER_OF_JOBS=4 Sto','autoPROC 1.0.4 (see: http://www.globalphasing.com/autoproc/)',1,NULL,NULL,NULL,NULL,'2016-01-22 11:53:38',NULL), -(56985592,'xia2 min_images=3 -3dii -xparallel -1 -atom s -blend -project cm14451v1 -crystal xins22 -ispyb_xml_out ispyb.xml image=/dls/i03/data/2016/cm14451-1/20160122/gw/ins2/001/ins2_2_0001.cbf','xia2 3dii',1,NULL,NULL,NULL,NULL,'2016-01-22 11:54:01',NULL), -(56986673,'xia2 min_images=3 -dials -xparallel -1 -atom s -blend -project cm14451v1 -crystal xins22 -ispyb_xml_out ispyb.xml image=/dls/i03/data/2016/cm14451-1/20160122/gw/ins2/001/ins2_2_0001.cbf','xia2 dials',1,NULL,NULL,NULL,NULL,'2016-01-22 12:01:59',5), -(56986674,'/dls_sw/apps/dimple/git-master/main.py --dls-naming --slow -fpng /dls/i24/data/2018/cm19649-3/processed/test180731/hewlmesh_1/line4/hewlmesh_1_1_/xia2/3d-run/DataFiles/cm19649v3_xhewlmesh11_free.mtz /dls/i24/data/2018/cm19649-3/tmp/hewlmesh_1.4308.pdb /d','dimple',1,'Blob scores: 78','2018-07-31 08:55:52','2018-07-31 08:57:10',NULL,'2018-07-31 08:57:10',NULL), -(56986675,NULL,'dimple',0,'Unknown error','2018-07-31 08:57:12',NULL,NULL,NULL,NULL); +INSERT INTO `AutoProcProgram` (`autoProcProgramId`, `processingCommandLine`, `processingPrograms`, `processingStatus`, `processingMessage`, `processingStartTime`, `processingEndTime`, `processingEnvironment`, `recordTimeStamp`, `processingJobId`, `processingPipelineId`) VALUES (56425592,'/dls_sw/apps/fast_dp/2395/src/fast_dp.py -a S -j 0 -J 18 /dls/i03/data/2016/cm14451-1/20160114/tlys_jan_4/tlys_jan_4_1_0001.cbf','fast_dp',1,NULL,NULL,NULL,NULL,'2016-01-14 12:46:22',NULL,NULL), +(56425944,'xia2 min_images=3 -3dii -xparallel -1 -atom s -blend -project cm14451v1 -crystal xtlysjan41 -ispyb_xml_out ispyb.xml image=/dls/i03/data/2016/cm14451-1/20160114/tlys_jan_4/tlys_jan_4_1_0001.cbf','xia2 3dii',1,NULL,NULL,NULL,NULL,'2016-01-14 13:09:51',NULL,NULL), +(56425952,'xia2 min_images=3 -dials -xparallel -1 -atom s -blend -project cm14451v1 -crystal xtlysjan41 -ispyb_xml_out ispyb.xml image=/dls/i03/data/2016/cm14451-1/20160114/tlys_jan_4/tlys_jan_4_1_0001.cbf','xia2 dials',1,NULL,NULL,NULL,NULL,'2016-01-14 13:24:22',NULL,NULL), +(56425963,'/dls_sw/apps/GPhL/autoPROC/20151214/autoPROC/bin/linux64/process -xml -Id xtlysjan41,/dls/i03/data/2016/cm14451-1/20160114/tlys_jan_4/,tlys_jan_4_1_####.cbf,1,3600 autoPROC_XdsKeyword_MAXIMUM_NUMBER_OF_PROCESSORS=12 autoPROC_XdsKeyword_MAXIMUM_NUMBER_OF_J','autoPROC 1.0.4 (see: http://www.globalphasing.com/autoproc/)',1,NULL,NULL,NULL,NULL,'2016-01-14 13:34:34',NULL,NULL), +(56426286,'xia2 min_images=3 -dials -atom s -blend -ispyb_xml_out ispyb.xml image=/dls/i03/data/2016/cm14451-1/20160114/tlys_jan_4/linediffraction_1_0001.cbf image=/dls/i03/data/2016/cm14451-1/20160114/tlys_jan_4/tlys_jan_4_1_0001.cbf','xia2 dials',1,NULL,NULL,NULL,NULL,'2016-01-14 14:01:57',NULL,NULL), +(56426287,'xia2 min_images=3 -3dii -atom s -blend -ispyb_xml_out ispyb.xml image=/dls/i03/data/2016/cm14451-1/20160114/tlys_jan_4/linediffraction_1_0001.cbf image=/dls/i03/data/2016/cm14451-1/20160114/tlys_jan_4/tlys_jan_4_1_0001.cbf','xia2 3dii',1,NULL,NULL,NULL,NULL,'2016-01-14 14:13:57',NULL,NULL), +(56983954,'/dls_sw/apps/fast_dp/2395/src/fast_dp.py -a S -j 0 -J 18 /dls/i03/data/2016/cm14451-1/20160122/gw/ins2/001/ins2_2_0001.cbf','fast_dp',1,NULL,NULL,NULL,NULL,'2016-01-22 11:34:03',NULL,NULL), +(56985584,'xia2 min_images=3 -3d -xparallel -1 -atom s -blend -project cm14451v1 -crystal xins22 -ispyb_xml_out ispyb.xml image=/dls/i03/data/2016/cm14451-1/20160122/gw/ins2/001/ins2_2_0001.cbf','xia2 3d',1,NULL,NULL,NULL,NULL,'2016-01-22 11:52:36',NULL,NULL), +(56985589,'/dls_sw/apps/GPhL/autoPROC/20151214/autoPROC/bin/linux64/process -xml -Id xins22,/dls/i03/data/2016/cm14451-1/20160122/gw/ins2/001/,ins2_2_####.cbf,1,7200 autoPROC_XdsKeyword_MAXIMUM_NUMBER_OF_PROCESSORS=12 autoPROC_XdsKeyword_MAXIMUM_NUMBER_OF_JOBS=4 Sto','autoPROC 1.0.4 (see: http://www.globalphasing.com/autoproc/)',1,NULL,NULL,NULL,NULL,'2016-01-22 11:53:38',NULL,NULL), +(56985592,'xia2 min_images=3 -3dii -xparallel -1 -atom s -blend -project cm14451v1 -crystal xins22 -ispyb_xml_out ispyb.xml image=/dls/i03/data/2016/cm14451-1/20160122/gw/ins2/001/ins2_2_0001.cbf','xia2 3dii',1,NULL,NULL,NULL,NULL,'2016-01-22 11:54:01',NULL,NULL), +(56986673,'xia2 min_images=3 -dials -xparallel -1 -atom s -blend -project cm14451v1 -crystal xins22 -ispyb_xml_out ispyb.xml image=/dls/i03/data/2016/cm14451-1/20160122/gw/ins2/001/ins2_2_0001.cbf','xia2 dials',1,NULL,NULL,NULL,NULL,'2016-01-22 12:01:59',5,NULL), +(56986674,'/dls_sw/apps/dimple/git-master/main.py --dls-naming --slow -fpng /dls/i24/data/2018/cm19649-3/processed/test180731/hewlmesh_1/line4/hewlmesh_1_1_/xia2/3d-run/DataFiles/cm19649v3_xhewlmesh11_free.mtz /dls/i24/data/2018/cm19649-3/tmp/hewlmesh_1.4308.pdb /d','dimple',1,'Blob scores: 78','2018-07-31 08:55:52','2018-07-31 08:57:10',NULL,'2018-07-31 08:57:10',NULL,NULL), +(56986675,NULL,'dimple',0,'Unknown error','2018-07-31 08:57:12',NULL,NULL,NULL,NULL,NULL); /*!40000 ALTER TABLE `AutoProcProgram` ENABLE KEYS */; /*!40000 ALTER TABLE `AutoProcProgramAttachment` DISABLE KEYS */; -INSERT INTO `AutoProcProgramAttachment` (`autoProcProgramAttachmentId`, `autoProcProgramId`, `fileType`, `fileName`, `filePath`, `recordTimeStamp`, `importanceRank`) VALUES (1023947,56425592,'Log','fast_dp.log','/dls/i03/data/2016/cm14451-1/processed/20160114/tlys_jan_4/tlys_jan_4_1_/fast_dp','2016-01-14 12:46:22',NULL), -(1023955,56425944,'Result','cm14451v1_xtlysjan41_free.mtz','/dls/i03/data/2016/cm14451-1/processed/20160114/tlys_jan_4/tlys_jan_4_1_/xia2/3dii-run/DataFiles','2016-01-14 13:09:51',NULL), -(1023956,56425944,'Log','xia2.html','/dls/i03/data/2016/cm14451-1/processed/20160114/tlys_jan_4/tlys_jan_4_1_/xia2/3dii-run','2016-01-14 13:09:51',NULL), -(1023969,56425952,'Result','cm14451v1_xtlysjan41_free.mtz','/dls/i03/data/2016/cm14451-1/processed/20160114/tlys_jan_4/tlys_jan_4_1_/xia2/dials-run/DataFiles','2016-01-14 13:24:22',NULL), -(1023970,56425952,'Log','xia2.html','/dls/i03/data/2016/cm14451-1/processed/20160114/tlys_jan_4/tlys_jan_4_1_/xia2/dials-run','2016-01-14 13:24:22',NULL), -(1023971,56425963,'Log','autoPROC.log','/dls/i03/data/2016/cm14451-1/processed/20160114/tlys_jan_4/tlys_jan_4_1_/autoPROC/ap-run','2016-01-14 13:34:34',NULL), -(1023972,56425963,'Result','truncate-unique.mtz','/dls/i03/data/2016/cm14451-1/processed/20160114/tlys_jan_4/tlys_jan_4_1_/autoPROC/ap-run','2016-01-14 13:34:34',NULL), -(1023973,56426286,'Result','AUTOMATIC_DEFAULT_free.mtz','/dls/i03/data/2016/cm14451-1/processed/20160114/tlys_jan_4/linediffraction_1_/multi-xia2/dials/DataFiles','2016-01-14 14:01:57',NULL), -(1023974,56426286,'Log','xia2.html','/dls/i03/data/2016/cm14451-1/processed/20160114/tlys_jan_4/linediffraction_1_/multi-xia2/dials','2016-01-14 14:01:57',NULL), -(1023975,56426287,'Result','AUTOMATIC_DEFAULT_free.mtz','/dls/i03/data/2016/cm14451-1/processed/20160114/tlys_jan_4/linediffraction_1_/multi-xia2/3dii/DataFiles','2016-01-14 14:13:57',NULL), -(1023976,56426287,'Log','xia2.html','/dls/i03/data/2016/cm14451-1/processed/20160114/tlys_jan_4/linediffraction_1_/multi-xia2/3dii','2016-01-14 14:13:57',NULL), -(1037121,56983954,'Log','fast_dp.log','/dls/i03/data/2016/cm14451-1/processed/20160122/gw/ins2/001/ins2_2_/fast_dp','2016-01-22 11:34:03',NULL), -(1037160,56985584,'Result','cm14451v1_xins22_free.mtz','/dls/i03/data/2016/cm14451-1/processed/20160122/gw/ins2/001/ins2_2_/xia2/3d-run/DataFiles','2016-01-22 11:52:36',NULL), -(1037161,56985584,'Log','xia2.html','/dls/i03/data/2016/cm14451-1/processed/20160122/gw/ins2/001/ins2_2_/xia2/3d-run','2016-01-22 11:52:36',NULL), -(1037162,56985589,'Log','autoPROC.log','/dls/i03/data/2016/cm14451-1/processed/20160122/gw/ins2/001/ins2_2_/autoPROC/ap-run','2016-01-22 11:53:38',NULL), -(1037163,56985589,'Result','truncate-unique.mtz','/dls/i03/data/2016/cm14451-1/processed/20160122/gw/ins2/001/ins2_2_/autoPROC/ap-run','2016-01-22 11:53:38',NULL), -(1037168,56985592,'Result','cm14451v1_xins22_free.mtz','/dls/i03/data/2016/cm14451-1/processed/20160122/gw/ins2/001/ins2_2_/xia2/3dii-run/DataFiles','2016-01-22 11:54:01',NULL), -(1037169,56985592,'Log','xia2.html','/dls/i03/data/2016/cm14451-1/processed/20160122/gw/ins2/001/ins2_2_/xia2/3dii-run','2016-01-22 11:54:01',NULL), -(1037183,56986673,'Result','cm14451v1_xins22_free.mtz','/dls/i03/data/2016/cm14451-1/processed/20160122/gw/ins2/001/ins2_2_/xia2/dials-run/DataFiles','2016-01-22 12:01:59',NULL), -(1037184,56986673,'Log','xia2.html','/dls/i03/data/2016/cm14451-1/processed/20160122/gw/ins2/001/ins2_2_/xia2/dials-run','2016-01-22 12:01:59',NULL), -(1037185,56986674,'Input','--slow','/dls/i24/data/2018/cm19649-3/processed/test180731/hewlmesh_1/line4/hewlmesh_1_1_/xia2/3d-run/dimple','2018-07-31 08:57:10',NULL), -(1037186,56986674,'Input','--dls-naming','/dls/i24/data/2018/cm19649-3/processed/test180731/hewlmesh_1/line4/hewlmesh_1_1_/xia2/3d-run/dimple','2018-07-31 08:57:10',NULL), -(1037187,56986674,'Result','final.pdb','/dls/i24/data/2018/cm19649-3/processed/test180731/hewlmesh_1/line4/hewlmesh_1_1_/xia2/3d-run/dimple','2018-07-31 08:57:10',NULL), -(1037188,56986674,'Result','final.mtz','/dls/i24/data/2018/cm19649-3/processed/test180731/hewlmesh_1/line4/hewlmesh_1_1_/xia2/3d-run/dimple','2018-07-31 08:57:10',NULL), -(1037189,56986674,'Log','dimple.log','/dls/i24/data/2018/cm19649-3/processed/test180731/hewlmesh_1/line4/hewlmesh_1_1_/xia2/3d-run/dimple','2018-07-31 08:57:10',0); +INSERT INTO `AutoProcProgramAttachment` (`autoProcProgramAttachmentId`, `autoProcProgramId`, `fileType`, `fileName`, `filePath`, `recordTimeStamp`, `importanceRank`, `deleted`) VALUES (1023947,56425592,'Log','fast_dp.log','/dls/i03/data/2016/cm14451-1/processed/20160114/tlys_jan_4/tlys_jan_4_1_/fast_dp','2016-01-14 12:46:22',NULL,0), +(1023955,56425944,'Result','cm14451v1_xtlysjan41_free.mtz','/dls/i03/data/2016/cm14451-1/processed/20160114/tlys_jan_4/tlys_jan_4_1_/xia2/3dii-run/DataFiles','2016-01-14 13:09:51',NULL,0), +(1023956,56425944,'Log','xia2.html','/dls/i03/data/2016/cm14451-1/processed/20160114/tlys_jan_4/tlys_jan_4_1_/xia2/3dii-run','2016-01-14 13:09:51',NULL,0), +(1023969,56425952,'Result','cm14451v1_xtlysjan41_free.mtz','/dls/i03/data/2016/cm14451-1/processed/20160114/tlys_jan_4/tlys_jan_4_1_/xia2/dials-run/DataFiles','2016-01-14 13:24:22',NULL,0), +(1023970,56425952,'Log','xia2.html','/dls/i03/data/2016/cm14451-1/processed/20160114/tlys_jan_4/tlys_jan_4_1_/xia2/dials-run','2016-01-14 13:24:22',NULL,0), +(1023971,56425963,'Log','autoPROC.log','/dls/i03/data/2016/cm14451-1/processed/20160114/tlys_jan_4/tlys_jan_4_1_/autoPROC/ap-run','2016-01-14 13:34:34',NULL,0), +(1023972,56425963,'Result','truncate-unique.mtz','/dls/i03/data/2016/cm14451-1/processed/20160114/tlys_jan_4/tlys_jan_4_1_/autoPROC/ap-run','2016-01-14 13:34:34',NULL,0), +(1023973,56426286,'Result','AUTOMATIC_DEFAULT_free.mtz','/dls/i03/data/2016/cm14451-1/processed/20160114/tlys_jan_4/linediffraction_1_/multi-xia2/dials/DataFiles','2016-01-14 14:01:57',NULL,0), +(1023974,56426286,'Log','xia2.html','/dls/i03/data/2016/cm14451-1/processed/20160114/tlys_jan_4/linediffraction_1_/multi-xia2/dials','2016-01-14 14:01:57',NULL,0), +(1023975,56426287,'Result','AUTOMATIC_DEFAULT_free.mtz','/dls/i03/data/2016/cm14451-1/processed/20160114/tlys_jan_4/linediffraction_1_/multi-xia2/3dii/DataFiles','2016-01-14 14:13:57',NULL,0), +(1023976,56426287,'Log','xia2.html','/dls/i03/data/2016/cm14451-1/processed/20160114/tlys_jan_4/linediffraction_1_/multi-xia2/3dii','2016-01-14 14:13:57',NULL,0), +(1037121,56983954,'Log','fast_dp.log','/dls/i03/data/2016/cm14451-1/processed/20160122/gw/ins2/001/ins2_2_/fast_dp','2016-01-22 11:34:03',NULL,0), +(1037160,56985584,'Result','cm14451v1_xins22_free.mtz','/dls/i03/data/2016/cm14451-1/processed/20160122/gw/ins2/001/ins2_2_/xia2/3d-run/DataFiles','2016-01-22 11:52:36',NULL,0), +(1037161,56985584,'Log','xia2.html','/dls/i03/data/2016/cm14451-1/processed/20160122/gw/ins2/001/ins2_2_/xia2/3d-run','2016-01-22 11:52:36',NULL,0), +(1037162,56985589,'Log','autoPROC.log','/dls/i03/data/2016/cm14451-1/processed/20160122/gw/ins2/001/ins2_2_/autoPROC/ap-run','2016-01-22 11:53:38',NULL,0), +(1037163,56985589,'Result','truncate-unique.mtz','/dls/i03/data/2016/cm14451-1/processed/20160122/gw/ins2/001/ins2_2_/autoPROC/ap-run','2016-01-22 11:53:38',NULL,0), +(1037168,56985592,'Result','cm14451v1_xins22_free.mtz','/dls/i03/data/2016/cm14451-1/processed/20160122/gw/ins2/001/ins2_2_/xia2/3dii-run/DataFiles','2016-01-22 11:54:01',NULL,0), +(1037169,56985592,'Log','xia2.html','/dls/i03/data/2016/cm14451-1/processed/20160122/gw/ins2/001/ins2_2_/xia2/3dii-run','2016-01-22 11:54:01',NULL,0), +(1037183,56986673,'Result','cm14451v1_xins22_free.mtz','/dls/i03/data/2016/cm14451-1/processed/20160122/gw/ins2/001/ins2_2_/xia2/dials-run/DataFiles','2016-01-22 12:01:59',NULL,0), +(1037184,56986673,'Log','xia2.html','/dls/i03/data/2016/cm14451-1/processed/20160122/gw/ins2/001/ins2_2_/xia2/dials-run','2016-01-22 12:01:59',NULL,0), +(1037185,56986674,'Input','--slow','/dls/i24/data/2018/cm19649-3/processed/test180731/hewlmesh_1/line4/hewlmesh_1_1_/xia2/3d-run/dimple','2018-07-31 08:57:10',NULL,0), +(1037186,56986674,'Input','--dls-naming','/dls/i24/data/2018/cm19649-3/processed/test180731/hewlmesh_1/line4/hewlmesh_1_1_/xia2/3d-run/dimple','2018-07-31 08:57:10',NULL,0), +(1037187,56986674,'Result','final.pdb','/dls/i24/data/2018/cm19649-3/processed/test180731/hewlmesh_1/line4/hewlmesh_1_1_/xia2/3d-run/dimple','2018-07-31 08:57:10',NULL,0), +(1037188,56986674,'Result','final.mtz','/dls/i24/data/2018/cm19649-3/processed/test180731/hewlmesh_1/line4/hewlmesh_1_1_/xia2/3d-run/dimple','2018-07-31 08:57:10',NULL,0), +(1037189,56986674,'Log','dimple.log','/dls/i24/data/2018/cm19649-3/processed/test180731/hewlmesh_1/line4/hewlmesh_1_1_/xia2/3d-run/dimple','2018-07-31 08:57:10',0,0); /*!40000 ALTER TABLE `AutoProcProgramAttachment` ENABLE KEYS */; /*!40000 ALTER TABLE `AutoProcProgramMessage` DISABLE KEYS */; @@ -211,9 +212,9 @@ INSERT INTO `BLSample` (`blSampleId`, `diffractionPlanId`, `crystalId`, `contain /*!40000 ALTER TABLE `BLSample` ENABLE KEYS */; /*!40000 ALTER TABLE `BLSampleGroup` DISABLE KEYS */; -INSERT INTO `BLSampleGroup` (`blSampleGroupId`, `name`, `proposalId`) VALUES (5,NULL,37027), -(6,'foo',37027), -(7,'bar',37027); +INSERT INTO `BLSampleGroup` (`blSampleGroupId`, `name`, `proposalId`, `ownerId`) VALUES (5,NULL,37027,NULL), +(6,'foo',37027,NULL), +(7,'bar',37027,NULL); /*!40000 ALTER TABLE `BLSampleGroup` ENABLE KEYS */; /*!40000 ALTER TABLE `BLSampleGroup_has_BLSample` DISABLE KEYS */; @@ -633,6 +634,9 @@ INSERT INTO `Position` (`positionId`, `relativePositionId`, `posX`, `posY`, `pos /*!40000 ALTER TABLE `PreparePhasingData` DISABLE KEYS */; /*!40000 ALTER TABLE `PreparePhasingData` ENABLE KEYS */; +/*!40000 ALTER TABLE `ProcessedTomogram` DISABLE KEYS */; +/*!40000 ALTER TABLE `ProcessedTomogram` ENABLE KEYS */; + /*!40000 ALTER TABLE `ProcessingJob` DISABLE KEYS */; INSERT INTO `ProcessingJob` (`processingJobId`, `dataCollectionId`, `displayName`, `comments`, `recordTimestamp`, `recipe`, `automatic`) VALUES (5,1002287,'test job 01','Testing the job submission system','2017-10-16 11:02:12','DIALS/xia2',0); /*!40000 ALTER TABLE `ProcessingJob` ENABLE KEYS */; diff --git a/schemas/ispyb/lookups.sql b/schemas/ispyb/lookups.sql index 6c54b6a3..3f7d45ad 100644 --- a/schemas/ispyb/lookups.sql +++ b/schemas/ispyb/lookups.sql @@ -1,3 +1,4 @@ +/*M!999999\- enable the sandbox mode */ /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; @@ -10,7 +11,7 @@ /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; /*!40000 ALTER TABLE `AdminVar` DISABLE KEYS */; -INSERT INTO `AdminVar` (`varId`, `name`, `value`) VALUES (4,'schemaVersion','4.2.1'); +INSERT INTO `AdminVar` (`varId`, `name`, `value`) VALUES (4,'schemaVersion','4.3.0'); /*!40000 ALTER TABLE `AdminVar` ENABLE KEYS */; /*!40000 ALTER TABLE `SchemaStatus` DISABLE KEYS */; @@ -263,7 +264,13 @@ INSERT INTO `SchemaStatus` (`schemaStatusId`, `scriptName`, `schemaStatus`, `rec (292,'2024_07_16_ContainerType_insert_new.sql','DONE','2024-08-14 11:23:41'), (293,'2024_08_08_ProcessedTomogram.sql','DONE','2024-08-14 11:23:41'), (294,'2024_08_14_AdminVar_bump_version.sql','DONE','2024-08-14 11:23:41'), -(295,'2024_08_19_AdminVar_bump_version.sql','DONE','2024-08-19 12:17:10'); +(295,'2024_08_19_AdminVar_bump_version.sql','DONE','2024-08-19 12:17:10'), +(296,'2024_09_04_ProcessedTomogram_comment','ONGOING','2024-12-05 13:27:18'), +(297,'2024_09_17_SpaceGroup_trim','ONGOING','2024-12-05 13:27:18'), +(298,'2024_09_25_AutoProcProgram_processingPipelineId.sql','DONE','2024-12-05 13:27:18'), +(299,'2024_10_15_BLSample_unique_index.sql','DONE','2024-12-05 13:27:18'), +(300,'2024_12_04_AutoProcProgramAttachment_deleted.sql','DONE','2024-12-05 13:27:18'), +(301,'2024_12_05_AdminVar_bump_version.sql','DONE','2024-12-05 13:27:18'); /*!40000 ALTER TABLE `SchemaStatus` ENABLE KEYS */; /*!40000 ALTER TABLE `ComponentType` DISABLE KEYS */; @@ -523,20 +530,20 @@ INSERT INTO `SpaceGroup` (`spaceGroupId`, `spaceGroupNumber`, `spaceGroupShortNa (48,48,'Pnnn','P nn n',NULL,NULL,NULL,NULL,0), (49,49,'Pccm','P cc m',NULL,NULL,NULL,NULL,0), (50,50,'Pban','P ba n',NULL,NULL,NULL,NULL,0), -(51,51,'Pmma1','P mm a1',NULL,NULL,NULL,NULL,0), -(52,52,'Pnna1','P nn a1',NULL,NULL,NULL,NULL,0), -(53,53,'Pmna1','P mn a1',NULL,NULL,NULL,NULL,0), -(54,54,'Pcca1','P cc a1',NULL,NULL,NULL,NULL,0), -(55,55,'Pbam1','P ba m1',NULL,NULL,NULL,NULL,0), -(56,56,'Pccn1','P cc n1',NULL,NULL,NULL,NULL,0), -(57,57,'Pbcm1','P bc m1',NULL,NULL,NULL,NULL,0), -(58,58,'Pnnm1','P nn m1',NULL,NULL,NULL,NULL,0), -(59,59,'Pmmn1','P mm n1',NULL,NULL,NULL,NULL,0), -(60,60,'Pbcn1','P bc n1',NULL,NULL,NULL,NULL,0), -(61,61,'Pbca1','P bc a1',NULL,NULL,NULL,NULL,0), -(62,62,'Pnma1','P nm a1',NULL,NULL,NULL,NULL,0), -(63,63,'Cmcm1','C mc m1',NULL,NULL,NULL,NULL,0), -(64,64,'Cmca1','C mc a1',NULL,NULL,NULL,NULL,0), +(51,51,'Pmma','P mm a1',NULL,NULL,NULL,NULL,0), +(52,52,'Pnna','P nn a1',NULL,NULL,NULL,NULL,0), +(53,53,'Pmna','P mn a1',NULL,NULL,NULL,NULL,0), +(54,54,'Pcca','P cc a1',NULL,NULL,NULL,NULL,0), +(55,55,'Pbam','P ba m1',NULL,NULL,NULL,NULL,0), +(56,56,'Pccn','P cc n1',NULL,NULL,NULL,NULL,0), +(57,57,'Pbcm','P bc m1',NULL,NULL,NULL,NULL,0), +(58,58,'Pnnm','P nn m1',NULL,NULL,NULL,NULL,0), +(59,59,'Pmmn','P mm n1',NULL,NULL,NULL,NULL,0), +(60,60,'Pbcn','P bc n1',NULL,NULL,NULL,NULL,0), +(61,61,'Pbca','P bc a1',NULL,NULL,NULL,NULL,0), +(62,62,'Pnma','P nm a1',NULL,NULL,NULL,NULL,0), +(63,63,'Cmcm','C mc m1',NULL,NULL,NULL,NULL,0), +(64,64,'Cmca','C mc a1',NULL,NULL,NULL,NULL,0), (65,65,'Cmmm','C mm m',NULL,NULL,NULL,NULL,0), (66,66,'Cccm','C cc m',NULL,NULL,NULL,NULL,0), (67,67,'Cmma','C mm a',NULL,NULL,NULL,NULL,0), @@ -545,8 +552,8 @@ INSERT INTO `SpaceGroup` (`spaceGroupId`, `spaceGroupNumber`, `spaceGroupShortNa (70,70,'Fddd','F dd d',NULL,NULL,NULL,NULL,0), (71,71,'Immm','I mm m',NULL,NULL,NULL,NULL,0), (72,72,'Ibam','I ba m',NULL,NULL,NULL,NULL,0), -(73,73,'Ibca1','I b c a1',NULL,NULL,NULL,NULL,0), -(74,74,'Imma1','I mm a1',NULL,NULL,NULL,NULL,0), +(73,73,'Ibca','I b c a1',NULL,NULL,NULL,NULL,0), +(74,74,'Imma','I mm a1',NULL,NULL,NULL,NULL,0), (75,75,'P4','P4','tP',NULL,NULL,NULL,1), (76,76,'P41','P41','tP',NULL,NULL,NULL,1), (77,77,'P42','P42','tP',NULL,NULL,NULL,1), @@ -599,10 +606,10 @@ INSERT INTO `SpaceGroup` (`spaceGroupId`, `spaceGroupNumber`, `spaceGroupShortNa (124,124,'P4/mcc','P4/m c c',NULL,NULL,NULL,NULL,0), (125,125,'P4/nbm','P4/n b m',NULL,NULL,NULL,NULL,0), (126,126,'P4/nnc','P4/n n c',NULL,NULL,NULL,NULL,0), -(127,127,'P4/mbm1','P4/m b m1',NULL,NULL,NULL,NULL,0), -(128,128,'P4/mnc1','P4/m n c1',NULL,NULL,NULL,NULL,0), -(129,129,'P4/nmm1','P4/n m m1',NULL,NULL,NULL,NULL,0), -(130,130,'P4/ncc1','P4/n c c1',NULL,NULL,NULL,NULL,0), +(127,127,'P4/mbm','P4/m b m1',NULL,NULL,NULL,NULL,0), +(128,128,'P4/mnc','P4/m n c1',NULL,NULL,NULL,NULL,0), +(129,129,'P4/nmm','P4/n m m1',NULL,NULL,NULL,NULL,0), +(130,130,'P4/ncc','P4/n c c1',NULL,NULL,NULL,NULL,0), (131,131,'P42/mmc','P42/m m c',NULL,NULL,NULL,NULL,0), (132,132,'P42/mcm','P42/m c m',NULL,NULL,NULL,NULL,0), (133,133,'P42/nbc','P42/n b c',NULL,NULL,NULL,NULL,0), @@ -677,8 +684,8 @@ INSERT INTO `SpaceGroup` (`spaceGroupId`, `spaceGroupNumber`, `spaceGroupShortNa (202,202,'Fm-3','Fm -3',NULL,NULL,NULL,NULL,0), (203,203,'Fd-3','Fd -3',NULL,NULL,NULL,NULL,0), (204,204,'Im-3','Im -3',NULL,NULL,NULL,NULL,0), -(205,205,'Pa-31','Pa -31',NULL,NULL,NULL,NULL,0), -(206,206,'Ia-31','Ia -31',NULL,NULL,NULL,NULL,0), +(205,205,'Pa-3','Pa -31',NULL,NULL,NULL,NULL,0), +(206,206,'Ia-3','Ia -31',NULL,NULL,NULL,NULL,0), (207,207,'P432','P4 3 2','cP',NULL,NULL,NULL,1), (208,208,'P4232','P42 3 2','cP',NULL,NULL,NULL,1), (209,209,'F432','F4 3 2','cF',NULL,NULL,NULL,1), @@ -695,14 +702,14 @@ INSERT INTO `SpaceGroup` (`spaceGroupId`, `spaceGroupNumber`, `spaceGroupShortNa (220,220,'I-43d','I-4 3 d',NULL,NULL,NULL,NULL,0), (221,221,'Pm-3m','Pm -3 m',NULL,NULL,NULL,NULL,0), (222,222,'Pn-3n','Pn -3 n',NULL,NULL,NULL,NULL,0), -(223,223,'Pm-3n1','Pm -3 n1',NULL,NULL,NULL,NULL,0), -(224,224,'Pn-3m1','Pn -3 m1',NULL,NULL,NULL,NULL,0), +(223,223,'Pm-3n','Pm -3 n1',NULL,NULL,NULL,NULL,0), +(224,224,'Pn-3m','Pn -3 m1',NULL,NULL,NULL,NULL,0), (225,225,'Fm-3m','Fm -3 m',NULL,NULL,NULL,NULL,0), (226,226,'Fm-3c','Fm -3 c',NULL,NULL,NULL,NULL,0), -(227,227,'Fd-3m1','Fd -3 m1',NULL,NULL,NULL,NULL,0), -(228,228,'Fd-3c1','Fd -3 c1',NULL,NULL,NULL,NULL,0), +(227,227,'Fd-3m','Fd -3 m1',NULL,NULL,NULL,NULL,0), +(228,228,'Fd-3c','Fd -3 c1',NULL,NULL,NULL,NULL,0), (229,229,'Im-3m','Im -3 m',NULL,NULL,NULL,NULL,0), -(230,230,'Ia-3d1','Ia -3 d1',NULL,NULL,NULL,NULL,0); +(230,230,'Ia-3d','Ia -3 d1',NULL,NULL,NULL,NULL,0); /*!40000 ALTER TABLE `SpaceGroup` ENABLE KEYS */; /*!40000 ALTER TABLE `ProcessingPipelineCategory` DISABLE KEYS */; diff --git a/schemas/ispyb/tables.sql b/schemas/ispyb/tables.sql index c0ef35fb..d68fca82 100644 --- a/schemas/ispyb/tables.sql +++ b/schemas/ispyb/tables.sql @@ -1,3 +1,4 @@ +/*M!999999\- enable the sandbox mode */ /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; @@ -124,6 +125,7 @@ CREATE TABLE `AutoProcProgram` ( `processingEnvironment` varchar(255) DEFAULT NULL COMMENT 'Cpus, Nodes,...', `recordTimeStamp` datetime DEFAULT NULL COMMENT 'Creation or last update date/time', `processingJobId` int(11) unsigned DEFAULT NULL, + `processingPipelineId` int(11) unsigned DEFAULT NULL, PRIMARY KEY (`autoProcProgramId`), KEY `AutoProcProgram_FK2` (`processingJobId`), CONSTRAINT `AutoProcProgram_FK2` FOREIGN KEY (`processingJobId`) REFERENCES `ProcessingJob` (`processingJobId`) @@ -140,6 +142,7 @@ CREATE TABLE `AutoProcProgramAttachment` ( `filePath` varchar(255) DEFAULT NULL COMMENT 'Attachment filepath to disk storage', `recordTimeStamp` datetime DEFAULT NULL COMMENT 'Creation or last update date/time', `importanceRank` tinyint(3) unsigned DEFAULT NULL COMMENT 'For the particular autoProcProgramId and fileType, indicate the importance of the attachment. Higher numbers are more important', + `deleted` tinyint(1) DEFAULT 0 COMMENT '1/TRUE if the file has been deleted', PRIMARY KEY (`autoProcProgramAttachmentId`), KEY `AutoProcProgramAttachmentIdx1` (`autoProcProgramId`), CONSTRAINT `AutoProcProgramAttachmentFk1` FOREIGN KEY (`autoProcProgramId`) REFERENCES `AutoProcProgram` (`autoProcProgramId`) ON DELETE CASCADE ON UPDATE CASCADE @@ -429,6 +432,7 @@ CREATE TABLE `BLSample` ( `staffComments` varchar(255) DEFAULT NULL COMMENT 'Any staff comments on the sample', `source` varchar(50) DEFAULT current_user(), PRIMARY KEY (`blSampleId`), + UNIQUE KEY `BLSample_uidx_containerId_location_subLocation` (`containerId`,`location`,`subLocation`), KEY `BLSample_FKIndex1` (`containerId`), KEY `BLSample_FKIndex3` (`diffractionPlanId`), KEY `BLSample_FKIndex_Status` (`blSampleStatus`), @@ -2669,7 +2673,7 @@ CREATE TABLE `ProcessedTomogram` ( PRIMARY KEY (`processedTomogramId`), KEY `tomogramId` (`tomogramId`), CONSTRAINT `ProcessedTomogram_ibfk_1` FOREIGN KEY (`tomogramId`) REFERENCES `Tomogram` (`tomogramId`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='References to processed tomogram paths'; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='Indicates the sample''s location on a multi-sample pin, where 1 is closest to the pin base or a sample''s position in a cryo-EM cassette'; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `ProcessingJob`; /*!40101 SET @saved_cs_client = @@character_set_client */; diff --git a/schemas/ispyb/updates/2024_12_05_AdminVar_bump_version.sql b/schemas/ispyb/updates/2024_12_05_AdminVar_bump_version.sql new file mode 100644 index 00000000..ae25d707 --- /dev/null +++ b/schemas/ispyb/updates/2024_12_05_AdminVar_bump_version.sql @@ -0,0 +1,5 @@ +INSERT IGNORE INTO SchemaStatus (scriptName, schemaStatus) VALUES ('2024_12_05_AdminVar_bump_version.sql', 'ONGOING'); + +UPDATE AdminVar SET `value` = '4.3.0' WHERE `name` = 'schemaVersion'; + +UPDATE SchemaStatus SET schemaStatus = 'DONE' WHERE scriptName = '2024_12_05_AdminVar_bump_version.sql'; From b957b283bf3882cda623d2ca059fa9f3973e0e24 Mon Sep 17 00:00:00 2001 From: KarlLevik Date: Tue, 10 Dec 2024 16:58:32 +0000 Subject: [PATCH 09/14] Use MariaDB 10.6.19 in Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d92144c1..92d4f9e1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.io/library/mariadb:10.10.3 +FROM docker.io/library/mariadb:10.6.19 WORKDIR /ispyb From 4ee4d83b15fc2a71151206acd37046c479a283de Mon Sep 17 00:00:00 2001 From: KarlLevik Date: Tue, 10 Dec 2024 16:59:41 +0000 Subject: [PATCH 10/14] Specify that the Wiki has info about installing via Dockerfile --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index cca80e77..1344c761 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ This repository provides everything needed to create the Diamond flavour of the ## Installation -1. Install MariaDB. Please see the Wiki for ideas on how to install in a particular environment. +1. Install MariaDB. The Wiki has ideas on how to install in a particular environment, including OS packages or containers via the provided Dockerfile. If you use the container approach with the provided Dockerfile, then steps 2 and 3 below are done for you automatically. 2. Copy `.my.example.cnf` to `.my.cnf` and then edit that file to set the `user` and `password`, e.g. `user = root` and correspond `password`. Optionally, you can also set e.g. `host` and `port`. 3. In a test environment run the `build.sh` file. This creates the database schema and applies the grants as described in the "Schema" and "Grants" sections below. From 7a7a8463cb53625dea38002936e7df58c78ae61e Mon Sep 17 00:00:00 2001 From: KarlLevik Date: Wed, 11 Dec 2024 11:49:40 +0000 Subject: [PATCH 11/14] Add more info, correct mistake, in "Useful scripts" README section --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 1344c761..d8a8b9c2 100644 --- a/README.md +++ b/README.md @@ -94,8 +94,8 @@ mariadb ispyb < grants/ispyb_web.sql ## Useful scripts * `build.sh`: Creates a development `ispyb_build` database and imports all the schema and grants files into it. -* `release.sh`: Makes a release, see the Releasing section. -* `bin/backup.sh`: Makes a backup of the development database. +* `release.sh`: Makes a release, see the `RELEASE.md` file for details. +* `bin/backup.sh`: Makes a backup of the development database, producing four files: `tables.sql`, `routines.sql`, `lookups.sql`, `data.sql`. * `bin/missed_updates.sh`: Generates a list of files in the `schemas/ispyb/updates/` folder that haven't been applied. * `bin/export_session.sh`: Exports a given session's database rows to SQL files. These can then easily be imported into an empty ispyb database. This can be used e.g. to create a single-session ISPyB/SynchWeb instance if combined with all the relevant data files and processing files for the session, and an instance of SynchWeb. From a5b4636c9367707106cf25ff94c5627d51b5b4e4 Mon Sep 17 00:00:00 2001 From: Karl Levik Date: Wed, 11 Dec 2024 12:34:02 +0000 Subject: [PATCH 12/14] Fix wrong scriptName in insert to SchemaStatus (#251) --- schemas/ispyb/updates/2024_09_04_ProcessedTomogram_comment.sql | 2 +- schemas/ispyb/updates/2024_09_17_SpaceGroup_trim.sql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/schemas/ispyb/updates/2024_09_04_ProcessedTomogram_comment.sql b/schemas/ispyb/updates/2024_09_04_ProcessedTomogram_comment.sql index 85a85103..da56faa4 100644 --- a/schemas/ispyb/updates/2024_09_04_ProcessedTomogram_comment.sql +++ b/schemas/ispyb/updates/2024_09_04_ProcessedTomogram_comment.sql @@ -1,4 +1,4 @@ -INSERT IGNORE INTO SchemaStatus (scriptName, schemaStatus) VALUES ('2024_09_04_ProcessedTomogram_comment', 'ONGOING'); +INSERT IGNORE INTO SchemaStatus (scriptName, schemaStatus) VALUES ('2024_09_04_ProcessedTomogram_comment.sql', 'ONGOING'); ALTER TABLE ProcessedTomogram COMMENT = 'Indicates the sample''s location on a multi-sample pin, where 1 is closest to the pin base or a sample''s position in a cryo-EM cassette'; diff --git a/schemas/ispyb/updates/2024_09_17_SpaceGroup_trim.sql b/schemas/ispyb/updates/2024_09_17_SpaceGroup_trim.sql index accbe502..d8d7cb61 100644 --- a/schemas/ispyb/updates/2024_09_17_SpaceGroup_trim.sql +++ b/schemas/ispyb/updates/2024_09_17_SpaceGroup_trim.sql @@ -1,4 +1,4 @@ -INSERT IGNORE INTO SchemaStatus (scriptName, schemaStatus) VALUES ('2024_09_17_SpaceGroup_trim', 'ONGOING'); +INSERT IGNORE INTO SchemaStatus (scriptName, schemaStatus) VALUES ('2024_09_17_SpaceGroup_trim.sql', 'ONGOING'); UPDATE SpaceGroup SET spaceGroupShortName=trim(trailing '1' FROM spaceGroupShortName) WHERE spaceGroupId in (51,52,53,54,55,56,57,58,59,60,61,62,63,64,73,74,127,128,129,130,205,206,223,224,227,228,230); From 763a591324acdaaa0874155c9c6010ae761c0b0d Mon Sep 17 00:00:00 2001 From: KarlLevik Date: Thu, 12 Dec 2024 10:19:02 +0000 Subject: [PATCH 13/14] Fix wrong scriptName values in schema lookups.sql file --- schemas/ispyb/lookups.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/schemas/ispyb/lookups.sql b/schemas/ispyb/lookups.sql index 3f7d45ad..2abf64aa 100644 --- a/schemas/ispyb/lookups.sql +++ b/schemas/ispyb/lookups.sql @@ -265,8 +265,8 @@ INSERT INTO `SchemaStatus` (`schemaStatusId`, `scriptName`, `schemaStatus`, `rec (293,'2024_08_08_ProcessedTomogram.sql','DONE','2024-08-14 11:23:41'), (294,'2024_08_14_AdminVar_bump_version.sql','DONE','2024-08-14 11:23:41'), (295,'2024_08_19_AdminVar_bump_version.sql','DONE','2024-08-19 12:17:10'), -(296,'2024_09_04_ProcessedTomogram_comment','ONGOING','2024-12-05 13:27:18'), -(297,'2024_09_17_SpaceGroup_trim','ONGOING','2024-12-05 13:27:18'), +(296,'2024_09_04_ProcessedTomogram_comment.sql','DONE','2024-12-05 13:27:18'), +(297,'2024_09_17_SpaceGroup_trim.sql','DONE','2024-12-05 13:27:18'), (298,'2024_09_25_AutoProcProgram_processingPipelineId.sql','DONE','2024-12-05 13:27:18'), (299,'2024_10_15_BLSample_unique_index.sql','DONE','2024-12-05 13:27:18'), (300,'2024_12_04_AutoProcProgramAttachment_deleted.sql','DONE','2024-12-05 13:27:18'), From 27bef6a113e8ffd1e82abd53346db1b3d7424fcb Mon Sep 17 00:00:00 2001 From: KarlLevik <1378676+KarlLevik@users.noreply.github.com> Date: Thu, 12 Dec 2024 10:20:00 +0000 Subject: [PATCH 14/14] Update database sql files --- schemas/ispyb/data.sql | 643 +++-------------------------- schemas/ispyb/lookups.sql | 816 ++----------------------------------- schemas/ispyb/routines.sql | 8 +- schemas/ispyb/tables.sql | 392 +++++++++--------- 4 files changed, 271 insertions(+), 1588 deletions(-) diff --git a/schemas/ispyb/data.sql b/schemas/ispyb/data.sql index 5e2a6f32..7d54cb76 100644 --- a/schemas/ispyb/data.sql +++ b/schemas/ispyb/data.sql @@ -20,146 +20,34 @@ /*!40000 ALTER TABLE `Atlas` ENABLE KEYS */; /*!40000 ALTER TABLE `AutoProc` DISABLE KEYS */; -INSERT INTO `AutoProc` (`autoProcId`, `autoProcProgramId`, `spaceGroup`, `refinedCell_a`, `refinedCell_b`, `refinedCell_c`, `refinedCell_alpha`, `refinedCell_beta`, `refinedCell_gamma`, `recordTimeStamp`) VALUES (596406,56425592,'P 6 2 2',92.5546,92.5546,129.784,90,90,120,'2016-01-14 12:46:22'), -(596411,56425944,'P 63 2 2',92.53,92.53,129.75,90,90,120,'2016-01-14 13:09:51'), -(596418,56425952,'P 61 2 2',92.6461,92.6461,129.879,90,90,120,'2016-01-14 13:24:22'), -(596419,56425963,'P 63 2 2',92.511,92.511,129.722,90,90,120,'2016-01-14 13:34:34'), -(596420,56426286,'P 61 2 2',92.693,92.693,129.839,90,90,120,'2016-01-14 14:01:57'), -(596421,56426287,'P 63 2 2',92.64,92.64,129.77,90,90,120,'2016-01-14 14:13:57'), -(603708,56983954,'I 2 3',78.1548,78.1548,78.1548,90,90,90,'2016-01-22 11:34:03'), -(603731,56985584,'I 2 3',78.15,78.15,78.15,90,90,90,'2016-01-22 11:52:36'), -(603732,56985589,'I 2 3',78.157,78.157,78.157,90,90,90,'2016-01-22 11:53:38'), -(603735,56985592,'I 2 3',78.15,78.15,78.15,90,90,90,'2016-01-22 11:54:01'), -(603744,56986673,'I 2 3',78.1381,78.1381,78.1381,90,90,90,'2016-01-22 12:01:59'); +INSERT INTO `AutoProc` (`autoProcId`, `autoProcProgramId`, `spaceGroup`, `refinedCell_a`, `refinedCell_b`, `refinedCell_c`, `refinedCell_alpha`, `refinedCell_beta`, `refinedCell_gamma`, `recordTimeStamp`) VALUES (596406,56425592,'P 6 2 2',92.5546,92.5546,129.784,90,90,120,'2016-01-14 12:46:22'),(596411,56425944,'P 63 2 2',92.53,92.53,129.75,90,90,120,'2016-01-14 13:09:51'),(596418,56425952,'P 61 2 2',92.6461,92.6461,129.879,90,90,120,'2016-01-14 13:24:22'),(596419,56425963,'P 63 2 2',92.511,92.511,129.722,90,90,120,'2016-01-14 13:34:34'),(596420,56426286,'P 61 2 2',92.693,92.693,129.839,90,90,120,'2016-01-14 14:01:57'),(596421,56426287,'P 63 2 2',92.64,92.64,129.77,90,90,120,'2016-01-14 14:13:57'),(603708,56983954,'I 2 3',78.1548,78.1548,78.1548,90,90,90,'2016-01-22 11:34:03'),(603731,56985584,'I 2 3',78.15,78.15,78.15,90,90,90,'2016-01-22 11:52:36'),(603732,56985589,'I 2 3',78.157,78.157,78.157,90,90,90,'2016-01-22 11:53:38'),(603735,56985592,'I 2 3',78.15,78.15,78.15,90,90,90,'2016-01-22 11:54:01'),(603744,56986673,'I 2 3',78.1381,78.1381,78.1381,90,90,90,'2016-01-22 12:01:59'); /*!40000 ALTER TABLE `AutoProc` ENABLE KEYS */; /*!40000 ALTER TABLE `AutoProcIntegration` DISABLE KEYS */; -INSERT INTO `AutoProcIntegration` (`autoProcIntegrationId`, `dataCollectionId`, `autoProcProgramId`, `startImageNumber`, `endImageNumber`, `refinedDetectorDistance`, `refinedXBeam`, `refinedYBeam`, `rotationAxisX`, `rotationAxisY`, `rotationAxisZ`, `beamVectorX`, `beamVectorY`, `beamVectorZ`, `cell_a`, `cell_b`, `cell_c`, `cell_alpha`, `cell_beta`, `cell_gamma`, `recordTimeStamp`, `anomalous`) VALUES (592508,993677,56425592,NULL,NULL,NULL,209.131,215.722,NULL,NULL,NULL,NULL,NULL,NULL,92.5546,92.5546,129.784,90,90,120,'2016-01-14 12:46:22',0), -(592513,993677,56425944,1,3600,193.939,209.052,215.618,NULL,NULL,NULL,NULL,NULL,NULL,92.532,92.532,129.747,90,90,120,'2016-01-14 13:09:51',0), -(592520,993677,56425952,1,3600,194.077,209.062,215.62,NULL,NULL,NULL,NULL,NULL,NULL,92.6461,92.6461,129.879,90,90,120,'2016-01-14 13:24:22',0), -(592521,993677,56425963,1,3600,193.893,209.135,215.719,NULL,NULL,NULL,NULL,NULL,NULL,92.5114,92.5114,129.722,90,90,120,'2016-01-14 13:34:35',0), -(592522,993677,56426286,1,3600,194.077,209.062,215.62,NULL,NULL,NULL,NULL,NULL,NULL,92.6461,92.6461,129.879,90,90,120,'2016-01-14 14:01:57',0), -(592523,993677,56426286,1,1800,194.147,209.069,215.622,NULL,NULL,NULL,NULL,NULL,NULL,92.7867,92.7867,129.759,90,90,120,'2016-01-14 14:01:57',0), -(592524,993677,56426287,1,3600,193.939,209.052,215.618,NULL,NULL,NULL,NULL,NULL,NULL,92.531,92.531,129.745,90,90,120,'2016-01-14 14:13:57',0), -(592525,993677,56426287,1,1800,194.388,209.058,215.61,NULL,NULL,NULL,NULL,NULL,NULL,92.847,92.847,129.817,90,90,120,'2016-01-14 14:13:57',0), -(600339,1002287,56983954,NULL,NULL,NULL,209.264,215.741,NULL,NULL,NULL,NULL,NULL,NULL,78.1548,78.1548,78.1548,90,90,90,'2016-01-22 11:34:03',0), -(600362,1002287,56985584,1,7200,175.977,209.186,215.643,NULL,NULL,NULL,NULL,NULL,NULL,78.153,78.153,78.153,90,90,90,'2016-01-22 11:52:36',0), -(600363,1002287,56985589,1,7200,176.262,209.264,215.741,NULL,NULL,NULL,NULL,NULL,NULL,78.1569,78.1569,78.1569,90,90,90,'2016-01-22 11:53:38',0), -(600366,1002287,56985592,1,7200,176.239,209.177,215.651,NULL,NULL,NULL,NULL,NULL,NULL,78.153,78.153,78.153,90,90,90,'2016-01-22 11:54:01',0), -(600376,1002287,56986673,1,7200,176.219,209.178,215.653,NULL,NULL,NULL,NULL,NULL,NULL,78.1381,78.1381,78.1381,90,90,90,'2016-01-22 12:01:59',0); +INSERT INTO `AutoProcIntegration` (`autoProcIntegrationId`, `dataCollectionId`, `autoProcProgramId`, `startImageNumber`, `endImageNumber`, `refinedDetectorDistance`, `refinedXBeam`, `refinedYBeam`, `rotationAxisX`, `rotationAxisY`, `rotationAxisZ`, `beamVectorX`, `beamVectorY`, `beamVectorZ`, `cell_a`, `cell_b`, `cell_c`, `cell_alpha`, `cell_beta`, `cell_gamma`, `recordTimeStamp`, `anomalous`) VALUES (592508,993677,56425592,NULL,NULL,NULL,209.131,215.722,NULL,NULL,NULL,NULL,NULL,NULL,92.5546,92.5546,129.784,90,90,120,'2016-01-14 12:46:22',0),(592513,993677,56425944,1,3600,193.939,209.052,215.618,NULL,NULL,NULL,NULL,NULL,NULL,92.532,92.532,129.747,90,90,120,'2016-01-14 13:09:51',0),(592520,993677,56425952,1,3600,194.077,209.062,215.62,NULL,NULL,NULL,NULL,NULL,NULL,92.6461,92.6461,129.879,90,90,120,'2016-01-14 13:24:22',0),(592521,993677,56425963,1,3600,193.893,209.135,215.719,NULL,NULL,NULL,NULL,NULL,NULL,92.5114,92.5114,129.722,90,90,120,'2016-01-14 13:34:35',0),(592522,993677,56426286,1,3600,194.077,209.062,215.62,NULL,NULL,NULL,NULL,NULL,NULL,92.6461,92.6461,129.879,90,90,120,'2016-01-14 14:01:57',0),(592523,993677,56426286,1,1800,194.147,209.069,215.622,NULL,NULL,NULL,NULL,NULL,NULL,92.7867,92.7867,129.759,90,90,120,'2016-01-14 14:01:57',0),(592524,993677,56426287,1,3600,193.939,209.052,215.618,NULL,NULL,NULL,NULL,NULL,NULL,92.531,92.531,129.745,90,90,120,'2016-01-14 14:13:57',0),(592525,993677,56426287,1,1800,194.388,209.058,215.61,NULL,NULL,NULL,NULL,NULL,NULL,92.847,92.847,129.817,90,90,120,'2016-01-14 14:13:57',0),(600339,1002287,56983954,NULL,NULL,NULL,209.264,215.741,NULL,NULL,NULL,NULL,NULL,NULL,78.1548,78.1548,78.1548,90,90,90,'2016-01-22 11:34:03',0),(600362,1002287,56985584,1,7200,175.977,209.186,215.643,NULL,NULL,NULL,NULL,NULL,NULL,78.153,78.153,78.153,90,90,90,'2016-01-22 11:52:36',0),(600363,1002287,56985589,1,7200,176.262,209.264,215.741,NULL,NULL,NULL,NULL,NULL,NULL,78.1569,78.1569,78.1569,90,90,90,'2016-01-22 11:53:38',0),(600366,1002287,56985592,1,7200,176.239,209.177,215.651,NULL,NULL,NULL,NULL,NULL,NULL,78.153,78.153,78.153,90,90,90,'2016-01-22 11:54:01',0),(600376,1002287,56986673,1,7200,176.219,209.178,215.653,NULL,NULL,NULL,NULL,NULL,NULL,78.1381,78.1381,78.1381,90,90,90,'2016-01-22 12:01:59',0); /*!40000 ALTER TABLE `AutoProcIntegration` ENABLE KEYS */; /*!40000 ALTER TABLE `AutoProcProgram` DISABLE KEYS */; -INSERT INTO `AutoProcProgram` (`autoProcProgramId`, `processingCommandLine`, `processingPrograms`, `processingStatus`, `processingMessage`, `processingStartTime`, `processingEndTime`, `processingEnvironment`, `recordTimeStamp`, `processingJobId`, `processingPipelineId`) VALUES (56425592,'/dls_sw/apps/fast_dp/2395/src/fast_dp.py -a S -j 0 -J 18 /dls/i03/data/2016/cm14451-1/20160114/tlys_jan_4/tlys_jan_4_1_0001.cbf','fast_dp',1,NULL,NULL,NULL,NULL,'2016-01-14 12:46:22',NULL,NULL), -(56425944,'xia2 min_images=3 -3dii -xparallel -1 -atom s -blend -project cm14451v1 -crystal xtlysjan41 -ispyb_xml_out ispyb.xml image=/dls/i03/data/2016/cm14451-1/20160114/tlys_jan_4/tlys_jan_4_1_0001.cbf','xia2 3dii',1,NULL,NULL,NULL,NULL,'2016-01-14 13:09:51',NULL,NULL), -(56425952,'xia2 min_images=3 -dials -xparallel -1 -atom s -blend -project cm14451v1 -crystal xtlysjan41 -ispyb_xml_out ispyb.xml image=/dls/i03/data/2016/cm14451-1/20160114/tlys_jan_4/tlys_jan_4_1_0001.cbf','xia2 dials',1,NULL,NULL,NULL,NULL,'2016-01-14 13:24:22',NULL,NULL), -(56425963,'/dls_sw/apps/GPhL/autoPROC/20151214/autoPROC/bin/linux64/process -xml -Id xtlysjan41,/dls/i03/data/2016/cm14451-1/20160114/tlys_jan_4/,tlys_jan_4_1_####.cbf,1,3600 autoPROC_XdsKeyword_MAXIMUM_NUMBER_OF_PROCESSORS=12 autoPROC_XdsKeyword_MAXIMUM_NUMBER_OF_J','autoPROC 1.0.4 (see: http://www.globalphasing.com/autoproc/)',1,NULL,NULL,NULL,NULL,'2016-01-14 13:34:34',NULL,NULL), -(56426286,'xia2 min_images=3 -dials -atom s -blend -ispyb_xml_out ispyb.xml image=/dls/i03/data/2016/cm14451-1/20160114/tlys_jan_4/linediffraction_1_0001.cbf image=/dls/i03/data/2016/cm14451-1/20160114/tlys_jan_4/tlys_jan_4_1_0001.cbf','xia2 dials',1,NULL,NULL,NULL,NULL,'2016-01-14 14:01:57',NULL,NULL), -(56426287,'xia2 min_images=3 -3dii -atom s -blend -ispyb_xml_out ispyb.xml image=/dls/i03/data/2016/cm14451-1/20160114/tlys_jan_4/linediffraction_1_0001.cbf image=/dls/i03/data/2016/cm14451-1/20160114/tlys_jan_4/tlys_jan_4_1_0001.cbf','xia2 3dii',1,NULL,NULL,NULL,NULL,'2016-01-14 14:13:57',NULL,NULL), -(56983954,'/dls_sw/apps/fast_dp/2395/src/fast_dp.py -a S -j 0 -J 18 /dls/i03/data/2016/cm14451-1/20160122/gw/ins2/001/ins2_2_0001.cbf','fast_dp',1,NULL,NULL,NULL,NULL,'2016-01-22 11:34:03',NULL,NULL), -(56985584,'xia2 min_images=3 -3d -xparallel -1 -atom s -blend -project cm14451v1 -crystal xins22 -ispyb_xml_out ispyb.xml image=/dls/i03/data/2016/cm14451-1/20160122/gw/ins2/001/ins2_2_0001.cbf','xia2 3d',1,NULL,NULL,NULL,NULL,'2016-01-22 11:52:36',NULL,NULL), -(56985589,'/dls_sw/apps/GPhL/autoPROC/20151214/autoPROC/bin/linux64/process -xml -Id xins22,/dls/i03/data/2016/cm14451-1/20160122/gw/ins2/001/,ins2_2_####.cbf,1,7200 autoPROC_XdsKeyword_MAXIMUM_NUMBER_OF_PROCESSORS=12 autoPROC_XdsKeyword_MAXIMUM_NUMBER_OF_JOBS=4 Sto','autoPROC 1.0.4 (see: http://www.globalphasing.com/autoproc/)',1,NULL,NULL,NULL,NULL,'2016-01-22 11:53:38',NULL,NULL), -(56985592,'xia2 min_images=3 -3dii -xparallel -1 -atom s -blend -project cm14451v1 -crystal xins22 -ispyb_xml_out ispyb.xml image=/dls/i03/data/2016/cm14451-1/20160122/gw/ins2/001/ins2_2_0001.cbf','xia2 3dii',1,NULL,NULL,NULL,NULL,'2016-01-22 11:54:01',NULL,NULL), -(56986673,'xia2 min_images=3 -dials -xparallel -1 -atom s -blend -project cm14451v1 -crystal xins22 -ispyb_xml_out ispyb.xml image=/dls/i03/data/2016/cm14451-1/20160122/gw/ins2/001/ins2_2_0001.cbf','xia2 dials',1,NULL,NULL,NULL,NULL,'2016-01-22 12:01:59',5,NULL), -(56986674,'/dls_sw/apps/dimple/git-master/main.py --dls-naming --slow -fpng /dls/i24/data/2018/cm19649-3/processed/test180731/hewlmesh_1/line4/hewlmesh_1_1_/xia2/3d-run/DataFiles/cm19649v3_xhewlmesh11_free.mtz /dls/i24/data/2018/cm19649-3/tmp/hewlmesh_1.4308.pdb /d','dimple',1,'Blob scores: 78','2018-07-31 08:55:52','2018-07-31 08:57:10',NULL,'2018-07-31 08:57:10',NULL,NULL), -(56986675,NULL,'dimple',0,'Unknown error','2018-07-31 08:57:12',NULL,NULL,NULL,NULL,NULL); +INSERT INTO `AutoProcProgram` (`autoProcProgramId`, `processingCommandLine`, `processingPrograms`, `processingStatus`, `processingMessage`, `processingStartTime`, `processingEndTime`, `processingEnvironment`, `recordTimeStamp`, `processingJobId`, `processingPipelineId`) VALUES (56425592,'/dls_sw/apps/fast_dp/2395/src/fast_dp.py -a S -j 0 -J 18 /dls/i03/data/2016/cm14451-1/20160114/tlys_jan_4/tlys_jan_4_1_0001.cbf','fast_dp',1,NULL,NULL,NULL,NULL,'2016-01-14 12:46:22',NULL,NULL),(56425944,'xia2 min_images=3 -3dii -xparallel -1 -atom s -blend -project cm14451v1 -crystal xtlysjan41 -ispyb_xml_out ispyb.xml image=/dls/i03/data/2016/cm14451-1/20160114/tlys_jan_4/tlys_jan_4_1_0001.cbf','xia2 3dii',1,NULL,NULL,NULL,NULL,'2016-01-14 13:09:51',NULL,NULL),(56425952,'xia2 min_images=3 -dials -xparallel -1 -atom s -blend -project cm14451v1 -crystal xtlysjan41 -ispyb_xml_out ispyb.xml image=/dls/i03/data/2016/cm14451-1/20160114/tlys_jan_4/tlys_jan_4_1_0001.cbf','xia2 dials',1,NULL,NULL,NULL,NULL,'2016-01-14 13:24:22',NULL,NULL),(56425963,'/dls_sw/apps/GPhL/autoPROC/20151214/autoPROC/bin/linux64/process -xml -Id xtlysjan41,/dls/i03/data/2016/cm14451-1/20160114/tlys_jan_4/,tlys_jan_4_1_####.cbf,1,3600 autoPROC_XdsKeyword_MAXIMUM_NUMBER_OF_PROCESSORS=12 autoPROC_XdsKeyword_MAXIMUM_NUMBER_OF_J','autoPROC 1.0.4 (see: http://www.globalphasing.com/autoproc/)',1,NULL,NULL,NULL,NULL,'2016-01-14 13:34:34',NULL,NULL),(56426286,'xia2 min_images=3 -dials -atom s -blend -ispyb_xml_out ispyb.xml image=/dls/i03/data/2016/cm14451-1/20160114/tlys_jan_4/linediffraction_1_0001.cbf image=/dls/i03/data/2016/cm14451-1/20160114/tlys_jan_4/tlys_jan_4_1_0001.cbf','xia2 dials',1,NULL,NULL,NULL,NULL,'2016-01-14 14:01:57',NULL,NULL),(56426287,'xia2 min_images=3 -3dii -atom s -blend -ispyb_xml_out ispyb.xml image=/dls/i03/data/2016/cm14451-1/20160114/tlys_jan_4/linediffraction_1_0001.cbf image=/dls/i03/data/2016/cm14451-1/20160114/tlys_jan_4/tlys_jan_4_1_0001.cbf','xia2 3dii',1,NULL,NULL,NULL,NULL,'2016-01-14 14:13:57',NULL,NULL),(56983954,'/dls_sw/apps/fast_dp/2395/src/fast_dp.py -a S -j 0 -J 18 /dls/i03/data/2016/cm14451-1/20160122/gw/ins2/001/ins2_2_0001.cbf','fast_dp',1,NULL,NULL,NULL,NULL,'2016-01-22 11:34:03',NULL,NULL),(56985584,'xia2 min_images=3 -3d -xparallel -1 -atom s -blend -project cm14451v1 -crystal xins22 -ispyb_xml_out ispyb.xml image=/dls/i03/data/2016/cm14451-1/20160122/gw/ins2/001/ins2_2_0001.cbf','xia2 3d',1,NULL,NULL,NULL,NULL,'2016-01-22 11:52:36',NULL,NULL),(56985589,'/dls_sw/apps/GPhL/autoPROC/20151214/autoPROC/bin/linux64/process -xml -Id xins22,/dls/i03/data/2016/cm14451-1/20160122/gw/ins2/001/,ins2_2_####.cbf,1,7200 autoPROC_XdsKeyword_MAXIMUM_NUMBER_OF_PROCESSORS=12 autoPROC_XdsKeyword_MAXIMUM_NUMBER_OF_JOBS=4 Sto','autoPROC 1.0.4 (see: http://www.globalphasing.com/autoproc/)',1,NULL,NULL,NULL,NULL,'2016-01-22 11:53:38',NULL,NULL),(56985592,'xia2 min_images=3 -3dii -xparallel -1 -atom s -blend -project cm14451v1 -crystal xins22 -ispyb_xml_out ispyb.xml image=/dls/i03/data/2016/cm14451-1/20160122/gw/ins2/001/ins2_2_0001.cbf','xia2 3dii',1,NULL,NULL,NULL,NULL,'2016-01-22 11:54:01',NULL,NULL),(56986673,'xia2 min_images=3 -dials -xparallel -1 -atom s -blend -project cm14451v1 -crystal xins22 -ispyb_xml_out ispyb.xml image=/dls/i03/data/2016/cm14451-1/20160122/gw/ins2/001/ins2_2_0001.cbf','xia2 dials',1,NULL,NULL,NULL,NULL,'2016-01-22 12:01:59',5,NULL),(56986674,'/dls_sw/apps/dimple/git-master/main.py --dls-naming --slow -fpng /dls/i24/data/2018/cm19649-3/processed/test180731/hewlmesh_1/line4/hewlmesh_1_1_/xia2/3d-run/DataFiles/cm19649v3_xhewlmesh11_free.mtz /dls/i24/data/2018/cm19649-3/tmp/hewlmesh_1.4308.pdb /d','dimple',1,'Blob scores: 78','2018-07-31 08:55:52','2018-07-31 08:57:10',NULL,'2018-07-31 08:57:10',NULL,NULL),(56986675,NULL,'dimple',0,'Unknown error','2018-07-31 08:57:12',NULL,NULL,NULL,NULL,NULL); /*!40000 ALTER TABLE `AutoProcProgram` ENABLE KEYS */; /*!40000 ALTER TABLE `AutoProcProgramAttachment` DISABLE KEYS */; -INSERT INTO `AutoProcProgramAttachment` (`autoProcProgramAttachmentId`, `autoProcProgramId`, `fileType`, `fileName`, `filePath`, `recordTimeStamp`, `importanceRank`, `deleted`) VALUES (1023947,56425592,'Log','fast_dp.log','/dls/i03/data/2016/cm14451-1/processed/20160114/tlys_jan_4/tlys_jan_4_1_/fast_dp','2016-01-14 12:46:22',NULL,0), -(1023955,56425944,'Result','cm14451v1_xtlysjan41_free.mtz','/dls/i03/data/2016/cm14451-1/processed/20160114/tlys_jan_4/tlys_jan_4_1_/xia2/3dii-run/DataFiles','2016-01-14 13:09:51',NULL,0), -(1023956,56425944,'Log','xia2.html','/dls/i03/data/2016/cm14451-1/processed/20160114/tlys_jan_4/tlys_jan_4_1_/xia2/3dii-run','2016-01-14 13:09:51',NULL,0), -(1023969,56425952,'Result','cm14451v1_xtlysjan41_free.mtz','/dls/i03/data/2016/cm14451-1/processed/20160114/tlys_jan_4/tlys_jan_4_1_/xia2/dials-run/DataFiles','2016-01-14 13:24:22',NULL,0), -(1023970,56425952,'Log','xia2.html','/dls/i03/data/2016/cm14451-1/processed/20160114/tlys_jan_4/tlys_jan_4_1_/xia2/dials-run','2016-01-14 13:24:22',NULL,0), -(1023971,56425963,'Log','autoPROC.log','/dls/i03/data/2016/cm14451-1/processed/20160114/tlys_jan_4/tlys_jan_4_1_/autoPROC/ap-run','2016-01-14 13:34:34',NULL,0), -(1023972,56425963,'Result','truncate-unique.mtz','/dls/i03/data/2016/cm14451-1/processed/20160114/tlys_jan_4/tlys_jan_4_1_/autoPROC/ap-run','2016-01-14 13:34:34',NULL,0), -(1023973,56426286,'Result','AUTOMATIC_DEFAULT_free.mtz','/dls/i03/data/2016/cm14451-1/processed/20160114/tlys_jan_4/linediffraction_1_/multi-xia2/dials/DataFiles','2016-01-14 14:01:57',NULL,0), -(1023974,56426286,'Log','xia2.html','/dls/i03/data/2016/cm14451-1/processed/20160114/tlys_jan_4/linediffraction_1_/multi-xia2/dials','2016-01-14 14:01:57',NULL,0), -(1023975,56426287,'Result','AUTOMATIC_DEFAULT_free.mtz','/dls/i03/data/2016/cm14451-1/processed/20160114/tlys_jan_4/linediffraction_1_/multi-xia2/3dii/DataFiles','2016-01-14 14:13:57',NULL,0), -(1023976,56426287,'Log','xia2.html','/dls/i03/data/2016/cm14451-1/processed/20160114/tlys_jan_4/linediffraction_1_/multi-xia2/3dii','2016-01-14 14:13:57',NULL,0), -(1037121,56983954,'Log','fast_dp.log','/dls/i03/data/2016/cm14451-1/processed/20160122/gw/ins2/001/ins2_2_/fast_dp','2016-01-22 11:34:03',NULL,0), -(1037160,56985584,'Result','cm14451v1_xins22_free.mtz','/dls/i03/data/2016/cm14451-1/processed/20160122/gw/ins2/001/ins2_2_/xia2/3d-run/DataFiles','2016-01-22 11:52:36',NULL,0), -(1037161,56985584,'Log','xia2.html','/dls/i03/data/2016/cm14451-1/processed/20160122/gw/ins2/001/ins2_2_/xia2/3d-run','2016-01-22 11:52:36',NULL,0), -(1037162,56985589,'Log','autoPROC.log','/dls/i03/data/2016/cm14451-1/processed/20160122/gw/ins2/001/ins2_2_/autoPROC/ap-run','2016-01-22 11:53:38',NULL,0), -(1037163,56985589,'Result','truncate-unique.mtz','/dls/i03/data/2016/cm14451-1/processed/20160122/gw/ins2/001/ins2_2_/autoPROC/ap-run','2016-01-22 11:53:38',NULL,0), -(1037168,56985592,'Result','cm14451v1_xins22_free.mtz','/dls/i03/data/2016/cm14451-1/processed/20160122/gw/ins2/001/ins2_2_/xia2/3dii-run/DataFiles','2016-01-22 11:54:01',NULL,0), -(1037169,56985592,'Log','xia2.html','/dls/i03/data/2016/cm14451-1/processed/20160122/gw/ins2/001/ins2_2_/xia2/3dii-run','2016-01-22 11:54:01',NULL,0), -(1037183,56986673,'Result','cm14451v1_xins22_free.mtz','/dls/i03/data/2016/cm14451-1/processed/20160122/gw/ins2/001/ins2_2_/xia2/dials-run/DataFiles','2016-01-22 12:01:59',NULL,0), -(1037184,56986673,'Log','xia2.html','/dls/i03/data/2016/cm14451-1/processed/20160122/gw/ins2/001/ins2_2_/xia2/dials-run','2016-01-22 12:01:59',NULL,0), -(1037185,56986674,'Input','--slow','/dls/i24/data/2018/cm19649-3/processed/test180731/hewlmesh_1/line4/hewlmesh_1_1_/xia2/3d-run/dimple','2018-07-31 08:57:10',NULL,0), -(1037186,56986674,'Input','--dls-naming','/dls/i24/data/2018/cm19649-3/processed/test180731/hewlmesh_1/line4/hewlmesh_1_1_/xia2/3d-run/dimple','2018-07-31 08:57:10',NULL,0), -(1037187,56986674,'Result','final.pdb','/dls/i24/data/2018/cm19649-3/processed/test180731/hewlmesh_1/line4/hewlmesh_1_1_/xia2/3d-run/dimple','2018-07-31 08:57:10',NULL,0), -(1037188,56986674,'Result','final.mtz','/dls/i24/data/2018/cm19649-3/processed/test180731/hewlmesh_1/line4/hewlmesh_1_1_/xia2/3d-run/dimple','2018-07-31 08:57:10',NULL,0), -(1037189,56986674,'Log','dimple.log','/dls/i24/data/2018/cm19649-3/processed/test180731/hewlmesh_1/line4/hewlmesh_1_1_/xia2/3d-run/dimple','2018-07-31 08:57:10',0,0); +INSERT INTO `AutoProcProgramAttachment` (`autoProcProgramAttachmentId`, `autoProcProgramId`, `fileType`, `fileName`, `filePath`, `recordTimeStamp`, `importanceRank`, `deleted`) VALUES (1023947,56425592,'Log','fast_dp.log','/dls/i03/data/2016/cm14451-1/processed/20160114/tlys_jan_4/tlys_jan_4_1_/fast_dp','2016-01-14 12:46:22',NULL,0),(1023955,56425944,'Result','cm14451v1_xtlysjan41_free.mtz','/dls/i03/data/2016/cm14451-1/processed/20160114/tlys_jan_4/tlys_jan_4_1_/xia2/3dii-run/DataFiles','2016-01-14 13:09:51',NULL,0),(1023956,56425944,'Log','xia2.html','/dls/i03/data/2016/cm14451-1/processed/20160114/tlys_jan_4/tlys_jan_4_1_/xia2/3dii-run','2016-01-14 13:09:51',NULL,0),(1023969,56425952,'Result','cm14451v1_xtlysjan41_free.mtz','/dls/i03/data/2016/cm14451-1/processed/20160114/tlys_jan_4/tlys_jan_4_1_/xia2/dials-run/DataFiles','2016-01-14 13:24:22',NULL,0),(1023970,56425952,'Log','xia2.html','/dls/i03/data/2016/cm14451-1/processed/20160114/tlys_jan_4/tlys_jan_4_1_/xia2/dials-run','2016-01-14 13:24:22',NULL,0),(1023971,56425963,'Log','autoPROC.log','/dls/i03/data/2016/cm14451-1/processed/20160114/tlys_jan_4/tlys_jan_4_1_/autoPROC/ap-run','2016-01-14 13:34:34',NULL,0),(1023972,56425963,'Result','truncate-unique.mtz','/dls/i03/data/2016/cm14451-1/processed/20160114/tlys_jan_4/tlys_jan_4_1_/autoPROC/ap-run','2016-01-14 13:34:34',NULL,0),(1023973,56426286,'Result','AUTOMATIC_DEFAULT_free.mtz','/dls/i03/data/2016/cm14451-1/processed/20160114/tlys_jan_4/linediffraction_1_/multi-xia2/dials/DataFiles','2016-01-14 14:01:57',NULL,0),(1023974,56426286,'Log','xia2.html','/dls/i03/data/2016/cm14451-1/processed/20160114/tlys_jan_4/linediffraction_1_/multi-xia2/dials','2016-01-14 14:01:57',NULL,0),(1023975,56426287,'Result','AUTOMATIC_DEFAULT_free.mtz','/dls/i03/data/2016/cm14451-1/processed/20160114/tlys_jan_4/linediffraction_1_/multi-xia2/3dii/DataFiles','2016-01-14 14:13:57',NULL,0),(1023976,56426287,'Log','xia2.html','/dls/i03/data/2016/cm14451-1/processed/20160114/tlys_jan_4/linediffraction_1_/multi-xia2/3dii','2016-01-14 14:13:57',NULL,0),(1037121,56983954,'Log','fast_dp.log','/dls/i03/data/2016/cm14451-1/processed/20160122/gw/ins2/001/ins2_2_/fast_dp','2016-01-22 11:34:03',NULL,0),(1037160,56985584,'Result','cm14451v1_xins22_free.mtz','/dls/i03/data/2016/cm14451-1/processed/20160122/gw/ins2/001/ins2_2_/xia2/3d-run/DataFiles','2016-01-22 11:52:36',NULL,0),(1037161,56985584,'Log','xia2.html','/dls/i03/data/2016/cm14451-1/processed/20160122/gw/ins2/001/ins2_2_/xia2/3d-run','2016-01-22 11:52:36',NULL,0),(1037162,56985589,'Log','autoPROC.log','/dls/i03/data/2016/cm14451-1/processed/20160122/gw/ins2/001/ins2_2_/autoPROC/ap-run','2016-01-22 11:53:38',NULL,0),(1037163,56985589,'Result','truncate-unique.mtz','/dls/i03/data/2016/cm14451-1/processed/20160122/gw/ins2/001/ins2_2_/autoPROC/ap-run','2016-01-22 11:53:38',NULL,0),(1037168,56985592,'Result','cm14451v1_xins22_free.mtz','/dls/i03/data/2016/cm14451-1/processed/20160122/gw/ins2/001/ins2_2_/xia2/3dii-run/DataFiles','2016-01-22 11:54:01',NULL,0),(1037169,56985592,'Log','xia2.html','/dls/i03/data/2016/cm14451-1/processed/20160122/gw/ins2/001/ins2_2_/xia2/3dii-run','2016-01-22 11:54:01',NULL,0),(1037183,56986673,'Result','cm14451v1_xins22_free.mtz','/dls/i03/data/2016/cm14451-1/processed/20160122/gw/ins2/001/ins2_2_/xia2/dials-run/DataFiles','2016-01-22 12:01:59',NULL,0),(1037184,56986673,'Log','xia2.html','/dls/i03/data/2016/cm14451-1/processed/20160122/gw/ins2/001/ins2_2_/xia2/dials-run','2016-01-22 12:01:59',NULL,0),(1037185,56986674,'Input','--slow','/dls/i24/data/2018/cm19649-3/processed/test180731/hewlmesh_1/line4/hewlmesh_1_1_/xia2/3d-run/dimple','2018-07-31 08:57:10',NULL,0),(1037186,56986674,'Input','--dls-naming','/dls/i24/data/2018/cm19649-3/processed/test180731/hewlmesh_1/line4/hewlmesh_1_1_/xia2/3d-run/dimple','2018-07-31 08:57:10',NULL,0),(1037187,56986674,'Result','final.pdb','/dls/i24/data/2018/cm19649-3/processed/test180731/hewlmesh_1/line4/hewlmesh_1_1_/xia2/3d-run/dimple','2018-07-31 08:57:10',NULL,0),(1037188,56986674,'Result','final.mtz','/dls/i24/data/2018/cm19649-3/processed/test180731/hewlmesh_1/line4/hewlmesh_1_1_/xia2/3d-run/dimple','2018-07-31 08:57:10',NULL,0),(1037189,56986674,'Log','dimple.log','/dls/i24/data/2018/cm19649-3/processed/test180731/hewlmesh_1/line4/hewlmesh_1_1_/xia2/3d-run/dimple','2018-07-31 08:57:10',0,0); /*!40000 ALTER TABLE `AutoProcProgramAttachment` ENABLE KEYS */; /*!40000 ALTER TABLE `AutoProcProgramMessage` DISABLE KEYS */; /*!40000 ALTER TABLE `AutoProcProgramMessage` ENABLE KEYS */; /*!40000 ALTER TABLE `AutoProcScaling` DISABLE KEYS */; -INSERT INTO `AutoProcScaling` (`autoProcScalingId`, `autoProcId`, `recordTimeStamp`) VALUES (596133,596406,'2016-01-14 12:46:22'), -(596138,596411,'2016-01-14 13:09:51'), -(596145,596418,'2016-01-14 13:24:22'), -(596146,596419,'2016-01-14 13:34:35'), -(596147,596420,'2016-01-14 14:01:57'), -(596148,596421,'2016-01-14 14:13:57'), -(603434,603708,'2016-01-22 11:34:03'), -(603457,603731,'2016-01-22 11:52:36'), -(603458,603732,'2016-01-22 11:53:38'), -(603461,603735,'2016-01-22 11:54:01'), -(603470,603744,'2016-01-22 12:01:59'); +INSERT INTO `AutoProcScaling` (`autoProcScalingId`, `autoProcId`, `recordTimeStamp`) VALUES (596133,596406,'2016-01-14 12:46:22'),(596138,596411,'2016-01-14 13:09:51'),(596145,596418,'2016-01-14 13:24:22'),(596146,596419,'2016-01-14 13:34:35'),(596147,596420,'2016-01-14 14:01:57'),(596148,596421,'2016-01-14 14:13:57'),(603434,603708,'2016-01-22 11:34:03'),(603457,603731,'2016-01-22 11:52:36'),(603458,603732,'2016-01-22 11:53:38'),(603461,603735,'2016-01-22 11:54:01'),(603470,603744,'2016-01-22 12:01:59'); /*!40000 ALTER TABLE `AutoProcScaling` ENABLE KEYS */; /*!40000 ALTER TABLE `AutoProcScalingStatistics` DISABLE KEYS */; -INSERT INTO `AutoProcScalingStatistics` (`autoProcScalingStatisticsId`, `autoProcScalingId`, `scalingStatisticsType`, `comments`, `resolutionLimitLow`, `resolutionLimitHigh`, `rMerge`, `rMeasWithinIPlusIMinus`, `rMeasAllIPlusIMinus`, `rPimWithinIPlusIMinus`, `rPimAllIPlusIMinus`, `fractionalPartialBias`, `nTotalObservations`, `nTotalUniqueObservations`, `meanIOverSigI`, `completeness`, `multiplicity`, `anomalousCompleteness`, `anomalousMultiplicity`, `recordTimeStamp`, `anomalous`, `ccHalf`, `ccAnomalous`, `resIOverSigI2`) VALUES (1770617,596133,'outerShell',NULL,1.65,1.61,0.766,NULL,0.789,NULL,NULL,NULL,105090,3089,5.5,97.8,34,96.8,17.8,'2016-01-14 12:46:22',0,91.7,15.8,NULL), -(1770618,596133,'innerShell',NULL,29.5,7.18,0.061,NULL,0.063,NULL,NULL,NULL,17093,593,61.7,98.6,28.8,100,19.5,'2016-01-14 12:46:22',0,99.9,73.4,NULL), -(1770619,596133,'overall',NULL,29.5,1.61,0.106,NULL,0.109,NULL,NULL,NULL,1588225,43478,30.2,99.8,36.5,99.8,19.4,'2016-01-14 12:46:22',0,99.9,60.5,NULL), -(1770632,596138,'outerShell',NULL,1.49,1.45,1.326,NULL,1.419,0.506,0.365,NULL,61482,4245,2,99.8,14.5,99.5,7.4,'2016-01-14 13:09:51',0,0.584,-0.059,NULL), -(1770633,596138,'innerShell',NULL,68.18,6.48,0.064,NULL,0.07,0.015,0.012,NULL,23609,800,58.6,99.8,29.5,100,19.7,'2016-01-14 13:09:51',0,0.998,0.732,NULL), -(1770634,596138,'overall',NULL,68.18,1.45,0.116,NULL,0.123,0.028,0.021,NULL,1942930,58601,22.9,99.9,33.2,99.9,17.4,'2016-01-14 13:09:51',0,0.999,0.592,NULL), -(1770653,596145,'outerShell',NULL,1.46,1.42,3.758,NULL,4.107,1.67,1.216,NULL,42977,4422,2.2,97.9,9.7,96.3,5,'2016-01-14 13:24:22',0,0.497,-0.012,NULL), -(1770654,596145,'innerShell',NULL,129.88,6.35,0.09,NULL,0.095,0.02,0.017,NULL,28041,858,32,100,32.7,100,21.3,'2016-01-14 13:24:22',0,0.996,0.556,NULL), -(1770655,596145,'overall',NULL,129.88,1.42,0.177,NULL,0.184,0.045,0.033,NULL,1942399,62483,16.4,99.8,31.1,99.7,16.2,'2016-01-14 13:24:22',0,0.999,0.343,NULL), -(1770656,596146,'outerShell',NULL,1.476,1.451,1.268,1.314,1.312,0.459,0.33,NULL,42945,2859,2.4,99.2,15,98.9,7.8,'2016-01-14 13:34:35',0,0.633,-0.059,NULL), -(1770657,596146,'innerShell',NULL,129.722,3.938,0.08,0.078,0.081,0.017,0.014,NULL,103297,3251,50.7,100,31.8,99.7,19.1,'2016-01-14 13:34:35',0,0.993,-0.169,NULL), -(1770658,596146,'overall',NULL,129.722,1.451,0.138,0.141,0.141,0.032,0.024,NULL,1953227,58523,22.5,100,33.4,100,17.8,'2016-01-14 13:34:35',0,0.996,0.035,NULL), -(1770659,596147,'outerShell',NULL,1.47,1.43,3.442,NULL,3.711,1.471,1.058,NULL,46996,4388,1.6,99,10.7,97.8,5.5,'2016-01-14 14:01:57',0,0.627,-0.004,NULL), -(1770660,596147,'innerShell',NULL,129.84,6.4,0.124,NULL,0.129,0.023,0.019,NULL,41147,842,27,100,48.9,100,31.8,'2016-01-14 14:01:57',0,0.996,0.532,NULL), -(1770661,596147,'overall',NULL,129.84,1.43,0.707,NULL,0.719,0.156,0.114,NULL,2865527,61286,14.1,99.9,46.8,99.8,24.3,'2016-01-14 14:01:57',0,0.998,0.175,NULL), -(1770662,596148,'outerShell',NULL,1.47,1.43,1.278,NULL,1.362,0.447,0.326,NULL,66780,4414,1.7,99.2,15.1,97,7.8,'2016-01-14 14:13:57',0,0.564,-0.056,NULL), -(1770663,596148,'innerShell',NULL,80.23,6.4,0.106,NULL,0.112,0.02,0.017,NULL,36380,837,58.7,100,43.5,100,28.9,'2016-01-14 14:13:57',0,0.987,0.717,NULL), -(1770664,596148,'overall',NULL,80.23,1.43,0.166,NULL,0.172,0.032,0.024,NULL,2926200,61215,22.9,99.9,47.8,99.8,25,'2016-01-14 14:13:57',0,0.997,0.589,NULL), -(1792520,603434,'outerShell',NULL,1.57,1.53,0.765,NULL,0.775,NULL,NULL,NULL,64789,889,7.4,97.6,72.9,97.3,37,'2016-01-22 11:34:03',0,97.7,-4.8,NULL), -(1792521,603434,'innerShell',NULL,27.63,6.84,0.043,NULL,0.044,NULL,NULL,NULL,10404,156,144.1,98.6,66.7,99,39.5,'2016-01-22 11:34:03',0,100,74.1,NULL), -(1792522,603434,'overall',NULL,27.63,1.53,0.073,NULL,0.074,NULL,NULL,NULL,946151,12186,50.8,99.8,77.6,99.8,40,'2016-01-22 11:34:03',0,100,41.3,NULL), -(1792589,603457,'outerShell',NULL,1.38,1.34,3.435,NULL,3.586,0.744,0.543,NULL,57789,1347,1.2,100,42.9,100,21.2,'2016-01-22 11:52:36',0,0.622,-0.017,NULL), -(1792590,603457,'innerShell',NULL,31.9,6,0.044,NULL,0.046,0.007,0.006,NULL,15766,225,131.3,99.6,70.1,100,40.5,'2016-01-22 11:52:36',0,1,0.665,NULL), -(1792591,603457,'overall',NULL,31.9,1.34,0.08,NULL,0.082,0.013,0.009,NULL,1309987,17989,34.2,100,72.8,100,37.2,'2016-01-22 11:52:36',0,1,0.484,NULL), -(1792592,603458,'outerShell',NULL,1.4,1.376,2.142,2.136,2.156,0.345,0.249,NULL,60591,813,2.4,100,74.5,100,38.1,'2016-01-22 11:53:38',0,0.908,0.059,NULL), -(1792593,603458,'innerShell',NULL,39.079,3.735,0.045,0.044,0.045,0.007,0.005,NULL,64542,887,114,99.9,72.8,99.9,40.2,'2016-01-22 11:53:38',0,1,0.267,NULL), -(1792594,603458,'overall',NULL,39.079,1.376,0.083,0.084,0.083,0.013,0.009,NULL,1275766,16626,35,100,76.7,100,39.9,'2016-01-22 11:53:38',0,1,0.217,NULL), -(1792601,603461,'outerShell',NULL,1.38,1.34,3.444,NULL,3.597,0.746,0.545,NULL,57746,1347,1.2,100,42.9,100,21.2,'2016-01-22 11:54:01',0,0.647,0.002,NULL), -(1792602,603461,'innerShell',NULL,31.9,6,0.044,NULL,0.046,0.007,0.006,NULL,15773,225,131.2,99.6,70.1,100,40.5,'2016-01-22 11:54:01',0,1,0.654,NULL), -(1792603,603461,'overall',NULL,31.9,1.34,0.08,NULL,0.082,0.013,0.009,NULL,1314502,17989,34.2,100,73.1,100,37.3,'2016-01-22 11:54:01',0,1,0.469,NULL), -(1792628,603470,'outerShell',NULL,1.36,1.33,3.124,NULL,3.246,0.711,0.515,NULL,53402,1370,1.3,100,39,100,19.2,'2016-01-22 12:01:59',0,0.703,0.017,NULL), -(1792629,603470,'innerShell',NULL,39.07,5.95,0.051,NULL,0.053,0.008,0.006,NULL,16799,235,117.7,99.7,71.5,100,41.9,'2016-01-22 12:01:59',0,1,0.654,NULL), -(1792630,603470,'overall',NULL,39.07,1.33,0.08,NULL,0.082,0.013,0.009,NULL,1305126,18395,30.9,100,71,100,36.1,'2016-01-22 12:01:59',0,1,0.482,NULL); +INSERT INTO `AutoProcScalingStatistics` (`autoProcScalingStatisticsId`, `autoProcScalingId`, `scalingStatisticsType`, `comments`, `resolutionLimitLow`, `resolutionLimitHigh`, `rMerge`, `rMeasWithinIPlusIMinus`, `rMeasAllIPlusIMinus`, `rPimWithinIPlusIMinus`, `rPimAllIPlusIMinus`, `fractionalPartialBias`, `nTotalObservations`, `nTotalUniqueObservations`, `meanIOverSigI`, `completeness`, `multiplicity`, `anomalousCompleteness`, `anomalousMultiplicity`, `recordTimeStamp`, `anomalous`, `ccHalf`, `ccAnomalous`, `resIOverSigI2`) VALUES (1770617,596133,'outerShell',NULL,1.65,1.61,0.766,NULL,0.789,NULL,NULL,NULL,105090,3089,5.5,97.8,34,96.8,17.8,'2016-01-14 12:46:22',0,91.7,15.8,NULL),(1770618,596133,'innerShell',NULL,29.5,7.18,0.061,NULL,0.063,NULL,NULL,NULL,17093,593,61.7,98.6,28.8,100,19.5,'2016-01-14 12:46:22',0,99.9,73.4,NULL),(1770619,596133,'overall',NULL,29.5,1.61,0.106,NULL,0.109,NULL,NULL,NULL,1588225,43478,30.2,99.8,36.5,99.8,19.4,'2016-01-14 12:46:22',0,99.9,60.5,NULL),(1770632,596138,'outerShell',NULL,1.49,1.45,1.326,NULL,1.419,0.506,0.365,NULL,61482,4245,2,99.8,14.5,99.5,7.4,'2016-01-14 13:09:51',0,0.584,-0.059,NULL),(1770633,596138,'innerShell',NULL,68.18,6.48,0.064,NULL,0.07,0.015,0.012,NULL,23609,800,58.6,99.8,29.5,100,19.7,'2016-01-14 13:09:51',0,0.998,0.732,NULL),(1770634,596138,'overall',NULL,68.18,1.45,0.116,NULL,0.123,0.028,0.021,NULL,1942930,58601,22.9,99.9,33.2,99.9,17.4,'2016-01-14 13:09:51',0,0.999,0.592,NULL),(1770653,596145,'outerShell',NULL,1.46,1.42,3.758,NULL,4.107,1.67,1.216,NULL,42977,4422,2.2,97.9,9.7,96.3,5,'2016-01-14 13:24:22',0,0.497,-0.012,NULL),(1770654,596145,'innerShell',NULL,129.88,6.35,0.09,NULL,0.095,0.02,0.017,NULL,28041,858,32,100,32.7,100,21.3,'2016-01-14 13:24:22',0,0.996,0.556,NULL),(1770655,596145,'overall',NULL,129.88,1.42,0.177,NULL,0.184,0.045,0.033,NULL,1942399,62483,16.4,99.8,31.1,99.7,16.2,'2016-01-14 13:24:22',0,0.999,0.343,NULL),(1770656,596146,'outerShell',NULL,1.476,1.451,1.268,1.314,1.312,0.459,0.33,NULL,42945,2859,2.4,99.2,15,98.9,7.8,'2016-01-14 13:34:35',0,0.633,-0.059,NULL),(1770657,596146,'innerShell',NULL,129.722,3.938,0.08,0.078,0.081,0.017,0.014,NULL,103297,3251,50.7,100,31.8,99.7,19.1,'2016-01-14 13:34:35',0,0.993,-0.169,NULL),(1770658,596146,'overall',NULL,129.722,1.451,0.138,0.141,0.141,0.032,0.024,NULL,1953227,58523,22.5,100,33.4,100,17.8,'2016-01-14 13:34:35',0,0.996,0.035,NULL),(1770659,596147,'outerShell',NULL,1.47,1.43,3.442,NULL,3.711,1.471,1.058,NULL,46996,4388,1.6,99,10.7,97.8,5.5,'2016-01-14 14:01:57',0,0.627,-0.004,NULL),(1770660,596147,'innerShell',NULL,129.84,6.4,0.124,NULL,0.129,0.023,0.019,NULL,41147,842,27,100,48.9,100,31.8,'2016-01-14 14:01:57',0,0.996,0.532,NULL),(1770661,596147,'overall',NULL,129.84,1.43,0.707,NULL,0.719,0.156,0.114,NULL,2865527,61286,14.1,99.9,46.8,99.8,24.3,'2016-01-14 14:01:57',0,0.998,0.175,NULL),(1770662,596148,'outerShell',NULL,1.47,1.43,1.278,NULL,1.362,0.447,0.326,NULL,66780,4414,1.7,99.2,15.1,97,7.8,'2016-01-14 14:13:57',0,0.564,-0.056,NULL),(1770663,596148,'innerShell',NULL,80.23,6.4,0.106,NULL,0.112,0.02,0.017,NULL,36380,837,58.7,100,43.5,100,28.9,'2016-01-14 14:13:57',0,0.987,0.717,NULL),(1770664,596148,'overall',NULL,80.23,1.43,0.166,NULL,0.172,0.032,0.024,NULL,2926200,61215,22.9,99.9,47.8,99.8,25,'2016-01-14 14:13:57',0,0.997,0.589,NULL),(1792520,603434,'outerShell',NULL,1.57,1.53,0.765,NULL,0.775,NULL,NULL,NULL,64789,889,7.4,97.6,72.9,97.3,37,'2016-01-22 11:34:03',0,97.7,-4.8,NULL),(1792521,603434,'innerShell',NULL,27.63,6.84,0.043,NULL,0.044,NULL,NULL,NULL,10404,156,144.1,98.6,66.7,99,39.5,'2016-01-22 11:34:03',0,100,74.1,NULL),(1792522,603434,'overall',NULL,27.63,1.53,0.073,NULL,0.074,NULL,NULL,NULL,946151,12186,50.8,99.8,77.6,99.8,40,'2016-01-22 11:34:03',0,100,41.3,NULL),(1792589,603457,'outerShell',NULL,1.38,1.34,3.435,NULL,3.586,0.744,0.543,NULL,57789,1347,1.2,100,42.9,100,21.2,'2016-01-22 11:52:36',0,0.622,-0.017,NULL),(1792590,603457,'innerShell',NULL,31.9,6,0.044,NULL,0.046,0.007,0.006,NULL,15766,225,131.3,99.6,70.1,100,40.5,'2016-01-22 11:52:36',0,1,0.665,NULL),(1792591,603457,'overall',NULL,31.9,1.34,0.08,NULL,0.082,0.013,0.009,NULL,1309987,17989,34.2,100,72.8,100,37.2,'2016-01-22 11:52:36',0,1,0.484,NULL),(1792592,603458,'outerShell',NULL,1.4,1.376,2.142,2.136,2.156,0.345,0.249,NULL,60591,813,2.4,100,74.5,100,38.1,'2016-01-22 11:53:38',0,0.908,0.059,NULL),(1792593,603458,'innerShell',NULL,39.079,3.735,0.045,0.044,0.045,0.007,0.005,NULL,64542,887,114,99.9,72.8,99.9,40.2,'2016-01-22 11:53:38',0,1,0.267,NULL),(1792594,603458,'overall',NULL,39.079,1.376,0.083,0.084,0.083,0.013,0.009,NULL,1275766,16626,35,100,76.7,100,39.9,'2016-01-22 11:53:38',0,1,0.217,NULL),(1792601,603461,'outerShell',NULL,1.38,1.34,3.444,NULL,3.597,0.746,0.545,NULL,57746,1347,1.2,100,42.9,100,21.2,'2016-01-22 11:54:01',0,0.647,0.002,NULL),(1792602,603461,'innerShell',NULL,31.9,6,0.044,NULL,0.046,0.007,0.006,NULL,15773,225,131.2,99.6,70.1,100,40.5,'2016-01-22 11:54:01',0,1,0.654,NULL),(1792603,603461,'overall',NULL,31.9,1.34,0.08,NULL,0.082,0.013,0.009,NULL,1314502,17989,34.2,100,73.1,100,37.3,'2016-01-22 11:54:01',0,1,0.469,NULL),(1792628,603470,'outerShell',NULL,1.36,1.33,3.124,NULL,3.246,0.711,0.515,NULL,53402,1370,1.3,100,39,100,19.2,'2016-01-22 12:01:59',0,0.703,0.017,NULL),(1792629,603470,'innerShell',NULL,39.07,5.95,0.051,NULL,0.053,0.008,0.006,NULL,16799,235,117.7,99.7,71.5,100,41.9,'2016-01-22 12:01:59',0,1,0.654,NULL),(1792630,603470,'overall',NULL,39.07,1.33,0.08,NULL,0.082,0.013,0.009,NULL,1305126,18395,30.9,100,71,100,36.1,'2016-01-22 12:01:59',0,1,0.482,NULL); /*!40000 ALTER TABLE `AutoProcScalingStatistics` ENABLE KEYS */; /*!40000 ALTER TABLE `AutoProcScaling_has_Int` DISABLE KEYS */; -INSERT INTO `AutoProcScaling_has_Int` (`autoProcScaling_has_IntId`, `autoProcScalingId`, `autoProcIntegrationId`, `recordTimeStamp`) VALUES (592507,596133,592508,'2016-01-14 12:46:22'), -(592512,596138,592513,'2016-01-14 13:09:51'), -(592519,596145,592520,'2016-01-14 13:24:22'), -(592520,596146,592521,'2016-01-14 13:34:35'), -(592521,596147,592522,'2016-01-14 14:01:57'), -(592522,596147,592523,'2016-01-14 14:01:57'), -(592523,596148,592524,'2016-01-14 14:13:57'), -(592524,596148,592525,'2016-01-14 14:13:57'), -(600338,603434,600339,'2016-01-22 11:34:03'), -(600361,603457,600362,'2016-01-22 11:52:36'), -(600362,603458,600363,'2016-01-22 11:53:38'), -(600365,603461,600366,'2016-01-22 11:54:01'), -(600375,603470,600376,'2016-01-22 12:01:59'); +INSERT INTO `AutoProcScaling_has_Int` (`autoProcScaling_has_IntId`, `autoProcScalingId`, `autoProcIntegrationId`, `recordTimeStamp`) VALUES (592507,596133,592508,'2016-01-14 12:46:22'),(592512,596138,592513,'2016-01-14 13:09:51'),(592519,596145,592520,'2016-01-14 13:24:22'),(592520,596146,592521,'2016-01-14 13:34:35'),(592521,596147,592522,'2016-01-14 14:01:57'),(592522,596147,592523,'2016-01-14 14:01:57'),(592523,596148,592524,'2016-01-14 14:13:57'),(592524,596148,592525,'2016-01-14 14:13:57'),(600338,603434,600339,'2016-01-22 11:34:03'),(600361,603457,600362,'2016-01-22 11:52:36'),(600362,603458,600363,'2016-01-22 11:53:38'),(600365,603461,600366,'2016-01-22 11:54:01'),(600375,603470,600376,'2016-01-22 12:01:59'); /*!40000 ALTER TABLE `AutoProcScaling_has_Int` ENABLE KEYS */; /*!40000 ALTER TABLE `AutoProcStatus` DISABLE KEYS */; @@ -187,47 +75,19 @@ INSERT INTO `AutoProcScaling_has_Int` (`autoProcScaling_has_IntId`, `autoProcSca /*!40000 ALTER TABLE `BFactorFit` ENABLE KEYS */; /*!40000 ALTER TABLE `BLSample` DISABLE KEYS */; -INSERT INTO `BLSample` (`blSampleId`, `diffractionPlanId`, `crystalId`, `containerId`, `name`, `code`, `location`, `holderLength`, `loopLength`, `loopType`, `wireWidth`, `comments`, `completionStage`, `structureStage`, `publicationStage`, `publicationComments`, `blSampleStatus`, `isInSampleChanger`, `lastKnownCenteringPosition`, `POSITIONID`, `recordTimeStamp`, `SMILES`, `blSubSampleId`, `lastImageURL`, `screenComponentGroupId`, `volume`, `dimension1`, `dimension2`, `dimension3`, `shape`, `packingFraction`, `preparationTemeprature`, `preparationHumidity`, `blottingTime`, `blottingForce`, `blottingDrainTime`, `support`, `subLocation`, `staffComments`, `source`) VALUES (11550,NULL,3918,1326,'Sample-001','SAM-011550','1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2016-03-17 16:16:11',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'root@%'), -(11553,NULL,3921,1326,'Sample-002','SAM-011553','2',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2016-03-17 16:21:43',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'root@%'), -(11556,NULL,3924,1326,'Sample-003','SAM-011556','3',NULL,NULL,NULL,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2016-03-17 16:27:25',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'root@%'), -(11559,NULL,3927,1329,'Sample-004','SAM-011559','1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2016-03-17 16:27:25',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'root@%'), -(11562,NULL,3930,1329,'Sample-005','SAM-011562','2',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2016-03-17 16:27:25',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'root@%'), -(11565,NULL,3933,1329,'Sample-006','SAM-011565','3',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2016-03-17 16:27:25',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'root@%'), -(11568,NULL,3936,1332,'Sample-007','SAM-011568','1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2016-03-17 16:27:25',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'root@%'), -(11571,NULL,3939,1332,'Sample-008','SAM-011571','2',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2016-03-17 16:27:25',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'root@%'), -(11574,NULL,3942,1332,'Sample-009','SAM-011574','3',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2016-03-17 16:27:25',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'root@%'), -(11577,NULL,3942,1335,'Sample-010','SAM-011577','1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2016-03-17 16:27:25',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'root@%'), -(11580,NULL,3942,1335,'Sample-011','SAM-011580','2',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2016-03-17 16:27:25',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'root@%'), -(11583,NULL,3951,1335,'Sample-012','SAM-011583','3',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2016-03-17 16:27:25',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'root@%'), -(11586,NULL,3954,NULL,'Sample-013','SAM-011586',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2016-03-17 16:27:25',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'root@%'), -(11589,NULL,3957,NULL,'Sample-014','SAM-011589',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2016-03-17 16:27:25',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'root@%'), -(11592,NULL,3960,NULL,'Sample-015','SAM-011592',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2016-03-17 16:27:25',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'root@%'), -(374695,NULL,310037,33049,'tlys_jan_4','HA00AU3712','4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2016-03-19 22:57:04',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'root@%'), -(398810,197784,333301,34864,'thau8','HA00AK8934','8',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2016-03-19 22:57:05',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'root@%'), -(398816,197784,310037,34874,'thau88','HH00AU3788','1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2016-09-30 14:21:28',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'root@%'), -(398819,197784,310037,34877,'thau99','HH00AU3799','1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2016-10-05 10:15:47',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'root@%'), -(398824,NULL,333308,34883,'XPDF-1','XPDF-0001',NULL,NULL,NULL,NULL,NULL,'Test sample for XPDF',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2016-10-26 14:47:58',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'root@%'), -(398827,NULL,333308,34883,'XPDF-2','XPDF-0002',NULL,NULL,NULL,NULL,NULL,'Test sample for XPDF',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2016-10-26 14:51:23',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'root@%'), -(398828,NULL,NULL,34888,'hello','hello','1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2020-10-14 18:33:06',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'root@%'); +INSERT INTO `BLSample` (`blSampleId`, `diffractionPlanId`, `crystalId`, `containerId`, `name`, `code`, `location`, `holderLength`, `loopLength`, `loopType`, `wireWidth`, `comments`, `completionStage`, `structureStage`, `publicationStage`, `publicationComments`, `blSampleStatus`, `isInSampleChanger`, `lastKnownCenteringPosition`, `POSITIONID`, `recordTimeStamp`, `SMILES`, `blSubSampleId`, `lastImageURL`, `screenComponentGroupId`, `volume`, `dimension1`, `dimension2`, `dimension3`, `shape`, `packingFraction`, `preparationTemeprature`, `preparationHumidity`, `blottingTime`, `blottingForce`, `blottingDrainTime`, `support`, `subLocation`, `staffComments`, `source`) VALUES (11550,NULL,3918,1326,'Sample-001','SAM-011550','1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2016-03-17 16:16:11',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'root@%'),(11553,NULL,3921,1326,'Sample-002','SAM-011553','2',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2016-03-17 16:21:43',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'root@%'),(11556,NULL,3924,1326,'Sample-003','SAM-011556','3',NULL,NULL,NULL,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2016-03-17 16:27:25',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'root@%'),(11559,NULL,3927,1329,'Sample-004','SAM-011559','1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2016-03-17 16:27:25',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'root@%'),(11562,NULL,3930,1329,'Sample-005','SAM-011562','2',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2016-03-17 16:27:25',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'root@%'),(11565,NULL,3933,1329,'Sample-006','SAM-011565','3',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2016-03-17 16:27:25',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'root@%'),(11568,NULL,3936,1332,'Sample-007','SAM-011568','1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2016-03-17 16:27:25',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'root@%'),(11571,NULL,3939,1332,'Sample-008','SAM-011571','2',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2016-03-17 16:27:25',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'root@%'),(11574,NULL,3942,1332,'Sample-009','SAM-011574','3',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2016-03-17 16:27:25',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'root@%'),(11577,NULL,3942,1335,'Sample-010','SAM-011577','1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2016-03-17 16:27:25',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'root@%'),(11580,NULL,3942,1335,'Sample-011','SAM-011580','2',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2016-03-17 16:27:25',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'root@%'),(11583,NULL,3951,1335,'Sample-012','SAM-011583','3',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2016-03-17 16:27:25',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'root@%'),(11586,NULL,3954,NULL,'Sample-013','SAM-011586',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2016-03-17 16:27:25',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'root@%'),(11589,NULL,3957,NULL,'Sample-014','SAM-011589',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2016-03-17 16:27:25',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'root@%'),(11592,NULL,3960,NULL,'Sample-015','SAM-011592',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2016-03-17 16:27:25',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'root@%'),(374695,NULL,310037,33049,'tlys_jan_4','HA00AU3712','4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2016-03-19 22:57:04',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'root@%'),(398810,197784,333301,34864,'thau8','HA00AK8934','8',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2016-03-19 22:57:05',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'root@%'),(398816,197784,310037,34874,'thau88','HH00AU3788','1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2016-09-30 14:21:28',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'root@%'),(398819,197784,310037,34877,'thau99','HH00AU3799','1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2016-10-05 10:15:47',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'root@%'),(398824,NULL,333308,34883,'XPDF-1','XPDF-0001',NULL,NULL,NULL,NULL,NULL,'Test sample for XPDF',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2016-10-26 14:47:58',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'root@%'),(398827,NULL,333308,34883,'XPDF-2','XPDF-0002',NULL,NULL,NULL,NULL,NULL,'Test sample for XPDF',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2016-10-26 14:51:23',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'root@%'),(398828,NULL,NULL,34888,'hello','hello','1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2020-10-14 18:33:06',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'root@%'); /*!40000 ALTER TABLE `BLSample` ENABLE KEYS */; /*!40000 ALTER TABLE `BLSampleGroup` DISABLE KEYS */; -INSERT INTO `BLSampleGroup` (`blSampleGroupId`, `name`, `proposalId`, `ownerId`) VALUES (5,NULL,37027,NULL), -(6,'foo',37027,NULL), -(7,'bar',37027,NULL); +INSERT INTO `BLSampleGroup` (`blSampleGroupId`, `name`, `proposalId`, `ownerId`) VALUES (5,NULL,37027,NULL),(6,'foo',37027,NULL),(7,'bar',37027,NULL); /*!40000 ALTER TABLE `BLSampleGroup` ENABLE KEYS */; /*!40000 ALTER TABLE `BLSampleGroup_has_BLSample` DISABLE KEYS */; -INSERT INTO `BLSampleGroup_has_BLSample` (`blSampleGroupId`, `blSampleId`, `groupOrder`, `type`, `blSampleTypeId`) VALUES (5,398824,1,'background',NULL), -(5,398827,2,'sample',NULL), -(6,398810,NULL,NULL,NULL), -(7,374695,NULL,NULL,NULL), -(7,398810,NULL,NULL,NULL); +INSERT INTO `BLSampleGroup_has_BLSample` (`blSampleGroupId`, `blSampleId`, `groupOrder`, `type`, `blSampleTypeId`) VALUES (5,398824,1,'background',NULL),(5,398827,2,'sample',NULL),(6,398810,NULL,NULL,NULL),(7,374695,NULL,NULL,NULL),(7,398810,NULL,NULL,NULL); /*!40000 ALTER TABLE `BLSampleGroup_has_BLSample` ENABLE KEYS */; /*!40000 ALTER TABLE `BLSampleImage` DISABLE KEYS */; -INSERT INTO `BLSampleImage` (`blSampleImageId`, `blSampleId`, `micronsPerPixelX`, `micronsPerPixelY`, `imageFullPath`, `blSampleImageScoreId`, `comments`, `blTimeStamp`, `containerInspectionId`, `modifiedTimeStamp`, `offsetX`, `offsetY`) VALUES (2,398819,NULL,NULL,'/dls/i03/data/2016/cm1234-5/something.jpg',NULL,NULL,'2016-10-05 11:23:33',NULL,NULL,0,0), -(5,398816,1.1,1.2,'/dls/i03/data/2016/cm1234-5/something-else.jpg',NULL,NULL,'2016-10-10 14:31:06',4,NULL,0,0); +INSERT INTO `BLSampleImage` (`blSampleImageId`, `blSampleId`, `micronsPerPixelX`, `micronsPerPixelY`, `imageFullPath`, `blSampleImageScoreId`, `comments`, `blTimeStamp`, `containerInspectionId`, `modifiedTimeStamp`, `offsetX`, `offsetY`) VALUES (2,398819,NULL,NULL,'/dls/i03/data/2016/cm1234-5/something.jpg',NULL,NULL,'2016-10-05 11:23:33',NULL,NULL,0,0),(5,398816,1.1,1.2,'/dls/i03/data/2016/cm1234-5/something-else.jpg',NULL,NULL,'2016-10-10 14:31:06',4,NULL,0,0); /*!40000 ALTER TABLE `BLSampleImage` ENABLE KEYS */; /*!40000 ALTER TABLE `BLSampleImageAnalysis` DISABLE KEYS */; @@ -238,16 +98,7 @@ INSERT INTO `BLSampleImageAnalysis` (`blSampleImageAnalysisId`, `blSampleImageId /*!40000 ALTER TABLE `BLSampleImageMeasurement` ENABLE KEYS */; /*!40000 ALTER TABLE `BLSampleImageScore` DISABLE KEYS */; -INSERT INTO `BLSampleImageScore` (`blSampleImageScoreId`, `name`, `score`, `colour`) VALUES (1,'Clear',0,'#cccccc'), -(2,'Contaminated',1,'#fffd96'), -(3,'Light Precipitate',2,'#fdfd96'), -(4,'Phase Separation',4,'#fdfd96'), -(5,'Spherulites',5,'#ffb347'), -(6,'Microcrystals',6,'#ffb347'), -(7,'1D Crystals',7,'#87ceeb'), -(8,'2D Crystals',8,'#77dd77'), -(9,'3D Crystals',9,'#77dd77'), -(10,'Heavy Precipitate',3,'#ff6961'); +INSERT INTO `BLSampleImageScore` (`blSampleImageScoreId`, `name`, `score`, `colour`) VALUES (1,'Clear',0,'#cccccc'),(2,'Contaminated',1,'#fffd96'),(3,'Light Precipitate',2,'#fdfd96'),(4,'Phase Separation',4,'#fdfd96'),(5,'Spherulites',5,'#ffb347'),(6,'Microcrystals',6,'#ffb347'),(7,'1D Crystals',7,'#87ceeb'),(8,'2D Crystals',8,'#77dd77'),(9,'3D Crystals',9,'#77dd77'),(10,'Heavy Precipitate',3,'#ff6961'); /*!40000 ALTER TABLE `BLSampleImageScore` ENABLE KEYS */; /*!40000 ALTER TABLE `BLSampleImage_has_AutoScoreClass` DISABLE KEYS */; @@ -260,8 +111,7 @@ INSERT INTO `BLSampleImageScore` (`blSampleImageScoreId`, `name`, `score`, `colo /*!40000 ALTER TABLE `BLSampleType_has_Component` ENABLE KEYS */; /*!40000 ALTER TABLE `BLSample_has_DataCollectionPlan` DISABLE KEYS */; -INSERT INTO `BLSample_has_DataCollectionPlan` (`blSampleId`, `dataCollectionPlanId`, `planOrder`) VALUES (398824,197792,1), -(398827,197792,2); +INSERT INTO `BLSample_has_DataCollectionPlan` (`blSampleId`, `dataCollectionPlanId`, `planOrder`) VALUES (398824,197792,1),(398827,197792,2); /*!40000 ALTER TABLE `BLSample_has_DataCollectionPlan` ENABLE KEYS */; /*!40000 ALTER TABLE `BLSample_has_EnergyScan` DISABLE KEYS */; @@ -271,20 +121,14 @@ INSERT INTO `BLSample_has_DataCollectionPlan` (`blSampleId`, `dataCollectionPlan /*!40000 ALTER TABLE `BLSample_has_Positioner` ENABLE KEYS */; /*!40000 ALTER TABLE `BLSession` DISABLE KEYS */; -INSERT INTO `BLSession` (`sessionId`, `beamLineSetupId`, `proposalId`, `beamCalendarId`, `startDate`, `endDate`, `beamLineName`, `scheduled`, `nbShifts`, `comments`, `beamLineOperator`, `bltimeStamp`, `visit_number`, `usedFlag`, `lastUpdate`, `externalId`, `archived`, `riskRating`) VALUES (55167,1,37027,NULL,'2016-01-01 09:00:00','2016-01-01 17:00:00','i03',NULL,NULL,'ghfg',NULL,'2015-12-21 15:20:43',1,NULL,'0000-00-00 00:00:00',NULL,0,NULL), -(55168,1,37027,NULL,'2016-03-11 09:00:00','2016-03-11 17:00:00','i03',NULL,NULL,'jhgjh',NULL,'2015-12-21 15:20:44',2,NULL,'0000-00-00 00:00:00',NULL,0,NULL), -(339525,NULL,141666,NULL,NULL,NULL,'i03',NULL,NULL,NULL,NULL,'2016-03-16 16:08:29',1,NULL,'0000-00-00 00:00:00',NULL,0,NULL), -(339528,NULL,141666,NULL,NULL,NULL,'i03',NULL,NULL,NULL,NULL,'2016-03-17 15:07:42',2,NULL,'0000-00-00 00:00:00',NULL,0,NULL), -(339531,NULL,141666,NULL,NULL,NULL,'i03',NULL,NULL,NULL,NULL,'2016-03-17 15:08:09',3,NULL,'0000-00-00 00:00:00',NULL,0,NULL), -(339535,NULL,37027,NULL,'2018-03-27 09:00:00','2018-07-27 09:00:00','i02-2',NULL,NULL,NULL,NULL,'2018-04-05 15:48:37',99,NULL,'0000-00-00 00:00:00',NULL,0,NULL); +INSERT INTO `BLSession` (`sessionId`, `beamLineSetupId`, `proposalId`, `beamCalendarId`, `startDate`, `endDate`, `beamLineName`, `scheduled`, `nbShifts`, `comments`, `beamLineOperator`, `bltimeStamp`, `visit_number`, `usedFlag`, `lastUpdate`, `externalId`, `archived`, `riskRating`) VALUES (55167,1,37027,NULL,'2016-01-01 09:00:00','2016-01-01 17:00:00','i03',NULL,NULL,'ghfg',NULL,'2015-12-21 15:20:43',1,NULL,'0000-00-00 00:00:00',NULL,0,NULL),(55168,1,37027,NULL,'2016-03-11 09:00:00','2016-03-11 17:00:00','i03',NULL,NULL,'jhgjh',NULL,'2015-12-21 15:20:44',2,NULL,'0000-00-00 00:00:00',NULL,0,NULL),(339525,NULL,141666,NULL,NULL,NULL,'i03',NULL,NULL,NULL,NULL,'2016-03-16 16:08:29',1,NULL,'0000-00-00 00:00:00',NULL,0,NULL),(339528,NULL,141666,NULL,NULL,NULL,'i03',NULL,NULL,NULL,NULL,'2016-03-17 15:07:42',2,NULL,'0000-00-00 00:00:00',NULL,0,NULL),(339531,NULL,141666,NULL,NULL,NULL,'i03',NULL,NULL,NULL,NULL,'2016-03-17 15:08:09',3,NULL,'0000-00-00 00:00:00',NULL,0,NULL),(339535,NULL,37027,NULL,'2018-03-27 09:00:00','2018-07-27 09:00:00','i02-2',NULL,NULL,NULL,NULL,'2018-04-05 15:48:37',99,NULL,'0000-00-00 00:00:00',NULL,0,NULL); /*!40000 ALTER TABLE `BLSession` ENABLE KEYS */; /*!40000 ALTER TABLE `BLSession_has_SCPosition` DISABLE KEYS */; /*!40000 ALTER TABLE `BLSession_has_SCPosition` ENABLE KEYS */; /*!40000 ALTER TABLE `BLSubSample` DISABLE KEYS */; -INSERT INTO `BLSubSample` (`blSubSampleId`, `blSampleId`, `diffractionPlanId`, `blSampleImageId`, `positionId`, `position2Id`, `motorPositionId`, `blSubSampleUUID`, `imgFileName`, `imgFilePath`, `comments`, `recordTimeStamp`, `source`, `type`) VALUES (2,398816,197784,NULL,2,5,NULL,NULL,NULL,NULL,NULL,'2016-09-30 14:25:19','manual',NULL), -(5,398819,197784,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2016-10-05 10:16:44','manual',NULL); +INSERT INTO `BLSubSample` (`blSubSampleId`, `blSampleId`, `diffractionPlanId`, `blSampleImageId`, `positionId`, `position2Id`, `motorPositionId`, `blSubSampleUUID`, `imgFileName`, `imgFilePath`, `comments`, `recordTimeStamp`, `source`, `type`) VALUES (2,398816,197784,NULL,2,5,NULL,NULL,NULL,NULL,NULL,'2016-09-30 14:25:19','manual',NULL),(5,398819,197784,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2016-10-05 10:16:44','manual',NULL); /*!40000 ALTER TABLE `BLSubSample` ENABLE KEYS */; /*!40000 ALTER TABLE `BLSubSample_has_Positioner` DISABLE KEYS */; @@ -326,24 +170,11 @@ INSERT INTO `ComponentLattice` (`componentLatticeId`, `componentId`, `spaceGroup /*!40000 ALTER TABLE `Component_has_SubType` ENABLE KEYS */; /*!40000 ALTER TABLE `Container` DISABLE KEYS */; -INSERT INTO `Container` (`containerId`, `dewarId`, `code`, `containerType`, `capacity`, `sampleChangerLocation`, `containerStatus`, `bltimeStamp`, `beamlineLocation`, `screenId`, `scheduleId`, `barcode`, `imagerId`, `sessionId`, `ownerId`, `requestedImagerId`, `requestedReturn`, `comments`, `experimentType`, `storageTemperature`, `containerRegistryId`, `scLocationUpdated`, `priorityPipelineId`, `experimentTypeId`, `containerTypeId`, `currentDewarId`, `parentContainerId`, `source`) VALUES (1326,573,'Container-1-cm0001-1','Puck-16',16,'3','processing',NULL,'i03',NULL,NULL,'container-cm0001-1-0000001',NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,4,NULL,NULL,NULL,NULL,NULL,NULL,'root@%'), -(1329,573,'Container-2-cm0001-1','Puck-16',16,'4','processing',NULL,'i03',NULL,NULL,'container-cm0001-1-0000002',NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'root@%'), -(1332,576,'Container-3-cm0001-1','Puck-16',16,'5','processing',NULL,'i03',NULL,NULL,'container-cm0001-1-0000003',NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'root@%'), -(1335,579,'Container-4-cm0001-2','Puck-16',16,'6','processing',NULL,'i03',NULL,NULL,'container-cm0001-2-0001335',NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'root@%'), -(1338,582,'Container-5-cm0001-3','Puck-16',16,'7','processing',NULL,'i03',NULL,NULL,'container-cm0001-3-0001338',NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'root@%'), -(1341,573,'Manual',NULL,NULL,'9',NULL,NULL,'i03',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'root@%'), -(33049,8287,'cm14451-1_i03r-002','Puck',16,NULL,'at DLS',NULL,'i03',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'root@%'), -(34864,8572,'I03R-001','Puck',16,'29','processing','2016-02-24 12:13:05','i03',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'root@%'), -(34874,8572,'test_plate2','CrystalQuickX',192,'3','in_storage','2016-02-12 09:20:44','i03',NULL,2,'test_plate2',2,NULL,NULL,2,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'root@%'), -(34877,8572,'test_plate3','CrystalQuickX',192,'3','in_storage','2016-10-04 10:50:05','i03',NULL,2,'test_plate3',2,NULL,NULL,2,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'root@%'), -(34879,8572,'test_plate4','CrystalQuickX',192,'4','processing',NULL,'i02-2',NULL,2,'test_plate4',2,NULL,NULL,2,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'root@%'), -(34883,NULL,'XPDF-container-1','XPDF container',NULL,NULL,'processing',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'root@%'), -(34888,8578,'TestSim01','CrystalQuickX',192,'1','in_storage',NULL,'i02-2',NULL,2,'VMXiSim-001',7,339535,1,7,0,NULL,NULL,NULL,5,NULL,NULL,NULL,NULL,NULL,NULL,'root@%'); +INSERT INTO `Container` (`containerId`, `dewarId`, `code`, `containerType`, `capacity`, `sampleChangerLocation`, `containerStatus`, `bltimeStamp`, `beamlineLocation`, `screenId`, `scheduleId`, `barcode`, `imagerId`, `sessionId`, `ownerId`, `requestedImagerId`, `requestedReturn`, `comments`, `experimentType`, `storageTemperature`, `containerRegistryId`, `scLocationUpdated`, `priorityPipelineId`, `experimentTypeId`, `containerTypeId`, `currentDewarId`, `parentContainerId`, `source`) VALUES (1326,573,'Container-1-cm0001-1','Puck-16',16,'3','processing',NULL,'i03',NULL,NULL,'container-cm0001-1-0000001',NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,4,NULL,NULL,NULL,NULL,NULL,NULL,'root@%'),(1329,573,'Container-2-cm0001-1','Puck-16',16,'4','processing',NULL,'i03',NULL,NULL,'container-cm0001-1-0000002',NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'root@%'),(1332,576,'Container-3-cm0001-1','Puck-16',16,'5','processing',NULL,'i03',NULL,NULL,'container-cm0001-1-0000003',NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'root@%'),(1335,579,'Container-4-cm0001-2','Puck-16',16,'6','processing',NULL,'i03',NULL,NULL,'container-cm0001-2-0001335',NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'root@%'),(1338,582,'Container-5-cm0001-3','Puck-16',16,'7','processing',NULL,'i03',NULL,NULL,'container-cm0001-3-0001338',NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'root@%'),(1341,573,'Manual',NULL,NULL,'9',NULL,NULL,'i03',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'root@%'),(33049,8287,'cm14451-1_i03r-002','Puck',16,NULL,'at DLS',NULL,'i03',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'root@%'),(34864,8572,'I03R-001','Puck',16,'29','processing','2016-02-24 12:13:05','i03',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'root@%'),(34874,8572,'test_plate2','CrystalQuickX',192,'3','in_storage','2016-02-12 09:20:44','i03',NULL,2,'test_plate2',2,NULL,NULL,2,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'root@%'),(34877,8572,'test_plate3','CrystalQuickX',192,'3','in_storage','2016-10-04 10:50:05','i03',NULL,2,'test_plate3',2,NULL,NULL,2,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'root@%'),(34879,8572,'test_plate4','CrystalQuickX',192,'4','processing',NULL,'i02-2',NULL,2,'test_plate4',2,NULL,NULL,2,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'root@%'),(34883,NULL,'XPDF-container-1','XPDF container',NULL,NULL,'processing',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'root@%'),(34888,8578,'TestSim01','CrystalQuickX',192,'1','in_storage',NULL,'i02-2',NULL,2,'VMXiSim-001',7,339535,1,7,0,NULL,NULL,NULL,5,NULL,NULL,NULL,NULL,NULL,NULL,'root@%'); /*!40000 ALTER TABLE `Container` ENABLE KEYS */; /*!40000 ALTER TABLE `ContainerHistory` DISABLE KEYS */; -INSERT INTO `ContainerHistory` (`containerHistoryId`, `containerId`, `location`, `blTimeStamp`, `status`, `beamlineName`, `currentDewarId`) VALUES (6,34874,'3','2016-09-30 12:56:21','in_localstorage','i03',NULL), -(7,34874,'3','2017-10-19 13:35:34','in_storage','i02-2',NULL); +INSERT INTO `ContainerHistory` (`containerHistoryId`, `containerId`, `location`, `blTimeStamp`, `status`, `beamlineName`, `currentDewarId`) VALUES (6,34874,'3','2016-09-30 12:56:21','in_localstorage','i03',NULL),(7,34874,'3','2017-10-19 13:35:34','in_storage','i02-2',NULL); /*!40000 ALTER TABLE `ContainerHistory` ENABLE KEYS */; /*!40000 ALTER TABLE `ContainerInspection` DISABLE KEYS */; @@ -351,8 +182,7 @@ INSERT INTO `ContainerInspection` (`containerInspectionId`, `containerId`, `insp /*!40000 ALTER TABLE `ContainerInspection` ENABLE KEYS */; /*!40000 ALTER TABLE `ContainerQueue` DISABLE KEYS */; -INSERT INTO `ContainerQueue` (`containerQueueId`, `containerId`, `personId`, `createdTimeStamp`, `completedTimeStamp`) VALUES (2,34874,NULL,'2016-09-30 12:56:21',NULL), -(8,34877,NULL,'2016-10-05 09:09:59',NULL); +INSERT INTO `ContainerQueue` (`containerQueueId`, `containerId`, `personId`, `createdTimeStamp`, `completedTimeStamp`) VALUES (2,34874,NULL,'2016-09-30 12:56:21',NULL),(8,34877,NULL,'2016-10-05 09:09:59',NULL); /*!40000 ALTER TABLE `ContainerQueue` ENABLE KEYS */; /*!40000 ALTER TABLE `ContainerQueueSample` DISABLE KEYS */; @@ -360,8 +190,7 @@ INSERT INTO `ContainerQueueSample` (`containerQueueSampleId`, `containerQueueId` /*!40000 ALTER TABLE `ContainerQueueSample` ENABLE KEYS */; /*!40000 ALTER TABLE `ContainerRegistry` DISABLE KEYS */; -INSERT INTO `ContainerRegistry` (`containerRegistryId`, `barcode`, `comments`, `recordTimestamp`) VALUES (4,'DLS-0001',NULL,'2017-09-21 10:01:07'), -(5,'VMXiSim-001',NULL,'2019-03-22 11:48:43'); +INSERT INTO `ContainerRegistry` (`containerRegistryId`, `barcode`, `comments`, `recordTimestamp`) VALUES (4,'DLS-0001',NULL,'2017-09-21 10:01:07'),(5,'VMXiSim-001',NULL,'2019-03-22 11:48:43'); /*!40000 ALTER TABLE `ContainerRegistry` ENABLE KEYS */; /*!40000 ALTER TABLE `ContainerRegistry_has_Proposal` DISABLE KEYS */; @@ -377,24 +206,7 @@ INSERT INTO `ContainerRegistry` (`containerRegistryId`, `barcode`, `comments`, ` /*!40000 ALTER TABLE `CryoemInitialModel` ENABLE KEYS */; /*!40000 ALTER TABLE `Crystal` DISABLE KEYS */; -INSERT INTO `Crystal` (`crystalId`, `diffractionPlanId`, `proteinId`, `crystalUUID`, `name`, `spaceGroup`, `morphology`, `color`, `size_X`, `size_Y`, `size_Z`, `cell_a`, `cell_b`, `cell_c`, `cell_alpha`, `cell_beta`, `cell_gamma`, `comments`, `pdbFileName`, `pdbFilePath`, `recordTimeStamp`, `abundance`, `theoreticalDensity`) VALUES (3918,NULL,4380,NULL,'Crystal 01',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2016-03-17 16:11:19',NULL,NULL), -(3921,NULL,4383,NULL,'Crystal 02',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2016-03-17 16:11:19',NULL,NULL), -(3924,NULL,4386,NULL,'Crystal 03',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2016-03-17 16:11:19',NULL,NULL), -(3927,NULL,4389,NULL,'Crystal 04',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2016-03-17 16:11:19',NULL,NULL), -(3930,NULL,4392,NULL,'Crystal 05',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2016-03-17 16:11:19',NULL,NULL), -(3933,NULL,4395,NULL,'Crystal 06',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2016-03-17 16:11:19',NULL,NULL), -(3936,NULL,4398,NULL,'Crystal 07',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2016-03-17 16:11:19',NULL,NULL), -(3939,NULL,4401,NULL,'Crystal 08',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2016-03-17 16:11:19',NULL,NULL), -(3942,NULL,4404,NULL,'Crystal 09',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2016-03-17 16:11:19',NULL,NULL), -(3945,NULL,4407,NULL,'Crystal 10',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2016-03-17 16:11:19',NULL,NULL), -(3948,NULL,4407,NULL,'Crystal 11',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2016-03-17 16:11:19',NULL,NULL), -(3951,NULL,4410,NULL,'Crystal 12',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2016-03-17 16:11:19',NULL,NULL), -(3954,NULL,4410,NULL,'Crystal 13',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2016-03-17 16:11:19',NULL,NULL), -(3957,NULL,4413,NULL,'Crystal 14',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2016-03-17 16:11:19',NULL,NULL), -(3960,NULL,4413,NULL,'Crystal 15',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2016-03-17 16:11:19',NULL,NULL), -(310037,NULL,121393,NULL,'crystal-4-cm14451-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2016-03-19 22:58:00',NULL,NULL), -(333301,NULL,123491,NULL,NULL,'P41212',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2016-03-19 22:58:00',NULL,NULL), -(333308,NULL,123497,NULL,'SampleType01','P12121',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'sample type comments ...',NULL,NULL,'2017-03-23 22:06:42',NULL,NULL); +INSERT INTO `Crystal` (`crystalId`, `diffractionPlanId`, `proteinId`, `crystalUUID`, `name`, `spaceGroup`, `morphology`, `color`, `size_X`, `size_Y`, `size_Z`, `cell_a`, `cell_b`, `cell_c`, `cell_alpha`, `cell_beta`, `cell_gamma`, `comments`, `pdbFileName`, `pdbFilePath`, `recordTimeStamp`, `abundance`, `theoreticalDensity`) VALUES (3918,NULL,4380,NULL,'Crystal 01',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2016-03-17 16:11:19',NULL,NULL),(3921,NULL,4383,NULL,'Crystal 02',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2016-03-17 16:11:19',NULL,NULL),(3924,NULL,4386,NULL,'Crystal 03',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2016-03-17 16:11:19',NULL,NULL),(3927,NULL,4389,NULL,'Crystal 04',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2016-03-17 16:11:19',NULL,NULL),(3930,NULL,4392,NULL,'Crystal 05',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2016-03-17 16:11:19',NULL,NULL),(3933,NULL,4395,NULL,'Crystal 06',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2016-03-17 16:11:19',NULL,NULL),(3936,NULL,4398,NULL,'Crystal 07',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2016-03-17 16:11:19',NULL,NULL),(3939,NULL,4401,NULL,'Crystal 08',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2016-03-17 16:11:19',NULL,NULL),(3942,NULL,4404,NULL,'Crystal 09',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2016-03-17 16:11:19',NULL,NULL),(3945,NULL,4407,NULL,'Crystal 10',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2016-03-17 16:11:19',NULL,NULL),(3948,NULL,4407,NULL,'Crystal 11',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2016-03-17 16:11:19',NULL,NULL),(3951,NULL,4410,NULL,'Crystal 12',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2016-03-17 16:11:19',NULL,NULL),(3954,NULL,4410,NULL,'Crystal 13',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2016-03-17 16:11:19',NULL,NULL),(3957,NULL,4413,NULL,'Crystal 14',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2016-03-17 16:11:19',NULL,NULL),(3960,NULL,4413,NULL,'Crystal 15',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2016-03-17 16:11:19',NULL,NULL),(310037,NULL,121393,NULL,'crystal-4-cm14451-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2016-03-19 22:58:00',NULL,NULL),(333301,NULL,123491,NULL,NULL,'P41212',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2016-03-19 22:58:00',NULL,NULL),(333308,NULL,123497,NULL,'SampleType01','P12121',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'sample type comments ...',NULL,NULL,'2017-03-23 22:06:42',NULL,NULL); /*!40000 ALTER TABLE `Crystal` ENABLE KEYS */; /*!40000 ALTER TABLE `CrystalComposition` DISABLE KEYS */; @@ -407,12 +219,7 @@ INSERT INTO `Crystal` (`crystalId`, `diffractionPlanId`, `proteinId`, `crystalUU /*!40000 ALTER TABLE `DataAcquisition` ENABLE KEYS */; /*!40000 ALTER TABLE `DataCollection` DISABLE KEYS */; -INSERT INTO `DataCollection` (`dataCollectionId`, `BLSAMPLEID`, `SESSIONID`, `experimenttype`, `dataCollectionNumber`, `startTime`, `endTime`, `runStatus`, `axisStart`, `axisEnd`, `axisRange`, `overlap`, `numberOfImages`, `startImageNumber`, `numberOfPasses`, `exposureTime`, `imageDirectory`, `imagePrefix`, `imageSuffix`, `imageContainerSubPath`, `fileTemplate`, `wavelength`, `resolution`, `detectorDistance`, `xBeam`, `yBeam`, `comments`, `printableForReport`, `CRYSTALCLASS`, `slitGapVertical`, `slitGapHorizontal`, `transmission`, `synchrotronMode`, `xtalSnapshotFullPath1`, `xtalSnapshotFullPath2`, `xtalSnapshotFullPath3`, `xtalSnapshotFullPath4`, `rotationAxis`, `phiStart`, `kappaStart`, `omegaStart`, `chiStart`, `resolutionAtCorner`, `detector2Theta`, `DETECTORMODE`, `undulatorGap1`, `undulatorGap2`, `undulatorGap3`, `beamSizeAtSampleX`, `beamSizeAtSampleY`, `centeringMethod`, `averageTemperature`, `ACTUALSAMPLEBARCODE`, `ACTUALSAMPLESLOTINCONTAINER`, `ACTUALCONTAINERBARCODE`, `ACTUALCONTAINERSLOTINSC`, `actualCenteringPosition`, `beamShape`, `dataCollectionGroupId`, `POSITIONID`, `detectorId`, `FOCALSPOTSIZEATSAMPLEX`, `POLARISATION`, `FOCALSPOTSIZEATSAMPLEY`, `APERTUREID`, `screeningOrigId`, `startPositionId`, `endPositionId`, `flux`, `strategySubWedgeOrigId`, `blSubSampleId`, `flux_end`, `bestWilsonPlotPath`, `processedDataFile`, `datFullPath`, `magnification`, `totalAbsorbedDose`, `binning`, `particleDiameter`, `boxSize_CTF`, `minResolution`, `minDefocus`, `maxDefocus`, `defocusStepSize`, `amountAstigmatism`, `extractSize`, `bgRadius`, `voltage`, `objAperture`, `c1aperture`, `c2aperture`, `c3aperture`, `c1lens`, `c2lens`, `c3lens`, `totalExposedDose`, `nominalMagnification`, `nominalDefocus`, `imageSizeX`, `imageSizeY`, `pixelSizeOnImage`, `phasePlate`, `dataCollectionPlanId`) VALUES (993677,374695,55167,NULL,1,'2016-01-14 12:40:34','2016-01-14 12:41:54','DataCollection Successful',45,0.1,0.1,0,3600,1,1,0.02,'/dls/i03/data/2016/cm14451-1/20160114/tlys_jan_4/','tlys_jan_4','cbf',NULL,'tlys_jan_4_1_####.cbf',1.28255,1.6,193.087,215.62,208.978,'(-402,345,142) EDNAStrategy4: subWedge:1Aperture: Medium',1,NULL,0.059918,0.099937,40.1936,'User','/dls/i03/data/2016/cm14451-1/jpegs/20160114/tlys_jan_4/tlys_jan_4_1_1_315.0.png','/dls/i03/data/2016/cm14451-1/jpegs/20160114/tlys_jan_4/tlys_jan_4_1_1_225.0.png','/dls/i03/data/2016/cm14451-1/jpegs/20160114/tlys_jan_4/tlys_jan_4_1_1_135.0.png','/dls/i03/data/2016/cm14451-1/jpegs/20160114/tlys_jan_4/tlys_jan_4_1_1_45.0.png','Omega',NULL,NULL,45,NULL,NULL,NULL,NULL,5.685,NULL,NULL,0.05,0.02,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,988855,595236,NULL,80,NULL,20,6,NULL,NULL,NULL,833107367454.3083,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), -(1002287,NULL,55167,NULL,2,'2016-01-22 11:25:18','2016-01-22 11:28:23','DataCollection Successful',0,0.1,0.1,0,7200,1,1,0.025,'/dls/i03/data/2016/cm14451-1/20160122/gw/ins2/001/','ins2','cbf',NULL,'ins2_2_####.cbf',1.2,1.41777,175,215.618,209.102,'(-307,322,-184) Aperture: Large',1,NULL,0.059918,0.099937,0.999423,'User','/dls/i03/data/2016/cm14451-1/jpegs/20160122/gw/ins2/001/ins2_2_1_270.0.png','/dls/i03/data/2016/cm14451-1/jpegs/20160122/gw/ins2/001/ins2_2_1_180.0.png','/dls/i03/data/2016/cm14451-1/jpegs/20160122/gw/ins2/001/ins2_2_1_90.0.png','/dls/i03/data/2016/cm14451-1/jpegs/20160122/gw/ins2/001/ins2_2_1_0.0.png','Omega',NULL,NULL,0,NULL,NULL,NULL,NULL,6.1213,NULL,NULL,0.08,0.02,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,996311,602072,NULL,80,NULL,20,3752,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), -(1052494,NULL,55168,NULL,1,'2016-04-13 12:18:12','2016-04-13 12:18:50','DataCollection Successful',0,0.4,0.4,-89.6,2,1,1,0.01,'/dls/i03/data/2016/cm14451-2/20160413/test_xtal/','xtal1','cbf',NULL,'xtal1_1_####.cbf',0.976254,1.24362,200,214.33,208.71,'(-703,-47,-74) Aperture: Large',1,NULL,0.059918,0.099937,100,'User','/dls/i03/data/2016/cm14451-2/jpegs/20160413/test_xtal/xtal1_1_1_90.0.png','/dls/i03/data/2016/cm14451-2/jpegs/20160413/test_xtal/xtal1_1_1_0.0.png',NULL,NULL,'Omega',NULL,NULL,0,NULL,NULL,NULL,NULL,5.30095,NULL,NULL,0.08,0.02,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1040398,647536,NULL,80,NULL,20,3752,NULL,NULL,NULL,1959830505829.428,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), -(1052503,NULL,55168,NULL,3,'2016-04-13 12:21:26','2016-04-13 12:21:54','DataCollection Successful',93,0.3,0.3,-44.7,3,1,1,0.01,'/dls/i03/data/2016/cm14451-2/20160413/test_xtal/','xtal1','cbf',NULL,'xtal1_3_####.cbf',0.976253,1.5,266.693,214.372,208.299,'(-703,-47,-74) Aperture: Large',1,NULL,0.059918,0.099937,100,'User','/dls/i03/data/2016/cm14451-2/jpegs/20160413/test_xtal/xtal1_3_1_183.0.png','/dls/i03/data/2016/cm14451-2/jpegs/20160413/test_xtal/xtal1_3_1_93.0.png',NULL,NULL,'Omega',NULL,NULL,93,NULL,NULL,NULL,NULL,5.30095,NULL,NULL,0.08,0.02,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1040407,647545,NULL,80,NULL,20,3752,NULL,NULL,NULL,1972385107622.2878,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), -(1066786,398810,55168,NULL,2,'2016-04-18 11:04:44','2016-04-18 11:04:57','DataCollection Successful',0,0.5,0.5,-44.5,3,1,1,0.1,'/dls/i03/data/2016/cm14451-2/gw/20160418/thau/edna_test/','thau','cbf',NULL,'thau_2_####.cbf',0.976253,1.5,266.693,214.372,208.299,'(-345,-241,-185) Aperture: Large',1,NULL,0.059918,0.099937,5.00016,'User','/dls/i03/data/2016/cm14451-2/jpegs/gw/20160418/thau/edna_test/thau_2_1_90.0.png','/dls/i03/data/2016/cm14451-2/jpegs/gw/20160418/thau/edna_test/thau_2_1_0.0.png',NULL,NULL,'Omega',NULL,NULL,0,NULL,NULL,NULL,NULL,5.301,NULL,NULL,0.08,0.02,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1054243,661459,NULL,80,NULL,20,3752,NULL,NULL,NULL,57087013071.909134,NULL,2,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), -(6017405,374695,55167,NULL,1,'2021-02-25 10:15:06','2021-02-25 10:15:47','DataCollection Successful',210,0,0,0,480,1,1,0.004,'/dls/i03/data/2021/cm28170-1/xraycentring/screening/TestLysozyme/Lys_6/','Lys_6','h5',NULL,'Lys_6_1_master.h5',0.976254,4.2989,337,78.0483,83.9258,'Xray centring - Diffraction grid scan of 30 by 16 images, Top left [304,229], Bottom right [1024,599]',1,NULL,0.499922,0.49994,100,'User','/dls/i03/data/2021/cm28170-1/jpegs/xraycentring/screening/TestLysozyme/Lys_6/Lys_6_1_210.0.png','/dls/i03/data/2021/cm28170-1/jpegs/xraycentring/screening/TestLysozyme/Lys_6/Lys_6_1_210.0.png','/dls/i03/data/2021/cm28170-1/jpegs/xraycentring/screening/TestLysozyme/Lys_6/Lys_6_1_210.0.png',NULL,NULL,0,NULL,210,-0.000047,NULL,NULL,NULL,5.28695,NULL,NULL,0.02,0.02,'UNSPECIFIED',NULL,NULL,NULL,NULL,NULL,NULL,NULL,5440739,4642226,78,80,NULL,20,NULL,NULL,NULL,NULL,731694586254.7522,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL); +INSERT INTO `DataCollection` (`dataCollectionId`, `BLSAMPLEID`, `SESSIONID`, `experimenttype`, `dataCollectionNumber`, `startTime`, `endTime`, `runStatus`, `axisStart`, `axisEnd`, `axisRange`, `overlap`, `numberOfImages`, `startImageNumber`, `numberOfPasses`, `exposureTime`, `imageDirectory`, `imagePrefix`, `imageSuffix`, `imageContainerSubPath`, `fileTemplate`, `wavelength`, `resolution`, `detectorDistance`, `xBeam`, `yBeam`, `comments`, `printableForReport`, `CRYSTALCLASS`, `slitGapVertical`, `slitGapHorizontal`, `transmission`, `synchrotronMode`, `xtalSnapshotFullPath1`, `xtalSnapshotFullPath2`, `xtalSnapshotFullPath3`, `xtalSnapshotFullPath4`, `rotationAxis`, `phiStart`, `kappaStart`, `omegaStart`, `chiStart`, `resolutionAtCorner`, `detector2Theta`, `DETECTORMODE`, `undulatorGap1`, `undulatorGap2`, `undulatorGap3`, `beamSizeAtSampleX`, `beamSizeAtSampleY`, `centeringMethod`, `averageTemperature`, `ACTUALSAMPLEBARCODE`, `ACTUALSAMPLESLOTINCONTAINER`, `ACTUALCONTAINERBARCODE`, `ACTUALCONTAINERSLOTINSC`, `actualCenteringPosition`, `beamShape`, `dataCollectionGroupId`, `POSITIONID`, `detectorId`, `FOCALSPOTSIZEATSAMPLEX`, `POLARISATION`, `FOCALSPOTSIZEATSAMPLEY`, `APERTUREID`, `screeningOrigId`, `startPositionId`, `endPositionId`, `flux`, `strategySubWedgeOrigId`, `blSubSampleId`, `flux_end`, `bestWilsonPlotPath`, `processedDataFile`, `datFullPath`, `magnification`, `totalAbsorbedDose`, `binning`, `particleDiameter`, `boxSize_CTF`, `minResolution`, `minDefocus`, `maxDefocus`, `defocusStepSize`, `amountAstigmatism`, `extractSize`, `bgRadius`, `voltage`, `objAperture`, `c1aperture`, `c2aperture`, `c3aperture`, `c1lens`, `c2lens`, `c3lens`, `totalExposedDose`, `nominalMagnification`, `nominalDefocus`, `imageSizeX`, `imageSizeY`, `pixelSizeOnImage`, `phasePlate`, `dataCollectionPlanId`) VALUES (993677,374695,55167,NULL,1,'2016-01-14 12:40:34','2016-01-14 12:41:54','DataCollection Successful',45,0.1,0.1,0,3600,1,1,0.02,'/dls/i03/data/2016/cm14451-1/20160114/tlys_jan_4/','tlys_jan_4','cbf',NULL,'tlys_jan_4_1_####.cbf',1.28255,1.6,193.087,215.62,208.978,'(-402,345,142) EDNAStrategy4: subWedge:1Aperture: Medium',1,NULL,0.059918,0.099937,40.1936,'User','/dls/i03/data/2016/cm14451-1/jpegs/20160114/tlys_jan_4/tlys_jan_4_1_1_315.0.png','/dls/i03/data/2016/cm14451-1/jpegs/20160114/tlys_jan_4/tlys_jan_4_1_1_225.0.png','/dls/i03/data/2016/cm14451-1/jpegs/20160114/tlys_jan_4/tlys_jan_4_1_1_135.0.png','/dls/i03/data/2016/cm14451-1/jpegs/20160114/tlys_jan_4/tlys_jan_4_1_1_45.0.png','Omega',NULL,NULL,45,NULL,NULL,NULL,NULL,5.685,NULL,NULL,0.05,0.02,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,988855,595236,NULL,80,NULL,20,6,NULL,NULL,NULL,833107367454.3083,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(1002287,NULL,55167,NULL,2,'2016-01-22 11:25:18','2016-01-22 11:28:23','DataCollection Successful',0,0.1,0.1,0,7200,1,1,0.025,'/dls/i03/data/2016/cm14451-1/20160122/gw/ins2/001/','ins2','cbf',NULL,'ins2_2_####.cbf',1.2,1.41777,175,215.618,209.102,'(-307,322,-184) Aperture: Large',1,NULL,0.059918,0.099937,0.999423,'User','/dls/i03/data/2016/cm14451-1/jpegs/20160122/gw/ins2/001/ins2_2_1_270.0.png','/dls/i03/data/2016/cm14451-1/jpegs/20160122/gw/ins2/001/ins2_2_1_180.0.png','/dls/i03/data/2016/cm14451-1/jpegs/20160122/gw/ins2/001/ins2_2_1_90.0.png','/dls/i03/data/2016/cm14451-1/jpegs/20160122/gw/ins2/001/ins2_2_1_0.0.png','Omega',NULL,NULL,0,NULL,NULL,NULL,NULL,6.1213,NULL,NULL,0.08,0.02,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,996311,602072,NULL,80,NULL,20,3752,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(1052494,NULL,55168,NULL,1,'2016-04-13 12:18:12','2016-04-13 12:18:50','DataCollection Successful',0,0.4,0.4,-89.6,2,1,1,0.01,'/dls/i03/data/2016/cm14451-2/20160413/test_xtal/','xtal1','cbf',NULL,'xtal1_1_####.cbf',0.976254,1.24362,200,214.33,208.71,'(-703,-47,-74) Aperture: Large',1,NULL,0.059918,0.099937,100,'User','/dls/i03/data/2016/cm14451-2/jpegs/20160413/test_xtal/xtal1_1_1_90.0.png','/dls/i03/data/2016/cm14451-2/jpegs/20160413/test_xtal/xtal1_1_1_0.0.png',NULL,NULL,'Omega',NULL,NULL,0,NULL,NULL,NULL,NULL,5.30095,NULL,NULL,0.08,0.02,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1040398,647536,NULL,80,NULL,20,3752,NULL,NULL,NULL,1959830505829.428,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(1052503,NULL,55168,NULL,3,'2016-04-13 12:21:26','2016-04-13 12:21:54','DataCollection Successful',93,0.3,0.3,-44.7,3,1,1,0.01,'/dls/i03/data/2016/cm14451-2/20160413/test_xtal/','xtal1','cbf',NULL,'xtal1_3_####.cbf',0.976253,1.5,266.693,214.372,208.299,'(-703,-47,-74) Aperture: Large',1,NULL,0.059918,0.099937,100,'User','/dls/i03/data/2016/cm14451-2/jpegs/20160413/test_xtal/xtal1_3_1_183.0.png','/dls/i03/data/2016/cm14451-2/jpegs/20160413/test_xtal/xtal1_3_1_93.0.png',NULL,NULL,'Omega',NULL,NULL,93,NULL,NULL,NULL,NULL,5.30095,NULL,NULL,0.08,0.02,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1040407,647545,NULL,80,NULL,20,3752,NULL,NULL,NULL,1972385107622.2878,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(1066786,398810,55168,NULL,2,'2016-04-18 11:04:44','2016-04-18 11:04:57','DataCollection Successful',0,0.5,0.5,-44.5,3,1,1,0.1,'/dls/i03/data/2016/cm14451-2/gw/20160418/thau/edna_test/','thau','cbf',NULL,'thau_2_####.cbf',0.976253,1.5,266.693,214.372,208.299,'(-345,-241,-185) Aperture: Large',1,NULL,0.059918,0.099937,5.00016,'User','/dls/i03/data/2016/cm14451-2/jpegs/gw/20160418/thau/edna_test/thau_2_1_90.0.png','/dls/i03/data/2016/cm14451-2/jpegs/gw/20160418/thau/edna_test/thau_2_1_0.0.png',NULL,NULL,'Omega',NULL,NULL,0,NULL,NULL,NULL,NULL,5.301,NULL,NULL,0.08,0.02,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1054243,661459,NULL,80,NULL,20,3752,NULL,NULL,NULL,57087013071.909134,NULL,2,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(6017405,374695,55167,NULL,1,'2021-02-25 10:15:06','2021-02-25 10:15:47','DataCollection Successful',210,0,0,0,480,1,1,0.004,'/dls/i03/data/2021/cm28170-1/xraycentring/screening/TestLysozyme/Lys_6/','Lys_6','h5',NULL,'Lys_6_1_master.h5',0.976254,4.2989,337,78.0483,83.9258,'Xray centring - Diffraction grid scan of 30 by 16 images, Top left [304,229], Bottom right [1024,599]',1,NULL,0.499922,0.49994,100,'User','/dls/i03/data/2021/cm28170-1/jpegs/xraycentring/screening/TestLysozyme/Lys_6/Lys_6_1_210.0.png','/dls/i03/data/2021/cm28170-1/jpegs/xraycentring/screening/TestLysozyme/Lys_6/Lys_6_1_210.0.png','/dls/i03/data/2021/cm28170-1/jpegs/xraycentring/screening/TestLysozyme/Lys_6/Lys_6_1_210.0.png',NULL,NULL,0,NULL,210,-0.000047,NULL,NULL,NULL,5.28695,NULL,NULL,0.02,0.02,'UNSPECIFIED',NULL,NULL,NULL,NULL,NULL,NULL,NULL,5440739,4642226,78,80,NULL,20,NULL,NULL,NULL,NULL,731694586254.7522,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL); /*!40000 ALTER TABLE `DataCollection` ENABLE KEYS */; /*!40000 ALTER TABLE `DataCollectionComment` DISABLE KEYS */; @@ -422,12 +229,7 @@ INSERT INTO `DataCollection` (`dataCollectionId`, `BLSAMPLEID`, `SESSIONID`, `ex /*!40000 ALTER TABLE `DataCollectionFileAttachment` ENABLE KEYS */; /*!40000 ALTER TABLE `DataCollectionGroup` DISABLE KEYS */; -INSERT INTO `DataCollectionGroup` (`dataCollectionGroupId`, `sessionId`, `comments`, `blSampleId`, `experimentType`, `startTime`, `endTime`, `crystalClass`, `detectorMode`, `actualSampleBarcode`, `actualSampleSlotInContainer`, `actualContainerBarcode`, `actualContainerSlotInSC`, `xtalSnapshotFullPath`, `scanParameters`, `experimentTypeId`) VALUES (988855,55167,NULL,374695,'SAD',NULL,NULL,NULL,'Ext. Trigger','HA00AU3712',NULL,NULL,NULL,NULL,NULL,NULL), -(996311,55167,NULL,NULL,'SAD',NULL,NULL,NULL,'Ext. Trigger',NULL,NULL,NULL,NULL,NULL,NULL,NULL), -(1040398,55168,NULL,NULL,'SAD',NULL,NULL,NULL,'Ext. Trigger',NULL,NULL,NULL,NULL,NULL,NULL,NULL), -(1040407,55168,NULL,NULL,'SAD',NULL,NULL,NULL,'Ext. Trigger',NULL,NULL,NULL,NULL,NULL,NULL,NULL), -(1054243,55168,NULL,398810,'SAD',NULL,NULL,NULL,'Ext. Trigger','CA00AG9993',NULL,NULL,NULL,NULL,NULL,NULL), -(5440739,55167,NULL,374695,'Mesh',NULL,NULL,NULL,NULL,'NR',NULL,NULL,NULL,NULL,NULL,NULL); +INSERT INTO `DataCollectionGroup` (`dataCollectionGroupId`, `sessionId`, `comments`, `blSampleId`, `experimentType`, `startTime`, `endTime`, `crystalClass`, `detectorMode`, `actualSampleBarcode`, `actualSampleSlotInContainer`, `actualContainerBarcode`, `actualContainerSlotInSC`, `xtalSnapshotFullPath`, `scanParameters`, `experimentTypeId`) VALUES (988855,55167,NULL,374695,'SAD',NULL,NULL,NULL,'Ext. Trigger','HA00AU3712',NULL,NULL,NULL,NULL,NULL,NULL),(996311,55167,NULL,NULL,'SAD',NULL,NULL,NULL,'Ext. Trigger',NULL,NULL,NULL,NULL,NULL,NULL,NULL),(1040398,55168,NULL,NULL,'SAD',NULL,NULL,NULL,'Ext. Trigger',NULL,NULL,NULL,NULL,NULL,NULL,NULL),(1040407,55168,NULL,NULL,'SAD',NULL,NULL,NULL,'Ext. Trigger',NULL,NULL,NULL,NULL,NULL,NULL,NULL),(1054243,55168,NULL,398810,'SAD',NULL,NULL,NULL,'Ext. Trigger','CA00AG9993',NULL,NULL,NULL,NULL,NULL,NULL),(5440739,55167,NULL,374695,'Mesh',NULL,NULL,NULL,NULL,'NR',NULL,NULL,NULL,NULL,NULL,NULL); /*!40000 ALTER TABLE `DataCollectionGroup` ENABLE KEYS */; /*!40000 ALTER TABLE `DataCollectionPlan_has_Detector` DISABLE KEYS */; @@ -435,13 +237,7 @@ INSERT INTO `DataCollectionPlan_has_Detector` (`dataCollectionPlanHasDetectorId` /*!40000 ALTER TABLE `DataCollectionPlan_has_Detector` ENABLE KEYS */; /*!40000 ALTER TABLE `Dewar` DISABLE KEYS */; -INSERT INTO `Dewar` (`dewarId`, `shippingId`, `code`, `comments`, `storageLocation`, `dewarStatus`, `bltimeStamp`, `isStorageDewar`, `barCode`, `firstExperimentId`, `customsValue`, `transportValue`, `trackingNumberToSynchrotron`, `trackingNumberFromSynchrotron`, `type`, `facilityCode`, `weight`, `deliveryAgent_barcode`, `extra`, `source`, `externalShippingIdFromSynchrotron`) VALUES (573,474,'Dewar-1-cm0001-1',NULL,NULL,'processing',NULL,0,'dewar-cm0001-1-0000001',NULL,NULL,NULL,NULL,NULL,'Dewar',NULL,NULL,NULL,NULL,'root@%',NULL), -(576,474,'Dewar-2-cm0001-1',NULL,NULL,'at DLS',NULL,0,'dewar-cm0001-1-0000002',NULL,NULL,NULL,NULL,NULL,'Dewar',NULL,NULL,NULL,NULL,'root@%',NULL), -(579,477,'Dewar-3-cm0001-2',NULL,NULL,'processing',NULL,0,'dewar-cm0001-2-0000477',NULL,NULL,NULL,NULL,NULL,'Dewar',NULL,NULL,NULL,NULL,'root@%',NULL), -(582,480,'Dewar-4-cm0001-3',NULL,NULL,'processing',NULL,0,'dewar-cm0001-3-0000480',NULL,NULL,NULL,NULL,NULL,'Dewar',NULL,NULL,NULL,NULL,'root@%',NULL), -(8287,6988,'Default Dewar:cm14451-1',NULL,NULL,'processing',NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,'Dewar',NULL,NULL,NULL,NULL,'root@%',NULL), -(8572,7227,'cm14451-2_Dewar1',NULL,NULL,'processing','2016-02-10 13:03:07',0,NULL,NULL,NULL,NULL,NULL,NULL,'Dewar',NULL,NULL,NULL,NULL,'root@%',NULL), -(8578,7231,'Dewar_1',NULL,NULL,'opened',NULL,0,'cm14451-12345',NULL,NULL,NULL,NULL,NULL,'Dewar',NULL,NULL,NULL,NULL,'root@%',NULL); +INSERT INTO `Dewar` (`dewarId`, `shippingId`, `code`, `comments`, `storageLocation`, `dewarStatus`, `bltimeStamp`, `isStorageDewar`, `barCode`, `firstExperimentId`, `customsValue`, `transportValue`, `trackingNumberToSynchrotron`, `trackingNumberFromSynchrotron`, `type`, `facilityCode`, `weight`, `deliveryAgent_barcode`, `extra`, `source`, `externalShippingIdFromSynchrotron`) VALUES (573,474,'Dewar-1-cm0001-1',NULL,NULL,'processing',NULL,0,'dewar-cm0001-1-0000001',NULL,NULL,NULL,NULL,NULL,'Dewar',NULL,NULL,NULL,NULL,'root@%',NULL),(576,474,'Dewar-2-cm0001-1',NULL,NULL,'at DLS',NULL,0,'dewar-cm0001-1-0000002',NULL,NULL,NULL,NULL,NULL,'Dewar',NULL,NULL,NULL,NULL,'root@%',NULL),(579,477,'Dewar-3-cm0001-2',NULL,NULL,'processing',NULL,0,'dewar-cm0001-2-0000477',NULL,NULL,NULL,NULL,NULL,'Dewar',NULL,NULL,NULL,NULL,'root@%',NULL),(582,480,'Dewar-4-cm0001-3',NULL,NULL,'processing',NULL,0,'dewar-cm0001-3-0000480',NULL,NULL,NULL,NULL,NULL,'Dewar',NULL,NULL,NULL,NULL,'root@%',NULL),(8287,6988,'Default Dewar:cm14451-1',NULL,NULL,'processing',NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,'Dewar',NULL,NULL,NULL,NULL,'root@%',NULL),(8572,7227,'cm14451-2_Dewar1',NULL,NULL,'processing','2016-02-10 13:03:07',0,NULL,NULL,NULL,NULL,NULL,NULL,'Dewar',NULL,NULL,NULL,NULL,'root@%',NULL),(8578,7231,'Dewar_1',NULL,NULL,'opened',NULL,0,'cm14451-12345',NULL,NULL,NULL,NULL,NULL,'Dewar',NULL,NULL,NULL,NULL,'root@%',NULL); /*!40000 ALTER TABLE `Dewar` ENABLE KEYS */; /*!40000 ALTER TABLE `DewarLocation` DISABLE KEYS */; @@ -460,39 +256,11 @@ INSERT INTO `Dewar` (`dewarId`, `shippingId`, `code`, `comments`, `storageLocati /*!40000 ALTER TABLE `DewarTransportHistory` ENABLE KEYS */; /*!40000 ALTER TABLE `DiffractionPlan` DISABLE KEYS */; -INSERT INTO `DiffractionPlan` (`diffractionPlanId`, `name`, `experimentKind`, `observedResolution`, `minimalResolution`, `exposureTime`, `oscillationRange`, `maximalResolution`, `screeningResolution`, `radiationSensitivity`, `anomalousScatterer`, `preferredBeamSizeX`, `preferredBeamSizeY`, `preferredBeamDiameter`, `comments`, `DIFFRACTIONPLANUUID`, `aimedCompleteness`, `aimedIOverSigmaAtHighestRes`, `aimedMultiplicity`, `aimedResolution`, `anomalousData`, `complexity`, `estimateRadiationDamage`, `forcedSpaceGroup`, `requiredCompleteness`, `requiredMultiplicity`, `requiredResolution`, `strategyOption`, `kappaStrategyOption`, `numberOfPositions`, `minDimAccrossSpindleAxis`, `maxDimAccrossSpindleAxis`, `radiationSensitivityBeta`, `radiationSensitivityGamma`, `minOscWidth`, `recordTimeStamp`, `monochromator`, `energy`, `transmission`, `boxSizeX`, `boxSizeY`, `kappaStart`, `axisStart`, `axisRange`, `numberOfImages`, `presetForProposalId`, `beamLineName`, `detectorId`, `distance`, `orientation`, `monoBandwidth`, `centringMethod`, `userPath`, `robotPlateTemperature`, `exposureTemperature`, `experimentTypeId`, `purificationColumnId`, `collectionMode`, `priority`, `qMin`, `qMax`, `reductionParametersAveraging`, `scanParameters`) VALUES (197784,NULL,'OSC',NULL,NULL,0.2,NULL,NULL,NULL,NULL,NULL,10.5,10.5,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,NULL,NULL,NULL,1.1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2016-03-20 23:50:27',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), -(197788,NULL,NULL,NULL,NULL,10,NULL,NULL,NULL,NULL,NULL,160,100,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2016-10-26 15:28:12',NULL,150,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,4,162.5,45,330.6,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), -(197792,'XPDF-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2017-03-22 10:56:32',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL); +INSERT INTO `DiffractionPlan` (`diffractionPlanId`, `name`, `experimentKind`, `observedResolution`, `minimalResolution`, `exposureTime`, `oscillationRange`, `maximalResolution`, `screeningResolution`, `radiationSensitivity`, `anomalousScatterer`, `preferredBeamSizeX`, `preferredBeamSizeY`, `preferredBeamDiameter`, `comments`, `DIFFRACTIONPLANUUID`, `aimedCompleteness`, `aimedIOverSigmaAtHighestRes`, `aimedMultiplicity`, `aimedResolution`, `anomalousData`, `complexity`, `estimateRadiationDamage`, `forcedSpaceGroup`, `requiredCompleteness`, `requiredMultiplicity`, `requiredResolution`, `strategyOption`, `kappaStrategyOption`, `numberOfPositions`, `minDimAccrossSpindleAxis`, `maxDimAccrossSpindleAxis`, `radiationSensitivityBeta`, `radiationSensitivityGamma`, `minOscWidth`, `recordTimeStamp`, `monochromator`, `energy`, `transmission`, `boxSizeX`, `boxSizeY`, `kappaStart`, `axisStart`, `axisRange`, `numberOfImages`, `presetForProposalId`, `beamLineName`, `detectorId`, `distance`, `orientation`, `monoBandwidth`, `centringMethod`, `userPath`, `robotPlateTemperature`, `exposureTemperature`, `experimentTypeId`, `purificationColumnId`, `collectionMode`, `priority`, `qMin`, `qMax`, `reductionParametersAveraging`, `scanParameters`) VALUES (197784,NULL,'OSC',NULL,NULL,0.2,NULL,NULL,NULL,NULL,NULL,10.5,10.5,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,NULL,NULL,NULL,1.1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2016-03-20 23:50:27',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(197788,NULL,NULL,NULL,NULL,10,NULL,NULL,NULL,NULL,NULL,160,100,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2016-10-26 15:28:12',NULL,150,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,4,162.5,45,330.6,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(197792,'XPDF-1',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'2017-03-22 10:56:32',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL); /*!40000 ALTER TABLE `DiffractionPlan` ENABLE KEYS */; /*!40000 ALTER TABLE `EnergyScan` DISABLE KEYS */; -INSERT INTO `EnergyScan` (`energyScanId`, `sessionId`, `blSampleId`, `fluorescenceDetector`, `scanFileFullPath`, `jpegChoochFileFullPath`, `element`, `startEnergy`, `endEnergy`, `transmissionFactor`, `exposureTime`, `axisPosition`, `synchrotronCurrent`, `temperature`, `peakEnergy`, `peakFPrime`, `peakFDoublePrime`, `inflectionEnergy`, `inflectionFPrime`, `inflectionFDoublePrime`, `xrayDose`, `startTime`, `endTime`, `edgeEnergy`, `filename`, `beamSizeVertical`, `beamSizeHorizontal`, `choochFileFullPath`, `crystalClass`, `comments`, `flux`, `flux_end`, `workingDirectory`, `blSubSampleId`) VALUES (49661,55167,NULL,'Vortex1_MCAScaler','/dls/i03/data/2016/cm14451-1/fe1.fluo','/dls/i03/data/2016/cm14451-1/fluorescence_scans/fe1_chooch.png','Fe',7062.75,7170.88,0.016,1,NULL,298.569,100,7115.73,-4.79,4.66,7095.13,-7.26,1.66,0,'2016-01-12 14:51:20','2016-01-12 14:58:33','K',NULL,20,50,NULL,NULL,NULL,NULL,NULL,NULL,NULL), -(49662,55167,NULL,'Vortex1_MCAScaler','/dls/i03/data/2016/cm14451-1/fe1.fluo','/dls/i03/data/2016/cm14451-1/fluorescence_scans/fe1_chooch.png','Fe',7062.75,7170.88,0.256,1,NULL,299.986,100,7131.44,-6.26,5.1,7122.6,-8.69,2.52,0,'2016-01-12 15:00:34','2016-01-12 15:05:28','K',NULL,20,50,NULL,NULL,NULL,NULL,NULL,NULL,NULL), -(49668,55167,NULL,'Vortex1_MCAScaler','/dls/i03/data/2016/cm14451-1/zn1.fluo','/dls/i03/data/2016/cm14451-1/fluorescence_scans/zn1_chooch.png','Zn',9626.73,9692.41,0.256,1,NULL,301.465,100,9673.5,-8.73,3.05,9672.94,-9.04,0.48,0,'2016-01-13 15:55:39','2016-01-13 16:02:15','K',NULL,20,20,NULL,NULL,NULL,NULL,NULL,NULL,NULL), -(49669,55167,NULL,'Vortex1_MCAScaler','/dls/i03/data/2016/cm14451-1/zn1.fluo','/dls/i03/data/2016/cm14451-1/fluorescence_scans/zn1_chooch.png','Zn',9626.73,9692.41,0.256,1,NULL,299.054,100,9674.62,-7.78,3.36,9674.62,-7.78,3.36,0,'2016-01-13 16:02:39','2016-01-13 16:07:38','K',NULL,20,20,NULL,NULL,NULL,NULL,NULL,NULL,NULL), -(49671,55167,NULL,'Vortex1_MCAScaler','/dls/i03/data/2016/cm14451-1/zn1.fluo','/dls/i03/data/2016/cm14451-1/fluorescence_scans/zn1_chooch.png','Zn',9626.73,9692.41,0.004,1,NULL,301.497,100,9663.49,-10.11,8.51,9660.14,-13.87,3.89,0,'2016-01-13 16:16:35','2016-01-13 16:22:27','K',NULL,20,20,NULL,NULL,NULL,NULL,NULL,NULL,NULL), -(49673,55167,NULL,'Vortex1_MCAScaler','/dls/i03/data/2016/cm14451-1/zn2.fluo','/dls/i03/data/2016/cm14451-1/fluorescence_scans/zn2_chooch.png','Zn',9626.73,9692.41,0.064,1,NULL,298.34,100,9685.13,-6.16,3.78,9671.27,-7.05,2.64,0,'2016-01-13 16:24:38','2016-01-13 16:29:33','K',NULL,20,20,NULL,NULL,NULL,NULL,NULL,NULL,NULL), -(49674,55167,NULL,'Vortex1_MCAScaler','/dls/i03/data/2016/cm14451-1/zn3.fluo','/dls/i03/data/2016/cm14451-1/fluorescence_scans/zn3_chooch.png','Zn',9626.73,9692.41,0.064,1,NULL,299.716,100,9643.43,-7.52,4.09,9636.73,-8.25,1.59,0,'2016-01-13 16:30:48','2016-01-13 16:35:37','K',NULL,20,20,NULL,NULL,NULL,NULL,NULL,NULL,NULL), -(49675,55167,NULL,'Vortex1_MCAScaler','/dls/i03/data/2016/cm14451-1/zn_1730_13th.fluo','/dls/i03/data/2016/cm14451-1/fluorescence_scans/zn_1730_13th_chooch.png','Zn',9626.73,9692.41,0.002,1,NULL,298.912,100,9667.37,-6.92,6.36,9660.69,-11.35,3.51,0,'2016-01-13 17:31:04','2016-01-13 17:37:43','K',NULL,20,50,NULL,NULL,NULL,NULL,NULL,NULL,NULL), -(49676,55167,NULL,'Vortex1_MCAScaler','/dls/i03/data/2016/cm14451-1/zn_1738_13th.fluo','/dls/i03/data/2016/cm14451-1/fluorescence_scans/zn_1738_13th_chooch.png','Zn',9626.73,9692.41,0.006,1,NULL,300.82,100,9664.04,-8.7,6.42,9660.69,-11.37,3.59,0,'2016-01-13 17:39:01','2016-01-13 17:43:37','K',NULL,20,50,NULL,NULL,NULL,NULL,NULL,NULL,NULL), -(49677,55167,NULL,'Vortex1_MCAScaler','/dls/i03/data/2016/cm14451-1/cu1.fluo','/dls/i03/data/2016/cm14451-1/fluorescence_scans/cu1_chooch.png','Cu',8942.19,9019.21,0.032,1,NULL,298.45,100,8991.12,-6.37,4.03,8977.04,-8.12,1.82,0,'2016-01-13 19:51:26','2016-01-13 19:58:15','K',NULL,20,50,NULL,NULL,NULL,NULL,NULL,NULL,NULL), -(49678,55167,NULL,'Vortex1_MCAScaler','/dls/i03/data/2016/cm14451-1/se1.fluo','/dls/i03/data/2016/cm14451-1/fluorescence_scans/se1_chooch.png','Se',12628,12688,0.004,1,NULL,298.837,100,12653,-8.84,8.25,12651,-12.16,4.46,0,'2016-01-13 20:20:25','2016-01-13 20:27:01','K',NULL,20,50,NULL,NULL,NULL,NULL,NULL,NULL,NULL), -(49679,55167,NULL,'Vortex1_MCAScaler','/dls/i03/data/2016/cm14451-1/se2.fluo','/dls/i03/data/2016/cm14451-1/fluorescence_scans/se2_chooch.png','Se',12628,12688,0.002,1,NULL,300.543,100,12664,-7.91,9.44,12662.5,-11.35,5.87,0,'2016-01-14 09:48:06','2016-01-14 09:53:34','K',NULL,20,50,NULL,NULL,NULL,NULL,NULL,NULL,NULL), -(49680,55167,NULL,'Vortex1_MCAScaler','/dls/i03/data/2016/cm14451-1/se3.fluo','/dls/i03/data/2016/cm14451-1/fluorescence_scans/se3_chooch.png','Se',12628,12688,0.002,1,NULL,299.851,100,12658.5,-7.03,11.31,12656.5,-12.74,6.37,0,'2016-01-14 10:00:43','2016-01-14 10:05:39','K',NULL,20,50,NULL,NULL,NULL,NULL,NULL,NULL,NULL), -(49681,55167,NULL,'Vortex1_MCAScaler','/dls/i03/data/2016/cm14451-1/se4.fluo','/dls/i03/data/2016/cm14451-1/fluorescence_scans/se4_chooch.png','Se',12628,12688,0.002,1,NULL,299.856,100,12660,-7.58,11.19,12658,-12.64,5.98,0,'2016-01-14 10:09:58','2016-01-14 10:14:56','K',NULL,20,50,NULL,NULL,NULL,NULL,NULL,NULL,NULL), -(49682,55167,374695,'Vortex1_MCAScaler','/dls/i03/data/2016/cm14451-1/zn_1401_1125.fluo','/dls/i03/data/2016/cm14451-1/fluorescence_scans/zn_1401_1125_chooch.png','Zn',9626.73,9692.41,0.004,1,NULL,301.75,100,9666.82,-7.77,6.51,9661.25,-11.11,3.49,0,'2016-01-14 11:24:43','2016-01-14 11:31:22','K',NULL,20,50,NULL,NULL,NULL,NULL,NULL,NULL,NULL), -(50165,55167,NULL,'Vortex1_MCAScaler','/dls/i03/data/2016/cm14451-1/20160224/testZn.fluo','/dls/i03/data/2016/cm14451-1/20160224/fluorescence_scans/testZn_chooch.png','Zn',9626.73,9692.41,0.004,1,NULL,300.402,100,9668.43,-6.85,5.95,9658.43,-9.83,1.07,0,'2016-02-24 14:42:38','2016-02-24 14:44:02','K',NULL,20,50,NULL,NULL,NULL,NULL,NULL,NULL,NULL), -(50166,55167,NULL,'Vortex1_MCAScaler','/dls/i03/data/2016/cm14451-1/testZn.fluo','/dls/i03/data/2016/cm14451-1/fluorescence_scans/testZn_chooch.png','Zn',9626.73,9692.41,0.004,1,NULL,298.566,100,9668.43,-6.9,5.96,9658.43,-9.91,1.13,0,'2016-02-24 14:46:33','2016-02-24 14:48:20','K',NULL,20,50,NULL,NULL,NULL,NULL,NULL,NULL,NULL), -(50167,55167,NULL,'Vortex1_MCAScaler','/dls/i03/data/2016/cm14451-1/20160224b/testZn.fluo','/dls/i03/data/2016/cm14451-1/20160224b/fluorescence_scans/testZn_chooch.png','Zn',9626.73,9692.41,0.004,1,NULL,298.913,100,9663.43,-9.53,6.11,9658.43,-10,1.09,0,'2016-02-24 14:55:42','2016-02-24 14:57:34','K',NULL,20,50,NULL,NULL,NULL,NULL,NULL,NULL,NULL), -(50168,55167,NULL,'Vortex1_MCAScaler','/dls/i03/data/2016/cm14451-1/20160224c/testZn.fluo','/dls/i03/data/2016/cm14451-1/20160224c/fluorescence_scans/testZn_chooch.png','Zn',9626.73,9692.41,0.004,1,NULL,299.834,100,9663.44,-9.95,7.45,9658.43,-10.89,1.32,0,'2016-02-24 15:03:55','2016-02-24 15:05:33','K',NULL,20,50,NULL,NULL,NULL,NULL,NULL,NULL,NULL), -(50169,55167,NULL,'Vortex1_MCAScaler','/dls/i03/data/2016/cm14451-1/20160224d/testZn.fluo','/dls/i03/data/2016/cm14451-1/20160224d/fluorescence_scans/testZn_chooch.png','Zn',9626.73,9692.41,0.004,1,NULL,298.071,100,9663.43,-9.56,6.37,9658.44,-10.1,1.15,0,'2016-02-24 15:07:49','2016-02-24 15:09:42','K',NULL,20,50,NULL,NULL,NULL,NULL,NULL,NULL,NULL), -(50261,55167,NULL,'Vortex1_MCAScaler','/dls/i03/data/2016/cm14451-1/se_sb.fluo','/dls/i03/data/2016/cm14451-1/fluorescence_scans/se_sb_chooch.png','Se',12628,12688,0.5,1,NULL,9.67282,100,12660.5,-7.64,10.63,12659,-11.08,7.15,0,'2016-03-09 10:48:58','2016-03-09 10:54:35','K',NULL,20,80,NULL,NULL,'null _FLAG_',NULL,NULL,NULL,NULL), -(50263,55168,NULL,'Vortex1_MCAScaler','/dls/i03/data/2016/cm14451-2/se_test1.fluo',NULL,NULL,12628,12688,1,1,NULL,-0.000965,100,NULL,NULL,NULL,NULL,NULL,NULL,0,'2016-03-30 14:36:51','2016-03-30 14:42:06',NULL,NULL,20,80,NULL,NULL,NULL,NULL,NULL,NULL,NULL), -(50266,55168,NULL,'Vortex1_MCAScaler','/dls/i03/data/2016/cm14451-2/test_1.fluo',NULL,NULL,12628,12688,0.2,1,NULL,0.000111,100,NULL,NULL,NULL,NULL,NULL,NULL,0,'2016-03-31 10:14:15','2016-03-31 10:19:01',NULL,NULL,20,80,NULL,NULL,NULL,NULL,NULL,NULL,NULL), -(50269,55168,NULL,'Vortex1_MCAScaler','/dls/i03/data/2016/cm14451-2/se1.fluo','/dls/i03/data/2016/cm14451-2/fluorescence_scans/se1_chooch.png','Se',12628,12688,0.128,1,NULL,198.223,100,12660.5,-7.26,9.79,12656,-10.42,4.21,0,'2016-04-05 16:43:16','2016-04-05 16:49:58','K',NULL,20,20,NULL,NULL,NULL,NULL,NULL,NULL,NULL), -(50284,55168,NULL,'Vortex1_MCAScaler','/dls/i03/data/2016/cm14451-2/zn.fluo','/dls/i03/data/2016/cm14451-2/fluorescence_scans/zn_chooch.png','Zn',9626.73,9692.41,0.016,1,NULL,301.691,100,9666.82,-7.09,9.24,9661.81,-12.08,3.36,0,'2016-04-06 16:36:18','2016-04-06 16:42:43','K',NULL,20,50,NULL,NULL,NULL,NULL,NULL,NULL,NULL), -(50287,55168,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), -(50290,55168,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL); +INSERT INTO `EnergyScan` (`energyScanId`, `sessionId`, `blSampleId`, `fluorescenceDetector`, `scanFileFullPath`, `jpegChoochFileFullPath`, `element`, `startEnergy`, `endEnergy`, `transmissionFactor`, `exposureTime`, `axisPosition`, `synchrotronCurrent`, `temperature`, `peakEnergy`, `peakFPrime`, `peakFDoublePrime`, `inflectionEnergy`, `inflectionFPrime`, `inflectionFDoublePrime`, `xrayDose`, `startTime`, `endTime`, `edgeEnergy`, `filename`, `beamSizeVertical`, `beamSizeHorizontal`, `choochFileFullPath`, `crystalClass`, `comments`, `flux`, `flux_end`, `workingDirectory`, `blSubSampleId`) VALUES (49661,55167,NULL,'Vortex1_MCAScaler','/dls/i03/data/2016/cm14451-1/fe1.fluo','/dls/i03/data/2016/cm14451-1/fluorescence_scans/fe1_chooch.png','Fe',7062.75,7170.88,0.016,1,NULL,298.569,100,7115.73,-4.79,4.66,7095.13,-7.26,1.66,0,'2016-01-12 14:51:20','2016-01-12 14:58:33','K',NULL,20,50,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(49662,55167,NULL,'Vortex1_MCAScaler','/dls/i03/data/2016/cm14451-1/fe1.fluo','/dls/i03/data/2016/cm14451-1/fluorescence_scans/fe1_chooch.png','Fe',7062.75,7170.88,0.256,1,NULL,299.986,100,7131.44,-6.26,5.1,7122.6,-8.69,2.52,0,'2016-01-12 15:00:34','2016-01-12 15:05:28','K',NULL,20,50,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(49668,55167,NULL,'Vortex1_MCAScaler','/dls/i03/data/2016/cm14451-1/zn1.fluo','/dls/i03/data/2016/cm14451-1/fluorescence_scans/zn1_chooch.png','Zn',9626.73,9692.41,0.256,1,NULL,301.465,100,9673.5,-8.73,3.05,9672.94,-9.04,0.48,0,'2016-01-13 15:55:39','2016-01-13 16:02:15','K',NULL,20,20,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(49669,55167,NULL,'Vortex1_MCAScaler','/dls/i03/data/2016/cm14451-1/zn1.fluo','/dls/i03/data/2016/cm14451-1/fluorescence_scans/zn1_chooch.png','Zn',9626.73,9692.41,0.256,1,NULL,299.054,100,9674.62,-7.78,3.36,9674.62,-7.78,3.36,0,'2016-01-13 16:02:39','2016-01-13 16:07:38','K',NULL,20,20,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(49671,55167,NULL,'Vortex1_MCAScaler','/dls/i03/data/2016/cm14451-1/zn1.fluo','/dls/i03/data/2016/cm14451-1/fluorescence_scans/zn1_chooch.png','Zn',9626.73,9692.41,0.004,1,NULL,301.497,100,9663.49,-10.11,8.51,9660.14,-13.87,3.89,0,'2016-01-13 16:16:35','2016-01-13 16:22:27','K',NULL,20,20,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(49673,55167,NULL,'Vortex1_MCAScaler','/dls/i03/data/2016/cm14451-1/zn2.fluo','/dls/i03/data/2016/cm14451-1/fluorescence_scans/zn2_chooch.png','Zn',9626.73,9692.41,0.064,1,NULL,298.34,100,9685.13,-6.16,3.78,9671.27,-7.05,2.64,0,'2016-01-13 16:24:38','2016-01-13 16:29:33','K',NULL,20,20,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(49674,55167,NULL,'Vortex1_MCAScaler','/dls/i03/data/2016/cm14451-1/zn3.fluo','/dls/i03/data/2016/cm14451-1/fluorescence_scans/zn3_chooch.png','Zn',9626.73,9692.41,0.064,1,NULL,299.716,100,9643.43,-7.52,4.09,9636.73,-8.25,1.59,0,'2016-01-13 16:30:48','2016-01-13 16:35:37','K',NULL,20,20,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(49675,55167,NULL,'Vortex1_MCAScaler','/dls/i03/data/2016/cm14451-1/zn_1730_13th.fluo','/dls/i03/data/2016/cm14451-1/fluorescence_scans/zn_1730_13th_chooch.png','Zn',9626.73,9692.41,0.002,1,NULL,298.912,100,9667.37,-6.92,6.36,9660.69,-11.35,3.51,0,'2016-01-13 17:31:04','2016-01-13 17:37:43','K',NULL,20,50,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(49676,55167,NULL,'Vortex1_MCAScaler','/dls/i03/data/2016/cm14451-1/zn_1738_13th.fluo','/dls/i03/data/2016/cm14451-1/fluorescence_scans/zn_1738_13th_chooch.png','Zn',9626.73,9692.41,0.006,1,NULL,300.82,100,9664.04,-8.7,6.42,9660.69,-11.37,3.59,0,'2016-01-13 17:39:01','2016-01-13 17:43:37','K',NULL,20,50,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(49677,55167,NULL,'Vortex1_MCAScaler','/dls/i03/data/2016/cm14451-1/cu1.fluo','/dls/i03/data/2016/cm14451-1/fluorescence_scans/cu1_chooch.png','Cu',8942.19,9019.21,0.032,1,NULL,298.45,100,8991.12,-6.37,4.03,8977.04,-8.12,1.82,0,'2016-01-13 19:51:26','2016-01-13 19:58:15','K',NULL,20,50,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(49678,55167,NULL,'Vortex1_MCAScaler','/dls/i03/data/2016/cm14451-1/se1.fluo','/dls/i03/data/2016/cm14451-1/fluorescence_scans/se1_chooch.png','Se',12628,12688,0.004,1,NULL,298.837,100,12653,-8.84,8.25,12651,-12.16,4.46,0,'2016-01-13 20:20:25','2016-01-13 20:27:01','K',NULL,20,50,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(49679,55167,NULL,'Vortex1_MCAScaler','/dls/i03/data/2016/cm14451-1/se2.fluo','/dls/i03/data/2016/cm14451-1/fluorescence_scans/se2_chooch.png','Se',12628,12688,0.002,1,NULL,300.543,100,12664,-7.91,9.44,12662.5,-11.35,5.87,0,'2016-01-14 09:48:06','2016-01-14 09:53:34','K',NULL,20,50,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(49680,55167,NULL,'Vortex1_MCAScaler','/dls/i03/data/2016/cm14451-1/se3.fluo','/dls/i03/data/2016/cm14451-1/fluorescence_scans/se3_chooch.png','Se',12628,12688,0.002,1,NULL,299.851,100,12658.5,-7.03,11.31,12656.5,-12.74,6.37,0,'2016-01-14 10:00:43','2016-01-14 10:05:39','K',NULL,20,50,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(49681,55167,NULL,'Vortex1_MCAScaler','/dls/i03/data/2016/cm14451-1/se4.fluo','/dls/i03/data/2016/cm14451-1/fluorescence_scans/se4_chooch.png','Se',12628,12688,0.002,1,NULL,299.856,100,12660,-7.58,11.19,12658,-12.64,5.98,0,'2016-01-14 10:09:58','2016-01-14 10:14:56','K',NULL,20,50,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(49682,55167,374695,'Vortex1_MCAScaler','/dls/i03/data/2016/cm14451-1/zn_1401_1125.fluo','/dls/i03/data/2016/cm14451-1/fluorescence_scans/zn_1401_1125_chooch.png','Zn',9626.73,9692.41,0.004,1,NULL,301.75,100,9666.82,-7.77,6.51,9661.25,-11.11,3.49,0,'2016-01-14 11:24:43','2016-01-14 11:31:22','K',NULL,20,50,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(50165,55167,NULL,'Vortex1_MCAScaler','/dls/i03/data/2016/cm14451-1/20160224/testZn.fluo','/dls/i03/data/2016/cm14451-1/20160224/fluorescence_scans/testZn_chooch.png','Zn',9626.73,9692.41,0.004,1,NULL,300.402,100,9668.43,-6.85,5.95,9658.43,-9.83,1.07,0,'2016-02-24 14:42:38','2016-02-24 14:44:02','K',NULL,20,50,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(50166,55167,NULL,'Vortex1_MCAScaler','/dls/i03/data/2016/cm14451-1/testZn.fluo','/dls/i03/data/2016/cm14451-1/fluorescence_scans/testZn_chooch.png','Zn',9626.73,9692.41,0.004,1,NULL,298.566,100,9668.43,-6.9,5.96,9658.43,-9.91,1.13,0,'2016-02-24 14:46:33','2016-02-24 14:48:20','K',NULL,20,50,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(50167,55167,NULL,'Vortex1_MCAScaler','/dls/i03/data/2016/cm14451-1/20160224b/testZn.fluo','/dls/i03/data/2016/cm14451-1/20160224b/fluorescence_scans/testZn_chooch.png','Zn',9626.73,9692.41,0.004,1,NULL,298.913,100,9663.43,-9.53,6.11,9658.43,-10,1.09,0,'2016-02-24 14:55:42','2016-02-24 14:57:34','K',NULL,20,50,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(50168,55167,NULL,'Vortex1_MCAScaler','/dls/i03/data/2016/cm14451-1/20160224c/testZn.fluo','/dls/i03/data/2016/cm14451-1/20160224c/fluorescence_scans/testZn_chooch.png','Zn',9626.73,9692.41,0.004,1,NULL,299.834,100,9663.44,-9.95,7.45,9658.43,-10.89,1.32,0,'2016-02-24 15:03:55','2016-02-24 15:05:33','K',NULL,20,50,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(50169,55167,NULL,'Vortex1_MCAScaler','/dls/i03/data/2016/cm14451-1/20160224d/testZn.fluo','/dls/i03/data/2016/cm14451-1/20160224d/fluorescence_scans/testZn_chooch.png','Zn',9626.73,9692.41,0.004,1,NULL,298.071,100,9663.43,-9.56,6.37,9658.44,-10.1,1.15,0,'2016-02-24 15:07:49','2016-02-24 15:09:42','K',NULL,20,50,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(50261,55167,NULL,'Vortex1_MCAScaler','/dls/i03/data/2016/cm14451-1/se_sb.fluo','/dls/i03/data/2016/cm14451-1/fluorescence_scans/se_sb_chooch.png','Se',12628,12688,0.5,1,NULL,9.67282,100,12660.5,-7.64,10.63,12659,-11.08,7.15,0,'2016-03-09 10:48:58','2016-03-09 10:54:35','K',NULL,20,80,NULL,NULL,'null _FLAG_',NULL,NULL,NULL,NULL),(50263,55168,NULL,'Vortex1_MCAScaler','/dls/i03/data/2016/cm14451-2/se_test1.fluo',NULL,NULL,12628,12688,1,1,NULL,-0.000965,100,NULL,NULL,NULL,NULL,NULL,NULL,0,'2016-03-30 14:36:51','2016-03-30 14:42:06',NULL,NULL,20,80,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(50266,55168,NULL,'Vortex1_MCAScaler','/dls/i03/data/2016/cm14451-2/test_1.fluo',NULL,NULL,12628,12688,0.2,1,NULL,0.000111,100,NULL,NULL,NULL,NULL,NULL,NULL,0,'2016-03-31 10:14:15','2016-03-31 10:19:01',NULL,NULL,20,80,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(50269,55168,NULL,'Vortex1_MCAScaler','/dls/i03/data/2016/cm14451-2/se1.fluo','/dls/i03/data/2016/cm14451-2/fluorescence_scans/se1_chooch.png','Se',12628,12688,0.128,1,NULL,198.223,100,12660.5,-7.26,9.79,12656,-10.42,4.21,0,'2016-04-05 16:43:16','2016-04-05 16:49:58','K',NULL,20,20,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(50284,55168,NULL,'Vortex1_MCAScaler','/dls/i03/data/2016/cm14451-2/zn.fluo','/dls/i03/data/2016/cm14451-2/fluorescence_scans/zn_chooch.png','Zn',9626.73,9692.41,0.016,1,NULL,301.691,100,9666.82,-7.09,9.24,9661.81,-12.08,3.36,0,'2016-04-06 16:36:18','2016-04-06 16:42:43','K',NULL,20,50,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(50287,55168,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(50290,55168,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL); /*!40000 ALTER TABLE `EnergyScan` ENABLE KEYS */; /*!40000 ALTER TABLE `Event` DISABLE KEYS */; @@ -521,25 +289,11 @@ INSERT INTO `GridInfo` (`gridInfoId`, `xOffset`, `yOffset`, `dx_mm`, `dy_mm`, `s /*!40000 ALTER TABLE `GridSquare` ENABLE KEYS */; /*!40000 ALTER TABLE `Image` DISABLE KEYS */; -INSERT INTO `Image` (`imageId`, `dataCollectionId`, `imageNumber`, `fileName`, `fileLocation`, `measuredIntensity`, `jpegFileFullPath`, `jpegThumbnailFileFullPath`, `temperature`, `cumulativeIntensity`, `synchrotronCurrent`, `comments`, `machineMessage`, `BLTIMESTAMP`, `motorPositionId`, `recordTimeStamp`) VALUES (274837165,1052494,1,'xtal1_1_0001.cbf','/dls/i03/data/2016/cm14451-2/20160413/test_xtal',0,'/dls/i03/data/2016/cm14451-2/jpegs/20160413/test_xtal/xtal1_1_0001.jpeg','/dls/i03/data/2016/cm14451-2/jpegs/20160413/test_xtal/xtal1_1_0001.thumb.jpeg',294,0,298.847,NULL,NULL,'2016-04-13 11:18:39',NULL,'2016-04-13 11:18:39'), -(274837168,1052494,2,'xtal1_1_0002.cbf','/dls/i03/data/2016/cm14451-2/20160413/test_xtal',0,'/dls/i03/data/2016/cm14451-2/jpegs/20160413/test_xtal/xtal1_1_0002.jpeg','/dls/i03/data/2016/cm14451-2/jpegs/20160413/test_xtal/xtal1_1_0002.thumb.jpeg',294,0,298.74,NULL,NULL,'2016-04-13 11:18:50',NULL,'2016-04-13 11:18:50'), -(274837177,1052503,1,'xtal1_3_0001.cbf','/dls/i03/data/2016/cm14451-2/20160413/test_xtal',0,'/dls/i03/data/2016/cm14451-2/jpegs/20160413/test_xtal/xtal1_3_0001.jpeg','/dls/i03/data/2016/cm14451-2/jpegs/20160413/test_xtal/xtal1_3_0001.thumb.jpeg',294,0,302.004,NULL,NULL,'2016-04-13 11:21:36',NULL,'2016-04-13 11:21:36'), -(274837180,1052503,2,'xtal1_3_0002.cbf','/dls/i03/data/2016/cm14451-2/20160413/test_xtal',0,'/dls/i03/data/2016/cm14451-2/jpegs/20160413/test_xtal/xtal1_3_0002.jpeg','/dls/i03/data/2016/cm14451-2/jpegs/20160413/test_xtal/xtal1_3_0002.thumb.jpeg',294,0,301.922,NULL,NULL,'2016-04-13 11:21:45',NULL,'2016-04-13 11:21:45'), -(274837183,1052503,3,'xtal1_3_0003.cbf','/dls/i03/data/2016/cm14451-2/20160413/test_xtal',0,'/dls/i03/data/2016/cm14451-2/jpegs/20160413/test_xtal/xtal1_3_0003.jpeg','/dls/i03/data/2016/cm14451-2/jpegs/20160413/test_xtal/xtal1_3_0003.thumb.jpeg',294,0,301.842,NULL,NULL,'2016-04-13 11:21:54',NULL,'2016-04-13 11:21:54'), -(284717989,1066786,1,'thau_2_0001.cbf','/dls/i03/data/2016/cm14451-2/gw/20160418/thau/edna_test',0,'/dls/i03/data/2016/cm14451-2/jpegs/gw/20160418/thau/edna_test/thau_2_0001.jpeg','/dls/i03/data/2016/cm14451-2/jpegs/gw/20160418/thau/edna_test/thau_2_0001.thumb.jpeg',294,0,299.987,NULL,NULL,'2016-04-14 02:19:04',NULL,'2016-04-14 02:19:04'), -(284718055,1066786,2,'thau_2_0002.cbf','/dls/i03/data/2016/cm14451-2/gw/20160418/thau/edna_test',0,'/dls/i03/data/2016/cm14451-2/jpegs/gw/20160418/thau/edna_test/thau_2_0002.jpeg','/dls/i03/data/2016/cm14451-2/jpegs/gw/20160418/thau/edna_test/thau_2_0002.thumb.jpeg',294,0,299.933,NULL,NULL,'2016-04-14 02:19:04',NULL,'2016-04-14 02:19:04'), -(284718118,1066786,3,'thau_2_0003.cbf','/dls/i03/data/2016/cm14451-2/gw/20160418/thau/edna_test',0,'/dls/i03/data/2016/cm14451-2/jpegs/gw/20160418/thau/edna_test/thau_2_0003.jpeg','/dls/i03/data/2016/cm14451-2/jpegs/gw/20160418/thau/edna_test/thau_2_0003.thumb.jpeg',294,0,299.908,NULL,NULL,'2016-04-14 02:19:04',NULL,'2016-04-14 02:19:04'); +INSERT INTO `Image` (`imageId`, `dataCollectionId`, `imageNumber`, `fileName`, `fileLocation`, `measuredIntensity`, `jpegFileFullPath`, `jpegThumbnailFileFullPath`, `temperature`, `cumulativeIntensity`, `synchrotronCurrent`, `comments`, `machineMessage`, `BLTIMESTAMP`, `motorPositionId`, `recordTimeStamp`) VALUES (274837165,1052494,1,'xtal1_1_0001.cbf','/dls/i03/data/2016/cm14451-2/20160413/test_xtal',0,'/dls/i03/data/2016/cm14451-2/jpegs/20160413/test_xtal/xtal1_1_0001.jpeg','/dls/i03/data/2016/cm14451-2/jpegs/20160413/test_xtal/xtal1_1_0001.thumb.jpeg',294,0,298.847,NULL,NULL,'2016-04-13 11:18:39',NULL,'2016-04-13 11:18:39'),(274837168,1052494,2,'xtal1_1_0002.cbf','/dls/i03/data/2016/cm14451-2/20160413/test_xtal',0,'/dls/i03/data/2016/cm14451-2/jpegs/20160413/test_xtal/xtal1_1_0002.jpeg','/dls/i03/data/2016/cm14451-2/jpegs/20160413/test_xtal/xtal1_1_0002.thumb.jpeg',294,0,298.74,NULL,NULL,'2016-04-13 11:18:50',NULL,'2016-04-13 11:18:50'),(274837177,1052503,1,'xtal1_3_0001.cbf','/dls/i03/data/2016/cm14451-2/20160413/test_xtal',0,'/dls/i03/data/2016/cm14451-2/jpegs/20160413/test_xtal/xtal1_3_0001.jpeg','/dls/i03/data/2016/cm14451-2/jpegs/20160413/test_xtal/xtal1_3_0001.thumb.jpeg',294,0,302.004,NULL,NULL,'2016-04-13 11:21:36',NULL,'2016-04-13 11:21:36'),(274837180,1052503,2,'xtal1_3_0002.cbf','/dls/i03/data/2016/cm14451-2/20160413/test_xtal',0,'/dls/i03/data/2016/cm14451-2/jpegs/20160413/test_xtal/xtal1_3_0002.jpeg','/dls/i03/data/2016/cm14451-2/jpegs/20160413/test_xtal/xtal1_3_0002.thumb.jpeg',294,0,301.922,NULL,NULL,'2016-04-13 11:21:45',NULL,'2016-04-13 11:21:45'),(274837183,1052503,3,'xtal1_3_0003.cbf','/dls/i03/data/2016/cm14451-2/20160413/test_xtal',0,'/dls/i03/data/2016/cm14451-2/jpegs/20160413/test_xtal/xtal1_3_0003.jpeg','/dls/i03/data/2016/cm14451-2/jpegs/20160413/test_xtal/xtal1_3_0003.thumb.jpeg',294,0,301.842,NULL,NULL,'2016-04-13 11:21:54',NULL,'2016-04-13 11:21:54'),(284717989,1066786,1,'thau_2_0001.cbf','/dls/i03/data/2016/cm14451-2/gw/20160418/thau/edna_test',0,'/dls/i03/data/2016/cm14451-2/jpegs/gw/20160418/thau/edna_test/thau_2_0001.jpeg','/dls/i03/data/2016/cm14451-2/jpegs/gw/20160418/thau/edna_test/thau_2_0001.thumb.jpeg',294,0,299.987,NULL,NULL,'2016-04-14 02:19:04',NULL,'2016-04-14 02:19:04'),(284718055,1066786,2,'thau_2_0002.cbf','/dls/i03/data/2016/cm14451-2/gw/20160418/thau/edna_test',0,'/dls/i03/data/2016/cm14451-2/jpegs/gw/20160418/thau/edna_test/thau_2_0002.jpeg','/dls/i03/data/2016/cm14451-2/jpegs/gw/20160418/thau/edna_test/thau_2_0002.thumb.jpeg',294,0,299.933,NULL,NULL,'2016-04-14 02:19:04',NULL,'2016-04-14 02:19:04'),(284718118,1066786,3,'thau_2_0003.cbf','/dls/i03/data/2016/cm14451-2/gw/20160418/thau/edna_test',0,'/dls/i03/data/2016/cm14451-2/jpegs/gw/20160418/thau/edna_test/thau_2_0003.jpeg','/dls/i03/data/2016/cm14451-2/jpegs/gw/20160418/thau/edna_test/thau_2_0003.thumb.jpeg',294,0,299.908,NULL,NULL,'2016-04-14 02:19:04',NULL,'2016-04-14 02:19:04'); /*!40000 ALTER TABLE `Image` ENABLE KEYS */; /*!40000 ALTER TABLE `ImageQualityIndicators` DISABLE KEYS */; -INSERT INTO `ImageQualityIndicators` (`dataCollectionId`, `imageNumber`, `imageId`, `autoProcProgramId`, `spotTotal`, `inResTotal`, `goodBraggCandidates`, `iceRings`, `method1Res`, `method2Res`, `maxUnitCell`, `pctSaturationTop50Peaks`, `inResolutionOvrlSpots`, `binPopCutOffMethod2Res`, `recordTimeStamp`, `totalIntegratedSignal`, `dozor_score`, `driftFactor`) VALUES (1052494,1,NULL,NULL,296,296,259,0,2.03,2.03,0,0,0,0,NULL,2.61,NULL,NULL), -(1052494,2,NULL,NULL,239,239,224,0,2.12,2.12,0,0,0,0,NULL,2.95,NULL,NULL), -(1052503,1,274837177,NULL,217,217,202,0,2.07,2.07,0,0,0,0,NULL,2.99,NULL,NULL), -(1052503,2,NULL,NULL,257,257,236,0,2.06,2.06,0,0,0,0,NULL,3.02,NULL,NULL), -(1052503,3,NULL,NULL,306,306,278,0,2.04,2.04,0,0,0,0,NULL,2.75,NULL,NULL), -(1066786,1,284717989,NULL,1132,1132,872,0,1.63,1.63,0,0,0,0,NULL,2.09,NULL,NULL), -(1066786,2,284718055,NULL,848,848,652,0,1.56,1.56,0,0,0,0,NULL,2.03,NULL,NULL), -(1066786,3,284718118,NULL,922,922,735,0,1.57,1.57,0,0,0,0,NULL,2.13,NULL,NULL); +INSERT INTO `ImageQualityIndicators` (`dataCollectionId`, `imageNumber`, `imageId`, `autoProcProgramId`, `spotTotal`, `inResTotal`, `goodBraggCandidates`, `iceRings`, `method1Res`, `method2Res`, `maxUnitCell`, `pctSaturationTop50Peaks`, `inResolutionOvrlSpots`, `binPopCutOffMethod2Res`, `recordTimeStamp`, `totalIntegratedSignal`, `dozor_score`, `driftFactor`) VALUES (1052494,1,NULL,NULL,296,296,259,0,2.03,2.03,0,0,0,0,NULL,2.61,NULL,NULL),(1052494,2,NULL,NULL,239,239,224,0,2.12,2.12,0,0,0,0,NULL,2.95,NULL,NULL),(1052503,1,274837177,NULL,217,217,202,0,2.07,2.07,0,0,0,0,NULL,2.99,NULL,NULL),(1052503,2,NULL,NULL,257,257,236,0,2.06,2.06,0,0,0,0,NULL,3.02,NULL,NULL),(1052503,3,NULL,NULL,306,306,278,0,2.04,2.04,0,0,0,0,NULL,2.75,NULL,NULL),(1066786,1,284717989,NULL,1132,1132,872,0,1.63,1.63,0,0,0,0,NULL,2.09,NULL,NULL),(1066786,2,284718055,NULL,848,848,652,0,1.56,1.56,0,0,0,0,NULL,2.03,NULL,NULL),(1066786,3,284718118,NULL,922,922,735,0,1.57,1.57,0,0,0,0,NULL,2.13,NULL,NULL); /*!40000 ALTER TABLE `ImageQualityIndicators` ENABLE KEYS */; /*!40000 ALTER TABLE `IspybCrystalClass` DISABLE KEYS */; @@ -555,8 +309,7 @@ INSERT INTO `ImageQualityIndicators` (`dataCollectionId`, `imageNumber`, `imageI /*!40000 ALTER TABLE `Laboratory` ENABLE KEYS */; /*!40000 ALTER TABLE `MXMRRun` DISABLE KEYS */; -INSERT INTO `MXMRRun` (`mxMRRunId`, `autoProcScalingId`, `rValueStart`, `rValueEnd`, `rFreeValueStart`, `rFreeValueEnd`, `LLG`, `TFZ`, `spaceGroup`, `autoProcProgramId`) VALUES (672897,603470,0.1812,0.1682,0.1896,0.1888,NULL,NULL,NULL,56986674), -(672900,603470,NULL,NULL,NULL,NULL,NULL,NULL,NULL,56986675); +INSERT INTO `MXMRRun` (`mxMRRunId`, `autoProcScalingId`, `rValueStart`, `rValueEnd`, `rFreeValueStart`, `rFreeValueEnd`, `LLG`, `TFZ`, `spaceGroup`, `autoProcProgramId`) VALUES (672897,603470,0.1812,0.1682,0.1896,0.1888,NULL,NULL,NULL,56986674),(672900,603470,NULL,NULL,NULL,NULL,NULL,NULL,NULL,56986675); /*!40000 ALTER TABLE `MXMRRun` ENABLE KEYS */; /*!40000 ALTER TABLE `MXMRRunBlob` DISABLE KEYS */; @@ -597,9 +350,7 @@ INSERT INTO `PDB` (`pdbId`, `name`, `contents`, `code`, `source`) VALUES (6,'ceo /*!40000 ALTER TABLE `ParticlePicker` ENABLE KEYS */; /*!40000 ALTER TABLE `Person` DISABLE KEYS */; -INSERT INTO `Person` (`personId`, `laboratoryId`, `siteId`, `personUUID`, `familyName`, `givenName`, `title`, `emailAddress`, `phoneNumber`, `login`, `faxNumber`, `recordTimeStamp`, `cache`, `externalId`) VALUES (1,NULL,NULL,NULL,'McBoatface','Boaty','Mr',NULL,NULL,'boaty',NULL,'2016-03-20 13:56:45','a:1:{s:9:\"container\";N;}',NULL), -(46266,NULL,NULL,NULL,NULL,NULL,'User',NULL,NULL,NULL,NULL,'2016-03-16 15:53:55',NULL,NULL), -(46269,NULL,NULL,NULL,NULL,NULL,'User',NULL,NULL,NULL,NULL,'2016-03-16 15:59:22',NULL,NULL); +INSERT INTO `Person` (`personId`, `laboratoryId`, `siteId`, `personUUID`, `familyName`, `givenName`, `title`, `emailAddress`, `phoneNumber`, `login`, `faxNumber`, `recordTimeStamp`, `cache`, `externalId`) VALUES (1,NULL,NULL,NULL,'McBoatface','Boaty','Mr',NULL,NULL,'boaty',NULL,'2016-03-20 13:56:45','a:1:{s:9:\"container\";N;}',NULL),(46266,NULL,NULL,NULL,NULL,NULL,'User',NULL,NULL,NULL,NULL,'2016-03-16 15:53:55',NULL,NULL),(46269,NULL,NULL,NULL,NULL,NULL,'User',NULL,NULL,NULL,NULL,'2016-03-16 15:59:22',NULL,NULL); /*!40000 ALTER TABLE `Person` ENABLE KEYS */; /*!40000 ALTER TABLE `Phasing` DISABLE KEYS */; @@ -624,8 +375,7 @@ INSERT INTO `Person` (`personId`, `laboratoryId`, `siteId`, `personUUID`, `famil /*!40000 ALTER TABLE `Phasing_has_Scaling` ENABLE KEYS */; /*!40000 ALTER TABLE `Position` DISABLE KEYS */; -INSERT INTO `Position` (`positionId`, `relativePositionId`, `posX`, `posY`, `posZ`, `scale`, `recordTimeStamp`, `X`, `Y`, `Z`) VALUES (2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), -(5,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL); +INSERT INTO `Position` (`positionId`, `relativePositionId`, `posX`, `posY`, `posZ`, `scale`, `recordTimeStamp`, `X`, `Y`, `Z`) VALUES (2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(5,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL); /*!40000 ALTER TABLE `Position` ENABLE KEYS */; /*!40000 ALTER TABLE `Positioner` DISABLE KEYS */; @@ -642,13 +392,11 @@ INSERT INTO `ProcessingJob` (`processingJobId`, `dataCollectionId`, `displayName /*!40000 ALTER TABLE `ProcessingJob` ENABLE KEYS */; /*!40000 ALTER TABLE `ProcessingJobImageSweep` DISABLE KEYS */; -INSERT INTO `ProcessingJobImageSweep` (`processingJobImageSweepId`, `processingJobId`, `dataCollectionId`, `startImage`, `endImage`) VALUES (5,5,1002287,1,270), -(8,5,1002287,271,360); +INSERT INTO `ProcessingJobImageSweep` (`processingJobImageSweepId`, `processingJobId`, `dataCollectionId`, `startImage`, `endImage`) VALUES (5,5,1002287,1,270),(8,5,1002287,271,360); /*!40000 ALTER TABLE `ProcessingJobImageSweep` ENABLE KEYS */; /*!40000 ALTER TABLE `ProcessingJobParameter` DISABLE KEYS */; -INSERT INTO `ProcessingJobParameter` (`processingJobParameterId`, `processingJobId`, `parameterKey`, `parameterValue`) VALUES (5,5,'vortex factor','1.8*10^102'), -(8,5,'80s factor','0.87*10^-93'); +INSERT INTO `ProcessingJobParameter` (`processingJobParameterId`, `processingJobId`, `parameterKey`, `parameterValue`) VALUES (5,5,'vortex factor','1.8*10^102'),(8,5,'80s factor','0.87*10^-93'); /*!40000 ALTER TABLE `ProcessingJobParameter` ENABLE KEYS */; /*!40000 ALTER TABLE `Project` DISABLE KEYS */; @@ -682,8 +430,7 @@ INSERT INTO `ProcessingJobParameter` (`processingJobParameterId`, `processingJob /*!40000 ALTER TABLE `Project_has_XFEFSpectrum` ENABLE KEYS */; /*!40000 ALTER TABLE `Proposal` DISABLE KEYS */; -INSERT INTO `Proposal` (`proposalId`, `personId`, `title`, `proposalCode`, `proposalNumber`, `bltimeStamp`, `proposalType`, `externalId`, `state`) VALUES (37027,1,'I03 Commissioning Directory 2016','cm','14451','2015-12-21 15:20:43',NULL,NULL,'Open'), -(141666,46266,'Test Proposal cm-0001','cm','1','2016-03-16 16:01:34',NULL,NULL,'Open'); +INSERT INTO `Proposal` (`proposalId`, `personId`, `title`, `proposalCode`, `proposalNumber`, `bltimeStamp`, `proposalType`, `externalId`, `state`) VALUES (37027,1,'I03 Commissioning Directory 2016','cm','14451','2015-12-21 15:20:43',NULL,NULL,'Open'),(141666,46266,'Test Proposal cm-0001','cm','1','2016-03-16 16:01:34',NULL,NULL,'Open'); /*!40000 ALTER TABLE `Proposal` ENABLE KEYS */; /*!40000 ALTER TABLE `ProposalHasPerson` DISABLE KEYS */; @@ -691,21 +438,7 @@ INSERT INTO `ProposalHasPerson` (`proposalHasPersonId`, `proposalId`, `personId` /*!40000 ALTER TABLE `ProposalHasPerson` ENABLE KEYS */; /*!40000 ALTER TABLE `Protein` DISABLE KEYS */; -INSERT INTO `Protein` (`proteinId`, `proposalId`, `name`, `acronym`, `description`, `hazardGroup`, `containmentLevel`, `safetyLevel`, `molecularMass`, `proteinType`, `personId`, `bltimeStamp`, `isCreatedBySampleSheet`, `sequence`, `MOD_ID`, `componentTypeId`, `concentrationTypeId`, `global`, `externalId`, `density`, `abundance`, `isotropy`) VALUES (4380,141666,'Protein 01','PRT-01',NULL,1,1,NULL,NULL,NULL,NULL,'2016-03-17 15:57:52',0,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL), -(4383,141666,'Protein 02','PRT-02',NULL,1,1,NULL,NULL,NULL,NULL,'2016-03-17 16:02:07',0,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL), -(4386,141666,'Protein 03','PRT-03',NULL,1,1,NULL,NULL,NULL,NULL,'2016-03-17 16:02:07',0,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL), -(4389,141666,'Protein 04','PRT-04',NULL,1,1,NULL,NULL,NULL,NULL,'2016-03-17 16:02:07',0,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL), -(4392,141666,'Protein 05','PRT-05',NULL,1,1,NULL,NULL,NULL,NULL,'2016-03-17 16:02:07',0,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL), -(4395,141666,'Protein 06','PRT-06',NULL,1,1,NULL,NULL,NULL,NULL,'2016-03-17 16:02:07',0,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL), -(4398,141666,'Protein 07','PRT-07',NULL,1,1,NULL,NULL,NULL,NULL,'2016-03-17 16:02:07',0,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL), -(4401,141666,'Protein 08','PRT-08',NULL,1,1,NULL,NULL,NULL,NULL,'2016-03-17 16:02:07',0,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL), -(4404,141666,'Protein 09','PRT-09',NULL,1,1,NULL,NULL,NULL,NULL,'2016-03-17 16:02:07',0,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL), -(4407,141666,'Protein 10','PRT-10',NULL,1,1,NULL,NULL,NULL,NULL,'2016-03-17 16:02:07',0,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL), -(4410,141666,'Protein 11','PRT-11',NULL,1,1,NULL,NULL,NULL,NULL,'2016-03-17 16:02:07',0,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL), -(4413,141666,'Protein 12','PRT-12',NULL,1,1,NULL,NULL,NULL,NULL,'2016-03-17 16:02:07',0,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL), -(121393,37027,'therm','therm',NULL,1,1,NULL,NULL,NULL,NULL,'2016-01-13 13:50:20',0,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL), -(123491,37027,NULL,'thau',NULL,1,1,NULL,NULL,NULL,NULL,'2016-02-24 12:12:16',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), -(123497,37027,'XPDF comp1','xpdf-comp-01',NULL,1,1,NULL,NULL,NULL,NULL,'2017-03-23 22:03:40',0,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL); +INSERT INTO `Protein` (`proteinId`, `proposalId`, `name`, `acronym`, `description`, `hazardGroup`, `containmentLevel`, `safetyLevel`, `molecularMass`, `proteinType`, `personId`, `bltimeStamp`, `isCreatedBySampleSheet`, `sequence`, `MOD_ID`, `componentTypeId`, `concentrationTypeId`, `global`, `externalId`, `density`, `abundance`, `isotropy`) VALUES (4380,141666,'Protein 01','PRT-01',NULL,1,1,NULL,NULL,NULL,NULL,'2016-03-17 15:57:52',0,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL),(4383,141666,'Protein 02','PRT-02',NULL,1,1,NULL,NULL,NULL,NULL,'2016-03-17 16:02:07',0,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL),(4386,141666,'Protein 03','PRT-03',NULL,1,1,NULL,NULL,NULL,NULL,'2016-03-17 16:02:07',0,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL),(4389,141666,'Protein 04','PRT-04',NULL,1,1,NULL,NULL,NULL,NULL,'2016-03-17 16:02:07',0,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL),(4392,141666,'Protein 05','PRT-05',NULL,1,1,NULL,NULL,NULL,NULL,'2016-03-17 16:02:07',0,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL),(4395,141666,'Protein 06','PRT-06',NULL,1,1,NULL,NULL,NULL,NULL,'2016-03-17 16:02:07',0,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL),(4398,141666,'Protein 07','PRT-07',NULL,1,1,NULL,NULL,NULL,NULL,'2016-03-17 16:02:07',0,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL),(4401,141666,'Protein 08','PRT-08',NULL,1,1,NULL,NULL,NULL,NULL,'2016-03-17 16:02:07',0,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL),(4404,141666,'Protein 09','PRT-09',NULL,1,1,NULL,NULL,NULL,NULL,'2016-03-17 16:02:07',0,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL),(4407,141666,'Protein 10','PRT-10',NULL,1,1,NULL,NULL,NULL,NULL,'2016-03-17 16:02:07',0,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL),(4410,141666,'Protein 11','PRT-11',NULL,1,1,NULL,NULL,NULL,NULL,'2016-03-17 16:02:07',0,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL),(4413,141666,'Protein 12','PRT-12',NULL,1,1,NULL,NULL,NULL,NULL,'2016-03-17 16:02:07',0,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL),(121393,37027,'therm','therm',NULL,1,1,NULL,NULL,NULL,NULL,'2016-01-13 13:50:20',0,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL),(123491,37027,NULL,'thau',NULL,1,1,NULL,NULL,NULL,NULL,'2016-02-24 12:12:16',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(123497,37027,'XPDF comp1','xpdf-comp-01',NULL,1,1,NULL,NULL,NULL,NULL,'2017-03-23 22:03:40',0,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL); /*!40000 ALTER TABLE `Protein` ENABLE KEYS */; /*!40000 ALTER TABLE `Protein_has_PDB` DISABLE KEYS */; @@ -728,13 +461,7 @@ INSERT INTO `Protein_has_PDB` (`proteinhaspdbid`, `proteinid`, `pdbid`) VALUES ( /*!40000 ALTER TABLE `SampleComposition` ENABLE KEYS */; /*!40000 ALTER TABLE `ScanParametersModel` DISABLE KEYS */; -INSERT INTO `ScanParametersModel` (`scanParametersModelId`, `scanParametersServiceId`, `dataCollectionPlanId`, `sequenceNumber`, `start`, `stop`, `step`, `array`, `duration`) VALUES (4,4,197788,1,0,90,10,NULL,NULL), -(7,4,197788,2,90,180,5,NULL,NULL), -(10,4,197788,3,180,270,1,NULL,NULL), -(13,4,197788,3,270,360,0.5,NULL,NULL), -(16,7,197788,4,20,120,10,NULL,NULL), -(20,7,197792,1,0,90,5,NULL,NULL), -(23,7,197792,2,90,120,1,NULL,NULL); +INSERT INTO `ScanParametersModel` (`scanParametersModelId`, `scanParametersServiceId`, `dataCollectionPlanId`, `sequenceNumber`, `start`, `stop`, `step`, `array`, `duration`) VALUES (4,4,197788,1,0,90,10,NULL,NULL),(7,4,197788,2,90,180,5,NULL,NULL),(10,4,197788,3,180,270,1,NULL,NULL),(13,4,197788,3,270,360,0.5,NULL,NULL),(16,7,197788,4,20,120,10,NULL,NULL),(20,7,197792,1,0,90,5,NULL,NULL),(23,7,197792,2,90,120,1,NULL,NULL); /*!40000 ALTER TABLE `ScanParametersModel` ENABLE KEYS */; /*!40000 ALTER TABLE `Screen` DISABLE KEYS */; @@ -747,93 +474,19 @@ INSERT INTO `ScanParametersModel` (`scanParametersModelId`, `scanParametersServi /*!40000 ALTER TABLE `ScreenComponentGroup` ENABLE KEYS */; /*!40000 ALTER TABLE `Screening` DISABLE KEYS */; -INSERT INTO `Screening` (`screeningId`, `dataCollectionId`, `bltimeStamp`, `programVersion`, `comments`, `shortComments`, `diffractionPlanId`, `dataCollectionGroupId`, `xmlSampleInformation`, `autoProcProgramId`) VALUES (1894770,1052494,'2016-10-26 08:50:31','mosflm',NULL,'Mosflm native',NULL,1040398,NULL,NULL), -(1894773,1052494,'2016-10-26 08:50:31','mosflm',NULL,'Mosflm anomalous',NULL,1040398,NULL,NULL), -(1894774,1052494,'2016-10-26 08:50:31','EDNA MXv1','Standard Native Dataset Multiplicity=3 I/sig=2 Maxlifespan=202 s','EDNAStrategy1',NULL,1040398,NULL,NULL), -(1894777,1052494,'2016-10-26 08:50:31','EDNA MXv1','strategy with target multiplicity=16, target I/sig=2 Maxlifespan=202 s','EDNAStrategy3',NULL,1040398,NULL,NULL), -(1894780,1052494,'2016-10-26 08:50:31','EDNA MXv1','Gentle: Target Multiplicity=2 and target I/Sig 2 and Maxlifespan=20 s','EDNAStrategy4',NULL,1040398,NULL,NULL), -(1894783,1052494,'2016-10-26 08:50:31','EDNA MXv1','Standard Anomalous Dataset Multiplicity=3 I/sig=2 Maxlifespan=202 s','EDNAStrategy2',NULL,1040398,NULL,NULL), -(1894786,1052494,'2016-10-26 08:50:31','EDNA MXv1','UnderDEV Anomalous Dataset, RadDamage of standard protein','EDNAStrategy5',NULL,1040398,NULL,NULL), -(1894807,1052503,'2016-10-26 08:50:31','EDNA MXv1','strategy with target multiplicity=16, target I/sig=2 Maxlifespan=202 s','EDNAStrategy3',NULL,1040407,NULL,NULL), -(1894810,1052503,'2016-10-26 08:50:31','EDNA MXv1','Standard Anomalous Dataset Multiplicity=3 I/sig=2 Maxlifespan=202 s','EDNAStrategy2',NULL,1040407,NULL,NULL), -(1894812,1052503,'2016-10-26 08:50:31','mosflm',NULL,'Mosflm native',NULL,1040407,NULL,NULL), -(1894815,1052503,'2016-10-26 08:50:31','mosflm',NULL,'Mosflm anomalous',NULL,1040407,NULL,NULL), -(1894816,1052503,'2016-10-26 08:50:31','EDNA MXv1','Gentle: Target Multiplicity=2 and target I/Sig 2 and Maxlifespan=20 s','EDNAStrategy4',NULL,1040407,NULL,NULL), -(1894819,1052503,'2016-10-26 08:50:31','EDNA MXv1','UnderDEV Anomalous Dataset, RadDamage of standard protein','EDNAStrategy5',NULL,1040407,NULL,NULL), -(1894822,1052503,'2016-10-26 08:50:31','EDNA MXv1','Standard Native Dataset Multiplicity=3 I/sig=2 Maxlifespan=202 s','EDNAStrategy1',NULL,1040407,NULL,NULL), -(1927968,1066786,'2016-10-26 08:50:31','mosflm',NULL,'Mosflm native',NULL,1054243,NULL,NULL), -(1927971,1066786,'2016-10-26 08:50:31','mosflm',NULL,'Mosflm anomalous',NULL,1054243,NULL,NULL), -(1927972,1066786,'2016-10-26 08:50:31','EDNA MXv1','Standard Native Dataset Multiplicity=3 I/sig=2 Maxlifespan=4034 s','EDNAStrategy1',NULL,1054243,NULL,NULL), -(1927981,1066786,'2016-10-26 08:50:31','EDNA MXv1','Gentle: Target Multiplicity=2 and target I/Sig 2 and Maxlifespan=403 s','EDNAStrategy4',NULL,1054243,NULL,NULL), -(1927984,1066786,'2016-10-26 08:50:31','EDNA MXv1','strategy with target multiplicity=16, target I/sig=2 Maxlifespan=4034 s','EDNAStrategy3',NULL,1054243,NULL,NULL), -(1927987,1066786,'2016-10-26 08:50:31','EDNA MXv1','Standard Anomalous Dataset Multiplicity=3 I/sig=2 Maxlifespan=4034 s','EDNAStrategy2',NULL,1054243,NULL,NULL), -(1927990,1066786,'2016-10-26 08:50:31','EDNA MXv1','UnderDEV Anomalous Dataset, RadDamage of standard protein','EDNAStrategy5',NULL,1054243,NULL,NULL); +INSERT INTO `Screening` (`screeningId`, `dataCollectionId`, `bltimeStamp`, `programVersion`, `comments`, `shortComments`, `diffractionPlanId`, `dataCollectionGroupId`, `xmlSampleInformation`, `autoProcProgramId`) VALUES (1894770,1052494,'2016-10-26 08:50:31','mosflm',NULL,'Mosflm native',NULL,1040398,NULL,NULL),(1894773,1052494,'2016-10-26 08:50:31','mosflm',NULL,'Mosflm anomalous',NULL,1040398,NULL,NULL),(1894774,1052494,'2016-10-26 08:50:31','EDNA MXv1','Standard Native Dataset Multiplicity=3 I/sig=2 Maxlifespan=202 s','EDNAStrategy1',NULL,1040398,NULL,NULL),(1894777,1052494,'2016-10-26 08:50:31','EDNA MXv1','strategy with target multiplicity=16, target I/sig=2 Maxlifespan=202 s','EDNAStrategy3',NULL,1040398,NULL,NULL),(1894780,1052494,'2016-10-26 08:50:31','EDNA MXv1','Gentle: Target Multiplicity=2 and target I/Sig 2 and Maxlifespan=20 s','EDNAStrategy4',NULL,1040398,NULL,NULL),(1894783,1052494,'2016-10-26 08:50:31','EDNA MXv1','Standard Anomalous Dataset Multiplicity=3 I/sig=2 Maxlifespan=202 s','EDNAStrategy2',NULL,1040398,NULL,NULL),(1894786,1052494,'2016-10-26 08:50:31','EDNA MXv1','UnderDEV Anomalous Dataset, RadDamage of standard protein','EDNAStrategy5',NULL,1040398,NULL,NULL),(1894807,1052503,'2016-10-26 08:50:31','EDNA MXv1','strategy with target multiplicity=16, target I/sig=2 Maxlifespan=202 s','EDNAStrategy3',NULL,1040407,NULL,NULL),(1894810,1052503,'2016-10-26 08:50:31','EDNA MXv1','Standard Anomalous Dataset Multiplicity=3 I/sig=2 Maxlifespan=202 s','EDNAStrategy2',NULL,1040407,NULL,NULL),(1894812,1052503,'2016-10-26 08:50:31','mosflm',NULL,'Mosflm native',NULL,1040407,NULL,NULL),(1894815,1052503,'2016-10-26 08:50:31','mosflm',NULL,'Mosflm anomalous',NULL,1040407,NULL,NULL),(1894816,1052503,'2016-10-26 08:50:31','EDNA MXv1','Gentle: Target Multiplicity=2 and target I/Sig 2 and Maxlifespan=20 s','EDNAStrategy4',NULL,1040407,NULL,NULL),(1894819,1052503,'2016-10-26 08:50:31','EDNA MXv1','UnderDEV Anomalous Dataset, RadDamage of standard protein','EDNAStrategy5',NULL,1040407,NULL,NULL),(1894822,1052503,'2016-10-26 08:50:31','EDNA MXv1','Standard Native Dataset Multiplicity=3 I/sig=2 Maxlifespan=202 s','EDNAStrategy1',NULL,1040407,NULL,NULL),(1927968,1066786,'2016-10-26 08:50:31','mosflm',NULL,'Mosflm native',NULL,1054243,NULL,NULL),(1927971,1066786,'2016-10-26 08:50:31','mosflm',NULL,'Mosflm anomalous',NULL,1054243,NULL,NULL),(1927972,1066786,'2016-10-26 08:50:31','EDNA MXv1','Standard Native Dataset Multiplicity=3 I/sig=2 Maxlifespan=4034 s','EDNAStrategy1',NULL,1054243,NULL,NULL),(1927981,1066786,'2016-10-26 08:50:31','EDNA MXv1','Gentle: Target Multiplicity=2 and target I/Sig 2 and Maxlifespan=403 s','EDNAStrategy4',NULL,1054243,NULL,NULL),(1927984,1066786,'2016-10-26 08:50:31','EDNA MXv1','strategy with target multiplicity=16, target I/sig=2 Maxlifespan=4034 s','EDNAStrategy3',NULL,1054243,NULL,NULL),(1927987,1066786,'2016-10-26 08:50:31','EDNA MXv1','Standard Anomalous Dataset Multiplicity=3 I/sig=2 Maxlifespan=4034 s','EDNAStrategy2',NULL,1054243,NULL,NULL),(1927990,1066786,'2016-10-26 08:50:31','EDNA MXv1','UnderDEV Anomalous Dataset, RadDamage of standard protein','EDNAStrategy5',NULL,1054243,NULL,NULL); /*!40000 ALTER TABLE `Screening` ENABLE KEYS */; /*!40000 ALTER TABLE `ScreeningInput` DISABLE KEYS */; -INSERT INTO `ScreeningInput` (`screeningInputId`, `screeningId`, `beamX`, `beamY`, `rmsErrorLimits`, `minimumFractionIndexed`, `maximumFractionRejected`, `minimumSignalToNoise`, `diffractionPlanId`, `xmlSampleInformation`) VALUES (983791,1894774,208.731,214.298,NULL,NULL,NULL,NULL,NULL,NULL), -(983794,1894777,208.731,214.298,NULL,NULL,NULL,NULL,NULL,NULL), -(983797,1894780,208.731,214.298,NULL,NULL,NULL,NULL,NULL,NULL), -(983800,1894783,208.731,214.298,NULL,NULL,NULL,NULL,NULL,NULL), -(983803,1894786,208.731,214.298,NULL,NULL,NULL,NULL,NULL,NULL), -(983821,1894807,208.32,214.339,NULL,NULL,NULL,NULL,NULL,NULL), -(983824,1894810,208.32,214.339,NULL,NULL,NULL,NULL,NULL,NULL), -(983827,1894816,208.32,214.339,NULL,NULL,NULL,NULL,NULL,NULL), -(983830,1894819,208.32,214.339,NULL,NULL,NULL,NULL,NULL,NULL), -(983833,1894822,208.32,214.339,NULL,NULL,NULL,NULL,NULL,NULL), -(1013146,1927972,208.32,214.339,NULL,NULL,NULL,NULL,NULL,NULL), -(1013155,1927981,208.32,214.339,NULL,NULL,NULL,NULL,NULL,NULL), -(1013158,1927984,208.32,214.339,NULL,NULL,NULL,NULL,NULL,NULL), -(1013161,1927987,208.32,214.339,NULL,NULL,NULL,NULL,NULL,NULL), -(1013164,1927990,208.32,214.339,NULL,NULL,NULL,NULL,NULL,NULL); +INSERT INTO `ScreeningInput` (`screeningInputId`, `screeningId`, `beamX`, `beamY`, `rmsErrorLimits`, `minimumFractionIndexed`, `maximumFractionRejected`, `minimumSignalToNoise`, `diffractionPlanId`, `xmlSampleInformation`) VALUES (983791,1894774,208.731,214.298,NULL,NULL,NULL,NULL,NULL,NULL),(983794,1894777,208.731,214.298,NULL,NULL,NULL,NULL,NULL,NULL),(983797,1894780,208.731,214.298,NULL,NULL,NULL,NULL,NULL,NULL),(983800,1894783,208.731,214.298,NULL,NULL,NULL,NULL,NULL,NULL),(983803,1894786,208.731,214.298,NULL,NULL,NULL,NULL,NULL,NULL),(983821,1894807,208.32,214.339,NULL,NULL,NULL,NULL,NULL,NULL),(983824,1894810,208.32,214.339,NULL,NULL,NULL,NULL,NULL,NULL),(983827,1894816,208.32,214.339,NULL,NULL,NULL,NULL,NULL,NULL),(983830,1894819,208.32,214.339,NULL,NULL,NULL,NULL,NULL,NULL),(983833,1894822,208.32,214.339,NULL,NULL,NULL,NULL,NULL,NULL),(1013146,1927972,208.32,214.339,NULL,NULL,NULL,NULL,NULL,NULL),(1013155,1927981,208.32,214.339,NULL,NULL,NULL,NULL,NULL,NULL),(1013158,1927984,208.32,214.339,NULL,NULL,NULL,NULL,NULL,NULL),(1013161,1927987,208.32,214.339,NULL,NULL,NULL,NULL,NULL,NULL),(1013164,1927990,208.32,214.339,NULL,NULL,NULL,NULL,NULL,NULL); /*!40000 ALTER TABLE `ScreeningInput` ENABLE KEYS */; /*!40000 ALTER TABLE `ScreeningOutput` DISABLE KEYS */; -INSERT INTO `ScreeningOutput` (`screeningOutputId`, `screeningId`, `statusDescription`, `rejectedReflections`, `resolutionObtained`, `spotDeviationR`, `spotDeviationTheta`, `beamShiftX`, `beamShiftY`, `numSpotsFound`, `numSpotsUsed`, `numSpotsRejected`, `mosaicity`, `iOverSigma`, `diffractionRings`, `SCREENINGSUCCESS`, `mosaicityEstimated`, `rankingResolution`, `program`, `doseTotal`, `totalExposureTime`, `totalRotationRange`, `totalNumberOfImages`, `rFriedel`, `indexingSuccess`, `strategySuccess`, `alignmentSuccess`) VALUES (1489401,1894770,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0), -(1489404,1894773,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0), -(1489405,1894774,'Labelit: Indexing successful (I23). Integration successful. Strategy calculation successful.',NULL,NULL,0.197,NULL,-0.0094,-0.0618,303,303,0,1.2,NULL,NULL,1,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0), -(1489408,1894777,'Labelit: Indexing successful (I23). Integration successful. Strategy calculation successful.',NULL,NULL,0.197,NULL,-0.0094,-0.0618,303,303,0,1.2,NULL,NULL,1,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0), -(1489411,1894780,'Labelit: Indexing successful (I23). Integration successful. Strategy calculation successful.',NULL,NULL,0.197,NULL,-0.0094,-0.0618,303,303,0,1.2,NULL,NULL,1,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0), -(1489414,1894783,'Labelit: Indexing successful (I23). Integration successful. Strategy calculation successful.',NULL,NULL,0.197,NULL,-0.0094,-0.0618,303,303,0,1.2,NULL,NULL,1,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0), -(1489417,1894786,'Labelit: Indexing successful (I23). Integration successful. Strategy calculation successful.',NULL,NULL,0.197,NULL,-0.0094,-0.0618,303,303,0,1.2,NULL,NULL,1,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0), -(1489438,1894807,'Labelit: Indexing successful (I23). Integration successful. Strategy calculation successful.',NULL,NULL,0.184,NULL,0.0495,-0.0405,294,294,0,1.35,NULL,NULL,1,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0), -(1489441,1894810,'Labelit: Indexing successful (I23). Integration successful. Strategy calculation successful.',NULL,NULL,0.184,NULL,0.0495,-0.0405,294,294,0,1.35,NULL,NULL,1,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0), -(1489443,1894812,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.6,NULL,NULL,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0), -(1489446,1894815,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.6,NULL,NULL,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0), -(1489447,1894816,'Labelit: Indexing successful (I23). Integration successful. Strategy calculation successful.',NULL,NULL,0.184,NULL,0.0495,-0.0405,294,294,0,1.35,NULL,NULL,1,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0), -(1489450,1894819,'Labelit: Indexing successful (I23). Integration successful. Strategy calculation successful.',NULL,NULL,0.184,NULL,0.0495,-0.0405,294,294,0,1.35,NULL,NULL,1,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0), -(1489453,1894822,'Labelit: Indexing successful (I23). Integration successful. Strategy calculation successful.',NULL,NULL,0.184,NULL,0.0495,-0.0405,294,294,0,1.35,NULL,NULL,1,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0), -(1522596,1927968,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0.8,NULL,NULL,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0), -(1522599,1927971,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0.8,NULL,NULL,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0), -(1522600,1927972,'Labelit: Indexing successful (P4). Integration successful. Strategy calculation successful.',NULL,NULL,0.166,NULL,0.0195,-0.0105,434,434,0,0.7,NULL,NULL,1,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0), -(1522609,1927981,'Labelit: Indexing successful (P4). Integration successful. Strategy calculation successful.',NULL,NULL,0.166,NULL,0.0195,-0.0105,434,434,0,0.7,NULL,NULL,1,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0), -(1522612,1927984,'Labelit: Indexing successful (P4). Integration successful. Strategy calculation successful.',NULL,NULL,0.166,NULL,0.0195,-0.0105,434,434,0,0.7,NULL,NULL,1,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0), -(1522615,1927987,'Labelit: Indexing successful (P4). Integration successful. Strategy calculation successful.',NULL,NULL,0.166,NULL,0.0195,-0.0105,434,434,0,0.7,NULL,NULL,1,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0), -(1522618,1927990,'Labelit: Indexing successful (P4). Integration successful. Strategy calculation successful.',NULL,NULL,0.166,NULL,0.0195,-0.0105,434,434,0,0.7,NULL,NULL,1,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0); +INSERT INTO `ScreeningOutput` (`screeningOutputId`, `screeningId`, `statusDescription`, `rejectedReflections`, `resolutionObtained`, `spotDeviationR`, `spotDeviationTheta`, `beamShiftX`, `beamShiftY`, `numSpotsFound`, `numSpotsUsed`, `numSpotsRejected`, `mosaicity`, `iOverSigma`, `diffractionRings`, `SCREENINGSUCCESS`, `mosaicityEstimated`, `rankingResolution`, `program`, `doseTotal`, `totalExposureTime`, `totalRotationRange`, `totalNumberOfImages`, `rFriedel`, `indexingSuccess`, `strategySuccess`, `alignmentSuccess`) VALUES (1489401,1894770,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0),(1489404,1894773,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0),(1489405,1894774,'Labelit: Indexing successful (I23). Integration successful. Strategy calculation successful.',NULL,NULL,0.197,NULL,-0.0094,-0.0618,303,303,0,1.2,NULL,NULL,1,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0),(1489408,1894777,'Labelit: Indexing successful (I23). Integration successful. Strategy calculation successful.',NULL,NULL,0.197,NULL,-0.0094,-0.0618,303,303,0,1.2,NULL,NULL,1,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0),(1489411,1894780,'Labelit: Indexing successful (I23). Integration successful. Strategy calculation successful.',NULL,NULL,0.197,NULL,-0.0094,-0.0618,303,303,0,1.2,NULL,NULL,1,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0),(1489414,1894783,'Labelit: Indexing successful (I23). Integration successful. Strategy calculation successful.',NULL,NULL,0.197,NULL,-0.0094,-0.0618,303,303,0,1.2,NULL,NULL,1,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0),(1489417,1894786,'Labelit: Indexing successful (I23). Integration successful. Strategy calculation successful.',NULL,NULL,0.197,NULL,-0.0094,-0.0618,303,303,0,1.2,NULL,NULL,1,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0),(1489438,1894807,'Labelit: Indexing successful (I23). Integration successful. Strategy calculation successful.',NULL,NULL,0.184,NULL,0.0495,-0.0405,294,294,0,1.35,NULL,NULL,1,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0),(1489441,1894810,'Labelit: Indexing successful (I23). Integration successful. Strategy calculation successful.',NULL,NULL,0.184,NULL,0.0495,-0.0405,294,294,0,1.35,NULL,NULL,1,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0),(1489443,1894812,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.6,NULL,NULL,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0),(1489446,1894815,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.6,NULL,NULL,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0),(1489447,1894816,'Labelit: Indexing successful (I23). Integration successful. Strategy calculation successful.',NULL,NULL,0.184,NULL,0.0495,-0.0405,294,294,0,1.35,NULL,NULL,1,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0),(1489450,1894819,'Labelit: Indexing successful (I23). Integration successful. Strategy calculation successful.',NULL,NULL,0.184,NULL,0.0495,-0.0405,294,294,0,1.35,NULL,NULL,1,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0),(1489453,1894822,'Labelit: Indexing successful (I23). Integration successful. Strategy calculation successful.',NULL,NULL,0.184,NULL,0.0495,-0.0405,294,294,0,1.35,NULL,NULL,1,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0),(1522596,1927968,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0.8,NULL,NULL,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0),(1522599,1927971,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0.8,NULL,NULL,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0),(1522600,1927972,'Labelit: Indexing successful (P4). Integration successful. Strategy calculation successful.',NULL,NULL,0.166,NULL,0.0195,-0.0105,434,434,0,0.7,NULL,NULL,1,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0),(1522609,1927981,'Labelit: Indexing successful (P4). Integration successful. Strategy calculation successful.',NULL,NULL,0.166,NULL,0.0195,-0.0105,434,434,0,0.7,NULL,NULL,1,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0),(1522612,1927984,'Labelit: Indexing successful (P4). Integration successful. Strategy calculation successful.',NULL,NULL,0.166,NULL,0.0195,-0.0105,434,434,0,0.7,NULL,NULL,1,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0),(1522615,1927987,'Labelit: Indexing successful (P4). Integration successful. Strategy calculation successful.',NULL,NULL,0.166,NULL,0.0195,-0.0105,434,434,0,0.7,NULL,NULL,1,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0),(1522618,1927990,'Labelit: Indexing successful (P4). Integration successful. Strategy calculation successful.',NULL,NULL,0.166,NULL,0.0195,-0.0105,434,434,0,0.7,NULL,NULL,1,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0); /*!40000 ALTER TABLE `ScreeningOutput` ENABLE KEYS */; /*!40000 ALTER TABLE `ScreeningOutputLattice` DISABLE KEYS */; -INSERT INTO `ScreeningOutputLattice` (`screeningOutputLatticeId`, `screeningOutputId`, `spaceGroup`, `pointGroup`, `bravaisLattice`, `rawOrientationMatrix_a_x`, `rawOrientationMatrix_a_y`, `rawOrientationMatrix_a_z`, `rawOrientationMatrix_b_x`, `rawOrientationMatrix_b_y`, `rawOrientationMatrix_b_z`, `rawOrientationMatrix_c_x`, `rawOrientationMatrix_c_y`, `rawOrientationMatrix_c_z`, `unitCell_a`, `unitCell_b`, `unitCell_c`, `unitCell_alpha`, `unitCell_beta`, `unitCell_gamma`, `bltimeStamp`, `labelitIndexing`) VALUES (1309566,1489401,'I23',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,76.339,76.339,76.339,90,90,90,'2016-04-13 11:19:21',0), -(1309569,1489404,'I23',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,76.339,76.339,76.339,90,90,90,'2016-04-13 11:19:21',0), -(1309570,1489405,'I23',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,76.3,76.3,76.3,90,90,90,'2016-04-13 11:19:24',0), -(1309573,1489408,'I23',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,76.3,76.3,76.3,90,90,90,'2016-04-13 11:19:27',0), -(1309576,1489411,'I23',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,76.3,76.3,76.3,90,90,90,'2016-04-13 11:19:29',0), -(1309579,1489414,'I23',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,76.3,76.3,76.3,90,90,90,'2016-04-13 11:19:34',0), -(1309582,1489417,'I23',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,76.3,76.3,76.3,90,90,90,'2016-04-13 11:19:34',0), -(1309603,1489438,'I23',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,76.52,76.52,76.52,90,90,90,'2016-04-13 11:22:30',0), -(1309606,1489441,'I23',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,76.52,76.52,76.52,90,90,90,'2016-04-13 11:22:35',0), -(1309608,1489443,'C2221',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,76.645,108.218,108.03,90,90,90,'2016-04-13 11:22:36',0), -(1309611,1489446,'C2221',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,76.645,108.218,108.03,90,90,90,'2016-04-13 11:22:36',0), -(1309612,1489447,'I23',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,76.52,76.52,76.52,90,90,90,'2016-04-13 11:22:39',0), -(1309615,1489450,'I23',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,76.52,76.52,76.52,90,90,90,'2016-04-13 11:22:40',0), -(1309618,1489453,'I23',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,76.52,76.52,76.52,90,90,90,'2016-04-13 11:22:44',0), -(1323825,1522596,'P41212',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,57.334,57.334,148.969,90,90,90,'2016-04-18 10:05:24',0), -(1323828,1522599,'P41212',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,57.334,57.334,148.969,90,90,90,'2016-04-18 10:05:24',0), -(1323829,1522600,'P4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,57.29,57.29,149.07,90,90,90,'2016-04-14 02:19:04',0), -(1323838,1522609,'P4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,57.29,57.29,149.07,90,90,90,'2016-04-14 02:19:04',0), -(1323841,1522612,'P4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,57.29,57.29,149.07,90,90,90,'2016-04-14 02:19:04',0), -(1323844,1522615,'P4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,57.29,57.29,149.07,90,90,90,'2016-04-14 02:19:04',0), -(1323847,1522618,'P4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,57.29,57.29,149.07,90,90,90,'2016-04-14 02:19:04',0); +INSERT INTO `ScreeningOutputLattice` (`screeningOutputLatticeId`, `screeningOutputId`, `spaceGroup`, `pointGroup`, `bravaisLattice`, `rawOrientationMatrix_a_x`, `rawOrientationMatrix_a_y`, `rawOrientationMatrix_a_z`, `rawOrientationMatrix_b_x`, `rawOrientationMatrix_b_y`, `rawOrientationMatrix_b_z`, `rawOrientationMatrix_c_x`, `rawOrientationMatrix_c_y`, `rawOrientationMatrix_c_z`, `unitCell_a`, `unitCell_b`, `unitCell_c`, `unitCell_alpha`, `unitCell_beta`, `unitCell_gamma`, `bltimeStamp`, `labelitIndexing`) VALUES (1309566,1489401,'I23',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,76.339,76.339,76.339,90,90,90,'2016-04-13 11:19:21',0),(1309569,1489404,'I23',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,76.339,76.339,76.339,90,90,90,'2016-04-13 11:19:21',0),(1309570,1489405,'I23',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,76.3,76.3,76.3,90,90,90,'2016-04-13 11:19:24',0),(1309573,1489408,'I23',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,76.3,76.3,76.3,90,90,90,'2016-04-13 11:19:27',0),(1309576,1489411,'I23',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,76.3,76.3,76.3,90,90,90,'2016-04-13 11:19:29',0),(1309579,1489414,'I23',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,76.3,76.3,76.3,90,90,90,'2016-04-13 11:19:34',0),(1309582,1489417,'I23',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,76.3,76.3,76.3,90,90,90,'2016-04-13 11:19:34',0),(1309603,1489438,'I23',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,76.52,76.52,76.52,90,90,90,'2016-04-13 11:22:30',0),(1309606,1489441,'I23',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,76.52,76.52,76.52,90,90,90,'2016-04-13 11:22:35',0),(1309608,1489443,'C2221',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,76.645,108.218,108.03,90,90,90,'2016-04-13 11:22:36',0),(1309611,1489446,'C2221',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,76.645,108.218,108.03,90,90,90,'2016-04-13 11:22:36',0),(1309612,1489447,'I23',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,76.52,76.52,76.52,90,90,90,'2016-04-13 11:22:39',0),(1309615,1489450,'I23',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,76.52,76.52,76.52,90,90,90,'2016-04-13 11:22:40',0),(1309618,1489453,'I23',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,76.52,76.52,76.52,90,90,90,'2016-04-13 11:22:44',0),(1323825,1522596,'P41212',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,57.334,57.334,148.969,90,90,90,'2016-04-18 10:05:24',0),(1323828,1522599,'P41212',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,57.334,57.334,148.969,90,90,90,'2016-04-18 10:05:24',0),(1323829,1522600,'P4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,57.29,57.29,149.07,90,90,90,'2016-04-14 02:19:04',0),(1323838,1522609,'P4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,57.29,57.29,149.07,90,90,90,'2016-04-14 02:19:04',0),(1323841,1522612,'P4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,57.29,57.29,149.07,90,90,90,'2016-04-14 02:19:04',0),(1323844,1522615,'P4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,57.29,57.29,149.07,90,90,90,'2016-04-14 02:19:04',0),(1323847,1522618,'P4',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,57.29,57.29,149.07,90,90,90,'2016-04-14 02:19:04',0); /*!40000 ALTER TABLE `ScreeningOutputLattice` ENABLE KEYS */; /*!40000 ALTER TABLE `ScreeningRank` DISABLE KEYS */; @@ -843,100 +496,30 @@ INSERT INTO `ScreeningOutputLattice` (`screeningOutputLatticeId`, `screeningOutp /*!40000 ALTER TABLE `ScreeningRankSet` ENABLE KEYS */; /*!40000 ALTER TABLE `ScreeningStrategy` DISABLE KEYS */; -INSERT INTO `ScreeningStrategy` (`screeningStrategyId`, `screeningOutputId`, `phiStart`, `phiEnd`, `rotation`, `exposureTime`, `resolution`, `completeness`, `multiplicity`, `anomalous`, `program`, `rankingResolution`, `transmission`) VALUES (1473909,1489401,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'mosflm - native',NULL,NULL), -(1473912,1489404,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'mosflm - anomalous',NULL,NULL), -(1473913,1489405,NULL,NULL,NULL,0.428,NULL,NULL,NULL,0,'BEST',1.41,NULL), -(1473916,1489408,NULL,NULL,NULL,0.112,NULL,NULL,NULL,0,'BEST',1.41,NULL), -(1473919,1489411,NULL,NULL,NULL,0.049,NULL,NULL,NULL,0,'BEST',1.49,NULL), -(1473922,1489414,NULL,NULL,NULL,0.365,NULL,NULL,NULL,1,'BEST',1.41,NULL), -(1473925,1489417,NULL,NULL,NULL,0.365,NULL,NULL,NULL,1,'BEST',1.41,NULL), -(1473946,1489438,NULL,NULL,NULL,0.073,NULL,NULL,NULL,0,'BEST',1.44,NULL), -(1473949,1489441,NULL,NULL,NULL,0.333,NULL,NULL,NULL,1,'BEST',1.47,NULL), -(1473951,1489443,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'mosflm - native',NULL,NULL), -(1473954,1489446,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'mosflm - anomalous',NULL,NULL), -(1473955,1489447,NULL,NULL,NULL,0.086,NULL,NULL,NULL,0,'BEST',1.57,NULL), -(1473958,1489450,NULL,NULL,NULL,0.333,NULL,NULL,NULL,1,'BEST',1.47,NULL), -(1473961,1489453,NULL,NULL,NULL,0.296,NULL,NULL,NULL,0,'BEST',1.44,NULL), -(1507101,1522596,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'mosflm - native',NULL,NULL), -(1507104,1522599,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'mosflm - anomalous',NULL,NULL), -(1507105,1522600,NULL,NULL,NULL,0.01,NULL,NULL,NULL,0,'BEST',1.13,NULL), -(1507114,1522609,NULL,NULL,NULL,0.01,NULL,NULL,NULL,0,'BEST',1.23,NULL), -(1507117,1522612,NULL,NULL,NULL,0.01,NULL,NULL,NULL,0,'BEST',1.14,NULL), -(1507120,1522615,NULL,NULL,NULL,0.01,NULL,NULL,NULL,1,'BEST',1.16,NULL), -(1507123,1522618,NULL,NULL,NULL,0.01,NULL,NULL,NULL,1,'BEST',1.16,NULL); +INSERT INTO `ScreeningStrategy` (`screeningStrategyId`, `screeningOutputId`, `phiStart`, `phiEnd`, `rotation`, `exposureTime`, `resolution`, `completeness`, `multiplicity`, `anomalous`, `program`, `rankingResolution`, `transmission`) VALUES (1473909,1489401,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'mosflm - native',NULL,NULL),(1473912,1489404,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'mosflm - anomalous',NULL,NULL),(1473913,1489405,NULL,NULL,NULL,0.428,NULL,NULL,NULL,0,'BEST',1.41,NULL),(1473916,1489408,NULL,NULL,NULL,0.112,NULL,NULL,NULL,0,'BEST',1.41,NULL),(1473919,1489411,NULL,NULL,NULL,0.049,NULL,NULL,NULL,0,'BEST',1.49,NULL),(1473922,1489414,NULL,NULL,NULL,0.365,NULL,NULL,NULL,1,'BEST',1.41,NULL),(1473925,1489417,NULL,NULL,NULL,0.365,NULL,NULL,NULL,1,'BEST',1.41,NULL),(1473946,1489438,NULL,NULL,NULL,0.073,NULL,NULL,NULL,0,'BEST',1.44,NULL),(1473949,1489441,NULL,NULL,NULL,0.333,NULL,NULL,NULL,1,'BEST',1.47,NULL),(1473951,1489443,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'mosflm - native',NULL,NULL),(1473954,1489446,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'mosflm - anomalous',NULL,NULL),(1473955,1489447,NULL,NULL,NULL,0.086,NULL,NULL,NULL,0,'BEST',1.57,NULL),(1473958,1489450,NULL,NULL,NULL,0.333,NULL,NULL,NULL,1,'BEST',1.47,NULL),(1473961,1489453,NULL,NULL,NULL,0.296,NULL,NULL,NULL,0,'BEST',1.44,NULL),(1507101,1522596,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'mosflm - native',NULL,NULL),(1507104,1522599,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'mosflm - anomalous',NULL,NULL),(1507105,1522600,NULL,NULL,NULL,0.01,NULL,NULL,NULL,0,'BEST',1.13,NULL),(1507114,1522609,NULL,NULL,NULL,0.01,NULL,NULL,NULL,0,'BEST',1.23,NULL),(1507117,1522612,NULL,NULL,NULL,0.01,NULL,NULL,NULL,0,'BEST',1.14,NULL),(1507120,1522615,NULL,NULL,NULL,0.01,NULL,NULL,NULL,1,'BEST',1.16,NULL),(1507123,1522618,NULL,NULL,NULL,0.01,NULL,NULL,NULL,1,'BEST',1.16,NULL); /*!40000 ALTER TABLE `ScreeningStrategy` ENABLE KEYS */; /*!40000 ALTER TABLE `ScreeningStrategySubWedge` DISABLE KEYS */; -INSERT INTO `ScreeningStrategySubWedge` (`screeningStrategySubWedgeId`, `screeningStrategyWedgeId`, `subWedgeNumber`, `rotationAxis`, `axisStart`, `axisEnd`, `exposureTime`, `transmission`, `oscillationRange`, `completeness`, `multiplicity`, `RESOLUTION`, `doseTotal`, `numberOfImages`, `comments`) VALUES (1111566,1143792,NULL,'Omega',64,109,0,NULL,1.4,1,NULL,1.22,NULL,33,NULL), -(1111569,1143795,NULL,'Omega',74,119,0,NULL,1.4,0.98,NULL,1.22,NULL,33,NULL), -(1111570,1143796,1,'Omega',7,40,0.428,100,0.15,1,4.07,1.41,NULL,220,NULL), -(1111573,1143799,1,'Omega',30,160.05,0.112,100,0.15,1,16.02,1.41,NULL,867,NULL), -(1111576,1143802,1,'Omega',93,123.15,0.049,100,0.15,1,3.71,1.49,NULL,202,NULL), -(1111579,1143805,1,'Omega',225,273,0.365,100,0.1,0.997,3.08,1.41,NULL,480,NULL), -(1111582,1143808,1,'Omega',225,273,0.365,100,0.1,0.997,3.08,1.41,NULL,480,NULL), -(1111603,1143829,1,'Omega',42,171,0.073,100,0.15,1,15.93,1.51,NULL,860,NULL), -(1111606,1143832,1,'Omega',39,91.05,0.333,100,0.15,0.999,3.35,1.51,NULL,347,NULL), -(1111608,1143834,NULL,'Omega',265,355,0,NULL,0.2,0.99,NULL,1.47,NULL,450,NULL), -(1111611,1143837,NULL,'Omega',265,355,0,NULL,0.2,0.92,NULL,1.47,NULL,450,NULL), -(1111612,1143838,1,'Omega',7,39.1,0.086,100,0.15,1,3.95,1.57,NULL,215,NULL), -(1111615,1143841,1,'Omega',39,91.05,0.333,100,0.15,0.999,3.35,1.51,NULL,347,NULL), -(1111618,1143844,1,'Omega',144,175.05,0.296,100,0.15,1,3.83,1.51,NULL,208,NULL), -(1123965,1156191,NULL,'Omega',48,93,0,NULL,0.5,0.99,NULL,1.47,NULL,90,NULL), -(1123968,1156194,NULL,'Omega',43,88,0,NULL,0.5,0.93,NULL,1.47,NULL,90,NULL), -(1123969,1156195,1,'Omega',9,88,0.01,71.7436,0.1,0.999,3.34,1.51,NULL,790,NULL), -(1123978,1156204,1,'Omega',10,88,0.01,72.4236,0.1,0.999,3.3,1.51,NULL,780,NULL), -(1123981,1156207,1,'Omega',0,360,0.01,16.1595,0.1,1,15.21,1.51,NULL,3600,NULL), -(1123984,1156210,1,'Omega',87,239,0.01,72.2048,0.1,0.99,3.29,1.51,NULL,1520,NULL), -(1123987,1156213,1,'Omega',87,239,0.01,72.2048,0.1,0.99,3.29,1.51,NULL,1520,NULL); +INSERT INTO `ScreeningStrategySubWedge` (`screeningStrategySubWedgeId`, `screeningStrategyWedgeId`, `subWedgeNumber`, `rotationAxis`, `axisStart`, `axisEnd`, `exposureTime`, `transmission`, `oscillationRange`, `completeness`, `multiplicity`, `RESOLUTION`, `doseTotal`, `numberOfImages`, `comments`) VALUES (1111566,1143792,NULL,'Omega',64,109,0,NULL,1.4,1,NULL,1.22,NULL,33,NULL),(1111569,1143795,NULL,'Omega',74,119,0,NULL,1.4,0.98,NULL,1.22,NULL,33,NULL),(1111570,1143796,1,'Omega',7,40,0.428,100,0.15,1,4.07,1.41,NULL,220,NULL),(1111573,1143799,1,'Omega',30,160.05,0.112,100,0.15,1,16.02,1.41,NULL,867,NULL),(1111576,1143802,1,'Omega',93,123.15,0.049,100,0.15,1,3.71,1.49,NULL,202,NULL),(1111579,1143805,1,'Omega',225,273,0.365,100,0.1,0.997,3.08,1.41,NULL,480,NULL),(1111582,1143808,1,'Omega',225,273,0.365,100,0.1,0.997,3.08,1.41,NULL,480,NULL),(1111603,1143829,1,'Omega',42,171,0.073,100,0.15,1,15.93,1.51,NULL,860,NULL),(1111606,1143832,1,'Omega',39,91.05,0.333,100,0.15,0.999,3.35,1.51,NULL,347,NULL),(1111608,1143834,NULL,'Omega',265,355,0,NULL,0.2,0.99,NULL,1.47,NULL,450,NULL),(1111611,1143837,NULL,'Omega',265,355,0,NULL,0.2,0.92,NULL,1.47,NULL,450,NULL),(1111612,1143838,1,'Omega',7,39.1,0.086,100,0.15,1,3.95,1.57,NULL,215,NULL),(1111615,1143841,1,'Omega',39,91.05,0.333,100,0.15,0.999,3.35,1.51,NULL,347,NULL),(1111618,1143844,1,'Omega',144,175.05,0.296,100,0.15,1,3.83,1.51,NULL,208,NULL),(1123965,1156191,NULL,'Omega',48,93,0,NULL,0.5,0.99,NULL,1.47,NULL,90,NULL),(1123968,1156194,NULL,'Omega',43,88,0,NULL,0.5,0.93,NULL,1.47,NULL,90,NULL),(1123969,1156195,1,'Omega',9,88,0.01,71.7436,0.1,0.999,3.34,1.51,NULL,790,NULL),(1123978,1156204,1,'Omega',10,88,0.01,72.4236,0.1,0.999,3.3,1.51,NULL,780,NULL),(1123981,1156207,1,'Omega',0,360,0.01,16.1595,0.1,1,15.21,1.51,NULL,3600,NULL),(1123984,1156210,1,'Omega',87,239,0.01,72.2048,0.1,0.99,3.29,1.51,NULL,1520,NULL),(1123987,1156213,1,'Omega',87,239,0.01,72.2048,0.1,0.99,3.29,1.51,NULL,1520,NULL); /*!40000 ALTER TABLE `ScreeningStrategySubWedge` ENABLE KEYS */; /*!40000 ALTER TABLE `ScreeningStrategyWedge` DISABLE KEYS */; -INSERT INTO `ScreeningStrategyWedge` (`screeningStrategyWedgeId`, `screeningStrategyId`, `wedgeNumber`, `resolution`, `completeness`, `multiplicity`, `doseTotal`, `numberOfImages`, `phi`, `kappa`, `chi`, `comments`, `wavelength`) VALUES (1143792,1473909,1,1.22,1,NULL,NULL,33,NULL,NULL,NULL,NULL,NULL), -(1143795,1473912,1,1.22,0.98,NULL,NULL,33,NULL,NULL,NULL,NULL,NULL), -(1143796,1473913,1,1.41,1,4.07,0,220,NULL,NULL,NULL,NULL,NULL), -(1143799,1473916,1,1.41,1,16.02,0,867,NULL,NULL,NULL,NULL,NULL), -(1143802,1473919,1,1.49,1,3.71,0,202,NULL,NULL,NULL,NULL,NULL), -(1143805,1473922,1,1.41,0.997,3.08,0,480,NULL,NULL,NULL,NULL,NULL), -(1143808,1473925,1,1.41,0.997,3.08,0,480,NULL,NULL,NULL,NULL,NULL), -(1143829,1473946,1,1.51,1,15.93,0,860,NULL,NULL,NULL,NULL,NULL), -(1143832,1473949,1,1.51,0.999,3.35,0,347,NULL,NULL,NULL,NULL,NULL), -(1143834,1473951,1,1.47,0.99,NULL,NULL,450,NULL,NULL,NULL,NULL,NULL), -(1143837,1473954,1,1.47,0.92,NULL,NULL,450,NULL,NULL,NULL,NULL,NULL), -(1143838,1473955,1,1.57,1,3.95,0,215,NULL,NULL,NULL,NULL,NULL), -(1143841,1473958,1,1.51,0.999,3.35,0,347,NULL,NULL,NULL,NULL,NULL), -(1143844,1473961,1,1.51,1,3.83,0,208,NULL,NULL,NULL,NULL,NULL), -(1156191,1507101,1,1.47,0.99,NULL,NULL,90,NULL,NULL,NULL,NULL,NULL), -(1156194,1507104,1,1.47,0.93,NULL,NULL,90,NULL,NULL,NULL,NULL,NULL), -(1156195,1507105,1,1.51,0.999,3.34,0,790,NULL,NULL,NULL,NULL,NULL), -(1156204,1507114,1,1.51,0.999,3.3,0,780,NULL,NULL,NULL,NULL,NULL), -(1156207,1507117,1,1.51,1,15.21,0,3600,NULL,NULL,NULL,NULL,NULL), -(1156210,1507120,1,1.51,0.99,3.29,0,1520,NULL,NULL,NULL,NULL,NULL), -(1156213,1507123,1,1.51,0.99,3.29,0,1520,NULL,NULL,NULL,NULL,NULL); +INSERT INTO `ScreeningStrategyWedge` (`screeningStrategyWedgeId`, `screeningStrategyId`, `wedgeNumber`, `resolution`, `completeness`, `multiplicity`, `doseTotal`, `numberOfImages`, `phi`, `kappa`, `chi`, `comments`, `wavelength`) VALUES (1143792,1473909,1,1.22,1,NULL,NULL,33,NULL,NULL,NULL,NULL,NULL),(1143795,1473912,1,1.22,0.98,NULL,NULL,33,NULL,NULL,NULL,NULL,NULL),(1143796,1473913,1,1.41,1,4.07,0,220,NULL,NULL,NULL,NULL,NULL),(1143799,1473916,1,1.41,1,16.02,0,867,NULL,NULL,NULL,NULL,NULL),(1143802,1473919,1,1.49,1,3.71,0,202,NULL,NULL,NULL,NULL,NULL),(1143805,1473922,1,1.41,0.997,3.08,0,480,NULL,NULL,NULL,NULL,NULL),(1143808,1473925,1,1.41,0.997,3.08,0,480,NULL,NULL,NULL,NULL,NULL),(1143829,1473946,1,1.51,1,15.93,0,860,NULL,NULL,NULL,NULL,NULL),(1143832,1473949,1,1.51,0.999,3.35,0,347,NULL,NULL,NULL,NULL,NULL),(1143834,1473951,1,1.47,0.99,NULL,NULL,450,NULL,NULL,NULL,NULL,NULL),(1143837,1473954,1,1.47,0.92,NULL,NULL,450,NULL,NULL,NULL,NULL,NULL),(1143838,1473955,1,1.57,1,3.95,0,215,NULL,NULL,NULL,NULL,NULL),(1143841,1473958,1,1.51,0.999,3.35,0,347,NULL,NULL,NULL,NULL,NULL),(1143844,1473961,1,1.51,1,3.83,0,208,NULL,NULL,NULL,NULL,NULL),(1156191,1507101,1,1.47,0.99,NULL,NULL,90,NULL,NULL,NULL,NULL,NULL),(1156194,1507104,1,1.47,0.93,NULL,NULL,90,NULL,NULL,NULL,NULL,NULL),(1156195,1507105,1,1.51,0.999,3.34,0,790,NULL,NULL,NULL,NULL,NULL),(1156204,1507114,1,1.51,0.999,3.3,0,780,NULL,NULL,NULL,NULL,NULL),(1156207,1507117,1,1.51,1,15.21,0,3600,NULL,NULL,NULL,NULL,NULL),(1156210,1507120,1,1.51,0.99,3.29,0,1520,NULL,NULL,NULL,NULL,NULL),(1156213,1507123,1,1.51,0.99,3.29,0,1520,NULL,NULL,NULL,NULL,NULL); /*!40000 ALTER TABLE `ScreeningStrategyWedge` ENABLE KEYS */; /*!40000 ALTER TABLE `SessionType` DISABLE KEYS */; /*!40000 ALTER TABLE `SessionType` ENABLE KEYS */; /*!40000 ALTER TABLE `Session_has_Person` DISABLE KEYS */; -INSERT INTO `Session_has_Person` (`sessionId`, `personId`, `role`, `remote`) VALUES (55167,1,'Co-Investigator',0), -(55168,1,'Co-Investigator',0); +INSERT INTO `Session_has_Person` (`sessionId`, `personId`, `role`, `remote`) VALUES (55167,1,'Co-Investigator',0),(55168,1,'Co-Investigator',0); /*!40000 ALTER TABLE `Session_has_Person` ENABLE KEYS */; /*!40000 ALTER TABLE `Shipping` DISABLE KEYS */; -INSERT INTO `Shipping` (`shippingId`, `proposalId`, `shippingName`, `deliveryAgent_agentName`, `deliveryAgent_shippingDate`, `deliveryAgent_deliveryDate`, `deliveryAgent_agentCode`, `deliveryAgent_flightCode`, `shippingStatus`, `bltimeStamp`, `laboratoryId`, `isStorageShipping`, `creationDate`, `comments`, `sendingLabContactId`, `returnLabContactId`, `returnCourier`, `dateOfShippingToUser`, `shippingType`, `SAFETYLEVEL`, `deliveryAgent_flightCodeTimestamp`, `deliveryAgent_label`, `readyByTime`, `closeTime`, `physicalLocation`, `deliveryAgent_pickupConfirmationTimestamp`, `deliveryAgent_pickupConfirmation`, `deliveryAgent_readyByTime`, `deliveryAgent_callinTime`, `deliveryAgent_productcode`, `deliveryAgent_flightCodePersonId`, `extra`, `source`, `externalShippingIdToSynchrotron`) VALUES (474,141666,'cm-0001 1 processing',NULL,NULL,NULL,NULL,NULL,'processing',NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'root@%',NULL), -(477,141666,'cm-0001 2 processing',NULL,NULL,NULL,NULL,NULL,'processing',NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'root@%',NULL), -(480,141666,'cm-0001 3 processing',NULL,NULL,NULL,NULL,NULL,'processing',NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'root@%',NULL), -(6988,37027,'Default Shipping:cm14451-1',NULL,NULL,NULL,NULL,NULL,'processing',NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'root@%',NULL), -(7227,37027,'cm14451-2_Shipment1',NULL,NULL,NULL,NULL,NULL,'processing','2016-02-10 13:03:07',NULL,0,'2016-02-10 13:03:07',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'root@%',NULL), -(7231,37027,'VMXi Simulator Test shipment',NULL,NULL,NULL,NULL,NULL,'opened',NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'root@%',NULL); +INSERT INTO `Shipping` (`shippingId`, `proposalId`, `shippingName`, `deliveryAgent_agentName`, `deliveryAgent_shippingDate`, `deliveryAgent_deliveryDate`, `deliveryAgent_agentCode`, `deliveryAgent_flightCode`, `shippingStatus`, `bltimeStamp`, `laboratoryId`, `isStorageShipping`, `creationDate`, `comments`, `sendingLabContactId`, `returnLabContactId`, `returnCourier`, `dateOfShippingToUser`, `shippingType`, `SAFETYLEVEL`, `deliveryAgent_flightCodeTimestamp`, `deliveryAgent_label`, `readyByTime`, `closeTime`, `physicalLocation`, `deliveryAgent_pickupConfirmationTimestamp`, `deliveryAgent_pickupConfirmation`, `deliveryAgent_readyByTime`, `deliveryAgent_callinTime`, `deliveryAgent_productcode`, `deliveryAgent_flightCodePersonId`, `extra`, `source`, `externalShippingIdToSynchrotron`) VALUES (474,141666,'cm-0001 1 processing',NULL,NULL,NULL,NULL,NULL,'processing',NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'root@%',NULL),(477,141666,'cm-0001 2 processing',NULL,NULL,NULL,NULL,NULL,'processing',NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'root@%',NULL),(480,141666,'cm-0001 3 processing',NULL,NULL,NULL,NULL,NULL,'processing',NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'root@%',NULL),(6988,37027,'Default Shipping:cm14451-1',NULL,NULL,NULL,NULL,NULL,'processing',NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'root@%',NULL),(7227,37027,'cm14451-2_Shipment1',NULL,NULL,NULL,NULL,NULL,'processing','2016-02-10 13:03:07',NULL,0,'2016-02-10 13:03:07',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'root@%',NULL),(7231,37027,'VMXi Simulator Test shipment',NULL,NULL,NULL,NULL,NULL,'opened',NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'root@%',NULL); /*!40000 ALTER TABLE `Shipping` ENABLE KEYS */; /*!40000 ALTER TABLE `ShippingHasSession` DISABLE KEYS */; -INSERT INTO `ShippingHasSession` (`shippingId`, `sessionId`) VALUES (474,339525), -(477,339528), -(480,339531), -(6988,55167), -(7227,55168); +INSERT INTO `ShippingHasSession` (`shippingId`, `sessionId`) VALUES (474,339525),(477,339528),(480,339531),(6988,55167),(7227,55168); /*!40000 ALTER TABLE `ShippingHasSession` ENABLE KEYS */; /*!40000 ALTER TABLE `Sleeve` DISABLE KEYS */; @@ -958,68 +541,7 @@ INSERT INTO `ShippingHasSession` (`shippingId`, `sessionId`) VALUES (474,339525) /*!40000 ALTER TABLE `XFEFluorescenceComposite` ENABLE KEYS */; /*!40000 ALTER TABLE `XFEFluorescenceSpectrum` DISABLE KEYS */; -INSERT INTO `XFEFluorescenceSpectrum` (`xfeFluorescenceSpectrumId`, `sessionId`, `blSampleId`, `jpegScanFileFullPath`, `startTime`, `endTime`, `filename`, `exposureTime`, `axisPosition`, `beamTransmission`, `annotatedPymcaXfeSpectrum`, `fittedDataFileFullPath`, `scanFileFullPath`, `energy`, `beamSizeVertical`, `beamSizeHorizontal`, `crystalClass`, `comments`, `blSubSampleId`, `flux`, `flux_end`, `workingDirectory`) VALUES (1766,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160112_14_49_14.png','2016-01-12 14:49:14','2016-01-12 14:50:05','/dls/i03/data/2016/cm14451-1/20160112_14_49_14.mca',3,NULL,6.4,'/dls/i03/data/2016/cm14451-1/20160112_14_49_14.html',NULL,'/dls/i03/data/2016/cm14451-1/20160112_14_49_14.dat',12700,20,50,NULL,NULL,NULL,NULL,NULL,NULL), -(1779,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_15_53_23.png','2016-01-13 15:53:23','2016-01-13 15:54:53','/dls/i03/data/2016/cm14451-1/20160113_15_53_23.mca',3,NULL,1.6,'/dls/i03/data/2016/cm14451-1/20160113_15_53_23.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_15_53_23.dat',12700,20,20,NULL,NULL,NULL,NULL,NULL,NULL), -(1780,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_16_50_27.png','2016-01-13 16:50:27','2016-01-13 16:51:27','/dls/i03/data/2016/cm14451-1/20160113_16_50_27.mca',3,NULL,25.6,'/dls/i03/data/2016/cm14451-1/20160113_16_50_27.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_16_50_27.dat',12700,20,20,NULL,NULL,NULL,NULL,NULL,NULL), -(1781,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_16_51_54.png','2016-01-13 16:51:54','2016-01-13 16:52:29','/dls/i03/data/2016/cm14451-1/20160113_16_51_54.mca',1,NULL,100,'/dls/i03/data/2016/cm14451-1/20160113_16_51_54.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_16_51_54.dat',12700,20,20,NULL,NULL,NULL,NULL,NULL,NULL), -(1782,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_16_55_14.png','2016-01-13 16:55:14','2016-01-13 16:55:24','/dls/i03/data/2016/cm14451-1/20160113_16_55_14.mca',1,NULL,1.59925,'/dls/i03/data/2016/cm14451-1/20160113_16_55_14.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_16_55_14.dat',12700,20,20,NULL,NULL,NULL,NULL,NULL,NULL), -(1783,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_16_57_18.png','2016-01-13 16:57:18','2016-01-13 16:57:28','/dls/i03/data/2016/cm14451-1/20160113_16_57_18.mca',1,NULL,1.59925,'/dls/i03/data/2016/cm14451-1/20160113_16_57_18.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_16_57_18.dat',12700,20,50,NULL,NULL,NULL,NULL,NULL,NULL), -(1784,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_16_58_02.png','2016-01-13 16:58:02','2016-01-13 16:58:13','/dls/i03/data/2016/cm14451-1/20160113_16_58_02.mca',1,NULL,1.59925,'/dls/i03/data/2016/cm14451-1/20160113_16_58_02.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_16_58_02.dat',12700,20,80,NULL,NULL,NULL,NULL,NULL,NULL), -(1785,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_16_59_00.png','2016-01-13 16:59:00','2016-01-13 16:59:12','/dls/i03/data/2016/cm14451-1/20160113_16_59_00.mca',1,NULL,1.59925,'/dls/i03/data/2016/cm14451-1/20160113_16_59_00.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_16_59_00.dat',12700,20,80,NULL,NULL,NULL,NULL,NULL,NULL), -(1786,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_16_59_53.png','2016-01-13 16:59:53','2016-01-13 17:00:04','/dls/i03/data/2016/cm14451-1/20160113_16_59_53.mca',1,NULL,1.59925,'/dls/i03/data/2016/cm14451-1/20160113_16_59_53.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_16_59_53.dat',12700,20,80,NULL,NULL,NULL,NULL,NULL,NULL), -(1787,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_17_01_34.png','2016-01-13 17:01:34','2016-01-13 17:01:49','/dls/i03/data/2016/cm14451-1/20160113_17_01_34.mca',1,NULL,30.0212,'/dls/i03/data/2016/cm14451-1/20160113_17_01_34.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_17_01_34.dat',12700,20,80,NULL,NULL,NULL,NULL,NULL,NULL), -(1788,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_17_11_40.png','2016-01-13 17:11:40','2016-01-13 17:12:54','/dls/i03/data/2016/cm14451-1/20160113_17_11_40.mca',1,NULL,1.59925,'/dls/i03/data/2016/cm14451-1/20160113_17_11_40.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_17_11_40.dat',12700,20,80,NULL,NULL,NULL,NULL,NULL,NULL), -(1789,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_17_13_25.png','2016-01-13 17:13:25','2016-01-13 17:13:36','/dls/i03/data/2016/cm14451-1/20160113_17_13_25.mca',1,NULL,1.59925,'/dls/i03/data/2016/cm14451-1/20160113_17_13_25.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_17_13_25.dat',12700,20,80,NULL,NULL,NULL,NULL,NULL,NULL), -(1790,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_17_14_01.png','2016-01-13 17:14:01','2016-01-13 17:14:13','/dls/i03/data/2016/cm14451-1/20160113_17_14_01.mca',1,NULL,1.59925,'/dls/i03/data/2016/cm14451-1/20160113_17_14_01.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_17_14_01.dat',12700,20,80,NULL,NULL,NULL,NULL,NULL,NULL), -(1791,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_17_15_13.png','2016-01-13 17:15:13','2016-01-13 17:15:26','/dls/i03/data/2016/cm14451-1/20160113_17_15_13.mca',1,NULL,1.59925,'/dls/i03/data/2016/cm14451-1/20160113_17_15_13.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_17_15_13.dat',12700,20,80,NULL,NULL,NULL,NULL,NULL,NULL), -(1792,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_17_20_59.png','2016-01-13 17:20:59','2016-01-13 17:21:10','/dls/i03/data/2016/cm14451-1/20160113_17_20_59.mca',1,NULL,4.99011,'/dls/i03/data/2016/cm14451-1/20160113_17_20_59.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_17_20_59.dat',12700,20,80,NULL,NULL,NULL,NULL,NULL,NULL), -(1793,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_17_21_26.png','2016-01-13 17:21:26','2016-01-13 17:21:38','/dls/i03/data/2016/cm14451-1/20160113_17_21_26.mca',1,NULL,4.99011,'/dls/i03/data/2016/cm14451-1/20160113_17_21_26.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_17_21_26.dat',12700,20,80,NULL,NULL,NULL,NULL,NULL,NULL), -(1794,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_17_24_57.png','2016-01-13 17:24:57','2016-01-13 17:25:11','/dls/i03/data/2016/cm14451-1/20160113_17_24_57.mca',1,NULL,1.59925,'/dls/i03/data/2016/cm14451-1/20160113_17_24_57.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_17_24_57.dat',12700,20,80,NULL,NULL,NULL,NULL,NULL,NULL), -(1795,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_17_25_21.png','2016-01-13 17:25:21','2016-01-13 17:25:32','/dls/i03/data/2016/cm14451-1/20160113_17_25_21.mca',1,NULL,1.59925,'/dls/i03/data/2016/cm14451-1/20160113_17_25_21.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_17_25_21.dat',12700,20,80,NULL,NULL,NULL,NULL,NULL,NULL), -(1796,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_17_25_48.png','2016-01-13 17:25:48','2016-01-13 17:26:00','/dls/i03/data/2016/cm14451-1/20160113_17_25_48.mca',1,NULL,1.59925,'/dls/i03/data/2016/cm14451-1/20160113_17_25_48.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_17_25_48.dat',12700,20,80,NULL,NULL,NULL,NULL,NULL,NULL), -(1797,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_17_26_44.png','2016-01-13 17:26:44','2016-01-13 17:26:57','/dls/i03/data/2016/cm14451-1/20160113_17_26_44.mca',1,NULL,1.59925,'/dls/i03/data/2016/cm14451-1/20160113_17_26_44.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_17_26_44.dat',12700,20,20,NULL,NULL,NULL,NULL,NULL,NULL), -(1798,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_17_27_19.png','2016-01-13 17:27:19','2016-01-13 17:27:32','/dls/i03/data/2016/cm14451-1/20160113_17_27_19.mca',1,NULL,1.59925,'/dls/i03/data/2016/cm14451-1/20160113_17_27_19.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_17_27_19.dat',12700,20,50,NULL,NULL,NULL,NULL,NULL,NULL), -(1799,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_17_28_10.png','2016-01-13 17:28:10','2016-01-13 17:28:22','/dls/i03/data/2016/cm14451-1/20160113_17_28_10.mca',1,NULL,1.59925,'/dls/i03/data/2016/cm14451-1/20160113_17_28_10.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_17_28_10.dat',12700,20,50,NULL,NULL,NULL,NULL,NULL,NULL), -(1800,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_17_29_49.png','2016-01-13 17:29:49','2016-01-13 17:30:01','/dls/i03/data/2016/cm14451-1/20160113_17_29_49.mca',1,NULL,1.59925,'/dls/i03/data/2016/cm14451-1/20160113_17_29_49.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_17_29_49.dat',12700,20,50,NULL,NULL,NULL,NULL,NULL,NULL), -(1801,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_17_55_15.png','2016-01-13 17:55:15','2016-01-13 17:56:11','/dls/i03/data/2016/cm14451-1/20160113_17_55_15.mca',1,NULL,1.59925,'/dls/i03/data/2016/cm14451-1/20160113_17_55_15.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_17_55_15.dat',12700,20,50,NULL,NULL,NULL,NULL,NULL,NULL), -(1802,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_17_57_11.png','2016-01-13 17:57:11','2016-01-13 17:57:22','/dls/i03/data/2016/cm14451-1/20160113_17_57_11.mca',1,NULL,1.59925,'/dls/i03/data/2016/cm14451-1/20160113_17_57_11.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_17_57_11.dat',12700,20,50,NULL,NULL,NULL,NULL,NULL,NULL), -(1803,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_17_57_48.png','2016-01-13 17:57:48','2016-01-13 17:58:00','/dls/i03/data/2016/cm14451-1/20160113_17_57_48.mca',1,NULL,1.59925,'/dls/i03/data/2016/cm14451-1/20160113_17_57_48.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_17_57_48.dat',12700,20,50,NULL,NULL,NULL,NULL,NULL,NULL), -(1804,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_17_58_55.png','2016-01-13 17:58:55','2016-01-13 17:59:08','/dls/i03/data/2016/cm14451-1/20160113_17_58_55.mca',1,NULL,1.59925,'/dls/i03/data/2016/cm14451-1/20160113_17_58_55.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_17_58_55.dat',12700,20,50,NULL,NULL,NULL,NULL,NULL,NULL), -(1805,55167,374695,'/dls/i03/data/2016/cm14451-1/20160113_18_05_35.png','2016-01-13 18:05:35','2016-01-13 18:05:47','/dls/i03/data/2016/cm14451-1/20160113_18_05_35.mca',1,NULL,1.59925,'/dls/i03/data/2016/cm14451-1/20160113_18_05_35.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_18_05_35.dat',12700,20,50,NULL,NULL,NULL,NULL,NULL,NULL), -(1806,55167,374695,'/dls/i03/data/2016/cm14451-1/20160113_18_06_50.png','2016-01-13 18:06:50','2016-01-13 18:07:02','/dls/i03/data/2016/cm14451-1/20160113_18_06_50.mca',1,NULL,1.59925,'/dls/i03/data/2016/cm14451-1/20160113_18_06_50.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_18_06_50.dat',12700,20,50,NULL,NULL,NULL,NULL,NULL,NULL), -(1807,55167,374695,'/dls/i03/data/2016/cm14451-1/20160113_18_07_44.png','2016-01-13 18:07:44','2016-01-13 18:07:56','/dls/i03/data/2016/cm14451-1/20160113_18_07_44.mca',1,NULL,1.59925,'/dls/i03/data/2016/cm14451-1/20160113_18_07_44.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_18_07_44.dat',12700,20,50,NULL,NULL,NULL,NULL,NULL,NULL), -(1808,55167,374695,'/dls/i03/data/2016/cm14451-1/20160113_18_08_38.png','2016-01-13 18:08:38','2016-01-13 18:08:50','/dls/i03/data/2016/cm14451-1/20160113_18_08_38.mca',1,NULL,1.59925,'/dls/i03/data/2016/cm14451-1/20160113_18_08_38.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_18_08_38.dat',12700,20,50,NULL,NULL,NULL,NULL,NULL,NULL), -(1809,55167,374695,'/dls/i03/data/2016/cm14451-1/20160113_18_09_26.png','2016-01-13 18:09:26','2016-01-13 18:09:38','/dls/i03/data/2016/cm14451-1/20160113_18_09_26.mca',1,NULL,4.0011,'/dls/i03/data/2016/cm14451-1/20160113_18_09_26.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_18_09_26.dat',12700,20,50,NULL,NULL,NULL,NULL,NULL,NULL), -(1810,55167,374695,'/dls/i03/data/2016/cm14451-1/20160113_18_10_25.png','2016-01-13 18:10:25','2016-01-13 18:10:38','/dls/i03/data/2016/cm14451-1/20160113_18_10_25.mca',1,NULL,4.0011,'/dls/i03/data/2016/cm14451-1/20160113_18_10_25.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_18_10_25.dat',12700,20,50,NULL,NULL,NULL,NULL,NULL,NULL), -(1811,55167,374695,'/dls/i03/data/2016/cm14451-1/20160113_18_10_51.png','2016-01-13 18:10:51','2016-01-13 18:11:04','/dls/i03/data/2016/cm14451-1/20160113_18_10_51.mca',1,NULL,4.0011,'/dls/i03/data/2016/cm14451-1/20160113_18_10_51.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_18_10_51.dat',12700,20,50,NULL,NULL,NULL,NULL,NULL,NULL), -(1812,55167,374695,'/dls/i03/data/2016/cm14451-1/20160113_18_11_20.png','2016-01-13 18:11:20','2016-01-13 18:11:32','/dls/i03/data/2016/cm14451-1/20160113_18_11_20.mca',1,NULL,4.0011,'/dls/i03/data/2016/cm14451-1/20160113_18_11_20.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_18_11_20.dat',12700,20,50,NULL,NULL,NULL,NULL,NULL,NULL), -(1813,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_18_14_57.png','2016-01-13 18:14:57','2016-01-13 18:15:09','/dls/i03/data/2016/cm14451-1/20160113_18_14_57.mca',1,NULL,1.59925,'/dls/i03/data/2016/cm14451-1/20160113_18_14_57.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_18_14_57.dat',12700,20,50,NULL,NULL,NULL,NULL,NULL,NULL), -(1814,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_18_15_50.png','2016-01-13 18:15:50','2016-01-13 18:16:02','/dls/i03/data/2016/cm14451-1/20160113_18_15_50.mca',1,NULL,1.59925,'/dls/i03/data/2016/cm14451-1/20160113_18_15_50.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_18_15_50.dat',12700,20,50,NULL,NULL,NULL,NULL,NULL,NULL), -(1815,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_18_16_20.png','2016-01-13 18:16:20','2016-01-13 18:16:31','/dls/i03/data/2016/cm14451-1/20160113_18_16_20.mca',1,NULL,1.59925,'/dls/i03/data/2016/cm14451-1/20160113_18_16_20.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_18_16_20.dat',12700,20,50,NULL,NULL,NULL,NULL,NULL,NULL), -(1816,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_18_16_56.png','2016-01-13 18:16:56','2016-01-13 18:17:08','/dls/i03/data/2016/cm14451-1/20160113_18_16_56.mca',1,NULL,1.59925,'/dls/i03/data/2016/cm14451-1/20160113_18_16_56.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_18_16_56.dat',12700,20,50,NULL,NULL,NULL,NULL,NULL,NULL), -(1817,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_18_17_56.png','2016-01-13 18:17:56','2016-01-13 18:18:29','/dls/i03/data/2016/cm14451-1/20160113_18_17_56.mca',1,NULL,12.8,'/dls/i03/data/2016/cm14451-1/20160113_18_17_56.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_18_17_56.dat',12700,20,50,NULL,NULL,NULL,NULL,NULL,NULL), -(1818,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_18_20_49.png','2016-01-13 18:20:49','2016-01-13 18:21:22','/dls/i03/data/2016/cm14451-1/20160113_18_20_49.mca',1,NULL,6.4,'/dls/i03/data/2016/cm14451-1/20160113_18_20_49.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_18_20_49.dat',12700,20,50,NULL,NULL,NULL,NULL,NULL,NULL), -(1819,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_18_21_46.png','2016-01-13 18:21:46','2016-01-13 18:21:57','/dls/i03/data/2016/cm14451-1/20160113_18_21_46.mca',1,NULL,12.8138,'/dls/i03/data/2016/cm14451-1/20160113_18_21_46.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_18_21_46.dat',12700,20,50,NULL,NULL,NULL,NULL,NULL,NULL), -(1820,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_18_22_33.png','2016-01-13 18:22:33','2016-01-13 18:22:45','/dls/i03/data/2016/cm14451-1/20160113_18_22_33.mca',1,NULL,12.8138,'/dls/i03/data/2016/cm14451-1/20160113_18_22_33.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_18_22_33.dat',12700,20,50,NULL,'good spectrum',NULL,NULL,NULL,NULL), -(1821,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_18_23_52.png','2016-01-13 18:23:52','2016-01-13 18:24:05','/dls/i03/data/2016/cm14451-1/20160113_18_23_52.mca',1,NULL,12.8138,'/dls/i03/data/2016/cm14451-1/20160113_18_23_52.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_18_23_52.dat',12700,20,50,NULL,NULL,NULL,NULL,NULL,NULL), -(1822,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_18_39_34.png','2016-01-13 18:39:34','2016-01-13 18:40:11','/dls/i03/data/2016/cm14451-1/20160113_18_39_34.mca',1,NULL,100,'/dls/i03/data/2016/cm14451-1/20160113_18_39_34.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_18_39_34.dat',12700,20,50,NULL,NULL,NULL,NULL,NULL,NULL), -(1823,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_18_40_53.png','2016-01-13 18:40:53','2016-01-13 18:41:26','/dls/i03/data/2016/cm14451-1/20160113_18_40_53.mca',1,NULL,6.4,'/dls/i03/data/2016/cm14451-1/20160113_18_40_53.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_18_40_53.dat',12700,20,50,NULL,NULL,NULL,NULL,NULL,NULL), -(1824,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_18_41_43.png','2016-01-13 18:41:43','2016-01-13 18:42:16','/dls/i03/data/2016/cm14451-1/20160113_18_41_43.mca',1,NULL,6.4,'/dls/i03/data/2016/cm14451-1/20160113_18_41_43.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_18_41_43.dat',12700,20,50,NULL,NULL,NULL,NULL,NULL,NULL), -(1825,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_19_20_04.png','2016-01-13 19:20:04','2016-01-13 19:20:37','/dls/i03/data/2016/cm14451-1/20160113_19_20_04.mca',1,NULL,6.4,'/dls/i03/data/2016/cm14451-1/20160113_19_20_04.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_19_20_04.dat',12700,20,50,NULL,NULL,NULL,NULL,NULL,NULL), -(1826,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_19_21_10.png','2016-01-13 19:21:10','2016-01-13 19:21:43','/dls/i03/data/2016/cm14451-1/20160113_19_21_10.mca',1,NULL,6.4,'/dls/i03/data/2016/cm14451-1/20160113_19_21_10.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_19_21_10.dat',12700,20,50,NULL,NULL,NULL,NULL,NULL,NULL), -(1827,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_19_22_01.png','2016-01-13 19:22:01','2016-01-13 19:22:34','/dls/i03/data/2016/cm14451-1/20160113_19_22_01.mca',1,NULL,6.4,'/dls/i03/data/2016/cm14451-1/20160113_19_22_01.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_19_22_01.dat',12700,20,50,NULL,NULL,NULL,NULL,NULL,NULL), -(1828,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_19_23_10.png','2016-01-13 19:23:10','2016-01-13 19:23:45','/dls/i03/data/2016/cm14451-1/20160113_19_23_10.mca',1,NULL,12.8,'/dls/i03/data/2016/cm14451-1/20160113_19_23_10.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_19_23_10.dat',12700,20,50,NULL,NULL,NULL,NULL,NULL,NULL), -(1829,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_19_49_01.png','2016-01-13 19:49:01','2016-01-13 19:50:38','/dls/i03/data/2016/cm14451-1/20160113_19_49_01.mca',1,NULL,12.8,'/dls/i03/data/2016/cm14451-1/20160113_19_49_01.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_19_49_01.dat',12700,20,50,NULL,NULL,NULL,NULL,NULL,NULL), -(1830,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_20_12_35.png','2016-01-13 20:12:35','2016-01-13 20:13:35','/dls/i03/data/2016/cm14451-1/20160113_20_12_35.mca',1,NULL,0.1,'/dls/i03/data/2016/cm14451-1/20160113_20_12_35.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_20_12_35.dat',14000,20,50,NULL,NULL,NULL,NULL,NULL,NULL), -(1831,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_20_17_07.png','2016-01-13 20:17:07','2016-01-13 20:19:49','/dls/i03/data/2016/cm14451-1/20160113_20_17_07.mca',1,NULL,3.2,'/dls/i03/data/2016/cm14451-1/20160113_20_17_07.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_20_17_07.dat',14000,20,50,NULL,NULL,NULL,NULL,NULL,NULL), -(1832,55167,374695,'/dls/i03/data/2016/cm14451-1/20160114_11_16_25.png','2016-01-14 11:16:25','2016-01-14 11:17:32','/dls/i03/data/2016/cm14451-1/20160114_11_16_25.mca',1,NULL,1.6,'/dls/i03/data/2016/cm14451-1/20160114_11_16_25.html',NULL,'/dls/i03/data/2016/cm14451-1/20160114_11_16_25.dat',12673,20,50,NULL,NULL,NULL,NULL,NULL,NULL), -(1833,55167,374695,'/dls/i03/data/2016/cm14451-1/20160114_11_20_14.png','2016-01-14 11:20:14','2016-01-14 11:20:46','/dls/i03/data/2016/cm14451-1/20160114_11_20_14.mca',1,NULL,6.4,'/dls/i03/data/2016/cm14451-1/20160114_11_20_14.html',NULL,'/dls/i03/data/2016/cm14451-1/20160114_11_20_14.dat',12673,20,50,NULL,NULL,NULL,NULL,NULL,NULL), -(1834,55167,374695,'/dls/i03/data/2016/cm14451-1/20160114_11_23_23.png','2016-01-14 11:23:23','2016-01-14 11:23:56','/dls/i03/data/2016/cm14451-1/20160114_11_23_23.mca',1,NULL,6.4,'/dls/i03/data/2016/cm14451-1/20160114_11_23_23.html',NULL,'/dls/i03/data/2016/cm14451-1/20160114_11_23_23.dat',14000,20,50,NULL,'null _FLAG_',NULL,NULL,NULL,NULL), -(1984,55168,NULL,'/dls/i03/data/2016/cm14451-2/20160330_14_34_12.png','2016-03-30 14:34:12','2016-03-30 14:34:25','/dls/i03/data/2016/cm14451-2/20160330_14_34_12.mca',1,NULL,19.9988,'/dls/i03/data/2016/cm14451-2/20160330_14_34_12.html',NULL,'/dls/i03/data/2016/cm14451-2/20160330_14_34_12.dat',12700,20,80,NULL,NULL,NULL,NULL,NULL,NULL), -(1987,55168,NULL,'/dls/i03/data/2016/cm14451-2/20160331_10_13_31.png','2016-03-31 10:13:31','2016-03-31 10:13:44','/dls/i03/data/2016/cm14451-2/20160331_10_13_31.mca',1,NULL,20.0048,'/dls/i03/data/2016/cm14451-2/20160331_10_13_31.html',NULL,'/dls/i03/data/2016/cm14451-2/20160331_10_13_31.dat',12700,20,80,NULL,NULL,NULL,NULL,NULL,NULL), -(1990,55168,NULL,'/dls/i03/data/2016/cm14451-2/20160405_16_40_33.png','2016-04-05 16:40:33','2016-04-05 16:42:09','/dls/i03/data/2016/cm14451-2/20160405_16_40_33.mca',3,NULL,12.8,'/dls/i03/data/2016/cm14451-2/20160405_16_40_33.html',NULL,'/dls/i03/data/2016/cm14451-2/20160405_16_40_33.dat',14000,20,20,NULL,NULL,NULL,NULL,NULL,NULL), -(2002,55168,NULL,'/dls/i03/data/2016/cm14451-2/20160406_16_29_44.png','2016-04-06 16:29:44','2016-04-06 16:30:27','/dls/i03/data/2016/cm14451-2/20160406_16_29_44.mca',2,NULL,12.8,'/dls/i03/data/2016/cm14451-2/20160406_16_29_44.html',NULL,'/dls/i03/data/2016/cm14451-2/20160406_16_29_44.dat',12700,20,50,NULL,NULL,NULL,NULL,NULL,NULL), -(2005,55168,NULL,'/dls/i03/data/2009/in1246-1/jpegs/bs/bs_MS_1_001.jpeg',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL); +INSERT INTO `XFEFluorescenceSpectrum` (`xfeFluorescenceSpectrumId`, `sessionId`, `blSampleId`, `jpegScanFileFullPath`, `startTime`, `endTime`, `filename`, `exposureTime`, `axisPosition`, `beamTransmission`, `annotatedPymcaXfeSpectrum`, `fittedDataFileFullPath`, `scanFileFullPath`, `energy`, `beamSizeVertical`, `beamSizeHorizontal`, `crystalClass`, `comments`, `blSubSampleId`, `flux`, `flux_end`, `workingDirectory`) VALUES (1766,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160112_14_49_14.png','2016-01-12 14:49:14','2016-01-12 14:50:05','/dls/i03/data/2016/cm14451-1/20160112_14_49_14.mca',3,NULL,6.4,'/dls/i03/data/2016/cm14451-1/20160112_14_49_14.html',NULL,'/dls/i03/data/2016/cm14451-1/20160112_14_49_14.dat',12700,20,50,NULL,NULL,NULL,NULL,NULL,NULL),(1779,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_15_53_23.png','2016-01-13 15:53:23','2016-01-13 15:54:53','/dls/i03/data/2016/cm14451-1/20160113_15_53_23.mca',3,NULL,1.6,'/dls/i03/data/2016/cm14451-1/20160113_15_53_23.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_15_53_23.dat',12700,20,20,NULL,NULL,NULL,NULL,NULL,NULL),(1780,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_16_50_27.png','2016-01-13 16:50:27','2016-01-13 16:51:27','/dls/i03/data/2016/cm14451-1/20160113_16_50_27.mca',3,NULL,25.6,'/dls/i03/data/2016/cm14451-1/20160113_16_50_27.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_16_50_27.dat',12700,20,20,NULL,NULL,NULL,NULL,NULL,NULL),(1781,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_16_51_54.png','2016-01-13 16:51:54','2016-01-13 16:52:29','/dls/i03/data/2016/cm14451-1/20160113_16_51_54.mca',1,NULL,100,'/dls/i03/data/2016/cm14451-1/20160113_16_51_54.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_16_51_54.dat',12700,20,20,NULL,NULL,NULL,NULL,NULL,NULL),(1782,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_16_55_14.png','2016-01-13 16:55:14','2016-01-13 16:55:24','/dls/i03/data/2016/cm14451-1/20160113_16_55_14.mca',1,NULL,1.59925,'/dls/i03/data/2016/cm14451-1/20160113_16_55_14.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_16_55_14.dat',12700,20,20,NULL,NULL,NULL,NULL,NULL,NULL),(1783,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_16_57_18.png','2016-01-13 16:57:18','2016-01-13 16:57:28','/dls/i03/data/2016/cm14451-1/20160113_16_57_18.mca',1,NULL,1.59925,'/dls/i03/data/2016/cm14451-1/20160113_16_57_18.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_16_57_18.dat',12700,20,50,NULL,NULL,NULL,NULL,NULL,NULL),(1784,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_16_58_02.png','2016-01-13 16:58:02','2016-01-13 16:58:13','/dls/i03/data/2016/cm14451-1/20160113_16_58_02.mca',1,NULL,1.59925,'/dls/i03/data/2016/cm14451-1/20160113_16_58_02.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_16_58_02.dat',12700,20,80,NULL,NULL,NULL,NULL,NULL,NULL),(1785,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_16_59_00.png','2016-01-13 16:59:00','2016-01-13 16:59:12','/dls/i03/data/2016/cm14451-1/20160113_16_59_00.mca',1,NULL,1.59925,'/dls/i03/data/2016/cm14451-1/20160113_16_59_00.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_16_59_00.dat',12700,20,80,NULL,NULL,NULL,NULL,NULL,NULL),(1786,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_16_59_53.png','2016-01-13 16:59:53','2016-01-13 17:00:04','/dls/i03/data/2016/cm14451-1/20160113_16_59_53.mca',1,NULL,1.59925,'/dls/i03/data/2016/cm14451-1/20160113_16_59_53.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_16_59_53.dat',12700,20,80,NULL,NULL,NULL,NULL,NULL,NULL),(1787,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_17_01_34.png','2016-01-13 17:01:34','2016-01-13 17:01:49','/dls/i03/data/2016/cm14451-1/20160113_17_01_34.mca',1,NULL,30.0212,'/dls/i03/data/2016/cm14451-1/20160113_17_01_34.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_17_01_34.dat',12700,20,80,NULL,NULL,NULL,NULL,NULL,NULL),(1788,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_17_11_40.png','2016-01-13 17:11:40','2016-01-13 17:12:54','/dls/i03/data/2016/cm14451-1/20160113_17_11_40.mca',1,NULL,1.59925,'/dls/i03/data/2016/cm14451-1/20160113_17_11_40.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_17_11_40.dat',12700,20,80,NULL,NULL,NULL,NULL,NULL,NULL),(1789,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_17_13_25.png','2016-01-13 17:13:25','2016-01-13 17:13:36','/dls/i03/data/2016/cm14451-1/20160113_17_13_25.mca',1,NULL,1.59925,'/dls/i03/data/2016/cm14451-1/20160113_17_13_25.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_17_13_25.dat',12700,20,80,NULL,NULL,NULL,NULL,NULL,NULL),(1790,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_17_14_01.png','2016-01-13 17:14:01','2016-01-13 17:14:13','/dls/i03/data/2016/cm14451-1/20160113_17_14_01.mca',1,NULL,1.59925,'/dls/i03/data/2016/cm14451-1/20160113_17_14_01.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_17_14_01.dat',12700,20,80,NULL,NULL,NULL,NULL,NULL,NULL),(1791,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_17_15_13.png','2016-01-13 17:15:13','2016-01-13 17:15:26','/dls/i03/data/2016/cm14451-1/20160113_17_15_13.mca',1,NULL,1.59925,'/dls/i03/data/2016/cm14451-1/20160113_17_15_13.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_17_15_13.dat',12700,20,80,NULL,NULL,NULL,NULL,NULL,NULL),(1792,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_17_20_59.png','2016-01-13 17:20:59','2016-01-13 17:21:10','/dls/i03/data/2016/cm14451-1/20160113_17_20_59.mca',1,NULL,4.99011,'/dls/i03/data/2016/cm14451-1/20160113_17_20_59.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_17_20_59.dat',12700,20,80,NULL,NULL,NULL,NULL,NULL,NULL),(1793,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_17_21_26.png','2016-01-13 17:21:26','2016-01-13 17:21:38','/dls/i03/data/2016/cm14451-1/20160113_17_21_26.mca',1,NULL,4.99011,'/dls/i03/data/2016/cm14451-1/20160113_17_21_26.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_17_21_26.dat',12700,20,80,NULL,NULL,NULL,NULL,NULL,NULL),(1794,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_17_24_57.png','2016-01-13 17:24:57','2016-01-13 17:25:11','/dls/i03/data/2016/cm14451-1/20160113_17_24_57.mca',1,NULL,1.59925,'/dls/i03/data/2016/cm14451-1/20160113_17_24_57.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_17_24_57.dat',12700,20,80,NULL,NULL,NULL,NULL,NULL,NULL),(1795,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_17_25_21.png','2016-01-13 17:25:21','2016-01-13 17:25:32','/dls/i03/data/2016/cm14451-1/20160113_17_25_21.mca',1,NULL,1.59925,'/dls/i03/data/2016/cm14451-1/20160113_17_25_21.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_17_25_21.dat',12700,20,80,NULL,NULL,NULL,NULL,NULL,NULL),(1796,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_17_25_48.png','2016-01-13 17:25:48','2016-01-13 17:26:00','/dls/i03/data/2016/cm14451-1/20160113_17_25_48.mca',1,NULL,1.59925,'/dls/i03/data/2016/cm14451-1/20160113_17_25_48.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_17_25_48.dat',12700,20,80,NULL,NULL,NULL,NULL,NULL,NULL),(1797,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_17_26_44.png','2016-01-13 17:26:44','2016-01-13 17:26:57','/dls/i03/data/2016/cm14451-1/20160113_17_26_44.mca',1,NULL,1.59925,'/dls/i03/data/2016/cm14451-1/20160113_17_26_44.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_17_26_44.dat',12700,20,20,NULL,NULL,NULL,NULL,NULL,NULL),(1798,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_17_27_19.png','2016-01-13 17:27:19','2016-01-13 17:27:32','/dls/i03/data/2016/cm14451-1/20160113_17_27_19.mca',1,NULL,1.59925,'/dls/i03/data/2016/cm14451-1/20160113_17_27_19.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_17_27_19.dat',12700,20,50,NULL,NULL,NULL,NULL,NULL,NULL),(1799,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_17_28_10.png','2016-01-13 17:28:10','2016-01-13 17:28:22','/dls/i03/data/2016/cm14451-1/20160113_17_28_10.mca',1,NULL,1.59925,'/dls/i03/data/2016/cm14451-1/20160113_17_28_10.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_17_28_10.dat',12700,20,50,NULL,NULL,NULL,NULL,NULL,NULL),(1800,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_17_29_49.png','2016-01-13 17:29:49','2016-01-13 17:30:01','/dls/i03/data/2016/cm14451-1/20160113_17_29_49.mca',1,NULL,1.59925,'/dls/i03/data/2016/cm14451-1/20160113_17_29_49.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_17_29_49.dat',12700,20,50,NULL,NULL,NULL,NULL,NULL,NULL),(1801,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_17_55_15.png','2016-01-13 17:55:15','2016-01-13 17:56:11','/dls/i03/data/2016/cm14451-1/20160113_17_55_15.mca',1,NULL,1.59925,'/dls/i03/data/2016/cm14451-1/20160113_17_55_15.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_17_55_15.dat',12700,20,50,NULL,NULL,NULL,NULL,NULL,NULL),(1802,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_17_57_11.png','2016-01-13 17:57:11','2016-01-13 17:57:22','/dls/i03/data/2016/cm14451-1/20160113_17_57_11.mca',1,NULL,1.59925,'/dls/i03/data/2016/cm14451-1/20160113_17_57_11.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_17_57_11.dat',12700,20,50,NULL,NULL,NULL,NULL,NULL,NULL),(1803,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_17_57_48.png','2016-01-13 17:57:48','2016-01-13 17:58:00','/dls/i03/data/2016/cm14451-1/20160113_17_57_48.mca',1,NULL,1.59925,'/dls/i03/data/2016/cm14451-1/20160113_17_57_48.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_17_57_48.dat',12700,20,50,NULL,NULL,NULL,NULL,NULL,NULL),(1804,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_17_58_55.png','2016-01-13 17:58:55','2016-01-13 17:59:08','/dls/i03/data/2016/cm14451-1/20160113_17_58_55.mca',1,NULL,1.59925,'/dls/i03/data/2016/cm14451-1/20160113_17_58_55.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_17_58_55.dat',12700,20,50,NULL,NULL,NULL,NULL,NULL,NULL),(1805,55167,374695,'/dls/i03/data/2016/cm14451-1/20160113_18_05_35.png','2016-01-13 18:05:35','2016-01-13 18:05:47','/dls/i03/data/2016/cm14451-1/20160113_18_05_35.mca',1,NULL,1.59925,'/dls/i03/data/2016/cm14451-1/20160113_18_05_35.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_18_05_35.dat',12700,20,50,NULL,NULL,NULL,NULL,NULL,NULL),(1806,55167,374695,'/dls/i03/data/2016/cm14451-1/20160113_18_06_50.png','2016-01-13 18:06:50','2016-01-13 18:07:02','/dls/i03/data/2016/cm14451-1/20160113_18_06_50.mca',1,NULL,1.59925,'/dls/i03/data/2016/cm14451-1/20160113_18_06_50.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_18_06_50.dat',12700,20,50,NULL,NULL,NULL,NULL,NULL,NULL),(1807,55167,374695,'/dls/i03/data/2016/cm14451-1/20160113_18_07_44.png','2016-01-13 18:07:44','2016-01-13 18:07:56','/dls/i03/data/2016/cm14451-1/20160113_18_07_44.mca',1,NULL,1.59925,'/dls/i03/data/2016/cm14451-1/20160113_18_07_44.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_18_07_44.dat',12700,20,50,NULL,NULL,NULL,NULL,NULL,NULL),(1808,55167,374695,'/dls/i03/data/2016/cm14451-1/20160113_18_08_38.png','2016-01-13 18:08:38','2016-01-13 18:08:50','/dls/i03/data/2016/cm14451-1/20160113_18_08_38.mca',1,NULL,1.59925,'/dls/i03/data/2016/cm14451-1/20160113_18_08_38.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_18_08_38.dat',12700,20,50,NULL,NULL,NULL,NULL,NULL,NULL),(1809,55167,374695,'/dls/i03/data/2016/cm14451-1/20160113_18_09_26.png','2016-01-13 18:09:26','2016-01-13 18:09:38','/dls/i03/data/2016/cm14451-1/20160113_18_09_26.mca',1,NULL,4.0011,'/dls/i03/data/2016/cm14451-1/20160113_18_09_26.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_18_09_26.dat',12700,20,50,NULL,NULL,NULL,NULL,NULL,NULL),(1810,55167,374695,'/dls/i03/data/2016/cm14451-1/20160113_18_10_25.png','2016-01-13 18:10:25','2016-01-13 18:10:38','/dls/i03/data/2016/cm14451-1/20160113_18_10_25.mca',1,NULL,4.0011,'/dls/i03/data/2016/cm14451-1/20160113_18_10_25.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_18_10_25.dat',12700,20,50,NULL,NULL,NULL,NULL,NULL,NULL),(1811,55167,374695,'/dls/i03/data/2016/cm14451-1/20160113_18_10_51.png','2016-01-13 18:10:51','2016-01-13 18:11:04','/dls/i03/data/2016/cm14451-1/20160113_18_10_51.mca',1,NULL,4.0011,'/dls/i03/data/2016/cm14451-1/20160113_18_10_51.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_18_10_51.dat',12700,20,50,NULL,NULL,NULL,NULL,NULL,NULL),(1812,55167,374695,'/dls/i03/data/2016/cm14451-1/20160113_18_11_20.png','2016-01-13 18:11:20','2016-01-13 18:11:32','/dls/i03/data/2016/cm14451-1/20160113_18_11_20.mca',1,NULL,4.0011,'/dls/i03/data/2016/cm14451-1/20160113_18_11_20.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_18_11_20.dat',12700,20,50,NULL,NULL,NULL,NULL,NULL,NULL),(1813,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_18_14_57.png','2016-01-13 18:14:57','2016-01-13 18:15:09','/dls/i03/data/2016/cm14451-1/20160113_18_14_57.mca',1,NULL,1.59925,'/dls/i03/data/2016/cm14451-1/20160113_18_14_57.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_18_14_57.dat',12700,20,50,NULL,NULL,NULL,NULL,NULL,NULL),(1814,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_18_15_50.png','2016-01-13 18:15:50','2016-01-13 18:16:02','/dls/i03/data/2016/cm14451-1/20160113_18_15_50.mca',1,NULL,1.59925,'/dls/i03/data/2016/cm14451-1/20160113_18_15_50.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_18_15_50.dat',12700,20,50,NULL,NULL,NULL,NULL,NULL,NULL),(1815,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_18_16_20.png','2016-01-13 18:16:20','2016-01-13 18:16:31','/dls/i03/data/2016/cm14451-1/20160113_18_16_20.mca',1,NULL,1.59925,'/dls/i03/data/2016/cm14451-1/20160113_18_16_20.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_18_16_20.dat',12700,20,50,NULL,NULL,NULL,NULL,NULL,NULL),(1816,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_18_16_56.png','2016-01-13 18:16:56','2016-01-13 18:17:08','/dls/i03/data/2016/cm14451-1/20160113_18_16_56.mca',1,NULL,1.59925,'/dls/i03/data/2016/cm14451-1/20160113_18_16_56.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_18_16_56.dat',12700,20,50,NULL,NULL,NULL,NULL,NULL,NULL),(1817,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_18_17_56.png','2016-01-13 18:17:56','2016-01-13 18:18:29','/dls/i03/data/2016/cm14451-1/20160113_18_17_56.mca',1,NULL,12.8,'/dls/i03/data/2016/cm14451-1/20160113_18_17_56.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_18_17_56.dat',12700,20,50,NULL,NULL,NULL,NULL,NULL,NULL),(1818,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_18_20_49.png','2016-01-13 18:20:49','2016-01-13 18:21:22','/dls/i03/data/2016/cm14451-1/20160113_18_20_49.mca',1,NULL,6.4,'/dls/i03/data/2016/cm14451-1/20160113_18_20_49.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_18_20_49.dat',12700,20,50,NULL,NULL,NULL,NULL,NULL,NULL),(1819,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_18_21_46.png','2016-01-13 18:21:46','2016-01-13 18:21:57','/dls/i03/data/2016/cm14451-1/20160113_18_21_46.mca',1,NULL,12.8138,'/dls/i03/data/2016/cm14451-1/20160113_18_21_46.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_18_21_46.dat',12700,20,50,NULL,NULL,NULL,NULL,NULL,NULL),(1820,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_18_22_33.png','2016-01-13 18:22:33','2016-01-13 18:22:45','/dls/i03/data/2016/cm14451-1/20160113_18_22_33.mca',1,NULL,12.8138,'/dls/i03/data/2016/cm14451-1/20160113_18_22_33.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_18_22_33.dat',12700,20,50,NULL,'good spectrum',NULL,NULL,NULL,NULL),(1821,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_18_23_52.png','2016-01-13 18:23:52','2016-01-13 18:24:05','/dls/i03/data/2016/cm14451-1/20160113_18_23_52.mca',1,NULL,12.8138,'/dls/i03/data/2016/cm14451-1/20160113_18_23_52.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_18_23_52.dat',12700,20,50,NULL,NULL,NULL,NULL,NULL,NULL),(1822,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_18_39_34.png','2016-01-13 18:39:34','2016-01-13 18:40:11','/dls/i03/data/2016/cm14451-1/20160113_18_39_34.mca',1,NULL,100,'/dls/i03/data/2016/cm14451-1/20160113_18_39_34.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_18_39_34.dat',12700,20,50,NULL,NULL,NULL,NULL,NULL,NULL),(1823,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_18_40_53.png','2016-01-13 18:40:53','2016-01-13 18:41:26','/dls/i03/data/2016/cm14451-1/20160113_18_40_53.mca',1,NULL,6.4,'/dls/i03/data/2016/cm14451-1/20160113_18_40_53.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_18_40_53.dat',12700,20,50,NULL,NULL,NULL,NULL,NULL,NULL),(1824,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_18_41_43.png','2016-01-13 18:41:43','2016-01-13 18:42:16','/dls/i03/data/2016/cm14451-1/20160113_18_41_43.mca',1,NULL,6.4,'/dls/i03/data/2016/cm14451-1/20160113_18_41_43.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_18_41_43.dat',12700,20,50,NULL,NULL,NULL,NULL,NULL,NULL),(1825,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_19_20_04.png','2016-01-13 19:20:04','2016-01-13 19:20:37','/dls/i03/data/2016/cm14451-1/20160113_19_20_04.mca',1,NULL,6.4,'/dls/i03/data/2016/cm14451-1/20160113_19_20_04.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_19_20_04.dat',12700,20,50,NULL,NULL,NULL,NULL,NULL,NULL),(1826,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_19_21_10.png','2016-01-13 19:21:10','2016-01-13 19:21:43','/dls/i03/data/2016/cm14451-1/20160113_19_21_10.mca',1,NULL,6.4,'/dls/i03/data/2016/cm14451-1/20160113_19_21_10.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_19_21_10.dat',12700,20,50,NULL,NULL,NULL,NULL,NULL,NULL),(1827,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_19_22_01.png','2016-01-13 19:22:01','2016-01-13 19:22:34','/dls/i03/data/2016/cm14451-1/20160113_19_22_01.mca',1,NULL,6.4,'/dls/i03/data/2016/cm14451-1/20160113_19_22_01.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_19_22_01.dat',12700,20,50,NULL,NULL,NULL,NULL,NULL,NULL),(1828,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_19_23_10.png','2016-01-13 19:23:10','2016-01-13 19:23:45','/dls/i03/data/2016/cm14451-1/20160113_19_23_10.mca',1,NULL,12.8,'/dls/i03/data/2016/cm14451-1/20160113_19_23_10.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_19_23_10.dat',12700,20,50,NULL,NULL,NULL,NULL,NULL,NULL),(1829,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_19_49_01.png','2016-01-13 19:49:01','2016-01-13 19:50:38','/dls/i03/data/2016/cm14451-1/20160113_19_49_01.mca',1,NULL,12.8,'/dls/i03/data/2016/cm14451-1/20160113_19_49_01.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_19_49_01.dat',12700,20,50,NULL,NULL,NULL,NULL,NULL,NULL),(1830,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_20_12_35.png','2016-01-13 20:12:35','2016-01-13 20:13:35','/dls/i03/data/2016/cm14451-1/20160113_20_12_35.mca',1,NULL,0.1,'/dls/i03/data/2016/cm14451-1/20160113_20_12_35.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_20_12_35.dat',14000,20,50,NULL,NULL,NULL,NULL,NULL,NULL),(1831,55167,NULL,'/dls/i03/data/2016/cm14451-1/20160113_20_17_07.png','2016-01-13 20:17:07','2016-01-13 20:19:49','/dls/i03/data/2016/cm14451-1/20160113_20_17_07.mca',1,NULL,3.2,'/dls/i03/data/2016/cm14451-1/20160113_20_17_07.html',NULL,'/dls/i03/data/2016/cm14451-1/20160113_20_17_07.dat',14000,20,50,NULL,NULL,NULL,NULL,NULL,NULL),(1832,55167,374695,'/dls/i03/data/2016/cm14451-1/20160114_11_16_25.png','2016-01-14 11:16:25','2016-01-14 11:17:32','/dls/i03/data/2016/cm14451-1/20160114_11_16_25.mca',1,NULL,1.6,'/dls/i03/data/2016/cm14451-1/20160114_11_16_25.html',NULL,'/dls/i03/data/2016/cm14451-1/20160114_11_16_25.dat',12673,20,50,NULL,NULL,NULL,NULL,NULL,NULL),(1833,55167,374695,'/dls/i03/data/2016/cm14451-1/20160114_11_20_14.png','2016-01-14 11:20:14','2016-01-14 11:20:46','/dls/i03/data/2016/cm14451-1/20160114_11_20_14.mca',1,NULL,6.4,'/dls/i03/data/2016/cm14451-1/20160114_11_20_14.html',NULL,'/dls/i03/data/2016/cm14451-1/20160114_11_20_14.dat',12673,20,50,NULL,NULL,NULL,NULL,NULL,NULL),(1834,55167,374695,'/dls/i03/data/2016/cm14451-1/20160114_11_23_23.png','2016-01-14 11:23:23','2016-01-14 11:23:56','/dls/i03/data/2016/cm14451-1/20160114_11_23_23.mca',1,NULL,6.4,'/dls/i03/data/2016/cm14451-1/20160114_11_23_23.html',NULL,'/dls/i03/data/2016/cm14451-1/20160114_11_23_23.dat',14000,20,50,NULL,'null _FLAG_',NULL,NULL,NULL,NULL),(1984,55168,NULL,'/dls/i03/data/2016/cm14451-2/20160330_14_34_12.png','2016-03-30 14:34:12','2016-03-30 14:34:25','/dls/i03/data/2016/cm14451-2/20160330_14_34_12.mca',1,NULL,19.9988,'/dls/i03/data/2016/cm14451-2/20160330_14_34_12.html',NULL,'/dls/i03/data/2016/cm14451-2/20160330_14_34_12.dat',12700,20,80,NULL,NULL,NULL,NULL,NULL,NULL),(1987,55168,NULL,'/dls/i03/data/2016/cm14451-2/20160331_10_13_31.png','2016-03-31 10:13:31','2016-03-31 10:13:44','/dls/i03/data/2016/cm14451-2/20160331_10_13_31.mca',1,NULL,20.0048,'/dls/i03/data/2016/cm14451-2/20160331_10_13_31.html',NULL,'/dls/i03/data/2016/cm14451-2/20160331_10_13_31.dat',12700,20,80,NULL,NULL,NULL,NULL,NULL,NULL),(1990,55168,NULL,'/dls/i03/data/2016/cm14451-2/20160405_16_40_33.png','2016-04-05 16:40:33','2016-04-05 16:42:09','/dls/i03/data/2016/cm14451-2/20160405_16_40_33.mca',3,NULL,12.8,'/dls/i03/data/2016/cm14451-2/20160405_16_40_33.html',NULL,'/dls/i03/data/2016/cm14451-2/20160405_16_40_33.dat',14000,20,20,NULL,NULL,NULL,NULL,NULL,NULL),(2002,55168,NULL,'/dls/i03/data/2016/cm14451-2/20160406_16_29_44.png','2016-04-06 16:29:44','2016-04-06 16:30:27','/dls/i03/data/2016/cm14451-2/20160406_16_29_44.mca',2,NULL,12.8,'/dls/i03/data/2016/cm14451-2/20160406_16_29_44.html',NULL,'/dls/i03/data/2016/cm14451-2/20160406_16_29_44.dat',12700,20,50,NULL,NULL,NULL,NULL,NULL,NULL),(2005,55168,NULL,'/dls/i03/data/2009/in1246-1/jpegs/bs/bs_MS_1_001.jpeg',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL); /*!40000 ALTER TABLE `XFEFluorescenceSpectrum` ENABLE KEYS */; /*!40000 ALTER TABLE `XRFFluorescenceMapping` DISABLE KEYS */; @@ -1035,78 +557,7 @@ INSERT INTO `XFEFluorescenceSpectrum` (`xfeFluorescenceSpectrumId`, `sessionId`, /*!40000 ALTER TABLE `XrayCentringResult` ENABLE KEYS */; /*!40000 ALTER TABLE `v_run` DISABLE KEYS */; -INSERT INTO `v_run` (`runId`, `run`, `startDate`, `endDate`) VALUES (1,'2008-01','2007-12-17 09:00:00','2008-02-09 08:59:59'), -(2,'2008-02','2008-02-09 09:00:00','2008-03-14 08:59:59'), -(3,'2008-03','2008-03-14 09:00:00','2008-04-28 08:59:59'), -(4,'2008-04','2008-04-28 09:00:00','2008-05-30 08:59:59'), -(5,'2008-05','2008-05-30 09:00:00','2008-07-12 08:59:59'), -(6,'2008-06','2008-07-12 09:00:00','2008-08-15 08:59:59'), -(7,'2008-07','2008-08-15 09:00:00','2008-09-27 08:59:59'), -(8,'2008-08','2008-09-27 09:00:00','2008-10-31 08:59:59'), -(9,'2008-09','2008-10-31 09:00:00','2008-12-19 08:59:59'), -(10,'2009-01','2008-12-19 09:00:00','2009-02-09 08:59:59'), -(11,'2009-02','2009-02-09 09:00:00','2009-03-13 08:59:59'), -(12,'2009-03','2009-03-13 09:00:00','2009-04-25 08:59:59'), -(13,'2009-04','2009-04-25 09:00:00','2009-05-29 08:59:59'), -(14,'2009-05','2009-05-29 09:00:00','2009-07-18 08:59:59'), -(15,'2009-06','2009-07-18 09:00:00','2009-08-14 08:59:59'), -(16,'2009-07','2009-08-14 09:00:00','2009-09-29 08:59:59'), -(17,'2009-08','2009-09-29 09:00:00','2009-10-30 08:59:59'), -(18,'2009-09','2009-10-30 09:00:00','2009-12-18 08:59:59'), -(19,'2010-01','2009-12-18 09:00:00','2010-02-08 08:59:59'), -(20,'2010-02','2010-02-08 09:00:00','2010-03-15 08:59:59'), -(21,'2010-03','2010-03-15 09:00:00','2010-06-01 08:59:59'), -(22,'2010-04','2010-06-01 09:00:00','2010-08-13 08:59:59'), -(23,'2010-05','2010-08-13 09:00:00','2010-11-01 08:59:59'), -(24,'2010-06','2010-11-01 09:00:00','2010-12-23 08:59:59'), -(25,'2011-01','2010-12-23 09:00:00','2011-03-04 08:59:59'), -(26,'2011-02','2011-03-04 09:00:00','2011-06-03 08:59:59'), -(27,'2011-03','2011-06-03 09:00:00','2011-08-12 08:59:59'), -(28,'2011-04','2011-08-12 09:00:00','2011-11-07 08:59:59'), -(29,'2011-05','2011-11-07 09:00:00','2011-12-22 08:59:59'), -(30,'2012-01','2011-12-22 09:00:00','2012-03-26 08:59:59'), -(31,'2012-02','2012-03-26 09:00:00','2012-06-01 08:59:59'), -(32,'2012-03','2012-06-01 09:00:00','2012-08-17 08:59:59'), -(33,'2012-04','2012-08-17 09:00:00','2012-11-02 08:59:59'), -(34,'2012-05','2012-11-02 09:00:00','2012-12-21 08:59:59'), -(35,'2013-01','2012-12-21 09:00:00','2013-03-22 08:59:59'), -(36,'2013-02','2013-03-22 09:00:00','2013-05-31 08:59:59'), -(37,'2013-03','2013-05-31 09:00:00','2013-08-16 08:59:59'), -(38,'2013-04','2013-08-16 09:00:00','2013-11-01 08:59:59'), -(39,'2013-05','2013-11-01 09:00:00','2013-12-20 08:59:59'), -(40,'2014-01','2013-12-20 09:00:00','2014-03-14 08:59:59'), -(41,'2014-02','2014-03-14 09:00:00','2014-05-30 08:59:59'), -(42,'2014-03','2014-05-30 09:00:00','2014-08-15 08:59:59'), -(43,'2014-04','2014-08-15 09:00:00','2014-10-24 08:59:59'), -(44,'2014-05','2014-10-24 09:00:00','2014-12-19 08:59:59'), -(45,'2015-01','2014-12-19 09:00:00','2015-03-13 08:59:59'), -(46,'2015-02','2015-03-13 09:00:00','2015-05-29 08:59:59'), -(47,'2015-03','2015-05-29 09:00:00','2015-08-14 08:59:59'), -(48,'2015-04','2015-08-14 09:00:00','2015-10-23 08:59:59'), -(49,'2015-05','2015-10-23 09:00:00','2015-12-18 08:59:59'), -(50,'2016-01','2015-12-18 09:00:00','2016-03-11 08:59:59'), -(51,'2016-02','2016-03-11 09:00:00','2016-05-20 08:59:59'), -(52,'2016-03','2016-05-20 09:00:00','2016-08-12 08:59:59'), -(53,'2016-04','2016-08-12 09:00:00','2016-10-07 08:59:59'), -(54,'2016-05','2016-10-07 09:00:00','2016-12-20 08:59:59'), -(55,'2017-01','2016-12-20 09:00:00','2017-03-17 08:59:59'), -(56,'2017-02','2017-03-17 09:00:00','2017-05-26 08:59:59'), -(57,'2017-03','2017-05-26 09:00:00','2017-08-11 08:59:59'), -(58,'2017-04','2017-08-11 09:00:00','2017-10-27 08:59:59'), -(59,'2017-05','2017-10-27 09:00:00','2017-12-19 08:59:59'), -(60,'2018-01','2017-12-19 09:00:00','2018-03-16 08:59:59'), -(61,'2018-02','2018-03-16 09:00:00','2018-05-24 08:59:59'), -(62,'2018-03','2018-05-24 09:00:00','2018-08-10 08:59:59'), -(63,'2018-04','2018-08-10 09:00:00','2018-10-26 08:59:59'), -(64,'2018-05','2018-10-26 09:00:00','2018-12-18 08:59:59'), -(65,'2019-01','2018-12-18 09:00:00','2019-03-08 08:59:59'), -(66,'2019-02','2019-03-08 09:00:00','2019-05-23 08:59:59'), -(67,'2019-03','2019-05-23 09:00:00','2019-08-09 08:59:59'), -(68,'2019-04','2019-08-09 09:00:00','2019-10-25 08:59:59'), -(69,'2019-05','2019-10-25 09:00:00','2019-12-17 08:59:59'), -(70,'2020-01','2019-12-17 09:00:00','2020-03-06 08:59:59'), -(71,'2020-02','2020-03-06 09:00:00','2020-05-22 08:59:59'), -(72,'2020-03','2020-05-22 09:00:00','2020-08-14 08:59:59'); +INSERT INTO `v_run` (`runId`, `run`, `startDate`, `endDate`) VALUES (1,'2008-01','2007-12-17 09:00:00','2008-02-09 08:59:59'),(2,'2008-02','2008-02-09 09:00:00','2008-03-14 08:59:59'),(3,'2008-03','2008-03-14 09:00:00','2008-04-28 08:59:59'),(4,'2008-04','2008-04-28 09:00:00','2008-05-30 08:59:59'),(5,'2008-05','2008-05-30 09:00:00','2008-07-12 08:59:59'),(6,'2008-06','2008-07-12 09:00:00','2008-08-15 08:59:59'),(7,'2008-07','2008-08-15 09:00:00','2008-09-27 08:59:59'),(8,'2008-08','2008-09-27 09:00:00','2008-10-31 08:59:59'),(9,'2008-09','2008-10-31 09:00:00','2008-12-19 08:59:59'),(10,'2009-01','2008-12-19 09:00:00','2009-02-09 08:59:59'),(11,'2009-02','2009-02-09 09:00:00','2009-03-13 08:59:59'),(12,'2009-03','2009-03-13 09:00:00','2009-04-25 08:59:59'),(13,'2009-04','2009-04-25 09:00:00','2009-05-29 08:59:59'),(14,'2009-05','2009-05-29 09:00:00','2009-07-18 08:59:59'),(15,'2009-06','2009-07-18 09:00:00','2009-08-14 08:59:59'),(16,'2009-07','2009-08-14 09:00:00','2009-09-29 08:59:59'),(17,'2009-08','2009-09-29 09:00:00','2009-10-30 08:59:59'),(18,'2009-09','2009-10-30 09:00:00','2009-12-18 08:59:59'),(19,'2010-01','2009-12-18 09:00:00','2010-02-08 08:59:59'),(20,'2010-02','2010-02-08 09:00:00','2010-03-15 08:59:59'),(21,'2010-03','2010-03-15 09:00:00','2010-06-01 08:59:59'),(22,'2010-04','2010-06-01 09:00:00','2010-08-13 08:59:59'),(23,'2010-05','2010-08-13 09:00:00','2010-11-01 08:59:59'),(24,'2010-06','2010-11-01 09:00:00','2010-12-23 08:59:59'),(25,'2011-01','2010-12-23 09:00:00','2011-03-04 08:59:59'),(26,'2011-02','2011-03-04 09:00:00','2011-06-03 08:59:59'),(27,'2011-03','2011-06-03 09:00:00','2011-08-12 08:59:59'),(28,'2011-04','2011-08-12 09:00:00','2011-11-07 08:59:59'),(29,'2011-05','2011-11-07 09:00:00','2011-12-22 08:59:59'),(30,'2012-01','2011-12-22 09:00:00','2012-03-26 08:59:59'),(31,'2012-02','2012-03-26 09:00:00','2012-06-01 08:59:59'),(32,'2012-03','2012-06-01 09:00:00','2012-08-17 08:59:59'),(33,'2012-04','2012-08-17 09:00:00','2012-11-02 08:59:59'),(34,'2012-05','2012-11-02 09:00:00','2012-12-21 08:59:59'),(35,'2013-01','2012-12-21 09:00:00','2013-03-22 08:59:59'),(36,'2013-02','2013-03-22 09:00:00','2013-05-31 08:59:59'),(37,'2013-03','2013-05-31 09:00:00','2013-08-16 08:59:59'),(38,'2013-04','2013-08-16 09:00:00','2013-11-01 08:59:59'),(39,'2013-05','2013-11-01 09:00:00','2013-12-20 08:59:59'),(40,'2014-01','2013-12-20 09:00:00','2014-03-14 08:59:59'),(41,'2014-02','2014-03-14 09:00:00','2014-05-30 08:59:59'),(42,'2014-03','2014-05-30 09:00:00','2014-08-15 08:59:59'),(43,'2014-04','2014-08-15 09:00:00','2014-10-24 08:59:59'),(44,'2014-05','2014-10-24 09:00:00','2014-12-19 08:59:59'),(45,'2015-01','2014-12-19 09:00:00','2015-03-13 08:59:59'),(46,'2015-02','2015-03-13 09:00:00','2015-05-29 08:59:59'),(47,'2015-03','2015-05-29 09:00:00','2015-08-14 08:59:59'),(48,'2015-04','2015-08-14 09:00:00','2015-10-23 08:59:59'),(49,'2015-05','2015-10-23 09:00:00','2015-12-18 08:59:59'),(50,'2016-01','2015-12-18 09:00:00','2016-03-11 08:59:59'),(51,'2016-02','2016-03-11 09:00:00','2016-05-20 08:59:59'),(52,'2016-03','2016-05-20 09:00:00','2016-08-12 08:59:59'),(53,'2016-04','2016-08-12 09:00:00','2016-10-07 08:59:59'),(54,'2016-05','2016-10-07 09:00:00','2016-12-20 08:59:59'),(55,'2017-01','2016-12-20 09:00:00','2017-03-17 08:59:59'),(56,'2017-02','2017-03-17 09:00:00','2017-05-26 08:59:59'),(57,'2017-03','2017-05-26 09:00:00','2017-08-11 08:59:59'),(58,'2017-04','2017-08-11 09:00:00','2017-10-27 08:59:59'),(59,'2017-05','2017-10-27 09:00:00','2017-12-19 08:59:59'),(60,'2018-01','2017-12-19 09:00:00','2018-03-16 08:59:59'),(61,'2018-02','2018-03-16 09:00:00','2018-05-24 08:59:59'),(62,'2018-03','2018-05-24 09:00:00','2018-08-10 08:59:59'),(63,'2018-04','2018-08-10 09:00:00','2018-10-26 08:59:59'),(64,'2018-05','2018-10-26 09:00:00','2018-12-18 08:59:59'),(65,'2019-01','2018-12-18 09:00:00','2019-03-08 08:59:59'),(66,'2019-02','2019-03-08 09:00:00','2019-05-23 08:59:59'),(67,'2019-03','2019-05-23 09:00:00','2019-08-09 08:59:59'),(68,'2019-04','2019-08-09 09:00:00','2019-10-25 08:59:59'),(69,'2019-05','2019-10-25 09:00:00','2019-12-17 08:59:59'),(70,'2020-01','2019-12-17 09:00:00','2020-03-06 08:59:59'),(71,'2020-02','2020-03-06 09:00:00','2020-05-22 08:59:59'),(72,'2020-03','2020-05-22 09:00:00','2020-08-14 08:59:59'); /*!40000 ALTER TABLE `v_run` ENABLE KEYS */; /*!40000 ALTER TABLE `zc_ZocaloBuffer` DISABLE KEYS */; diff --git a/schemas/ispyb/lookups.sql b/schemas/ispyb/lookups.sql index 2abf64aa..683faa9e 100644 --- a/schemas/ispyb/lookups.sql +++ b/schemas/ispyb/lookups.sql @@ -15,440 +15,47 @@ INSERT INTO `AdminVar` (`varId`, `name`, `value`) VALUES (4,'schemaVersion','4.3 /*!40000 ALTER TABLE `AdminVar` ENABLE KEYS */; /*!40000 ALTER TABLE `SchemaStatus` DISABLE KEYS */; -INSERT INTO `SchemaStatus` (`schemaStatusId`, `scriptName`, `schemaStatus`, `recordTimeStamp`) VALUES (6,'20180213_BLSample_subLocation.sql','DONE','2018-02-13 13:27:19'), -(12,'20180213_DataCollectionFileAttachment_fileType.sql','DONE','2018-02-13 15:12:54'), -(16,'20180303_v_run_to_table.sql','DONE','2018-07-25 15:11:18'), -(19,'20180328_ImageQualityIndicators_alter_table.sql','DONE','2018-07-25 15:11:18'), -(22,'20180410_BeamLineSetup_alter.sql','DONE','2018-07-25 15:11:18'), -(25,'20180413_BeamLineSetup_and_Detector_alter.sql','DONE','2018-07-25 15:11:18'), -(28,'20180501_DataCollectionGroup_experimentType_enum.sql','DONE','2018-07-25 15:11:18'), -(31,'20180531_ScreeningOutput_alignmentSuccess.sql','DONE','2018-07-25 15:11:18'), -(34,'20180629_DataCollection_imageContainerSubPath.sql','DONE','2018-07-25 15:11:18'), -(35,'20180913_BeamCalendar.sql','DONE','2018-09-19 09:52:45'), -(36,'2018_09_19_DataCollection_imageDirectory_comment.sql','DONE','2018-09-19 12:38:01'), -(37,'2018_09_27_increase_schema_version.sql','DONE','2018-09-27 13:17:15'), -(38,'2018_11_01_XrayCenteringResult.sql','DONE','2018-11-01 13:36:53'), -(39,'2018_11_01_AutoProcProgram_dataCollectionId.sql','DONE','2018-11-01 15:10:38'), -(40,'2018_11_01_AutoProcProgramMessage.sql','DONE','2018-11-01 15:28:17'), -(44,'2018_11_01_DiffractionPlan_centeringMethod.sql','DONE','2018-11-01 22:51:36'), -(45,'2018_11_02_DataCollectionGroup_experimentType_enum.sql','DONE','2018-11-02 11:54:15'), -(47,'2018_11_05_spelling_of_centring.sql','DONE','2018-11-05 15:31:38'), -(48,'2018_11_09_AutoProcProgram_update_processing_program.sql','DONE','2018-11-09 16:38:34'), -(49,'2018_11_14_AutoProcProgramMessage_autoinc.sql','DONE','2018-11-14 10:15:27'), -(50,'2018_11_22_AutoProcProgram_processingStatus_update.sql','DONE','2018-11-22 16:11:15'), -(51,'2018_12_04_EnergyScan_and_XFEFluorescenceSpectrum_add_axisPosition.sql','DONE','2018-12-04 14:13:23'), -(52,'2018_12_20_DataCollectionGroup_scanParameters.sql','DONE','2018-12-20 17:30:04'), -(53,'2019_01_14_Proposal_state.sql','DONE','2019-01-14 12:13:31'), -(54,'2019_01_14_ProcessingJobParameter_parameterValue.sql','DONE','2019-01-14 14:00:02'), -(57,'2019_01_15_Detector_localName.sql','DONE','2019-01-15 23:01:15'), -(58,'2019_02_04_BLSession_unique_index.sql','DONE','2019-02-04 13:52:19'), -(59,'2019_03_29_BLSession_archived.sql','DONE','2019-04-03 14:43:08'), -(60,'2019_04_03_UserGroup_and_Permission.sql','DONE','2019-04-03 14:51:04'), -(61,'2019_04_07_AdminVar_bump_version.sql','DONE','2019-04-07 11:35:06'), -(62,'2019_04_08_AdminVar_bump_version.sql','DONE','2019-04-08 15:38:01'), -(63,'2019_04_23_AdminVar_bump_version.sql','DONE','2019-04-23 11:13:27'), -(64,'2019_04_23_drop_v_run_view.sql','DONE','2019-04-23 11:13:35'), -(67,'2019_04_23_v_run_additional_runs.sql','DONE','2019-04-23 12:39:47'), -(68,'2019_05_28_AdminVar_bump_version.sql','DONE','2019-05-28 13:29:27'), -(72,'2019_07_17_BLSample_crystalId_default.sql','DONE','2019-07-17 15:21:59'), -(73,'2019_08_15_Sleeve.sql','DONE','2019-08-15 08:34:34'), -(74,'2019_08_15_AdminVar_bump_version.sql','DONE','2019-08-15 08:57:37'), -(75,'2019_08_28_AdminVar_bump_version.sql','DONE','2019-08-28 13:30:13'), -(76,'2019_08_30_AdminVar_bump_version.sql','DONE','2019-08-30 11:58:16'), -(77,'2019_10_06_BLSampleImage_fk3.sql','DONE','2019-10-06 16:55:44'), -(78,'2019_10_08_DiffractionPlan_experimentKind.sql','DONE','2019-10-08 12:47:10'), -(79,'2019_11_07_AutoProcProgramAttachment_importanceRank.sql','DONE','2019-11-07 16:35:25'), -(80,'2019_11_07_AdminVar_bump_version.sql','DONE','2019-11-07 16:45:44'), -(81,'2019_11_08_AdminVar_bump_version.sql','DONE','2019-11-08 16:09:52'), -(82,'2019_11_26_v_run_idx1.sql','DONE','2019-11-26 15:00:21'), -(83,'2019_12_02_AdminVar_bump_version.sql','DONE','2019-12-02 11:29:05'), -(84,'2019_12_02_AdminVar_bump_version_v2.sql','DONE','2019-12-02 18:14:11'), -(85,'2020_01_03_BLSampleImage_tables.sql','DONE','2020-01-03 16:05:45'), -(86,'2020_01_06_AdminVar_bump_version.sql','DONE','2020-01-06 11:45:02'), -(87,'2020_01_07_AdminVar_bump_version.sql','DONE','2020-01-07 09:45:25'), -(88,'2020_01_07_AdminVar_bump_version_v2.sql','DONE','2020-01-07 10:24:54'), -(89,'2020_01_07_AdminVar_bump_version_v3.sql','DONE','2020-01-07 11:16:09'), -(90,'2020_01_20_AdminVar_bump_version.sql','DONE','2020-01-20 13:40:52'), -(91,'2020_01_20_AdminVar_bump_version_v2.sql','DONE','2020-01-20 16:27:37'), -(92,'2020_02_13_SpaceGroup_data.sql','DONE','2020-02-13 16:52:53'), -(93,'2020_01_21_DiffractionPlan_experimentKind.sql','DONE','2020-02-13 17:13:17'), -(94,'2020_02_21_ProposalHasPerson_role_enum.sql','DONE','2020-02-21 14:36:10'), -(95,'2020_02_21_Session_has_Person_role_enum.sql','DONE','2020-02-21 14:36:17'), -(96,'2020_02_27_Container_scLocationUpdated.sql','DONE','2020-02-27 13:43:51'), -(97,'2020_03_09_Reprocessing_drop_tables.sql','DONE','2020-03-09 11:05:09'), -(98,'2020_03_24_ProcessingPipeline_tables.sql','DONE','2020-03-26 16:37:29'), -(99,'2020_03_25_ProcessingPipeline_ren_col.sql','DONE','2020-03-26 16:37:34'), -(100,'2020_03_27_AdminVar_bump_version.sql','DONE','2020-03-27 08:51:52'), -(101,'2020_03_27_AdminVar_bump_version_v2.sql','DONE','2020-03-27 15:07:56'), -(102,'2020_04_06_alterProtein.sql','DONE','2020-04-06 13:40:18'), -(103,'2020_04_27_BLSampleImageAutoScoreSchema_insert_CHIMP.sql','DONE','2020-04-27 14:37:41'), -(104,'2020_05_21_BLSampleImageAutoScoreClass_insert_CHIMP.sql','DONE','2020-05-21 17:52:54'), -(105,'2020_06_01_DewarRegistry_and_DewarRegistry_has_Proposal.sql','DONE','2020-06-01 10:29:19'), -(106,'2020_06_01_Protein_new_columns.sql','DONE','2020-06-01 10:29:32'), -(107,'2020_06_01_AdminVar_bump_version.sql','DONE','2020-06-01 10:46:11'), -(108,'2020_06_08_Shipping_comments.sql','DONE','2020-06-08 16:44:26'), -(109,'2020_06_10_DiffractionPlan_experimentKind.sql','DONE','2020-06-10 14:35:18'), -(110,'2020_06_15_Shipping_comments.sql','DONE','2020-06-15 14:01:25'), -(111,'2020_06_24_BLSampleGroup_name.sql','DONE','2020-06-24 10:56:25'), -(112,'2020_06_24_DiffractionPlan_userPath.sql','DONE','2020-06-24 10:56:30'), -(113,'2020_07_01_DewarRegistry_and_DewarRegistry_has_Proposal.sql','DONE','2020-07-01 13:51:49'), -(114,'2020_07_06_DewarRegistry_to_DewarRegistry_has_Proposal_data.sql','DONE','2020-07-06 10:59:22'), -(115,'2020_07_13_AdminVar_bump_version.sql','DONE','2020-07-13 18:14:39'), -(116,'2020_08_03_AdminVar_bump_version.sql','DONE','2020-08-03 15:19:36'), -(117,'2020_09_02_AutoProcScalingStatistics_new_index.sql','DONE','2020-09-02 17:02:33'), -(118,'2020_09_08_DewarRegistry_modify_fks.sql','DONE','2020-09-08 15:26:14'), -(119,'2020_08_28_ComponentSubType_changes.sql','DONE','2020-10-14 18:15:55'), -(120,'2020_08_28_ConcentrationType_changes.sql','DONE','2020-10-14 18:15:55'), -(121,'2020_08_28_Dewar_type.sql','DONE','2020-10-14 18:15:55'), -(122,'2020_08_28_DiffractionPlan_new_temperature_cols.sql','DONE','2020-10-14 18:15:55'), -(123,'2020_08_28_ExperimentType.sql','DONE','2020-10-14 18:15:55'), -(124,'2020_08_28_PurificationColumn.sql','DONE','2020-10-14 18:15:55'), -(125,'2020_08_29_BLSampleType.sql','DONE','2020-10-14 18:15:55'), -(126,'2020_08_29_Protein_isotropy.sql','DONE','2020-10-14 18:15:55'), -(127,'2020_10_16_AdminVar_bump_version.sql','DONE','2020-10-16 22:05:36'), -(128,'2020_10_19_AdminVar_bump_version.sql','DONE','2020-10-20 04:21:23'), -(129,'2020_10_22_GridInfo_dcId.sql','DONE','2020-11-09 13:57:27'), -(130,'2020_11_09_Phasing_method_enum.sql','DONE','2020-11-09 13:57:27'), -(133,'2020_11_09_AdminVar_bump_version.sql','DONE','2020-11-09 22:26:13'), -(134,'2020_11_10_SpaceGroup_update.sql','DONE','2020-11-20 17:49:46'), -(135,'2020_11_13_Dewar_facilityCode.sql','DONE','2020-11-20 17:49:46'), -(136,'2020_11_20_AdminVar_bump_version.sql','DONE','2020-11-20 17:49:46'), -(137,'2020_12_01_AdminVar_bump_version.sql','DONE','2020-12-01 12:21:43'), -(138,'2020_12_04_Container_experimentTypeId_FK.sql','DONE','2020-12-04 16:34:05'), -(139,'2020_12_04_AdminVar_bump_version.sql','DONE','2020-12-04 16:40:14'), -(140,'2020_11_22_diffractionplan_priority_and_mode.sql','DONE','2020-12-29 18:29:08'), -(141,'2020_12_07_AutoProc_index_unit_cell.sql','DONE','2020-12-29 18:29:08'), -(142,'2020_12_07_DataCollection_index_startTime.sql','DONE','2020-12-29 18:29:08'), -(143,'2020_12_10_BLSubSample_source.sql','DONE','2020-12-29 18:29:08'), -(144,'2020_12_30_AdminVar_bump_version.sql','DONE','2020-12-30 14:36:17'), -(145,'2021_01_13_AdminVar_bump_version.sql','DONE','2021-01-13 12:12:57'), -(146,'2021_01_14_AdminVar_bump_version.sql','DONE','2021-01-14 11:04:57'), -(147,'2020_07_31_add_offset_blsampleimage.sql','DONE','2021-02-22 12:28:16'), -(148,'2020_07_31_add_type_blsubsample.sql','DONE','2021-02-22 12:28:16'), -(149,'2020_07_31_extend_dcattachment_enum.sql','DONE','2021-02-22 12:28:16'), -(150,'2020_07_31_extend_dcg_type_enum.sql','DONE','2021-02-22 12:28:16'), -(151,'2020_07_31_extend_robotaction_enum.sql','DONE','2021-02-22 12:28:16'), -(152,'2020_07_31_refactor_xrfmapping.sql','DONE','2021-02-22 12:28:16'), -(153,'2020_11_22_blsample_staff_comments.sql','DONE','2021-02-22 12:28:16'), -(154,'2021_01_28_beamlinesetup_add_datacentre.sql','DONE','2021-02-22 12:28:16'), -(155,'2021_02_04_DiffractionPlan_strategyOption.sql','DONE','2021-02-22 12:28:16'), -(156,'2021_02_22_AdminVar_bump_version.sql','DONE','2021-02-22 13:06:57'), -(157,'2021_02_22_AdminVar_bump_version_v2.sql','DONE','2021-02-22 15:37:45'), -(158,'2020_08_28_ContainerType.sql','DONE','2021-03-05 16:09:40'), -(159,'2021_03_03_BF_automationError.sql','DONE','2021-03-05 16:09:41'), -(160,'2021_03_03_BF_automationFault.sql','DONE','2021-03-05 16:09:41'), -(161,'2021_03_03_cryoEMv2_0_tables.sql','DONE','2021-03-05 16:09:41'), -(162,'2021_03_05_AdminVar_bump_version.sql','DONE','2021-03-05 16:09:41'), -(163,'2021_03_05_ContainerType_update.sql','DONE','2021-04-13 15:50:39'), -(164,'2021_03_08_ContainerType_update.sql','DONE','2021-04-13 15:50:39'), -(165,'2021_03_09_SpaceGroup_update.sql','DONE','2021-04-13 15:50:39'), -(166,'2021_03_19_add_drop_indices.sql','DONE','2021-04-13 15:50:39'), -(167,'2021_03_19_ExperimentType_update.sql','DONE','2021-04-13 15:50:39'), -(168,'2021_04_01_BLSampleGroup_has_BLSample_modify_type.sql','DONE','2021-04-13 15:50:39'), -(169,'2021_04_01_ContainerType_insert.sql','DONE','2021-04-13 15:50:39'), -(170,'2021_04_12_cryoEMv2_1.sql','DONE','2021-04-13 15:50:39'), -(171,'2021_04_13_AdminVar_bump_version.sql','DONE','2021-04-13 16:17:12'), -(173,'2021_04_13_ContainerType_update.sql','DONE','2021-04-13 16:42:57'), -(174,'2021_04_20_AdminVar_bump_version.sql','DONE','2021-04-20 17:05:50'), -(175,'2020_11_19_ContainerQueueSample.sql','DONE','2021-05-14 16:07:45'), -(176,'2020_11_19_DataCollection.sql','DONE','2021-05-14 16:07:45'), -(177,'2021_04_23_Dewar_fk_constraint.sql','DONE','2021-05-14 16:07:46'), -(178,'2021_05_12_ParticleClassification_rotationAccuracy.sql','DONE','2021-05-14 16:07:46'), -(179,'2021_05_14_AdminVar_bump_version.sql','DONE','2021-05-14 16:21:50'), -(180,'2021_05_19_AdminVar_bump_version.sql','DONE','2021-05-19 16:01:54'), -(181,'2021_05_20_AdminVar_bump_version.sql','DONE','2021-05-20 10:30:35'), -(182,'2021_05_28_AdminVar_bump_version.sql','DONE','2021-05-28 15:46:50'), -(183,'2020_08_28_DiffractionPlan_new_cols.sql','DONE','2021-07-07 09:32:34'), -(184,'2021_06_01_BLSampleGroup_fk_proposalId.sql','DONE','2021-07-07 09:32:34'), -(185,'2021_06_09_DataCollectionGroup_experimentType_enum.sql','DONE','2021-07-07 09:32:34'), -(186,'2021_06_11_DataCollectionGroup_experimentType_enum.sql','DONE','2021-07-07 09:32:34'), -(187,'2021_06_17_SpaceGroup_update.sql','DONE','2021-07-07 09:32:34'), -(188,'2021_06_30_zc_ZocaloBuffer.sql','DONE','2021-07-07 09:32:34'), -(189,'2021_07_01_ParticleClassification_classDistribution.sql','DONE','2021-07-07 09:32:34'), -(190,'2021_07_01_ParticlePicker_summaryImageFullPath.sql','DONE','2021-07-07 09:32:34'), -(191,'2021_07_02_UserGroup_insert.sql','DONE','2021-07-07 09:32:34'), -(192,'2021_07_07_AdminVar_bump_version.sql','DONE','2021-07-07 10:35:39'), -(193,'2021_07_07_AdminVar_bump_version_v2.sql','DONE','2021-07-07 11:37:27'), -(194,'2021_07_08_AutoProcScalingStatistics_resIOverSigI2.sql','DONE','2021-07-23 17:36:44'), -(195,'2021_07_08_Screening_autoProcProgramId.sql','DONE','2021-07-23 17:36:45'), -(196,'2021_07_09_ProposalHasPerson_role_enum.sql','DONE','2021-07-23 17:36:45'), -(197,'2021_07_09_Session_has_Person_role_enum.sql','DONE','2021-07-23 17:36:45'), -(198,'2021_07_21_Positioner_tables.sql','DONE','2021-07-23 17:36:45'), -(199,'2021_07_23_AdminVar_bump_version.sql','DONE','2021-07-23 17:36:45'), -(200,'2021_07_23_AutoProcProgram_drop_dataCollectionId.sql','DONE','2021-07-23 17:36:45'), -(201,'2021_07_26_AdminVar_bump_version.sql','DONE','2021-07-26 10:41:54'), -(202,'2021_07_27_PDB_source.sql','DONE','2021-07-27 14:49:59'), -(204,'2021_07_28_AdminVar_bump_version.sql','DONE','2021-07-28 11:13:27'), -(205,'2021_06_18_ContainerType_update.sql','DONE','2021-08-31 10:04:06'), -(206,'2021_08_09_AdminVar_bump_version.sql','DONE','2021-08-31 10:04:06'), -(208,'2021_08_31_AdminVar_bump_version.sql','DONE','2021-08-31 10:30:39'), -(209,'2021_09_14_RelativeIceThickness.sql','DONE','2021-09-14 10:54:10'), -(210,'2021_09_15_AdminVar_bump_version.sql','DONE','2021-09-15 17:35:02'), -(211,'2021_08_05_MXMRRun_update.sql','DONE','2021-11-23 12:56:56'), -(212,'2021_09_23_BLSampleGroup_update_proposalId.sql','DONE','2021-11-23 12:56:56'), -(213,'2021_11_12_BLSampleImage_fullImagePath_idx.sql','DONE','2021-11-23 12:56:56'), -(214,'2021_11_23_AdminVar_bump_version.sql','DONE','2021-11-23 17:20:13'), -(215,'2022_01_12_Container_and_ContainerHistory_update.sql','DONE','2022-02-14 11:02:17'), -(216,'2022_01_20_Container_priorityPipelineId_default.sql','DONE','2022-02-14 11:02:18'), -(217,'2022_02_04_Pod.sql','DONE','2022-02-14 11:02:18'), -(218,'2022_02_14_AdminVar_bump_version.sql','DONE','2022-02-14 11:02:18'), -(219,'2022_03_07_SW_onceToken_recordTimeStamp_idx.sql','DONE','2022-06-22 12:09:07'), -(220,'2022_04_12_BLSession_fk_beamCalendarId_set_null.sql','DONE','2022-06-22 12:09:07'), -(221,'2022_05_12_Pod_app_modify_enum.sql','DONE','2022-06-22 12:09:07'), -(222,'2022_06_22_AdminVar_bump_version.sql','DONE','2022-06-22 12:09:07'), -(223,'2022_06_22_cryo-ET_tables.sql','DONE','2022-06-22 12:09:07'), -(224,'2022_07_17_BLSubSample_update_blSampleImageId.sql','DONE','2022-08-08 12:03:49'), -(225,'2022_08_08_AdminVar_bump_version.sql','DONE','2022-08-08 16:40:14'), -(226,'2022_06_28_diffractionplan_scanparameters.sql','DONE','2022-08-22 11:57:56'), -(227,'2022_06_28_gridinfo_patches.sql','DONE','2022-08-22 11:57:56'), -(228,'2022_06_28_sampleimage_positioner.sql','DONE','2022-08-22 11:57:56'), -(229,'2022_08_25_AdminVar_bump_version.sql','DONE','2022-08-25 15:55:14'), -(230,'2022_09_14_BLSample_has_DataCollectionPlan_modify_planOrder.sql','DONE','2022-09-16 11:31:04'), -(231,'2022_09_21_ExperimentType_add_em_types.sql','DONE','2022-09-21 07:17:23'), -(232,'2022_09_28_ContainerType_update.sql','DONE','2022-09-28 10:04:59'), -(233,'2022_10_17_BLSession_drop_constraint.sql','DONE','2022-10-17 11:25:35'), -(234,'2022_10_21_Shipping_extra.sql','DONE','2022-11-02 17:04:27'), -(235,'2022_11_02_AdminVar_bump_version.sql','DONE','2022-11-02 17:04:27'), -(236,'2023_01_16_Tomogram_new_cols.sql','DONE','2023-01-16 18:09:03'), -(237,'2023_01_16_AdminVar_bump_version.sql','DONE','2023-01-16 18:42:40'), -(238,'2023_01_19_AdminVar_bump_version.sql','DONE','2023-01-19 12:24:28'), -(239,'2023_02_01_PDB_contents_compressed.sql','DONE','2023-02-21 13:20:55'), -(240,'2023_02_01_Tomogram_drop_processingJobId.sql','DONE','2023-02-21 13:20:55'), -(241,'2023_02_14_SSX_experiment.sql','DONE','2023-02-21 13:20:55'), -(242,'2023_02_28_AdminVar_bump_version.sql','DONE','2023-02-28 16:57:44'), -(243,'2023_03_08_LDAPSearch_tables.sql','DONE','2023-03-27 11:06:43'), -(244,'2023_03_27_Detector_numberOfROIPixelsXY.sql','DONE','2023-03-27 11:06:44'), -(245,'2023_03_27_GridInfo_micronsPerPixelXY.sql','DONE','2023-03-27 11:06:44'), -(246,'2023_04_04_XrayCentring.sql','DONE','2023-04-13 17:03:59'), -(247,'2023_04_14_XrayCentring.sql','DONE','2023-04-17 10:06:29'), -(248,'2023_04_17_AdminVar_bump_version.sql','DONE','2023-04-17 10:06:29'), -(249,'2023_04_17_AdminVar_bump_version_v2.sql','DONE','2023-04-17 11:27:26'), -(250,'2023_04_18_Remove_upsert_XrayCentring.sql','DONE','2023-04-18 14:59:34'), -(251,'2023_05_05_Dewar_extra.sql','DONE','2023-05-05 14:25:42'), -(252,'2023_05_05_ParticleClassificationGroup_selected.sql','DONE','2023-05-05 14:25:42'), -(253,'2023_05_09_Dewar_modify_comments.sql','DONE','2023-05-11 15:32:52'), -(254,'2023_05_11_ParticleClassification_selected.sql','DONE','2023-05-11 15:32:52'), -(255,'2023_05_15_AdminVar_bump_version.sql','DONE','2023-05-15 09:59:49'), -(256,'2023_06_05_AdminVar_bump_version.sql','DONE','2023-06-05 15:13:35'), -(257,'2023_07_19_Container_parentContainerId.sql','DONE','2023-10-19 09:36:56'), -(258,'2023_08_09_Screen_fk_containerTypeId.sql','DONE','2023-10-19 09:36:56'), -(259,'2023_08_15_DewarRegistry_manufacturerSerialNumber.sql','DONE','2023-10-19 09:36:56'), -(260,'2023_08_15_Laboratory_EORINumber.sql','DONE','2023-10-19 09:36:56'), -(261,'2023_08_16_ContainerRegistry_barcode_unique_not_null.sql','DONE','2023-10-19 09:36:56'), -(262,'2023_10_18_MotionCorrectionDrift_drop.sql','DONE','2023-10-19 09:36:56'), -(263,'2023_10_23_Dewar_modify_shippingId.sql','DONE','2023-10-26 15:50:26'), -(264,'2023_10_24_BLSession_add_riskRating.sql','DONE','2023-10-26 15:50:26'), -(265,'2023_10_26_BFactorFit_and_new_cols.sql','DONE','2023-10-26 15:50:26'), -(266,'2023_10_27_BFactorFit_particleClassification_not_null.sql','DONE','2023-10-27 11:28:51'), -(267,'2023_10_31_BLSession_modify_beamlineOperator.sql','DONE','2023-10-31 11:58:22'), -(269,'2024_01_02_drop_bioSAXS.sql','DONE','2024-01-08 15:41:22'), -(270,'2024_01_02_drop_views.sql','DONE','2024-01-08 15:41:22'), -(271,'2024_01_04_BLSession_drop_cols.sql','DONE','2024-01-08 15:41:22'), -(272,'2024_01_04_drop_unused_tables.sql','DONE','2024-01-08 15:41:22'), -(274,'2024_01_08_AdminVar_bump_version.sql','DONE','2024-01-08 17:01:43'), -(276,'2024_01_08_BLSession_add_dropped_cols.sql','DONE','2024-01-09 14:26:50'), -(277,'2024_01_09_AdminVar_bump_version.sql','DONE','2024-01-09 14:43:35'), -(279,'2024_01_22_cryoEM_tracking.sql','DONE','2024-03-26 16:40:34'), -(280,'2024_03_05_BLSubSample_replace_index.sql','DONE','2024-03-26 16:40:34'), -(281,'2024_03_12_source_column.sql','DONE','2024-03-26 16:40:34'), -(282,'2024_03_19_AutoProcProgramMessage_severity_not_null.sql','DONE','2024-03-26 16:40:34'), -(283,'2024_03_19_ContainerQueue_containerId_not_null.sql','DONE','2024-03-26 16:40:34'), -(284,'2024_03_19_ProcessingJobParameter_index.sql','DONE','2024-03-26 16:40:34'), -(285,'2024_03_20_Shipping_Dewar_externalIds.sql','DONE','2024-03-26 16:40:34'), -(286,'2024_03_26_AdminVar_bump_version.sql','DONE','2024-03-26 16:40:34'), -(287,'2024_03_26_AutoProc_index_refined_unit_cell.sql','DONE','2024-03-26 16:40:34'), -(288,'2023_11_16_AdminVar_bump_version.sql','DONE','2024-03-26 16:47:25'), -(289,'2024_05_14_DataCollectionGroup_experimentType.sql','DONE','2024-08-14 11:23:41'), -(290,'2024_05_30_DiffractionPlan_experimentKind.sql','DONE','2024-08-14 11:23:41'), -(291,'2024_07_08_BLSampleGroup_ownerId.sql','DONE','2024-08-14 11:23:41'), -(292,'2024_07_16_ContainerType_insert_new.sql','DONE','2024-08-14 11:23:41'), -(293,'2024_08_08_ProcessedTomogram.sql','DONE','2024-08-14 11:23:41'), -(294,'2024_08_14_AdminVar_bump_version.sql','DONE','2024-08-14 11:23:41'), -(295,'2024_08_19_AdminVar_bump_version.sql','DONE','2024-08-19 12:17:10'), -(296,'2024_09_04_ProcessedTomogram_comment.sql','DONE','2024-12-05 13:27:18'), -(297,'2024_09_17_SpaceGroup_trim.sql','DONE','2024-12-05 13:27:18'), -(298,'2024_09_25_AutoProcProgram_processingPipelineId.sql','DONE','2024-12-05 13:27:18'), -(299,'2024_10_15_BLSample_unique_index.sql','DONE','2024-12-05 13:27:18'), -(300,'2024_12_04_AutoProcProgramAttachment_deleted.sql','DONE','2024-12-05 13:27:18'), -(301,'2024_12_05_AdminVar_bump_version.sql','DONE','2024-12-05 13:27:18'); +INSERT INTO `SchemaStatus` (`schemaStatusId`, `scriptName`, `schemaStatus`, `recordTimeStamp`) VALUES (6,'20180213_BLSample_subLocation.sql','DONE','2018-02-13 13:27:19'),(12,'20180213_DataCollectionFileAttachment_fileType.sql','DONE','2018-02-13 15:12:54'),(16,'20180303_v_run_to_table.sql','DONE','2018-07-25 15:11:18'),(19,'20180328_ImageQualityIndicators_alter_table.sql','DONE','2018-07-25 15:11:18'),(22,'20180410_BeamLineSetup_alter.sql','DONE','2018-07-25 15:11:18'),(25,'20180413_BeamLineSetup_and_Detector_alter.sql','DONE','2018-07-25 15:11:18'),(28,'20180501_DataCollectionGroup_experimentType_enum.sql','DONE','2018-07-25 15:11:18'),(31,'20180531_ScreeningOutput_alignmentSuccess.sql','DONE','2018-07-25 15:11:18'),(34,'20180629_DataCollection_imageContainerSubPath.sql','DONE','2018-07-25 15:11:18'),(35,'20180913_BeamCalendar.sql','DONE','2018-09-19 09:52:45'),(36,'2018_09_19_DataCollection_imageDirectory_comment.sql','DONE','2018-09-19 12:38:01'),(37,'2018_09_27_increase_schema_version.sql','DONE','2018-09-27 13:17:15'),(38,'2018_11_01_XrayCenteringResult.sql','DONE','2018-11-01 13:36:53'),(39,'2018_11_01_AutoProcProgram_dataCollectionId.sql','DONE','2018-11-01 15:10:38'),(40,'2018_11_01_AutoProcProgramMessage.sql','DONE','2018-11-01 15:28:17'),(44,'2018_11_01_DiffractionPlan_centeringMethod.sql','DONE','2018-11-01 22:51:36'),(45,'2018_11_02_DataCollectionGroup_experimentType_enum.sql','DONE','2018-11-02 11:54:15'),(47,'2018_11_05_spelling_of_centring.sql','DONE','2018-11-05 15:31:38'),(48,'2018_11_09_AutoProcProgram_update_processing_program.sql','DONE','2018-11-09 16:38:34'),(49,'2018_11_14_AutoProcProgramMessage_autoinc.sql','DONE','2018-11-14 10:15:27'),(50,'2018_11_22_AutoProcProgram_processingStatus_update.sql','DONE','2018-11-22 16:11:15'),(51,'2018_12_04_EnergyScan_and_XFEFluorescenceSpectrum_add_axisPosition.sql','DONE','2018-12-04 14:13:23'),(52,'2018_12_20_DataCollectionGroup_scanParameters.sql','DONE','2018-12-20 17:30:04'),(53,'2019_01_14_Proposal_state.sql','DONE','2019-01-14 12:13:31'),(54,'2019_01_14_ProcessingJobParameter_parameterValue.sql','DONE','2019-01-14 14:00:02'),(57,'2019_01_15_Detector_localName.sql','DONE','2019-01-15 23:01:15'),(58,'2019_02_04_BLSession_unique_index.sql','DONE','2019-02-04 13:52:19'),(59,'2019_03_29_BLSession_archived.sql','DONE','2019-04-03 14:43:08'),(60,'2019_04_03_UserGroup_and_Permission.sql','DONE','2019-04-03 14:51:04'),(61,'2019_04_07_AdminVar_bump_version.sql','DONE','2019-04-07 11:35:06'),(62,'2019_04_08_AdminVar_bump_version.sql','DONE','2019-04-08 15:38:01'),(63,'2019_04_23_AdminVar_bump_version.sql','DONE','2019-04-23 11:13:27'),(64,'2019_04_23_drop_v_run_view.sql','DONE','2019-04-23 11:13:35'),(67,'2019_04_23_v_run_additional_runs.sql','DONE','2019-04-23 12:39:47'),(68,'2019_05_28_AdminVar_bump_version.sql','DONE','2019-05-28 13:29:27'),(72,'2019_07_17_BLSample_crystalId_default.sql','DONE','2019-07-17 15:21:59'),(73,'2019_08_15_Sleeve.sql','DONE','2019-08-15 08:34:34'),(74,'2019_08_15_AdminVar_bump_version.sql','DONE','2019-08-15 08:57:37'),(75,'2019_08_28_AdminVar_bump_version.sql','DONE','2019-08-28 13:30:13'),(76,'2019_08_30_AdminVar_bump_version.sql','DONE','2019-08-30 11:58:16'),(77,'2019_10_06_BLSampleImage_fk3.sql','DONE','2019-10-06 16:55:44'),(78,'2019_10_08_DiffractionPlan_experimentKind.sql','DONE','2019-10-08 12:47:10'),(79,'2019_11_07_AutoProcProgramAttachment_importanceRank.sql','DONE','2019-11-07 16:35:25'),(80,'2019_11_07_AdminVar_bump_version.sql','DONE','2019-11-07 16:45:44'),(81,'2019_11_08_AdminVar_bump_version.sql','DONE','2019-11-08 16:09:52'),(82,'2019_11_26_v_run_idx1.sql','DONE','2019-11-26 15:00:21'),(83,'2019_12_02_AdminVar_bump_version.sql','DONE','2019-12-02 11:29:05'),(84,'2019_12_02_AdminVar_bump_version_v2.sql','DONE','2019-12-02 18:14:11'),(85,'2020_01_03_BLSampleImage_tables.sql','DONE','2020-01-03 16:05:45'),(86,'2020_01_06_AdminVar_bump_version.sql','DONE','2020-01-06 11:45:02'),(87,'2020_01_07_AdminVar_bump_version.sql','DONE','2020-01-07 09:45:25'),(88,'2020_01_07_AdminVar_bump_version_v2.sql','DONE','2020-01-07 10:24:54'),(89,'2020_01_07_AdminVar_bump_version_v3.sql','DONE','2020-01-07 11:16:09'),(90,'2020_01_20_AdminVar_bump_version.sql','DONE','2020-01-20 13:40:52'),(91,'2020_01_20_AdminVar_bump_version_v2.sql','DONE','2020-01-20 16:27:37'),(92,'2020_02_13_SpaceGroup_data.sql','DONE','2020-02-13 16:52:53'),(93,'2020_01_21_DiffractionPlan_experimentKind.sql','DONE','2020-02-13 17:13:17'),(94,'2020_02_21_ProposalHasPerson_role_enum.sql','DONE','2020-02-21 14:36:10'),(95,'2020_02_21_Session_has_Person_role_enum.sql','DONE','2020-02-21 14:36:17'),(96,'2020_02_27_Container_scLocationUpdated.sql','DONE','2020-02-27 13:43:51'),(97,'2020_03_09_Reprocessing_drop_tables.sql','DONE','2020-03-09 11:05:09'),(98,'2020_03_24_ProcessingPipeline_tables.sql','DONE','2020-03-26 16:37:29'),(99,'2020_03_25_ProcessingPipeline_ren_col.sql','DONE','2020-03-26 16:37:34'),(100,'2020_03_27_AdminVar_bump_version.sql','DONE','2020-03-27 08:51:52'),(101,'2020_03_27_AdminVar_bump_version_v2.sql','DONE','2020-03-27 15:07:56'),(102,'2020_04_06_alterProtein.sql','DONE','2020-04-06 13:40:18'),(103,'2020_04_27_BLSampleImageAutoScoreSchema_insert_CHIMP.sql','DONE','2020-04-27 14:37:41'),(104,'2020_05_21_BLSampleImageAutoScoreClass_insert_CHIMP.sql','DONE','2020-05-21 17:52:54'),(105,'2020_06_01_DewarRegistry_and_DewarRegistry_has_Proposal.sql','DONE','2020-06-01 10:29:19'),(106,'2020_06_01_Protein_new_columns.sql','DONE','2020-06-01 10:29:32'),(107,'2020_06_01_AdminVar_bump_version.sql','DONE','2020-06-01 10:46:11'),(108,'2020_06_08_Shipping_comments.sql','DONE','2020-06-08 16:44:26'),(109,'2020_06_10_DiffractionPlan_experimentKind.sql','DONE','2020-06-10 14:35:18'),(110,'2020_06_15_Shipping_comments.sql','DONE','2020-06-15 14:01:25'),(111,'2020_06_24_BLSampleGroup_name.sql','DONE','2020-06-24 10:56:25'),(112,'2020_06_24_DiffractionPlan_userPath.sql','DONE','2020-06-24 10:56:30'),(113,'2020_07_01_DewarRegistry_and_DewarRegistry_has_Proposal.sql','DONE','2020-07-01 13:51:49'),(114,'2020_07_06_DewarRegistry_to_DewarRegistry_has_Proposal_data.sql','DONE','2020-07-06 10:59:22'),(115,'2020_07_13_AdminVar_bump_version.sql','DONE','2020-07-13 18:14:39'),(116,'2020_08_03_AdminVar_bump_version.sql','DONE','2020-08-03 15:19:36'),(117,'2020_09_02_AutoProcScalingStatistics_new_index.sql','DONE','2020-09-02 17:02:33'),(118,'2020_09_08_DewarRegistry_modify_fks.sql','DONE','2020-09-08 15:26:14'),(119,'2020_08_28_ComponentSubType_changes.sql','DONE','2020-10-14 18:15:55'),(120,'2020_08_28_ConcentrationType_changes.sql','DONE','2020-10-14 18:15:55'),(121,'2020_08_28_Dewar_type.sql','DONE','2020-10-14 18:15:55'),(122,'2020_08_28_DiffractionPlan_new_temperature_cols.sql','DONE','2020-10-14 18:15:55'),(123,'2020_08_28_ExperimentType.sql','DONE','2020-10-14 18:15:55'),(124,'2020_08_28_PurificationColumn.sql','DONE','2020-10-14 18:15:55'),(125,'2020_08_29_BLSampleType.sql','DONE','2020-10-14 18:15:55'),(126,'2020_08_29_Protein_isotropy.sql','DONE','2020-10-14 18:15:55'),(127,'2020_10_16_AdminVar_bump_version.sql','DONE','2020-10-16 22:05:36'),(128,'2020_10_19_AdminVar_bump_version.sql','DONE','2020-10-20 04:21:23'),(129,'2020_10_22_GridInfo_dcId.sql','DONE','2020-11-09 13:57:27'),(130,'2020_11_09_Phasing_method_enum.sql','DONE','2020-11-09 13:57:27'),(133,'2020_11_09_AdminVar_bump_version.sql','DONE','2020-11-09 22:26:13'),(134,'2020_11_10_SpaceGroup_update.sql','DONE','2020-11-20 17:49:46'),(135,'2020_11_13_Dewar_facilityCode.sql','DONE','2020-11-20 17:49:46'),(136,'2020_11_20_AdminVar_bump_version.sql','DONE','2020-11-20 17:49:46'),(137,'2020_12_01_AdminVar_bump_version.sql','DONE','2020-12-01 12:21:43'),(138,'2020_12_04_Container_experimentTypeId_FK.sql','DONE','2020-12-04 16:34:05'),(139,'2020_12_04_AdminVar_bump_version.sql','DONE','2020-12-04 16:40:14'),(140,'2020_11_22_diffractionplan_priority_and_mode.sql','DONE','2020-12-29 18:29:08'),(141,'2020_12_07_AutoProc_index_unit_cell.sql','DONE','2020-12-29 18:29:08'),(142,'2020_12_07_DataCollection_index_startTime.sql','DONE','2020-12-29 18:29:08'),(143,'2020_12_10_BLSubSample_source.sql','DONE','2020-12-29 18:29:08'),(144,'2020_12_30_AdminVar_bump_version.sql','DONE','2020-12-30 14:36:17'),(145,'2021_01_13_AdminVar_bump_version.sql','DONE','2021-01-13 12:12:57'),(146,'2021_01_14_AdminVar_bump_version.sql','DONE','2021-01-14 11:04:57'),(147,'2020_07_31_add_offset_blsampleimage.sql','DONE','2021-02-22 12:28:16'),(148,'2020_07_31_add_type_blsubsample.sql','DONE','2021-02-22 12:28:16'),(149,'2020_07_31_extend_dcattachment_enum.sql','DONE','2021-02-22 12:28:16'),(150,'2020_07_31_extend_dcg_type_enum.sql','DONE','2021-02-22 12:28:16'),(151,'2020_07_31_extend_robotaction_enum.sql','DONE','2021-02-22 12:28:16'),(152,'2020_07_31_refactor_xrfmapping.sql','DONE','2021-02-22 12:28:16'),(153,'2020_11_22_blsample_staff_comments.sql','DONE','2021-02-22 12:28:16'),(154,'2021_01_28_beamlinesetup_add_datacentre.sql','DONE','2021-02-22 12:28:16'),(155,'2021_02_04_DiffractionPlan_strategyOption.sql','DONE','2021-02-22 12:28:16'),(156,'2021_02_22_AdminVar_bump_version.sql','DONE','2021-02-22 13:06:57'),(157,'2021_02_22_AdminVar_bump_version_v2.sql','DONE','2021-02-22 15:37:45'),(158,'2020_08_28_ContainerType.sql','DONE','2021-03-05 16:09:40'),(159,'2021_03_03_BF_automationError.sql','DONE','2021-03-05 16:09:41'),(160,'2021_03_03_BF_automationFault.sql','DONE','2021-03-05 16:09:41'),(161,'2021_03_03_cryoEMv2_0_tables.sql','DONE','2021-03-05 16:09:41'),(162,'2021_03_05_AdminVar_bump_version.sql','DONE','2021-03-05 16:09:41'),(163,'2021_03_05_ContainerType_update.sql','DONE','2021-04-13 15:50:39'),(164,'2021_03_08_ContainerType_update.sql','DONE','2021-04-13 15:50:39'),(165,'2021_03_09_SpaceGroup_update.sql','DONE','2021-04-13 15:50:39'),(166,'2021_03_19_add_drop_indices.sql','DONE','2021-04-13 15:50:39'),(167,'2021_03_19_ExperimentType_update.sql','DONE','2021-04-13 15:50:39'),(168,'2021_04_01_BLSampleGroup_has_BLSample_modify_type.sql','DONE','2021-04-13 15:50:39'),(169,'2021_04_01_ContainerType_insert.sql','DONE','2021-04-13 15:50:39'),(170,'2021_04_12_cryoEMv2_1.sql','DONE','2021-04-13 15:50:39'),(171,'2021_04_13_AdminVar_bump_version.sql','DONE','2021-04-13 16:17:12'),(173,'2021_04_13_ContainerType_update.sql','DONE','2021-04-13 16:42:57'),(174,'2021_04_20_AdminVar_bump_version.sql','DONE','2021-04-20 17:05:50'),(175,'2020_11_19_ContainerQueueSample.sql','DONE','2021-05-14 16:07:45'),(176,'2020_11_19_DataCollection.sql','DONE','2021-05-14 16:07:45'),(177,'2021_04_23_Dewar_fk_constraint.sql','DONE','2021-05-14 16:07:46'),(178,'2021_05_12_ParticleClassification_rotationAccuracy.sql','DONE','2021-05-14 16:07:46'),(179,'2021_05_14_AdminVar_bump_version.sql','DONE','2021-05-14 16:21:50'),(180,'2021_05_19_AdminVar_bump_version.sql','DONE','2021-05-19 16:01:54'),(181,'2021_05_20_AdminVar_bump_version.sql','DONE','2021-05-20 10:30:35'),(182,'2021_05_28_AdminVar_bump_version.sql','DONE','2021-05-28 15:46:50'),(183,'2020_08_28_DiffractionPlan_new_cols.sql','DONE','2021-07-07 09:32:34'),(184,'2021_06_01_BLSampleGroup_fk_proposalId.sql','DONE','2021-07-07 09:32:34'),(185,'2021_06_09_DataCollectionGroup_experimentType_enum.sql','DONE','2021-07-07 09:32:34'),(186,'2021_06_11_DataCollectionGroup_experimentType_enum.sql','DONE','2021-07-07 09:32:34'),(187,'2021_06_17_SpaceGroup_update.sql','DONE','2021-07-07 09:32:34'),(188,'2021_06_30_zc_ZocaloBuffer.sql','DONE','2021-07-07 09:32:34'),(189,'2021_07_01_ParticleClassification_classDistribution.sql','DONE','2021-07-07 09:32:34'),(190,'2021_07_01_ParticlePicker_summaryImageFullPath.sql','DONE','2021-07-07 09:32:34'),(191,'2021_07_02_UserGroup_insert.sql','DONE','2021-07-07 09:32:34'),(192,'2021_07_07_AdminVar_bump_version.sql','DONE','2021-07-07 10:35:39'),(193,'2021_07_07_AdminVar_bump_version_v2.sql','DONE','2021-07-07 11:37:27'),(194,'2021_07_08_AutoProcScalingStatistics_resIOverSigI2.sql','DONE','2021-07-23 17:36:44'),(195,'2021_07_08_Screening_autoProcProgramId.sql','DONE','2021-07-23 17:36:45'),(196,'2021_07_09_ProposalHasPerson_role_enum.sql','DONE','2021-07-23 17:36:45'),(197,'2021_07_09_Session_has_Person_role_enum.sql','DONE','2021-07-23 17:36:45'),(198,'2021_07_21_Positioner_tables.sql','DONE','2021-07-23 17:36:45'),(199,'2021_07_23_AdminVar_bump_version.sql','DONE','2021-07-23 17:36:45'),(200,'2021_07_23_AutoProcProgram_drop_dataCollectionId.sql','DONE','2021-07-23 17:36:45'),(201,'2021_07_26_AdminVar_bump_version.sql','DONE','2021-07-26 10:41:54'),(202,'2021_07_27_PDB_source.sql','DONE','2021-07-27 14:49:59'),(204,'2021_07_28_AdminVar_bump_version.sql','DONE','2021-07-28 11:13:27'),(205,'2021_06_18_ContainerType_update.sql','DONE','2021-08-31 10:04:06'),(206,'2021_08_09_AdminVar_bump_version.sql','DONE','2021-08-31 10:04:06'),(208,'2021_08_31_AdminVar_bump_version.sql','DONE','2021-08-31 10:30:39'),(209,'2021_09_14_RelativeIceThickness.sql','DONE','2021-09-14 10:54:10'),(210,'2021_09_15_AdminVar_bump_version.sql','DONE','2021-09-15 17:35:02'),(211,'2021_08_05_MXMRRun_update.sql','DONE','2021-11-23 12:56:56'),(212,'2021_09_23_BLSampleGroup_update_proposalId.sql','DONE','2021-11-23 12:56:56'),(213,'2021_11_12_BLSampleImage_fullImagePath_idx.sql','DONE','2021-11-23 12:56:56'),(214,'2021_11_23_AdminVar_bump_version.sql','DONE','2021-11-23 17:20:13'),(215,'2022_01_12_Container_and_ContainerHistory_update.sql','DONE','2022-02-14 11:02:17'),(216,'2022_01_20_Container_priorityPipelineId_default.sql','DONE','2022-02-14 11:02:18'),(217,'2022_02_04_Pod.sql','DONE','2022-02-14 11:02:18'),(218,'2022_02_14_AdminVar_bump_version.sql','DONE','2022-02-14 11:02:18'),(219,'2022_03_07_SW_onceToken_recordTimeStamp_idx.sql','DONE','2022-06-22 12:09:07'),(220,'2022_04_12_BLSession_fk_beamCalendarId_set_null.sql','DONE','2022-06-22 12:09:07'),(221,'2022_05_12_Pod_app_modify_enum.sql','DONE','2022-06-22 12:09:07'),(222,'2022_06_22_AdminVar_bump_version.sql','DONE','2022-06-22 12:09:07'),(223,'2022_06_22_cryo-ET_tables.sql','DONE','2022-06-22 12:09:07'),(224,'2022_07_17_BLSubSample_update_blSampleImageId.sql','DONE','2022-08-08 12:03:49'),(225,'2022_08_08_AdminVar_bump_version.sql','DONE','2022-08-08 16:40:14'),(226,'2022_06_28_diffractionplan_scanparameters.sql','DONE','2022-08-22 11:57:56'),(227,'2022_06_28_gridinfo_patches.sql','DONE','2022-08-22 11:57:56'),(228,'2022_06_28_sampleimage_positioner.sql','DONE','2022-08-22 11:57:56'),(229,'2022_08_25_AdminVar_bump_version.sql','DONE','2022-08-25 15:55:14'),(230,'2022_09_14_BLSample_has_DataCollectionPlan_modify_planOrder.sql','DONE','2022-09-16 11:31:04'),(231,'2022_09_21_ExperimentType_add_em_types.sql','DONE','2022-09-21 07:17:23'),(232,'2022_09_28_ContainerType_update.sql','DONE','2022-09-28 10:04:59'),(233,'2022_10_17_BLSession_drop_constraint.sql','DONE','2022-10-17 11:25:35'),(234,'2022_10_21_Shipping_extra.sql','DONE','2022-11-02 17:04:27'),(235,'2022_11_02_AdminVar_bump_version.sql','DONE','2022-11-02 17:04:27'),(236,'2023_01_16_Tomogram_new_cols.sql','DONE','2023-01-16 18:09:03'),(237,'2023_01_16_AdminVar_bump_version.sql','DONE','2023-01-16 18:42:40'),(238,'2023_01_19_AdminVar_bump_version.sql','DONE','2023-01-19 12:24:28'),(239,'2023_02_01_PDB_contents_compressed.sql','DONE','2023-02-21 13:20:55'),(240,'2023_02_01_Tomogram_drop_processingJobId.sql','DONE','2023-02-21 13:20:55'),(241,'2023_02_14_SSX_experiment.sql','DONE','2023-02-21 13:20:55'),(242,'2023_02_28_AdminVar_bump_version.sql','DONE','2023-02-28 16:57:44'),(243,'2023_03_08_LDAPSearch_tables.sql','DONE','2023-03-27 11:06:43'),(244,'2023_03_27_Detector_numberOfROIPixelsXY.sql','DONE','2023-03-27 11:06:44'),(245,'2023_03_27_GridInfo_micronsPerPixelXY.sql','DONE','2023-03-27 11:06:44'),(246,'2023_04_04_XrayCentring.sql','DONE','2023-04-13 17:03:59'),(247,'2023_04_14_XrayCentring.sql','DONE','2023-04-17 10:06:29'),(248,'2023_04_17_AdminVar_bump_version.sql','DONE','2023-04-17 10:06:29'),(249,'2023_04_17_AdminVar_bump_version_v2.sql','DONE','2023-04-17 11:27:26'),(250,'2023_04_18_Remove_upsert_XrayCentring.sql','DONE','2023-04-18 14:59:34'),(251,'2023_05_05_Dewar_extra.sql','DONE','2023-05-05 14:25:42'),(252,'2023_05_05_ParticleClassificationGroup_selected.sql','DONE','2023-05-05 14:25:42'),(253,'2023_05_09_Dewar_modify_comments.sql','DONE','2023-05-11 15:32:52'),(254,'2023_05_11_ParticleClassification_selected.sql','DONE','2023-05-11 15:32:52'),(255,'2023_05_15_AdminVar_bump_version.sql','DONE','2023-05-15 09:59:49'),(256,'2023_06_05_AdminVar_bump_version.sql','DONE','2023-06-05 15:13:35'),(257,'2023_07_19_Container_parentContainerId.sql','DONE','2023-10-19 09:36:56'),(258,'2023_08_09_Screen_fk_containerTypeId.sql','DONE','2023-10-19 09:36:56'),(259,'2023_08_15_DewarRegistry_manufacturerSerialNumber.sql','DONE','2023-10-19 09:36:56'),(260,'2023_08_15_Laboratory_EORINumber.sql','DONE','2023-10-19 09:36:56'),(261,'2023_08_16_ContainerRegistry_barcode_unique_not_null.sql','DONE','2023-10-19 09:36:56'),(262,'2023_10_18_MotionCorrectionDrift_drop.sql','DONE','2023-10-19 09:36:56'),(263,'2023_10_23_Dewar_modify_shippingId.sql','DONE','2023-10-26 15:50:26'),(264,'2023_10_24_BLSession_add_riskRating.sql','DONE','2023-10-26 15:50:26'),(265,'2023_10_26_BFactorFit_and_new_cols.sql','DONE','2023-10-26 15:50:26'),(266,'2023_10_27_BFactorFit_particleClassification_not_null.sql','DONE','2023-10-27 11:28:51'),(267,'2023_10_31_BLSession_modify_beamlineOperator.sql','DONE','2023-10-31 11:58:22'),(269,'2024_01_02_drop_bioSAXS.sql','DONE','2024-01-08 15:41:22'),(270,'2024_01_02_drop_views.sql','DONE','2024-01-08 15:41:22'),(271,'2024_01_04_BLSession_drop_cols.sql','DONE','2024-01-08 15:41:22'),(272,'2024_01_04_drop_unused_tables.sql','DONE','2024-01-08 15:41:22'),(274,'2024_01_08_AdminVar_bump_version.sql','DONE','2024-01-08 17:01:43'),(276,'2024_01_08_BLSession_add_dropped_cols.sql','DONE','2024-01-09 14:26:50'),(277,'2024_01_09_AdminVar_bump_version.sql','DONE','2024-01-09 14:43:35'),(279,'2024_01_22_cryoEM_tracking.sql','DONE','2024-03-26 16:40:34'),(280,'2024_03_05_BLSubSample_replace_index.sql','DONE','2024-03-26 16:40:34'),(281,'2024_03_12_source_column.sql','DONE','2024-03-26 16:40:34'),(282,'2024_03_19_AutoProcProgramMessage_severity_not_null.sql','DONE','2024-03-26 16:40:34'),(283,'2024_03_19_ContainerQueue_containerId_not_null.sql','DONE','2024-03-26 16:40:34'),(284,'2024_03_19_ProcessingJobParameter_index.sql','DONE','2024-03-26 16:40:34'),(285,'2024_03_20_Shipping_Dewar_externalIds.sql','DONE','2024-03-26 16:40:34'),(286,'2024_03_26_AdminVar_bump_version.sql','DONE','2024-03-26 16:40:34'),(287,'2024_03_26_AutoProc_index_refined_unit_cell.sql','DONE','2024-03-26 16:40:34'),(288,'2023_11_16_AdminVar_bump_version.sql','DONE','2024-03-26 16:47:25'),(289,'2024_05_14_DataCollectionGroup_experimentType.sql','DONE','2024-08-14 11:23:41'),(290,'2024_05_30_DiffractionPlan_experimentKind.sql','DONE','2024-08-14 11:23:41'),(291,'2024_07_08_BLSampleGroup_ownerId.sql','DONE','2024-08-14 11:23:41'),(292,'2024_07_16_ContainerType_insert_new.sql','DONE','2024-08-14 11:23:41'),(293,'2024_08_08_ProcessedTomogram.sql','DONE','2024-08-14 11:23:41'),(294,'2024_08_14_AdminVar_bump_version.sql','DONE','2024-08-14 11:23:41'),(295,'2024_08_19_AdminVar_bump_version.sql','DONE','2024-08-19 12:17:10'),(296,'2024_09_04_ProcessedTomogram_comment.sql','DONE','2024-12-05 13:27:18'),(297,'2024_09_17_SpaceGroup_trim.sql','DONE','2024-12-05 13:27:18'),(298,'2024_09_25_AutoProcProgram_processingPipelineId.sql','DONE','2024-12-05 13:27:18'),(299,'2024_10_15_BLSample_unique_index.sql','DONE','2024-12-05 13:27:18'),(300,'2024_12_04_AutoProcProgramAttachment_deleted.sql','DONE','2024-12-05 13:27:18'),(301,'2024_12_05_AdminVar_bump_version.sql','DONE','2024-12-05 13:27:18'); /*!40000 ALTER TABLE `SchemaStatus` ENABLE KEYS */; /*!40000 ALTER TABLE `ComponentType` DISABLE KEYS */; -INSERT INTO `ComponentType` (`componentTypeId`, `name`) VALUES (6,'Buffer'), -(2,'DNA'), -(7,'JetMaterial'), -(5,'Ligand'), -(1,'Protein'), -(4,'RNA'), -(3,'Small Molecule'); +INSERT INTO `ComponentType` (`componentTypeId`, `name`) VALUES (6,'Buffer'),(2,'DNA'),(7,'JetMaterial'),(5,'Ligand'),(1,'Protein'),(4,'RNA'),(3,'Small Molecule'); /*!40000 ALTER TABLE `ComponentType` ENABLE KEYS */; /*!40000 ALTER TABLE `ComponentSubType` DISABLE KEYS */; -INSERT INTO `ComponentSubType` (`componentSubTypeId`, `name`, `hasPh`, `proposalType`, `active`) VALUES (1,'Buffer',1,NULL,1), -(2,'Precipitant',0,NULL,1), -(3,'Salt',0,NULL,1), -(4,'Cell',0,'scm',1), -(5,'Matrix',0,'scm',1), -(6,'Powder',0,'scm',1), -(7,'Solution',1,'scm',1), -(8,'Powder',0,'cy',1); +INSERT INTO `ComponentSubType` (`componentSubTypeId`, `name`, `hasPh`, `proposalType`, `active`) VALUES (1,'Buffer',1,NULL,1),(2,'Precipitant',0,NULL,1),(3,'Salt',0,NULL,1),(4,'Cell',0,'scm',1),(5,'Matrix',0,'scm',1),(6,'Powder',0,'scm',1),(7,'Solution',1,'scm',1),(8,'Powder',0,'cy',1); /*!40000 ALTER TABLE `ComponentSubType` ENABLE KEYS */; /*!40000 ALTER TABLE `ConcentrationType` DISABLE KEYS */; -INSERT INTO `ConcentrationType` (`concentrationTypeId`, `name`, `symbol`, `proposalType`, `active`) VALUES (1,'Molar','M',NULL,1), -(2,'Percentage Weight / Volume','%(w/v)',NULL,1), -(3,'Percentage Volume / Volume','%(v/v)',NULL,1), -(4,'Milligrams / Millilitre','mg/ml',NULL,1), -(5,'Grams','g',NULL,1), -(6,'Microlitre','uL','scm',1), -(7,'Millilitre','ml','scm',1); +INSERT INTO `ConcentrationType` (`concentrationTypeId`, `name`, `symbol`, `proposalType`, `active`) VALUES (1,'Molar','M',NULL,1),(2,'Percentage Weight / Volume','%(w/v)',NULL,1),(3,'Percentage Volume / Volume','%(v/v)',NULL,1),(4,'Milligrams / Millilitre','mg/ml',NULL,1),(5,'Grams','g',NULL,1),(6,'Microlitre','uL','scm',1),(7,'Millilitre','ml','scm',1); /*!40000 ALTER TABLE `ConcentrationType` ENABLE KEYS */; /*!40000 ALTER TABLE `ContainerType` DISABLE KEYS */; -INSERT INTO `ContainerType` (`containerTypeId`, `name`, `proposalType`, `active`, `capacity`, `wellPerRow`, `dropPerWellX`, `dropPerWellY`, `dropHeight`, `dropWidth`, `dropOffsetX`, `dropOffsetY`, `wellDrop`) VALUES (1,'B21_8+1','saxs',1,9,9,1,1,1,1,0,0,-1), -(2,'B21_96','saxs',1,192,12,2,1,0.5,1,0,0,-1), -(3,'B21_1tube','saxs',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), -(4,'I22_Capillary_Rack_20','saxs',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), -(5,'I22_Grid_100','saxs',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), -(6,'I22_Grid_45','saxs',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), -(7,'P38_Capillary_Rack_27','saxs',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), -(8,'P38_Solids','saxs',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), -(9,'P38_Powder','saxs',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), -(10,'B22_6','saxs',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), -(11,'I11_Capillary_Rack_6','saxs',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), -(12,'Puck','mx',1,16,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), -(13,'ReferencePlate','mx',1,16,2,1,1,1,1,0,0,-1), -(14,'CrystalQuickX','mx',1,192,12,2,1,0.5,1,0,0,-1), -(15,'MitegenInSitu','mx',1,192,12,2,1,0.5,1,0,0,-1), -(16,'FilmBatch','mx',1,96,12,1,1,1,1,0,0,-1), -(17,'MitegenInSitu_3_Drop','mx',1,288,12,3,1,0.5,1,0,0,-1), -(18,'Greiner 3 Drop','mx',1,288,12,3,1,0.5,1,0,0,-1), -(19,'MRC Maxi','mx',1,48,6,1,1,1,0.5,0,0,-1), -(20,'MRC 2 Drop','mx',1,192,12,1,2,1,0.5,0.5,0,-1), -(21,'Griener 1536','mx',1,1536,12,4,4,1,1,0,0,-1), -(22,'3 Drop Square','mx',1,288,12,2,2,1,1,0,0,3), -(23,'SWISSCI 3 Drop','mx',1,288,12,2,2,1,1,0,0,1), -(24,'1 drop','mx',1,96,12,1,1,0.5,0.5,0,0,-1), -(25,'LCP Glass','mx',1,96,12,1,1,1,1,0,0,-1), -(26,'PCRStrip','saxs',1,9,9,1,1,1,1,0,0,-1), -(27,'Basket','mx',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), -(28,'Cane','mx',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), -(29,'Terasaki72','mx',0,72,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), -(30,'Puck-16','mx',1,16,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), -(31,'Block-4','mx',1,4,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), -(32,'Box','xpdf',1,25,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), -(33,'Puck-22','xpdf',1,22,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), -(34,'I22_Grid_81','saxs',1,81,9,1,1,1,1,0,0,-1), -(35,'I22_Capillary_Rack_25','saxs',1,25,25,1,1,1,1,0,0,-1), -(36,'VMXm-Cartridge','mx',1,5,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), -(37,'VMXm-GridBox','mx',1,4,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL); +INSERT INTO `ContainerType` (`containerTypeId`, `name`, `proposalType`, `active`, `capacity`, `wellPerRow`, `dropPerWellX`, `dropPerWellY`, `dropHeight`, `dropWidth`, `dropOffsetX`, `dropOffsetY`, `wellDrop`) VALUES (1,'B21_8+1','saxs',1,9,9,1,1,1,1,0,0,-1),(2,'B21_96','saxs',1,192,12,2,1,0.5,1,0,0,-1),(3,'B21_1tube','saxs',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(4,'I22_Capillary_Rack_20','saxs',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(5,'I22_Grid_100','saxs',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(6,'I22_Grid_45','saxs',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(7,'P38_Capillary_Rack_27','saxs',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(8,'P38_Solids','saxs',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(9,'P38_Powder','saxs',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(10,'B22_6','saxs',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(11,'I11_Capillary_Rack_6','saxs',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(12,'Puck','mx',1,16,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(13,'ReferencePlate','mx',1,16,2,1,1,1,1,0,0,-1),(14,'CrystalQuickX','mx',1,192,12,2,1,0.5,1,0,0,-1),(15,'MitegenInSitu','mx',1,192,12,2,1,0.5,1,0,0,-1),(16,'FilmBatch','mx',1,96,12,1,1,1,1,0,0,-1),(17,'MitegenInSitu_3_Drop','mx',1,288,12,3,1,0.5,1,0,0,-1),(18,'Greiner 3 Drop','mx',1,288,12,3,1,0.5,1,0,0,-1),(19,'MRC Maxi','mx',1,48,6,1,1,1,0.5,0,0,-1),(20,'MRC 2 Drop','mx',1,192,12,1,2,1,0.5,0.5,0,-1),(21,'Griener 1536','mx',1,1536,12,4,4,1,1,0,0,-1),(22,'3 Drop Square','mx',1,288,12,2,2,1,1,0,0,3),(23,'SWISSCI 3 Drop','mx',1,288,12,2,2,1,1,0,0,1),(24,'1 drop','mx',1,96,12,1,1,0.5,0.5,0,0,-1),(25,'LCP Glass','mx',1,96,12,1,1,1,1,0,0,-1),(26,'PCRStrip','saxs',1,9,9,1,1,1,1,0,0,-1),(27,'Basket','mx',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(28,'Cane','mx',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(29,'Terasaki72','mx',0,72,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(30,'Puck-16','mx',1,16,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(31,'Block-4','mx',1,4,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(32,'Box','xpdf',1,25,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(33,'Puck-22','xpdf',1,22,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(34,'I22_Grid_81','saxs',1,81,9,1,1,1,1,0,0,-1),(35,'I22_Capillary_Rack_25','saxs',1,25,25,1,1,1,1,0,0,-1),(36,'VMXm-Cartridge','mx',1,5,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(37,'VMXm-GridBox','mx',1,4,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL); /*!40000 ALTER TABLE `ContainerType` ENABLE KEYS */; /*!40000 ALTER TABLE `ExperimentType` DISABLE KEYS */; -INSERT INTO `ExperimentType` (`experimentTypeId`, `name`, `proposalType`, `active`) VALUES (1,'Default',NULL,1), -(2,'MXPressE','mx',1), -(3,'MXPressO','mx',1), -(4,'MXPressE_SAD','mx',1), -(5,'MXScore','mx',1), -(6,'MXPressM','mx',1), -(7,'MAD','mx',1), -(8,'SAD','mx',1), -(9,'Fixed','mx',1), -(10,'Ligand binding','mx',1), -(11,'Refinement','mx',1), -(12,'OSC','mx',1), -(13,'MAD - Inverse Beam','mx',1), -(14,'SAD - Inverse Beam','mx',1), -(15,'MESH','mx',1), -(16,'XFE','mx',1), -(17,'Stepped transmission','mx',1), -(18,'XChem High Symmetry','mx',1), -(19,'XChem Low Symmetry','mx',1), -(20,'Commissioning','mx',1), -(21,'HPLC','saxs',1), -(22,'Robot','saxs',1), -(23,'Rack','saxs',1), -(24,'Grid','saxs',1), -(25,'Solids','saxs',1), -(26,'Powder','saxs',1), -(27,'Peltier','saxs',1), -(28,'Spectroscopy','saxs',1), -(29,'CD Spectroscopy','saxs',1), -(30,'Microscopy','saxs',1), -(31,'Imaging','saxs',1), -(32,'CD Thermal Melt','saxs',1), -(33,'Fixed Energy At Ambient With Robot','saxs',1), -(34,'Mesh3D','mx',1), -(35,'Screening','sm',1), -(36,'Tomography','em',1), -(37,'Single Particle','em',1), -(38,'Serial Fixed','mx',1), -(39,'Serial Jet','mx',1), -(40,'Still','mx',1), -(41,'SSX-Chip','mx',1), -(42,'SSX-Jet','mx',1), -(43,'Metal ID','mx',1); +INSERT INTO `ExperimentType` (`experimentTypeId`, `name`, `proposalType`, `active`) VALUES (1,'Default',NULL,1),(2,'MXPressE','mx',1),(3,'MXPressO','mx',1),(4,'MXPressE_SAD','mx',1),(5,'MXScore','mx',1),(6,'MXPressM','mx',1),(7,'MAD','mx',1),(8,'SAD','mx',1),(9,'Fixed','mx',1),(10,'Ligand binding','mx',1),(11,'Refinement','mx',1),(12,'OSC','mx',1),(13,'MAD - Inverse Beam','mx',1),(14,'SAD - Inverse Beam','mx',1),(15,'MESH','mx',1),(16,'XFE','mx',1),(17,'Stepped transmission','mx',1),(18,'XChem High Symmetry','mx',1),(19,'XChem Low Symmetry','mx',1),(20,'Commissioning','mx',1),(21,'HPLC','saxs',1),(22,'Robot','saxs',1),(23,'Rack','saxs',1),(24,'Grid','saxs',1),(25,'Solids','saxs',1),(26,'Powder','saxs',1),(27,'Peltier','saxs',1),(28,'Spectroscopy','saxs',1),(29,'CD Spectroscopy','saxs',1),(30,'Microscopy','saxs',1),(31,'Imaging','saxs',1),(32,'CD Thermal Melt','saxs',1),(33,'Fixed Energy At Ambient With Robot','saxs',1),(34,'Mesh3D','mx',1),(35,'Screening','sm',1),(36,'Tomography','em',1),(37,'Single Particle','em',1),(38,'Serial Fixed','mx',1),(39,'Serial Jet','mx',1),(40,'Still','mx',1),(41,'SSX-Chip','mx',1),(42,'SSX-Jet','mx',1),(43,'Metal ID','mx',1); /*!40000 ALTER TABLE `ExperimentType` ENABLE KEYS */; /*!40000 ALTER TABLE `InspectionType` DISABLE KEYS */; -INSERT INTO `InspectionType` (`inspectionTypeId`, `name`) VALUES (1,'Visible'), -(2,'UV'); +INSERT INTO `InspectionType` (`inspectionTypeId`, `name`) VALUES (1,'Visible'),(2,'UV'); /*!40000 ALTER TABLE `InspectionType` ENABLE KEYS */; /*!40000 ALTER TABLE `Schedule` DISABLE KEYS */; -INSERT INTO `Schedule` (`scheduleId`, `name`) VALUES (1,'Daily - 1 week'), -(2,'Schedule 2'), -(11,'Fibonacci'), -(15,'3 Hour Interval'); +INSERT INTO `Schedule` (`scheduleId`, `name`) VALUES (1,'Daily - 1 week'),(2,'Schedule 2'),(11,'Fibonacci'),(15,'3 Hour Interval'); /*!40000 ALTER TABLE `Schedule` ENABLE KEYS */; /*!40000 ALTER TABLE `ScheduleComponent` DISABLE KEYS */; -INSERT INTO `ScheduleComponent` (`scheduleComponentId`, `scheduleId`, `offset_hours`, `inspectionTypeId`) VALUES (1,1,0,1), -(2,1,12,1), -(3,1,24,1), -(4,1,96,1), -(5,1,48,1), -(6,1,72,1), -(8,2,24,1), -(11,2,48,2), -(14,11,0,1), -(17,11,12,1), -(20,11,24,1), -(23,11,36,1), -(26,11,60,1), -(29,11,96,1), -(32,11,156,1), -(35,11,252,1), -(38,11,408,1), -(41,11,660,1), -(44,11,1068,1), -(47,11,1728,1), -(50,11,2796,1), -(54,15,3,1), -(57,15,6,1), -(60,15,9,1), -(63,15,12,1), -(66,15,18,1), -(69,15,24,1), -(72,15,30,1), -(75,15,36,1), -(78,15,42,1), -(81,15,48,1), -(84,1,120,1), -(87,1,144,1), -(90,1,168,1), -(93,1,336,1), -(96,1,504,1); +INSERT INTO `ScheduleComponent` (`scheduleComponentId`, `scheduleId`, `offset_hours`, `inspectionTypeId`) VALUES (1,1,0,1),(2,1,12,1),(3,1,24,1),(4,1,96,1),(5,1,48,1),(6,1,72,1),(8,2,24,1),(11,2,48,2),(14,11,0,1),(17,11,12,1),(20,11,24,1),(23,11,36,1),(26,11,60,1),(29,11,96,1),(32,11,156,1),(35,11,252,1),(38,11,408,1),(41,11,660,1),(44,11,1068,1),(47,11,1728,1),(50,11,2796,1),(54,15,3,1),(57,15,6,1),(60,15,9,1),(63,15,12,1),(66,15,18,1),(69,15,24,1),(72,15,30,1),(75,15,36,1),(78,15,42,1),(81,15,48,1),(84,1,120,1),(87,1,144,1),(90,1,168,1),(93,1,336,1),(96,1,504,1); /*!40000 ALTER TABLE `ScheduleComponent` ENABLE KEYS */; /*!40000 ALTER TABLE `Imager` DISABLE KEYS */; -INSERT INTO `Imager` (`imagerId`, `name`, `temperature`, `serial`, `capacity`) VALUES (2,'Imager1 20c',20,'Z125434',1000), -(7,'VMXi sim',20,'RI1000-0000',750); +INSERT INTO `Imager` (`imagerId`, `name`, `temperature`, `serial`, `capacity`) VALUES (2,'Imager1 20c',20,'Z125434',1000),(7,'VMXi sim',20,'RI1000-0000',750); /*!40000 ALTER TABLE `Imager` ENABLE KEYS */; /*!40000 ALTER TABLE `Detector` DISABLE KEYS */; -INSERT INTO `Detector` (`detectorId`, `detectorType`, `detectorManufacturer`, `detectorModel`, `detectorPixelSizeHorizontal`, `detectorPixelSizeVertical`, `DETECTORMAXRESOLUTION`, `DETECTORMINRESOLUTION`, `detectorSerialNumber`, `detectorDistanceMin`, `detectorDistanceMax`, `trustedPixelValueRangeLower`, `trustedPixelValueRangeUpper`, `sensorThickness`, `overload`, `XGeoCorr`, `YGeoCorr`, `detectorMode`, `density`, `composition`, `numberOfPixelsX`, `numberOfPixelsY`, `detectorRollMin`, `detectorRollMax`, `localName`, `numberOfROIPixelsX`, `numberOfROIPixelsY`) VALUES (4,'Photon counting','In-house','Excalibur',NULL,NULL,NULL,NULL,'1109-434',100,300,NULL,NULL,NULL,NULL,NULL,NULL,NULL,55,'CrO3Br5Sr10',NULL,NULL,NULL,NULL,NULL,NULL,NULL), -(8,'Diamond XPDF detector',NULL,NULL,NULL,NULL,NULL,NULL,'1109-761',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,10.4,'C+Br+He',NULL,NULL,NULL,NULL,NULL,NULL,NULL); +INSERT INTO `Detector` (`detectorId`, `detectorType`, `detectorManufacturer`, `detectorModel`, `detectorPixelSizeHorizontal`, `detectorPixelSizeVertical`, `DETECTORMAXRESOLUTION`, `DETECTORMINRESOLUTION`, `detectorSerialNumber`, `detectorDistanceMin`, `detectorDistanceMax`, `trustedPixelValueRangeLower`, `trustedPixelValueRangeUpper`, `sensorThickness`, `overload`, `XGeoCorr`, `YGeoCorr`, `detectorMode`, `density`, `composition`, `numberOfPixelsX`, `numberOfPixelsY`, `detectorRollMin`, `detectorRollMax`, `localName`, `numberOfROIPixelsX`, `numberOfROIPixelsY`) VALUES (4,'Photon counting','In-house','Excalibur',NULL,NULL,NULL,NULL,'1109-434',100,300,NULL,NULL,NULL,NULL,NULL,NULL,NULL,55,'CrO3Br5Sr10',NULL,NULL,NULL,NULL,NULL,NULL,NULL),(8,'Diamond XPDF detector',NULL,NULL,NULL,NULL,NULL,NULL,'1109-761',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,10.4,'C+Br+He',NULL,NULL,NULL,NULL,NULL,NULL,NULL); /*!40000 ALTER TABLE `Detector` ENABLE KEYS */; /*!40000 ALTER TABLE `DewarLocationList` DISABLE KEYS */; @@ -464,428 +71,51 @@ INSERT INTO `Detector` (`detectorId`, `detectorType`, `detectorManufacturer`, `d /*!40000 ALTER TABLE `BF_system` ENABLE KEYS */; /*!40000 ALTER TABLE `BLSampleImageAutoScoreSchema` DISABLE KEYS */; -INSERT INTO `BLSampleImageAutoScoreSchema` (`blSampleImageAutoScoreSchemaId`, `schemaName`, `enabled`) VALUES (1,'MARCO',1), -(2,'CHIMP',1); +INSERT INTO `BLSampleImageAutoScoreSchema` (`blSampleImageAutoScoreSchemaId`, `schemaName`, `enabled`) VALUES (1,'MARCO',1),(2,'CHIMP',1); /*!40000 ALTER TABLE `BLSampleImageAutoScoreSchema` ENABLE KEYS */; /*!40000 ALTER TABLE `BLSampleImageAutoScoreClass` DISABLE KEYS */; -INSERT INTO `BLSampleImageAutoScoreClass` (`blSampleImageAutoScoreClassId`, `blSampleImageAutoScoreSchemaId`, `scoreClass`) VALUES (1,1,'clear'), -(2,1,'crystal'), -(3,1,'precipitant'), -(4,1,'other'), -(5,2,'clear'), -(6,2,'crystal'), -(7,2,'precipitant'), -(8,2,'other'); +INSERT INTO `BLSampleImageAutoScoreClass` (`blSampleImageAutoScoreClassId`, `blSampleImageAutoScoreSchemaId`, `scoreClass`) VALUES (1,1,'clear'),(2,1,'crystal'),(3,1,'precipitant'),(4,1,'other'),(5,2,'clear'),(6,2,'crystal'),(7,2,'precipitant'),(8,2,'other'); /*!40000 ALTER TABLE `BLSampleImageAutoScoreClass` ENABLE KEYS */; /*!40000 ALTER TABLE `SpaceGroup` DISABLE KEYS */; -INSERT INTO `SpaceGroup` (`spaceGroupId`, `spaceGroupNumber`, `spaceGroupShortName`, `spaceGroupName`, `bravaisLattice`, `bravaisLatticeName`, `pointGroup`, `geometryClassnameId`, `MX_used`) VALUES (1,1,'P1','P 1','aP',NULL,NULL,NULL,1), -(2,2,'P-1','P-1',NULL,NULL,NULL,NULL,1), -(3,3,'P2','P 12 1','mP',NULL,NULL,NULL,1), -(4,4,'P21','P 121 1','mP',NULL,NULL,NULL,1), -(5,5,'C2','C 12 1','mC,mI',NULL,NULL,NULL,1), -(6,6,'P1m1','P 1m 1',NULL,NULL,NULL,NULL,0), -(7,7,'P1c1','P 1c 1',NULL,NULL,NULL,NULL,0), -(8,8,'C1m1','C 1m 1',NULL,NULL,NULL,NULL,0), -(9,9,'C1c1','C 1c 1',NULL,NULL,NULL,NULL,0), -(10,10,'P12/m1','P 12/m 1',NULL,NULL,NULL,NULL,0), -(11,11,'P121/m1','P 121/m 1',NULL,NULL,NULL,NULL,0), -(12,12,'C12/m1','C 12/m 1',NULL,NULL,NULL,NULL,0), -(13,13,'P12/c1','P 12/c 1',NULL,NULL,NULL,NULL,0), -(14,14,'P121/c1','P 121/c 1',NULL,NULL,NULL,NULL,0), -(15,15,'C12/c1','C 12/c 1',NULL,NULL,NULL,NULL,0), -(16,16,'P222','P 22 2','oP',NULL,NULL,NULL,1), -(17,17,'P2221','P 22 21','oP',NULL,NULL,NULL,1), -(18,18,'P21212','P21 21 2','oP',NULL,NULL,NULL,1), -(19,19,'P212121','P21 21 21','oP',NULL,NULL,NULL,1), -(20,20,'C2221','C 22 21','oC',NULL,NULL,NULL,1), -(21,21,'C222','C 22 2','oC',NULL,NULL,NULL,1), -(22,22,'F222','F 22 2','oF',NULL,NULL,NULL,1), -(23,23,'I222','I 22 2','oI',NULL,NULL,NULL,1), -(24,24,'I212121','I21 21 21','oI',NULL,NULL,NULL,1), -(25,25,'Pmm2','P mm 2',NULL,NULL,NULL,NULL,0), -(26,26,'Pmc21','P mc 21',NULL,NULL,NULL,NULL,0), -(27,27,'Pcc2','P cc 2',NULL,NULL,NULL,NULL,0), -(28,28,'Pma2','P ma 2',NULL,NULL,NULL,NULL,0), -(29,29,'Pca21','P ca 21',NULL,NULL,NULL,NULL,0), -(30,30,'Pnc2','P nc 2',NULL,NULL,NULL,NULL,0), -(31,31,'Pmn21','P mn 21',NULL,NULL,NULL,NULL,0), -(32,32,'Pba2','P ba 2',NULL,NULL,NULL,NULL,0), -(33,33,'Pna21','P na 21',NULL,NULL,NULL,NULL,0), -(34,34,'Pnn2','P nn 2',NULL,NULL,NULL,NULL,0), -(35,35,'Cmm2','C mm 2',NULL,NULL,NULL,NULL,0), -(36,36,'Cmc21','C mc 21',NULL,NULL,NULL,NULL,0), -(37,37,'Ccc2','C cc 2',NULL,NULL,NULL,NULL,0), -(38,38,'Amm2','A mm 2',NULL,NULL,NULL,NULL,0), -(39,39,'Abm2','A bm 2',NULL,NULL,NULL,NULL,0), -(40,40,'Ama2','A ma 2',NULL,NULL,NULL,NULL,0), -(41,41,'Aba2','A ba 2',NULL,NULL,NULL,NULL,0), -(42,42,'Fmm2','F mm 2',NULL,NULL,NULL,NULL,0), -(43,43,'Fdd2','F dd 2',NULL,NULL,NULL,NULL,0), -(44,44,'Imm2','I mm 2',NULL,NULL,NULL,NULL,0), -(45,45,'Iba2','I ba 2',NULL,NULL,NULL,NULL,0), -(46,46,'Ima2','I ma 2',NULL,NULL,NULL,NULL,0), -(47,47,'Pmmm','P mm m',NULL,NULL,NULL,NULL,0), -(48,48,'Pnnn','P nn n',NULL,NULL,NULL,NULL,0), -(49,49,'Pccm','P cc m',NULL,NULL,NULL,NULL,0), -(50,50,'Pban','P ba n',NULL,NULL,NULL,NULL,0), -(51,51,'Pmma','P mm a1',NULL,NULL,NULL,NULL,0), -(52,52,'Pnna','P nn a1',NULL,NULL,NULL,NULL,0), -(53,53,'Pmna','P mn a1',NULL,NULL,NULL,NULL,0), -(54,54,'Pcca','P cc a1',NULL,NULL,NULL,NULL,0), -(55,55,'Pbam','P ba m1',NULL,NULL,NULL,NULL,0), -(56,56,'Pccn','P cc n1',NULL,NULL,NULL,NULL,0), -(57,57,'Pbcm','P bc m1',NULL,NULL,NULL,NULL,0), -(58,58,'Pnnm','P nn m1',NULL,NULL,NULL,NULL,0), -(59,59,'Pmmn','P mm n1',NULL,NULL,NULL,NULL,0), -(60,60,'Pbcn','P bc n1',NULL,NULL,NULL,NULL,0), -(61,61,'Pbca','P bc a1',NULL,NULL,NULL,NULL,0), -(62,62,'Pnma','P nm a1',NULL,NULL,NULL,NULL,0), -(63,63,'Cmcm','C mc m1',NULL,NULL,NULL,NULL,0), -(64,64,'Cmca','C mc a1',NULL,NULL,NULL,NULL,0), -(65,65,'Cmmm','C mm m',NULL,NULL,NULL,NULL,0), -(66,66,'Cccm','C cc m',NULL,NULL,NULL,NULL,0), -(67,67,'Cmma','C mm a',NULL,NULL,NULL,NULL,0), -(68,68,'Ccca','C cc a',NULL,NULL,NULL,NULL,0), -(69,69,'Fmmm','F mm m',NULL,NULL,NULL,NULL,0), -(70,70,'Fddd','F dd d',NULL,NULL,NULL,NULL,0), -(71,71,'Immm','I mm m',NULL,NULL,NULL,NULL,0), -(72,72,'Ibam','I ba m',NULL,NULL,NULL,NULL,0), -(73,73,'Ibca','I b c a1',NULL,NULL,NULL,NULL,0), -(74,74,'Imma','I mm a1',NULL,NULL,NULL,NULL,0), -(75,75,'P4','P4','tP',NULL,NULL,NULL,1), -(76,76,'P41','P41','tP',NULL,NULL,NULL,1), -(77,77,'P42','P42','tP',NULL,NULL,NULL,1), -(78,78,'P43','P43','tP',NULL,NULL,NULL,1), -(79,79,'I4','I4','tI',NULL,NULL,NULL,1), -(80,80,'I41','I41','tI',NULL,NULL,NULL,1), -(81,81,'P-4','P-4',NULL,NULL,NULL,NULL,0), -(82,82,'I-4','I-4',NULL,NULL,NULL,NULL,0), -(83,83,'P4/m','P4/m',NULL,NULL,NULL,NULL,0), -(84,84,'P42/m','P42/m',NULL,NULL,NULL,NULL,0), -(85,85,'P4/n','P4/n',NULL,NULL,NULL,NULL,0), -(86,86,'P42/n','P42/n',NULL,NULL,NULL,NULL,0), -(87,87,'I4/m','I4/m',NULL,NULL,NULL,NULL,0), -(88,88,'I41/a','I41/a',NULL,NULL,NULL,NULL,0), -(89,89,'P422','P 42 2','tP',NULL,NULL,NULL,1), -(90,90,'P4212','P 421 2','tP',NULL,NULL,NULL,1), -(91,91,'P4122','P41 2 2','tP',NULL,NULL,NULL,1), -(92,92,'P41212','P41 21 2','tP',NULL,NULL,NULL,1), -(93,93,'P4222','P42 2 2','tP',NULL,NULL,NULL,1), -(94,94,'P42212','P42 21 2','tP',NULL,NULL,NULL,1), -(95,95,'P4322','P43 2 2','tP',NULL,NULL,NULL,1), -(96,96,'P43212','P43 21 2','tP',NULL,NULL,NULL,1), -(97,97,'I422','I 42 2','tI',NULL,NULL,NULL,1), -(98,98,'I4122','I41 2 2','tI',NULL,NULL,NULL,1), -(99,99,'P4mm','P 4m m',NULL,NULL,NULL,NULL,0), -(100,100,'P4bm','P4 b m',NULL,NULL,NULL,NULL,0), -(101,101,'P42cm','P42 c m',NULL,NULL,NULL,NULL,0), -(102,102,'P42nm','P42 n m',NULL,NULL,NULL,NULL,0), -(103,103,'P4cc','P4 c c',NULL,NULL,NULL,NULL,0), -(104,104,'P4nc','P4 n c',NULL,NULL,NULL,NULL,0), -(105,105,'P42mc','P42 m c',NULL,NULL,NULL,NULL,0), -(106,106,'P42bc','P42 b c',NULL,NULL,NULL,NULL,0), -(107,107,'I4mm','I4 m m',NULL,NULL,NULL,NULL,0), -(108,108,'I4cm','I4 c m',NULL,NULL,NULL,NULL,0), -(109,109,'I41md','I41 m d',NULL,NULL,NULL,NULL,0), -(110,110,'I41cd','I41 c d',NULL,NULL,NULL,NULL,0), -(111,111,'P-42m','P-4 2 m',NULL,NULL,NULL,NULL,0), -(112,112,'P-42c','P-4 2 c',NULL,NULL,NULL,NULL,0), -(113,113,'P-421m','P-4 21 m',NULL,NULL,NULL,NULL,0), -(114,114,'P-421c','P-4 21 c',NULL,NULL,NULL,NULL,0), -(115,115,'P-4m2','P-4 m 2',NULL,NULL,NULL,NULL,0), -(116,116,'P-4c2','P-4 c 2',NULL,NULL,NULL,NULL,0), -(117,117,'P-4b2','P-4 b 2',NULL,NULL,NULL,NULL,0), -(118,118,'P-4n2','P-4 n 2',NULL,NULL,NULL,NULL,0), -(119,119,'I-4m2','I-4 m 2',NULL,NULL,NULL,NULL,0), -(120,120,'I-4c2','I-4 c 2',NULL,NULL,NULL,NULL,0), -(121,121,'I-42m','I-4 2 m',NULL,NULL,NULL,NULL,0), -(122,122,'I-42d','I-4 2 d',NULL,NULL,NULL,NULL,0), -(123,123,'P4/mmm','P4/m m m',NULL,NULL,NULL,NULL,0), -(124,124,'P4/mcc','P4/m c c',NULL,NULL,NULL,NULL,0), -(125,125,'P4/nbm','P4/n b m',NULL,NULL,NULL,NULL,0), -(126,126,'P4/nnc','P4/n n c',NULL,NULL,NULL,NULL,0), -(127,127,'P4/mbm','P4/m b m1',NULL,NULL,NULL,NULL,0), -(128,128,'P4/mnc','P4/m n c1',NULL,NULL,NULL,NULL,0), -(129,129,'P4/nmm','P4/n m m1',NULL,NULL,NULL,NULL,0), -(130,130,'P4/ncc','P4/n c c1',NULL,NULL,NULL,NULL,0), -(131,131,'P42/mmc','P42/m m c',NULL,NULL,NULL,NULL,0), -(132,132,'P42/mcm','P42/m c m',NULL,NULL,NULL,NULL,0), -(133,133,'P42/nbc','P42/n b c',NULL,NULL,NULL,NULL,0), -(134,134,'P42/nnm','P42/n n m',NULL,NULL,NULL,NULL,0), -(135,135,'P42/mbc','P42/m b c',NULL,NULL,NULL,NULL,0), -(136,136,'P42/mnm','P42/m n m',NULL,NULL,NULL,NULL,0), -(137,137,'P42/nmc','P42/n m c',NULL,NULL,NULL,NULL,0), -(138,138,'P42/ncm','P42/n c m',NULL,NULL,NULL,NULL,0), -(139,139,'I4/mmm','I4/m m m',NULL,NULL,NULL,NULL,0), -(140,140,'I4/mcm','I4/m c m',NULL,NULL,NULL,NULL,0), -(141,141,'I41/amd','I41/a m d',NULL,NULL,NULL,NULL,0), -(142,142,'I41/acd','I41/a c d',NULL,NULL,NULL,NULL,0), -(143,143,'P3','P3','hP',NULL,NULL,NULL,1), -(144,144,'P31','P31','hP',NULL,NULL,NULL,1), -(145,145,'P32','P32','hP',NULL,NULL,NULL,1), -(146,146,'R3','H3','hR',NULL,NULL,NULL,1), -(147,147,'P-3','P-3',NULL,NULL,NULL,NULL,0), -(148,148,'H-3','H-3',NULL,NULL,NULL,NULL,0), -(149,149,'P312','P3 1 2','hP',NULL,NULL,NULL,1), -(150,150,'P321','P3 2 1','hP',NULL,NULL,NULL,1), -(151,151,'P3112','P31 1 2','hP',NULL,NULL,NULL,1), -(152,152,'P3121','P31 2 1','hP',NULL,NULL,NULL,1), -(153,153,'P3212','P32 1 2','hP',NULL,NULL,NULL,1), -(154,154,'P3221','P32 2 1','hP',NULL,NULL,NULL,1), -(155,155,'R32','H3 2','hR',NULL,NULL,NULL,1), -(156,156,'P3m1','P3 m 1',NULL,NULL,NULL,NULL,0), -(157,157,'P31m','P3 1 m',NULL,NULL,NULL,NULL,0), -(158,158,'P3c1','P3 c 1',NULL,NULL,NULL,NULL,0), -(159,159,'P31c','P3 1 c',NULL,NULL,NULL,NULL,0), -(160,160,'H3m','H3 m',NULL,NULL,NULL,NULL,0), -(161,161,'H3c','H3 c',NULL,NULL,NULL,NULL,0), -(162,162,'P-31m','P-3 1 m',NULL,NULL,NULL,NULL,0), -(163,163,'P-31c','P-3 1 c',NULL,NULL,NULL,NULL,0), -(164,164,'P-3m1','P-3 m 1',NULL,NULL,NULL,NULL,0), -(165,165,'P-3c1','P-3 c 1',NULL,NULL,NULL,NULL,0), -(166,166,'H-3m','H-3 m',NULL,NULL,NULL,NULL,0), -(167,167,'H-3c','H-3 c',NULL,NULL,NULL,NULL,0), -(168,168,'P6','P6','hP',NULL,NULL,NULL,1), -(169,169,'P61','P61','hP',NULL,NULL,NULL,1), -(170,170,'P65','P65','hP',NULL,NULL,NULL,1), -(171,171,'P62','P62','hP',NULL,NULL,NULL,1), -(172,172,'P64','P64','hP',NULL,NULL,NULL,1), -(173,173,'P63','P63','hP',NULL,NULL,NULL,1), -(174,174,'P-6','P-6',NULL,NULL,NULL,NULL,0), -(175,175,'P6/m','P6/m',NULL,NULL,NULL,NULL,0), -(176,176,'P63/m','P63/m',NULL,NULL,NULL,NULL,0), -(177,177,'P622','P6 2 2','hP',NULL,NULL,NULL,1), -(178,178,'P6122','P61 2 2','hP',NULL,NULL,NULL,1), -(179,179,'P6522','P65 2 2','hP',NULL,NULL,NULL,1), -(180,180,'P6222','P62 2 2','hP',NULL,NULL,NULL,1), -(181,181,'P6422','P64 2 2','hP',NULL,NULL,NULL,1), -(182,182,'P6322','P63 2 2','hP',NULL,NULL,NULL,1), -(183,183,'P6mm','P6 m m',NULL,NULL,NULL,NULL,0), -(184,184,'P6cc','P6 c c',NULL,NULL,NULL,NULL,0), -(185,185,'P63cm','P63 c m',NULL,NULL,NULL,NULL,0), -(186,186,'P63mc','P63 m c',NULL,NULL,NULL,NULL,0), -(187,187,'P-6m2','P-6 m 2',NULL,NULL,NULL,NULL,0), -(188,188,'P-6c2','P-6 c 2',NULL,NULL,NULL,NULL,0), -(189,189,'P-62m','P-6 2 m',NULL,NULL,NULL,NULL,0), -(190,190,'P-62c','P-6 2 c',NULL,NULL,NULL,NULL,0), -(191,191,'P6/mmm','P6/m m m',NULL,NULL,NULL,NULL,0), -(192,192,'P6/mcc','P6/m c c',NULL,NULL,NULL,NULL,0), -(193,193,'P63/mcm','P63/m c m',NULL,NULL,NULL,NULL,0), -(194,194,'P63/mmc','P63/m m c',NULL,NULL,NULL,NULL,0), -(195,195,'P23','P2 3','cP',NULL,NULL,NULL,1), -(196,196,'F23','F2 3','cF',NULL,NULL,NULL,1), -(197,197,'I23','I2 3','cI',NULL,NULL,NULL,1), -(198,198,'P213','P21 3','cP',NULL,NULL,NULL,1), -(199,199,'I213','I21 3','cI',NULL,NULL,NULL,1), -(200,200,'Pm-3','Pm -3',NULL,NULL,NULL,NULL,0), -(201,201,'Pn-3','Pn -3',NULL,NULL,NULL,NULL,0), -(202,202,'Fm-3','Fm -3',NULL,NULL,NULL,NULL,0), -(203,203,'Fd-3','Fd -3',NULL,NULL,NULL,NULL,0), -(204,204,'Im-3','Im -3',NULL,NULL,NULL,NULL,0), -(205,205,'Pa-3','Pa -31',NULL,NULL,NULL,NULL,0), -(206,206,'Ia-3','Ia -31',NULL,NULL,NULL,NULL,0), -(207,207,'P432','P4 3 2','cP',NULL,NULL,NULL,1), -(208,208,'P4232','P42 3 2','cP',NULL,NULL,NULL,1), -(209,209,'F432','F4 3 2','cF',NULL,NULL,NULL,1), -(210,210,'F4132','F41 3 2','cF',NULL,NULL,NULL,1), -(211,211,'I432','I4 3 2','cI',NULL,NULL,NULL,1), -(212,212,'P4332','P43 3 2','cP',NULL,NULL,NULL,1), -(213,213,'P4132','P41 3 2','cP',NULL,NULL,NULL,1), -(214,214,'I4132','I41 3 2','cI',NULL,NULL,NULL,1), -(215,215,'P-43m','P-4 3 m',NULL,NULL,NULL,NULL,0), -(216,216,'F-43m','F-4 3 m',NULL,NULL,NULL,NULL,0), -(217,217,'I-43m','I-4 3 m',NULL,NULL,NULL,NULL,0), -(218,218,'P-43n','P-4 3 n',NULL,NULL,NULL,NULL,0), -(219,219,'F-43c','F-4 3 c',NULL,NULL,NULL,NULL,0), -(220,220,'I-43d','I-4 3 d',NULL,NULL,NULL,NULL,0), -(221,221,'Pm-3m','Pm -3 m',NULL,NULL,NULL,NULL,0), -(222,222,'Pn-3n','Pn -3 n',NULL,NULL,NULL,NULL,0), -(223,223,'Pm-3n','Pm -3 n1',NULL,NULL,NULL,NULL,0), -(224,224,'Pn-3m','Pn -3 m1',NULL,NULL,NULL,NULL,0), -(225,225,'Fm-3m','Fm -3 m',NULL,NULL,NULL,NULL,0), -(226,226,'Fm-3c','Fm -3 c',NULL,NULL,NULL,NULL,0), -(227,227,'Fd-3m','Fd -3 m1',NULL,NULL,NULL,NULL,0), -(228,228,'Fd-3c','Fd -3 c1',NULL,NULL,NULL,NULL,0), -(229,229,'Im-3m','Im -3 m',NULL,NULL,NULL,NULL,0), -(230,230,'Ia-3d','Ia -3 d1',NULL,NULL,NULL,NULL,0); +INSERT INTO `SpaceGroup` (`spaceGroupId`, `spaceGroupNumber`, `spaceGroupShortName`, `spaceGroupName`, `bravaisLattice`, `bravaisLatticeName`, `pointGroup`, `geometryClassnameId`, `MX_used`) VALUES (1,1,'P1','P 1','aP',NULL,NULL,NULL,1),(2,2,'P-1','P-1',NULL,NULL,NULL,NULL,1),(3,3,'P2','P 12 1','mP',NULL,NULL,NULL,1),(4,4,'P21','P 121 1','mP',NULL,NULL,NULL,1),(5,5,'C2','C 12 1','mC,mI',NULL,NULL,NULL,1),(6,6,'P1m1','P 1m 1',NULL,NULL,NULL,NULL,0),(7,7,'P1c1','P 1c 1',NULL,NULL,NULL,NULL,0),(8,8,'C1m1','C 1m 1',NULL,NULL,NULL,NULL,0),(9,9,'C1c1','C 1c 1',NULL,NULL,NULL,NULL,0),(10,10,'P12/m1','P 12/m 1',NULL,NULL,NULL,NULL,0),(11,11,'P121/m1','P 121/m 1',NULL,NULL,NULL,NULL,0),(12,12,'C12/m1','C 12/m 1',NULL,NULL,NULL,NULL,0),(13,13,'P12/c1','P 12/c 1',NULL,NULL,NULL,NULL,0),(14,14,'P121/c1','P 121/c 1',NULL,NULL,NULL,NULL,0),(15,15,'C12/c1','C 12/c 1',NULL,NULL,NULL,NULL,0),(16,16,'P222','P 22 2','oP',NULL,NULL,NULL,1),(17,17,'P2221','P 22 21','oP',NULL,NULL,NULL,1),(18,18,'P21212','P21 21 2','oP',NULL,NULL,NULL,1),(19,19,'P212121','P21 21 21','oP',NULL,NULL,NULL,1),(20,20,'C2221','C 22 21','oC',NULL,NULL,NULL,1),(21,21,'C222','C 22 2','oC',NULL,NULL,NULL,1),(22,22,'F222','F 22 2','oF',NULL,NULL,NULL,1),(23,23,'I222','I 22 2','oI',NULL,NULL,NULL,1),(24,24,'I212121','I21 21 21','oI',NULL,NULL,NULL,1),(25,25,'Pmm2','P mm 2',NULL,NULL,NULL,NULL,0),(26,26,'Pmc21','P mc 21',NULL,NULL,NULL,NULL,0),(27,27,'Pcc2','P cc 2',NULL,NULL,NULL,NULL,0),(28,28,'Pma2','P ma 2',NULL,NULL,NULL,NULL,0),(29,29,'Pca21','P ca 21',NULL,NULL,NULL,NULL,0),(30,30,'Pnc2','P nc 2',NULL,NULL,NULL,NULL,0),(31,31,'Pmn21','P mn 21',NULL,NULL,NULL,NULL,0),(32,32,'Pba2','P ba 2',NULL,NULL,NULL,NULL,0),(33,33,'Pna21','P na 21',NULL,NULL,NULL,NULL,0),(34,34,'Pnn2','P nn 2',NULL,NULL,NULL,NULL,0),(35,35,'Cmm2','C mm 2',NULL,NULL,NULL,NULL,0),(36,36,'Cmc21','C mc 21',NULL,NULL,NULL,NULL,0),(37,37,'Ccc2','C cc 2',NULL,NULL,NULL,NULL,0),(38,38,'Amm2','A mm 2',NULL,NULL,NULL,NULL,0),(39,39,'Abm2','A bm 2',NULL,NULL,NULL,NULL,0),(40,40,'Ama2','A ma 2',NULL,NULL,NULL,NULL,0),(41,41,'Aba2','A ba 2',NULL,NULL,NULL,NULL,0),(42,42,'Fmm2','F mm 2',NULL,NULL,NULL,NULL,0),(43,43,'Fdd2','F dd 2',NULL,NULL,NULL,NULL,0),(44,44,'Imm2','I mm 2',NULL,NULL,NULL,NULL,0),(45,45,'Iba2','I ba 2',NULL,NULL,NULL,NULL,0),(46,46,'Ima2','I ma 2',NULL,NULL,NULL,NULL,0),(47,47,'Pmmm','P mm m',NULL,NULL,NULL,NULL,0),(48,48,'Pnnn','P nn n',NULL,NULL,NULL,NULL,0),(49,49,'Pccm','P cc m',NULL,NULL,NULL,NULL,0),(50,50,'Pban','P ba n',NULL,NULL,NULL,NULL,0),(51,51,'Pmma','P mm a1',NULL,NULL,NULL,NULL,0),(52,52,'Pnna','P nn a1',NULL,NULL,NULL,NULL,0),(53,53,'Pmna','P mn a1',NULL,NULL,NULL,NULL,0),(54,54,'Pcca','P cc a1',NULL,NULL,NULL,NULL,0),(55,55,'Pbam','P ba m1',NULL,NULL,NULL,NULL,0),(56,56,'Pccn','P cc n1',NULL,NULL,NULL,NULL,0),(57,57,'Pbcm','P bc m1',NULL,NULL,NULL,NULL,0),(58,58,'Pnnm','P nn m1',NULL,NULL,NULL,NULL,0),(59,59,'Pmmn','P mm n1',NULL,NULL,NULL,NULL,0),(60,60,'Pbcn','P bc n1',NULL,NULL,NULL,NULL,0),(61,61,'Pbca','P bc a1',NULL,NULL,NULL,NULL,0),(62,62,'Pnma','P nm a1',NULL,NULL,NULL,NULL,0),(63,63,'Cmcm','C mc m1',NULL,NULL,NULL,NULL,0),(64,64,'Cmca','C mc a1',NULL,NULL,NULL,NULL,0),(65,65,'Cmmm','C mm m',NULL,NULL,NULL,NULL,0),(66,66,'Cccm','C cc m',NULL,NULL,NULL,NULL,0),(67,67,'Cmma','C mm a',NULL,NULL,NULL,NULL,0),(68,68,'Ccca','C cc a',NULL,NULL,NULL,NULL,0),(69,69,'Fmmm','F mm m',NULL,NULL,NULL,NULL,0),(70,70,'Fddd','F dd d',NULL,NULL,NULL,NULL,0),(71,71,'Immm','I mm m',NULL,NULL,NULL,NULL,0),(72,72,'Ibam','I ba m',NULL,NULL,NULL,NULL,0),(73,73,'Ibca','I b c a1',NULL,NULL,NULL,NULL,0),(74,74,'Imma','I mm a1',NULL,NULL,NULL,NULL,0),(75,75,'P4','P4','tP',NULL,NULL,NULL,1),(76,76,'P41','P41','tP',NULL,NULL,NULL,1),(77,77,'P42','P42','tP',NULL,NULL,NULL,1),(78,78,'P43','P43','tP',NULL,NULL,NULL,1),(79,79,'I4','I4','tI',NULL,NULL,NULL,1),(80,80,'I41','I41','tI',NULL,NULL,NULL,1),(81,81,'P-4','P-4',NULL,NULL,NULL,NULL,0),(82,82,'I-4','I-4',NULL,NULL,NULL,NULL,0),(83,83,'P4/m','P4/m',NULL,NULL,NULL,NULL,0),(84,84,'P42/m','P42/m',NULL,NULL,NULL,NULL,0),(85,85,'P4/n','P4/n',NULL,NULL,NULL,NULL,0),(86,86,'P42/n','P42/n',NULL,NULL,NULL,NULL,0),(87,87,'I4/m','I4/m',NULL,NULL,NULL,NULL,0),(88,88,'I41/a','I41/a',NULL,NULL,NULL,NULL,0),(89,89,'P422','P 42 2','tP',NULL,NULL,NULL,1),(90,90,'P4212','P 421 2','tP',NULL,NULL,NULL,1),(91,91,'P4122','P41 2 2','tP',NULL,NULL,NULL,1),(92,92,'P41212','P41 21 2','tP',NULL,NULL,NULL,1),(93,93,'P4222','P42 2 2','tP',NULL,NULL,NULL,1),(94,94,'P42212','P42 21 2','tP',NULL,NULL,NULL,1),(95,95,'P4322','P43 2 2','tP',NULL,NULL,NULL,1),(96,96,'P43212','P43 21 2','tP',NULL,NULL,NULL,1),(97,97,'I422','I 42 2','tI',NULL,NULL,NULL,1),(98,98,'I4122','I41 2 2','tI',NULL,NULL,NULL,1),(99,99,'P4mm','P 4m m',NULL,NULL,NULL,NULL,0),(100,100,'P4bm','P4 b m',NULL,NULL,NULL,NULL,0),(101,101,'P42cm','P42 c m',NULL,NULL,NULL,NULL,0),(102,102,'P42nm','P42 n m',NULL,NULL,NULL,NULL,0),(103,103,'P4cc','P4 c c',NULL,NULL,NULL,NULL,0),(104,104,'P4nc','P4 n c',NULL,NULL,NULL,NULL,0),(105,105,'P42mc','P42 m c',NULL,NULL,NULL,NULL,0),(106,106,'P42bc','P42 b c',NULL,NULL,NULL,NULL,0),(107,107,'I4mm','I4 m m',NULL,NULL,NULL,NULL,0),(108,108,'I4cm','I4 c m',NULL,NULL,NULL,NULL,0),(109,109,'I41md','I41 m d',NULL,NULL,NULL,NULL,0),(110,110,'I41cd','I41 c d',NULL,NULL,NULL,NULL,0),(111,111,'P-42m','P-4 2 m',NULL,NULL,NULL,NULL,0),(112,112,'P-42c','P-4 2 c',NULL,NULL,NULL,NULL,0),(113,113,'P-421m','P-4 21 m',NULL,NULL,NULL,NULL,0),(114,114,'P-421c','P-4 21 c',NULL,NULL,NULL,NULL,0),(115,115,'P-4m2','P-4 m 2',NULL,NULL,NULL,NULL,0),(116,116,'P-4c2','P-4 c 2',NULL,NULL,NULL,NULL,0),(117,117,'P-4b2','P-4 b 2',NULL,NULL,NULL,NULL,0),(118,118,'P-4n2','P-4 n 2',NULL,NULL,NULL,NULL,0),(119,119,'I-4m2','I-4 m 2',NULL,NULL,NULL,NULL,0),(120,120,'I-4c2','I-4 c 2',NULL,NULL,NULL,NULL,0),(121,121,'I-42m','I-4 2 m',NULL,NULL,NULL,NULL,0),(122,122,'I-42d','I-4 2 d',NULL,NULL,NULL,NULL,0),(123,123,'P4/mmm','P4/m m m',NULL,NULL,NULL,NULL,0),(124,124,'P4/mcc','P4/m c c',NULL,NULL,NULL,NULL,0),(125,125,'P4/nbm','P4/n b m',NULL,NULL,NULL,NULL,0),(126,126,'P4/nnc','P4/n n c',NULL,NULL,NULL,NULL,0),(127,127,'P4/mbm','P4/m b m1',NULL,NULL,NULL,NULL,0),(128,128,'P4/mnc','P4/m n c1',NULL,NULL,NULL,NULL,0),(129,129,'P4/nmm','P4/n m m1',NULL,NULL,NULL,NULL,0),(130,130,'P4/ncc','P4/n c c1',NULL,NULL,NULL,NULL,0),(131,131,'P42/mmc','P42/m m c',NULL,NULL,NULL,NULL,0),(132,132,'P42/mcm','P42/m c m',NULL,NULL,NULL,NULL,0),(133,133,'P42/nbc','P42/n b c',NULL,NULL,NULL,NULL,0),(134,134,'P42/nnm','P42/n n m',NULL,NULL,NULL,NULL,0),(135,135,'P42/mbc','P42/m b c',NULL,NULL,NULL,NULL,0),(136,136,'P42/mnm','P42/m n m',NULL,NULL,NULL,NULL,0),(137,137,'P42/nmc','P42/n m c',NULL,NULL,NULL,NULL,0),(138,138,'P42/ncm','P42/n c m',NULL,NULL,NULL,NULL,0),(139,139,'I4/mmm','I4/m m m',NULL,NULL,NULL,NULL,0),(140,140,'I4/mcm','I4/m c m',NULL,NULL,NULL,NULL,0),(141,141,'I41/amd','I41/a m d',NULL,NULL,NULL,NULL,0),(142,142,'I41/acd','I41/a c d',NULL,NULL,NULL,NULL,0),(143,143,'P3','P3','hP',NULL,NULL,NULL,1),(144,144,'P31','P31','hP',NULL,NULL,NULL,1),(145,145,'P32','P32','hP',NULL,NULL,NULL,1),(146,146,'R3','H3','hR',NULL,NULL,NULL,1),(147,147,'P-3','P-3',NULL,NULL,NULL,NULL,0),(148,148,'H-3','H-3',NULL,NULL,NULL,NULL,0),(149,149,'P312','P3 1 2','hP',NULL,NULL,NULL,1),(150,150,'P321','P3 2 1','hP',NULL,NULL,NULL,1),(151,151,'P3112','P31 1 2','hP',NULL,NULL,NULL,1),(152,152,'P3121','P31 2 1','hP',NULL,NULL,NULL,1),(153,153,'P3212','P32 1 2','hP',NULL,NULL,NULL,1),(154,154,'P3221','P32 2 1','hP',NULL,NULL,NULL,1),(155,155,'R32','H3 2','hR',NULL,NULL,NULL,1),(156,156,'P3m1','P3 m 1',NULL,NULL,NULL,NULL,0),(157,157,'P31m','P3 1 m',NULL,NULL,NULL,NULL,0),(158,158,'P3c1','P3 c 1',NULL,NULL,NULL,NULL,0),(159,159,'P31c','P3 1 c',NULL,NULL,NULL,NULL,0),(160,160,'H3m','H3 m',NULL,NULL,NULL,NULL,0),(161,161,'H3c','H3 c',NULL,NULL,NULL,NULL,0),(162,162,'P-31m','P-3 1 m',NULL,NULL,NULL,NULL,0),(163,163,'P-31c','P-3 1 c',NULL,NULL,NULL,NULL,0),(164,164,'P-3m1','P-3 m 1',NULL,NULL,NULL,NULL,0),(165,165,'P-3c1','P-3 c 1',NULL,NULL,NULL,NULL,0),(166,166,'H-3m','H-3 m',NULL,NULL,NULL,NULL,0),(167,167,'H-3c','H-3 c',NULL,NULL,NULL,NULL,0),(168,168,'P6','P6','hP',NULL,NULL,NULL,1),(169,169,'P61','P61','hP',NULL,NULL,NULL,1),(170,170,'P65','P65','hP',NULL,NULL,NULL,1),(171,171,'P62','P62','hP',NULL,NULL,NULL,1),(172,172,'P64','P64','hP',NULL,NULL,NULL,1),(173,173,'P63','P63','hP',NULL,NULL,NULL,1),(174,174,'P-6','P-6',NULL,NULL,NULL,NULL,0),(175,175,'P6/m','P6/m',NULL,NULL,NULL,NULL,0),(176,176,'P63/m','P63/m',NULL,NULL,NULL,NULL,0),(177,177,'P622','P6 2 2','hP',NULL,NULL,NULL,1),(178,178,'P6122','P61 2 2','hP',NULL,NULL,NULL,1),(179,179,'P6522','P65 2 2','hP',NULL,NULL,NULL,1),(180,180,'P6222','P62 2 2','hP',NULL,NULL,NULL,1),(181,181,'P6422','P64 2 2','hP',NULL,NULL,NULL,1),(182,182,'P6322','P63 2 2','hP',NULL,NULL,NULL,1),(183,183,'P6mm','P6 m m',NULL,NULL,NULL,NULL,0),(184,184,'P6cc','P6 c c',NULL,NULL,NULL,NULL,0),(185,185,'P63cm','P63 c m',NULL,NULL,NULL,NULL,0),(186,186,'P63mc','P63 m c',NULL,NULL,NULL,NULL,0),(187,187,'P-6m2','P-6 m 2',NULL,NULL,NULL,NULL,0),(188,188,'P-6c2','P-6 c 2',NULL,NULL,NULL,NULL,0),(189,189,'P-62m','P-6 2 m',NULL,NULL,NULL,NULL,0),(190,190,'P-62c','P-6 2 c',NULL,NULL,NULL,NULL,0),(191,191,'P6/mmm','P6/m m m',NULL,NULL,NULL,NULL,0),(192,192,'P6/mcc','P6/m c c',NULL,NULL,NULL,NULL,0),(193,193,'P63/mcm','P63/m c m',NULL,NULL,NULL,NULL,0),(194,194,'P63/mmc','P63/m m c',NULL,NULL,NULL,NULL,0),(195,195,'P23','P2 3','cP',NULL,NULL,NULL,1),(196,196,'F23','F2 3','cF',NULL,NULL,NULL,1),(197,197,'I23','I2 3','cI',NULL,NULL,NULL,1),(198,198,'P213','P21 3','cP',NULL,NULL,NULL,1),(199,199,'I213','I21 3','cI',NULL,NULL,NULL,1),(200,200,'Pm-3','Pm -3',NULL,NULL,NULL,NULL,0),(201,201,'Pn-3','Pn -3',NULL,NULL,NULL,NULL,0),(202,202,'Fm-3','Fm -3',NULL,NULL,NULL,NULL,0),(203,203,'Fd-3','Fd -3',NULL,NULL,NULL,NULL,0),(204,204,'Im-3','Im -3',NULL,NULL,NULL,NULL,0),(205,205,'Pa-3','Pa -31',NULL,NULL,NULL,NULL,0),(206,206,'Ia-3','Ia -31',NULL,NULL,NULL,NULL,0),(207,207,'P432','P4 3 2','cP',NULL,NULL,NULL,1),(208,208,'P4232','P42 3 2','cP',NULL,NULL,NULL,1),(209,209,'F432','F4 3 2','cF',NULL,NULL,NULL,1),(210,210,'F4132','F41 3 2','cF',NULL,NULL,NULL,1),(211,211,'I432','I4 3 2','cI',NULL,NULL,NULL,1),(212,212,'P4332','P43 3 2','cP',NULL,NULL,NULL,1),(213,213,'P4132','P41 3 2','cP',NULL,NULL,NULL,1),(214,214,'I4132','I41 3 2','cI',NULL,NULL,NULL,1),(215,215,'P-43m','P-4 3 m',NULL,NULL,NULL,NULL,0),(216,216,'F-43m','F-4 3 m',NULL,NULL,NULL,NULL,0),(217,217,'I-43m','I-4 3 m',NULL,NULL,NULL,NULL,0),(218,218,'P-43n','P-4 3 n',NULL,NULL,NULL,NULL,0),(219,219,'F-43c','F-4 3 c',NULL,NULL,NULL,NULL,0),(220,220,'I-43d','I-4 3 d',NULL,NULL,NULL,NULL,0),(221,221,'Pm-3m','Pm -3 m',NULL,NULL,NULL,NULL,0),(222,222,'Pn-3n','Pn -3 n',NULL,NULL,NULL,NULL,0),(223,223,'Pm-3n','Pm -3 n1',NULL,NULL,NULL,NULL,0),(224,224,'Pn-3m','Pn -3 m1',NULL,NULL,NULL,NULL,0),(225,225,'Fm-3m','Fm -3 m',NULL,NULL,NULL,NULL,0),(226,226,'Fm-3c','Fm -3 c',NULL,NULL,NULL,NULL,0),(227,227,'Fd-3m','Fd -3 m1',NULL,NULL,NULL,NULL,0),(228,228,'Fd-3c','Fd -3 c1',NULL,NULL,NULL,NULL,0),(229,229,'Im-3m','Im -3 m',NULL,NULL,NULL,NULL,0),(230,230,'Ia-3d','Ia -3 d1',NULL,NULL,NULL,NULL,0); /*!40000 ALTER TABLE `SpaceGroup` ENABLE KEYS */; /*!40000 ALTER TABLE `ProcessingPipelineCategory` DISABLE KEYS */; -INSERT INTO `ProcessingPipelineCategory` (`processingPipelineCategoryId`, `name`) VALUES (1,'screening'), -(2,'processing'), -(3,'post processing'); +INSERT INTO `ProcessingPipelineCategory` (`processingPipelineCategoryId`, `name`) VALUES (1,'screening'),(2,'processing'),(3,'post processing'); /*!40000 ALTER TABLE `ProcessingPipelineCategory` ENABLE KEYS */; /*!40000 ALTER TABLE `ProcessingPipeline` DISABLE KEYS */; -INSERT INTO `ProcessingPipeline` (`processingPipelineId`, `processingPipelineCategoryId`, `name`, `discipline`, `pipelineStatus`, `reprocessing`) VALUES (1,1,'Mosflm','MX','automatic',0), -(2,1,'EDNA','MX','automatic',0), -(3,2,'Fast DP','MX','automatic',1), -(4,2,'xia2/3dii','MX','deprecated',0), -(5,2,'xia2/Multiplex','MX','automatic',1), -(6,2,'xia2/DIALS','MX','optional',1), -(7,2,'xia2/XDS','MX','optional',1), -(8,2,'autoPROC','MX','optional',1), -(9,3,'Fast EP','MX','automatic',0), -(10,3,'Dimple','MX','automatic',0), -(11,3,'MrBUMP','MX','automatic',0), -(12,3,'Big EP/XDS','MX','automatic',0), -(13,3,'Big EP/DIALS','MX','automatic',0); +INSERT INTO `ProcessingPipeline` (`processingPipelineId`, `processingPipelineCategoryId`, `name`, `discipline`, `pipelineStatus`, `reprocessing`) VALUES (1,1,'Mosflm','MX','automatic',0),(2,1,'EDNA','MX','automatic',0),(3,2,'Fast DP','MX','automatic',1),(4,2,'xia2/3dii','MX','deprecated',0),(5,2,'xia2/Multiplex','MX','automatic',1),(6,2,'xia2/DIALS','MX','optional',1),(7,2,'xia2/XDS','MX','optional',1),(8,2,'autoPROC','MX','optional',1),(9,3,'Fast EP','MX','automatic',0),(10,3,'Dimple','MX','automatic',0),(11,3,'MrBUMP','MX','automatic',0),(12,3,'Big EP/XDS','MX','automatic',0),(13,3,'Big EP/DIALS','MX','automatic',0); /*!40000 ALTER TABLE `ProcessingPipeline` ENABLE KEYS */; /*!40000 ALTER TABLE `BLSampleType` DISABLE KEYS */; -INSERT INTO `BLSampleType` (`blSampleTypeId`, `name`, `proposalType`, `active`) VALUES (1,'background','xpdf',1), -(2,'container','xpdf',1), -(3,'sample','xpdf',1), -(4,'calibrant','xpdf',1), -(5,'buffer','scm',1), -(6,'sample','scm',1), -(7,'sample','mx',1); +INSERT INTO `BLSampleType` (`blSampleTypeId`, `name`, `proposalType`, `active`) VALUES (1,'background','xpdf',1),(2,'container','xpdf',1),(3,'sample','xpdf',1),(4,'calibrant','xpdf',1),(5,'buffer','scm',1),(6,'sample','scm',1),(7,'sample','mx',1); /*!40000 ALTER TABLE `BLSampleType` ENABLE KEYS */; /*!40000 ALTER TABLE `PurificationColumn` DISABLE KEYS */; -INSERT INTO `PurificationColumn` (`purificationColumnId`, `name`, `active`) VALUES (1,'user supplied',1), -(2,'s75',1), -(3,'s200',1), -(4,'superose6',1), -(5,'kw402.5',1), -(6,'kw403',1), -(7,'kw404',1), -(8,'kw405',1); +INSERT INTO `PurificationColumn` (`purificationColumnId`, `name`, `active`) VALUES (1,'user supplied',1),(2,'s75',1),(3,'s200',1),(4,'superose6',1),(5,'kw402.5',1),(6,'kw403',1),(7,'kw404',1),(8,'kw405',1); /*!40000 ALTER TABLE `PurificationColumn` ENABLE KEYS */; /*!40000 ALTER TABLE `UserGroup` DISABLE KEYS */; -INSERT INTO `UserGroup` (`userGroupId`, `name`) VALUES (39,'autocollect'), -(17,'bag_stats'), -(20,'bl_stats'), -(45,'detector_admin'), -(8,'developers'), -(9,'ehc'), -(6,'em_admin'), -(10,'fault_admin'), -(50,'goods_handling'), -(53,'imaging_admin'), -(59,'mm_admin'), -(2,'mx_admin'), -(14,'pdb_stats'), -(4,'powder_admin'), -(47,'prop_admin'), -(3,'saxs_admin'), -(28,'ship_manage'), -(12,'sm_admin'), -(56,'spectroscopy_admin'), -(1,'super_admin'), -(24,'temp_mx_admin'), -(5,'tomo_admin'), -(11,'vmxi'), -(34,'xpdf_admin'); +INSERT INTO `UserGroup` (`userGroupId`, `name`) VALUES (39,'autocollect'),(17,'bag_stats'),(20,'bl_stats'),(45,'detector_admin'),(8,'developers'),(9,'ehc'),(6,'em_admin'),(10,'fault_admin'),(50,'goods_handling'),(53,'imaging_admin'),(59,'mm_admin'),(2,'mx_admin'),(14,'pdb_stats'),(4,'powder_admin'),(47,'prop_admin'),(3,'saxs_admin'),(28,'ship_manage'),(12,'sm_admin'),(56,'spectroscopy_admin'),(1,'super_admin'),(24,'temp_mx_admin'),(5,'tomo_admin'),(11,'vmxi'),(34,'xpdf_admin'); /*!40000 ALTER TABLE `UserGroup` ENABLE KEYS */; /*!40000 ALTER TABLE `Permission` DISABLE KEYS */; -INSERT INTO `Permission` (`permissionId`, `type`, `description`) VALUES (1,'mx_admin','MX Administrator'), -(2,'manage_groups','Manage User Groups'), -(4,'manage_perms','Manage User Group Permissions'), -(5,'global_stats','View Global Statistics'), -(6,'fault_view','View Fault Reports'), -(7,'saxs_admin','SAXS Administrator'), -(8,'em_admin','EM Administrator'), -(9,'gen_admin','Powder Admin'), -(10,'tomo_admin','Tomo Admin'), -(11,'super_admin','Site Admin'), -(12,'fault_global','Globally edit all faults'), -(13,'schedules','Manage Imaging Schedules'), -(15,'schedule_comps','Manage Imaging Schedule Components'), -(16,'imaging_dash','Imaging Dashboard'), -(17,'vmxi_queue','VMXi Data Collection Queue'), -(18,'sm_admin','Small Molecule Admin'), -(20,'pow_admin','Power Admin'), -(23,'all_dewars','View All Dewars'), -(26,'all_prop_stats','View All Proposal Stats'), -(29,'all_breakdown','View Aggregated Visit Breakdown Stats'), -(32,'disp_cont','VMXi Dispose Container'), -(37,'view_manifest','View Shipping Manifest'), -(43,'schedule_comp','typo fill in'), -(49,'xpdf_admin','XPDF Admin'), -(55,'edit_presets','Edit Beamline DC Presets'), -(58,'manage_params','Edit Beamline Parameter Limits'), -(64,'manage_detector','Manage Beamline Detector Limits'), -(69,'auto_dash','AutoCollect Dashboard'), -(77,'fault_admin','Edit Fault Categories'), -(80,'fault_add','Add New Fault Reports'); +INSERT INTO `Permission` (`permissionId`, `type`, `description`) VALUES (1,'mx_admin','MX Administrator'),(2,'manage_groups','Manage User Groups'),(4,'manage_perms','Manage User Group Permissions'),(5,'global_stats','View Global Statistics'),(6,'fault_view','View Fault Reports'),(7,'saxs_admin','SAXS Administrator'),(8,'em_admin','EM Administrator'),(9,'gen_admin','Powder Admin'),(10,'tomo_admin','Tomo Admin'),(11,'super_admin','Site Admin'),(12,'fault_global','Globally edit all faults'),(13,'schedules','Manage Imaging Schedules'),(15,'schedule_comps','Manage Imaging Schedule Components'),(16,'imaging_dash','Imaging Dashboard'),(17,'vmxi_queue','VMXi Data Collection Queue'),(18,'sm_admin','Small Molecule Admin'),(20,'pow_admin','Power Admin'),(23,'all_dewars','View All Dewars'),(26,'all_prop_stats','View All Proposal Stats'),(29,'all_breakdown','View Aggregated Visit Breakdown Stats'),(32,'disp_cont','VMXi Dispose Container'),(37,'view_manifest','View Shipping Manifest'),(43,'schedule_comp','typo fill in'),(49,'xpdf_admin','XPDF Admin'),(55,'edit_presets','Edit Beamline DC Presets'),(58,'manage_params','Edit Beamline Parameter Limits'),(64,'manage_detector','Manage Beamline Detector Limits'),(69,'auto_dash','AutoCollect Dashboard'),(77,'fault_admin','Edit Fault Categories'),(80,'fault_add','Add New Fault Reports'); /*!40000 ALTER TABLE `Permission` ENABLE KEYS */; /*!40000 ALTER TABLE `UserGroup_has_Permission` DISABLE KEYS */; -INSERT INTO `UserGroup_has_Permission` (`userGroupId`, `permissionId`) VALUES (1,1), -(1,7), -(1,8), -(1,9), -(1,10), -(1,11), -(1,18), -(1,20), -(1,23), -(1,49), -(2,1), -(2,6), -(2,23), -(2,80), -(3,7), -(3,23), -(4,20), -(5,10), -(6,8), -(6,23), -(8,1), -(8,2), -(8,4), -(8,6), -(8,7), -(8,8), -(8,9), -(8,10), -(8,11), -(8,18), -(8,20), -(8,23), -(8,26), -(8,29), -(8,37), -(8,49), -(9,1), -(9,6), -(10,12), -(10,77), -(11,13), -(11,15), -(11,16), -(11,17), -(11,32), -(11,43), -(11,55), -(11,58), -(11,64), -(12,18), -(14,1), -(17,26), -(20,29), -(24,1), -(28,23), -(28,37), -(34,49), -(39,69); +INSERT INTO `UserGroup_has_Permission` (`userGroupId`, `permissionId`) VALUES (1,1),(1,7),(1,8),(1,9),(1,10),(1,11),(1,18),(1,20),(1,23),(1,49),(2,1),(2,6),(2,23),(2,80),(3,7),(3,23),(4,20),(5,10),(6,8),(6,23),(8,1),(8,2),(8,4),(8,6),(8,7),(8,8),(8,9),(8,10),(8,11),(8,18),(8,20),(8,23),(8,26),(8,29),(8,37),(8,49),(9,1),(9,6),(10,12),(10,77),(11,13),(11,15),(11,16),(11,17),(11,32),(11,43),(11,55),(11,58),(11,64),(12,18),(14,1),(17,26),(20,29),(24,1),(28,23),(28,37),(34,49),(39,69); /*!40000 ALTER TABLE `UserGroup_has_Permission` ENABLE KEYS */; /*!40000 ALTER TABLE `ScanParametersService` DISABLE KEYS */; -INSERT INTO `ScanParametersService` (`scanParametersServiceId`, `name`, `description`) VALUES (4,'Temperature','Temperature in Celsius'), -(7,'Pressure','Pressure in pascal (Pa)'); +INSERT INTO `ScanParametersService` (`scanParametersServiceId`, `name`, `description`) VALUES (4,'Temperature','Temperature in Celsius'),(7,'Pressure','Pressure in pascal (Pa)'); /*!40000 ALTER TABLE `ScanParametersService` ENABLE KEYS */; /*!40000 ALTER TABLE `EventType` DISABLE KEYS */; -INSERT INTO `EventType` (`eventTypeId`, `name`) VALUES (3,'LaserExcitation'), -(4,'ReactionTrigger'), -(1,'XrayDetection'), -(2,'XrayExposure'); +INSERT INTO `EventType` (`eventTypeId`, `name`) VALUES (3,'LaserExcitation'),(4,'ReactionTrigger'),(1,'XrayDetection'),(2,'XrayExposure'); /*!40000 ALTER TABLE `EventType` ENABLE KEYS */; /*!40000 ALTER TABLE `LDAPSearchParameters` DISABLE KEYS */; diff --git a/schemas/ispyb/routines.sql b/schemas/ispyb/routines.sql index c9da2dc5..7d79befc 100644 --- a/schemas/ispyb/routines.sql +++ b/schemas/ispyb/routines.sql @@ -1,3 +1,4 @@ +/*M!999999\- enable the sandbox mode */ /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; @@ -130,7 +131,7 @@ DELIMITER ; /*!50003 SET character_set_results = utf8mb3 */ ; /*!50003 SET collation_connection = utf8mb3_general_ci */ ; DELIMITER ;; -CREATE FUNCTION `retrieve_proposal_title`(p_proposal_code varchar(5), p_proposal_number int) RETURNS varchar(255) CHARSET latin1 +CREATE FUNCTION `retrieve_proposal_title`(p_proposal_code varchar(5), p_proposal_number int) RETURNS varchar(255) CHARSET latin1 COLLATE latin1_swedish_ci READS SQL DATA BEGIN DECLARE ret_title varchar(255); @@ -155,7 +156,7 @@ DELIMITER ; /*!50003 SET character_set_results = utf8mb3 */ ; /*!50003 SET collation_connection = utf8mb3_general_ci */ ; DELIMITER ;; -CREATE FUNCTION `retrieve_proposal_title_v2`(p_proposalCode varchar(5), p_proposalNumber int) RETURNS varchar(255) CHARSET latin1 +CREATE FUNCTION `retrieve_proposal_title_v2`(p_proposalCode varchar(5), p_proposalNumber int) RETURNS varchar(255) CHARSET latin1 COLLATE latin1_swedish_ci READS SQL DATA COMMENT 'Retrieve the title for a given proposal code and number.' BEGIN @@ -206,7 +207,7 @@ DELIMITER ; /*!50003 SET character_set_results = utf8mb3 */ ; /*!50003 SET collation_connection = utf8mb3_general_ci */ ; DELIMITER ;; -CREATE FUNCTION `root_replace`(p_str varchar(255), p_oldroot varchar(255), p_newroot varchar(255)) RETURNS varchar(255) CHARSET latin1 +CREATE FUNCTION `root_replace`(p_str varchar(255), p_oldroot varchar(255), p_newroot varchar(255)) RETURNS varchar(255) CHARSET latin1 COLLATE latin1_swedish_ci COMMENT 'Returns a varchar where the old root p_oldroot (the leftmost part) of p_str has been replaced with a new root p_newroot' BEGIN DECLARE path_len smallint unsigned DEFAULT LENGTH(p_oldroot); @@ -12115,6 +12116,7 @@ DELIMITER ; /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; +/*M!999999\- enable the sandbox mode */ /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; diff --git a/schemas/ispyb/tables.sql b/schemas/ispyb/tables.sql index d68fca82..47cadebd 100644 --- a/schemas/ispyb/tables.sql +++ b/schemas/ispyb/tables.sql @@ -22,7 +22,7 @@ CREATE TABLE `AdminActivity` ( PRIMARY KEY (`adminActivityId`), UNIQUE KEY `username` (`username`), KEY `AdminActivity_FKAction` (`action`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `AdminVar`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -34,7 +34,7 @@ CREATE TABLE `AdminVar` ( PRIMARY KEY (`varId`), KEY `AdminVar_FKIndexName` (`name`), KEY `AdminVar_FKIndexValue` (`value`(767)) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMMENT='ISPyB administration values'; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='ISPyB administration values'; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `Aperture`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -43,7 +43,7 @@ CREATE TABLE `Aperture` ( `apertureId` int(10) unsigned NOT NULL AUTO_INCREMENT, `sizeX` float DEFAULT NULL, PRIMARY KEY (`apertureId`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `Atlas`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -57,7 +57,7 @@ CREATE TABLE `Atlas` ( PRIMARY KEY (`atlasId`), KEY `Atlas_fk_dataCollectionGroupId` (`dataCollectionGroupId`), CONSTRAINT `Atlas_fk_dataCollectionGroupId` FOREIGN KEY (`dataCollectionGroupId`) REFERENCES `DataCollectionGroup` (`dataCollectionGroupId`) ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='Atlas of a Cryo-EM grid'; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='Atlas of a Cryo-EM grid'; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `AutoProc`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -76,7 +76,7 @@ CREATE TABLE `AutoProc` ( PRIMARY KEY (`autoProcId`), KEY `AutoProc_FKIndex1` (`autoProcProgramId`), KEY `AutoProc_refined_unit_cell` (`refinedCell_a`,`refinedCell_b`,`refinedCell_c`,`refinedCell_alpha`,`refinedCell_beta`,`refinedCell_gamma`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `AutoProcIntegration`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -109,7 +109,7 @@ CREATE TABLE `AutoProcIntegration` ( KEY `AutoProcIntegration_FKIndex1` (`autoProcProgramId`), CONSTRAINT `AutoProcIntegration_ibfk_1` FOREIGN KEY (`dataCollectionId`) REFERENCES `DataCollection` (`dataCollectionId`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `AutoProcIntegration_ibfk_2` FOREIGN KEY (`autoProcProgramId`) REFERENCES `AutoProcProgram` (`autoProcProgramId`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `AutoProcProgram`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -129,7 +129,7 @@ CREATE TABLE `AutoProcProgram` ( PRIMARY KEY (`autoProcProgramId`), KEY `AutoProcProgram_FK2` (`processingJobId`), CONSTRAINT `AutoProcProgram_FK2` FOREIGN KEY (`processingJobId`) REFERENCES `ProcessingJob` (`processingJobId`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `AutoProcProgramAttachment`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -146,7 +146,7 @@ CREATE TABLE `AutoProcProgramAttachment` ( PRIMARY KEY (`autoProcProgramAttachmentId`), KEY `AutoProcProgramAttachmentIdx1` (`autoProcProgramId`), CONSTRAINT `AutoProcProgramAttachmentFk1` FOREIGN KEY (`autoProcProgramId`) REFERENCES `AutoProcProgram` (`autoProcProgramId`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `AutoProcProgramMessage`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -161,7 +161,7 @@ CREATE TABLE `AutoProcProgramMessage` ( PRIMARY KEY (`autoProcProgramMessageId`), KEY `AutoProcProgramMessage_fk1` (`autoProcProgramId`), CONSTRAINT `AutoProcProgramMessage_fk1` FOREIGN KEY (`autoProcProgramId`) REFERENCES `AutoProcProgram` (`autoProcProgramId`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `AutoProcScaling`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -174,7 +174,7 @@ CREATE TABLE `AutoProcScaling` ( KEY `AutoProcScalingFk1` (`autoProcId`), KEY `AutoProcScalingIdx1` (`autoProcScalingId`,`autoProcId`), CONSTRAINT `AutoProcScalingFk1` FOREIGN KEY (`autoProcId`) REFERENCES `AutoProc` (`autoProcId`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `AutoProcScalingStatistics`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -208,7 +208,7 @@ CREATE TABLE `AutoProcScalingStatistics` ( KEY `AutoProcScalingStatistics_FKindexType` (`scalingStatisticsType`), KEY `AutoProcScalingStatistics_scalingId_statisticsType` (`autoProcScalingId`,`scalingStatisticsType`), CONSTRAINT `_AutoProcScalingStatisticsFk1` FOREIGN KEY (`autoProcScalingId`) REFERENCES `AutoProcScaling` (`autoProcScalingId`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `AutoProcScaling_has_Int`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -223,7 +223,7 @@ CREATE TABLE `AutoProcScaling_has_Int` ( KEY `AutoProcScal_has_IntIdx2` (`autoProcIntegrationId`), CONSTRAINT `AutoProcScaling_has_IntFk1` FOREIGN KEY (`autoProcScalingId`) REFERENCES `AutoProcScaling` (`autoProcScalingId`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `AutoProcScaling_has_IntFk2` FOREIGN KEY (`autoProcIntegrationId`) REFERENCES `AutoProcIntegration` (`autoProcIntegrationId`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `AutoProcStatus`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -238,7 +238,7 @@ CREATE TABLE `AutoProcStatus` ( PRIMARY KEY (`autoProcStatusId`), KEY `AutoProcStatus_FKIndex1` (`autoProcIntegrationId`), CONSTRAINT `AutoProcStatus_ibfk_1` FOREIGN KEY (`autoProcIntegrationId`) REFERENCES `AutoProcIntegration` (`autoProcIntegrationId`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMMENT='AutoProcStatus table is linked to AutoProcIntegration'; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='AutoProcStatus table is linked to AutoProcIntegration'; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `BF_automationError`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -248,7 +248,7 @@ CREATE TABLE `BF_automationError` ( `errorType` varchar(40) NOT NULL, `solution` text DEFAULT NULL, PRIMARY KEY (`automationErrorId`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `BF_automationFault`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -266,7 +266,7 @@ CREATE TABLE `BF_automationFault` ( KEY `BF_automationFault_ibfk2` (`containerId`), CONSTRAINT `BF_automationFault_ibfk1` FOREIGN KEY (`automationErrorId`) REFERENCES `BF_automationError` (`automationErrorId`), CONSTRAINT `BF_automationFault_ibfk2` FOREIGN KEY (`containerId`) REFERENCES `Container` (`containerId`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `BF_component`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -279,7 +279,7 @@ CREATE TABLE `BF_component` ( PRIMARY KEY (`componentId`), KEY `bf_component_FK1` (`systemId`), CONSTRAINT `bf_component_FK1` FOREIGN KEY (`systemId`) REFERENCES `BF_system` (`systemId`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `BF_component_beamline`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -291,7 +291,7 @@ CREATE TABLE `BF_component_beamline` ( PRIMARY KEY (`component_beamlineId`), KEY `bf_component_beamline_FK1` (`componentId`), CONSTRAINT `bf_component_beamline_FK1` FOREIGN KEY (`componentId`) REFERENCES `BF_component` (`componentId`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `BF_fault`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -324,7 +324,7 @@ CREATE TABLE `BF_fault` ( CONSTRAINT `bf_fault_FK2` FOREIGN KEY (`subcomponentId`) REFERENCES `BF_subcomponent` (`subcomponentId`), CONSTRAINT `bf_fault_FK3` FOREIGN KEY (`personId`) REFERENCES `Person` (`personId`), CONSTRAINT `bf_fault_FK4` FOREIGN KEY (`assigneeId`) REFERENCES `Person` (`personId`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `BF_subcomponent`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -337,7 +337,7 @@ CREATE TABLE `BF_subcomponent` ( PRIMARY KEY (`subcomponentId`), KEY `bf_subcomponent_FK1` (`componentId`), CONSTRAINT `bf_subcomponent_FK1` FOREIGN KEY (`componentId`) REFERENCES `BF_component` (`componentId`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `BF_subcomponent_beamline`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -349,7 +349,7 @@ CREATE TABLE `BF_subcomponent_beamline` ( PRIMARY KEY (`subcomponent_beamlineId`), KEY `bf_subcomponent_beamline_FK1` (`subcomponentId`), CONSTRAINT `bf_subcomponent_beamline_FK1` FOREIGN KEY (`subcomponentId`) REFERENCES `BF_subcomponent` (`subcomponentId`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `BF_system`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -359,7 +359,7 @@ CREATE TABLE `BF_system` ( `name` varchar(100) DEFAULT NULL, `description` varchar(200) DEFAULT NULL, PRIMARY KEY (`systemId`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `BF_system_beamline`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -371,7 +371,7 @@ CREATE TABLE `BF_system_beamline` ( PRIMARY KEY (`system_beamlineId`), KEY `bf_system_beamline_FK1` (`systemId`), CONSTRAINT `bf_system_beamline_FK1` FOREIGN KEY (`systemId`) REFERENCES `BF_system` (`systemId`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `BFactorFit`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -385,7 +385,7 @@ CREATE TABLE `BFactorFit` ( PRIMARY KEY (`bFactorFitId`), KEY `BFactorFit_fk_particleClassificationId` (`particleClassificationId`), CONSTRAINT `BFactorFit_fk_particleClassificationId` FOREIGN KEY (`particleClassificationId`) REFERENCES `ParticleClassification` (`particleClassificationId`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='CryoEM reconstruction resolution as a function of the number of particles for the creation of a Rosenthal-Henderson plot and the calculation of B-factors'; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='CryoEM reconstruction resolution as a function of the number of particles for the creation of a Rosenthal-Henderson plot and the calculation of B-factors'; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `BLSample`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -445,7 +445,7 @@ CREATE TABLE `BLSample` ( CONSTRAINT `BLSample_ibfk_1` FOREIGN KEY (`containerId`) REFERENCES `Container` (`containerId`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `BLSample_ibfk_2` FOREIGN KEY (`crystalId`) REFERENCES `Crystal` (`crystalId`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `BLSample_ibfk_3` FOREIGN KEY (`diffractionPlanId`) REFERENCES `DiffractionPlan` (`diffractionPlanId`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `BLSampleGroup`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -460,7 +460,7 @@ CREATE TABLE `BLSampleGroup` ( KEY `BLSampleGroup_fk_ownerId` (`ownerId`), CONSTRAINT `BLSampleGroup_fk_ownerId` FOREIGN KEY (`ownerId`) REFERENCES `Person` (`personId`) ON UPDATE CASCADE, CONSTRAINT `BLSampleGroup_fk_proposalId` FOREIGN KEY (`proposalId`) REFERENCES `Proposal` (`proposalId`) ON DELETE SET NULL ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `BLSampleGroup_has_BLSample`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -477,7 +477,7 @@ CREATE TABLE `BLSampleGroup_has_BLSample` ( CONSTRAINT `BLSampleGroup_has_BLSample_ibfk1` FOREIGN KEY (`blSampleGroupId`) REFERENCES `BLSampleGroup` (`blSampleGroupId`), CONSTRAINT `BLSampleGroup_has_BLSample_ibfk2` FOREIGN KEY (`blSampleId`) REFERENCES `BLSample` (`blSampleId`), CONSTRAINT `BLSampleGroup_has_BLSample_ibfk3` FOREIGN KEY (`blSampleTypeId`) REFERENCES `BLSampleType` (`blSampleTypeId`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `BLSampleImage`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -503,7 +503,7 @@ CREATE TABLE `BLSampleImage` ( CONSTRAINT `BLSampleImage_fk1` FOREIGN KEY (`blSampleId`) REFERENCES `BLSample` (`blSampleId`) ON DELETE NO ACTION ON UPDATE NO ACTION, CONSTRAINT `BLSampleImage_fk2` FOREIGN KEY (`containerInspectionId`) REFERENCES `ContainerInspection` (`containerInspectionId`), CONSTRAINT `BLSampleImage_fk3` FOREIGN KEY (`blSampleImageScoreId`) REFERENCES `BLSampleImageScore` (`blSampleImageScoreId`) ON DELETE NO ACTION ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `BLSampleImageAnalysis`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -523,7 +523,7 @@ CREATE TABLE `BLSampleImageAnalysis` ( PRIMARY KEY (`blSampleImageAnalysisId`), KEY `BLSampleImageAnalysis_ibfk1` (`blSampleImageId`), CONSTRAINT `BLSampleImageAnalysis_ibfk1` FOREIGN KEY (`blSampleImageId`) REFERENCES `BLSampleImage` (`blSampleImageId`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `BLSampleImageAutoScoreClass`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -535,7 +535,7 @@ CREATE TABLE `BLSampleImageAutoScoreClass` ( PRIMARY KEY (`blSampleImageAutoScoreClassId`), KEY `BLSampleImageAutoScoreClass_fk1` (`blSampleImageAutoScoreSchemaId`), CONSTRAINT `BLSampleImageAutoScoreClass_fk1` FOREIGN KEY (`blSampleImageAutoScoreSchemaId`) REFERENCES `BLSampleImageAutoScoreSchema` (`blSampleImageAutoScoreSchemaId`) ON DELETE NO ACTION ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMMENT='The automated scoring classes - the thing being scored'; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='The automated scoring classes - the thing being scored'; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `BLSampleImageAutoScoreSchema`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -545,7 +545,7 @@ CREATE TABLE `BLSampleImageAutoScoreSchema` ( `schemaName` varchar(25) NOT NULL COMMENT 'Name of the schema e.g. Hampton, MARCO', `enabled` tinyint(1) DEFAULT 1 COMMENT 'Whether this schema is enabled (could be configurable in the UI)', PRIMARY KEY (`blSampleImageAutoScoreSchemaId`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMMENT='Scoring schema name and whether it is enabled'; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='Scoring schema name and whether it is enabled'; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `BLSampleImageMeasurement`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -564,7 +564,7 @@ CREATE TABLE `BLSampleImageMeasurement` ( KEY `BLSampleImageMeasurement_ibfk_2` (`blSubSampleId`), CONSTRAINT `BLSampleImageMeasurement_ibfk_1` FOREIGN KEY (`blSampleImageId`) REFERENCES `BLSampleImage` (`blSampleImageId`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `BLSampleImageMeasurement_ibfk_2` FOREIGN KEY (`blSubSampleId`) REFERENCES `BLSubSample` (`blSubSampleId`) ON DELETE NO ACTION ON UPDATE NO ACTION -) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMMENT='For measuring crystal growth over time'; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='For measuring crystal growth over time'; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `BLSampleImageScore`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -575,7 +575,7 @@ CREATE TABLE `BLSampleImageScore` ( `score` float DEFAULT NULL, `colour` varchar(15) DEFAULT NULL, PRIMARY KEY (`blSampleImageScoreId`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `BLSampleImage_has_AutoScoreClass`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -588,7 +588,7 @@ CREATE TABLE `BLSampleImage_has_AutoScoreClass` ( KEY `BLSampleImage_has_AutoScoreClass_fk2` (`blSampleImageAutoScoreClassId`), CONSTRAINT `BLSampleImage_has_AutoScoreClass_fk1` FOREIGN KEY (`blSampleImageId`) REFERENCES `BLSampleImage` (`blSampleImageId`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `BLSampleImage_has_AutoScoreClass_fk2` FOREIGN KEY (`blSampleImageAutoScoreClassId`) REFERENCES `BLSampleImageAutoScoreClass` (`blSampleImageAutoScoreClassId`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMMENT='Many-to-many relationship between drop images and thing being scored, as well as the actual probability (score) that the drop image contains that thing'; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='Many-to-many relationship between drop images and thing being scored, as well as the actual probability (score) that the drop image contains that thing'; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `BLSampleImage_has_Positioner`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -603,7 +603,7 @@ CREATE TABLE `BLSampleImage_has_Positioner` ( KEY `BLSampleImageHasPositioner_ibfk2` (`positionerId`), CONSTRAINT `BLSampleImageHasPositioner_ibfk1` FOREIGN KEY (`blSampleImageId`) REFERENCES `BLSampleImage` (`blSampleImageId`), CONSTRAINT `BLSampleImageHasPositioner_ibfk2` FOREIGN KEY (`positionerId`) REFERENCES `Positioner` (`positionerId`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='Allows a BLSampleImage to store motor positions along with the image'; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='Allows a BLSampleImage to store motor positions along with the image'; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `BLSampleType`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -614,7 +614,7 @@ CREATE TABLE `BLSampleType` ( `proposalType` varchar(10) DEFAULT NULL, `active` tinyint(1) DEFAULT 1 COMMENT '1=active, 0=inactive', PRIMARY KEY (`blSampleTypeId`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `BLSampleType_has_Component`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -627,7 +627,7 @@ CREATE TABLE `BLSampleType_has_Component` ( KEY `blSampleType_has_Component_fk2` (`componentId`), CONSTRAINT `blSampleType_has_Component_fk1` FOREIGN KEY (`blSampleTypeId`) REFERENCES `Crystal` (`crystalId`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `blSampleType_has_Component_fk2` FOREIGN KEY (`componentId`) REFERENCES `Protein` (`proteinId`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `BLSample_has_DataCollectionPlan`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -640,7 +640,7 @@ CREATE TABLE `BLSample_has_DataCollectionPlan` ( KEY `BLSample_has_DataCollectionPlan_ibfk2` (`dataCollectionPlanId`), CONSTRAINT `BLSample_has_DataCollectionPlan_ibfk1` FOREIGN KEY (`blSampleId`) REFERENCES `BLSample` (`blSampleId`), CONSTRAINT `BLSample_has_DataCollectionPlan_ibfk2` FOREIGN KEY (`dataCollectionPlanId`) REFERENCES `DiffractionPlan` (`diffractionPlanId`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `BLSample_has_EnergyScan`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -654,7 +654,7 @@ CREATE TABLE `BLSample_has_EnergyScan` ( KEY `BLSample_has_EnergyScan_FKIndex2` (`energyScanId`), CONSTRAINT `BLSample_has_EnergyScan_ibfk_1` FOREIGN KEY (`blSampleId`) REFERENCES `BLSample` (`blSampleId`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `BLSample_has_EnergyScan_ibfk_2` FOREIGN KEY (`energyScanId`) REFERENCES `EnergyScan` (`energyScanId`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `BLSample_has_Positioner`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -668,7 +668,7 @@ CREATE TABLE `BLSample_has_Positioner` ( KEY `BLSampleHasPositioner_ibfk2` (`positionerId`), CONSTRAINT `BLSampleHasPositioner_ibfk1` FOREIGN KEY (`blSampleId`) REFERENCES `BLSample` (`blSampleId`), CONSTRAINT `BLSampleHasPositioner_ibfk2` FOREIGN KEY (`positionerId`) REFERENCES `Positioner` (`positionerId`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `BLSession`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -702,7 +702,7 @@ CREATE TABLE `BLSession` ( CONSTRAINT `BLSession_fk_beamCalendarId` FOREIGN KEY (`beamCalendarId`) REFERENCES `BeamCalendar` (`beamCalendarId`) ON DELETE SET NULL ON UPDATE CASCADE, CONSTRAINT `BLSession_ibfk_1` FOREIGN KEY (`proposalId`) REFERENCES `Proposal` (`proposalId`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `BLSession_ibfk_2` FOREIGN KEY (`beamLineSetupId`) REFERENCES `BeamLineSetup` (`beamLineSetupId`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `BLSession_has_SCPosition`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -715,7 +715,7 @@ CREATE TABLE `BLSession_has_SCPosition` ( PRIMARY KEY (`blsessionhasscpositionid`), KEY `blsession_has_scposition_FK1` (`blsessionid`), CONSTRAINT `blsession_has_scposition_FK1` FOREIGN KEY (`blsessionid`) REFERENCES `BLSession` (`sessionId`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `BLSubSample`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -748,7 +748,7 @@ CREATE TABLE `BLSubSample` ( CONSTRAINT `BLSubSample_motorPositionfk_1` FOREIGN KEY (`motorPositionId`) REFERENCES `MotorPosition` (`motorPositionId`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `BLSubSample_positionfk_1` FOREIGN KEY (`positionId`) REFERENCES `Position` (`positionId`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `BLSubSample_positionfk_2` FOREIGN KEY (`position2Id`) REFERENCES `Position` (`positionId`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `BLSubSample_has_Positioner`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -762,7 +762,7 @@ CREATE TABLE `BLSubSample_has_Positioner` ( KEY `BLSubSampleHasPositioner_ibfk2` (`positionerId`), CONSTRAINT `BLSubSampleHasPositioner_ibfk1` FOREIGN KEY (`blSubSampleId`) REFERENCES `BLSubSample` (`blSubSampleId`), CONSTRAINT `BLSubSampleHasPositioner_ibfk2` FOREIGN KEY (`positionerId`) REFERENCES `Positioner` (`positionerId`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `BeamApertures`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -777,7 +777,7 @@ CREATE TABLE `BeamApertures` ( PRIMARY KEY (`beamAperturesid`), KEY `beamapertures_FK1` (`beamlineStatsId`), CONSTRAINT `beamapertures_FK1` FOREIGN KEY (`beamlineStatsId`) REFERENCES `BeamlineStats` (`beamlineStatsId`) ON DELETE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `BeamCalendar`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -789,7 +789,7 @@ CREATE TABLE `BeamCalendar` ( `startDate` datetime NOT NULL, `endDate` datetime NOT NULL, PRIMARY KEY (`beamCalendarId`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `BeamCentres`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -803,7 +803,7 @@ CREATE TABLE `BeamCentres` ( PRIMARY KEY (`beamCentresid`), KEY `beamCentres_FK1` (`beamlineStatsId`), CONSTRAINT `beamCentres_FK1` FOREIGN KEY (`beamlineStatsId`) REFERENCES `BeamlineStats` (`beamlineStatsId`) ON DELETE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `BeamLineSetup`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -860,7 +860,7 @@ CREATE TABLE `BeamLineSetup` ( PRIMARY KEY (`beamLineSetupId`), KEY `BeamLineSetup_ibfk_1` (`detectorId`), CONSTRAINT `BeamLineSetup_ibfk_1` FOREIGN KEY (`detectorId`) REFERENCES `Detector` (`detectorId`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `BeamlineAction`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -878,7 +878,7 @@ CREATE TABLE `BeamlineAction` ( PRIMARY KEY (`beamlineActionId`), KEY `BeamlineAction_ibfk1` (`sessionId`), CONSTRAINT `BeamlineAction_ibfk1` FOREIGN KEY (`sessionId`) REFERENCES `BLSession` (`sessionId`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `BeamlineStats`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -896,7 +896,7 @@ CREATE TABLE `BeamlineStats` ( `scanFileW` varchar(255) DEFAULT NULL, `scanFileH` varchar(255) DEFAULT NULL, PRIMARY KEY (`beamlineStatsId`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `CTF`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -925,7 +925,7 @@ CREATE TABLE `CTF` ( KEY `CTF_ibfk2` (`autoProcProgramId`), CONSTRAINT `CTF_ibfk1` FOREIGN KEY (`motionCorrectionId`) REFERENCES `MotionCorrection` (`motionCorrectionId`), CONSTRAINT `CTF_ibfk2` FOREIGN KEY (`autoProcProgramId`) REFERENCES `AutoProcProgram` (`autoProcProgramId`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `CalendarHash`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -936,7 +936,7 @@ CREATE TABLE `CalendarHash` ( `hash` varchar(128) DEFAULT NULL, `beamline` tinyint(1) DEFAULT NULL, PRIMARY KEY (`calendarHashId`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMMENT='Lets people get to their calendars without logging in using a private (hash) url'; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='Lets people get to their calendars without logging in using a private (hash) url'; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `Component`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -952,7 +952,7 @@ CREATE TABLE `Component` ( KEY `proposalId` (`proposalId`), CONSTRAINT `Component_ibfk_1` FOREIGN KEY (`componentTypeId`) REFERENCES `ComponentType` (`componentTypeId`), CONSTRAINT `Component_ibfk_2` FOREIGN KEY (`proposalId`) REFERENCES `Proposal` (`proposalId`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='Description of a component that can be used inside a crystal or a sample.'; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='Description of a component that can be used inside a crystal or a sample.'; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `ComponentLattice`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -970,7 +970,7 @@ CREATE TABLE `ComponentLattice` ( PRIMARY KEY (`componentLatticeId`), KEY `ComponentLattice_ibfk1` (`componentId`), CONSTRAINT `ComponentLattice_ibfk1` FOREIGN KEY (`componentId`) REFERENCES `Protein` (`proteinId`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `ComponentSubType`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -982,7 +982,7 @@ CREATE TABLE `ComponentSubType` ( `proposalType` varchar(10) DEFAULT NULL, `active` tinyint(1) DEFAULT 1 COMMENT '1=active, 0=inactive', PRIMARY KEY (`componentSubTypeId`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `ComponentType`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -992,7 +992,7 @@ CREATE TABLE `ComponentType` ( `name` varchar(31) NOT NULL, PRIMARY KEY (`componentTypeId`), UNIQUE KEY `name` (`name`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `Component_has_SubType`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -1004,7 +1004,7 @@ CREATE TABLE `Component_has_SubType` ( KEY `component_has_SubType_fk2` (`componentSubTypeId`), CONSTRAINT `component_has_SubType_fk1` FOREIGN KEY (`componentId`) REFERENCES `Protein` (`proteinId`) ON DELETE CASCADE, CONSTRAINT `component_has_SubType_fk2` FOREIGN KEY (`componentSubTypeId`) REFERENCES `ComponentSubType` (`componentSubTypeId`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `ConcentrationType`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -1016,7 +1016,7 @@ CREATE TABLE `ConcentrationType` ( `proposalType` varchar(10) DEFAULT NULL, `active` tinyint(1) DEFAULT 1 COMMENT '1=active, 0=inactive', PRIMARY KEY (`concentrationTypeId`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `Container`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -1080,7 +1080,7 @@ CREATE TABLE `Container` ( CONSTRAINT `Container_ibfk8` FOREIGN KEY (`containerRegistryId`) REFERENCES `ContainerRegistry` (`containerRegistryId`), CONSTRAINT `Container_ibfk9` FOREIGN KEY (`priorityPipelineId`) REFERENCES `ProcessingPipeline` (`processingPipelineId`), CONSTRAINT `Container_ibfk_1` FOREIGN KEY (`dewarId`) REFERENCES `Dewar` (`dewarId`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `ContainerHistory`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -1098,7 +1098,7 @@ CREATE TABLE `ContainerHistory` ( KEY `ContainerHistory_fk_dewarId` (`currentDewarId`), CONSTRAINT `ContainerHistory_fk_dewarId` FOREIGN KEY (`currentDewarId`) REFERENCES `Dewar` (`dewarId`), CONSTRAINT `ContainerHistory_ibfk1` FOREIGN KEY (`containerId`) REFERENCES `Container` (`containerId`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `ContainerInspection`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -1125,7 +1125,7 @@ CREATE TABLE `ContainerInspection` ( CONSTRAINT `ContainerInspection_fk2` FOREIGN KEY (`inspectionTypeId`) REFERENCES `InspectionType` (`inspectionTypeId`) ON DELETE NO ACTION ON UPDATE NO ACTION, CONSTRAINT `ContainerInspection_fk3` FOREIGN KEY (`imagerId`) REFERENCES `Imager` (`imagerId`) ON DELETE NO ACTION ON UPDATE NO ACTION, CONSTRAINT `ContainerInspection_fk4` FOREIGN KEY (`scheduleComponentid`) REFERENCES `ScheduleComponent` (`scheduleComponentId`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `ContainerQueue`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -1142,7 +1142,7 @@ CREATE TABLE `ContainerQueue` ( KEY `ContainerQueue_idx1` (`containerId`,`completedTimeStamp`), CONSTRAINT `ContainerQueue_ibfk1` FOREIGN KEY (`containerId`) REFERENCES `Container` (`containerId`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `ContainerQueue_ibfk2` FOREIGN KEY (`personId`) REFERENCES `Person` (`personId`) ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `ContainerQueueSample`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -1165,7 +1165,7 @@ CREATE TABLE `ContainerQueueSample` ( CONSTRAINT `ContainerQueueSample_dataCollectionPlanId` FOREIGN KEY (`dataCollectionPlanId`) REFERENCES `DiffractionPlan` (`diffractionPlanId`) ON DELETE NO ACTION ON UPDATE NO ACTION, CONSTRAINT `ContainerQueueSample_ibfk1` FOREIGN KEY (`containerQueueId`) REFERENCES `ContainerQueue` (`containerQueueId`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `ContainerQueueSample_ibfk2` FOREIGN KEY (`blSubSampleId`) REFERENCES `BLSubSample` (`blSubSampleId`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `ContainerRegistry`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -1177,7 +1177,7 @@ CREATE TABLE `ContainerRegistry` ( `recordTimestamp` datetime DEFAULT current_timestamp(), PRIMARY KEY (`containerRegistryId`), UNIQUE KEY `ContainerRegistry_uniq_barcode` (`barcode`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `ContainerRegistry_has_Proposal`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -1195,7 +1195,7 @@ CREATE TABLE `ContainerRegistry_has_Proposal` ( CONSTRAINT `ContainerRegistry_has_Proposal_ibfk1` FOREIGN KEY (`containerRegistryId`) REFERENCES `ContainerRegistry` (`containerRegistryId`), CONSTRAINT `ContainerRegistry_has_Proposal_ibfk2` FOREIGN KEY (`proposalId`) REFERENCES `Proposal` (`proposalId`), CONSTRAINT `ContainerRegistry_has_Proposal_ibfk3` FOREIGN KEY (`personId`) REFERENCES `Person` (`personId`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `ContainerReport`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -1212,7 +1212,7 @@ CREATE TABLE `ContainerReport` ( KEY `ContainerReport_ibfk2` (`personId`), CONSTRAINT `ContainerReport_ibfk1` FOREIGN KEY (`containerRegistryId`) REFERENCES `ContainerRegistry` (`containerRegistryId`), CONSTRAINT `ContainerReport_ibfk2` FOREIGN KEY (`personId`) REFERENCES `Person` (`personId`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `ContainerType`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -1232,7 +1232,7 @@ CREATE TABLE `ContainerType` ( `dropOffsetY` float DEFAULT NULL, `wellDrop` smallint(6) DEFAULT NULL, PRIMARY KEY (`containerTypeId`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMMENT='A lookup table for different types of containers'; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='A lookup table for different types of containers'; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `CourierTermsAccepted`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -1251,7 +1251,7 @@ CREATE TABLE `CourierTermsAccepted` ( CONSTRAINT `CourierTermsAccepted_ibfk_1` FOREIGN KEY (`proposalId`) REFERENCES `Proposal` (`proposalId`), CONSTRAINT `CourierTermsAccepted_ibfk_2` FOREIGN KEY (`personId`) REFERENCES `Person` (`personId`), CONSTRAINT `CourierTermsAccepted_ibfk_3` FOREIGN KEY (`shippingId`) REFERENCES `Shipping` (`shippingId`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMMENT='Records acceptances of the courier T and C'; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='Records acceptances of the courier T and C'; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `CryoemInitialModel`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -1261,7 +1261,7 @@ CREATE TABLE `CryoemInitialModel` ( `resolution` float DEFAULT NULL COMMENT 'Unit: Angstroms', `numberOfParticles` int(10) unsigned DEFAULT NULL, PRIMARY KEY (`cryoemInitialModelId`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMMENT='Initial cryo-EM model generation results'; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='Initial cryo-EM model generation results'; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `Crystal`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -1295,7 +1295,7 @@ CREATE TABLE `Crystal` ( KEY `Crystal_FKIndex2` (`diffractionPlanId`), CONSTRAINT `Crystal_ibfk_1` FOREIGN KEY (`proteinId`) REFERENCES `Protein` (`proteinId`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `Crystal_ibfk_2` FOREIGN KEY (`diffractionPlanId`) REFERENCES `DiffractionPlan` (`diffractionPlanId`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `CrystalComposition`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -1315,7 +1315,7 @@ CREATE TABLE `CrystalComposition` ( CONSTRAINT `CrystalComposition_ibfk_1` FOREIGN KEY (`componentId`) REFERENCES `Component` (`componentId`), CONSTRAINT `CrystalComposition_ibfk_2` FOREIGN KEY (`crystalId`) REFERENCES `Crystal` (`crystalId`), CONSTRAINT `CrystalComposition_ibfk_3` FOREIGN KEY (`concentrationTypeId`) REFERENCES `ConcentrationType` (`concentrationTypeId`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='Links a crystal to its components with a specified abundance or ratio.'; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='Links a crystal to its components with a specified abundance or ratio.'; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `Crystal_has_UUID`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -1329,7 +1329,7 @@ CREATE TABLE `Crystal_has_UUID` ( KEY `Crystal_has_UUID_FKIndex1` (`crystalId`), KEY `Crystal_has_UUID_FKIndex2` (`UUID`), CONSTRAINT `ibfk_1` FOREIGN KEY (`crystalId`) REFERENCES `Crystal` (`crystalId`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `DataAcquisition`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -1342,7 +1342,7 @@ CREATE TABLE `DataAcquisition` ( `waitTime` varchar(45) DEFAULT NULL, `detectorDistance` varchar(45) DEFAULT NULL, PRIMARY KEY (`dataAcquisitionId`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `DataCollection`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -1473,7 +1473,7 @@ CREATE TABLE `DataCollection` ( CONSTRAINT `DataCollection_ibfk_6` FOREIGN KEY (`startPositionId`) REFERENCES `MotorPosition` (`motorPositionId`), CONSTRAINT `DataCollection_ibfk_7` FOREIGN KEY (`endPositionId`) REFERENCES `MotorPosition` (`motorPositionId`), CONSTRAINT `DataCollection_ibfk_8` FOREIGN KEY (`blSubSampleId`) REFERENCES `BLSubSample` (`blSubSampleId`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `DataCollectionComment`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -1490,7 +1490,7 @@ CREATE TABLE `DataCollectionComment` ( KEY `dataCollectionComment_fk2` (`personId`), CONSTRAINT `dataCollectionComment_fk1` FOREIGN KEY (`dataCollectionId`) REFERENCES `DataCollection` (`dataCollectionId`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `dataCollectionComment_fk2` FOREIGN KEY (`personId`) REFERENCES `Person` (`personId`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `DataCollectionFileAttachment`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -1504,7 +1504,7 @@ CREATE TABLE `DataCollectionFileAttachment` ( PRIMARY KEY (`dataCollectionFileAttachmentId`), KEY `_dataCollectionFileAttachmentId_fk1` (`dataCollectionId`), CONSTRAINT `_dataCollectionFileAttachmentId_fk1` FOREIGN KEY (`dataCollectionId`) REFERENCES `DataCollection` (`dataCollectionId`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `DataCollectionGroup`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -1533,7 +1533,7 @@ CREATE TABLE `DataCollectionGroup` ( CONSTRAINT `DataCollectionGroup_ibfk_1` FOREIGN KEY (`blSampleId`) REFERENCES `BLSample` (`blSampleId`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `DataCollectionGroup_ibfk_2` FOREIGN KEY (`sessionId`) REFERENCES `BLSession` (`sessionId`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `DataCollectionGroup_ibfk_4` FOREIGN KEY (`experimentTypeId`) REFERENCES `ExperimentType` (`experimentTypeId`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMMENT='a dataCollectionGroup is a group of dataCollection for a spe'; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='a dataCollectionGroup is a group of dataCollection for a spe'; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `DataCollectionPlan_has_Detector`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -1550,7 +1550,7 @@ CREATE TABLE `DataCollectionPlan_has_Detector` ( KEY `DataCollectionPlan_has_Detector_ibfk2` (`detectorId`), CONSTRAINT `DataCollectionPlan_has_Detector_ibfk1` FOREIGN KEY (`dataCollectionPlanId`) REFERENCES `DiffractionPlan` (`diffractionPlanId`), CONSTRAINT `DataCollectionPlan_has_Detector_ibfk2` FOREIGN KEY (`detectorId`) REFERENCES `Detector` (`detectorId`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `Detector`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -1586,7 +1586,7 @@ CREATE TABLE `Detector` ( PRIMARY KEY (`detectorId`), UNIQUE KEY `Detector_ibuk1` (`detectorSerialNumber`), KEY `Detector_FKIndex1` (`detectorType`,`detectorManufacturer`,`detectorModel`,`detectorPixelSizeHorizontal`,`detectorPixelSizeVertical`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMMENT='Detector table is linked to a dataCollection'; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='Detector table is linked to a dataCollection'; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `Dewar`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -1621,7 +1621,7 @@ CREATE TABLE `Dewar` ( KEY `Dewar_FKIndexStatus` (`dewarStatus`), CONSTRAINT `Dewar_fk_firstExperimentId` FOREIGN KEY (`firstExperimentId`) REFERENCES `BLSession` (`sessionId`) ON DELETE SET NULL ON UPDATE CASCADE, CONSTRAINT `Dewar_ibfk_1` FOREIGN KEY (`shippingId`) REFERENCES `Shipping` (`shippingId`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `DewarLocation`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -1635,7 +1635,7 @@ CREATE TABLE `DewarLocation` ( `courierName` varchar(128) DEFAULT NULL COMMENT 'Carrier name who''s shipping back the dewar', `courierTrackingNumber` varchar(128) DEFAULT NULL COMMENT 'Tracking number of the shippment', PRIMARY KEY (`eventId`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMMENT='ISPyB Dewar location table'; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='ISPyB Dewar location table'; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `DewarLocationList`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -1644,7 +1644,7 @@ CREATE TABLE `DewarLocationList` ( `locationId` int(10) unsigned NOT NULL AUTO_INCREMENT, `locationName` varchar(128) NOT NULL DEFAULT '' COMMENT 'Location', PRIMARY KEY (`locationId`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMMENT='List of locations for dewars'; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='List of locations for dewars'; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `DewarRegistry`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -1663,7 +1663,7 @@ CREATE TABLE `DewarRegistry` ( KEY `DewarRegistry_ibfk_2` (`labContactId`), CONSTRAINT `DewarRegistry_ibfk_1` FOREIGN KEY (`proposalId`) REFERENCES `Proposal` (`proposalId`) ON DELETE NO ACTION ON UPDATE CASCADE, CONSTRAINT `DewarRegistry_ibfk_2` FOREIGN KEY (`labContactId`) REFERENCES `LabContact` (`labContactId`) ON DELETE SET NULL ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `DewarRegistry_has_Proposal`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -1684,7 +1684,7 @@ CREATE TABLE `DewarRegistry_has_Proposal` ( CONSTRAINT `DewarRegistry_has_Proposal_ibfk2` FOREIGN KEY (`proposalId`) REFERENCES `Proposal` (`proposalId`), CONSTRAINT `DewarRegistry_has_Proposal_ibfk3` FOREIGN KEY (`personId`) REFERENCES `Person` (`personId`), CONSTRAINT `DewarRegistry_has_Proposal_ibfk4` FOREIGN KEY (`labContactId`) REFERENCES `LabContact` (`labContactId`) ON DELETE NO ACTION ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `DewarReport`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -1698,7 +1698,7 @@ CREATE TABLE `DewarReport` ( PRIMARY KEY (`dewarReportId`), KEY `DewarReportIdx1` (`facilityCode`), CONSTRAINT `DewarReport_ibfk_1` FOREIGN KEY (`facilityCode`) REFERENCES `DewarRegistry` (`facilityCode`) ON DELETE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `DewarTransportHistory`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -1712,7 +1712,7 @@ CREATE TABLE `DewarTransportHistory` ( PRIMARY KEY (`DewarTransportHistoryId`), KEY `DewarTransportHistory_FKIndex1` (`dewarId`), CONSTRAINT `DewarTransportHistory_ibfk_1` FOREIGN KEY (`dewarId`) REFERENCES `Dewar` (`dewarId`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `DiffractionPlan`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -1790,7 +1790,7 @@ CREATE TABLE `DiffractionPlan` ( CONSTRAINT `DiffractionPlan_ibfk1` FOREIGN KEY (`presetForProposalId`) REFERENCES `Proposal` (`proposalId`), CONSTRAINT `DiffractionPlan_ibfk2` FOREIGN KEY (`purificationColumnId`) REFERENCES `PurificationColumn` (`purificationColumnId`), CONSTRAINT `DiffractionPlan_ibfk3` FOREIGN KEY (`experimentTypeId`) REFERENCES `ExperimentType` (`experimentTypeId`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `EnergyScan`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -1837,7 +1837,7 @@ CREATE TABLE `EnergyScan` ( CONSTRAINT `ES_ibfk_1` FOREIGN KEY (`sessionId`) REFERENCES `BLSession` (`sessionId`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `ES_ibfk_2` FOREIGN KEY (`blSampleId`) REFERENCES `BLSample` (`blSampleId`), CONSTRAINT `ES_ibfk_3` FOREIGN KEY (`blSubSampleId`) REFERENCES `BLSubSample` (`blSubSampleId`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `Event`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -1859,7 +1859,7 @@ CREATE TABLE `Event` ( CONSTRAINT `Event_ibfk_1` FOREIGN KEY (`eventChainId`) REFERENCES `EventChain` (`eventChainId`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `Event_ibfk_2` FOREIGN KEY (`componentId`) REFERENCES `Component` (`componentId`), CONSTRAINT `Event_ibfk_3` FOREIGN KEY (`eventTypeId`) REFERENCES `EventType` (`eventTypeId`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='Describes an event that occurred during a data collection and should be taken into account for data analysis. Can optionally be repeated at a specified frequency.'; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='Describes an event that occurred during a data collection and should be taken into account for data analysis. Can optionally be repeated at a specified frequency.'; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `EventChain`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -1871,7 +1871,7 @@ CREATE TABLE `EventChain` ( PRIMARY KEY (`eventChainId`), KEY `dataCollectionId` (`dataCollectionId`), CONSTRAINT `EventChain_ibfk_1` FOREIGN KEY (`dataCollectionId`) REFERENCES `DataCollection` (`dataCollectionId`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='Groups events together in a data collection.'; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='Groups events together in a data collection.'; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `EventType`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -1881,7 +1881,7 @@ CREATE TABLE `EventType` ( `name` varchar(30) NOT NULL, PRIMARY KEY (`eventTypeId`), UNIQUE KEY `name` (`name`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='Defines the list of event types which can occur during a data collection.'; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='Defines the list of event types which can occur during a data collection.'; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `ExperimentKindDetails`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -1896,7 +1896,7 @@ CREATE TABLE `ExperimentKindDetails` ( PRIMARY KEY (`experimentKindId`), KEY `ExperimentKindDetails_FKIndex1` (`diffractionPlanId`), CONSTRAINT `EKD_ibfk_1` FOREIGN KEY (`diffractionPlanId`) REFERENCES `DiffractionPlan` (`diffractionPlanId`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `ExperimentType`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -1907,7 +1907,7 @@ CREATE TABLE `ExperimentType` ( `proposalType` varchar(10) DEFAULT NULL, `active` tinyint(1) DEFAULT 1 COMMENT '1=active, 0=inactive', PRIMARY KEY (`experimentTypeId`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMMENT='A lookup table for different types of experients'; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='A lookup table for different types of experients'; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `FoilHole`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -1927,7 +1927,7 @@ CREATE TABLE `FoilHole` ( PRIMARY KEY (`foilHoleId`), KEY `FoilHole_fk_gridSquareId` (`gridSquareId`), CONSTRAINT `FoilHole_fk_gridSquareId` FOREIGN KEY (`gridSquareId`) REFERENCES `GridSquare` (`gridSquareId`) ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='Details of a Cryo-EM foil hole within a grid square including image captured at foil hole magnification if applicable'; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='Details of a Cryo-EM foil hole within a grid square including image captured at foil hole magnification if applicable'; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `GeometryClassname`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -1937,7 +1937,7 @@ CREATE TABLE `GeometryClassname` ( `geometryClassname` varchar(45) DEFAULT NULL, `geometryOrder` int(2) NOT NULL, PRIMARY KEY (`geometryClassnameId`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `GridImageMap`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -1952,7 +1952,7 @@ CREATE TABLE `GridImageMap` ( PRIMARY KEY (`gridImageMapId`), KEY `_GridImageMap_ibfk1` (`dataCollectionId`), CONSTRAINT `_GridImageMap_ibfk1` FOREIGN KEY (`dataCollectionId`) REFERENCES `DataCollection` (`dataCollectionId`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `GridInfo`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -1986,7 +1986,7 @@ CREATE TABLE `GridInfo` ( KEY `GridInfo_fk_dataCollectionId` (`dataCollectionId`), CONSTRAINT `GridInfo_fk_dataCollectionId` FOREIGN KEY (`dataCollectionId`) REFERENCES `DataCollection` (`dataCollectionId`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `GridInfo_ibfk_2` FOREIGN KEY (`dataCollectionGroupId`) REFERENCES `DataCollectionGroup` (`dataCollectionGroupId`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `GridSquare`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -2008,7 +2008,7 @@ CREATE TABLE `GridSquare` ( PRIMARY KEY (`gridSquareId`), KEY `GridSquare_fk_atlasId` (`atlasId`), CONSTRAINT `GridSquare_fk_atlasId` FOREIGN KEY (`atlasId`) REFERENCES `Atlas` (`atlasId`) ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='Details of a Cryo-EM grid square including image captured at grid square magnification'; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='Details of a Cryo-EM grid square including image captured at grid square magnification'; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `Image`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -2037,7 +2037,7 @@ CREATE TABLE `Image` ( KEY `motorPositionId` (`motorPositionId`), CONSTRAINT `Image_ibfk_1` FOREIGN KEY (`dataCollectionId`) REFERENCES `DataCollection` (`dataCollectionId`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `Image_ibfk_2` FOREIGN KEY (`motorPositionId`) REFERENCES `MotorPosition` (`motorPositionId`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `ImageQualityIndicators`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -2062,7 +2062,7 @@ CREATE TABLE `ImageQualityIndicators` ( `dozor_score` double DEFAULT NULL COMMENT 'dozor_score', `driftFactor` float DEFAULT NULL COMMENT 'EM movie drift factor', PRIMARY KEY (`dataCollectionId`,`imageNumber`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `Imager`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -2074,7 +2074,7 @@ CREATE TABLE `Imager` ( `serial` varchar(45) DEFAULT NULL, `capacity` smallint(6) DEFAULT NULL, PRIMARY KEY (`imagerId`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `InspectionType`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -2083,7 +2083,7 @@ CREATE TABLE `InspectionType` ( `inspectionTypeId` int(11) unsigned NOT NULL AUTO_INCREMENT, `name` varchar(45) DEFAULT NULL, PRIMARY KEY (`inspectionTypeId`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `IspybCrystalClass`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -2093,7 +2093,7 @@ CREATE TABLE `IspybCrystalClass` ( `crystalClass_code` varchar(20) NOT NULL, `crystalClass_name` varchar(255) NOT NULL, PRIMARY KEY (`crystalClassId`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMMENT='ISPyB crystal class values'; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='ISPyB crystal class values'; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `IspybReference`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -2105,7 +2105,7 @@ CREATE TABLE `IspybReference` ( `referenceBibtext` blob DEFAULT NULL COMMENT 'bibtext value of the reference', `beamline` enum('All','ID14-4','ID23-1','ID23-2','ID29','XRF','AllXRF','Mesh') DEFAULT NULL COMMENT 'beamline involved', PRIMARY KEY (`referenceId`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `LDAPSearchBase`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -2118,7 +2118,7 @@ CREATE TABLE `LDAPSearchBase` ( PRIMARY KEY (`ldapSearchBaseId`), KEY `LDAPSearchBase_fk_ldapSearchParametersId` (`ldapSearchParametersId`), CONSTRAINT `LDAPSearchBase_fk_ldapSearchParametersId` FOREIGN KEY (`ldapSearchParametersId`) REFERENCES `LDAPSearchParameters` (`ldapSearchParametersId`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='LDAP search base and the sequence number in which it should be attempted'; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='LDAP search base and the sequence number in which it should be attempted'; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `LDAPSearchParameters`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -2132,7 +2132,7 @@ CREATE TABLE `LDAPSearchParameters` ( `filter` varchar(200) DEFAULT NULL COMMENT 'A filter string for the search', `attributes` varchar(255) NOT NULL COMMENT 'Comma-separated list of search attributes', PRIMARY KEY (`ldapSearchParametersId`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='All necessary parameters to run an LDAP search, except the search base'; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='All necessary parameters to run an LDAP search, except the search base'; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `LabContact`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -2154,7 +2154,7 @@ CREATE TABLE `LabContact` ( KEY `LabContact_FKIndex1` (`proposalId`), CONSTRAINT `LabContact_ibfk_1` FOREIGN KEY (`personId`) REFERENCES `Person` (`personId`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `LabContact_ibfk_2` FOREIGN KEY (`proposalId`) REFERENCES `Proposal` (`proposalId`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `Laboratory`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -2173,7 +2173,7 @@ CREATE TABLE `Laboratory` ( `postcode` varchar(15) DEFAULT NULL, `EORINumber` varchar(17) DEFAULT NULL COMMENT 'An EORI number consists of an ISO Country code from an EU Member State (2 characters) + a maximum of 15 characters', PRIMARY KEY (`laboratoryId`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `MXMRRun`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -2194,7 +2194,7 @@ CREATE TABLE `MXMRRun` ( KEY `mxMRRun_FK2` (`autoProcProgramId`), CONSTRAINT `mxMRRun_FK1` FOREIGN KEY (`autoProcScalingId`) REFERENCES `AutoProcScaling` (`autoProcScalingId`), CONSTRAINT `mxMRRun_FK2` FOREIGN KEY (`autoProcProgramId`) REFERENCES `AutoProcProgram` (`autoProcProgramId`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `MXMRRunBlob`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -2220,7 +2220,7 @@ CREATE TABLE `MXMRRunBlob` ( PRIMARY KEY (`mxMRRunBlobId`), KEY `mxMRRunBlob_FK1` (`mxMRRunId`), CONSTRAINT `mxMRRunBlob_FK1` FOREIGN KEY (`mxMRRunId`) REFERENCES `MXMRRun` (`mxMRRunId`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `ModelBuilding`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -2240,7 +2240,7 @@ CREATE TABLE `ModelBuilding` ( CONSTRAINT `ModelBuilding_phasingAnalysisfk_1` FOREIGN KEY (`phasingAnalysisId`) REFERENCES `PhasingAnalysis` (`phasingAnalysisId`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `ModelBuilding_phasingProgramRunfk_1` FOREIGN KEY (`phasingProgramRunId`) REFERENCES `PhasingProgramRun` (`phasingProgramRunId`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `ModelBuilding_spaceGroupfk_1` FOREIGN KEY (`spaceGroupId`) REFERENCES `SpaceGroup` (`spaceGroupId`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `MotionCorrection`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -2272,7 +2272,7 @@ CREATE TABLE `MotionCorrection` ( CONSTRAINT `MotionCorrection_ibfk2` FOREIGN KEY (`autoProcProgramId`) REFERENCES `AutoProcProgram` (`autoProcProgramId`), CONSTRAINT `MotionCorrection_ibfk3` FOREIGN KEY (`movieId`) REFERENCES `Movie` (`movieId`), CONSTRAINT `_MotionCorrection_ibfk1` FOREIGN KEY (`dataCollectionId`) REFERENCES `DataCollection` (`dataCollectionId`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `MotorPosition`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -2292,7 +2292,7 @@ CREATE TABLE `MotorPosition` ( `gridIndexZ` int(11) DEFAULT NULL, `recordTimeStamp` timestamp NOT NULL DEFAULT current_timestamp() COMMENT 'Creation or last update date/time', PRIMARY KEY (`motorPositionId`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `Movie`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -2316,7 +2316,7 @@ CREATE TABLE `Movie` ( KEY `Movie_fk_foilHoleId` (`foilHoleId`), CONSTRAINT `Movie_fk_foilHoleId` FOREIGN KEY (`foilHoleId`) REFERENCES `FoilHole` (`foilHoleId`) ON DELETE NO ACTION ON UPDATE CASCADE, CONSTRAINT `Movie_ibfk1` FOREIGN KEY (`dataCollectionId`) REFERENCES `DataCollection` (`dataCollectionId`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `PDB`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -2324,11 +2324,11 @@ DROP TABLE IF EXISTS `PDB`; CREATE TABLE `PDB` ( `pdbId` int(11) unsigned NOT NULL AUTO_INCREMENT, `name` varchar(255) DEFAULT NULL, - `contents` mediumtext /*!100301 COMPRESSED*/ CHARACTER SET utf8mb3 DEFAULT NULL, + `contents` mediumtext /*M!100301 COMPRESSED*/ CHARACTER SET utf8mb3 COLLATE utf8mb3_general_ci DEFAULT NULL, `code` varchar(4) DEFAULT NULL, `source` varchar(30) DEFAULT NULL COMMENT 'Could be e.g. AlphaFold or RoseTTAFold', PRIMARY KEY (`pdbId`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `PDBEntry`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -2357,7 +2357,7 @@ CREATE TABLE `PDBEntry` ( PRIMARY KEY (`pdbEntryId`), KEY `pdbEntryIdx1` (`autoProcProgramId`), CONSTRAINT `pdbEntry_FK1` FOREIGN KEY (`autoProcProgramId`) REFERENCES `AutoProcProgram` (`autoProcProgramId`) ON DELETE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `PDBEntry_has_AutoProcProgram`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -2372,7 +2372,7 @@ CREATE TABLE `PDBEntry_has_AutoProcProgram` ( KEY `pdbEntry_AutoProcProgramIdx2` (`autoProcProgramId`), CONSTRAINT `pdbEntry_AutoProcProgram_FK1` FOREIGN KEY (`pdbEntryId`) REFERENCES `PDBEntry` (`pdbEntryId`) ON DELETE CASCADE, CONSTRAINT `pdbEntry_AutoProcProgram_FK2` FOREIGN KEY (`autoProcProgramId`) REFERENCES `AutoProcProgram` (`autoProcProgramId`) ON DELETE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `ParticleClassification`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -2395,7 +2395,7 @@ CREATE TABLE `ParticleClassification` ( PRIMARY KEY (`particleClassificationId`), KEY `ParticleClassification_fk_particleClassificationGroupId` (`particleClassificationGroupId`), CONSTRAINT `ParticleClassification_fk_particleClassificationGroupId` FOREIGN KEY (`particleClassificationGroupId`) REFERENCES `ParticleClassificationGroup` (`particleClassificationGroupId`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMMENT='Results of 2D or 2D classification'; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='Results of 2D or 2D classification'; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `ParticleClassificationGroup`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -2414,7 +2414,7 @@ CREATE TABLE `ParticleClassificationGroup` ( KEY `ParticleClassificationGroup_fk_programId` (`programId`), CONSTRAINT `ParticleClassificationGroup_fk_particlePickerId` FOREIGN KEY (`particlePickerId`) REFERENCES `ParticlePicker` (`particlePickerId`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `ParticleClassificationGroup_fk_programId` FOREIGN KEY (`programId`) REFERENCES `AutoProcProgram` (`autoProcProgramId`) ON DELETE NO ACTION ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `ParticleClassification_has_CryoemInitialModel`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -2426,7 +2426,7 @@ CREATE TABLE `ParticleClassification_has_CryoemInitialModel` ( KEY `ParticleClassification_has_InitialModel_fk2` (`cryoemInitialModelId`), CONSTRAINT `ParticleClassification_has_CryoemInitialModel_fk1` FOREIGN KEY (`particleClassificationId`) REFERENCES `ParticleClassification` (`particleClassificationId`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `ParticleClassification_has_InitialModel_fk2` FOREIGN KEY (`cryoemInitialModelId`) REFERENCES `CryoemInitialModel` (`cryoemInitialModelId`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `ParticlePicker`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -2444,7 +2444,7 @@ CREATE TABLE `ParticlePicker` ( KEY `ParticlePicker_fk_motionCorrectionId` (`firstMotionCorrectionId`), CONSTRAINT `ParticlePicker_fk_motionCorrectionId` FOREIGN KEY (`firstMotionCorrectionId`) REFERENCES `MotionCorrection` (`motionCorrectionId`) ON DELETE NO ACTION ON UPDATE CASCADE, CONSTRAINT `ParticlePicker_fk_programId` FOREIGN KEY (`programId`) REFERENCES `AutoProcProgram` (`autoProcProgramId`) ON DELETE NO ACTION ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMMENT='An instance of a particle picker program that was run'; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='An instance of a particle picker program that was run'; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `Permission`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -2454,7 +2454,7 @@ CREATE TABLE `Permission` ( `type` varchar(15) NOT NULL, `description` varchar(100) DEFAULT NULL, PRIMARY KEY (`permissionId`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `Person`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -2480,7 +2480,7 @@ CREATE TABLE `Person` ( KEY `Person_FKIndexFamilyName` (`familyName`), KEY `siteId` (`siteId`), CONSTRAINT `Person_ibfk_1` FOREIGN KEY (`laboratoryId`) REFERENCES `Laboratory` (`laboratoryId`) ON DELETE NO ACTION ON UPDATE NO ACTION -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `Phasing`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -2503,7 +2503,7 @@ CREATE TABLE `Phasing` ( CONSTRAINT `Phasing_phasingAnalysisfk_1` FOREIGN KEY (`phasingAnalysisId`) REFERENCES `PhasingAnalysis` (`phasingAnalysisId`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `Phasing_phasingProgramRunfk_1` FOREIGN KEY (`phasingProgramRunId`) REFERENCES `PhasingProgramRun` (`phasingProgramRunId`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `Phasing_spaceGroupfk_1` FOREIGN KEY (`spaceGroupId`) REFERENCES `SpaceGroup` (`spaceGroupId`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `PhasingAnalysis`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -2512,7 +2512,7 @@ CREATE TABLE `PhasingAnalysis` ( `phasingAnalysisId` int(11) unsigned NOT NULL AUTO_INCREMENT COMMENT 'Primary key (auto-incremented)', `recordTimeStamp` datetime DEFAULT NULL COMMENT 'Creation or last update date/time', PRIMARY KEY (`phasingAnalysisId`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `PhasingProgramAttachment`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -2527,7 +2527,7 @@ CREATE TABLE `PhasingProgramAttachment` ( PRIMARY KEY (`phasingProgramAttachmentId`), KEY `PhasingProgramAttachment_FKIndex1` (`phasingProgramRunId`), CONSTRAINT `Phasing_phasingProgramAttachmentfk_1` FOREIGN KEY (`phasingProgramRunId`) REFERENCES `PhasingProgramRun` (`phasingProgramRunId`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `PhasingProgramRun`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -2543,7 +2543,7 @@ CREATE TABLE `PhasingProgramRun` ( `phasingEnvironment` varchar(255) DEFAULT NULL COMMENT 'Cpus, Nodes,...', `recordTimeStamp` datetime DEFAULT current_timestamp(), PRIMARY KEY (`phasingProgramRunId`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `PhasingStatistics`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -2568,7 +2568,7 @@ CREATE TABLE `PhasingStatistics` ( CONSTRAINT `PhasingStatistics_phasingHasScalingfk_1` FOREIGN KEY (`phasingHasScalingId1`) REFERENCES `Phasing_has_Scaling` (`phasingHasScalingId`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `PhasingStatistics_phasingHasScalingfk_2` FOREIGN KEY (`phasingHasScalingId2`) REFERENCES `Phasing_has_Scaling` (`phasingHasScalingId`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `fk_PhasingStatistics_phasingStep` FOREIGN KEY (`phasingStepId`) REFERENCES `PhasingStep` (`phasingStepId`) ON DELETE NO ACTION ON UPDATE NO ACTION -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `PhasingStep`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -2595,7 +2595,7 @@ CREATE TABLE `PhasingStep` ( CONSTRAINT `FK_autoprocScaling` FOREIGN KEY (`autoProcScalingId`) REFERENCES `AutoProcScaling` (`autoProcScalingId`) ON DELETE NO ACTION ON UPDATE NO ACTION, CONSTRAINT `FK_program` FOREIGN KEY (`programRunId`) REFERENCES `PhasingProgramRun` (`phasingProgramRunId`) ON DELETE NO ACTION ON UPDATE NO ACTION, CONSTRAINT `FK_spacegroup` FOREIGN KEY (`spaceGroupId`) REFERENCES `SpaceGroup` (`spaceGroupId`) ON DELETE NO ACTION ON UPDATE NO ACTION -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `Phasing_has_Scaling`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -2611,7 +2611,7 @@ CREATE TABLE `Phasing_has_Scaling` ( KEY `PhasingHasScaling_FKIndex2` (`autoProcScalingId`), CONSTRAINT `PhasingHasScaling_autoProcScalingfk_1` FOREIGN KEY (`autoProcScalingId`) REFERENCES `AutoProcScaling` (`autoProcScalingId`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `PhasingHasScaling_phasingAnalysisfk_1` FOREIGN KEY (`phasingAnalysisId`) REFERENCES `PhasingAnalysis` (`phasingAnalysisId`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `Position`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -2630,7 +2630,7 @@ CREATE TABLE `Position` ( PRIMARY KEY (`positionId`), KEY `Position_FKIndex1` (`relativePositionId`), CONSTRAINT `Position_relativePositionfk_1` FOREIGN KEY (`relativePositionId`) REFERENCES `Position` (`positionId`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `Positioner`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -2640,7 +2640,7 @@ CREATE TABLE `Positioner` ( `positioner` varchar(50) NOT NULL, `value` float NOT NULL, PRIMARY KEY (`positionerId`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMMENT='An arbitrary positioner and its value, could be e.g. a motor. Allows for instance to store some positions with a sample or subsample'; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='An arbitrary positioner and its value, could be e.g. a motor. Allows for instance to store some positions with a sample or subsample'; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `PreparePhasingData`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -2660,7 +2660,7 @@ CREATE TABLE `PreparePhasingData` ( CONSTRAINT `PreparePhasingData_phasingAnalysisfk_1` FOREIGN KEY (`phasingAnalysisId`) REFERENCES `PhasingAnalysis` (`phasingAnalysisId`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `PreparePhasingData_phasingProgramRunfk_1` FOREIGN KEY (`phasingProgramRunId`) REFERENCES `PhasingProgramRun` (`phasingProgramRunId`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `PreparePhasingData_spaceGroupfk_1` FOREIGN KEY (`spaceGroupId`) REFERENCES `SpaceGroup` (`spaceGroupId`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `ProcessedTomogram`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -2673,7 +2673,7 @@ CREATE TABLE `ProcessedTomogram` ( PRIMARY KEY (`processedTomogramId`), KEY `tomogramId` (`tomogramId`), CONSTRAINT `ProcessedTomogram_ibfk_1` FOREIGN KEY (`tomogramId`) REFERENCES `Tomogram` (`tomogramId`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='Indicates the sample''s location on a multi-sample pin, where 1 is closest to the pin base or a sample''s position in a cryo-EM cassette'; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='Indicates the sample''s location on a multi-sample pin, where 1 is closest to the pin base or a sample''s position in a cryo-EM cassette'; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `ProcessingJob`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -2689,7 +2689,7 @@ CREATE TABLE `ProcessingJob` ( PRIMARY KEY (`processingJobId`), KEY `ProcessingJob_ibfk1` (`dataCollectionId`), CONSTRAINT `ProcessingJob_ibfk1` FOREIGN KEY (`dataCollectionId`) REFERENCES `DataCollection` (`dataCollectionId`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMMENT='From this we get both job times and lag times'; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='From this we get both job times and lag times'; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `ProcessingJobImageSweep`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -2705,7 +2705,7 @@ CREATE TABLE `ProcessingJobImageSweep` ( KEY `ProcessingJobImageSweep_ibfk2` (`dataCollectionId`), CONSTRAINT `ProcessingJobImageSweep_ibfk1` FOREIGN KEY (`processingJobId`) REFERENCES `ProcessingJob` (`processingJobId`), CONSTRAINT `ProcessingJobImageSweep_ibfk2` FOREIGN KEY (`dataCollectionId`) REFERENCES `DataCollection` (`dataCollectionId`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMMENT='This allows multiple sweeps per processing job for multi-xia2'; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='This allows multiple sweeps per processing job for multi-xia2'; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `ProcessingJobParameter`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -2719,7 +2719,7 @@ CREATE TABLE `ProcessingJobParameter` ( KEY `ProcessingJobParameter_ibfk1` (`processingJobId`), KEY `ProcessingJobParameter_idx_paramKey_procJobId` (`parameterKey`,`processingJobId`), CONSTRAINT `ProcessingJobParameter_ibfk1` FOREIGN KEY (`processingJobId`) REFERENCES `ProcessingJob` (`processingJobId`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `ProcessingPipeline`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -2734,7 +2734,7 @@ CREATE TABLE `ProcessingPipeline` ( PRIMARY KEY (`processingPipelineId`), KEY `ProcessingPipeline_fk1` (`processingPipelineCategoryId`), CONSTRAINT `ProcessingPipeline_fk1` FOREIGN KEY (`processingPipelineCategoryId`) REFERENCES `ProcessingPipelineCategory` (`processingPipelineCategoryId`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMMENT='A lookup table for different processing pipelines and their categories'; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='A lookup table for different processing pipelines and their categories'; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `ProcessingPipelineCategory`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -2743,7 +2743,7 @@ CREATE TABLE `ProcessingPipelineCategory` ( `processingPipelineCategoryId` int(11) unsigned NOT NULL AUTO_INCREMENT, `name` varchar(20) NOT NULL, PRIMARY KEY (`processingPipelineCategoryId`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMMENT='A lookup table for the category of processing pipeline'; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='A lookup table for the category of processing pipeline'; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `Project`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -2757,7 +2757,7 @@ CREATE TABLE `Project` ( PRIMARY KEY (`projectId`), KEY `Project_FK1` (`personId`), CONSTRAINT `Project_FK1` FOREIGN KEY (`personId`) REFERENCES `Person` (`personId`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `Project_has_BLSample`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -2769,7 +2769,7 @@ CREATE TABLE `Project_has_BLSample` ( KEY `Project_has_BLSample_FK2` (`blSampleId`), CONSTRAINT `Project_has_BLSample_FK1` FOREIGN KEY (`projectId`) REFERENCES `Project` (`projectId`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `Project_has_BLSample_FK2` FOREIGN KEY (`blSampleId`) REFERENCES `BLSample` (`blSampleId`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `Project_has_DCGroup`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -2781,7 +2781,7 @@ CREATE TABLE `Project_has_DCGroup` ( KEY `Project_has_DCGroup_FK2` (`dataCollectionGroupId`), CONSTRAINT `Project_has_DCGroup_FK1` FOREIGN KEY (`projectId`) REFERENCES `Project` (`projectId`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `Project_has_DCGroup_FK2` FOREIGN KEY (`dataCollectionGroupId`) REFERENCES `DataCollectionGroup` (`dataCollectionGroupId`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `Project_has_EnergyScan`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -2793,7 +2793,7 @@ CREATE TABLE `Project_has_EnergyScan` ( KEY `project_has_energyscan_FK2` (`energyScanId`), CONSTRAINT `project_has_energyscan_FK1` FOREIGN KEY (`projectId`) REFERENCES `Project` (`projectId`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `project_has_energyscan_FK2` FOREIGN KEY (`energyScanId`) REFERENCES `EnergyScan` (`energyScanId`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `Project_has_Person`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -2805,7 +2805,7 @@ CREATE TABLE `Project_has_Person` ( KEY `project_has_person_FK2` (`personId`), CONSTRAINT `project_has_person_FK1` FOREIGN KEY (`projectId`) REFERENCES `Project` (`projectId`) ON DELETE CASCADE, CONSTRAINT `project_has_person_FK2` FOREIGN KEY (`personId`) REFERENCES `Person` (`personId`) ON DELETE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `Project_has_Protein`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -2817,7 +2817,7 @@ CREATE TABLE `Project_has_Protein` ( KEY `project_has_protein_FK2` (`proteinId`), CONSTRAINT `project_has_protein_FK1` FOREIGN KEY (`projectId`) REFERENCES `Project` (`projectId`) ON DELETE CASCADE, CONSTRAINT `project_has_protein_FK2` FOREIGN KEY (`proteinId`) REFERENCES `Protein` (`proteinId`) ON DELETE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `Project_has_Session`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -2829,7 +2829,7 @@ CREATE TABLE `Project_has_Session` ( KEY `project_has_session_FK2` (`sessionId`), CONSTRAINT `project_has_session_FK1` FOREIGN KEY (`projectId`) REFERENCES `Project` (`projectId`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `project_has_session_FK2` FOREIGN KEY (`sessionId`) REFERENCES `BLSession` (`sessionId`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `Project_has_Shipping`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -2841,7 +2841,7 @@ CREATE TABLE `Project_has_Shipping` ( KEY `project_has_shipping_FK2` (`shippingId`), CONSTRAINT `project_has_shipping_FK1` FOREIGN KEY (`projectId`) REFERENCES `Project` (`projectId`) ON DELETE CASCADE, CONSTRAINT `project_has_shipping_FK2` FOREIGN KEY (`shippingId`) REFERENCES `Shipping` (`shippingId`) ON DELETE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `Project_has_User`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -2853,7 +2853,7 @@ CREATE TABLE `Project_has_User` ( PRIMARY KEY (`projecthasuserid`), KEY `Project_Has_user_FK1` (`projectid`), CONSTRAINT `Project_Has_user_FK1` FOREIGN KEY (`projectid`) REFERENCES `Project` (`projectId`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `Project_has_XFEFSpectrum`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -2865,7 +2865,7 @@ CREATE TABLE `Project_has_XFEFSpectrum` ( KEY `project_has_xfefspectrum_FK2` (`xfeFluorescenceSpectrumId`), CONSTRAINT `project_has_xfefspectrum_FK1` FOREIGN KEY (`projectId`) REFERENCES `Project` (`projectId`) ON DELETE CASCADE, CONSTRAINT `project_has_xfefspectrum_FK2` FOREIGN KEY (`xfeFluorescenceSpectrumId`) REFERENCES `XFEFluorescenceSpectrum` (`xfeFluorescenceSpectrumId`) ON DELETE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `Proposal`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -2884,7 +2884,7 @@ CREATE TABLE `Proposal` ( UNIQUE KEY `Proposal_FKIndexCodeNumber` (`proposalCode`,`proposalNumber`), KEY `Proposal_FKIndex1` (`personId`), CONSTRAINT `Proposal_ibfk_1` FOREIGN KEY (`personId`) REFERENCES `Person` (`personId`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `ProposalHasPerson`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -2899,7 +2899,7 @@ CREATE TABLE `ProposalHasPerson` ( KEY `fk_ProposalHasPerson_Personal` (`personId`), CONSTRAINT `fk_ProposalHasPerson_Personal` FOREIGN KEY (`personId`) REFERENCES `Person` (`personId`) ON DELETE NO ACTION ON UPDATE NO ACTION, CONSTRAINT `fk_ProposalHasPerson_Proposal` FOREIGN KEY (`proposalId`) REFERENCES `Proposal` (`proposalId`) ON DELETE NO ACTION ON UPDATE NO ACTION -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `Protein`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -2936,7 +2936,7 @@ CREATE TABLE `Protein` ( CONSTRAINT `Protein_ibfk_1` FOREIGN KEY (`proposalId`) REFERENCES `Proposal` (`proposalId`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `protein_fk3` FOREIGN KEY (`componentTypeId`) REFERENCES `ComponentType` (`componentTypeId`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `protein_fk4` FOREIGN KEY (`concentrationTypeId`) REFERENCES `ConcentrationType` (`concentrationTypeId`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `Protein_has_PDB`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -2950,7 +2950,7 @@ CREATE TABLE `Protein_has_PDB` ( KEY `Protein_Has_PDB_fk2` (`pdbid`), CONSTRAINT `Protein_Has_PDB_fk1` FOREIGN KEY (`proteinid`) REFERENCES `Protein` (`proteinId`), CONSTRAINT `Protein_Has_PDB_fk2` FOREIGN KEY (`pdbid`) REFERENCES `PDB` (`pdbId`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `PurificationColumn`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -2960,7 +2960,7 @@ CREATE TABLE `PurificationColumn` ( `name` varchar(100) DEFAULT NULL, `active` tinyint(1) DEFAULT 1 COMMENT '1=active, 0=inactive', PRIMARY KEY (`purificationColumnId`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMMENT='Size exclusion chromotography (SEC) lookup table for BioSAXS'; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='Size exclusion chromotography (SEC) lookup table for BioSAXS'; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `RelativeIceThickness`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -3003,7 +3003,7 @@ CREATE TABLE `RobotAction` ( KEY `RobotAction_FK2` (`blsampleId`), CONSTRAINT `RobotAction_FK1` FOREIGN KEY (`blsessionId`) REFERENCES `BLSession` (`sessionId`), CONSTRAINT `RobotAction_FK2` FOREIGN KEY (`blsampleId`) REFERENCES `BLSample` (`blSampleId`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMMENT='Robot actions as reported by GDA'; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='Robot actions as reported by GDA'; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `SSXDataCollection`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -3022,7 +3022,7 @@ CREATE TABLE `SSXDataCollection` ( `experimentName` varchar(255) DEFAULT NULL, PRIMARY KEY (`dataCollectionId`), CONSTRAINT `SSXDataCollection_ibfk_1` FOREIGN KEY (`dataCollectionId`) REFERENCES `DataCollection` (`dataCollectionId`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='Extends DataCollection with SSX-specific fields.'; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='Extends DataCollection with SSX-specific fields.'; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `SW_onceToken`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -3040,7 +3040,7 @@ CREATE TABLE `SW_onceToken` ( KEY `SW_onceToken_recordTimeStamp_idx` (`recordTimeStamp`), CONSTRAINT `SW_onceToken_fk1` FOREIGN KEY (`personId`) REFERENCES `Person` (`personId`), CONSTRAINT `SW_onceToken_fk2` FOREIGN KEY (`proposalId`) REFERENCES `Proposal` (`proposalId`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMMENT='One-time use tokens needed for token auth in order to grant access to file downloads and webcams (and some images)'; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='One-time use tokens needed for token auth in order to grant access to file downloads and webcams (and some images)'; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `SampleComposition`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -3060,7 +3060,7 @@ CREATE TABLE `SampleComposition` ( CONSTRAINT `SampleComposition_ibfk_1` FOREIGN KEY (`componentId`) REFERENCES `Component` (`componentId`), CONSTRAINT `SampleComposition_ibfk_2` FOREIGN KEY (`blSampleId`) REFERENCES `BLSample` (`blSampleId`), CONSTRAINT `SampleComposition_ibfk_3` FOREIGN KEY (`concentrationTypeId`) REFERENCES `ConcentrationType` (`concentrationTypeId`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='Links a sample to its components with a specified abundance or ratio.'; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='Links a sample to its components with a specified abundance or ratio.'; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `ScanParametersModel`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -3080,7 +3080,7 @@ CREATE TABLE `ScanParametersModel` ( KEY `PDF_Model_ibfk2` (`dataCollectionPlanId`), CONSTRAINT `PDF_Model_ibfk1` FOREIGN KEY (`scanParametersServiceId`) REFERENCES `ScanParametersService` (`scanParametersServiceId`) ON UPDATE CASCADE, CONSTRAINT `PDF_Model_ibfk2` FOREIGN KEY (`dataCollectionPlanId`) REFERENCES `DiffractionPlan` (`diffractionPlanId`) ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `ScanParametersService`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -3090,7 +3090,7 @@ CREATE TABLE `ScanParametersService` ( `name` varchar(45) DEFAULT NULL, `description` varchar(45) DEFAULT NULL, PRIMARY KEY (`scanParametersServiceId`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `Schedule`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -3099,7 +3099,7 @@ CREATE TABLE `Schedule` ( `scheduleId` int(11) unsigned NOT NULL AUTO_INCREMENT, `name` varchar(45) DEFAULT NULL, PRIMARY KEY (`scheduleId`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `ScheduleComponent`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -3114,7 +3114,7 @@ CREATE TABLE `ScheduleComponent` ( KEY `ScheduleComponent_fk2` (`inspectionTypeId`), CONSTRAINT `ScheduleComponent_fk1` FOREIGN KEY (`scheduleId`) REFERENCES `Schedule` (`scheduleId`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `ScheduleComponent_fk2` FOREIGN KEY (`inspectionTypeId`) REFERENCES `InspectionType` (`inspectionTypeId`) ON DELETE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `SchemaStatus`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -3126,7 +3126,7 @@ CREATE TABLE `SchemaStatus` ( `recordTimeStamp` timestamp NOT NULL DEFAULT current_timestamp(), PRIMARY KEY (`schemaStatusId`), UNIQUE KEY `scriptName` (`scriptName`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `Screen`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -3142,7 +3142,7 @@ CREATE TABLE `Screen` ( KEY `Screen_fk_containerTypeId` (`containerTypeId`), CONSTRAINT `Screen_fk1` FOREIGN KEY (`proposalId`) REFERENCES `Proposal` (`proposalId`), CONSTRAINT `Screen_fk_containerTypeId` FOREIGN KEY (`containerTypeId`) REFERENCES `ContainerType` (`containerTypeId`) ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `ScreenComponent`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -3158,7 +3158,7 @@ CREATE TABLE `ScreenComponent` ( KEY `ScreenComponent_fk2` (`componentId`), CONSTRAINT `ScreenComponent_fk1` FOREIGN KEY (`screenComponentGroupId`) REFERENCES `ScreenComponentGroup` (`screenComponentGroupId`), CONSTRAINT `ScreenComponent_fk2` FOREIGN KEY (`componentId`) REFERENCES `Protein` (`proteinId`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `ScreenComponentGroup`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -3170,7 +3170,7 @@ CREATE TABLE `ScreenComponentGroup` ( PRIMARY KEY (`screenComponentGroupId`), KEY `ScreenComponentGroup_fk1` (`screenId`), CONSTRAINT `ScreenComponentGroup_fk1` FOREIGN KEY (`screenId`) REFERENCES `Screen` (`screenId`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `Screening`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -3194,7 +3194,7 @@ CREATE TABLE `Screening` ( CONSTRAINT `Screening_fk_autoProcProgramId` FOREIGN KEY (`autoProcProgramId`) REFERENCES `AutoProcProgram` (`autoProcProgramId`) ON DELETE SET NULL ON UPDATE CASCADE, CONSTRAINT `Screening_ibfk_1` FOREIGN KEY (`dataCollectionGroupId`) REFERENCES `DataCollectionGroup` (`dataCollectionGroupId`) ON DELETE NO ACTION ON UPDATE NO ACTION, CONSTRAINT `_Screening_ibfk2` FOREIGN KEY (`dataCollectionId`) REFERENCES `DataCollection` (`dataCollectionId`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `ScreeningInput`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -3213,7 +3213,7 @@ CREATE TABLE `ScreeningInput` ( PRIMARY KEY (`screeningInputId`), KEY `ScreeningInput_FKIndex1` (`screeningId`), CONSTRAINT `ScreeningInput_ibfk_1` FOREIGN KEY (`screeningId`) REFERENCES `Screening` (`screeningId`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `ScreeningOutput`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -3249,7 +3249,7 @@ CREATE TABLE `ScreeningOutput` ( PRIMARY KEY (`screeningOutputId`), KEY `ScreeningOutput_FKIndex1` (`screeningId`), CONSTRAINT `ScreeningOutput_ibfk_1` FOREIGN KEY (`screeningId`) REFERENCES `Screening` (`screeningId`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `ScreeningOutputLattice`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -3280,7 +3280,7 @@ CREATE TABLE `ScreeningOutputLattice` ( PRIMARY KEY (`screeningOutputLatticeId`), KEY `ScreeningOutputLattice_FKIndex1` (`screeningOutputId`), CONSTRAINT `ScreeningOutputLattice_ibfk_1` FOREIGN KEY (`screeningOutputId`) REFERENCES `ScreeningOutput` (`screeningOutputId`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `ScreeningRank`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -3296,7 +3296,7 @@ CREATE TABLE `ScreeningRank` ( KEY `ScreeningRank_FKIndex2` (`screeningRankSetId`), CONSTRAINT `ScreeningRank_ibfk_1` FOREIGN KEY (`screeningId`) REFERENCES `Screening` (`screeningId`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `ScreeningRank_ibfk_2` FOREIGN KEY (`screeningRankSetId`) REFERENCES `ScreeningRankSet` (`screeningRankSetId`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `ScreeningRankSet`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -3307,7 +3307,7 @@ CREATE TABLE `ScreeningRankSet` ( `rankingProjectFileName` varchar(255) DEFAULT NULL, `rankingSummaryFileName` varchar(255) DEFAULT NULL, PRIMARY KEY (`screeningRankSetId`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `ScreeningStrategy`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -3329,7 +3329,7 @@ CREATE TABLE `ScreeningStrategy` ( PRIMARY KEY (`screeningStrategyId`), KEY `ScreeningStrategy_FKIndex1` (`screeningOutputId`), CONSTRAINT `ScreeningStrategy_ibfk_1` FOREIGN KEY (`screeningOutputId`) REFERENCES `ScreeningOutput` (`screeningOutputId`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `ScreeningStrategySubWedge`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -3353,7 +3353,7 @@ CREATE TABLE `ScreeningStrategySubWedge` ( PRIMARY KEY (`screeningStrategySubWedgeId`), KEY `ScreeningStrategySubWedge_FK1` (`screeningStrategyWedgeId`), CONSTRAINT `ScreeningStrategySubWedge_FK1` FOREIGN KEY (`screeningStrategyWedgeId`) REFERENCES `ScreeningStrategyWedge` (`screeningStrategyWedgeId`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `ScreeningStrategyWedge`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -3375,7 +3375,7 @@ CREATE TABLE `ScreeningStrategyWedge` ( PRIMARY KEY (`screeningStrategyWedgeId`), KEY `ScreeningStrategyWedge_IBFK_1` (`screeningStrategyId`), CONSTRAINT `ScreeningStrategyWedge_IBFK_1` FOREIGN KEY (`screeningStrategyId`) REFERENCES `ScreeningStrategy` (`screeningStrategyId`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `SessionType`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -3387,7 +3387,7 @@ CREATE TABLE `SessionType` ( PRIMARY KEY (`sessionTypeId`), KEY `SessionType_FKIndex1` (`sessionId`), CONSTRAINT `SessionType_ibfk_1` FOREIGN KEY (`sessionId`) REFERENCES `BLSession` (`sessionId`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `Session_has_Person`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -3401,7 +3401,7 @@ CREATE TABLE `Session_has_Person` ( KEY `Session_has_Person_FKIndex2` (`personId`), CONSTRAINT `Session_has_Person_ibfk_1` FOREIGN KEY (`sessionId`) REFERENCES `BLSession` (`sessionId`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `Session_has_Person_ibfk_2` FOREIGN KEY (`personId`) REFERENCES `Person` (`personId`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `Shipping`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -3454,7 +3454,7 @@ CREATE TABLE `Shipping` ( CONSTRAINT `Shipping_ibfk_2` FOREIGN KEY (`sendingLabContactId`) REFERENCES `LabContact` (`labContactId`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `Shipping_ibfk_3` FOREIGN KEY (`returnLabContactId`) REFERENCES `LabContact` (`labContactId`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `Shipping_ibfk_4` FOREIGN KEY (`deliveryAgent_flightCodePersonId`) REFERENCES `Person` (`personId`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `ShippingHasSession`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -3466,7 +3466,7 @@ CREATE TABLE `ShippingHasSession` ( KEY `ShippingHasSession_FKIndex2` (`sessionId`), CONSTRAINT `ShippingHasSession_ibfk_1` FOREIGN KEY (`shippingId`) REFERENCES `Shipping` (`shippingId`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `ShippingHasSession_ibfk_2` FOREIGN KEY (`sessionId`) REFERENCES `BLSession` (`sessionId`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `Sleeve`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -3477,7 +3477,7 @@ CREATE TABLE `Sleeve` ( `lastMovedToFreezer` timestamp NOT NULL DEFAULT current_timestamp(), `lastMovedFromFreezer` timestamp NULL DEFAULT current_timestamp(), PRIMARY KEY (`sleeveId`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMMENT='Registry of ice-filled sleeves used to cool plates whilst on the goniometer'; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='Registry of ice-filled sleeves used to cool plates whilst on the goniometer'; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `SpaceGroup`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -3496,7 +3496,7 @@ CREATE TABLE `SpaceGroup` ( KEY `geometryClassnameId` (`geometryClassnameId`), KEY `SpaceGroup_FKShortName` (`spaceGroupShortName`), CONSTRAINT `SpaceGroup_ibfk_1` FOREIGN KEY (`geometryClassnameId`) REFERENCES `GeometryClassname` (`geometryClassnameId`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `SubstructureDetermination`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -3517,7 +3517,7 @@ CREATE TABLE `SubstructureDetermination` ( CONSTRAINT `SubstructureDetermination_phasingAnalysisfk_1` FOREIGN KEY (`phasingAnalysisId`) REFERENCES `PhasingAnalysis` (`phasingAnalysisId`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `SubstructureDetermination_phasingProgramRunfk_1` FOREIGN KEY (`phasingProgramRunId`) REFERENCES `PhasingProgramRun` (`phasingProgramRunId`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `SubstructureDetermination_spaceGroupfk_1` FOREIGN KEY (`spaceGroupId`) REFERENCES `SpaceGroup` (`spaceGroupId`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `TiltImageAlignment`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -3538,7 +3538,7 @@ CREATE TABLE `TiltImageAlignment` ( KEY `TiltImageAlignment_fk_tomogramId` (`tomogramId`), CONSTRAINT `TiltImageAlignment_fk_movieId` FOREIGN KEY (`movieId`) REFERENCES `Movie` (`movieId`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `TiltImageAlignment_fk_tomogramId` FOREIGN KEY (`tomogramId`) REFERENCES `Tomogram` (`tomogramId`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMMENT='For storing per-movie analysis results (reconstruction)'; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='For storing per-movie analysis results (reconstruction)'; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `Tomogram`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -3571,7 +3571,7 @@ CREATE TABLE `Tomogram` ( KEY `Tomogram_fk_autoProcProgramId` (`autoProcProgramId`), CONSTRAINT `Tomogram_fk_autoProcProgramId` FOREIGN KEY (`autoProcProgramId`) REFERENCES `AutoProcProgram` (`autoProcProgramId`) ON DELETE SET NULL ON UPDATE CASCADE, CONSTRAINT `Tomogram_fk_dataCollectionId` FOREIGN KEY (`dataCollectionId`) REFERENCES `DataCollection` (`dataCollectionId`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMMENT='For storing per-sample, per-position data analysis results (reconstruction)'; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='For storing per-sample, per-position data analysis results (reconstruction)'; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `UserGroup`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -3581,7 +3581,7 @@ CREATE TABLE `UserGroup` ( `name` varchar(31) NOT NULL, PRIMARY KEY (`userGroupId`), UNIQUE KEY `UserGroup_idx1` (`name`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `UserGroup_has_LDAPSearchParameters`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -3594,7 +3594,7 @@ CREATE TABLE `UserGroup_has_LDAPSearchParameters` ( KEY `UserGroup_has_LDAPSearchParameters_fk2` (`ldapSearchParametersId`), CONSTRAINT `UserGroup_has_LDAPSearchParameters_fk1` FOREIGN KEY (`userGroupId`) REFERENCES `UserGroup` (`userGroupId`), CONSTRAINT `UserGroup_has_LDAPSearchParameters_fk2` FOREIGN KEY (`ldapSearchParametersId`) REFERENCES `LDAPSearchParameters` (`ldapSearchParametersId`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='Gives the LDAP search parameters needed to find a set of usergroup members'; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='Gives the LDAP search parameters needed to find a set of usergroup members'; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `UserGroup_has_Permission`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -3606,7 +3606,7 @@ CREATE TABLE `UserGroup_has_Permission` ( KEY `UserGroup_has_Permission_fk2` (`permissionId`), CONSTRAINT `UserGroup_has_Permission_fk1` FOREIGN KEY (`userGroupId`) REFERENCES `UserGroup` (`userGroupId`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `UserGroup_has_Permission_fk2` FOREIGN KEY (`permissionId`) REFERENCES `Permission` (`permissionId`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `UserGroup_has_Person`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -3618,7 +3618,7 @@ CREATE TABLE `UserGroup_has_Person` ( KEY `userGroup_has_Person_fk2` (`personId`), CONSTRAINT `userGroup_has_Person_fk1` FOREIGN KEY (`userGroupId`) REFERENCES `UserGroup` (`userGroupId`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `userGroup_has_Person_fk2` FOREIGN KEY (`personId`) REFERENCES `Person` (`personId`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `XFEFluorescenceComposite`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -3639,7 +3639,7 @@ CREATE TABLE `XFEFluorescenceComposite` ( CONSTRAINT `XFEFluorescenceComposite_ibfk1` FOREIGN KEY (`r`) REFERENCES `XRFFluorescenceMapping` (`xrfFluorescenceMappingId`), CONSTRAINT `XFEFluorescenceComposite_ibfk2` FOREIGN KEY (`g`) REFERENCES `XRFFluorescenceMapping` (`xrfFluorescenceMappingId`), CONSTRAINT `XFEFluorescenceComposite_ibfk3` FOREIGN KEY (`b`) REFERENCES `XRFFluorescenceMapping` (`xrfFluorescenceMappingId`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMMENT='A composite XRF map composed of three XRFFluorescenceMapping entries creating r, g, b layers'; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='A composite XRF map composed of three XRFFluorescenceMapping entries creating r, g, b layers'; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `XFEFluorescenceSpectrum`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -3674,7 +3674,7 @@ CREATE TABLE `XFEFluorescenceSpectrum` ( CONSTRAINT `XFE_ibfk_1` FOREIGN KEY (`sessionId`) REFERENCES `BLSession` (`sessionId`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `XFE_ibfk_2` FOREIGN KEY (`blSampleId`) REFERENCES `BLSample` (`blSampleId`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `XFE_ibfk_3` FOREIGN KEY (`blSubSampleId`) REFERENCES `BLSubSample` (`blSubSampleId`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `XRFFluorescenceMapping`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -3698,7 +3698,7 @@ CREATE TABLE `XRFFluorescenceMapping` ( CONSTRAINT `XRFFluorescenceMapping_ibfk1` FOREIGN KEY (`xrfFluorescenceMappingROIId`) REFERENCES `XRFFluorescenceMappingROI` (`xrfFluorescenceMappingROIId`) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT `XRFFluorescenceMapping_ibfk2` FOREIGN KEY (`gridInfoId`) REFERENCES `GridInfo` (`gridInfoId`), CONSTRAINT `XRFFluorescenceMapping_ibfk3` FOREIGN KEY (`autoProcProgramId`) REFERENCES `AutoProcProgram` (`autoProcProgramId`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1 COMMENT='An XRF map generated from an XRF Mapping ROI based on data from a gridscan of a sample'; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci COMMENT='An XRF map generated from an XRF Mapping ROI based on data from a gridscan of a sample'; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `XRFFluorescenceMappingROI`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -3717,7 +3717,7 @@ CREATE TABLE `XRFFluorescenceMappingROI` ( PRIMARY KEY (`xrfFluorescenceMappingROIId`), KEY `XRFFluorescenceMappingROI_FKblSampleId` (`blSampleId`), CONSTRAINT `XRFFluorescenceMappingROI_FKblSampleId` FOREIGN KEY (`blSampleId`) REFERENCES `BLSample` (`blSampleId`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `XrayCentring`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -3730,7 +3730,7 @@ CREATE TABLE `XrayCentring` ( PRIMARY KEY (`xrayCentringId`), KEY `dataCollectionGroupId` (`dataCollectionGroupId`), CONSTRAINT `XrayCentring_ibfk_1` FOREIGN KEY (`dataCollectionGroupId`) REFERENCES `DataCollectionGroup` (`dataCollectionGroupId`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='Xray Centring analysis associated with one or more grid scans.'; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='Xray Centring analysis associated with one or more grid scans.'; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `XrayCentringResult`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -3757,7 +3757,7 @@ CREATE TABLE `XrayCentringResult` ( PRIMARY KEY (`xrayCentringResultId`), KEY `xrayCentringId` (`xrayCentringId`), CONSTRAINT `XrayCentringResult_ibfk_1` FOREIGN KEY (`xrayCentringId`) REFERENCES `XrayCentring` (`xrayCentringId`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='Xray Centring result.'; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='Xray Centring result.'; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `v_run`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -3769,7 +3769,7 @@ CREATE TABLE `v_run` ( `endDate` datetime DEFAULT NULL, PRIMARY KEY (`runId`), KEY `v_run_idx1` (`startDate`,`endDate`) -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; DROP TABLE IF EXISTS `zc_ZocaloBuffer`; /*!40101 SET @saved_cs_client = @@character_set_client */; @@ -3780,7 +3780,7 @@ CREATE TABLE `zc_ZocaloBuffer` ( `Reference` int(10) unsigned DEFAULT NULL COMMENT 'Context-dependent reference to primary key IDs in other ISPyB tables', PRIMARY KEY (`AutoProcProgramID`,`UUID`), CONSTRAINT `AutoProcProgram_fk_AutoProcProgramId` FOREIGN KEY (`AutoProcProgramID`) REFERENCES `AutoProcProgram` (`autoProcProgramId`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=latin1; +) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci; /*!40101 SET character_set_client = @saved_cs_client */; /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;