Changeset 9824

Timestamp:

Nov 1, 2006, 2:31:28 PM (20 years ago)

Author:

Paul Price

Message:

Fixing up trace components.

Location:

trunk/ppMerge/src

Files:

• ppMergeCheckInputs.c (modified) (5 diffs)
• ppMergeCombine.c (modified) (7 diffs)
• ppMergeScaleZero.c (modified) (7 diffs)

trunk/ppMerge/src/ppMergeCheckInputs.c

@@ -54 +54 @@
             continue;
         }
-        psTrace(__func__, 1, "Checking input file %s....\n", name);
+        psTrace("ppMerge", 1, "Checking input file %s....\n", name);
         psFits *inFile = psFitsOpen(filenames->data[i], "r"); // The FITS file to read
         if (!inFile) {
@@ -65 +65 @@
         psMetadata *header = psFitsReadHeader(NULL, inFile); // The FITS (primary) header
         if (psTraceGetLevel("ppMerge") > 9) {
-            psTrace(__func__, 9, "Primary header:\n");
+            psTrace("ppMerge", 9, "Primary header:\n");
             psMetadataPrint(stdout, header, 9);
         }
@@ -100 +100 @@
         // Use the first valid input as the basis for the output --- including the header
         if (!data->out) {
-            psTrace(__func__, 5, "Constructing output using %s as a template.\n", name);
+            psTrace("ppMerge", 5, "Constructing output using %s as a template.\n", name);
             data->out = pmFPAConstruct(config->camera);
             pmFPAview *view = pmFPAAddSourceFromHeader(data->out, header, options->format);
@@ -110 +110 @@
         psFree(header);
 
-        psTrace(__func__, 3, "%s checks out.\n", name);
+        psTrace("ppMerge", 3, "%s checks out.\n", name);
         numGood++;
     }
@@ -131 +131 @@
     }
     data->numCells = numCells;
-    psTrace(__func__, 3, "Output has %d cells.\n", numCells);
+    psTrace("ppMerge", 3, "Output has %d cells.\n", numCells);
 
-    psTrace(__func__, 3, "We have %d good inputs.\n", numGood);
+    psTrace("ppMerge", 3, "We have %d good inputs.\n", numGood);
     if (numGood > 1) {
         return data;

trunk/ppMerge/src/ppMergeCombine.c

@@ -70 +70 @@
         }
         psFree(leaks);
-        psTrace(__func__, 0, "Memory in use: %zd\n", totalSize);
-        psTrace(__func__, 0, "Largest block: %ld\n", largest);
-        psTrace(__func__, 0, "sbrk(): %zd\n", sbrk(0));
+        psTrace("ppMerge", 0, "Memory in use: %zd\n", totalSize);
+        psTrace("ppMerge", 0, "Largest block: %ld\n", largest);
+        psTrace("ppMerge", 0, "sbrk(): %zd\n", sbrk(0));
     }
     return;
@@ -172 +172 @@
                                                                 options->shutterRej,
                                                                 options->combine->maskVal);
-                    psTrace(__func__, 5, "Chip %d, cell %d\n", view->chip, view->cell);
+                    psTrace("ppMerge", 5, "Chip %d, cell %d\n", view->chip, view->cell);
                 } else {
                     psError(PS_ERR_UNKNOWN, true, "Not enough images to combine: %d\n", numRead);
@@ -219 +219 @@
                     if (numRead > 0) {
                         pmReadoutCombine(readout, stack, cellZeros, cellScales, options->combine);
-                        psTrace(__func__, 5, "Chip %d, cell %d, scan %d\n", view->chip, view->cell, numScan);
+                        psTrace("ppMerge", 5, "Chip %d, cell %d, scan %d\n", view->chip, view->cell, numScan);
                     }
                     numScan++;
@@ -252 +252 @@
                 if (numRead > 0) {
                     pmReadoutCombine(readout, stack, cellZeros, cellScales, options->combine);
-                    psTrace(__func__, 5, "Chip %d, cell %d\n", view->chip, view->cell);
+                    psTrace("ppMerge", 5, "Chip %d, cell %d\n", view->chip, view->cell);
                 }
 
@@ -291 +291 @@
             // Write the pixels
             if (cell->hdu) {
-                psTrace(__func__, 5, "Writing out cell HDU.\n");
+                psTrace("ppMerge", 5, "Writing out cell HDU.\n");
                 pmCellWrite(cell, data->outFile, config->database, false);
                 pmCellFreeData(cell);
@@ -306 +306 @@
         // Write the pixels
         if (chip->hdu) {
-            psTrace(__func__, 5, "Writing out chip HDU.\n");
+            psTrace("ppMerge", 5, "Writing out chip HDU.\n");
             pmChipWrite(chip, data->outFile, config->database, false, false);
             pmChipFreeData(chip);
@@ -314 +314 @@
     if (data->out->hdu) {
         // Write the pixels
-        psTrace(__func__, 5, "Writing out FPA HDU.\n");
+        psTrace("ppMerge", 5, "Writing out FPA HDU.\n");
         pmFPAWrite(data->out, data->outFile, config->database, false, false);
     }

trunk/ppMerge/src/ppMergeScaleZero.c

@@ -116 +116 @@
                         fromConcepts = true;
                         (*scales)->data.F32[i][cellNum] = scale;
-                        psTrace(__func__, 9, "Scale for input %ld, chip %ld, cell %ld: %f\n", i, j, k, scale);
+                        psTrace("ppMerge", 9, "Scale for input %ld, chip %ld, cell %ld: %f\n", i, j, k, scale);
                     } else if (!first && fromConcepts) {
                         psLogMsg(__func__, PS_LOG_WARN, "PPMERGE.SCALE and PPMERGE.ZERO have been set "
@@ -137 +137 @@
                         fromConcepts = true;
                         (*zeros)->data.F32[i][cellNum] = zero;
-                        psTrace(__func__, 9, "Zero for input %ld, chip %ld, cell %ld: %f\n", i, j, k, zero);
+                        psTrace("ppMerge", 9, "Zero for input %ld, chip %ld, cell %ld: %f\n", i, j, k, zero);
                     } else if (!first && fromConcepts) {
                         psLogMsg(__func__, PS_LOG_WARN, "PPMERGE.SCALE and PPMERGE.ZERO have been set "
@@ -175 +175 @@
             continue;
         }
-        psTrace(__func__, 9, "Opening %s to get background...\n", name);
+        psTrace("ppMerge", 9, "Opening %s to get background...\n", name);
         psFits *inFile = data->files->data[i]; // The FITS file to read
         pmFPA *fpa = data->in->data[i]; // The FPA for this input
@@ -263 +263 @@
                     psFree(sampleMask);
                     background->data.F32[i][cellNum] = getStat(bgStats, options->mean);
-                    psTrace(__func__, 3, "Background for %s, cell %d is %f\n", name, cellNum,
+                    psTrace("ppMerge", 3, "Background for %s, cell %d is %f\n", name, cellNum,
                             background->data.F32[i][cellNum]);
                 }
@@ -279 +279 @@
         if (psTraceGetLevel("ppMerge") > 9) {
             for (int i = 0; i < gains->n; i++) {
-                psTrace(__func__, 10, "Gain for cell %d is %f\n", i, gains->data.F32[i]);
+                psTrace("ppMerge", 10, "Gain for cell %d is %f\n", i, gains->data.F32[i]);
             }
         }
@@ -322 +322 @@
         for (int i = 0; i < scalesDeref->numRows; i++) {
             for (int j = 0; j < scalesDeref->numCols; j++) {
-                psTrace(__func__, 9, "Scale for exposure %d, cell %d is: %f\n", i, j,
+                psTrace("ppMerge", 9, "Scale for exposure %d, cell %d is: %f\n", i, j,
                         scalesDeref->data.F32[i][j]);
             }
@@ -331 +331 @@
         for (int i = 0; i < zerosDeref->numRows; i++) {
             for (int j = 0; j < zerosDeref->numCols; j++) {
-                psTrace(__func__, 9, "Zero for exposure %d, cell %d is: %f\n", i, j,
+                psTrace("ppMerge", 9, "Zero for exposure %d, cell %d is: %f\n", i, j,
                         zerosDeref->data.F32[i][j]);
             }