Changeset 27683 for trunk/ippToPsps/src/ippToPspsBatchDetection.c

Timestamp:

Apr 14, 2010, 2:30:14 PM (16 years ago)

Author:

rhenders

Message:

Fixed bug whereby an empty ImageMeta table was written even when assocaited XYnn.psf extension was missing in source

File:

• trunk/ippToPsps/src/ippToPspsBatchDetection.c (modified) (3 diffs)

trunk/ippToPsps/src/ippToPspsBatchDetection.c

@@ -205 +205 @@
             nOta++;
 
-
             // TODO check nDet < MAXDETECT
+            // move to detections table in smf
+            sprintf(extensionName, "XY%s.psf", ccdNumber);
+            status=0;
+            if (fits_movnam_hdu(fitsIn, BINARY_TBL, extensionName, 0, &status)) {
+                psError(PS_ERR_IO, false, "Can't move to extension: %s skipping\n", extensionName);
+                continue;
+            }
 
             // create ImageMeta
@@ -212 +218 @@
             psfFwhm = (fwhmMaj+fwhmMin)/2;
             momentFwhm = (momentMaj+momentMin)/2;
-            fits_write_col(this->fitsOut, TLONGLONG, IMAGEMETA_IMAGEID, 1, 1, 1, &pspsImageId, &status); // TODO enums for thse col numbers
+            fits_write_col(this->fitsOut, TLONGLONG, IMAGEMETA_IMAGEID, 1, 1, 1, &pspsImageId, &status);
             fits_write_col(this->fitsOut, TLONG, IMAGEMETA_FRAMEID, 1, 1, 1, &this->expId, &status);
             fits_write_col(this->fitsOut, TSHORT, IMAGEMETA_CCDID, 1, 1, 1, &pImage->ccdnum, &status);
@@ -222 +228 @@
             fits_write_col(this->fitsOut, TFLOAT, IMAGEMETA_MOMENTFWHM, 1, 1, 1, &momentFwhm, &status);
             fits_write_col(this->fitsOut, TFLOAT, IMAGEMETA_PHOTOZERO, 1, 1, 1, &zptObs, &status);
-
-            // move to detections table in smf
-            sprintf(extensionName, "XY%s.psf", ccdNumber);
-            status=0;
-            if (fits_movnam_hdu(fitsIn, BINARY_TBL, extensionName, 0, &status)) {
-                psError(PS_ERR_IO, false, "Can't move to extension: %s skipping\n", extensionName);
-                continue;
-            }
 
             long nDet = 0;