Changeset 41151 for trunk

Timestamp:

Nov 27, 2019, 5:26:15 AM (7 years ago)

Author:

eugene

Message:

added UKIRT ingest functions

Location:

trunk/Ohana/src/addstar

Files:

• Makefile (modified) (5 diffs)
• doc/mapping_UKIDSS_unWISE_DVO.pdf (copied) (copied from branches/eam_branches/ohana.20190329/src/addstar/doc/mapping_UKIDSS_unWISE_DVO.pdf )
• include/ukirt_uhs.h (copied) (copied from branches/eam_branches/ohana.20190329/src/addstar/include/ukirt_uhs.h )
• src/ReadImageHeader.c (modified) (1 diff)
• src/args_loadukirt_uhs.c (copied) (copied from branches/eam_branches/ohana.20190329/src/addstar/src/args_loadukirt_uhs.c )
• src/find_matches_ukirt_uhs.c (copied) (copied from branches/eam_branches/ohana.20190329/src/addstar/src/find_matches_ukirt_uhs.c )
• src/loadukirt_uhs.c (copied) (copied from branches/eam_branches/ohana.20190329/src/addstar/src/loadukirt_uhs.c )
• src/loadukirt_uhs_catalog.c (copied) (copied from branches/eam_branches/ohana.20190329/src/addstar/src/loadukirt_uhs_catalog.c )
• src/loadukirt_uhs_make_subset.c (copied) (copied from branches/eam_branches/ohana.20190329/src/addstar/src/loadukirt_uhs_make_subset.c )
• src/loadukirt_uhs_readstars.c (copied) (copied from branches/eam_branches/ohana.20190329/src/addstar/src/loadukirt_uhs_readstars.c )
• src/loadukirt_uhs_readstars_ugcs.c (copied) (copied from branches/eam_branches/ohana.20190329/src/addstar/src/loadukirt_uhs_readstars_ugcs.c )
• src/loadukirt_uhs_readstars_ugps.c (copied) (copied from branches/eam_branches/ohana.20190329/src/addstar/src/loadukirt_uhs_readstars_ugps.c )
• src/loadukirt_uhs_readstars_uhs.c (copied) (copied from branches/eam_branches/ohana.20190329/src/addstar/src/loadukirt_uhs_readstars_uhs.c )
• src/loadukirt_uhs_readstars_ulas.c (copied) (copied from branches/eam_branches/ohana.20190329/src/addstar/src/loadukirt_uhs_readstars_ulas.c )
• src/loadukirt_uhs_table.c (copied) (copied from branches/eam_branches/ohana.20190329/src/addstar/src/loadukirt_uhs_table.c )

trunk/Ohana/src/addstar/Makefile

@@ -27 +27 @@
 loadgaia     : $(BIN)/loadgaia.$(ARCH)
 loadgaia_dr2 : $(BIN)/loadgaia_dr2.$(ARCH)
+loadukirt_uhs : $(BIN)/loadukirt_uhs.$(ARCH)
 loadstarpar  : $(BIN)/loadstarpar.$(ARCH)
 loadstarpar_client : $(BIN)/loadstarpar_client.$(ARCH)
@@ -44 +45 @@
 # programs in 'SERVER' use the client-server concept and are out of date
 
-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 
+INSTALL = addstar addstar_client sedstar loadgalphot loadgaia loadgaia_dr2 loadukirt_uhs loadstarpar loadstarpar_client setobjflags setobjflags_client loadICRF loadICRF_client skycells mkcmf dumpskycells findskycell load2mass loadwise loadtycho loadbsc loadsupercos 
 SERVER  = addstarc addstard addstart
 
@@ -305 +306 @@
 $(SRC)/psps_ids.$(ARCH).o
 
+LOAD-UKIRT_UHS = \
+$(SRC)/loadukirt_uhs.$(ARCH).o \
+$(SRC)/ConfigInit.$(ARCH).o \
+$(SRC)/SetSignals.$(ARCH).o \
+$(SRC)/Shutdown.$(ARCH).o \
+$(SRC)/args_loadukirt_uhs.$(ARCH).o \
+$(SRC)/find_matches_ukirt_uhs.$(ARCH).o \
+$(SRC)/loadukirt_uhs_catalog.$(ARCH).o \
+$(SRC)/loadukirt_uhs_make_subset.$(ARCH).o \
+$(SRC)/loadukirt_uhs_readstars.$(ARCH).o \
+$(SRC)/loadukirt_uhs_readstars_uhs.$(ARCH).o \
+$(SRC)/loadukirt_uhs_readstars_ugcs.$(ARCH).o \
+$(SRC)/loadukirt_uhs_readstars_ugps.$(ARCH).o \
+$(SRC)/loadukirt_uhs_readstars_ulas.$(ARCH).o \
+$(SRC)/loadukirt_uhs_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 \
@@ -528 +551 @@
 $(LOAD-GAIA)           : $(INC)/addstar.h $(INC)/gaia.h
 $(LOAD-GAIA_DR2)       : $(INC)/addstar.h $(INC)/gaia_dr2.h
+$(LOAD-UKIRT_UHS)      : $(INC)/addstar.h $(INC)/ukirt_uhs.h
 $(LOAD-STARPAR)        : $(INC)/addstar.h $(INC)/loadstarpar.h
 $(LOAD-STARPAR-CLIENT) : $(INC)/addstar.h $(INC)/loadstarpar.h
@@ -551 +575 @@
 $(BIN)/loadgaia.$(ARCH)       : $(LOAD-GAIA)
 $(BIN)/loadgaia_dr2.$(ARCH)   : $(LOAD-GAIA_DR2)
+$(BIN)/loadukirt_uhs.$(ARCH)  : $(LOAD-UKIRT_UHS)
 $(BIN)/loadstarpar.$(ARCH)    : $(LOAD-STARPAR)
 $(BIN)/loadstarpar_client.$(ARCH) : $(LOAD-STARPAR-CLIENT)

trunk/Ohana/src/addstar/src/ReadImageHeader.c

@@ -118 +118 @@
   if (photcode == 0) {
     if (!gfits_scan (header, "PHOTCODE", "%s", 1, photname)) {
-      fprintf (stderr, "photcode not supplied in header\n");
+      fprintf (stderr, "failure: photcode not supplied in header\n");
       return (FALSE);
     }