Changeset 28589

Timestamp:

Jul 1, 2010, 4:05:29 PM (16 years ago)

Author:

rhenders

Message:

Cosmetic

File:

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

trunk/ippToPsps/src/ippToPspsBatchDetection.c

@@ -83 +83 @@
 
     // stuff to keep from psf.hdr header
-    int sourceId = -1;
-    int imageId = -1;
-    float fwhmMaj;
-    float fwhmMin;
-    float momentMaj;
-    float momentMin;
-    float psfFwhm;
-    float momentFwhm;
+    int sourceId = -1, imageId = -1;
+    float fwhmMaj, fwhmMin, momentMaj, momentMin, psfFwhm, momentFwhm;
     long pspsImageId = -1;
 
@@ -96 +90 @@
     SkyList *skylist = NULL;
     dvoDetection *dvoDetections = NULL;
-    int maxDvoDetId = -1;
-    int numDvoDetections = -1;
+    int maxDvoDetId = -1, numDvoDetections = -1;
     Image *image = NULL;
 
@@ -108 +101 @@
     strftime(timeStr, sizeof(timeStr), "%Y-%m-%d", ts);
 
-    uint32_t totalDetections = 0;
-    uint32_t s,d;
-    uint32_t invalidDvoRows;
-    uint32_t smfJumps;
-    uint32_t unmatched;
+    uint32_t s,d, invalidDvoRows, smfJumps, unmatched, totalDetections = 0;
 
     long longnull = -999;
@@ -118 +107 @@
     int anynull = 0;
 
-    char ccdNumber[3];
-    char extensionName[15];
-
+    char ccdNumber[3], extensionName[15];
+
+    // for storing FITS column data
     long ippIDet[MAXDETECT];
-    float instMag[MAXDETECT];
-    float instMagErr[MAXDETECT];
-    float peakMag[MAXDETECT];
+    float instMag[MAXDETECT], instMagErr[MAXDETECT], peakMag[MAXDETECT];
     uint64_t flags[MAXDETECT];
-    long objID[MAXDETECT];
-    long detectID[MAXDETECT];
-    long ippObjID[MAXDETECT];
-    long ippDetectID[MAXDETECT];
-    long imageID[MAXDETECT];
+    long objID[MAXDETECT], detectID[MAXDETECT], ippObjID[MAXDETECT], ippDetectID[MAXDETECT], imageID[MAXDETECT];
     double obsTimes[MAXDETECT];
-    float instFlux[MAXDETECT];
-    float instFluxErr[MAXDETECT];
-    float peakFlux[MAXDETECT];
-    int8_t filterIDs[MAXDETECT];
-    int8_t surveyIDs[MAXDETECT];
+    float instFlux[MAXDETECT], instFluxErr[MAXDETECT], peakFlux[MAXDETECT];
+    int8_t filterIDs[MAXDETECT], surveyIDs[MAXDETECT];
 
     char** assocDate = (char**)calloc(MAXDETECT, sizeof(char**));
@@ -149 +129 @@
     }
 
-    long maxObjID = LONG_MIN; 
-    long minObjID = LONG_MAX;
+    long maxObjID = LONG_MIN, minObjID = LONG_MAX;
     uint64_t imageFlags;
     short nOta = 0;
     long i;
     bool isDuplicate;
-    uint32_t numOfDuplicates;
-    uint32_t numInvalidFlux;
-    long numDetectionsOut;
-    long totalDetectionsOut = 0;
-    long numPhotoRef, totalNumPhotoRef = 0;
+    uint32_t numOfDuplicates, numInvalidFlux;
+    long numDetectionsOut, totalDetectionsOut = 0, numPhotoRef, totalNumPhotoRef = 0;
     long removeList[MAXDETECT];
     long thisObjId;
@@ -201 +177 @@
             status=0; fits_read_key(fitsIn, TLONG, "SOURCEID", &sourceId, NULL, &status);
             status=0; fits_read_key(fitsIn, TLONG, "NASTRO", &numPhotoRef, NULL, &status);
-            totalNumPhotoRef += numPhotoRef;
-             psLogMsg("ippToPsps", PS_LOG_INFO, "FFF %ld %ld\n", numPhotoRef, totalNumPhotoRef);
+            totalNumPhotoRef += numPhotoRef; // total up for storing in FrameMeta
+
             // access DVO database
             skylist = dvoSkyListByExternID(this->dvoConfig, sourceId, imageId, &image);
             if (skylist == NULL) {
                 psError(PS_ERR_IO, false, 
-                        "DVO: can't find SkyList for sourceId='%d' imageId='%d' (CCD = XY%s): skipping\n", 
+                        "DVO: can't find SkyList for sourceId='%d' imageId='%d' (CCD = XY%s): skipping this chip\n",
                         sourceId, imageId, ccdNumber);
                 continue;