Changeset 38268 for branches/eam_branches/ipp-20150419/Ohana/src/addstar/Makefile

Timestamp:

May 13, 2015, 11:28:45 AM (11 years ago)

Author:

eugene

Message:

added loadtycho; now setting measure.R,D and using that in find_matches_*

File:

• branches/eam_branches/ipp-20150419/Ohana/src/addstar/Makefile (modified) (10 diffs)

branches/eam_branches/ipp-20150419/Ohana/src/addstar/Makefile

@@ -29 +29 @@
 loadICRF_client : $(BIN)/loadICRF_client.$(ARCH)
 loadwise     : $(BIN)/loadwise.$(ARCH)
+loadtycho    : $(BIN)/loadtycho.$(ARCH)
 dumpskycells : $(BIN)/dumpskycells.$(ARCH)
 findskycell  : $(BIN)/findskycell.$(ARCH)
@@ -35 +36 @@
 mkcmf        : $(BIN)/mkcmf.$(ARCH)
 
-all: addstar addstar_client sedstar load2mass loadstarpar loadstarpar_client loadICRF loadICRF_client skycells mkcmf loadwise loadsupercos dumpskycells findskycell
-
-INSTALL = addstar addstar_client sedstar load2mass loadstarpar loadstarpar_client loadICRF loadICRF_client skycells mkcmf loadwise loadsupercos dumpskycells findskycell
+all: addstar addstar_client sedstar load2mass loadstarpar loadstarpar_client loadICRF loadICRF_client skycells mkcmf loadwise loadtycho loadsupercos dumpskycells findskycell
+
+INSTALL = addstar addstar_client sedstar load2mass loadstarpar loadstarpar_client loadICRF loadICRF_client skycells mkcmf loadwise loadtycho loadsupercos dumpskycells findskycell
 
 # I need to fix the client/server version of addstar now that I have dropped Stars
@@ -49 +50 @@
 $(SRC)/SkyListForStars.$(ARCH).o \
 $(SRC)/SkyRegionUtils.$(ARCH).o \
-$(SRC)/SkyTableFromTychoIndex.$(ARCH).o \
 $(SRC)/addstar.$(ARCH).o \
 $(SRC)/addstar_create_ID.$(ARCH).o \
@@ -65 +65 @@
 $(SRC)/find_subset.$(ARCH).o \
 $(SRC)/getgsc.$(ARCH).o \
-$(SRC)/gettycho.$(ARCH).o \
 $(SRC)/getusno.$(ARCH).o \
 $(SRC)/getusnob.$(ARCH).o \
@@ -127 +126 @@
 $(SRC)/SkyListForStars.$(ARCH).o \
 $(SRC)/SkyRegionUtils.$(ARCH).o \
-$(SRC)/SkyTableFromTychoIndex.$(ARCH).o \
 $(SRC)/SocketOps.$(ARCH).o \
 $(SRC)/UpdateDatabase_Image.$(ARCH).o \
@@ -143 +141 @@
 $(SRC)/find_subset.$(ARCH).o \
 $(SRC)/getgsc.$(ARCH).o \
-$(SRC)/gettycho.$(ARCH).o \
 $(SRC)/getusno.$(ARCH).o \
 $(SRC)/getusnob.$(ARCH).o \
@@ -176 +173 @@
 $(SRC)/getusno.$(ARCH).o \
 $(SRC)/getusnob.$(ARCH).o \
-$(SRC)/gettycho.$(ARCH).o \
 $(SRC)/greference.$(ARCH).o \
 $(SRC)/in_image.$(ARCH).o \
@@ -188 +184 @@
 $(SRC)/edge_check.$(ARCH).o \
 $(SRC)/opening_angle.$(ARCH).o \
-$(SRC)/SkyTableFromTychoIndex.$(ARCH).o \
 $(SRC)/ListenClients_Thread.$(ARCH).o \
 $(SRC)/NewImage_Thread.$(ARCH).o \
@@ -334 +329 @@
 $(SRC)/psps_ids.$(ARCH).o
 
+LOAD-TYCHO = \
+$(SRC)/loadtycho.$(ARCH).o \
+$(SRC)/loadtycho_rawdata.$(ARCH).o \
+$(SRC)/loadtycho_ops.$(ARCH).o \
+$(SRC)/args_loadtycho.$(ARCH).o \
+$(SRC)/ConfigInit.$(ARCH).o \
+$(SRC)/Shutdown.$(ARCH).o \
+$(SRC)/find_matches_closest_refstars.$(ARCH).o \
+$(SRC)/build_links.$(ARCH).o \
+$(SRC)/replace_match.$(ARCH).o \
+$(SRC)/SetSignals.$(ARCH).o \
+$(SRC)/update_coords.$(ARCH).o \
+$(SRC)/SkyRegionUtils.$(ARCH).o \
+$(SRC)/psps_ids.$(ARCH).o
+
 LOAD-SUPERCOS = \
 $(SRC)/loadsupercos.$(ARCH).o \
@@ -410 +420 @@
 $(BIN)/load2mass.$(ARCH)      : $(LOAD-2MASS)
 $(BIN)/loadwise.$(ARCH)       : $(LOAD-WISE)
+$(BIN)/loadtycho.$(ARCH)      : $(LOAD-TYCHO)
 $(BIN)/loadstarpar.$(ARCH)    : $(LOAD-STARPAR)
 $(BIN)/loadstarpar_client.$(ARCH) : $(LOAD-STARPAR-CLIENT)