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

Timestamp:

Mar 24, 2010, 11:15:44 AM (16 years ago)

Author:

rhenders

Message:

pspsSchema2xml now generates C header files with enums detailing table columns

File:

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

trunk/ippToPsps/src/ippToPspsBatchDetection.c

@@ -7 +7 @@
  */
 
-# include <limits.h>
+#include <limits.h>
 #include "ippToPsps.h"
 #include "ippToPspsConfig.h"
+#include "ippToPspsDetEnums.h"
 #include "fitsio.h"
 
@@ -61 +62 @@
 
     // FrameMeta values
-    fits_write_col(this->fitsOut, TLONG, 1, 1, 1, 1, &this->expId, &status);
+    fits_write_col(this->fitsOut, TLONG, FRAMEMETA_FRAMEID, 1, 1, 1, &this->expId, &status);
 
     int8_t surveyID = 0; // TODO
-    fits_write_col(this->fitsOut, TBYTE, 2, 1, 1, 1, &surveyID, &status);
+    fits_write_col(this->fitsOut, TBYTE, FRAMEMETA_SURVEYID, 1, 1, 1, &surveyID, &status);
 
     int8_t filterID = -1;
     ippToPspsConfig_getFilterId(this->config, filterType, &filterID);
-    fits_write_col(this->fitsOut, TBYTE, 3, 1, 1, 1, &filterID, &status);
+    fits_write_col(this->fitsOut, TBYTE, FRAMEMETA_FILTERID, 1, 1, 1, &filterID, &status);
 
     int16_t cameraID = 1; // TODO
-    fits_write_col(this->fitsOut, TSHORT, 4, 1, 1, 1, &cameraID, &status);
+    fits_write_col(this->fitsOut, TSHORT, FRAMEMETA_CAMERAID, 1, 1, 1, &cameraID, &status);
 
     int16_t cameraConfigID = 1; // TODO
-    fits_write_col(this->fitsOut, TSHORT, 5, 1, 1, 1, &cameraConfigID, &status);
+    fits_write_col(this->fitsOut, TSHORT, FRAMEMETA_CAMERACONFIGID, 1, 1, 1, &cameraConfigID, &status);
 
     int16_t telescopeID = 1; // TODO
-    fits_write_col(this->fitsOut, TSHORT, 6, 1, 1, 1, &telescopeID, &status);
+    fits_write_col(this->fitsOut, TSHORT, FRAMEMETA_TELESCOPEID, 1, 1, 1, &telescopeID, &status);
 
     // stuff to keep from psf.hdr header
@@ -200 +201 @@
 
 
-            // TODO check numSmfDetections < MAXDETECT
+            // TODO check nDet < MAXDETECT
 
             // create ImageMeta
             ippToPspsConfig_writeTable(this->config, fitsIn, this->fitsOut, 1, "ImageMeta", true);
             psfFwhm = (fwhmMaj+fwhmMin)/2;
-            fits_write_col(this->fitsOut, TLONGLONG, 1, 1, 1, 1, &pspsImageId, &status); // TODO enums for thse col numbers
-            fits_write_col(this->fitsOut, TLONG, 2, 1, 1, 1, &this->expId, &status);
-            fits_write_col(this->fitsOut, TSHORT, 3, 1, 1, 1, &pImage->ccdnum, &status);
-            // fits_write_col(this->fitsOut, TLONG, 4, 1, 1, 1, &pImage->photcode, &status); TODO
+            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);
+            fits_write_col(this->fitsOut, TSHORT, IMAGEMETA_CCDID, 1, 1, 1, &pImage->ccdnum, &status);
+            // fits_write_col(this->fitsOut, TLONG, IMAGEMETA_PHOTOCALID, 1, 1, 1, &pImage->photcode, &status); TODO
             psLogMsg("ippToPsps", PS_LOG_INFO, "photocode %d", pImage->photcode);
-            fits_write_col(this->fitsOut, TBYTE, 5, 1, 1, 1, &filterID, &status);
-            fits_write_col(this->fitsOut, TFLOAT, 14, 1, 1, 1, &zptObs, &status);
-            fits_write_col(this->fitsOut, TFLOAT, 19, 1, 1, 1, &psfFwhm, &status);
-            fits_write_col(this->fitsOut, TFLOAT, 38, 1, 1, 1, &zptObs, &status);
+            fits_write_col(this->fitsOut, TBYTE, IMAGEMETA_FILTERID, 1, 1, 1, &filterID, &status);
+            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_PHOTOZERO, 1, 1, 1, &zptObs, &status);
 
             // move to detections table in smf
@@ -223 +224 @@
             }
 
-            long numSmfDetections = 0;
-            if (fits_get_num_rows(fitsIn, &numSmfDetections, &status)) {
+            long nDet = 0;
+            if (fits_get_num_rows(fitsIn, &nDet, &status)) {
                 fits_report_error(stderr, status);
             }
@@ -232 +233 @@
 
             anynull = 0;
-            fits_read_col(fitsIn, TLONG, 1, 1, 1, numSmfDetections, &longnull, ippIDet, &anynull, &status);
-            fits_read_col(fitsIn, TFLOAT, 8, 1, 1, numSmfDetections, &floatnull, instMag, &anynull, &status);
-            fits_read_col(fitsIn, TFLOAT, 9, 1, 1, numSmfDetections, &floatnull, instMagErr, &anynull, &status);
-            fits_read_col(fitsIn, TFLOAT, 12, 1, 1, numSmfDetections, &floatnull, peakMag, &anynull, &status);
+            fits_read_col(fitsIn, TLONG, 1, 1, 1, nDet, &longnull, ippIDet, &anynull, &status);
+            fits_read_col(fitsIn, TFLOAT, 8, 1, 1, nDet, &floatnull, instMag, &anynull, &status);
+            fits_read_col(fitsIn, TFLOAT, 9, 1, 1, nDet, &floatnull, instMagErr, &anynull, &status);
+            fits_read_col(fitsIn, TFLOAT, 12, 1, 1, nDet, &floatnull, peakMag, &anynull, &status);
 
             // DVO detections are ordered by IPP_IDET, which increments from 0 in SMF table
             // both DVO detections and smf detections should increment. however, there may be gaps in smf and 'invalid' rows in dvo
             numOfDuplicates = 0;
-            for (long s = 0; s<numSmfDetections; s++) {
+            for (long s = 0; s<nDet; s++) {
 
                 // count jumps in smf file
@@ -296 +297 @@
 
             // detections
-            ippToPspsConfig_writeTable(this->config, fitsIn, this->fitsOut, numSmfDetections, "Detection", false);
-            fits_write_col(this->fitsOut, TLONGLONG, 1, 1, 1, numSmfDetections, objID, &status);
-            fits_write_col(this->fitsOut, TLONGLONG, 2, 1, 1, numSmfDetections, detectID, &status);
-            fits_write_col(this->fitsOut, TLONGLONG, 3, 1, 1, numSmfDetections, ippObjID, &status);
-            fits_write_col(this->fitsOut, TLONGLONG, 4, 1, 1, numSmfDetections, ippDetectID, &status);
-            fits_write_col(this->fitsOut, TBYTE, 5, 1, 1, numSmfDetections, filterIDs, &status);
-            fits_write_col(this->fitsOut, TBYTE, 6, 1, 1, numSmfDetections, surveyIDs, &status);
-            fits_write_col(this->fitsOut, TLONGLONG, 7, 1, 1, numSmfDetections, imageID, &status);
-            fits_write_col(this->fitsOut, TFLOAT, 8, 1, 1, numSmfDetections, obsTimes, &status);
-            fits_write_col(this->fitsOut, TFLOAT, 13, 1, 1, numSmfDetections, instFlux, &status);
-            fits_write_col(this->fitsOut, TFLOAT, 14, 1, 1, numSmfDetections, instFluxErr, &status);
-            fits_write_col(this->fitsOut, TFLOAT, 15, 1, 1, numSmfDetections, peakFlux, &status);
-            fits_write_col(this->fitsOut, TSTRING, 26, 1, 1, numSmfDetections, assocDate, &status); 
+            ippToPspsConfig_writeTable(this->config, fitsIn, this->fitsOut, nDet, "Detection", false);
+            fits_write_col(this->fitsOut, TLONGLONG, DETECTION_OBJID, 1, 1, nDet, objID, &status);
+            fits_write_col(this->fitsOut, TLONGLONG, DETECTION_DETECTID, 1, 1, nDet, detectID, &status);
+            fits_write_col(this->fitsOut, TLONGLONG, DETECTION_IPPOBJID, 1, 1, nDet, ippObjID, &status);
+            fits_write_col(this->fitsOut, TLONGLONG, DETECTION_IPPDETECTID, 1, 1, nDet, ippDetectID, &status);
+            fits_write_col(this->fitsOut, TBYTE, DETECTION_FILTERID, 1, 1, nDet, filterIDs, &status);
+            fits_write_col(this->fitsOut, TBYTE, DETECTION_SURVEYID, 1, 1, nDet, surveyIDs, &status);
+            fits_write_col(this->fitsOut, TLONGLONG, DETECTION_IMAGEID, 1, 1, nDet, imageID, &status);
+            fits_write_col(this->fitsOut, TFLOAT, DETECTION_OBSTIME, 1, 1, nDet, obsTimes, &status);
+            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, TSTRING, DETECTION_ASSOCDATE, 1, 1, nDet, assocDate, &status); 
             if (numOfDuplicates) fits_delete_rowlist(this->fitsOut, duplicateList, numOfDuplicates, &status);
 
             // skinny object
-            ippToPspsConfig_writeTable(this->config, fitsIn, this->fitsOut, numSmfDetections, "SkinnyObject", false);
-            fits_write_col(this->fitsOut, TLONGLONG, 1, 1, 1, numSmfDetections, objID, &status);
-            fits_write_col(this->fitsOut, TLONGLONG, 2, 1, 1, numSmfDetections, ippObjID, &status);
+            ippToPspsConfig_writeTable(this->config, fitsIn, this->fitsOut, nDet, "SkinnyObject", false);
+            fits_write_col(this->fitsOut, TLONGLONG, SKINNYOBJECT_OBJID, 1, 1, nDet, objID, &status);
+            fits_write_col(this->fitsOut, TLONGLONG, SKINNYOBJECT_IPPOBJID, 1, 1, nDet, ippObjID, &status);
             if (numOfDuplicates) fits_delete_rowlist(this->fitsOut, duplicateList, numOfDuplicates, &status);
 
             // object calibration color
-            ippToPspsConfig_writeTable(this->config, fitsIn, this->fitsOut, numSmfDetections, "ObjectCalColor", false);
-            fits_write_col(this->fitsOut, TLONGLONG, 1, 1, 1, numSmfDetections, objID, &status);
-            fits_write_col(this->fitsOut, TLONGLONG, 2, 1, 1, numSmfDetections, ippObjID, &status);
-            fits_write_col(this->fitsOut, TBYTE, 3, 1, 1, numSmfDetections, filterIDs, &status);
+            ippToPspsConfig_writeTable(this->config, fitsIn, this->fitsOut, nDet, "ObjectCalColor", false);
+            fits_write_col(this->fitsOut, TLONGLONG, OBJECTCALCOLOR_OBJID, 1, 1, nDet, objID, &status);
+            fits_write_col(this->fitsOut, TLONGLONG, OBJECTCALCOLOR_IPPOBJID, 1, 1, nDet, ippObjID, &status);
+            fits_write_col(this->fitsOut, TBYTE, OBJECTCALCOLOR_FILTERID, 1, 1, nDet, filterIDs, &status);
             if (numOfDuplicates) fits_delete_rowlist(this->fitsOut, duplicateList, numOfDuplicates, &status);
 
@@ -329 +330 @@
                     "|  %s |  %5ld  |   %5ld  |      %5d       |    %5d      |\n"
                     "|___________|_________|__________|__________________|_______________|\n",
-                    extensionName, numSmfDetections, numDetectionsOut, unmatched, numOfDuplicates);
+                    extensionName, nDet, numDetectionsOut, unmatched, numOfDuplicates);
 
             if (dvoDetections!= NULL) dvoFree(dvoDetections);