Changeset 40520 for trunk

Timestamp:

Aug 21, 2018, 4:28:33 PM (8 years ago)

Author:

eugene

Message:

small fixes to the UKIRT addstar code to make it work

Location:

trunk/Ohana/src/addstar

Files:

• include/addstar.h (modified) (1 diff)
• src/LoadDataUKIRT.c (modified) (2 diffs)
• src/LoadStars.c (modified) (1 diff)
• src/ReadStarsUKIRT.c (modified) (5 diffs)

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

@@ -327 +327 @@
 void saveMosaicCoords (Coords *input);
 
-Catalog *ReadStarsUKIRT (FILE *f, char *name, Header *header, Image *images, off_t *nimages);
-Catalog *LoadDataUKIRT (FILE *f, char *file, Image **images, off_t *nimages, Header **headers, off_t *extsize, HeaderSet *headerSets, off_t NheaderSets);
+Catalog *ReadStarsUKIRT (FILE *f, char *name, Header *header, Image *images, off_t *nimages, SkyRegion *region);
+Catalog *LoadDataUKIRT (FILE *f, char *file, Image **images, off_t *nimages, Header **headers, off_t *extsize, HeaderSet *headerSets, off_t NheaderSets, SkyRegion *region);
 
 AddstarFile *LoadFilenames (int *nfile, char *filename, AddstarClientOptions *options);

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

@@ -6 +6 @@
 int MergeCatalogs (Catalog *tgt, Catalog *src);
 
-Catalog *LoadDataUKIRT (FILE *f, char *imagename, Image **images, off_t *nimages, Header **headers, off_t *extsize, HeaderSet *headerSets, off_t NheaderSets) {
+Catalog *LoadDataUKIRT (FILE *f, char *imagename, Image **images, off_t *nimages, Header **headers, off_t *extsize, HeaderSet *headerSets, off_t NheaderSets, SkyRegion *region) {
 
   off_t Nskip, Nvalid, NVALID;
@@ -41 +41 @@
     fseeko (f, Nskip, SEEK_SET); 
 
-    Catalog *newcat = ReadStarsUKIRT (f, imagename, headers[Nhead], images[0], &Nvalid);
+    Catalog *newcat = ReadStarsUKIRT (f, imagename, headers[Nhead], images[0], &Nvalid, region);
     MergeCatalogs (catalog, newcat);
 

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

@@ -77 +77 @@
     // if these are SDSS data, load with SDSS-specific wrapper
     if (headerSets[0].exttype && !strcmp (headerSets[0].exttype, "UKIRT_OBJ")) {
-      newcat = LoadDataUKIRT (f, file[i].imagename, images, Nimages, headers, extsize, headerSets, NheaderSets);
+      newcat = LoadDataUKIRT (f, file[i].imagename, images, Nimages, headers, extsize, headerSets, NheaderSets, &region);
       goto next_file;
     }

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

@@ -8 +8 @@
 // given a file with the pointer at the start of the table block and the 
 // corresponding image header, load the stars from the table
-Catalog *ReadStarsUKIRT (FILE *f, char *imagename, Header *header, Image *images, off_t *nimages) {
+Catalog *ReadStarsUKIRT (FILE *f, char *imagename, Header *header, Image *images, off_t *nimages, SkyRegion *region) {
 
   off_t Nrow;
@@ -14 +14 @@
   char type[80];
   FTable table;
-  
-  myAbort("need to save the RA,DEC range in a returned SkyRegion (see LoadData)");
+  float RMIN, RMAX, DMIN, DMAX;
+  
+  // myAbort("need to save the RA,DEC range in a returned SkyRegion (see LoadData)");
+
+  RMIN = region->Rmin;
+  RMAX = region->Rmax;
+  DMIN = region->Dmin;
+  DMAX = region->Dmax;
 
   // the FITS binary table header is the same as the image header
@@ -177 +183 @@
     catalog->average[i].Nmeasure      = 1;
     catalog->average[i].measureOffset = i;
+
+    // determine the full coverage of this set of measurements
+    RMIN = MIN (RMIN, catalog->average[i].R);
+    RMAX = MAX (RMAX, catalog->average[i].R);
+    DMIN = MIN (DMIN, catalog->average[i].D);
+    DMAX = MAX (DMAX, catalog->average[i].D);
 
     catalog->measure[i].R         = catalog->average[i].R;
@@ -210 +222 @@
     catalog->measure[i].imageID   = *nimages; // set imageID to entry for this filter
   }
+  catalog->Naverage = Nstars;
+  catalog->Nmeasure = Nstars;
 
   if (1) {
@@ -272 +286 @@
   // ohana_memcheck (TRUE);
 
+  if (VERBOSE) fprintf (stderr, "stars cover region %f,%f - %f,%f\n", RMIN, DMIN, RMAX, DMAX);
+
+  // define containing region a bit generously
+  region->Rmin = RMIN;
+  region->Rmax = RMAX;
+  region->Dmin = DMIN;
+  region->Dmax = DMAX;
+
   return (catalog);
 }