Changeset 37357 for trunk/Ohana

Timestamp:

Sep 4, 2014, 7:55:12 AM (12 years ago)

Author:

eugene

Message:

merge changes from eam branch ipp-20140813 (ingest radial apertures for force photometry [-xrad])

Location:

trunk/Ohana/src/addstar

Files:

• Makefile (modified) (1 diff)
• include/addstar.h (modified) (3 diffs)
• src/FilterStars.c (modified) (2 diffs)
• src/LoadData.c (modified) (1 diff)
• src/MatchHeaders.c (modified) (1 diff)
• src/ReadXradFITS.c (copied) (copied from branches/eam_branches/ipp-20140813/Ohana/src/addstar/src/ReadXradFITS.c )
• src/UpdateImageIDs.c (modified) (1 diff)
• src/addstar.c (modified) (8 diffs)
• src/args.c (modified) (1 diff)

trunk/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 \

trunk/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;
@@ -250 +253 @@
 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));

trunk/Ohana/src/addstar/src/FilterStars.c

@@ -9 +9 @@
 
 // the imageID supplied here is the sequence **within this set**
-// this value is updated based on the image table later
+// this value is updated based on the image table later (in UpdateImageIDs)
 Stars *FilterStars (Stars *instars, Image *image, unsigned int imageID, const AddstarClientOptions *options) {
 
@@ -127 +127 @@
     stars[N].measure.imageID = imageID; // this value is updated in UpdateImageIDs
 
+    // add imageID to lensing entry, if it exists
+    if (stars[N].lensing) {
+      stars[N].lensing->imageID = imageID;
+    }
+
     N ++;
   }

trunk/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);

trunk/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;
+      }
     }
 

trunk/Ohana/src/addstar/src/UpdateImageIDs.c

@@ -55 +55 @@
   for (i = 0; i < Nstars; i++) {
     stars[i].measure.imageID += imageID;
+    if (stars[i].lensing) {
+      stars[i].lensing->imageID += imageID;
+    }
   }
 

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

@@ -1 +1 @@
 # include "addstar.h"
+
+# define RESETTIME { gettimeofday (&startTimer, (void *) NULL); }
 
 // LARGEFILES: this program currently limits Nstars (input file) to < 2^31
@@ -18 +20 @@
   SkyList *newlist = NULL;
 
-  double dtime;
-  struct timeval start, stop;
-
-  gettimeofday (&start, NULL);
+  struct timeval startAddstar, stopAddstar;
+  gettimeofday (&startAddstar, (void *) NULL);
+
+  INITTIME;
 
   SetSignals ();
@@ -44 +46 @@
   }
 
+  MARKTIME ("init and config: %f sec\n", dtime); RESETTIME; 
+
   stars = NULL;
 
@@ -50 +54 @@
     case ADDSTAR_MODE_IMAGE:
       stars = LoadStars (argv[1], &Nstars, &images, &Nimages, &options);
+      MARKTIME ("load smf: %f sec\n", dtime); RESETTIME; 
 
       // set and update the imageID sequence
@@ -127 +132 @@
       }
     }
+    MARKTIME ("load cpt: %f sec\n", dtime); RESETTIME; 
 
     // Naves_disk == 0 implies an empty catalog file
@@ -157 +163 @@
         break;
     }
+    MARKTIME ("match stars: %f sec\n", dtime); RESETTIME; 
+
     /* report total updated values */
     Naverage += catalog.Naverage;
@@ -175 +183 @@
     dvo_catalog_unlock (&catalog);
     dvo_catalog_free (&catalog);
+    MARKTIME ("save cpt: %f sec\n", dtime); RESETTIME; 
 
     if (options.mode == ADDSTAR_MODE_REFCAT) free (stars);
@@ -208 +217 @@
   dvo_image_unlock (&db); /* unlock? */
 
-  gettimeofday (&stop, NULL);
-  dtime = DTIME (stop, start);
+  gettimeofday (&stopAddstar, (void *) NULL);
+  float dtime = DTIME (stopAddstar, startAddstar);
   fprintf (stderr, "SUCCESS: elapsed time %9.4f sec for %5d stars (%5d matches), "OFF_T_FMT" average, "OFF_T_FMT" measure, "OFF_T_FMT" lensing\n", dtime, Nstars, Nmatch,  Naverage,  Nmeasure, Nlensing);
 

trunk/Ohana/src/addstar/src/args.c

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