- <emd emdb_id="" version="3.0.9.1">
+ <emd emdb_id="" version="3.0.9.2">
<admin composite_map="">{1,1}</admin>
<crossreferences>{1,1}</crossreferences>
<sample>{1,1}</sample>
@@ -4724,7 +4724,7 @@ Showing:
| version |
xs:token |
- 3.0.9.1 |
+ 3.0.9.2 |
optional |
@@ -85114,7 +85114,7 @@ Showing:
|
| version |
xs:token |
- 3.0.9.1 |
+ 3.0.9.2 |
optional |
@@ -85157,7 +85157,7 @@ Showing:
</xs:element>
</xs:sequence>
<xs:attribute name="emdb_id" type="emdb_id_type" use="required"/>
- <xs:attribute name="version" type="xs:token" default="3.0.9.1"/>
+ <xs:attribute name="version" type="xs:token" default="3.0.9.2"/>
<!-- <xs:attribute name="composite_structure" type="xs:boolean"/> -->
</xs:complexType>
|
@@ -93006,6 +93006,13 @@ Showing:
+
+ | enumeration |
+ GATAN ALPINE (2.3k x 3.2k) |
+
+
+ |
+
| enumeration |
GATAN K2 (4k x 4k) |
@@ -93048,6 +93055,13 @@ Showing:
+
+ | enumeration |
+ GATAN K3 BIOCONTINUUM (6k x 4k) |
+
+
+ |
+
| enumeration |
GATAN K3 BIOQUANTUM (6k x 4k) |
@@ -93306,12 +93320,14 @@ Showing:
<xs:enumeration value="FEI FALCON II (4k x 4k)"/>
<xs:enumeration value="FEI FALCON III (4k x 4k)"/>
<xs:enumeration value="FEI FALCON IV (4k x 4k)"/>
+ <xs:enumeration value="GATAN ALPINE (2.3k x 3.2k)"/>
<xs:enumeration value="GATAN K2 (4k x 4k)"/>
<xs:enumeration value="GATAN K2 BASE (4k x 4k)"/>
<xs:enumeration value="GATAN K2 IS (4k x 4k)"/>
<xs:enumeration value="GATAN K2 QUANTUM (4k x 4k)"/>
<xs:enumeration value="GATAN K2 SUMMIT (4k x 4k)"/>
<xs:enumeration value="GATAN K3 (6k x 4k)"/>
+ <xs:enumeration value="GATAN K3 BIOCONTINUUM (6k x 4k)"/>
<xs:enumeration value="GATAN K3 BIOQUANTUM (6k x 4k)"/>
<xs:enumeration value="GATAN MULTISCAN"/>
<xs:enumeration value="GATAN ORIUS SC1000 (4k x 2.7k)"/>
@@ -113435,7 +113451,7 @@ Showing:
| default |
- 3.0.9.1 |
+ 3.0.9.2 |
@@ -113467,7 +113483,7 @@ Showing:
- <xs:attribute name="version" type="xs:token" default="3.0.9.1"/>
+ <xs:attribute name="version" type="xs:token" default="3.0.9.2"/>
|
diff --git a/emdb_schemas/current/doc/img/emdb_xsd_Complex_Type_entry_type.jpeg b/emdb_schemas/current/doc/img/emdb_xsd_Complex_Type_entry_type.jpeg
index 6ef293a..3583ad2 100644
Binary files a/emdb_schemas/current/doc/img/emdb_xsd_Complex_Type_entry_type.jpeg and b/emdb_schemas/current/doc/img/emdb_xsd_Complex_Type_entry_type.jpeg differ
diff --git a/emdb_schemas/current/doc/img/emdb_xsd_Element_emd.jpeg b/emdb_schemas/current/doc/img/emdb_xsd_Element_emd.jpeg
index dbded1a..4b2394e 100644
Binary files a/emdb_schemas/current/doc/img/emdb_xsd_Element_emd.jpeg and b/emdb_schemas/current/doc/img/emdb_xsd_Element_emd.jpeg differ
diff --git a/emdb_schemas/current/emdb.py b/emdb_schemas/current/emdb.py
index b57fdc4..e10af82 100644
--- a/emdb_schemas/current/emdb.py
+++ b/emdb_schemas/current/emdb.py
@@ -2,24 +2,24 @@
# -*- coding: utf-8 -*-
#
-# Generated Wed Dec 6 16:40:58 2023 by generateDS.py version 2.43.3.
+# Generated Mon Feb 5 18:29:43 2024 by generateDS.py version 2.43.3.
# Python 3.9.7 (default, Sep 16 2021, 08:50:36) [Clang 10.0.0 ]
#
# Command line options:
# ('--root-element', 'emd')
# ('-f', '')
-# ('-o', '/Users/sanja/IdeaProjects/emdb_schemas/emdb_schemas/v3/v3_0_9_1/emdb.py')
+# ('-o', '/Users/sanja/IdeaProjects/emdb_schemas/emdb_schemas/v3/v3_0_9_2/emdb.py')
# ('--no-warnings', '')
# ('--external-encoding', 'utf-8')
#
# Command line arguments:
-# /Users/sanja/IdeaProjects/emdb_schemas/emdb_schemas/v3/v3_0_9_1/emdb.xsd
+# /Users/sanja/IdeaProjects/emdb_schemas/emdb_schemas/v3/v3_0_9_2/emdb.xsd
#
# Command line:
-# /Users/sanja/generateDS/generateDS-2.43.3/generateDS.py --root-element="emd" -f -o "/Users/sanja/IdeaProjects/emdb_schemas/emdb_schemas/v3/v3_0_9_1/emdb.py" --no-warnings --external-encoding="utf-8" /Users/sanja/IdeaProjects/emdb_schemas/emdb_schemas/v3/v3_0_9_1/emdb.xsd
+# /Users/sanja/generateDS/generateDS-2.43.3/generateDS.py --root-element="emd" -f -o "/Users/sanja/IdeaProjects/emdb_schemas/emdb_schemas/v3/v3_0_9_2/emdb.py" --no-warnings --external-encoding="utf-8" /Users/sanja/IdeaProjects/emdb_schemas/emdb_schemas/v3/v3_0_9_2/emdb.xsd
#
# Current working directory (os.getcwd()):
-# v3_0_9_1
+# sanja
#
import sys
@@ -1034,12 +1034,14 @@ class allowed_film_or_detector_model(str, Enum):
FEIFALCONII_4_KX_4_K='FEI FALCON II (4k x 4k)'
FEIFALCONIII_4_KX_4_K='FEI FALCON III (4k x 4k)'
FEIFALCONIV_4_KX_4_K='FEI FALCON IV (4k x 4k)'
+ GATANALPINE_2_3_KX_3_2_K='GATAN ALPINE (2.3k x 3.2k)'
GATANK_2_4_KX_4_K='GATAN K2 (4k x 4k)'
GATANK_2BASE_4_KX_4_K='GATAN K2 BASE (4k x 4k)'
GATANK_2IS_4_KX_4_K='GATAN K2 IS (4k x 4k)'
GATANK_2QUANTUM_4_KX_4_K='GATAN K2 QUANTUM (4k x 4k)'
GATANK_2SUMMIT_4_KX_4_K='GATAN K2 SUMMIT (4k x 4k)'
GATANK_3_6_KX_4_K='GATAN K3 (6k x 4k)'
+ GATANK_3BIOCONTINUUM_6_KX_4_K='GATAN K3 BIOCONTINUUM (6k x 4k)'
GATANK_3BIOQUANTUM_6_KX_4_K='GATAN K3 BIOQUANTUM (6k x 4k)'
GATANMULTISCAN='GATAN MULTISCAN'
GATANORIUSSC_1000_4_KX_2_7_K='GATAN ORIUS SC1000 (4k x 2.7k)'
@@ -1768,7 +1770,7 @@ class entry_type(GeneratedsSuper):
__hash__ = GeneratedsSuper.__hash__
subclass = None
superclass = None
- def __init__(self, emdb_id=None, version='3.0.9.1', admin=None, crossreferences=None, sample=None, structure_determination_list=None, map=None, interpretation=None, validation=None, gds_collector_=None, **kwargs_):
+ def __init__(self, emdb_id=None, version='3.0.9.2', admin=None, crossreferences=None, sample=None, structure_determination_list=None, map=None, interpretation=None, validation=None, gds_collector_=None, **kwargs_):
self.gds_collector_ = gds_collector_
self.gds_elementtree_node_ = None
self.original_tagname_ = None
@@ -1894,7 +1896,7 @@ def _exportAttributes(self, outfile, level, already_processed, namespaceprefix_=
if self.emdb_id is not None and 'emdb_id' not in already_processed:
already_processed.add('emdb_id')
outfile.write(' emdb_id=%s' % (self.gds_encode(self.gds_format_string(quote_attrib(self.emdb_id), input_name='emdb_id')), ))
- if self.version != "3.0.9.1" and 'version' not in already_processed:
+ if self.version != "3.0.9.2" and 'version' not in already_processed:
already_processed.add('version')
outfile.write(' version=%s' % (self.gds_encode(self.gds_format_string(quote_attrib(self.version), input_name='version')), ))
def _exportChildren(self, outfile, level, namespaceprefix_='', namespacedef_='', name_='entry_type', fromsubclass_=False, pretty_print=True):
@@ -33691,7 +33693,7 @@ def validate_allowed_film_or_detector_model(self, value):
self.gds_collector_.add_message('Value "%(value)s"%(lineno)s is not of the correct base simple type (str)' % {"value": value, "lineno": lineno, })
return False
value = value
- enumerations = ['AGFA SCIENTA FILM', 'DECTRIS SINGLA (1k x 1k)', 'DECTRIS ELA (1k x 0.5k)', 'DIRECT ELECTRON APOLLO (4k x 4k)', 'DIRECT ELECTRON DE-10 (5k x 4k)', 'DIRECT ELECTRON DE-12 (4k x 3k)', 'DIRECT ELECTRON DE-16 (4k x 4k)', 'DIRECT ELECTRON DE-20 (5k x 3k)', 'DIRECT ELECTRON DE-64 (8k x 8k)', 'FEI CETA (4k x 4k)', 'FEI EAGLE (2k x 2k)', 'FEI EAGLE (4k x 4k)', 'FEI FALCON I (4k x 4k)', 'FEI FALCON II (4k x 4k)', 'FEI FALCON III (4k x 4k)', 'FEI FALCON IV (4k x 4k)', 'GATAN K2 (4k x 4k)', 'GATAN K2 BASE (4k x 4k)', 'GATAN K2 IS (4k x 4k)', 'GATAN K2 QUANTUM (4k x 4k)', 'GATAN K2 SUMMIT (4k x 4k)', 'GATAN K3 (6k x 4k)', 'GATAN K3 BIOQUANTUM (6k x 4k)', 'GATAN MULTISCAN', 'GATAN ORIUS SC1000 (4k x 2.7k)', 'GATAN ORIUS SC200 (2k x 2k)', 'GATAN ORIUS SC600 (2.7k x 2.7k)', 'GATAN ULTRASCAN 1000 (2k x 2k)', 'GATAN ULTRASCAN 10000 (10k x 10k)', 'GATAN ULTRASCAN 4000 (4k x 4k)', 'GENERIC CCD', 'GENERIC CCD (2k x 2k)', 'GENERIC CCD (4k x 4k)', 'GENERIC FILM', 'GENERIC GATAN', 'GENERIC GATAN (2k x 2k)', 'GENERIC GATAN (4k x 4k)', 'GENERIC IMAGE PLATES', 'GENERIC TVIPS', 'GENERIC TVIPS (2k x 2k)', 'GENERIC TVIPS (4k x 4k)', 'KODAK 4489 FILM', 'KODAK SO-163 FILM', 'OTHER', 'PROSCAN TEM-PIV (2k x 2k)', 'SIA 15C (3k x 3k)', 'TFS FALCON 4i (4k x 4k)', 'TVIPS TEMCAM-F216 (2k x 2k)', 'TVIPS TEMCAM-F224 (2k x 2k)', 'TVIPS TEMCAM-F415 (4k x 4k)', 'TVIPS TEMCAM-F416 (4k x 4k)', 'TVIPS TEMCAM-F816 (8k x 8k)']
+ enumerations = ['AGFA SCIENTA FILM', 'DECTRIS SINGLA (1k x 1k)', 'DECTRIS ELA (1k x 0.5k)', 'DIRECT ELECTRON APOLLO (4k x 4k)', 'DIRECT ELECTRON DE-10 (5k x 4k)', 'DIRECT ELECTRON DE-12 (4k x 3k)', 'DIRECT ELECTRON DE-16 (4k x 4k)', 'DIRECT ELECTRON DE-20 (5k x 3k)', 'DIRECT ELECTRON DE-64 (8k x 8k)', 'FEI CETA (4k x 4k)', 'FEI EAGLE (2k x 2k)', 'FEI EAGLE (4k x 4k)', 'FEI FALCON I (4k x 4k)', 'FEI FALCON II (4k x 4k)', 'FEI FALCON III (4k x 4k)', 'FEI FALCON IV (4k x 4k)', 'GATAN ALPINE (2.3k x 3.2k)', 'GATAN K2 (4k x 4k)', 'GATAN K2 BASE (4k x 4k)', 'GATAN K2 IS (4k x 4k)', 'GATAN K2 QUANTUM (4k x 4k)', 'GATAN K2 SUMMIT (4k x 4k)', 'GATAN K3 (6k x 4k)', 'GATAN K3 BIOCONTINUUM (6k x 4k)', 'GATAN K3 BIOQUANTUM (6k x 4k)', 'GATAN MULTISCAN', 'GATAN ORIUS SC1000 (4k x 2.7k)', 'GATAN ORIUS SC200 (2k x 2k)', 'GATAN ORIUS SC600 (2.7k x 2.7k)', 'GATAN ULTRASCAN 1000 (2k x 2k)', 'GATAN ULTRASCAN 10000 (10k x 10k)', 'GATAN ULTRASCAN 4000 (4k x 4k)', 'GENERIC CCD', 'GENERIC CCD (2k x 2k)', 'GENERIC CCD (4k x 4k)', 'GENERIC FILM', 'GENERIC GATAN', 'GENERIC GATAN (2k x 2k)', 'GENERIC GATAN (4k x 4k)', 'GENERIC IMAGE PLATES', 'GENERIC TVIPS', 'GENERIC TVIPS (2k x 2k)', 'GENERIC TVIPS (4k x 4k)', 'KODAK 4489 FILM', 'KODAK SO-163 FILM', 'OTHER', 'PROSCAN TEM-PIV (2k x 2k)', 'SIA 15C (3k x 3k)', 'TFS FALCON 4i (4k x 4k)', 'TVIPS TEMCAM-F216 (2k x 2k)', 'TVIPS TEMCAM-F224 (2k x 2k)', 'TVIPS TEMCAM-F415 (4k x 4k)', 'TVIPS TEMCAM-F416 (4k x 4k)', 'TVIPS TEMCAM-F816 (8k x 8k)']
if value not in enumerations:
lineno = self.gds_get_node_lineno_()
self.gds_collector_.add_message('Value "%(value)s"%(lineno)s does not match xsd enumeration restriction on allowed_film_or_detector_model' % {"value" : encode_str_2_3(value), "lineno": lineno} )
diff --git a/emdb_schemas/current/emdb.xsd b/emdb_schemas/current/emdb.xsd
index 9e802ec..0964515 100644
--- a/emdb_schemas/current/emdb.xsd
+++ b/emdb_schemas/current/emdb.xsd
@@ -25,7 +25,7 @@
-
+
@@ -2683,12 +2683,14 @@
+
+
diff --git a/emdb_schemas/current/emdb_relaxed.py b/emdb_schemas/current/emdb_relaxed.py
index 25242b1..2fb9b7f 100644
--- a/emdb_schemas/current/emdb_relaxed.py
+++ b/emdb_schemas/current/emdb_relaxed.py
@@ -2,24 +2,24 @@
# -*- coding: utf-8 -*-
#
-# Generated Wed Dec 6 16:42:07 2023 by generateDS.py version 2.43.3.
-# Python 3.9.7 (default, Sep 16 2021, 08:50:36) [Clang 10.0.0 ]
+# Generated Mon Feb 5 18:34:39 2024 by generateDS.py version 2.43.3.
+# Python 3.8.13 (default, Mar 28 2022, 06:16:26) [Clang 12.0.0 ]
#
# Command line options:
# ('--root-element', 'emd')
# ('-f', '')
-# ('-o', '/Users/sanja/IdeaProjects/emdb_schemas/emdb_schemas/v3/v3_0_9_1/emdb_relaxed.py')
+# ('-o', '/Users/sanja/IdeaProjects/emdb_schemas/emdb_schemas/v3/v3_0_9_2/emdb_relaxed.py')
# ('--no-warnings', '')
# ('--external-encoding', 'utf-8')
#
# Command line arguments:
-# /Users/sanja/IdeaProjects/emdb_schemas/emdb_schemas/v3/v3_0_9_1/emdb_relaxed.xsd
+# /Users/sanja/IdeaProjects/emdb_schemas/emdb_schemas/v3/v3_0_9_2/emdb_relaxed.xsd
#
# Command line:
-# /Users/sanja/generateDS/generateDS-2.43.3/generateDS.py --root-element="emd" -f -o "/Users/sanja/IdeaProjects/emdb_schemas/emdb_schemas/v3/v3_0_9_1/emdb_relaxed.py" --no-warnings --external-encoding="utf-8" /Users/sanja/IdeaProjects/emdb_schemas/emdb_schemas/v3/v3_0_9_1/emdb_relaxed.xsd
+# /Users/sanja/generateDS/generateDS-2.43.3/generateDS.py --root-element="emd" -f -o "/Users/sanja/IdeaProjects/emdb_schemas/emdb_schemas/v3/v3_0_9_2/emdb_relaxed.py" --no-warnings --external-encoding="utf-8" /Users/sanja/IdeaProjects/emdb_schemas/emdb_schemas/v3/v3_0_9_2/emdb_relaxed.xsd
#
# Current working directory (os.getcwd()):
-# v3_0_9_1
+# v3
#
import sys
@@ -1034,12 +1034,14 @@ class allowed_film_or_detector_model(str, Enum):
FEIFALCONII_4_KX_4_K='FEI FALCON II (4k x 4k)'
FEIFALCONIII_4_KX_4_K='FEI FALCON III (4k x 4k)'
FEIFALCONIV_4_KX_4_K='FEI FALCON IV (4k x 4k)'
+ GATANALPINE_2_3_KX_3_2_K='GATAN ALPINE (2.3k x 3.2k)'
GATANK_2_4_KX_4_K='GATAN K2 (4k x 4k)'
GATANK_2BASE_4_KX_4_K='GATAN K2 BASE (4k x 4k)'
GATANK_2IS_4_KX_4_K='GATAN K2 IS (4k x 4k)'
GATANK_2QUANTUM_4_KX_4_K='GATAN K2 QUANTUM (4k x 4k)'
GATANK_2SUMMIT_4_KX_4_K='GATAN K2 SUMMIT (4k x 4k)'
GATANK_3_6_KX_4_K='GATAN K3 (6k x 4k)'
+ GATANK_3BIOCONTINUUM_6_KX_4_K='GATAN K3 BIOCONTINUUM (6k x 4k)'
GATANK_3BIOQUANTUM_6_KX_4_K='GATAN K3 BIOQUANTUM (6k x 4k)'
GATANMULTISCAN='GATAN MULTISCAN'
GATANORIUSSC_1000_4_KX_2_7_K='GATAN ORIUS SC1000 (4k x 2.7k)'
@@ -1773,7 +1775,7 @@ class entry_type(GeneratedsSuper):
__hash__ = GeneratedsSuper.__hash__
subclass = None
superclass = None
- def __init__(self, emdb_id=None, version='3.0.9.1', admin=None, crossreferences=None, sample=None, structure_determination_list=None, map=None, interpretation=None, validation=None, gds_collector_=None, **kwargs_):
+ def __init__(self, emdb_id=None, version='3.0.9.2', admin=None, crossreferences=None, sample=None, structure_determination_list=None, map=None, interpretation=None, validation=None, gds_collector_=None, **kwargs_):
self.gds_collector_ = gds_collector_
self.gds_elementtree_node_ = None
self.original_tagname_ = None
@@ -1899,7 +1901,7 @@ def _exportAttributes(self, outfile, level, already_processed, namespaceprefix_=
if self.emdb_id is not None and 'emdb_id' not in already_processed:
already_processed.add('emdb_id')
outfile.write(' emdb_id=%s' % (self.gds_encode(self.gds_format_string(quote_attrib(self.emdb_id), input_name='emdb_id')), ))
- if self.version != "3.0.9.1" and 'version' not in already_processed:
+ if self.version != "3.0.9.2" and 'version' not in already_processed:
already_processed.add('version')
outfile.write(' version=%s' % (self.gds_encode(self.gds_format_string(quote_attrib(self.version), input_name='version')), ))
def _exportChildren(self, outfile, level, namespaceprefix_='', namespacedef_='', name_='entry_type', fromsubclass_=False, pretty_print=True):
@@ -33692,7 +33694,7 @@ def validate_allowed_film_or_detector_model(self, value):
self.gds_collector_.add_message('Value "%(value)s"%(lineno)s is not of the correct base simple type (str)' % {"value": value, "lineno": lineno, })
return False
value = value
- enumerations = ['AGFA SCIENTA FILM', 'DECTRIS SINGLA (1k x 1k)', 'DECTRIS ELA (1k x 0.5k)', 'DIRECT ELECTRON APOLLO (4k x 4k)', 'DIRECT ELECTRON DE-10 (5k x 4k)', 'DIRECT ELECTRON DE-12 (4k x 3k)', 'DIRECT ELECTRON DE-16 (4k x 4k)', 'DIRECT ELECTRON DE-20 (5k x 3k)', 'DIRECT ELECTRON DE-64 (8k x 8k)', 'FEI CETA (4k x 4k)', 'FEI EAGLE (2k x 2k)', 'FEI EAGLE (4k x 4k)', 'FEI FALCON I (4k x 4k)', 'FEI FALCON II (4k x 4k)', 'FEI FALCON III (4k x 4k)', 'FEI FALCON IV (4k x 4k)', 'GATAN K2 (4k x 4k)', 'GATAN K2 BASE (4k x 4k)', 'GATAN K2 IS (4k x 4k)', 'GATAN K2 QUANTUM (4k x 4k)', 'GATAN K2 SUMMIT (4k x 4k)', 'GATAN K3 (6k x 4k)', 'GATAN K3 BIOQUANTUM (6k x 4k)', 'GATAN MULTISCAN', 'GATAN ORIUS SC1000 (4k x 2.7k)', 'GATAN ORIUS SC200 (2k x 2k)', 'GATAN ORIUS SC600 (2.7k x 2.7k)', 'GATAN ULTRASCAN 1000 (2k x 2k)', 'GATAN ULTRASCAN 10000 (10k x 10k)', 'GATAN ULTRASCAN 4000 (4k x 4k)', 'GENERIC CCD', 'GENERIC CCD (2k x 2k)', 'GENERIC CCD (4k x 4k)', 'GENERIC FILM', 'GENERIC GATAN', 'GENERIC GATAN (2k x 2k)', 'GENERIC GATAN (4k x 4k)', 'GENERIC IMAGE PLATES', 'GENERIC TVIPS', 'GENERIC TVIPS (2k x 2k)', 'GENERIC TVIPS (4k x 4k)', 'KODAK 4489 FILM', 'KODAK SO-163 FILM', 'OTHER', 'PROSCAN TEM-PIV (2k x 2k)', 'SIA 15C (3k x 3k)', 'TFS FALCON 4i (4k x 4k)', 'TVIPS TEMCAM-F216 (2k x 2k)', 'TVIPS TEMCAM-F224 (2k x 2k)', 'TVIPS TEMCAM-F415 (4k x 4k)', 'TVIPS TEMCAM-F416 (4k x 4k)', 'TVIPS TEMCAM-F816 (8k x 8k)']
+ enumerations = ['AGFA SCIENTA FILM', 'DECTRIS SINGLA (1k x 1k)', 'DECTRIS ELA (1k x 0.5k)', 'DIRECT ELECTRON APOLLO (4k x 4k)', 'DIRECT ELECTRON DE-10 (5k x 4k)', 'DIRECT ELECTRON DE-12 (4k x 3k)', 'DIRECT ELECTRON DE-16 (4k x 4k)', 'DIRECT ELECTRON DE-20 (5k x 3k)', 'DIRECT ELECTRON DE-64 (8k x 8k)', 'FEI CETA (4k x 4k)', 'FEI EAGLE (2k x 2k)', 'FEI EAGLE (4k x 4k)', 'FEI FALCON I (4k x 4k)', 'FEI FALCON II (4k x 4k)', 'FEI FALCON III (4k x 4k)', 'FEI FALCON IV (4k x 4k)', 'GATAN ALPINE (2.3k x 3.2k)', 'GATAN K2 (4k x 4k)', 'GATAN K2 BASE (4k x 4k)', 'GATAN K2 IS (4k x 4k)', 'GATAN K2 QUANTUM (4k x 4k)', 'GATAN K2 SUMMIT (4k x 4k)', 'GATAN K3 (6k x 4k)', 'GATAN K3 BIOCONTINUUM (6k x 4k)', 'GATAN K3 BIOQUANTUM (6k x 4k)', 'GATAN MULTISCAN', 'GATAN ORIUS SC1000 (4k x 2.7k)', 'GATAN ORIUS SC200 (2k x 2k)', 'GATAN ORIUS SC600 (2.7k x 2.7k)', 'GATAN ULTRASCAN 1000 (2k x 2k)', 'GATAN ULTRASCAN 10000 (10k x 10k)', 'GATAN ULTRASCAN 4000 (4k x 4k)', 'GENERIC CCD', 'GENERIC CCD (2k x 2k)', 'GENERIC CCD (4k x 4k)', 'GENERIC FILM', 'GENERIC GATAN', 'GENERIC GATAN (2k x 2k)', 'GENERIC GATAN (4k x 4k)', 'GENERIC IMAGE PLATES', 'GENERIC TVIPS', 'GENERIC TVIPS (2k x 2k)', 'GENERIC TVIPS (4k x 4k)', 'KODAK 4489 FILM', 'KODAK SO-163 FILM', 'OTHER', 'PROSCAN TEM-PIV (2k x 2k)', 'SIA 15C (3k x 3k)', 'TFS FALCON 4i (4k x 4k)', 'TVIPS TEMCAM-F216 (2k x 2k)', 'TVIPS TEMCAM-F224 (2k x 2k)', 'TVIPS TEMCAM-F415 (4k x 4k)', 'TVIPS TEMCAM-F416 (4k x 4k)', 'TVIPS TEMCAM-F816 (8k x 8k)']
if value not in enumerations:
lineno = self.gds_get_node_lineno_()
self.gds_collector_.add_message('Value "%(value)s"%(lineno)s does not match xsd enumeration restriction on allowed_film_or_detector_model' % {"value" : encode_str_2_3(value), "lineno": lineno} )
diff --git a/emdb_schemas/current/emdb_relaxed.xsd b/emdb_schemas/current/emdb_relaxed.xsd
index 47436ec..693fb5f 100644
--- a/emdb_schemas/current/emdb_relaxed.xsd
+++ b/emdb_schemas/current/emdb_relaxed.xsd
@@ -24,7 +24,7 @@
-
+
@@ -2538,12 +2538,14 @@
+
+
diff --git a/emdb_schemas/v3/current_v3/doc/emdb_xsd.html b/emdb_schemas/v3/current_v3/doc/emdb_xsd.html
index e2b3780..da1ff60 100644
--- a/emdb_schemas/v3/current_v3/doc/emdb_xsd.html
+++ b/emdb_schemas/v3/current_v3/doc/emdb_xsd.html
@@ -4680,7 +4680,7 @@ Showing:
- <emd emdb_id="" version="3.0.9.1">
+ <emd emdb_id="" version="3.0.9.2">
<admin composite_map="">{1,1}</admin>
<crossreferences>{1,1}</crossreferences>
<sample>{1,1}</sample>
@@ -4724,7 +4724,7 @@ Showing:
| version |
xs:token |
- 3.0.9.1 |
+ 3.0.9.2 |
optional |
@@ -85114,7 +85114,7 @@ Showing:
|
| version |
xs:token |
- 3.0.9.1 |
+ 3.0.9.2 |
optional |
@@ -85157,7 +85157,7 @@ Showing:
</xs:element>
</xs:sequence>
<xs:attribute name="emdb_id" type="emdb_id_type" use="required"/>
- <xs:attribute name="version" type="xs:token" default="3.0.9.1"/>
+ <xs:attribute name="version" type="xs:token" default="3.0.9.2"/>
<!-- <xs:attribute name="composite_structure" type="xs:boolean"/> -->
</xs:complexType>
|
@@ -93006,6 +93006,13 @@ Showing:
+
+ | enumeration |
+ GATAN ALPINE (2.3k x 3.2k) |
+
+
+ |
+
| enumeration |
GATAN K2 (4k x 4k) |
@@ -93048,6 +93055,13 @@ Showing:
+
+ | enumeration |
+ GATAN K3 BIOCONTINUUM (6k x 4k) |
+
+
+ |
+
| enumeration |
GATAN K3 BIOQUANTUM (6k x 4k) |
@@ -93306,12 +93320,14 @@ Showing:
<xs:enumeration value="FEI FALCON II (4k x 4k)"/>
<xs:enumeration value="FEI FALCON III (4k x 4k)"/>
<xs:enumeration value="FEI FALCON IV (4k x 4k)"/>
+ <xs:enumeration value="GATAN ALPINE (2.3k x 3.2k)"/>
<xs:enumeration value="GATAN K2 (4k x 4k)"/>
<xs:enumeration value="GATAN K2 BASE (4k x 4k)"/>
<xs:enumeration value="GATAN K2 IS (4k x 4k)"/>
<xs:enumeration value="GATAN K2 QUANTUM (4k x 4k)"/>
<xs:enumeration value="GATAN K2 SUMMIT (4k x 4k)"/>
<xs:enumeration value="GATAN K3 (6k x 4k)"/>
+ <xs:enumeration value="GATAN K3 BIOCONTINUUM (6k x 4k)"/>
<xs:enumeration value="GATAN K3 BIOQUANTUM (6k x 4k)"/>
<xs:enumeration value="GATAN MULTISCAN"/>
<xs:enumeration value="GATAN ORIUS SC1000 (4k x 2.7k)"/>
@@ -113435,7 +113451,7 @@ Showing:
| default |
- 3.0.9.1 |
+ 3.0.9.2 |
@@ -113467,7 +113483,7 @@ Showing:
- <xs:attribute name="version" type="xs:token" default="3.0.9.1"/>
+ <xs:attribute name="version" type="xs:token" default="3.0.9.2"/>
|
diff --git a/emdb_schemas/v3/current_v3/doc/img/emdb_xsd_Complex_Type_entry_type.jpeg b/emdb_schemas/v3/current_v3/doc/img/emdb_xsd_Complex_Type_entry_type.jpeg
index 6ef293a..3583ad2 100644
Binary files a/emdb_schemas/v3/current_v3/doc/img/emdb_xsd_Complex_Type_entry_type.jpeg and b/emdb_schemas/v3/current_v3/doc/img/emdb_xsd_Complex_Type_entry_type.jpeg differ
diff --git a/emdb_schemas/v3/current_v3/doc/img/emdb_xsd_Element_emd.jpeg b/emdb_schemas/v3/current_v3/doc/img/emdb_xsd_Element_emd.jpeg
index dbded1a..4b2394e 100644
Binary files a/emdb_schemas/v3/current_v3/doc/img/emdb_xsd_Element_emd.jpeg and b/emdb_schemas/v3/current_v3/doc/img/emdb_xsd_Element_emd.jpeg differ
diff --git a/emdb_schemas/v3/current_v3/emdb.py b/emdb_schemas/v3/current_v3/emdb.py
index b57fdc4..e10af82 100644
--- a/emdb_schemas/v3/current_v3/emdb.py
+++ b/emdb_schemas/v3/current_v3/emdb.py
@@ -2,24 +2,24 @@
# -*- coding: utf-8 -*-
#
-# Generated Wed Dec 6 16:40:58 2023 by generateDS.py version 2.43.3.
+# Generated Mon Feb 5 18:29:43 2024 by generateDS.py version 2.43.3.
# Python 3.9.7 (default, Sep 16 2021, 08:50:36) [Clang 10.0.0 ]
#
# Command line options:
# ('--root-element', 'emd')
# ('-f', '')
-# ('-o', '/Users/sanja/IdeaProjects/emdb_schemas/emdb_schemas/v3/v3_0_9_1/emdb.py')
+# ('-o', '/Users/sanja/IdeaProjects/emdb_schemas/emdb_schemas/v3/v3_0_9_2/emdb.py')
# ('--no-warnings', '')
# ('--external-encoding', 'utf-8')
#
# Command line arguments:
-# /Users/sanja/IdeaProjects/emdb_schemas/emdb_schemas/v3/v3_0_9_1/emdb.xsd
+# /Users/sanja/IdeaProjects/emdb_schemas/emdb_schemas/v3/v3_0_9_2/emdb.xsd
#
# Command line:
-# /Users/sanja/generateDS/generateDS-2.43.3/generateDS.py --root-element="emd" -f -o "/Users/sanja/IdeaProjects/emdb_schemas/emdb_schemas/v3/v3_0_9_1/emdb.py" --no-warnings --external-encoding="utf-8" /Users/sanja/IdeaProjects/emdb_schemas/emdb_schemas/v3/v3_0_9_1/emdb.xsd
+# /Users/sanja/generateDS/generateDS-2.43.3/generateDS.py --root-element="emd" -f -o "/Users/sanja/IdeaProjects/emdb_schemas/emdb_schemas/v3/v3_0_9_2/emdb.py" --no-warnings --external-encoding="utf-8" /Users/sanja/IdeaProjects/emdb_schemas/emdb_schemas/v3/v3_0_9_2/emdb.xsd
#
# Current working directory (os.getcwd()):
-# v3_0_9_1
+# sanja
#
import sys
@@ -1034,12 +1034,14 @@ class allowed_film_or_detector_model(str, Enum):
FEIFALCONII_4_KX_4_K='FEI FALCON II (4k x 4k)'
FEIFALCONIII_4_KX_4_K='FEI FALCON III (4k x 4k)'
FEIFALCONIV_4_KX_4_K='FEI FALCON IV (4k x 4k)'
+ GATANALPINE_2_3_KX_3_2_K='GATAN ALPINE (2.3k x 3.2k)'
GATANK_2_4_KX_4_K='GATAN K2 (4k x 4k)'
GATANK_2BASE_4_KX_4_K='GATAN K2 BASE (4k x 4k)'
GATANK_2IS_4_KX_4_K='GATAN K2 IS (4k x 4k)'
GATANK_2QUANTUM_4_KX_4_K='GATAN K2 QUANTUM (4k x 4k)'
GATANK_2SUMMIT_4_KX_4_K='GATAN K2 SUMMIT (4k x 4k)'
GATANK_3_6_KX_4_K='GATAN K3 (6k x 4k)'
+ GATANK_3BIOCONTINUUM_6_KX_4_K='GATAN K3 BIOCONTINUUM (6k x 4k)'
GATANK_3BIOQUANTUM_6_KX_4_K='GATAN K3 BIOQUANTUM (6k x 4k)'
GATANMULTISCAN='GATAN MULTISCAN'
GATANORIUSSC_1000_4_KX_2_7_K='GATAN ORIUS SC1000 (4k x 2.7k)'
@@ -1768,7 +1770,7 @@ class entry_type(GeneratedsSuper):
__hash__ = GeneratedsSuper.__hash__
subclass = None
superclass = None
- def __init__(self, emdb_id=None, version='3.0.9.1', admin=None, crossreferences=None, sample=None, structure_determination_list=None, map=None, interpretation=None, validation=None, gds_collector_=None, **kwargs_):
+ def __init__(self, emdb_id=None, version='3.0.9.2', admin=None, crossreferences=None, sample=None, structure_determination_list=None, map=None, interpretation=None, validation=None, gds_collector_=None, **kwargs_):
self.gds_collector_ = gds_collector_
self.gds_elementtree_node_ = None
self.original_tagname_ = None
@@ -1894,7 +1896,7 @@ def _exportAttributes(self, outfile, level, already_processed, namespaceprefix_=
if self.emdb_id is not None and 'emdb_id' not in already_processed:
already_processed.add('emdb_id')
outfile.write(' emdb_id=%s' % (self.gds_encode(self.gds_format_string(quote_attrib(self.emdb_id), input_name='emdb_id')), ))
- if self.version != "3.0.9.1" and 'version' not in already_processed:
+ if self.version != "3.0.9.2" and 'version' not in already_processed:
already_processed.add('version')
outfile.write(' version=%s' % (self.gds_encode(self.gds_format_string(quote_attrib(self.version), input_name='version')), ))
def _exportChildren(self, outfile, level, namespaceprefix_='', namespacedef_='', name_='entry_type', fromsubclass_=False, pretty_print=True):
@@ -33691,7 +33693,7 @@ def validate_allowed_film_or_detector_model(self, value):
self.gds_collector_.add_message('Value "%(value)s"%(lineno)s is not of the correct base simple type (str)' % {"value": value, "lineno": lineno, })
return False
value = value
- enumerations = ['AGFA SCIENTA FILM', 'DECTRIS SINGLA (1k x 1k)', 'DECTRIS ELA (1k x 0.5k)', 'DIRECT ELECTRON APOLLO (4k x 4k)', 'DIRECT ELECTRON DE-10 (5k x 4k)', 'DIRECT ELECTRON DE-12 (4k x 3k)', 'DIRECT ELECTRON DE-16 (4k x 4k)', 'DIRECT ELECTRON DE-20 (5k x 3k)', 'DIRECT ELECTRON DE-64 (8k x 8k)', 'FEI CETA (4k x 4k)', 'FEI EAGLE (2k x 2k)', 'FEI EAGLE (4k x 4k)', 'FEI FALCON I (4k x 4k)', 'FEI FALCON II (4k x 4k)', 'FEI FALCON III (4k x 4k)', 'FEI FALCON IV (4k x 4k)', 'GATAN K2 (4k x 4k)', 'GATAN K2 BASE (4k x 4k)', 'GATAN K2 IS (4k x 4k)', 'GATAN K2 QUANTUM (4k x 4k)', 'GATAN K2 SUMMIT (4k x 4k)', 'GATAN K3 (6k x 4k)', 'GATAN K3 BIOQUANTUM (6k x 4k)', 'GATAN MULTISCAN', 'GATAN ORIUS SC1000 (4k x 2.7k)', 'GATAN ORIUS SC200 (2k x 2k)', 'GATAN ORIUS SC600 (2.7k x 2.7k)', 'GATAN ULTRASCAN 1000 (2k x 2k)', 'GATAN ULTRASCAN 10000 (10k x 10k)', 'GATAN ULTRASCAN 4000 (4k x 4k)', 'GENERIC CCD', 'GENERIC CCD (2k x 2k)', 'GENERIC CCD (4k x 4k)', 'GENERIC FILM', 'GENERIC GATAN', 'GENERIC GATAN (2k x 2k)', 'GENERIC GATAN (4k x 4k)', 'GENERIC IMAGE PLATES', 'GENERIC TVIPS', 'GENERIC TVIPS (2k x 2k)', 'GENERIC TVIPS (4k x 4k)', 'KODAK 4489 FILM', 'KODAK SO-163 FILM', 'OTHER', 'PROSCAN TEM-PIV (2k x 2k)', 'SIA 15C (3k x 3k)', 'TFS FALCON 4i (4k x 4k)', 'TVIPS TEMCAM-F216 (2k x 2k)', 'TVIPS TEMCAM-F224 (2k x 2k)', 'TVIPS TEMCAM-F415 (4k x 4k)', 'TVIPS TEMCAM-F416 (4k x 4k)', 'TVIPS TEMCAM-F816 (8k x 8k)']
+ enumerations = ['AGFA SCIENTA FILM', 'DECTRIS SINGLA (1k x 1k)', 'DECTRIS ELA (1k x 0.5k)', 'DIRECT ELECTRON APOLLO (4k x 4k)', 'DIRECT ELECTRON DE-10 (5k x 4k)', 'DIRECT ELECTRON DE-12 (4k x 3k)', 'DIRECT ELECTRON DE-16 (4k x 4k)', 'DIRECT ELECTRON DE-20 (5k x 3k)', 'DIRECT ELECTRON DE-64 (8k x 8k)', 'FEI CETA (4k x 4k)', 'FEI EAGLE (2k x 2k)', 'FEI EAGLE (4k x 4k)', 'FEI FALCON I (4k x 4k)', 'FEI FALCON II (4k x 4k)', 'FEI FALCON III (4k x 4k)', 'FEI FALCON IV (4k x 4k)', 'GATAN ALPINE (2.3k x 3.2k)', 'GATAN K2 (4k x 4k)', 'GATAN K2 BASE (4k x 4k)', 'GATAN K2 IS (4k x 4k)', 'GATAN K2 QUANTUM (4k x 4k)', 'GATAN K2 SUMMIT (4k x 4k)', 'GATAN K3 (6k x 4k)', 'GATAN K3 BIOCONTINUUM (6k x 4k)', 'GATAN K3 BIOQUANTUM (6k x 4k)', 'GATAN MULTISCAN', 'GATAN ORIUS SC1000 (4k x 2.7k)', 'GATAN ORIUS SC200 (2k x 2k)', 'GATAN ORIUS SC600 (2.7k x 2.7k)', 'GATAN ULTRASCAN 1000 (2k x 2k)', 'GATAN ULTRASCAN 10000 (10k x 10k)', 'GATAN ULTRASCAN 4000 (4k x 4k)', 'GENERIC CCD', 'GENERIC CCD (2k x 2k)', 'GENERIC CCD (4k x 4k)', 'GENERIC FILM', 'GENERIC GATAN', 'GENERIC GATAN (2k x 2k)', 'GENERIC GATAN (4k x 4k)', 'GENERIC IMAGE PLATES', 'GENERIC TVIPS', 'GENERIC TVIPS (2k x 2k)', 'GENERIC TVIPS (4k x 4k)', 'KODAK 4489 FILM', 'KODAK SO-163 FILM', 'OTHER', 'PROSCAN TEM-PIV (2k x 2k)', 'SIA 15C (3k x 3k)', 'TFS FALCON 4i (4k x 4k)', 'TVIPS TEMCAM-F216 (2k x 2k)', 'TVIPS TEMCAM-F224 (2k x 2k)', 'TVIPS TEMCAM-F415 (4k x 4k)', 'TVIPS TEMCAM-F416 (4k x 4k)', 'TVIPS TEMCAM-F816 (8k x 8k)']
if value not in enumerations:
lineno = self.gds_get_node_lineno_()
self.gds_collector_.add_message('Value "%(value)s"%(lineno)s does not match xsd enumeration restriction on allowed_film_or_detector_model' % {"value" : encode_str_2_3(value), "lineno": lineno} )
diff --git a/emdb_schemas/v3/current_v3/emdb.xsd b/emdb_schemas/v3/current_v3/emdb.xsd
index 9e802ec..0964515 100644
--- a/emdb_schemas/v3/current_v3/emdb.xsd
+++ b/emdb_schemas/v3/current_v3/emdb.xsd
@@ -25,7 +25,7 @@
-
+
@@ -2683,12 +2683,14 @@
+
+
diff --git a/emdb_schemas/v3/current_v3/emdb_relaxed.py b/emdb_schemas/v3/current_v3/emdb_relaxed.py
index 25242b1..2fb9b7f 100644
--- a/emdb_schemas/v3/current_v3/emdb_relaxed.py
+++ b/emdb_schemas/v3/current_v3/emdb_relaxed.py
@@ -2,24 +2,24 @@
# -*- coding: utf-8 -*-
#
-# Generated Wed Dec 6 16:42:07 2023 by generateDS.py version 2.43.3.
-# Python 3.9.7 (default, Sep 16 2021, 08:50:36) [Clang 10.0.0 ]
+# Generated Mon Feb 5 18:34:39 2024 by generateDS.py version 2.43.3.
+# Python 3.8.13 (default, Mar 28 2022, 06:16:26) [Clang 12.0.0 ]
#
# Command line options:
# ('--root-element', 'emd')
# ('-f', '')
-# ('-o', '/Users/sanja/IdeaProjects/emdb_schemas/emdb_schemas/v3/v3_0_9_1/emdb_relaxed.py')
+# ('-o', '/Users/sanja/IdeaProjects/emdb_schemas/emdb_schemas/v3/v3_0_9_2/emdb_relaxed.py')
# ('--no-warnings', '')
# ('--external-encoding', 'utf-8')
#
# Command line arguments:
-# /Users/sanja/IdeaProjects/emdb_schemas/emdb_schemas/v3/v3_0_9_1/emdb_relaxed.xsd
+# /Users/sanja/IdeaProjects/emdb_schemas/emdb_schemas/v3/v3_0_9_2/emdb_relaxed.xsd
#
# Command line:
-# /Users/sanja/generateDS/generateDS-2.43.3/generateDS.py --root-element="emd" -f -o "/Users/sanja/IdeaProjects/emdb_schemas/emdb_schemas/v3/v3_0_9_1/emdb_relaxed.py" --no-warnings --external-encoding="utf-8" /Users/sanja/IdeaProjects/emdb_schemas/emdb_schemas/v3/v3_0_9_1/emdb_relaxed.xsd
+# /Users/sanja/generateDS/generateDS-2.43.3/generateDS.py --root-element="emd" -f -o "/Users/sanja/IdeaProjects/emdb_schemas/emdb_schemas/v3/v3_0_9_2/emdb_relaxed.py" --no-warnings --external-encoding="utf-8" /Users/sanja/IdeaProjects/emdb_schemas/emdb_schemas/v3/v3_0_9_2/emdb_relaxed.xsd
#
# Current working directory (os.getcwd()):
-# v3_0_9_1
+# v3
#
import sys
@@ -1034,12 +1034,14 @@ class allowed_film_or_detector_model(str, Enum):
FEIFALCONII_4_KX_4_K='FEI FALCON II (4k x 4k)'
FEIFALCONIII_4_KX_4_K='FEI FALCON III (4k x 4k)'
FEIFALCONIV_4_KX_4_K='FEI FALCON IV (4k x 4k)'
+ GATANALPINE_2_3_KX_3_2_K='GATAN ALPINE (2.3k x 3.2k)'
GATANK_2_4_KX_4_K='GATAN K2 (4k x 4k)'
GATANK_2BASE_4_KX_4_K='GATAN K2 BASE (4k x 4k)'
GATANK_2IS_4_KX_4_K='GATAN K2 IS (4k x 4k)'
GATANK_2QUANTUM_4_KX_4_K='GATAN K2 QUANTUM (4k x 4k)'
GATANK_2SUMMIT_4_KX_4_K='GATAN K2 SUMMIT (4k x 4k)'
GATANK_3_6_KX_4_K='GATAN K3 (6k x 4k)'
+ GATANK_3BIOCONTINUUM_6_KX_4_K='GATAN K3 BIOCONTINUUM (6k x 4k)'
GATANK_3BIOQUANTUM_6_KX_4_K='GATAN K3 BIOQUANTUM (6k x 4k)'
GATANMULTISCAN='GATAN MULTISCAN'
GATANORIUSSC_1000_4_KX_2_7_K='GATAN ORIUS SC1000 (4k x 2.7k)'
@@ -1773,7 +1775,7 @@ class entry_type(GeneratedsSuper):
__hash__ = GeneratedsSuper.__hash__
subclass = None
superclass = None
- def __init__(self, emdb_id=None, version='3.0.9.1', admin=None, crossreferences=None, sample=None, structure_determination_list=None, map=None, interpretation=None, validation=None, gds_collector_=None, **kwargs_):
+ def __init__(self, emdb_id=None, version='3.0.9.2', admin=None, crossreferences=None, sample=None, structure_determination_list=None, map=None, interpretation=None, validation=None, gds_collector_=None, **kwargs_):
self.gds_collector_ = gds_collector_
self.gds_elementtree_node_ = None
self.original_tagname_ = None
@@ -1899,7 +1901,7 @@ def _exportAttributes(self, outfile, level, already_processed, namespaceprefix_=
if self.emdb_id is not None and 'emdb_id' not in already_processed:
already_processed.add('emdb_id')
outfile.write(' emdb_id=%s' % (self.gds_encode(self.gds_format_string(quote_attrib(self.emdb_id), input_name='emdb_id')), ))
- if self.version != "3.0.9.1" and 'version' not in already_processed:
+ if self.version != "3.0.9.2" and 'version' not in already_processed:
already_processed.add('version')
outfile.write(' version=%s' % (self.gds_encode(self.gds_format_string(quote_attrib(self.version), input_name='version')), ))
def _exportChildren(self, outfile, level, namespaceprefix_='', namespacedef_='', name_='entry_type', fromsubclass_=False, pretty_print=True):
@@ -33692,7 +33694,7 @@ def validate_allowed_film_or_detector_model(self, value):
self.gds_collector_.add_message('Value "%(value)s"%(lineno)s is not of the correct base simple type (str)' % {"value": value, "lineno": lineno, })
return False
value = value
- enumerations = ['AGFA SCIENTA FILM', 'DECTRIS SINGLA (1k x 1k)', 'DECTRIS ELA (1k x 0.5k)', 'DIRECT ELECTRON APOLLO (4k x 4k)', 'DIRECT ELECTRON DE-10 (5k x 4k)', 'DIRECT ELECTRON DE-12 (4k x 3k)', 'DIRECT ELECTRON DE-16 (4k x 4k)', 'DIRECT ELECTRON DE-20 (5k x 3k)', 'DIRECT ELECTRON DE-64 (8k x 8k)', 'FEI CETA (4k x 4k)', 'FEI EAGLE (2k x 2k)', 'FEI EAGLE (4k x 4k)', 'FEI FALCON I (4k x 4k)', 'FEI FALCON II (4k x 4k)', 'FEI FALCON III (4k x 4k)', 'FEI FALCON IV (4k x 4k)', 'GATAN K2 (4k x 4k)', 'GATAN K2 BASE (4k x 4k)', 'GATAN K2 IS (4k x 4k)', 'GATAN K2 QUANTUM (4k x 4k)', 'GATAN K2 SUMMIT (4k x 4k)', 'GATAN K3 (6k x 4k)', 'GATAN K3 BIOQUANTUM (6k x 4k)', 'GATAN MULTISCAN', 'GATAN ORIUS SC1000 (4k x 2.7k)', 'GATAN ORIUS SC200 (2k x 2k)', 'GATAN ORIUS SC600 (2.7k x 2.7k)', 'GATAN ULTRASCAN 1000 (2k x 2k)', 'GATAN ULTRASCAN 10000 (10k x 10k)', 'GATAN ULTRASCAN 4000 (4k x 4k)', 'GENERIC CCD', 'GENERIC CCD (2k x 2k)', 'GENERIC CCD (4k x 4k)', 'GENERIC FILM', 'GENERIC GATAN', 'GENERIC GATAN (2k x 2k)', 'GENERIC GATAN (4k x 4k)', 'GENERIC IMAGE PLATES', 'GENERIC TVIPS', 'GENERIC TVIPS (2k x 2k)', 'GENERIC TVIPS (4k x 4k)', 'KODAK 4489 FILM', 'KODAK SO-163 FILM', 'OTHER', 'PROSCAN TEM-PIV (2k x 2k)', 'SIA 15C (3k x 3k)', 'TFS FALCON 4i (4k x 4k)', 'TVIPS TEMCAM-F216 (2k x 2k)', 'TVIPS TEMCAM-F224 (2k x 2k)', 'TVIPS TEMCAM-F415 (4k x 4k)', 'TVIPS TEMCAM-F416 (4k x 4k)', 'TVIPS TEMCAM-F816 (8k x 8k)']
+ enumerations = ['AGFA SCIENTA FILM', 'DECTRIS SINGLA (1k x 1k)', 'DECTRIS ELA (1k x 0.5k)', 'DIRECT ELECTRON APOLLO (4k x 4k)', 'DIRECT ELECTRON DE-10 (5k x 4k)', 'DIRECT ELECTRON DE-12 (4k x 3k)', 'DIRECT ELECTRON DE-16 (4k x 4k)', 'DIRECT ELECTRON DE-20 (5k x 3k)', 'DIRECT ELECTRON DE-64 (8k x 8k)', 'FEI CETA (4k x 4k)', 'FEI EAGLE (2k x 2k)', 'FEI EAGLE (4k x 4k)', 'FEI FALCON I (4k x 4k)', 'FEI FALCON II (4k x 4k)', 'FEI FALCON III (4k x 4k)', 'FEI FALCON IV (4k x 4k)', 'GATAN ALPINE (2.3k x 3.2k)', 'GATAN K2 (4k x 4k)', 'GATAN K2 BASE (4k x 4k)', 'GATAN K2 IS (4k x 4k)', 'GATAN K2 QUANTUM (4k x 4k)', 'GATAN K2 SUMMIT (4k x 4k)', 'GATAN K3 (6k x 4k)', 'GATAN K3 BIOCONTINUUM (6k x 4k)', 'GATAN K3 BIOQUANTUM (6k x 4k)', 'GATAN MULTISCAN', 'GATAN ORIUS SC1000 (4k x 2.7k)', 'GATAN ORIUS SC200 (2k x 2k)', 'GATAN ORIUS SC600 (2.7k x 2.7k)', 'GATAN ULTRASCAN 1000 (2k x 2k)', 'GATAN ULTRASCAN 10000 (10k x 10k)', 'GATAN ULTRASCAN 4000 (4k x 4k)', 'GENERIC CCD', 'GENERIC CCD (2k x 2k)', 'GENERIC CCD (4k x 4k)', 'GENERIC FILM', 'GENERIC GATAN', 'GENERIC GATAN (2k x 2k)', 'GENERIC GATAN (4k x 4k)', 'GENERIC IMAGE PLATES', 'GENERIC TVIPS', 'GENERIC TVIPS (2k x 2k)', 'GENERIC TVIPS (4k x 4k)', 'KODAK 4489 FILM', 'KODAK SO-163 FILM', 'OTHER', 'PROSCAN TEM-PIV (2k x 2k)', 'SIA 15C (3k x 3k)', 'TFS FALCON 4i (4k x 4k)', 'TVIPS TEMCAM-F216 (2k x 2k)', 'TVIPS TEMCAM-F224 (2k x 2k)', 'TVIPS TEMCAM-F415 (4k x 4k)', 'TVIPS TEMCAM-F416 (4k x 4k)', 'TVIPS TEMCAM-F816 (8k x 8k)']
if value not in enumerations:
lineno = self.gds_get_node_lineno_()
self.gds_collector_.add_message('Value "%(value)s"%(lineno)s does not match xsd enumeration restriction on allowed_film_or_detector_model' % {"value" : encode_str_2_3(value), "lineno": lineno} )
diff --git a/emdb_schemas/v3/current_v3/emdb_relaxed.xsd b/emdb_schemas/v3/current_v3/emdb_relaxed.xsd
index 47436ec..693fb5f 100644
--- a/emdb_schemas/v3/current_v3/emdb_relaxed.xsd
+++ b/emdb_schemas/v3/current_v3/emdb_relaxed.xsd
@@ -24,7 +24,7 @@
-
+
@@ -2538,12 +2538,14 @@
+
+
| |