emdbva 0.0.1.dev132__tar.gz → 0.0.1.dev134__tar.gz

{emdbva-0.0.1.dev132/emdbva.egg-info → emdbva-0.0.1.dev134}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: emdbva
-Version: 0.0.1.dev132
+Version: 0.0.1.dev134
 Summary: CryoEM validation toolkit
 Home-page: https://test.pypi.org/project/va/
 Author: Zhe Wang

{emdbva-0.0.1.dev132 → emdbva-0.0.1.dev134/emdbva.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: emdbva
-Version: 0.0.1.dev132
+Version: 0.0.1.dev134
 Summary: CryoEM validation toolkit
 Home-page: https://test.pypi.org/project/va/
 Author: Zhe Wang

{emdbva-0.0.1.dev132 → emdbva-0.0.1.dev134}/va/metrics/phaserandomization.py

@@ -183,8 +183,8 @@ def calculate_pixels(angpix):
     """
 
     if angpix != 0:
-        dilatepx = 10 / angpix
-        softpx = 5 / angpix
+        dilatepx = 10 * angpix
+        softpx = 5 * angpix
         return dilatepx, softpx
     else:
         print('No hard and soft radius for mask as voxel value is 0.')

{emdbva-0.0.1.dev132 → emdbva-0.0.1.dev134}/va/preparation.py

@@ -774,6 +774,29 @@ class PreParation:
                 if db_name == 'PDB' and accession_code:
                     db_info['accession'] = accession_code
 
+        # Fallback: if no PDB id found in _database_2, try _em_db_reference
+        if 'accession' not in db_info:
+            em_access = block.find_value('_em_db_reference.access_code')
+            em_dbname = block.find_value('_em_db_reference.db_name')
+
+            # Case 1: _em_db_reference is a single (non-loop) category
+            if em_access and str(em_access).strip() not in ('?', '.', ''):
+                if em_dbname and str(em_dbname).strip().upper() == 'PDB':
+                    db_info['PDB'] = str(em_access).strip().strip("'").strip('"')
+
+            # Case 2: _em_db_reference is looped (multiple references)
+            else:
+                em_access_col = block.find_loop('_em_db_reference.access_code')
+                em_dbname_col = block.find_loop('_em_db_reference.db_name')
+
+                if em_access_col and em_dbname_col:
+                    for acc, name in zip(em_access_col, em_dbname_col):
+                        acc_s = str(acc).strip().strip("'").strip('"')
+                        name_s = str(name).strip().strip("'").strip('"')
+                        if name_s.upper() == 'PDB' and acc_s not in ('', '?', '.'):
+                            db_info['PDB'] = acc_s
+                            break  # take first PDB accession found
+
         # Final merge and return
         result = {
             'resolution': resolution,

{emdbva-0.0.1.dev132 → emdbva-0.0.1.dev134}/va/version.py

@@ -18,5 +18,5 @@ under the License.
 
 """
 
-__version__ = '0.0.1.dev132'
+__version__ = '0.0.1.dev134'
 __em_statistics_version__ = '202505.v01'