Changeset 39218

Timestamp:

Dec 3, 2015, 4:10:50 PM (11 years ago)

Author:

eugene

Message:

changes from trunk: do not drop detections across the 0,360 boundary

Location:

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

Files:

• include/addstar.h (modified) (2 diffs)
• src/FilterStars.c (modified) (2 diffs)
• src/LoadData.c (modified) (3 diffs)
• src/LoadStars.c (modified) (2 diffs)
• src/ReadStarsSDSS.c (modified) (1 diff)
• src/ReadStarsUKIRT.c (modified) (1 diff)

branches/eam_branches/ipp-20151113/Ohana/src/addstar/include/addstar.h

@@ -225 +225 @@
 HeaderSet *MatchHeaders           PROTO((off_t **extsize, off_t *nimage, int mode, Header **headers, int Nheaders));
 void       HeaderSetFree          PROTO((HeaderSet *headerSets, off_t NheaderSets));
-Catalog   *LoadData               PROTO((FILE *f, AddstarFile *file, Image **images, off_t *nvalid, Header **headers, off_t *extsize, HeaderSet *headerSets, int NheaderSets, AddstarClientOptions *options));
+Catalog   *LoadData               PROTO((FILE *f, AddstarFile *file, Image **images, off_t *nvalid, Header **headers, off_t *extsize, HeaderSet *headerSets, int NheaderSets, SkyRegion *region, AddstarClientOptions *options));
 int        GetZeroPointExposure   PROTO((Header **headers, HeaderSet *headerSets, off_t Nimages));
 
@@ -247 +247 @@
 
 Catalog   *ReadStarsFITS          PROTO((FILE *f, Header *header, Header *in_theader));
-Catalog   *FilterStars            PROTO((Catalog *newcat, Image *image, unsigned int imageID, const AddstarClientOptions *options));
+Catalog   *FilterStars            PROTO((Catalog *newcat, Image *image, unsigned int imageID, SkyRegion *region, const AddstarClientOptions *options));
 int        ReadXradFITS           PROTO((FILE *f, Header *theader, Catalog *catalog));
 

branches/eam_branches/ipp-20151113/Ohana/src/addstar/src/FilterStars.c

@@ -10 +10 @@
 // the imageID supplied here is the sequence **within this set**
 // this value is updated based on the image table later (in UpdateImageIDs)
-Catalog *FilterStars (Catalog *newcat, Image *image, unsigned int imageID, const AddstarClientOptions *options) {
+Catalog *FilterStars (Catalog *newcat, Image *image, unsigned int imageID, SkyRegion *region, const AddstarClientOptions *options) {
 
   int j, N;
@@ -182 +182 @@
   if (VERBOSE) fprintf (stderr, "stars cover region %f,%f - %f,%f\n", RMIN, DMIN, RMAX, DMAX);
 
+  float dR = RMAX - RMIN;
+  float dD = DMAX - DMIN;
+
+  // define containing region a bit generously
+  region->Rmin = RMIN - 0.1*dR;
+  region->Rmax = RMAX + 0.1*dR;
+  region->Dmin = DMIN - 0.1*dD;
+  region->Dmax = DMAX + 0.1*dD;
+
   return (outcat);
 }

branches/eam_branches/ipp-20151113/Ohana/src/addstar/src/LoadData.c

@@ -3 +3 @@
 // load photometry data from psphot, sextractor, and a few other formats
 // examine the header sets and set the Image entries for the the valid images
-Catalog *LoadData (FILE *f, AddstarFile *file, Image **images, off_t *nvalid, Header **headers, off_t *extsize, HeaderSet *headerSets, int Nimages, AddstarClientOptions *options) {
+Catalog *LoadData (FILE *f, AddstarFile *file, Image **images, off_t *nvalid, Header **headers, off_t *extsize, HeaderSet *headerSets, int Nimages, SkyRegion *region, AddstarClientOptions *options) {
 
   off_t Nskip, Nvalid, NVALID;
@@ -101 +101 @@
 
     // replace full input catalog newcat with subset version
-    newcat = FilterStars (newcat, &images[0][Nvalid], Nvalid, options);
+    newcat = FilterStars (newcat, &images[0][Nvalid], Nvalid, region, options);
 
-    double Rref, Dref;
-    XY_to_RD (&Rref, &Dref, 0.0, 0.0, &images[0][Nvalid].coords);
-    SkyRegion region;
-    region.Rmin = Rref - 180.0;
-    region.Rmax = Rref + 180.0;
-    region.Dmin = Dref -  90.0;
-    region.Dmax = Dref +  90.0;
-    
     AddstarClientOptions matchOptions = *options;
     matchOptions.radius = 0.4; // tight radius at this stage
@@ -118 +110 @@
     matchOptions.photcode = 0; // use an invalid photcode to avoid touching secfilt
 
-    find_matches_closest (&region, newcat, catalog, matchOptions);
+    find_matches_closest (region, newcat, catalog, matchOptions);
     dvo_catalog_free (newcat);
     free (newcat);

branches/eam_branches/ipp-20151113/Ohana/src/addstar/src/LoadStars.c

@@ -75 +75 @@
     }
 
-    newcat = LoadData (f, &file[i], images, Nimages, headers, extsize, headerSets, NheaderSets, options);
+    SkyRegion region;
+    newcat = LoadData (f, &file[i], images, Nimages, headers, extsize, headerSets, NheaderSets, &region, options);
 
   next_file:
@@ -81 +82 @@
     // if we added data from an image, then we can merge it in
     if (*Nimages > NimagesStart) {
-      double Rref, Dref;
-      XY_to_RD (&Rref, &Dref, 0.0, 0.0, &images[0][*Nimages-1].coords);
-      SkyRegion region;
-      region.Rmin = Rref - 180.0;
-      region.Rmax = Rref + 180.0;
-      region.Dmin = Dref -  90.0;
-      region.Dmax = Dref +  90.0;
-      
       AddstarClientOptions matchOptions = *options;
       matchOptions.radius = 0.4; // tight radius at this stage

branches/eam_branches/ipp-20151113/Ohana/src/addstar/src/ReadStarsSDSS.c

@@ -47 +47 @@
   int Ncol; // used in the GET_COLUMN_1,5 macros above
   
+  myAbort("need to save the RA,DEC range in a returned SkyRegion (see LoadData)");
+
   if (in_theader == NULL) {
     table.header = &theader;

branches/eam_branches/ipp-20151113/Ohana/src/addstar/src/ReadStarsUKIRT.c

@@ -15 +15 @@
   FTable table;
   
+  myAbort("need to save the RA,DEC range in a returned SkyRegion (see LoadData)");
+
   // the FITS binary table header is the same as the image header
   table.header = header;