Reconciled fix for 2n2w and 6feg

wwPDB · Jul 23, 2024 · 7ed0518 · 7ed0518
1 parent 3ceb951
commit 7ed0518
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/wwpdb/utils/nmr/mr/CharmmMRParserListener.py b/wwpdb/utils/nmr/mr/CharmmMRParserListener.py
@@ -982,8 +982,6 @@ def exitCharmm_mr(self, ctx: CharmmMRParser.Charmm_mrContext):  # pylint: disabl
                     del self.reasonsForReParsing['inhibit_label_seq_scheme']
                 if 'seq_id_remap' in self.reasonsForReParsing:
                     del self.reasonsForReParsing['seq_id_remap']
-                if 'global_sequence_offset' in self.reasonsForReParsing:
-                    del self.reasonsForReParsing['global_sequence_offset']
                 if len(_seqIdRemap) > 0 and 'chain_id_remap' not in self.reasonsForReParsing:
                     _chainIds = [d['chain_id'] for d in _seqIdRemap]
                     chainIds = [k for k, v in self.reasonsForReParsing['global_auth_sequence_offset'].items() if v is not None]
@@ -1010,6 +1008,8 @@ def exitCharmm_mr(self, ctx: CharmmMRParser.Charmm_mrContext):  # pylint: disabl
                                         break
                                     chainIdRemap[auth_seq_id] = {'chain_id': chainId, 'seq_id': auth_seq_id}
                         if valid:
+                            if 'global_sequence_offset' in self.reasonsForReParsing:
+                                del self.reasonsForReParsing['global_sequence_offset']
                             del self.reasonsForReParsing['global_auth_sequence_offset']
                             self.reasonsForReParsing['chain_id_remap'] = chainIdRemap
 

diff --git a/wwpdb/utils/nmr/mr/CnsMRParserListener.py b/wwpdb/utils/nmr/mr/CnsMRParserListener.py
@@ -1135,8 +1135,6 @@ def exitCns_mr(self, ctx: CnsMRParser.Cns_mrContext):  # pylint: disable=unused-
                     del self.reasonsForReParsing['inhibit_label_seq_scheme']
                 if 'seq_id_remap' in self.reasonsForReParsing:
                     del self.reasonsForReParsing['seq_id_remap']
-                if 'global_sequence_offset' in self.reasonsForReParsing:
-                    del self.reasonsForReParsing['global_sequence_offset']
                 if len(_seqIdRemap) > 0 and 'chain_id_remap' not in self.reasonsForReParsing:
                     _chainIds = [d['chain_id'] for d in _seqIdRemap]
                     chainIds = [k for k, v in self.reasonsForReParsing['global_auth_sequence_offset'].items() if v is not None]
@@ -1163,6 +1161,8 @@ def exitCns_mr(self, ctx: CnsMRParser.Cns_mrContext):  # pylint: disable=unused-
                                         break
                                     chainIdRemap[auth_seq_id] = {'chain_id': chainId, 'seq_id': auth_seq_id}
                         if valid:
+                            if 'global_sequence_offset' in self.reasonsForReParsing:
+                                del self.reasonsForReParsing['global_sequence_offset']
                             del self.reasonsForReParsing['global_auth_sequence_offset']
                             self.reasonsForReParsing['chain_id_remap'] = chainIdRemap
 

diff --git a/wwpdb/utils/nmr/mr/XplorMRParserListener.py b/wwpdb/utils/nmr/mr/XplorMRParserListener.py
@@ -1277,8 +1277,6 @@ def exitXplor_nih_mr(self, ctx: XplorMRParser.Xplor_nih_mrContext):  # pylint: d
                     del self.reasonsForReParsing['inhibit_label_seq_scheme']
                 if 'seq_id_remap' in self.reasonsForReParsing:
                     del self.reasonsForReParsing['seq_id_remap']
-                if 'global_sequence_offset' in self.reasonsForReParsing:
-                    del self.reasonsForReParsing['global_sequence_offset']
                 if len(_seqIdRemap) > 0 and 'chain_id_remap' not in self.reasonsForReParsing:
                     _chainIds = [d['chain_id'] for d in _seqIdRemap]
                     chainIds = [k for k, v in self.reasonsForReParsing['global_auth_sequence_offset'].items() if v is not None]
@@ -1305,6 +1303,8 @@ def exitXplor_nih_mr(self, ctx: XplorMRParser.Xplor_nih_mrContext):  # pylint: d
                                         break
                                     chainIdRemap[auth_seq_id] = {'chain_id': chainId, 'seq_id': auth_seq_id}
                         if valid:
+                            if 'global_sequence_offset' in self.reasonsForReParsing:
+                                del self.reasonsForReParsing['global_sequence_offset']
                             del self.reasonsForReParsing['global_auth_sequence_offset']
                             self.reasonsForReParsing['chain_id_remap'] = chainIdRemap