Changeset 37343

Timestamp:

Sep 1, 2014, 3:38:28 PM (12 years ago)

Author:

eugene

Message:

add capability to ingest the radial apertures in dvo

Location:

tags/ipp-pv3-20140717/Ohana/src/addstar

Files:

• Makefile (modified) (1 diff)
• include/addstar.h (modified) (3 diffs)
• src/LoadData.c (modified) (1 diff)
• src/MatchHeaders.c (modified) (1 diff)
• src/ReadXradFITS.c (added)
• src/args.c (modified) (1 diff)

tags/ipp-pv3-20140717/Ohana/src/addstar/Makefile

@@ -86 +86 @@
 $(SRC)/ReadStarsTEXT.$(ARCH).o \
 $(SRC)/ReadStarsSDSS.$(ARCH).o \
+$(SRC)/ReadXradFITS.$(ARCH).o \
 $(SRC)/FilterStars.$(ARCH).o \
 $(SRC)/ImageOptions.$(ARCH).o \

tags/ipp-pv3-20140717/Ohana/src/addstar/include/addstar.h

@@ -35 +35 @@
   char *exthead;
   char *extdata;
+  char *extxrad;
   char *exttype;
   int extnum_head;
   int extnum_data;
+  int extnum_xrad;
 } HeaderSet;
 
@@ -146 +148 @@
 
 int     OLD_RESORT;
+int     READ_XRAD_DATA;
 
 int    PARALLEL;
@@ -248 +251 @@
 Stars     *FilterStars            PROTO((Stars *instars, Image *image, unsigned int imageID, const AddstarClientOptions *options));
 Stars     *MergeStars             PROTO((Stars *stars, unsigned int *Nstars, Stars *instars, unsigned int Ninstars));
+
+int        ReadXradFITS           PROTO((FILE *f, Header *theader, Stars *stars, unsigned int Nstars));
+
 double     scat_subpix            PROTO((double x, double y));
 void       update_coords          PROTO((Average *average, Measure *measure, off_t *next));

tags/ipp-pv3-20140717/Ohana/src/addstar/src/LoadData.c

@@ -83 +83 @@
       continue;
     }
+
+    // XRAD : if we want to read the xrad table, skip to that table here:
+    if (headerSets[i].extnum_xrad != -1) {
+      int Nxrad = headerSets[i].extnum_xrad;
+      Nskip = 0;
+      for (j = 0; j < Nxrad; j++) {
+        Nskip += extsize[j];
+      }
+      fseeko (f, Nskip, SEEK_SET); 
+      
+      if (!ReadXradFITS (f, headers[Nxrad], inStars, images[0][Nvalid].nstar)) {
+        fprintf (stderr, "problem reading the radial flux data for %s\n", headerSets[i].extdata);
+      }
+    }
+
     inStars = FilterStars (inStars, &images[0][Nvalid], Nvalid, options);
     *stars = MergeStars (*stars, Nstars, inStars, images[0][Nvalid].nstar);

tags/ipp-pv3-20140717/Ohana/src/addstar/src/MatchHeaders.c

@@ -79 +79 @@
     headerSets[Nimage].extdata     = strcreate (extname);
     headerSets[Nimage].exthead     = strcreate (exthead);
+    headerSets[Nimage].extxrad     = NULL;
     headerSets[Nimage].extnum_data = i;
     headerSets[Nimage].extnum_head = -1;
+    headerSets[Nimage].extnum_xrad = -1;
+
+    // XXX a special case for fforce xrad data
+    if (READ_XRAD_DATA) {
+      // extname is foobar.psf, convert to foobar.xrad
+      int Nchar = strlen (extname); // foobar.psf : Nchar = 10
+      ALLOCATE (headerSets[Nimage].extxrad, char, Nchar + 2); // xrad is 1 longer than psf
+      memcpy   (headerSets[Nimage].extxrad, extname, Nchar - 3); // Nchar - 3 = 7
+      memcpy  (&headerSets[Nimage].extxrad[Nchar-3], "xrad", 4); 
+      headerSets[Nimage].extxrad[Nchar + 1] = 0; // put the 0 at element 11 for foobar.xrad\0
+    }
 
     // find the matching exthead entry
     for (j = 0; j < Nheaders; j++) {
       if (!gfits_scan (headers[j], ExtnameKeyword, "%s", 1, extname)) continue;
-      if (strcmp (extname, headerSets[Nimage].exthead)) continue;
-      headerSets[Nimage].extnum_head = j;
-      break;
+      if (!strcmp (extname, headerSets[Nimage].exthead)) { 
+        headerSets[Nimage].extnum_head = j;
+        if (!READ_XRAD_DATA) break;
+      }
+      if (READ_XRAD_DATA && !strcmp (extname, headerSets[Nimage].extxrad)) { 
+        headerSets[Nimage].extnum_xrad = j;
+      }
+      if ((headerSets[Nimage].extnum_head > -1) && (headerSets[Nimage].extnum_xrad > -1)) {
+        // we can only get here if READ_XRAD_DATA is true
+        break;
+      }
     }
 

tags/ipp-pv3-20140717/Ohana/src/addstar/src/args.c

@@ -75 +75 @@
     PMM_CCD_TABLE = strcreate (argv[N]);
     remove_argument (N, &argc, argv);
+  }
+
+  READ_XRAD_DATA = FALSE;
+  if ((N = get_argument (argc, argv, "-xrad"))) {
+    remove_argument (N, &argc, argv);
+    READ_XRAD_DATA = TRUE;
   }