Changeset 8246 for trunk/psModules/src/camera/pmFPAMosaic.c

Timestamp:

Aug 8, 2006, 4:37:08 PM (20 years ago)

Author:

jhoblitt

Message:

normalize psTrace() facility names

File:

• trunk/psModules/src/camera/pmFPAMosaic.c (modified) (16 diffs)

trunk/psModules/src/camera/pmFPAMosaic.c

@@ -243 +243 @@
     if (x0 != readout->col0 + readout->image->col0 - (int)imageBounds->x0 ||
             y0 != readout->row0 + readout->image->row0 - (int)imageBounds->y0) {
-        psTrace(__func__, 5, "CELL.X0,Y0 don't match: %d,%d vs %d,%d\n", x0, y0,
+        psTrace("psModules.camera", 5, "CELL.X0,Y0 don't match: %d,%d vs %d,%d\n", x0, y0,
                 readout->col0 + readout->image->col0 - (int)imageBounds->x0,
                 readout->row0 + readout->image->row0 - (int)imageBounds->y0);
@@ -280 +280 @@
     psRegion *imageBounds = psRegionAlloc(INFINITY, 0, INFINITY, 0); // Bound of image on HDU
     if (!chipBounds(imageBounds, chip) || !chipContiguousBiassec(imageBounds, chip)) {
-        psTrace(__func__, 5, "Image isn't contiguous.\n");
+        psTrace("psModules.camera", 5, "Image isn't contiguous.\n");
         psFree(imageBounds);
         return NULL;
@@ -286 +286 @@
 
     psString region = psRegionToString(*imageBounds);
-    psTrace(__func__, 7, "Image bounds: %s\n", region);
+    psTrace("psModules.camera", 7, "Image bounds: %s\n", region);
     psFree(region);
 
@@ -309 +309 @@
             if (!chipContiguousTrimsec(imageBounds, testChip) ||
                     !chipContiguousBiassec(imageBounds, testChip)) {
-                psTrace(__func__, 5, "Image isn't contiguous.\n");
+                psTrace("psModules.camera", 5, "Image isn't contiguous.\n");
                 psFree(imageBounds);
                 return NULL;
@@ -349 +349 @@
     psRegion *imageBounds = psRegionAlloc(0, 0, 0, 0); // Bound of image on HDU
     if (!fpaContiguous(imageBounds, fpa)) {
-        psTrace(__func__, 5, "Image isn't contiguous.\n");
+        psTrace("psModules.camera", 5, "Image isn't contiguous.\n");
         psFree(imageBounds);
         return NULL;
@@ -355 +355 @@
 
     psString region = psRegionToString(*imageBounds);
-    psTrace(__func__, 7, "Image bounds: %s\n", region);
+    psTrace("psModules.camera", 7, "Image bounds: %s\n", region);
     psFree(region);
 
@@ -406 +406 @@
     psElemType type = 0;
     int numImages = 0;                  // Number of images
-    psTrace(__func__, 3, "Mosaicking %ld cells.\n", source->n);
+    psTrace("psModules.camera", 3, "Mosaicking %ld cells.\n", source->n);
     for (int i = 0; i < source->n; i++) {
         psImage *image = source->data[i]; // The image of interest
@@ -425 +425 @@
         int xParity = xFlip->data.U8[i] ? -1 : 1;
         int yParity = yFlip->data.U8[i] ? -1 : 1;
-        psTrace(__func__, 5, "Extent of cell %d: %d -> %d , %d -> %d\n", i, x0->data.S32[i],
+        psTrace("psModules.camera", 5, "Extent of cell %d: %d -> %d , %d -> %d\n", i, x0->data.S32[i],
                 x0->data.S32[i] + xParity * xBinSource->data.S32[i] * image->numCols, y0->data.S32[i],
                 y0->data.S32[i] + yParity * yBinSource->data.S32[i] * image->numRows);
@@ -450 +450 @@
     }
 
-    psTrace(__func__, 3, "Spliced image will be %dx%d\n", (int)xSize, (int)ySize);
+    psTrace("psModules.camera", 3, "Spliced image will be %dx%d\n", (int)xSize, (int)ySize);
     psImage *mosaic = psImageAlloc((int)xSize, (int)ySize, type); // The mosaic image
     psImageInit(mosaic, 0);
@@ -586 +586 @@
         good = false;
     }
-    psTrace(__func__, 5, "Cell %d: x0=%d y0=%d\n", index, x0Cell, y0Cell);
+    psTrace("psModules.camera", 5, "Cell %d: x0=%d y0=%d\n", index, x0Cell, y0Cell);
 
     // Offset of the chip on the FPA
@@ -682 +682 @@
     masks->data[index]   = psMemIncrRefCounter(readout->mask);
 
-    psTrace(__func__, 9, "Added cell (%x) %ld: %d,%d; %d,%d, %d,%d.\n", cell, index,
+    psTrace("psModules.camera", 9, "Added cell (%x) %ld: %d,%d; %d,%d, %d,%d.\n", cell, index,
             x0->data.S32[index], y0->data.S32[index], xBin->data.S32[index], yBin->data.S32[index],
             xFlip->data.U8[index], yFlip->data.U8[index]);
@@ -970 +970 @@
     if ((chipRegion = niceChip(&xBin, &yBin, source))) {
         // Case 1 --- we need only cut out the region
-        psTrace(__func__, 1, "Case 1 mosaicking: simple cut-out.\n");
+        psTrace("psModules.camera", 1, "Case 1 mosaicking: simple cut-out.\n");
         pmHDU *hdu = source->hdu;       // The HDU that has the pixels
         if (!hdu || !hdu->images) {
@@ -984 +984 @@
     } else {
         // Case 2 --- we need to mosaic by cut and paste
-        psTrace(__func__, 1, "Case 2 mosaicking: cut and paste.\n");
+        psTrace("psModules.camera", 1, "Case 2 mosaicking: cut and paste.\n");
         if (!chipMosaic(&mosaicImage, &mosaicMask, &mosaicWeights, &xBin, &yBin, source, targetCell)) {
             psError(PS_ERR_UNKNOWN, false, "Unable to mosaic cells.\n");
@@ -991 +991 @@
         chipRegion = psRegionAlloc(NAN, NAN, NAN, NAN); // We've cut and paste, so there's no valid trimsec
     }
-    psTrace(__func__, 1, "xBin,yBin: %d,%d\n", xBin, yBin);
+    psTrace("psModules.camera", 1, "xBin,yBin: %d,%d\n", xBin, yBin);
 
     // Set the concepts for the target cell
@@ -1066 +1066 @@
     if ((fpaRegion = niceFPA(&xBin, &yBin, source))) {
         // Case 1 --- we need only cut out the region
-        psTrace(__func__, 1, "Case 1 mosaicking: simple cut-out.\n");
+        psTrace("psModules.camera", 1, "Case 1 mosaicking: simple cut-out.\n");
         pmHDU *hdu = source->hdu;         // The HDU that has the pixels
         mosaicImage = psMemIncrRefCounter(psImageSubset(hdu->images->data[0], *fpaRegion));
@@ -1077 +1077 @@
     } else {
         // Case 2 --- we need to mosaic by cut and paste
-        psTrace(__func__, 1, "Case 2 mosaicking: cut and paste.\n");
+        psTrace("psModules.camera", 1, "Case 2 mosaicking: cut and paste.\n");
         if (!fpaMosaic(&mosaicImage, &mosaicMask, &mosaicWeights, &xBin, &yBin, source,
                        targetChip, targetCell)) {