some makefile convenience methods

hyposat-snuffling/hyposat/bin_l/.gitignore

@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore

hyposat-snuffling/hyposat/src_l/Makefile

@@ -6,13 +6,15 @@
 #                                                            #
 #  johannes@norsar.no                                        #
 #                                                            #
-#  tested for Linux g77 compiler                             #
+#  tested for Linux f77 compiler                             #
 #                                                            #
 ##############################################################
 
 
 #F77 = /usr/bin/g77 -fno-automatic -W -Wunused -O -fbounds-check
 F77 = f77 -fno-automatic 
+PREFIX = /usr/local
+
 
 CC  = /usr/bin/gcc
 
@@ -26,22 +28,19 @@ L-FLAG = -lm
 # with their own version of the tau-spline software!
 #
 TTLIB = libtau_h.o 
-
 DEST = ../bin_l
-
 prog = hyposat 
 
 obj1 = hyposat.o  
 obj2 = hyposat_lib.o hyposat_geo.o hyposat_name.o hyposat_clib.o hyposat_loc.o
 obj3 = hyposat_crust.o hyposat_crust_mod.o hyposat_mag.o
-#
 obj4 = hyposat_cross.o hyposat_time.o hyposat_gmi.o hyposat_file.o $(TTLIB)
 
+
 $(prog) : $(obj1) $(obj2) $(obj3) $(obj4)
 	$(F77) $(L-FLAG) -o $(prog) $(obj1) $(obj2) $(obj3) $(obj4) 
 
 	mv hyposat $(DEST)/hyposat
-#	rm *.o
 
 hyposat_cross.o : hyposat_cross.f
 	$(F77) $(F-FLAG) -c hyposat_cross.f
@@ -82,6 +81,21 @@ hyposat.o : hyposat.f
 libtau_h.o : libtau_h.f
 	$(F77) $(F-FLAG) -c libtau_h.f
 
-#
 hyposat_clib.o : hyposat_clib.c
 	$(CC) $(C-FLAG) -c hyposat_clib.c
+
+.PYONY: clean
+
+clean:
+	rm -f *.o ../bin_l/hyposat
+
+PREFIX = /usr/local
+
+.PHONY: install
+install: hyposat 
+	mkdir -p $(DESTDIR)$(PREFIX)/bin
+		    cp $(DEST)/$(prog) $(DESTDIR)$(PREFIX)/bin/$(prog)
+
+.PHONY: uninstall
+uninstall:
+	rm -f $(DESTDIR)$(PREFIX)/bin/$(prog)

hyposat-snuffling/snuffling.py

@@ -152,7 +152,8 @@ class Hyposat(Snuffling):
     · Invoke snuffler with station meta data.
     <br>
     &middot; Pick <i>P</i> and <i>S</i> phases and define them as
-    such by pressing <i>F1</i> and <i>F2</i>, respectively.
+    such by pressing <i>F1</i> and <i>F2</i>, respectively. All phases of one
+    station have to be picked on the same channel.
     <br>
     &middot; Select markers you want to use in the inversion (e.g.: press
     <i>a</i> to select all markers in the visible time range)
@@ -324,14 +325,16 @@ class Hyposat(Snuffling):
         env['HYPOSAT_DATA'] = self.hyposat_data_dir
 
         try:
-            p = Popen([pjoin(self._path, 'hyposat/bin/hyposat')], env=env, stdout=PIPE)
+            hyposat_path = pjoin(self._path, 'hyposat/bin/hyposat')
+            p = Popen([hyposat_path], env=env, stdout=PIPE)
+            print('Using hyposat executable located at: %s' % hyposat_path)
         except OSError as e:
             try:
                 # try included, compiled version:
                 abs_path = os.path.dirname(os.path.abspath(__file__))
                 executable = pjoin(abs_path, 'hyposat', 'bin_l', 'hyposat')
-                print('abspath', executable)
                 p = Popen([executable], env=env, stdout=PIPE)
+                print('Using hyposat executable located at: %s' % executable)
             except OSError as e:
                 import errno
                 if e.errno == errno.ENOENT: