Changeset 27607 for trunk/ippToPsps/src

Timestamp:

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

Author:

rhenders

Message:

Changes to accommodate new PSPS schema.

Location:

trunk/ippToPsps/src

Files:

• ippToPspsBatchDetection.c (modified) (8 diffs)
• ippToPspsConfig.c (modified) (3 diffs)
• ippToPspsDetEnums.h (modified) (4 diffs)
• ippToPspsVersionDefinitions.h (modified) (1 diff)

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);

trunk/ippToPsps/src/ippToPspsConfig.c

@@ -41 +41 @@
     }
 
-    if (!column) psError(PS_ERR_IO, false, "Could not find column '%s'", name);
+    if (!column) psError(PS_ERR_IO, false, "Could not find column '%s' in table '%s'", name, table->name);
 
     return column;
@@ -709 +709 @@
     char** strcol = (char**)calloc(nRows, sizeof(char**));
     for (uint32_t i=0; i<nRows;i++)
-        strcol[i] = (char*)calloc(20,sizeof(char)); // TODO 20? size issue
+        strcol[i] = (char*)calloc(50,sizeof(char)); // TODO 20? size issue
 
     int8_t int8null = -99;
@@ -776 +776 @@
             }
 
-            if (readStatus) psError(PS_ERR_IO, false, "Unable to read col num '%d' col name '%s'", table->columns[i].ippColNum, table->columns[i].ippName );
-            if (writeStatus) psError(PS_ERR_IO, false, "Unable to write col '%s'", table->columns[i].pspsName );
+            // TODO need these errors, but strange error handling runs out of memory
+            //if (readStatus) psError(PS_ERR_IO, false, "Unable to read col num '%d' col name '%s'", table->columns[i].ippColNum, table->columns[i].ippName );
+            //if (writeStatus) psError(PS_ERR_IO, false, "Unable to write col '%s'", table->columns[i].pspsName );
         }
     }

trunk/ippToPsps/src/ippToPspsDetEnums.h

@@ -5 +5 @@
 typedef enum {
   FRAMEMETA_FRAMEID = 1,
-  FRAMEMETA_SURVEYID = 2,
-  FRAMEMETA_FILTERID = 3,
-  FRAMEMETA_CAMERAID = 4,
-  FRAMEMETA_CAMERACONFIGID = 5,
-  FRAMEMETA_TELESCOPEID = 6,
-  FRAMEMETA_ANALYSISVER = 7,
-  FRAMEMETA_P1RECIP = 8,
-  FRAMEMETA_P2RECIP = 9,
-  FRAMEMETA_P3RECIP = 10,
-  FRAMEMETA_NP2IMAGES = 11,
-  FRAMEMETA_ASTROSCAT = 12,
+  FRAMEMETA_FRAMENAME = 2,
+  FRAMEMETA_SURVEYID = 3,
+  FRAMEMETA_FILTERID = 4,
+  FRAMEMETA_CAMERAID = 5,
+  FRAMEMETA_CAMERACONFIGID = 6,
+  FRAMEMETA_TELESCOPEID = 7,
+  FRAMEMETA_ANALYSISVER = 8,
+  FRAMEMETA_P1RECIP = 9,
+  FRAMEMETA_P2RECIP = 10,
+  FRAMEMETA_P3RECIP = 11,
+  FRAMEMETA_NOTA = 12,
   FRAMEMETA_PHOTOSCAT = 13,
-  FRAMEMETA_NASTREF = 14,
-  FRAMEMETA_NPHOREF = 15,
-  FRAMEMETA_EXPSTART = 16,
-  FRAMEMETA_EXPTIME = 17,
-  FRAMEMETA_AIRMASS = 18,
-  FRAMEMETA_RABORE = 19,
-  FRAMEMETA_DECBORE = 20,
-  FRAMEMETA_CTYPE1 = 21,
-  FRAMEMETA_CTYPE2 = 22,
-  FRAMEMETA_CRVAL1 = 23,
-  FRAMEMETA_CRVAL2 = 24,
-  FRAMEMETA_CRPIX1 = 25,
-  FRAMEMETA_CRPIX2 = 26,
-  FRAMEMETA_PC001001 = 27,
-  FRAMEMETA_PC001002 = 28,
-  FRAMEMETA_PC002001 = 29,
-  FRAMEMETA_PC002002 = 30,
-  FRAMEMETA_POLYORDER = 31,
-  FRAMEMETA_PCA1X3Y0 = 32,
-  FRAMEMETA_PCA1X2Y1 = 33,
-  FRAMEMETA_PCA1X1Y2 = 34,
-  FRAMEMETA_PCA1X0Y3 = 35,
-  FRAMEMETA_PCA1X2Y0 = 36,
-  FRAMEMETA_PCA1X1Y1 = 37,
-  FRAMEMETA_PCA1X0Y2 = 38,
-  FRAMEMETA_PCA2X3Y0 = 39,
-  FRAMEMETA_PCA2X2Y1 = 40,
-  FRAMEMETA_PCA2X1Y2 = 41,
-  FRAMEMETA_PCA2X0Y3 = 42,
-  FRAMEMETA_PCA2X2Y0 = 43,
-  FRAMEMETA_PCA2X1Y1 = 44,
-  FRAMEMETA_PCA2X0Y2 = 45,
-  FRAMEMETA_CALIBMODNUM = 46,
-  FRAMEMETA_DATARELEASE = 47,
+  FRAMEMETA_NUMPHOTOREF = 14,
+  FRAMEMETA_EXPSTART = 15,
+  FRAMEMETA_EXPTIME = 16,
+  FRAMEMETA_AIRMASS = 17,
+  FRAMEMETA_RABORE = 18,
+  FRAMEMETA_DECBORE = 19,
+  FRAMEMETA_CTYPE1 = 20,
+  FRAMEMETA_CTYPE2 = 21,
+  FRAMEMETA_CRVAL1 = 22,
+  FRAMEMETA_CRVAL2 = 23,
+  FRAMEMETA_CRPIX1 = 24,
+  FRAMEMETA_CRPIX2 = 25,
+  FRAMEMETA_PC001001 = 26,
+  FRAMEMETA_PC001002 = 27,
+  FRAMEMETA_PC002001 = 28,
+  FRAMEMETA_PC002002 = 29,
+  FRAMEMETA_POLYORDER = 30,
+  FRAMEMETA_PCA1X3Y0 = 31,
+  FRAMEMETA_PCA1X2Y1 = 32,
+  FRAMEMETA_PCA1X1Y2 = 33,
+  FRAMEMETA_PCA1X0Y3 = 34,
+  FRAMEMETA_PCA1X2Y0 = 35,
+  FRAMEMETA_PCA1X1Y1 = 36,
+  FRAMEMETA_PCA1X0Y2 = 37,
+  FRAMEMETA_PCA2X3Y0 = 38,
+  FRAMEMETA_PCA2X2Y1 = 39,
+  FRAMEMETA_PCA2X1Y2 = 40,
+  FRAMEMETA_PCA2X0Y3 = 41,
+  FRAMEMETA_PCA2X2Y0 = 42,
+  FRAMEMETA_PCA2X1Y1 = 43,
+  FRAMEMETA_PCA2X0Y2 = 44,
+  FRAMEMETA_CALIBMODNUM = 45,
+  FRAMEMETA_DATARELEASE = 46,
 } FrameMeta;
 
@@ -68 +67 @@
   IMAGEMETA_ASTROSCAT = 13,
   IMAGEMETA_PHOTOSCAT = 14,
-  IMAGEMETA_NASTREF = 15,
-  IMAGEMETA_NPHOREF = 16,
+  IMAGEMETA_NUMASTROREF = 15,
+  IMAGEMETA_NUMPHOTOREF = 16,
   IMAGEMETA_NX = 17,
   IMAGEMETA_NY = 18,
-  IMAGEMETA_PSFFWHM = 19,
-  IMAGEMETA_PSFMODELID = 20,
+  IMAGEMETA_PSFMODELID = 19,
+  IMAGEMETA_PSFFWHM = 20,
   IMAGEMETA_PSFWIDMAJOR = 21,
   IMAGEMETA_PSFWIDMINOR = 22,
   IMAGEMETA_PSFTHETA = 23,
-  IMAGEMETA_PSFEXTRA1 = 24,
-  IMAGEMETA_PSFEXTRA2 = 25,
-  IMAGEMETA_APRESID = 26,
-  IMAGEMETA_DAPRESID = 27,
-  IMAGEMETA_DETECTORID = 28,
-  IMAGEMETA_QAFLAGS = 29,
-  IMAGEMETA_DETREND1 = 30,
-  IMAGEMETA_DETREND2 = 31,
-  IMAGEMETA_DETREND3 = 32,
-  IMAGEMETA_DETREND4 = 33,
-  IMAGEMETA_DETREND5 = 34,
-  IMAGEMETA_DETREND6 = 35,
-  IMAGEMETA_DETREND7 = 36,
-  IMAGEMETA_DETREND8 = 37,
-  IMAGEMETA_PHOTOZERO = 38,
-  IMAGEMETA_CTYPE1 = 39,
-  IMAGEMETA_CTYPE2 = 40,
-  IMAGEMETA_CRVAL1 = 41,
-  IMAGEMETA_CRVAL2 = 42,
-  IMAGEMETA_CRPIX1 = 43,
-  IMAGEMETA_CRPIX2 = 44,
-  IMAGEMETA_PC001001 = 45,
-  IMAGEMETA_PC001002 = 46,
-  IMAGEMETA_PC002001 = 47,
-  IMAGEMETA_PC002002 = 48,
-  IMAGEMETA_POLYORDER = 49,
-  IMAGEMETA_PCA1X3Y0 = 50,
-  IMAGEMETA_PCA1X2Y1 = 51,
-  IMAGEMETA_PCA1X1Y2 = 52,
-  IMAGEMETA_PCA1X0Y3 = 53,
-  IMAGEMETA_PCA1X2Y0 = 54,
-  IMAGEMETA_PCA1X1Y1 = 55,
-  IMAGEMETA_PCA1X0Y2 = 56,
-  IMAGEMETA_PCA2X3Y0 = 57,
-  IMAGEMETA_PCA2X2Y1 = 58,
-  IMAGEMETA_PCA2X1Y2 = 59,
-  IMAGEMETA_PCA2X0Y3 = 60,
-  IMAGEMETA_PCA2X2Y0 = 61,
-  IMAGEMETA_PCA2X1Y1 = 62,
-  IMAGEMETA_PCA2X0Y2 = 63,
-  IMAGEMETA_CALIBMODNUM = 64,
-  IMAGEMETA_DATARELEASE = 65,
+  IMAGEMETA_MOMENTFWHM = 24,
+  IMAGEMETA_MOMENTWIDMAJOR = 25,
+  IMAGEMETA_MOMENTWIDMINOR = 26,
+  IMAGEMETA_MOMENTTHETA = 27,
+  IMAGEMETA_APRESID = 28,
+  IMAGEMETA_DAPRESID = 29,
+  IMAGEMETA_DETECTORID = 30,
+  IMAGEMETA_QAFLAGS = 31,
+  IMAGEMETA_DETREND1 = 32,
+  IMAGEMETA_DETREND2 = 33,
+  IMAGEMETA_DETREND3 = 34,
+  IMAGEMETA_DETREND4 = 35,
+  IMAGEMETA_DETREND5 = 36,
+  IMAGEMETA_DETREND6 = 37,
+  IMAGEMETA_DETREND7 = 38,
+  IMAGEMETA_DETREND8 = 39,
+  IMAGEMETA_PHOTOZERO = 40,
+  IMAGEMETA_CTYPE1 = 41,
+  IMAGEMETA_CTYPE2 = 42,
+  IMAGEMETA_CRVAL1 = 43,
+  IMAGEMETA_CRVAL2 = 44,
+  IMAGEMETA_CRPIX1 = 45,
+  IMAGEMETA_CRPIX2 = 46,
+  IMAGEMETA_PC001001 = 47,
+  IMAGEMETA_PC001002 = 48,
+  IMAGEMETA_PC002001 = 49,
+  IMAGEMETA_PC002002 = 50,
+  IMAGEMETA_POLYORDER = 51,
+  IMAGEMETA_PCA1X3Y0 = 52,
+  IMAGEMETA_PCA1X2Y1 = 53,
+  IMAGEMETA_PCA1X1Y2 = 54,
+  IMAGEMETA_PCA1X0Y3 = 55,
+  IMAGEMETA_PCA1X2Y0 = 56,
+  IMAGEMETA_PCA1X1Y1 = 57,
+  IMAGEMETA_PCA1X0Y2 = 58,
+  IMAGEMETA_PCA2X3Y0 = 59,
+  IMAGEMETA_PCA2X2Y1 = 60,
+  IMAGEMETA_PCA2X1Y2 = 61,
+  IMAGEMETA_PCA2X0Y3 = 62,
+  IMAGEMETA_PCA2X2Y0 = 63,
+  IMAGEMETA_PCA2X1Y1 = 64,
+  IMAGEMETA_PCA2X0Y2 = 65,
+  IMAGEMETA_CALIBMODNUM = 66,
+  IMAGEMETA_DATARELEASE = 67,
 } ImageMeta;
 
@@ -136 +137 @@
   DETECTION_INSTFLUX = 13,
   DETECTION_INSTFLUXERR = 14,
-  DETECTION_PEAKFLUX = 15,
+  DETECTION_PEAKADU = 15,
   DETECTION_PSFWIDMAJOR = 16,
   DETECTION_PSFWIDMINOR = 17,
@@ -142 +143 @@
   DETECTION_PSFLIKELIHOOD = 19,
   DETECTION_PSFCF = 20,
-  DETECTION_INFOFLAG = 21,
-  DETECTION_SKY = 22,
-  DETECTION_SKYERR = 23,
-  DETECTION_SGSEP = 24,
-  DETECTION_ACTIVEFLAG = 25,
-  DETECTION_ASSOCDATE = 26,
-  DETECTION_HISTORYMODNUM = 27,
-  DETECTION_DATARELEASE = 28,
+  DETECTION_MOMENTWIDMAJOR = 21,
+  DETECTION_MOMENTWIDMINOR = 22,
+  DETECTION_MOMENTTHETA = 23,
+  DETECTION_CRLIKELIHOOD = 24,
+  DETECTION_EXTENDEDLIKELIHOOD = 25,
+  DETECTION_INFOFLAG = 26,
+  DETECTION_SKY = 27,
+  DETECTION_SKYERR = 28,
+  DETECTION_SGSEP = 29,
+  DETECTION_ACTIVEFLAG = 30,
+  DETECTION_ASSOCDATE = 31,
+  DETECTION_HISTORYMODNUM = 32,
+  DETECTION_DATARELEASE = 33,
 } Detection;
 

trunk/ippToPsps/src/ippToPspsVersionDefinitions.h

@@ -2 +2 @@
 #define IPPTOPSPS_VERSION_DEFINITIONS_H
 
-#define IPPTOPSPS_VERSION "exported" // SVN version
-#define IPPTOPSPS_BRANCH  ""  // SVN branch
-#define IPPTOPSPS_SOURCE  ""  // SVN source
+#define IPPTOPSPS_VERSION "27549M" // SVN version
+#define IPPTOPSPS_BRANCH  "trunk/ippToPsps"  // SVN branch
+#define IPPTOPSPS_SOURCE  "60eb6cdc-a59c-4636-a4e0-dba66a9721fd"  // SVN source
 
 #endif