Changeset 40543 for trunk

Timestamp:

Oct 19, 2018, 10:14:02 PM (8 years ago)

Author:

eugene

Message:

add loadgaia_dr2

Location:

trunk/Ohana/src/addstar

Files:

• Makefile (modified) (5 diffs)
• include/gaia_dr2.h (added)
• src/args_loadgaia_dr2.c (added)
• src/find_matches_gaia_dr2.c (added)
• src/loadgaia_dr2.c (added)
• src/loadgaia_dr2_catalog.c (added)
• src/loadgaia_dr2_make_subset.c (added)
• src/loadgaia_dr2_readstars.c (added)
• src/loadgaia_dr2_table.c (added)
• src/parse_csv.c (added)

trunk/Ohana/src/addstar/Makefile

@@ -26 +26 @@
 loadgalphot  : $(BIN)/loadgalphot.$(ARCH)
 loadgaia     : $(BIN)/loadgaia.$(ARCH)
+loadgaia_dr2 : $(BIN)/loadgaia_dr2.$(ARCH)
 loadstarpar  : $(BIN)/loadstarpar.$(ARCH)
 loadstarpar_client : $(BIN)/loadstarpar_client.$(ARCH)
@@ -43 +44 @@
 # programs in 'SERVER' use the client-server concept and are out of date
 
-INSTALL = addstar addstar_client sedstar loadgalphot loadgaia loadstarpar loadstarpar_client setobjflags setobjflags_client loadICRF loadICRF_client skycells mkcmf dumpskycells findskycell load2mass loadwise loadtycho loadbsc loadsupercos 
+INSTALL = addstar addstar_client sedstar loadgalphot loadgaia loadgaia_dr2 loadstarpar loadstarpar_client setobjflags setobjflags_client loadICRF loadICRF_client skycells mkcmf dumpskycells findskycell load2mass loadwise loadtycho loadbsc loadsupercos 
 SERVER  = addstarc addstard addstart
 
@@ -286 +287 @@
 $(SRC)/psps_ids.$(ARCH).o
 
+LOAD-GAIA_DR2 = \
+$(SRC)/loadgaia_dr2.$(ARCH).o \
+$(SRC)/ConfigInit.$(ARCH).o \
+$(SRC)/SetSignals.$(ARCH).o \
+$(SRC)/Shutdown.$(ARCH).o \
+$(SRC)/args_loadgaia_dr2.$(ARCH).o \
+$(SRC)/find_matches_gaia_dr2.$(ARCH).o \
+$(SRC)/loadgaia_dr2_catalog.$(ARCH).o \
+$(SRC)/loadgaia_dr2_make_subset.$(ARCH).o \
+$(SRC)/loadgaia_dr2_readstars.$(ARCH).o \
+$(SRC)/loadgaia_dr2_table.$(ARCH).o \
+$(SRC)/parse_csv.$(ARCH).o \
+$(SRC)/resort_catalog.$(ARCH).o \
+$(SRC)/build_links.$(ARCH).o \
+$(SRC)/strhash.$(ARCH).o \
+$(SRC)/sortIDs.$(ARCH).o \
+$(SRC)/psps_ids.$(ARCH).o
+
 LOAD-STARPAR = \
 $(SRC)/loadstarpar.$(ARCH).o \
@@ -508 +527 @@
 $(LOAD-GALPHOT)        : $(INC)/addstar.h $(INC)/loadgalphot.h
 $(LOAD-GAIA)           : $(INC)/addstar.h $(INC)/gaia.h
+$(LOAD-GAIA_DR2)       : $(INC)/addstar.h $(INC)/gaia_dr2.h
 $(LOAD-STARPAR)        : $(INC)/addstar.h $(INC)/loadstarpar.h
 $(LOAD-STARPAR-CLIENT) : $(INC)/addstar.h $(INC)/loadstarpar.h
@@ -530 +550 @@
 $(BIN)/loadgalphot.$(ARCH)    : $(LOAD-GALPHOT)
 $(BIN)/loadgaia.$(ARCH)       : $(LOAD-GAIA)
+$(BIN)/loadgaia_dr2.$(ARCH)   : $(LOAD-GAIA_DR2)
 $(BIN)/loadstarpar.$(ARCH)    : $(LOAD-STARPAR)
 $(BIN)/loadstarpar_client.$(ARCH) : $(LOAD-STARPAR-CLIENT)