Changeset 7688 for trunk/Ohana/src/addstar/src/get2mass_as_raw.c

Timestamp:

Jun 25, 2006, 12:58:30 PM (20 years ago)

Author:

eugene

Message:

updates to addstar for better 2mass support

File:

• trunk/Ohana/src/addstar/src/get2mass_as_raw.c (modified) (4 diffs)

trunk/Ohana/src/addstar/src/get2mass_as_raw.c

@@ -31 +31 @@
   DEC1 = MIN (patch[0].Dmax, UserPatch.Dmax);
 
-  FilterSkip = TimeSkip = Qentry = 0;
-  if (photcode == TM_J) {
-      FilterSkip = 6;
-      // TimeSkip = 23;
-      TimeSkip = 28;
-      Qentry   = 0;
-  }
-  if (photcode == TM_H) {
-      FilterSkip = 10;
-      // TimeSkip = 19;
-      TimeSkip = 24;
-      Qentry   = 1;
-  }
-  if (photcode == TM_K) {
-      FilterSkip = 14;
-      // looks like this should be 20, not 15...
-      // TimeSkip = 15;
-      TimeSkip = 20;
-      Qentry   = 2;
-  }
-  if (!FilterSkip) Shutdown ("invalid photcode %s", GetPhotcodeNamebyCode(photcode));
+  get2mass_setup (photcode);
 
   f = fopen (filename, "r");
@@ -60 +40 @@
   NSTARS = 10000;
   ALLOCATE (stars, Stars, NSTARS);
-
-  /* I want to add a seek-ahead test to find a good starting position in the file
-     this is very expensive using gzseek / gzread.  */
-
-  # if 0
-  if (patch[0].Rmin > 5) {
-    // each 2MASS record is a random length of ~ 330 bytes
-    // guess at start, then used a binary search to narrow down
-    // first guess at start:
-    dNoffset = region[0].childE / 360.0;
-    Noffset = dNoffset * patch[0].Rmin;
-    fseek (f, Noffset * NBREC, SEEK_SET);
-    Nbyte = fread (buffer, 1, 10*NBREC, f);
-    q = memchr (p, '\n', Nbyte);
-    if (q == NULL) Shutdown ("incomplete line at end of file\n");
-    q++; // first (or second) complete line
-  
-    // get coords for this line
-    RA = strtod (q, NULL);
-    ptr = skipNbounds (q, '|', 1, Nbyte - (q - buffer));
-    DEC = strtod (ptr, NULL);
-    if (DEC > 90) Shutdown ("weird DEC value: something is wrong");
-
-    // if we are beyond, spin back in ~5 deg chunks 'till we are below
-    while (RA > patch[0].Rmin) {
-      fseek (f, -5 * dNoffset * NBREC, SEEK_CUR);
-      Nbyte = fread (buffer, 1, 10*NBREC, f);
-      q = memchr (p, '\n', Nbyte);
-      if (q == NULL) Shutdown ("incomplete line at end of file\n");
-      q++; // first (or second) complete line
-  
-      // get coords for this line
-      RA = strtod (q, NULL);
-      ptr = skipNbounds (q, '|', 1, Nbyte - (q - buffer));
-      DEC = strtod (ptr, NULL);
-      if (DEC > 90) Shutdown ("weird DEC value: something is wrong");
-
-      Nextra = Nbyte - (q - buffer);
-      memmove (buffer, q, Nextra);
-    }
-  } else {
-    Nextra = 0;
-  }
-  # endif
 
   Nextra = 0;
@@ -119 +55 @@
     while (1) {
 
-      RA = strtod (p, NULL);
-      ptr = skipNbounds (p, '|', 1, Nbyte - (p - buffer));
-      DEC = strtod (ptr, NULL);
-      if (DEC > 90) Shutdown ("weird DEC value: something is wrong");
+      get2mass_coords (p, &RA, &DEC, Nbyte - (p - buffer));
 
       /* skip stars which are outside desired region */
@@ -130 +63 @@
       if (RA >  RA1)  goto skip_star;
 
-      ptr = skipNbounds (p, '|', FilterSkip, Nbyte - (p - buffer));
-      if (ptr == NULL) Shutdown ("format error in 2mass");
-      M  = strtod (ptr, NULL);
-      ptr = skipNbounds (ptr, '|', 1, Nbyte - (ptr - buffer));
-      dM = strtod (ptr, NULL);
-      time = get2mass_time (ptr, buffer, TimeSkip, Nbyte);
-
-      /* filter on the ph_qual flag for this filter (field 19) */
-      if (SELECT_2MASS_QUALITY != NULL) {
-        ptr = skipNbounds (p, '|', 18, Nbyte - (p - buffer));
-        qc  = ptr[Qentry];
-        if (strchr (SELECT_2MASS_QUALITY, qc) == NULL) goto skip_star;
-      }
-
-      stars[Nstars].R     = RA;
-      stars[Nstars].D     = DEC;
-      stars[Nstars].M     = M;
-      stars[Nstars].dM    = dM;
-      stars[Nstars].code  = photcode;
-      stars[Nstars].t     = time;
-      stars[Nstars].found = -1;
+      get2mass_star (&stars[Nstars], p, Nbyte - (p - buffer));
 
       Nstars ++;