Changeset 37822 for branches/eam_branches/ipp-pv3-20140717-merge/Ohana/src/getstar

Timestamp:

Jan 12, 2015, 12:29:24 PM (12 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-pv3-20140717-merge/Ohana

Files:

• . (modified) (1 prop)
• src/getstar (modified) (1 prop)
• src/getstar/include/dvoImageOverlaps.h (modified) (1 diff)
• src/getstar/src/MatchCoords.c (modified) (1 diff)
• src/getstar/src/MatchImages.c (modified) (2 diffs)
• src/getstar/src/ReadImageFiles.c (modified) (1 diff)
• src/getstar/src/ReadImageHeader.c (modified) (3 diffs)
• src/getstar/src/WriteImages.c (modified) (3 diffs)

branches/eam_branches/ipp-pv3-20140717-merge/Ohana/src/getstar/include/dvoImageOverlaps.h

@@ -37 +37 @@
 int edge_check (double *x1, double *y1, double *x2, double *y2);
 double opening_angle (double x1, double y1, double x2, double y2, double x3, double y3);
+
+void initMosaicCoords ();
+void saveMosaicCoords (Coords *input);

branches/eam_branches/ipp-pv3-20140717-merge/Ohana/src/getstar/src/MatchCoords.c

@@ -29 +29 @@
     if (!WITH_PHU && !strcmp (&dbImages[i].coords.ctype[4], "-DIS")) continue;
     if ( SOLO_PHU &&  strcmp (&dbImages[i].coords.ctype[4], "-DIS")) continue;
-
-    /* if any of these images are WRP images, need to find matching DIS */
-    if (!FindMosaicForImage (dbImages, NdbImages, i)) continue;
 
     /* define image corners */

branches/eam_branches/ipp-pv3-20140717-merge/Ohana/src/getstar/src/MatchImages.c

@@ -23 +23 @@
   /* we keep the original crpix1,2 and crref1,2 */
   /* for mosaic astrometry, the grid should be w.r.t. the tangent-plane, not chip coords */
+  InitCoords (&tcoords, "DEC--TAN");
   if (!strcmp (&image[0].coords.ctype[4], "-WRP")) {
-    // if the input image is a mosaic, we need to register that mosaic for the calculations below
-    if (MOSAIC == NULL) {
-      fprintf (stderr, "no mosaic for WRP image (use -mosaic)\n");
-      return NULL;
-    }
-    RegisterMosaic (MOSAIC);
-
-    tcoords = MOSAIC[0];
+    myAssert (image[0].coords.mosaic, "should already have tested this");
+    tcoords = image[0].coords.mosaic[0];
     tcoords.cdelt1 = tcoords.cdelt2 = 1.0 / 3600.0;
-    tcoords.pc1_1 = tcoords.pc2_2 = 1.0;
-    tcoords.pc1_2 = tcoords.pc2_1 = 0.0;
-    tcoords.Npolyterms = 1;
-    strcpy (tcoords.ctype, "DEC--TAN");
     /* register so image->sky conversions below have correct mosaic */
   } else {
     tcoords = image[0].coords;
     tcoords.cdelt1 = tcoords.cdelt2 = 1.0 / 3600.0;
-    tcoords.pc1_1 = tcoords.pc2_2 = 1.0;
-    tcoords.pc1_2 = tcoords.pc2_1 = 0.0;
-    tcoords.Npolyterms = 1;
-    strcpy (tcoords.ctype, "DEC--TAN");
   }
 
@@ -77 +64 @@
     if (!WITH_PHU && !strcmp (&dbImages[i].coords.ctype[4], "-DIS")) continue;
     if ( SOLO_PHU &&  strcmp (&dbImages[i].coords.ctype[4], "-DIS")) continue;
-
-    /* if any of these images are WRP images, need to find matching DIS */
-    if (!FindMosaicForImage (dbImages, NdbImages, i)) continue;
 
     /* define image corners */

branches/eam_branches/ipp-pv3-20140717-merge/Ohana/src/getstar/src/ReadImageFiles.c

@@ -42 +42 @@
 
   mode = GetFileMode (header);
+
+  initMosaicCoords ();
 
   /*** load data from a single PHU or a collection of PHU files ***/

branches/eam_branches/ipp-pv3-20140717-merge/Ohana/src/getstar/src/ReadImageHeader.c

@@ -1 +1 @@
 # include "dvoImageOverlaps.h"
+
+// for DIS/WRP sets, we need to save the DIS set and supply it to the WRP entries
+static Coords *mosaic = NULL;
+
+void initMosaicCoords () {
+  mosaic = NULL;
+}
+
+void saveMosaicCoords (Coords *input) {
+  mosaic = input;
+}
 
 /* read an image header corresponding to a CMF / CMP data block */
@@ -44 +55 @@
   /* only load astrometry, NAXIS1,2, and time if this is a MOSAIC_PHU (ctype is ....-DIS) */
   if (!strcmp (&image[0].coords.ctype[4], "-DIS")) {
-    MOSAIC = &image[0].coords;
+    saveMosaicCoords (&image[0].coords);
     return (TRUE);
   }
@@ -56 +67 @@
   }
   if (!strcmp (&image[0].coords.ctype[4], "-WRP")) {
-    if (MOSAIC == NULL) {
+    if (mosaic == NULL) {
       fprintf (stderr, "no mosaic for WRP image (use -mosaic)\n");
       return (FALSE);
     }
-    RegisterMosaic (MOSAIC);
+    image[0].coords.mosaic = mosaic;
   } else {
     /* force image to lie in 0-360 range */

branches/eam_branches/ipp-pv3-20140717-merge/Ohana/src/getstar/src/WriteImages.c

@@ -5 +5 @@
   
   int i, N;
-  int nWRP, newWRP, isWRP;
+  int isWRP;
   FILE *f;
 
@@ -16 +16 @@
   }
 
-  nWRP = -1;
+  Image *mosaic = NULL;
   isWRP = FALSE;
   for (i = 0; i < Nmatches; i++) {
-    if (!strcmp (&images[0].coords.ctype[4], "-WRP")) {
-      if (!FindMosaicForImage (images, Nimages, i)) {
-        fprintf (stderr, "failed to find matching mosaic\n");
-        exit (1);
-      }
+    N = matches[i];
+    if (!strcmp (&images[N].coords.ctype[4], "-WRP")) {
       if (isWRP) {
-        newWRP = GetRegisteredMosaic();
-        if (newWRP != nWRP) {
+        if (mosaic != images[N].parent) {
           fprintf (stderr, "only one mosaic allowed in an output file\n");
           exit (1);
         }
       } else {
-        nWRP = GetRegisteredMosaic();
-        isWRP = TRUE;
+        mosaic = images[N].parent;
       }
     }      
@@ -38 +33 @@
 
   if (isWRP) {
-    WriteImageFITS (f, &images[nWRP]);
+    WriteImageFITS (f, mosaic);
   } else {
     // write a blank