Changeset 37858 for branches/eam_branches/ipp-20150112/Ohana/src

Timestamp:

Jan 17, 2015, 10:22:35 AM (12 years ago)

Author:

eugene

Message:

tweaks to loadwise for allwise

Location:

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

Files:

• include/WISE.h (modified) (1 diff)
• src/args_loadwise.c (modified) (1 diff)
• src/loadwise_rawdata.c (modified) (1 diff)
• src/loadwise_star_full.c (modified) (3 diffs)

branches/eam_branches/ipp-20150112/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);
 
 

branches/eam_branches/ipp-20150112/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;

branches/eam_branches/ipp-20150112/Ohana/src/addstar/src/loadwise_rawdata.c

@@ -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;
         }

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

@@ -27 +27 @@
 
   ptr = skipNbounds (ptr, '|', 3, Nmax); // skip: desig, ra, dec,
-  star[0][0].measure.dXccd = ToShortPixels(strtod (ptr, NULL)); // sig_ra
+  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)); // sig_dec
+  star[0][0].measure.dYccd = ToShortPixels((strtod (ptr, NULL) + 0.005)); // sig_dec
   ptr = nextWISEfield (ptr);
 
@@ -105 +105 @@
   }
 
-  ptr = skipNbounds (ptr, '|', 158, Nmax); // skip: det_bit, moon_lev, w?nm, w?m, w?cov, etc, etc.
+  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
@@ -429 +429 @@
 # 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