Changeset 38062 for trunk/Ohana/src/addstar

Timestamp:

Mar 29, 2015, 6:52:41 AM (11 years ago)

Author:

eugene

Message:

merge changes from ipp-20150112

Location:

trunk

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/addstar/include/WISE.h (modified) (1 diff)
• Ohana/src/addstar/src/args_loadwise.c (modified) (1 diff)
• Ohana/src/addstar/src/loadwise_rawdata.c (modified) (2 diffs)
• Ohana/src/addstar/src/loadwise_star_full.c (modified) (8 diffs)

trunk/Ohana/src/addstar/include/WISE.h

@@ -35 +35 @@
 int getWISE_sortStars (WISE_Stars *tstars, int Ntstars);
 
+int loadwise_star_prelim (Stars **star, char *line, int Nmax);
 int loadwise_star_allsky (Stars **star, char *line, int Nmax);
-int loadwise_star_prelim (Stars **star, char *line, int Nmax);
+int loadwise_star_allwise (Stars **star, char *line, int Nmax);
 
 

trunk/Ohana/src/addstar/src/args_loadwise.c

@@ -53 +53 @@
   }
 
-enum {MODE_NONE, MODE_ALLWISE, MODE_ALLSKY, MODE_PRELIM};
-int MODE;
-
   /* load the prelim data dump */
   MODE = MODE_ALLWISE;

trunk/Ohana/src/addstar/src/loadwise_rawdata.c

@@ -7 +7 @@
 
 /* read in chunks of ~64MB */
-# define NBYTE 0x4000000
+# define NBYTE 0x40000000
 # define DEBUG 0
 
@@ -167 +167 @@
             break;
           case MODE_ALLWISE:
+            loadwise_star_allwise (&stars[Nstars], &buffer[offset], Nbyte - offset);
+            break;
           default:
-            // loadwise_star_allwise (&stars[Nstars], &buffer[offset], Nbyte - offset);
             break;
         }

trunk/Ohana/src/addstar/src/loadwise_star_full.c

@@ -14 +14 @@
 // RA and DEC have already been set
 int loadwise_star_allwise (Stars **star, char *line, int Nmax) {
+
+  int i;
+  char *ptr;
+
+  if (line == NULL) Shutdown ("format error in WISE");
+
+  ptr = line;
+
+  // I can assign dRA and dDEC to dX and dY if I can consistently set posangle and pltscale
+  star[0][0].measure.posangle = 0.0;
+  star[0][0].measure.pltscale = 1.0;
+
+  ptr = skipNbounds (ptr, '|', 3, Nmax); // skip: desig, ra, dec,
+  star[0][0].measure.dXccd = ToShortPixels((strtod (ptr, NULL) + 0.005)); // sig_ra -- add 5/1000 to avoid truncation
+  ptr = nextWISEfield (ptr);
+  star[0][0].measure.dYccd = ToShortPixels((strtod (ptr, NULL) + 0.005)); // sig_dec
+  ptr = nextWISEfield (ptr);
+
+  // we only know a single set of values for all 4 bands 
+  for (i = 1; i < 4; i++) {
+      star[i][0].measure.dXccd    = star[0][0].measure.dXccd;
+      star[i][0].measure.dYccd    = star[0][0].measure.dYccd;
+      star[i][0].measure.posangle = star[0][0].measure.posangle;
+      star[i][0].measure.pltscale = star[0][0].measure.pltscale;
+  }
+  ptr = skipNbounds (ptr, '|', 5, Nmax); // skip: sig_radec, glon, glat, elon, elat
+
+  star[0][0].measure.Xccd = strtod (ptr, NULL); // wx
+  ptr = nextWISEfield (ptr); // skip wx
+  star[0][0].measure.Yccd = strtod (ptr, NULL); // wy
+  ptr = nextWISEfield (ptr); // skip wy
+
+  for (i = 1; i < 4; i++) {
+      star[i][0].measure.Xccd    = star[0][0].measure.Xccd;
+      star[i][0].measure.Yccd    = star[0][0].measure.Yccd;
+  }
+  ptr = skipNbounds (ptr, '|', 4, Nmax); // skip: cntr, source_id, coadd_id, src
+
+  // W1
+  for (i = 0; i < 4; i++) {
+    char *endpoint;
+      star[i][0].measure.M  = strtod (ptr, &endpoint); // w?mpro
+      if (endpoint == ptr) {
+        star[i][0].measure.M  = NAN;
+      }
+      ptr = nextWISEfield (ptr);
+      star[i][0].measure.dM = strtod (ptr, &endpoint); // w?sigmpro
+      if (endpoint == ptr) {
+        star[i][0].measure.dM  = NAN;
+      }
+      ptr = skipNbounds (ptr, '|', 2, Nmax); // skip: w?sigmpro, w?snr
+      star[i][0].measure.psfChisq = strtod (ptr, NULL); // w?rchi2
+      star[i][0].measure.psfQF = strtod (ptr, NULL); // w?rchi2
+      ptr = nextWISEfield (ptr); // skip : w1rchi2
+
+      // init the photFlags field
+      star[i][0].measure.photFlags = 0;
+  }
+
+  ptr = nextWISEfield (ptr); // skip: rchi2
+
+  // set blend flags for all 4 measures
+  setWISE_blend_flag (star, ptr); // nb & na both used here
+  ptr = skipNbounds (ptr, '|', 2, Nmax); // skip: nb, na
+
+  for (i = 0; i < 4; i++) {
+      setWISE_sat_flag (star[i], ptr); // w1sat
+      ptr = nextWISEfield (ptr); 
+  }
+  ptr = nextWISEfield (ptr); // skip satnum
+
+  ptr = skipNbounds (ptr, '|', 15, Nmax); // skip pm info
+
+  for (i = 0; i < 4; i++) {
+      setWISE_cc_flag (star[i], ptr[i]); // cc_flags
+  }
+  ptr = nextWISEfield (ptr); // skip cc_flags
+  ptr = nextWISEfield (ptr); // skip rel
+
+  // set ext flags for all 4 measures
+  setWISE_ext_flag_allsky (star, ptr[0]); // ext_flg
+  ptr = nextWISEfield (ptr); // skip ext_flags
+
+  for (i = 0; i < 4; i++) {
+      setWISE_var_flag_allsky (star[i], ptr[i]); // var_flg
+  }
+  ptr = nextWISEfield (ptr); // skip var_flags
+
+  for (i = 0; i < 4; i++) {
+      setWISE_ph_qual (star[i], ptr[i]); // ph_qual
+  }
+
+  ptr = skipNbounds (ptr, '|', 157, Nmax); // skip: det_bit, moon_lev, w?nm, w?m, w?cov, etc, etc.
+  // w?frtr dropped, (-4), use_src, best_use_cntr, ngrp added (+3), w?dmag dropped, w?k added, 
+
+  for (i = 0; i < 4; i++) {
+    ptr = skipNbounds (ptr, '|', 8, Nmax); // skip: w?magp, w?sigp1,2, w?dmag, w?ndf, w?m1q, w?mjdmin, w?mjdmax
+    // w?magp is at 217, ph_qual is at 60
+    // double mjdmin = strtod (ptr, NULL); // mjd min
+    // ptr = nextWISEfield (ptr); // skip
+    // double mjdmax = strtod (ptr, NULL); // mjd max
+    // ptr = nextWISEfield (ptr); // skip mjd max
+    double mjdmean = strtod (ptr, NULL); // mjd mean
+    ptr = nextWISEfield (ptr); // skip mjd mean
+
+    // fprintf (stderr, "w%d mjd: %f\n", i, mjdmean);
+
+    // the release is based on data taken in the period 14 January 2010 to 29 April 2010
+    if (mjdmean == 0.0) {
+      star[i][0].measure.t = 0;
+    } else {
+      star[i][0].measure.t = ohana_mjd_to_sec (mjdmean);
+    }
+  }
+
+  star[0][0].measure.photcode  = WISE_W1;
+  star[0][0].measure.detID   = 0;
+  star[0][0].measure.imageID = 0;
+
+  star[1][0].measure.photcode  = WISE_W2;
+  star[1][0].measure.detID   = 0;
+  star[1][0].measure.imageID = 0;
+
+  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;
+}
+
+// there are slight format differences between the prelim data dump and the allsky data dump:
+// * after ph_qual & det_bit : new field moon_lev
+// * for each filter, after w?sigp2 : new fields w?dmag, w?ndf, w?mlq, w?mjdmin, w?mjdmax, w?mjdmean
+// * after w4mdjmean : new fields rho12, rho23, rho34, q12, q23, q34
+// * after k_msig_2mass : new fields best_use_cntr, ngrp
+
+// 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 loadwise_star_allsky (Stars **star, char *line, int Nmax) {
 
   int i;
@@ -84 +227 @@
   ptr = nextWISEfield (ptr); // skip satnum
 
-  ptr = skipNbounds (ptr, '|', 15, Nmax); // skip pm info
-
-  for (i = 0; i < 4; i++) {
-      setWISE_cc_flag (star[i], ptr[i]); // cc_flags
+  for (i = 0; i < 4; i++) {
+      setWISE_cc_flag (star[i], ptr[i]); // cc_flg
   }
   ptr = nextWISEfield (ptr); // skip cc_flags
-  ptr = nextWISEfield (ptr); // skip rel
 
   // set ext flags for all 4 measures
@@ -105 +245 @@
   }
 
-  ptr = skipNbounds (ptr, '|', 158, Nmax); // skip: det_bit, moon_lev, w?nm, w?m, w?cov, etc, etc.
-  // w?frtr dropped, (-4), use_src, best_use_cntr, ngrp added (+3), w?dmag dropped, w?k added, 
-
-  for (i = 0; i < 4; i++) {
-    ptr = skipNbounds (ptr, '|', 8, Nmax); // skip: w?magp, w?sigp1,2, w?dmag, w?ndf, w?m1q, w?mjdmin, w?mjdmax
+  ptr = skipNbounds (ptr, '|', 159, Nmax); // skip: det_bit, moon_lev, w?nm, w?m, w?cov, etc, etc.
+
+  for (i = 0; i < 4; i++) {
+    ptr = skipNbounds (ptr, '|', 8, Nmax); // skip: det_bit, moon_lev, w?nm, w?m, w?cov, etc, etc.
 
     // double mjdmin = strtod (ptr, NULL); // mjd min
@@ -147 +286 @@
 }
 
-// there are slight format differences between the prelim data dump and the allsky data dump:
-// * after ph_qual & det_bit : new field moon_lev
-// * for each filter, after w?sigp2 : new fields w?dmag, w?ndf, w?mlq, w?mjdmin, w?mjdmax, w?mjdmean
-// * after w4mdjmean : new fields rho12, rho23, rho34, q12, q23, q34
-// * after k_msig_2mass : new fields best_use_cntr, ngrp
-
 // 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 loadwise_star_allsky (Stars **star, char *line, int Nmax) {
+int loadwise_star_prelim (Stars **star, char *line, int Nmax) {
 
   int i;
@@ -196 +329 @@
   // W1
   for (i = 0; i < 4; i++) {
-    char *endpoint;
-      star[i][0].measure.M  = strtod (ptr, &endpoint); // w?mpro
-      if (endpoint == ptr) {
-        star[i][0].measure.M  = NAN;
-      }
-      ptr = nextWISEfield (ptr);
-      star[i][0].measure.dM = strtod (ptr, &endpoint); // w?sigmpro
-      if (endpoint == ptr) {
-        star[i][0].measure.dM  = NAN;
-      }
-      ptr = skipNbounds (ptr, '|', 2, Nmax); // skip: w?sigmpro, w?snr
-      star[i][0].measure.psfChisq = strtod (ptr, NULL); // w?rchi2
-      ptr = nextWISEfield (ptr); // skip : w1rchi2
-
-      // init the photFlags field
-      star[i][0].measure.photFlags = 0;
-  }
-
-  ptr = nextWISEfield (ptr); // skip: rchi2
-
-  // set blend flags for all 4 measures
-  setWISE_blend_flag (star, ptr); // nb & na both used here
-  ptr = skipNbounds (ptr, '|', 2, Nmax); // skip: nb, na
-
-  for (i = 0; i < 4; i++) {
-      setWISE_sat_flag (star[i], ptr); // w1sat
-      ptr = nextWISEfield (ptr); 
-  }
-  ptr = nextWISEfield (ptr); // skip satnum
-
-  for (i = 0; i < 4; i++) {
-      setWISE_cc_flag (star[i], ptr[i]); // cc_flg
-  }
-  ptr = nextWISEfield (ptr); // skip cc_flags
-
-  // set ext flags for all 4 measures
-  setWISE_ext_flag_allsky (star, ptr[0]); // ext_flg
-  ptr = nextWISEfield (ptr); // skip ext_flags
-
-  for (i = 0; i < 4; i++) {
-      setWISE_var_flag_allsky (star[i], ptr[i]); // var_flg
-  }
-  ptr = nextWISEfield (ptr); // skip var_flags
-
-  for (i = 0; i < 4; i++) {
-      setWISE_ph_qual (star[i], ptr[i]); // ph_qual
-  }
-
-  ptr = skipNbounds (ptr, '|', 159, Nmax); // skip: det_bit, moon_lev, w?nm, w?m, w?cov, etc, etc.
-
-  for (i = 0; i < 4; i++) {
-    ptr = skipNbounds (ptr, '|', 8, Nmax); // skip: det_bit, moon_lev, w?nm, w?m, w?cov, etc, etc.
-
-    // double mjdmin = strtod (ptr, NULL); // mjd min
-    // ptr = nextWISEfield (ptr); // skip
-    // double mjdmax = strtod (ptr, NULL); // mjd max
-    // ptr = nextWISEfield (ptr); // skip mjd max
-    double mjdmean = strtod (ptr, NULL); // mjd mean
-    ptr = nextWISEfield (ptr); // skip mjd mean
-
-    // fprintf (stderr, "w%d mjd: %f\n", i, mjdmean);
-
-    // the release is based on data taken in the period 14 January 2010 to 29 April 2010
-    if (mjdmean == 0.0) {
-      star[i][0].measure.t = 0;
-    } else {
-      star[i][0].measure.t = ohana_mjd_to_sec (mjdmean);
-    }
-  }
-
-  star[0][0].measure.photcode  = WISE_W1;
-  star[0][0].measure.detID   = 0;
-  star[0][0].measure.imageID = 0;
-
-  star[1][0].measure.photcode  = WISE_W2;
-  star[1][0].measure.detID   = 0;
-  star[1][0].measure.imageID = 0;
-
-  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;
-}
-
-// 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 loadwise_star_prelim (Stars **star, char *line, int Nmax) {
-
-  int i;
-  char *ptr;
-
-  if (line == NULL) Shutdown ("format error in WISE");
-
-  ptr = line;
-
-  // I can assign dRA and dDEC to dX and dY if I can consistently set posangle and pltscale
-  star[0][0].measure.posangle = 0.0;
-  star[0][0].measure.pltscale = 1.0;
-
-  ptr = skipNbounds (ptr, '|', 3, Nmax); // skip: desig, ra, dec,
-  star[0][0].measure.dXccd = ToShortPixels(strtod (ptr, NULL)); // sig_ra
-  ptr = nextWISEfield (ptr);
-  star[0][0].measure.dYccd = ToShortPixels(strtod (ptr, NULL)); // sig_dec
-  ptr = nextWISEfield (ptr);
-
-  // we only know a single set of values for all 4 bands 
-  for (i = 1; i < 4; i++) {
-      star[i][0].measure.dXccd    = star[0][0].measure.dXccd;
-      star[i][0].measure.dYccd    = star[0][0].measure.dYccd;
-      star[i][0].measure.posangle = star[0][0].measure.posangle;
-      star[i][0].measure.pltscale = star[0][0].measure.pltscale;
-  }
-  ptr = skipNbounds (ptr, '|', 5, Nmax); // skip: sig_radec, glon, glat, elon, elat
-
-  star[0][0].measure.Xccd = strtod (ptr, NULL); // wx
-  ptr = nextWISEfield (ptr); // skip wx
-  star[0][0].measure.Yccd = strtod (ptr, NULL); // wy
-  ptr = nextWISEfield (ptr); // skip wy
-
-  for (i = 1; i < 4; i++) {
-      star[i][0].measure.Xccd    = star[0][0].measure.Xccd;
-      star[i][0].measure.Yccd    = star[0][0].measure.Yccd;
-  }
-  ptr = skipNbounds (ptr, '|', 4, Nmax); // skip: cntr, source_id, coadd_id, src
-
-  // W1
-  for (i = 0; i < 4; i++) {
       star[i][0].measure.M  = strtod (ptr, NULL); // w?mpro
       ptr = nextWISEfield (ptr);
@@ -413 +414 @@
 # define FLAG_PH_U            0x00000008 // quality flag 'U'
 # define FLAG_PH_X            0x00000010 // quality flag 'X'
+# define FLAG_PH_Z            0x00000020 // quality flag 'Z'
 
 # define FLAG_SATURATED_PIX   0x00000100 // sat > 0.0
@@ -429 +431 @@
 # define FLAG_EXT_BY_XSC      0x04000000 // ext == 1
 
-# define FLAG_VARIABLE_LEVEL1 0x10000000 // var_flg == 1 to 4
-# define FLAG_VARIABLE_LEVEL2 0x20000000 // var_flg == 5 to 7
+// note prelim version had 1 -> 1-4, 2 -> 5-6
+# define FLAG_VARIABLE_LEVEL1 0x10000000 // var_flg == 0 to 5
+# define FLAG_VARIABLE_LEVEL2 0x20000000 // var_flg == 6 or 7
 # define FLAG_VARIABLE_LEVEL3 0x40000000 // var_flg == 8 or 9
 
@@ -606 +609 @@
     case 'U': star[0].measure.photFlags |= FLAG_PH_U; break;
     case 'X': star[0].measure.photFlags |= FLAG_PH_X; break;
+    case 'Z': star[0].measure.photFlags |= FLAG_PH_Z; break;
     default: 
       fprintf (stderr, "error in ph_flag: %c\n", qual);