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

Timestamp:

Apr 5, 2010, 2:36:09 PM (16 years ago)

Author:

rhenders

Message:

Changes to accommodate new PSPS schema.

File:

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

trunk/ippToPsps/src/ippToPspsBatchDetection.c

@@ -86 +86 @@
     float fwhmMaj;
     float fwhmMin;
+    float momentMaj;
+    float momentMin;
     float psfFwhm;
+    float momentFwhm;
     long pspsImageId = -1;
 
@@ -148 +151 @@
     long maxObjID = LONG_MIN; 
     long minObjID = LONG_MAX;
-    short nP2Images = 0;
+    short nOta = 0;
     long i;
     bool duplicate;
@@ -178 +181 @@
             status=0; fits_read_key(fitsIn, TFLOAT, "FWHM_MAJ", &fwhmMaj, NULL, &status);
             status=0; fits_read_key(fitsIn, TFLOAT, "FWHM_MIN", &fwhmMin, NULL, &status);
+            status=0; fits_read_key(fitsIn, TFLOAT, "IQ_FW1", &momentMaj, NULL, &status);
+            status=0; fits_read_key(fitsIn, TFLOAT, "IQ_FW2", &momentMin, NULL, &status);
             status=0; fits_read_key(fitsIn, TLONG, "IMAGEID", &imageId, NULL, &status);
             status=0; fits_read_key(fitsIn, TDOUBLE, "MJD-OBS", &obsTime, NULL, &status);
@@ -198 +203 @@
 
             // keep a running count of 'images' we find in order to write total to FrameMeta at the end
-            nP2Images++;
+            nOta++;
 
 
@@ -206 +211 @@
             ippToPspsConfig_writeTable(this->config, fitsIn, this->fitsOut, 1, "ImageMeta", true);
             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, TLONG, IMAGEMETA_FRAMEID, 1, 1, 1, &this->expId, &status);
@@ -214 +220 @@
             fits_write_col(this->fitsOut, TFLOAT, IMAGEMETA_PHOTOSCAT, 1, 1, 1, &zptObs, &status);
             fits_write_col(this->fitsOut, TFLOAT, IMAGEMETA_PSFFWHM, 1, 1, 1, &psfFwhm, &status);
+            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);
 
@@ -308 +315 @@
             fits_write_col(this->fitsOut, TFLOAT, DETECTION_INSTFLUX, 1, 1, nDet, instFlux, &status);
             fits_write_col(this->fitsOut, TFLOAT, DETECTION_INSTFLUXERR, 1, 1, nDet, instFluxErr, &status);
-            fits_write_col(this->fitsOut, TFLOAT, DETECTION_PEAKFLUX, 1, 1, nDet, peakFlux, &status);
+            fits_write_col(this->fitsOut, TFLOAT, DETECTION_PEAKADU, 1, 1, nDet, peakFlux, &status);
             fits_write_col(this->fitsOut, TSTRING, DETECTION_ASSOCDATE, 1, 1, nDet, assocDate, &status); 
             if (numOfDuplicates) fits_delete_rowlist(this->fitsOut, duplicateList, numOfDuplicates, &status);
@@ -344 +351 @@
         fits_report_error(stderr, status);
     else 
-        fits_write_col(this->fitsOut, TSHORT, 11, 1, 1, 1, &nP2Images, &status);
+        fits_write_col(this->fitsOut, TSHORT, FRAMEMETA_NOTA, 1, 1, 1, &nOta, &status);
 
     if (fits_close_file(fitsIn, &status)) fits_report_error(stderr, status);