Changeset 39926 for trunk/Ohana/src/addstar

Timestamp:

Jan 6, 2017, 11:30:10 AM (10 years ago)

Author:

eugene

Message:

merging changes from czw dev branch (compare with r39924)

Location:

trunk

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/addstar/Makefile (modified) (5 diffs)
• Ohana/src/addstar/include/gaia.h (copied) (copied from branches/czw_branch/20160809/Ohana/src/addstar/include/gaia.h )
• Ohana/src/addstar/src/args_loadgaia.c (copied) (copied from branches/czw_branch/20160809/Ohana/src/addstar/src/args_loadgaia.c )
• Ohana/src/addstar/src/find_matches_gaia.c (copied) (copied from branches/czw_branch/20160809/Ohana/src/addstar/src/find_matches_gaia.c )
• Ohana/src/addstar/src/loadgaia.c (copied) (copied from branches/czw_branch/20160809/Ohana/src/addstar/src/loadgaia.c )
• Ohana/src/addstar/src/loadgaia_catalog.c (copied) (copied from branches/czw_branch/20160809/Ohana/src/addstar/src/loadgaia_catalog.c )
• Ohana/src/addstar/src/loadgaia_make_subset.c (copied) (copied from branches/czw_branch/20160809/Ohana/src/addstar/src/loadgaia_make_subset.c )
• Ohana/src/addstar/src/loadgaia_readstars.c (copied) (copied from branches/czw_branch/20160809/Ohana/src/addstar/src/loadgaia_readstars.c )
• Ohana/src/addstar/src/loadgaia_table.c (copied) (copied from branches/czw_branch/20160809/Ohana/src/addstar/src/loadgaia_table.c )
• Ohana/src/addstar/src/psps_ids.c (modified) (2 diffs)

trunk/Ohana/src/addstar/Makefile

@@ -25 +25 @@
 load2mass    : $(BIN)/load2mass.$(ARCH)
 loadgalphot  : $(BIN)/loadgalphot.$(ARCH)
+loadgaia     : $(BIN)/loadgaia.$(ARCH)
 loadstarpar  : $(BIN)/loadstarpar.$(ARCH)
 loadstarpar_client : $(BIN)/loadstarpar_client.$(ARCH)
@@ -42 +43 @@
 # programs in 'SERVER' use the client-server concept and are out of date
 
-INSTALL = addstar addstar_client sedstar loadgalphot 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 loadstarpar loadstarpar_client setobjflags setobjflags_client loadICRF loadICRF_client skycells mkcmf dumpskycells findskycell load2mass loadwise loadtycho loadbsc loadsupercos 
 SERVER  = addstarc addstard addstart
 
@@ -267 +268 @@
 $(SRC)/psps_ids.$(ARCH).o
 
-# $(SRC)/SkyRegionUtils.$(ARCH).o 
-# $(SRC)/loadstarpar_io.$(ARCH).o 
-# $(SRC)/loadgalphot_remote_hosts.$(ARCH).o 
-# $(SRC)/loadgalphot_save_remote.$(ARCH).o 
+LOAD-GAIA = \
+$(SRC)/loadgaia.$(ARCH).o \
+$(SRC)/ConfigInit.$(ARCH).o \
+$(SRC)/SetSignals.$(ARCH).o \
+$(SRC)/Shutdown.$(ARCH).o \
+$(SRC)/args_loadgaia.$(ARCH).o \
+$(SRC)/find_matches_gaia.$(ARCH).o \
+$(SRC)/loadgaia_catalog.$(ARCH).o \
+$(SRC)/loadgaia_make_subset.$(ARCH).o \
+$(SRC)/loadgaia_readstars.$(ARCH).o \
+$(SRC)/loadgaia_table.$(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 = \
@@ -493 +506 @@
 $(LOAD-2MASS)          : $(INC)/addstar.h $(INC)/2mass.h
 $(LOAD-GALPHOT)        : $(INC)/addstar.h $(INC)/loadgalphot.h
+$(LOAD-GAIA)           : $(INC)/addstar.h $(INC)/gaia.h
 $(LOAD-STARPAR)        : $(INC)/addstar.h $(INC)/loadstarpar.h
 $(LOAD-STARPAR-CLIENT) : $(INC)/addstar.h $(INC)/loadstarpar.h
@@ -514 +528 @@
 $(BIN)/loadbsc.$(ARCH)        : $(LOAD-BSC)
 $(BIN)/loadgalphot.$(ARCH)    : $(LOAD-GALPHOT)
+$(BIN)/loadgaia.$(ARCH)       : $(LOAD-GAIA)
 $(BIN)/loadstarpar.$(ARCH)    : $(LOAD-STARPAR)
 $(BIN)/loadstarpar_client.$(ARCH) : $(LOAD-STARPAR-CLIENT)

trunk/Ohana/src/addstar/src/psps_ids.c

@@ -42 +42 @@
 
     uint64_t part1, part2, part3;
-    part1 = (uint64_t)( izone  * 10000000000000LL) ; 
+    part1 = (uint64_t)( izone  * 10000000000000LL) ; // 10,000,000,000,000
     part2 = ((uint64_t)(ra * 1000000.)) * 10000 ; // 0 - 360*1e6 = 3.6e8 (< 29 bits)
     part3 = (int) (zresid * 10000.0) ; // 0 - 10000 (1 bit == 30/10000 arcsec) (< 14 bits)
@@ -48 +48 @@
     return part1 + part2 + part3;
 }
+
+// 10 000 000 000 000