Changeset 32994

Timestamp:

Dec 21, 2011, 4:11:47 PM (15 years ago)

Author:

eugene

Message:

initial code for WISE and SuperCOSMOS ingests

Location:

branches/eam_branches/ipp-20111122/Ohana/src/addstar

Files:

• Makefile (modified) (4 diffs)
• include/WISE.h (modified) (1 diff)
• include/addstar.h (modified) (1 diff)
• include/supercos.h (added)
• src/ConfigInit.c (modified) (1 diff)
• src/ReadStarsSDSS.c (modified) (2 diffs)
• src/args_loadsupercos.c (added)
• src/args_loadwise.c (added)
• src/find_matches_refstars.c (modified) (1 diff)
• src/loadsupercos.c (added)
• src/loadsupercos_ops.c (added)
• src/loadsupercos_plates.c (added)
• src/loadsupercos_rawdata.c (added)
• src/loadsupercos_survey.c (added)
• src/loadwise.c (modified) (2 diffs)
• src/loadwise_ops.c (modified) (1 diff)
• src/loadwise_prelim_rawdata.c (modified) (2 diffs)
• src/loadwise_star_full.c (modified) (5 diffs)
• src/parse_time.c (modified) (1 diff)

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

@@ -24 +24 @@
 sedstar     : $(BIN)/sedstar.$(ARCH)
 load2mass   : $(BIN)/load2mass.$(ARCH)
+loadwise    : $(BIN)/loadwise.$(ARCH)
+loadsupercos: $(BIN)/loadsupercos.$(ARCH)
 gztest      : $(BIN)/gztest.$(ARCH)
 mkcmf       : $(BIN)/mkcmf.$(ARCH)
 
-all: addstar sedstar load2mass skycells mkcmf
+all: addstar sedstar load2mass skycells mkcmf loadwise loadsupercos
 
 # I need to fix the client/server version of addstar now that I have dropped Stars
@@ -214 +216 @@
 $(SRC)/psps_ids.$(ARCH).o
 
+LOAD-WISE = \
+$(SRC)/loadwise.$(ARCH).o \
+$(SRC)/loadwise_prelim_rawdata.$(ARCH).o \
+$(SRC)/loadwise_ops.$(ARCH).o \
+$(SRC)/loadwise_star_full.$(ARCH).o \
+$(SRC)/args_loadwise.$(ARCH).o \
+$(SRC)/ConfigInit.$(ARCH).o \
+$(SRC)/Shutdown.$(ARCH).o \
+$(SRC)/StarOps.$(ARCH).o \
+$(SRC)/find_matches_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 \
+$(SRC)/loadsupercos_ops.$(ARCH).o \
+$(SRC)/loadsupercos_survey.$(ARCH).o \
+$(SRC)/loadsupercos_plates.$(ARCH).o \
+$(SRC)/loadsupercos_rawdata.$(ARCH).o \
+$(SRC)/args_loadsupercos.$(ARCH).o \
+$(SRC)/ConfigInit.$(ARCH).o \
+$(SRC)/Shutdown.$(ARCH).o \
+$(SRC)/StarOps.$(ARCH).o \
+$(SRC)/find_matches_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)/parse_time.$(ARCH).o \
+$(SRC)/psps_ids.$(ARCH).o
+
 SEDSTAR = \
 $(SRC)/sedstar.$(ARCH).o \
@@ -241 +279 @@
 $(SKYCELLS)   : $(INC)/addstar.h
 $(LOAD-2MASS) : $(INC)/addstar.h $(INC)/2mass.h
+$(LOAD-WISE)  : $(INC)/addstar.h $(INC)/WISE.h
 $(MKCMF)      : $(INC)/mkcmf.h
 
@@ -250 +289 @@
 $(BIN)/sedstar.$(ARCH)     : $(SEDSTAR)
 $(BIN)/load2mass.$(ARCH)   : $(LOAD-2MASS)
+$(BIN)/loadwise.$(ARCH)    : $(LOAD-WISE)
+$(BIN)/loadsupercos.$(ARCH): $(LOAD-SUPERCOS)
 $(BIN)/skycells.$(ARCH)    : $(SKYCELLS)
 $(BIN)/mkcmf.$(ARCH)       : $(MKCMF)

branches/eam_branches/ipp-20111122/Ohana/src/addstar/include/WISE.h

@@ -21 +21 @@
 short WISE_W1, WISE_W2, WISE_W3, WISE_W4;
 
-SkyTable *get2mass_acc (SkyRegion *patch, char *path, char *accel);
-Stars    *get2mass_2DR_data (SkyRegion *region, char *filename, SkyRegion *patch, int photcode, int *nstars);
-Stars    *get2mass_AS_data (SkyRegion *region, char *filename, SkyRegion *patch, int phocode, int *nstars);
-Stars    *get2mass_AS_rawdata (SkyRegion *region, char *filename, SkyRegion *patch, int phocode, int *nstars);
+AddstarClientOptions args_loadwise (int argc, char **argv, AddstarClientOptions options);
 
-SkyTable *scan2mass_acc (char *path, char *accel);
-int       scan2mass_as_data (char *filename);
+int loadwise_prelim_rawdata (SkyList *skytable, char *filename, AddstarClientOptions options);
 
-char     *skipNbounds (char *line, char bound, int Nbound, int Nbyte);
-e_time    get2mass_time (char *ptr, int Nbound, int Nbyte);
-e_time    get2mass_date (char *ptr, int Nbound, int Nmax);
+int getWISE_setup ();
+int getWISE_coords (char *line, double *R, double *D, int Nmax);
+e_time getWISE_date (char *ptr, int Nbound, int Nmax);
+e_time getWISE_time (char *ptr, int Nbound, int Nmax);
 
-int       load2mass_as_rawdata (SkyList *skytable, char *filename, AddstarClientOptions options);
-SkyTable *load2mass_acc (char *path, char *accel);
-int       get2mass_3star (Stars *star, char *line, int Nmax);
-int       load2mass_catalog (Catalog *catalog, Stars *stars, int Nstars);
+int getWISE_sortStars (WISE_Stars *tstars, int Ntstars);
+int loadwise_star_full (Stars **star, char *line, int Nmax);
 
-int       get2mass_setup (int photcode);
-int       get2mass_coords (char *line, double *R, double *D, int Nmax);
-int       get2mass_star (Stars *star, char *line, int Nmax);
-int       get2mass_3star (Stars *star, char *line, int Nmax);
+char *nextWISEfield (char *line);
+int setWISE_cc_flag (Stars *star, char qual);
+int setWISE_ph_qual (Stars *star, char qual);
+int setWISE_rd_flag (Stars *star, char qual);
+int setWISE_bl_flag (Stars *star, char qual);
+int setWISE_gal_flag (Stars *star, char qual);
+int setWISE_mp_flag (Stars *star, char qual);
+int setWISE_dup_flag (Stars *star, char qual);
+int setWISE_use_flag (Stars *star, char qual);
 
-int get2mass_3star_full (Stars **star, char *line, int Nmax);
-char *next2MASSfield (char *line);
-int set2MASS_ph_qual (Stars *star, char qual);
-int set2MASS_rd_flag (Stars *star, char qual);
-int set2MASS_cc_flag (Stars *star, char qual);
-int set2MASS_bl_flag (Stars *star, char qual);
-int set2MASS_gal_flag (Stars *star, char qual);
-int set2MASS_mp_flag (Stars *star, char qual);
-int set2MASS_dup_flag (Stars *star, char qual);
-int set2MASS_use_flag (Stars *star, char qual);
-int get2mass_sortStars (WISE_Stars *tstars, int Ntstars);
+char *skipNbounds (char *line, char bound, int Nbound, int Nbyte);

branches/eam_branches/ipp-20111122/Ohana/src/addstar/include/addstar.h

@@ -28 +28 @@
     fprintf (stderr, "ERROR:  photcode %s not found in photcode table\n", NAME); \
     exit (0); }
+
+# define dCOS(A)   ((double) cos ((double)RAD_DEG*A))
+# define dSIN(A)   ((double) sin ((double)RAD_DEG*A))
 
 typedef struct {

branches/eam_branches/ipp-20111122/Ohana/src/addstar/src/ConfigInit.c

@@ -213 +213 @@
 
   /* get detection filtering mask */
-  if(!ScanConfig (config, "DETECTIONFILTER", "%d", 0, &options.detectionFilter)) {
+  if (!ScanConfig (config, "DETECTIONFILTER", "%d", 0, &options.detectionFilter)) {
       options.detectionFilter = 0;
-      fprintf (stderr, "Could not find 'DETECTIONFILTER' in config, using '%x'\n", options.detectionFilter);
   }
 

branches/eam_branches/ipp-20111122/Ohana/src/addstar/src/ReadStarsSDSS.c

@@ -4 +4 @@
 
 # define NFILTER 5
-# define dCOS(A)   ((double) cos ((double)RAD_DEG*A))
-# define dSIN(A)   ((double) sin ((double)RAD_DEG*A))
 
 # define GET_COLUMN_5(NAME,TYPE) \
@@ -279 +277 @@
 }
 
-// ha/dec -> alt/az
-int altaz (double *alt, double *az, double ha, double dec, double latitude) {
-
-  double sind, sinh, cosh;
-
-  sind = dSIN (dec) * dSIN (latitude) + dCOS (dec) * dCOS (ha) * dCOS (latitude);
-  *alt  = DEG_RAD * asin (sind);
-
-  sinh = - dCOS (dec) * dSIN (ha);
-  cosh =   dSIN (dec) * dCOS (latitude) - dCOS (dec) * dCOS (ha) * dSIN (latitude);
-
-  *az = DEG_RAD * atan2 (sinh, cosh);
-
-  // I may need to use the parallactic angle to get the right plate rotation...
-  // sinh = -dCOS(az) * dSIN(alt) * dSIN(ha) * dSIN(latitude) + dSIN(az) * dSIN(alt) * dCOS(ha) - dSIN(ha) * dCOS(alt) * dCOS(latitude);
-  // cosh = -dSIN(az) * dSIN(ha) * dSIN(latitude) - dCOS(az) * dCOS(ha);
-  // rot = -DEG_RAD * atan2 (sinh, cosh);
-  return TRUE;
-}
-
 int SetSDSSFlags (Stars *star, unsigned int flags1, unsigned int flags2) {
 

branches/eam_branches/ipp-20111122/Ohana/src/addstar/src/find_matches_refstars.c

@@ -13 +13 @@
   int Nsecfilt;
 
-  if ((NREFSTAR_GROUP != 1) && (NREFSTAR_GROUP != 3)) {
+  switch (NREFSTAR_GROUP) {
+    case 1:
+    case 3:
+    case 4:
+      break;
+    default:
       fprintf (stderr, "ERROR: NREFSTAR_GROUP NOT SET!\n");
       exit (1);

branches/eam_branches/ipp-20111122/Ohana/src/addstar/src/loadwise.c

@@ -2 +2 @@
 # include "WISE.h"
 
+/* This is the DVO program to upload WISE detections into a DVO database.
+   It is modeled on the load2mass program, but unlike that case, it is expected to be run only
+   rarely (once?).  The WISE data are delivered as *.bz2 files.  This program assumes the files
+   have been decompressed.  It does not allow a subset of the sky to be uploaded; entire WISE
+   files are loaded if supplied on the command line.
+
+   USAGE: loadwise -D CATDIR (catdir) (wisefile) [...more files]
+
+ */
+
 int main (int argc, char **argv) {
 
-  char *path;
   int i;
-  SkyTable *sky, *skyWISE;
+  SkyTable *sky;
   SkyList *skylist = NULL;
-  SkyList *overlap = NULL;
   AddstarClientOptions options;
 
   // need to construct these options with args_loadWISE...
   options = ConfigInit (&argc, argv);
-  options = args_loadWISE (argc, argv, options);
+  options = args_loadwise (argc, argv, options);
 
   // load the full sky description table:
@@ -30 +38 @@
   }
 
-  path = WISE_DIR_PRELIM;
-
-  // the accel.dat file has the raw filenames
-  // test if the file exists, or else try the .gz version
-  // XXX can we build an accelerator?
-  skyWISE = loadWISE_acc (path, "accel.dat");
-  
-  for (i = 0; i < skyWISE[0].Nregions; i++) {
-    // check if any of the skylist entries overlap this WISE catalog:
-    overlap = SkyListByBounds_List (skylist, -1, skyWISE[0].regions[i].Rmin, skyWISE[0].regions[i].Rmax, skyWISE[0].regions[i].Dmin, skyWISE[0].regions[i].Dmax);
-    if (overlap[0].Nregions == 0) {
-      SkyListFree (overlap);
-      continue;
-    }
-    
-    fprintf (stderr, "loading %s\n", skyWISE[0].filename[i]);
-    loadWISE_as_rawdata (overlap, skyWISE[0].filename[i], options);
-    SkyListFree (overlap);
+  for (i = 1; i < argc; i++) {
+      fprintf (stderr, "loading %s\n", argv[i]);
+      loadwise_prelim_rawdata (skylist, argv[i], options);
   }
   exit (0);
 }  
+

branches/eam_branches/ipp-20111122/Ohana/src/addstar/src/loadwise_ops.c

@@ -1 +1 @@
 # include "addstar.h"
 # include "WISE.h"
-
-static int FilterSkip;
-static int TimeSkip;
-static int Qentry;
-static int Photcode;
 
 int getWISE_setup () {

branches/eam_branches/ipp-20111122/Ohana/src/addstar/src/loadwise_prelim_rawdata.c

@@ -10 +10 @@
 # define DEBUG 0
 
-int loadWISE_as_rawdata (SkyList *skytable, char *filename, AddstarClientOptions options) {
+int loadwise_prelim_rawdata (SkyList *skytable, char *filename, AddstarClientOptions options) {
   
   int i, j, verbose;
@@ -159 +159 @@
         stars[Nstars+3][0].average.R = tstars[j].R;
         stars[Nstars+3][0].average.D = tstars[j].D;
-        getWISE_star_full (&stars[Nstars], &buffer[offset], Nbyte - offset);
+        loadwise_star_full (&stars[Nstars], &buffer[offset], Nbyte - offset);
 
         tstars[j].flag = TRUE;

branches/eam_branches/ipp-20111122/Ohana/src/addstar/src/loadwise_star_full.c

@@ -6 +6 @@
 // fill in the data for a WISE quad star.  takes a pointer to the start of the line the
 // RA and DEC have already been set
-int getWISE_star_full (Stars **star, char *line, int Nmax) {
+int loadwise_star_full (Stars **star, char *line, int Nmax) {
 
   char *ptr;
-  double dMfull;
   double jd;
 
   if (line == NULL) Shutdown ("format error in WISE");
 
+  ptr = line;
+
   ptr = skipNbounds (ptr, '|', 3, Nmax); // skip: desig, ra, dec,
-  star[0][0].measure.FWx = ToShortPixels(strtod (ptr, NULL));
-  ptr = nextWISEfield (ptr); // sig_dec
-  star[0][0].measure.FWy = ToShortPixels(strtod (ptr, NULL));
-  ptr = nextWISEfield (ptr); // sig_radec
-  star[0][0].measure.theta = ToShortPixels(strtod (ptr, NULL));
+  star[0][0].measure.FWx = ToShortPixels(strtod (ptr, NULL)); // sig_ra
+  ptr = nextWISEfield (ptr);
+  star[0][0].measure.FWy = ToShortPixels(strtod (ptr, NULL)); // sig_dec
+  ptr = nextWISEfield (ptr);
+  star[0][0].measure.theta = ToShortPixels(strtod (ptr, NULL)); // sig_radec
 
   star[1][0].measure.FWx   = star[0][0].measure.FWx;
@@ -31 +32 @@
   star[3][0].measure.theta = star[0][0].measure.theta;
 
-  ptr = skipNbounds (ptr, '|', 10, Nmax); // skip: glon, glat, elon, elat, wx, wy, cntr, source_id, coadd_id, src
+  ptr = skipNbounds (ptr, '|', 11, Nmax); // skip: sig_radec, glon, glat, elon, elat, wx, wy, cntr, source_id, coadd_id, src
 
   // W1
-  star[0][0].measure.M  = strtod (ptr, NULL);
-  ptr = nextWISEfield (ptr); // j_cmsig
-  star[0][0].measure.dM = strtod (ptr, NULL);
-  ptr = skipNbounds (ptr, '|', 2, Nmax); // skip: w1snr, w1rchi2
+  star[0][0].measure.M  = strtod (ptr, NULL); // w1mpro
+  ptr = nextWISEfield (ptr);
+  star[0][0].measure.dM = strtod (ptr, NULL); // w1sigmpro
+  ptr = skipNbounds (ptr, '|', 3, Nmax); // skip: w1sigmpro, w1snr, w1rchi2
 
   // W2
-  star[1][0].measure.M  = strtod (ptr, NULL);
-  ptr = nextWISEfield (ptr); // j_cmsig
-  star[1][0].measure.dM = strtod (ptr, NULL);
-  ptr = skipNbounds (ptr, '|', 2, Nmax); // skip: w2snr, w2rchi2
+  star[1][0].measure.M  = strtod (ptr, NULL); // w1mpro
+  ptr = nextWISEfield (ptr);
+  star[1][0].measure.dM = strtod (ptr, NULL); // w1sigmpro
+  ptr = skipNbounds (ptr, '|', 3, Nmax); // skip: w2sigmpro, w2snr, w2rchi2
 
   // W3
-  star[2][0].measure.M  = strtod (ptr, NULL);
-  ptr = nextWISEfield (ptr); // j_cmsig
-  star[2][0].measure.dM = strtod (ptr, NULL);
-  ptr = skipNbounds (ptr, '|', 2, Nmax); // skip: w3snr, w3rchi2
+  star[2][0].measure.M  = strtod (ptr, NULL); // w1mpro
+  ptr = nextWISEfield (ptr);
+  star[2][0].measure.dM = strtod (ptr, NULL); // w1sigmpro
+  ptr = skipNbounds (ptr, '|', 3, Nmax); // skip: w3sigmpro, w3snr, w3rchi2
 
   // W4
-  star[3][0].measure.M  = strtod (ptr, NULL);
-  ptr = nextWISEfield (ptr); // j_cmsig
-  star[3][0].measure.dM = strtod (ptr, NULL);
-  ptr = skipNbounds (ptr, '|', 2, Nmax); // skip: w4snr, w4rchi2
+  star[3][0].measure.M  = strtod (ptr, NULL); // w1mpro
+  ptr = nextWISEfield (ptr);
+  star[3][0].measure.dM = strtod (ptr, NULL); // w1sigmpro
+  ptr = skipNbounds (ptr, '|', 3, Nmax); // skip: w4sigmpro, w4snr, w4rchi2
 
   star[0][0].measure.photFlags = 0;
@@ -67 +68 @@
   setWISE_cc_flag (star[2], ptr[2]); // cc_flg
   setWISE_cc_flag (star[3], ptr[2]); // cc_flg
-  ptr = skipNbounds (ptr, '|', 2, Nmax); // skip: ext_flg, var_flg
+  ptr = skipNbounds (ptr, '|', 3, Nmax); // skip: cc_flags, ext_flg, var_flg
 
   setWISE_ph_qual (star[0], ptr[0]); // ph_qual
@@ -73 +74 @@
   setWISE_ph_qual (star[2], ptr[2]); // ph_qual
   setWISE_ph_qual (star[3], ptr[3]); // ph_qual
-  ptr = skipNbounds (ptr, '|', 2, Nmax); // skip: ext_flg, var_flg
 
   // setWISE_rd_flag (star[0], ptr[0]);
@@ -125 +125 @@
   // setWISE_use_flag (star[2], ptr[0]);
 
-  star[0][0].measure.photcode  = TM_J;
+  star[0][0].measure.photcode  = WISE_W1;
   star[0][0].measure.detID   = 0;
   star[0][0].measure.imageID = 0;
 
-  star[1][0].measure.photcode  = TM_H;
+  star[1][0].measure.photcode  = WISE_W2;
   star[1][0].measure.detID   = 0;
   star[1][0].measure.imageID = 0;
 
-  star[2][0].measure.photcode  = TM_K;
+  star[2][0].measure.photcode  = WISE_W3;
   star[2][0].measure.detID   = 0;
   star[2][0].measure.imageID = 0;
+
+  star[3][0].measure.photcode  = WISE_W4;
+  star[3][0].measure.detID   = 0;
+  star[3][0].measure.imageID = 0;
 
   return TRUE;

branches/eam_branches/ipp-20111122/Ohana/src/addstar/src/parse_time.c

@@ -145 +145 @@
 
 }
+
+// ha/dec -> alt/az
+int altaz (double *alt, double *az, double ha, double dec, double latitude) {
+
+  double sind, sinh, cosh;
+
+  sind = dSIN (dec) * dSIN (latitude) + dCOS (dec) * dCOS (ha) * dCOS (latitude);
+  *alt  = DEG_RAD * asin (sind);
+
+  sinh = - dCOS (dec) * dSIN (ha);
+  cosh =   dSIN (dec) * dCOS (latitude) - dCOS (dec) * dCOS (ha) * dSIN (latitude);
+
+  *az = DEG_RAD * atan2 (sinh, cosh);
+
+  // I may need to use the parallactic angle to get the right plate rotation...
+  // sinh = -dCOS(az) * dSIN(alt) * dSIN(ha) * dSIN(latitude) + dSIN(az) * dSIN(alt) * dCOS(ha) - dSIN(ha) * dCOS(alt) * dCOS(latitude);
+  // cosh = -dSIN(az) * dSIN(ha) * dSIN(latitude) - dCOS(az) * dCOS(ha);
+  // rot = -DEG_RAD * atan2 (sinh, cosh);
+  return TRUE;
+}
+