emdbva 0.0.1.dev151__tar.gz → 0.0.1.dev152__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {emdbva-0.0.1.dev151/emdbva.egg-info → emdbva-0.0.1.dev152}/PKG-INFO +1 -1
- {emdbva-0.0.1.dev151 → emdbva-0.0.1.dev152/emdbva.egg-info}/PKG-INFO +1 -1
- {emdbva-0.0.1.dev151 → emdbva-0.0.1.dev152}/va/preparation.py +2 -1
- {emdbva-0.0.1.dev151 → emdbva-0.0.1.dev152}/va/prepareandrun_codon_airflow.py +2 -1
- {emdbva-0.0.1.dev151 → emdbva-0.0.1.dev152}/va/schemas/emdb_entry_full.schema.json +1 -1
- {emdbva-0.0.1.dev151 → emdbva-0.0.1.dev152}/va/validationanalysis.py +5 -9
- {emdbva-0.0.1.dev151 → emdbva-0.0.1.dev152}/va/version.py +1 -1
- {emdbva-0.0.1.dev151 → emdbva-0.0.1.dev152}/LICENSE +0 -0
- {emdbva-0.0.1.dev151 → emdbva-0.0.1.dev152}/MANIFEST.in +0 -0
- {emdbva-0.0.1.dev151 → emdbva-0.0.1.dev152}/README.rst +0 -0
- {emdbva-0.0.1.dev151 → emdbva-0.0.1.dev152}/emdbva.egg-info/SOURCES.txt +0 -0
- {emdbva-0.0.1.dev151 → emdbva-0.0.1.dev152}/emdbva.egg-info/dependency_links.txt +0 -0
- {emdbva-0.0.1.dev151 → emdbva-0.0.1.dev152}/emdbva.egg-info/entry_points.txt +0 -0
- {emdbva-0.0.1.dev151 → emdbva-0.0.1.dev152}/emdbva.egg-info/requires.txt +0 -0
- {emdbva-0.0.1.dev151 → emdbva-0.0.1.dev152}/emdbva.egg-info/top_level.txt +0 -0
- {emdbva-0.0.1.dev151 → emdbva-0.0.1.dev152}/setup.cfg +0 -0
- {emdbva-0.0.1.dev151 → emdbva-0.0.1.dev152}/setup.py +0 -0
- {emdbva-0.0.1.dev151 → emdbva-0.0.1.dev152}/va/PATHS_codon_airflow.py +0 -0
- {emdbva-0.0.1.dev151 → emdbva-0.0.1.dev152}/va/__init__.py +0 -0
- {emdbva-0.0.1.dev151 → emdbva-0.0.1.dev152}/va/audit/__init__.py +0 -0
- {emdbva-0.0.1.dev151 → emdbva-0.0.1.dev152}/va/audit/cif_revision.py +0 -0
- {emdbva-0.0.1.dev151 → emdbva-0.0.1.dev152}/va/mainva.py +0 -0
- {emdbva-0.0.1.dev151 → emdbva-0.0.1.dev152}/va/metrics/__init__.py +0 -0
- {emdbva-0.0.1.dev151 → emdbva-0.0.1.dev152}/va/metrics/bars.py +0 -0
- {emdbva-0.0.1.dev151 → emdbva-0.0.1.dev152}/va/metrics/connected_percentage.py +0 -0
- {emdbva-0.0.1.dev151 → emdbva-0.0.1.dev152}/va/metrics/contour_level_predicator.py +0 -0
- {emdbva-0.0.1.dev151 → emdbva-0.0.1.dev152}/va/metrics/emda_mmcc.py +0 -0
- {emdbva-0.0.1.dev151 → emdbva-0.0.1.dev152}/va/metrics/emringer.py +0 -0
- {emdbva-0.0.1.dev151 → emdbva-0.0.1.dev152}/va/metrics/inclusion.py +0 -0
- {emdbva-0.0.1.dev151 → emdbva-0.0.1.dev152}/va/metrics/map_data_validation.py +0 -0
- {emdbva-0.0.1.dev151 → emdbva-0.0.1.dev152}/va/metrics/map_map_cc.py +0 -0
- {emdbva-0.0.1.dev151 → emdbva-0.0.1.dev152}/va/metrics/overlap_percentage.py +0 -0
- {emdbva-0.0.1.dev151 → emdbva-0.0.1.dev152}/va/metrics/phaserandomization.py +0 -0
- {emdbva-0.0.1.dev151 → emdbva-0.0.1.dev152}/va/metrics/phenix_cc.py +0 -0
- {emdbva-0.0.1.dev151 → emdbva-0.0.1.dev152}/va/metrics/phenix_mm.py +0 -0
- {emdbva-0.0.1.dev151 → emdbva-0.0.1.dev152}/va/metrics/projections.py +0 -0
- {emdbva-0.0.1.dev151 → emdbva-0.0.1.dev152}/va/metrics/qscore.py +0 -0
- {emdbva-0.0.1.dev151 → emdbva-0.0.1.dev152}/va/metrics/residue_locres.py +0 -0
- {emdbva-0.0.1.dev151 → emdbva-0.0.1.dev152}/va/metrics/resmap.py +0 -0
- {emdbva-0.0.1.dev151 → emdbva-0.0.1.dev152}/va/metrics/smoc.py +0 -0
- {emdbva-0.0.1.dev151 → emdbva-0.0.1.dev152}/va/metrics/strudel.py +0 -0
- {emdbva-0.0.1.dev151 → emdbva-0.0.1.dev152}/va/metrics/surfaces.py +0 -0
- {emdbva-0.0.1.dev151 → emdbva-0.0.1.dev152}/va/metrics/threedfsc.py +0 -0
- {emdbva-0.0.1.dev151 → emdbva-0.0.1.dev152}/va/qscores.csv +0 -0
- {emdbva-0.0.1.dev151 → emdbva-0.0.1.dev152}/va/schemas/__init__.py +0 -0
- {emdbva-0.0.1.dev151 → emdbva-0.0.1.dev152}/va/schemas/loader.py +0 -0
- {emdbva-0.0.1.dev151 → emdbva-0.0.1.dev152}/va/utils/Checker.py +0 -0
- {emdbva-0.0.1.dev151 → emdbva-0.0.1.dev152}/va/utils/ChimeraxViews.py +0 -0
- {emdbva-0.0.1.dev151 → emdbva-0.0.1.dev152}/va/utils/MapProcessor.py +0 -0
- {emdbva-0.0.1.dev151 → emdbva-0.0.1.dev152}/va/utils/Model.py +0 -0
- {emdbva-0.0.1.dev151 → emdbva-0.0.1.dev152}/va/utils/__init__.py +0 -0
- {emdbva-0.0.1.dev151 → emdbva-0.0.1.dev152}/va/utils/cl_weights.pth +0 -0
- {emdbva-0.0.1.dev151 → emdbva-0.0.1.dev152}/va/utils/log_utils.py +0 -0
- {emdbva-0.0.1.dev151 → emdbva-0.0.1.dev152}/va/utils/misc.py +0 -0
- {emdbva-0.0.1.dev151 → emdbva-0.0.1.dev152}/va/utils/rescolor.py +0 -0
- {emdbva-0.0.1.dev151 → emdbva-0.0.1.dev152}/va/utils/stars.py +0 -0
|
@@ -961,7 +961,8 @@ class PreParation:
|
|
|
961
961
|
|
|
962
962
|
breakdigits = 2
|
|
963
963
|
emdbidmin = 4
|
|
964
|
-
|
|
964
|
+
emdbidmax = 7
|
|
965
|
+
if isinstance(emdid, str) and emdid.isdigit() and emdbidmin <= len(emdid) <= emdbidmax:
|
|
965
966
|
topsubpath = emdid[:breakdigits]
|
|
966
967
|
middlesubpath = emdid[breakdigits:-breakdigits]
|
|
967
968
|
subpath = os.path.join(topsubpath, middlesubpath, emdid)
|
|
@@ -149,8 +149,9 @@ class prepareandrun():
|
|
|
149
149
|
idsubdirs = collections.OrderedDict()
|
|
150
150
|
breakdigits = 2
|
|
151
151
|
emdbidmin = 4
|
|
152
|
+
emdbidmax = 7
|
|
152
153
|
for id in emdids:
|
|
153
|
-
if
|
|
154
|
+
if isinstance(id, str) and id.isdigit() and emdbidmin <= len(id) <= emdbidmax:
|
|
154
155
|
topsubpath = id[:breakdigits]
|
|
155
156
|
middlesubpath = id[breakdigits:-breakdigits]
|
|
156
157
|
subpath = os.path.join(topsubpath, middlesubpath, id)
|
|
@@ -211,15 +211,11 @@ class ValidationAnalysis:
|
|
|
211
211
|
else:
|
|
212
212
|
self.cl = contourlevel
|
|
213
213
|
if self.emdid:
|
|
214
|
-
|
|
215
|
-
if len(
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
subdir = '{}/{}/{}/'.format(digits[0] + digits[1], digits[2], self.emdid)
|
|
220
|
-
self.workdir = MAP_SERVER_PATH + subdir + 'va/'
|
|
221
|
-
else:
|
|
222
|
-
pass
|
|
214
|
+
emdid_text = str(self.emdid)
|
|
215
|
+
if not emdid_text.isdigit() or not 4 <= len(emdid_text) <= 7:
|
|
216
|
+
raise ValueError('EMDB IDs must contain 4 to 7 digits.')
|
|
217
|
+
subdir = os.path.join(emdid_text[:2], emdid_text[2:-2], emdid_text)
|
|
218
|
+
self.workdir = os.path.join(MAP_SERVER_PATH, subdir, 'va') + '/'
|
|
223
219
|
self.queue = queue
|
|
224
220
|
else:
|
|
225
221
|
self.workdir = workdir
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|