Ignore negative redshifts while selecting highest crosscorr peak.

Remove "Done!" box when finished
daniel-muthukrishna · Sep 14, 2018 · 5b363ff · 5b363ff
1 parent 7228130
commit 5b363ff
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/astrodash/calculate_redshift.py b/astrodash/calculate_redshift.py
@@ -27,11 +27,12 @@ def cross_correlation(inputFlux, tempFlux, nw, tempMinMaxIndex):
 
 
 def calc_redshift_from_crosscorr(crossCorr, nw, dwlog):
-    deltaPeak = np.argmax(crossCorr)
+    # Find max peak while ignoring peaks that lead to negative redshifts
+    deltaPeak = np.argmax(crossCorr[:int(nw/2)+1])
 
     # z = np.exp(deltaPeak * dwlog) - 1 #equation 13 of Blondin)
     zAxisIndex = np.concatenate((np.arange(-nw / 2, 0), np.arange(0, nw / 2)))
-    if deltaPeak < nw / 2:
+    if deltaPeak <= nw / 2:
         z = (np.exp(abs(zAxisIndex) * dwlog) - 1)[deltaPeak]
     else:
         z = -(np.exp(abs(zAxisIndex) * dwlog) - 1)[deltaPeak]

diff --git a/astrodash/gui_main.py b/astrodash/gui_main.py
@@ -306,7 +306,7 @@ def done_fit_thread_single_redshift(self):
             self.set_plot_redshift(self.bestRedshift)
             self.plot_cross_corr()
             self.progressBar.setValue(100)
-            QtGui.QMessageBox.information(self, "Done!", "Finished Fitting Input Spectrum")
+            # QtGui.QMessageBox.information(self, "Done!", "Finished Fitting Input Spectrum")
 
     def best_broad_type(self):
         bestMatchList = []

diff --git a/astrodash/read_from_catalog.py b/astrodash/read_from_catalog.py
@@ -29,7 +29,7 @@ def read_json(url):
         if data.shape[0] == 3:
             wave, flux, fluxerr = data
         elif data.shape[0] == 2:
-            wave, flux, fluxerr = data
+            wave, flux = data
         else:
             raise Exception("Error reading the given OSC input: {}. Check data at {}".format(filename, urlSpectrum))