Merge branch 'release/2.1.3'

thespacedoctor · Jun 5, 2020 · 63c00f2 · 63c00f2
2 parents 64ed1e8 + e535b40
commit 63c00f2
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,6 +1,11 @@
 
 ## Release Notes
 
+**v2.1.3 - June 5, 2020**
+
+**refactor**: stop sherlock checking for transient database triggers if running in non-update mode
+**fixed**: another sdss photoz issue where photoz ranking about specz
+
 **v2.1.2 - May 24, 2020**
 
 * **fixed:** merged result parameters are now merged correctly

diff --git a/sherlock/__version__.py b/sherlock/__version__.py
@@ -1 +1 @@
-__version__ = '2.1.2'
+__version__ = '2.1.3'
diff --git a/sherlock/transient_catalogue_crossmatch.py b/sherlock/transient_catalogue_crossmatch.py
@@ -576,8 +576,6 @@ def _annotate_crossmatch_with_value_added_parameters(
         if 'z' in crossmatchDict:
             # THE CATALOGUE HAS A REDSHIFT COLUMN
             redshift = crossmatchDict['z']
-        elif 'photoZ' in crossmatchDict:
-            redshift = crossmatchDict['photoZ']
         if redshift and redshift > 0.0:
             # CALCULATE DISTANCE MODULUS, ETC
             c = converter(log=self.log)

diff --git a/sherlock/transient_classifier.py b/sherlock/transient_classifier.py
@@ -249,7 +249,7 @@ def classify(self):
             dbConn=self.cataloguesDbConn
         )
 
-        if self.transientsDbConn:
+        if self.transientsDbConn and self.update:
             self._create_tables_if_not_exist()
 
         import time
@@ -1225,7 +1225,7 @@ def _print_results_to_stdout(
             )
             tableData = dataSet.table(filepath=None)
 
-            print(tableData.decode("UTF-8"))
+            print(tableData)
 
         self.log.debug('completed the ``_print_results_to_stdout`` method')
         return None
@@ -1799,7 +1799,7 @@ def generate_match_annotation(
 
 
         ```python
-        usage code 
+        usage code
         ```
 
         ---