Changeset 31033 for trunk/ippToPsps/src/StackBatch.c

Timestamp:

Mar 24, 2011, 11:03:32 AM (15 years ago)

Author:

rhenders

Message:

Changes to reflect those in Logger class

File:

• trunk/ippToPsps/src/StackBatch.c (modified) (11 diffs)

trunk/ippToPsps/src/StackBatch.c

@@ -58 +58 @@
     fitsIn->readColumnUsingName(fitsIn, TLONG, "FLAGS2", 1, 1, nDet, flags2);
 
-    printf("Looping through %ld psf detections\n", nDet);
+    this->base.logger->print(this->base.logger, MSG_INFO, "StackBatch", 
+            "Looping through %ld psf detection rows from '%s'\n", nDet, extensionName);
     float mag;
     long unmatched = 0, totalDetections = 0, numOfDuplicates = 0, numInvalidFlux = 0, numDetectionsOut = 0;
 
-    this->base.logger->print(this->base.logger, MSG_INFO,
+    this->base.logger->print(this->base.logger, MSG_INFO, "StackBatch",  
             "+---------------+---------+----------+------------------+---------------+--------------+\n");
-    this->base.logger->print(this->base.logger, MSG_INFO,
+    this->base.logger->print(this->base.logger, MSG_INFO, "StackBatch",  
             "|   Extension   | Rows in | Rows out | Missing from DVO | Duplicate IDs | Invalid Flux |\n");
 
@@ -108 +109 @@
     }
 
-    this->base.logger->print(this->base.logger, MSG_INFO,
+    this->base.logger->print(this->base.logger, MSG_INFO, "StackBatch",
             "|  %12s |  %5ld  |   %5ld  |      %5ld       |    %5ld      |    %5ld     |\n",
             extensionName, nDet, numDetectionsOut, unmatched, numOfDuplicates, numInvalidFlux);
-    this->base.logger->print(this->base.logger, MSG_INFO,
+    this->base.logger->print(this->base.logger, MSG_INFO, "StackBatch",
             "+---------------+---------+----------+------------------+---------------+--------------+\n");
 
@@ -149 +150 @@
 
     long nDet = 0;
-    if (!fitsIn->moveToBinaryTableAndCountRows(fitsIn, "SkyChip.xrad", &nDet)) return false;
+    char extensionName[15];
+    sprintf(extensionName, "SkyChip.xrad");
+    if (!fitsIn->moveToBinaryTableAndCountRows(fitsIn, extensionName, &nDet)) return false;
 
 
@@ -172 +175 @@
     }
 
-    printf("Looping through %ld extended source detections\n", nDet);
+    this->base.logger->print(this->base.logger, MSG_INFO, "StackBatch", 
+            "Looping through %ld extended source detections from extension '%s'\n", nDet, extensionName);
     for (long s=0; s<nDet; s++) {
 
@@ -271 +275 @@
 
     long nDet = 0;
-    if (!fitsIn->moveToBinaryTableAndCountRows(fitsIn, "SkyChip.xfit", &nDet)) return false;
+    char extensionName[40];
+    sprintf(extensionName, "SkyChip.xfit");
+    if (!fitsIn->moveToBinaryTableAndCountRows(fitsIn, extensionName, &nDet)) return false;
 
     long* ippIdets = (long*)calloc(this->MAXDETECT, sizeof(long));
@@ -281 +287 @@
     fitsIn->readColumnUsingName(fitsIn, TSTRING, "MODEL_TYPE", 1, 1, nDet, modelTypes);
 
-    printf("Looping through %ld model fit rows\n", nDet);
+    this->base.logger->print(this->base.logger, MSG_INFO, "StackBatch", 
+            "Looping through %ld model fit rows from '%s'\n", nDet, extensionName);
     for (long i = 0; i<nDet; i++) {
 
@@ -360 +367 @@
     createStackDetectionTable(this, fitsIn, filterIDs, surveyIDs, skycellIDs, exposureTime);
     createStackApFlxTable(this, fitsIn, filterIDs, surveyIDs);
-    printf("dsdsdddds\n\n");
     createStackModelFitTable(this, fitsIn, filterIDs, surveyIDs);
     createStackToImageTable(this, fitsIn);
@@ -433 +439 @@
 StackBatch* new_StackBatch(Logger* logger, int *argc, char **argv) {
 
-    logger->print(logger, MSG_DEBUG, "StackBatch: Constructor\n");
+    logger->print(logger, MSG_DEBUG, "StackBatch", "Constructor\n");
     StackBatch *this = (StackBatch*)calloc(1, sizeof(StackBatch));
 
@@ -456 +462 @@
 int main(int argc, char **argv) {
 
-    psTimerStart("stackbatch");
-
 //    ippToPsps_VersionPrint();
 
@@ -463 +467 @@
 
     Logger* logger = new_Logger(NULL);
+    logger->print(logger, MSG_INFO, "main", "Creating new stack batch\n");
 
     StackBatch* stackBatch = new_StackBatch(logger, &argc, argv);
@@ -470 +475 @@
     stackBatch->destroy(stackBatch);
 
-    double secs = psTimerMark("stackbatch");
-
-    logger->print(logger, MSG_INFO, "stackbatch completed %ssuccessfully, with exit code %d, in %.1f %s\n",
-            (exitCode == PS_EXIT_SUCCESS) ? "" : "un",
-            exitCode,
-            (secs<60.0) ? secs : (secs/60.0),
-            (secs<60.0) ? "sec(s)" : "min(s)");
-
     // tidy up
-    psTimerStop();
+    logger->destroy(logger);
     psLibFinalize();
-    logger->destroy(logger);
 
     return exitCode;