v1.3.8.18 (25/11/2019) - bug fix: added except statement in get_gda_b…

…arcodes to catch errors during parsing of multiple visits (#271)
xchem · Nov 25, 2019 · 0a78200 · 0a78200
1 parent 2cd68f3
commit 0a78200
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/ChangeLog.txt b/ChangeLog.txt
@@ -1,3 +1,6 @@
+v1.3.8.18 (25/11/2019)
+- bug fix: added except statement in get_gda_barcodes to catch errors during parsing of multiple visits
+
 v1.3.8.17 (20/11/2019)
 - bug fix: refine routine in XChemCootReference.py did not contain argument for covalent bonds
 

diff --git a/gui_scripts/settings_preferences.py b/gui_scripts/settings_preferences.py
@@ -30,7 +30,7 @@ def set_xce_logfile(self, xce_object):
 
     def settings(self, xce_object):
         # set XCE version
-        xce_object.xce_version = 'v1.3.8.17'
+        xce_object.xce_version = 'v1.3.8.18'
 
         # general settings
         xce_object.allowed_unitcell_difference_percent = 12

diff --git a/lib/XChemLog.py b/lib/XChemLog.py
@@ -26,7 +26,7 @@ def create_logfile(self,version):
             '     #                                                                     #\n'
             '     # Version: %s                                       #\n' %pasteVersion+
             '     #                                                                     #\n'
-            '     # Date: 20/11/2019                                                    #\n'
+            '     # Date: 25/11/2019                                                    #\n'
             '     #                                                                     #\n'
             '     # Authors: Tobias Krojer, Structural Genomics Consortium, Oxford, UK  #\n'
             '     #          [email protected]                                 #\n'

diff --git a/lib/XChemMain.py b/lib/XChemMain.py
@@ -484,7 +484,10 @@ def get_gda_barcodes(sampleList,gzipped_logs_parsed,gda_log_start_line,beamline,
                             Logfile.insert(
                             'found: sample={0!s}, barcode={1!s}, file={2!s}'.format(sampleID, barcode, gdaLogFile))
                         found_barcode_entry = False
-            gda_log_start_line = gda_log_start_line + n -1
+            try:
+                gda_log_start_line = gda_log_start_line + n -1
+            except UnboundLocalError:
+                gda_log_start_line = gda_log_start_line
 
     return pinDict,gda_log_start_line