Changeset 7849

Timestamp:

Jul 7, 2006, 7:21:12 PM (20 years ago)

Author:

Paul Price

Message:

Adding pmConceptsAverageCells() from previous cellConcepts() in pmFPAMosaic: given a list of cells, find a reasonable combination of the concepts. This is used in pmFPAMosaic and now also pmReadoutCombine.

Location:

trunk/psModules/src

Files:

• camera/pmFPAMosaic.c (modified) (5 diffs)
• concepts/Makefile.am (modified) (2 diffs)
• concepts/pmConceptsAverage.c (added)
• concepts/pmConceptsAverage.h (added)
• imcombine/pmReadoutCombine.c (modified) (3 diffs)

trunk/psModules/src/camera/pmFPAMosaic.c

@@ -4 +4 @@
 #include "pmFPA.h"
 #include "pmHDU.h"
+#include "pmConceptsAverage.h"
 #include "pmHDUUtils.h"
 #include "pmFPAMosaic.h"
@@ -27 +28 @@
 if ((value) > (max)) { \
     (max) = (value); \
-}
-
-// Update a metadata entry directly
-#define MD_UPDATE(MD, NAME, TYPE, VALUE) \
-{ \
-    psMetadataItem *item = psMetadataLookup(MD, NAME); \
-    item->data.TYPE = VALUE; \
 }
 
@@ -529 +523 @@
 
     return mosaic;
-}
-
-
-// Set the concepts in the new cell, based on the values in the old one
-static bool cellConcepts(pmCell *target,// Target cell
-                         psList *sources, // Source cells
-                         int xBin, int yBin, // Binning
-                         psRegion *trimsec // The trim section
-                        )
-{
-    assert(target);
-    assert(sources);
-    assert(xBin > 0 && yBin > 0);
-    assert(trimsec);
-
-    bool success = true;                // Result of setting everything
-    float gain       = 0.0;             // Gain
-    float readnoise  = 0.0;             // Read noise
-    float saturation = INFINITY;        // Saturation level
-    float bad        = -INFINITY;       // Bad level
-    float exposure   = 0.0;             // Exposure time
-    float darktime   = 0.0;             // Dark time
-    double time      = 0.0;             // Time of observation
-    psTimeType timeSys = 0;             // Time system
-    int readdir      = 0;               // Cell read direction
-
-    int nCells = 0;                     // Number of cells;
-    psListIterator *sourcesIter = psListIteratorAlloc(sources, PS_LIST_HEAD, false); // Iterator for sources
-    pmCell *cell = NULL;                // Source cell from iteration
-    while ((cell = psListGetAndIncrement(sourcesIter))) {
-        if (!cell) {
-            continue;
-        }
-
-        nCells++;
-        gain       += psMetadataLookupF32(NULL, cell->concepts, "CELL.GAIN");
-        readnoise  += psMetadataLookupF32(NULL, cell->concepts, "CELL.READNOISE");
-        exposure   += psMetadataLookupF32(NULL, cell->concepts, "CELL.EXPOSURE");
-        darktime   += psMetadataLookupF32(NULL, cell->concepts, "CELL.DARKTIME");
-        psTime *cellTime = psMetadataLookupPtr(NULL, cell->concepts, "CELL.TIME");
-        time       += psTimeToMJD(cellTime);
-        if (nCells == 1) {
-            timeSys = psMetadataLookupS32(NULL, cell->concepts, "CELL.TIMESYS");
-            readdir = psMetadataLookupS32(NULL, cell->concepts, "CELL.READDIR");
-        } else {
-            if (timeSys != psMetadataLookupS32(NULL, cell->concepts, "CELL.TIMESYS")) {
-                psLogMsg(__func__, PS_LOG_ERROR, "Differing time systems in use: %d vs %d\n", timeSys,
-                         psMetadataLookupS32(NULL, cell->concepts, "CELL.TIMESYS"));
-                success = false;
-            }
-            if (readdir != psMetadataLookupS32(NULL, cell->concepts, "CELL.READDIR")) {
-                psLogMsg(__func__, PS_LOG_ERROR, "Differing cell read directions in use: %d vs %d\n", readdir,
-                         psMetadataLookupS32(NULL, cell->concepts, "CELL.READDIR"));
-                success = false;
-            }
-        }
-
-        float cellSaturation = psMetadataLookupF32(NULL, cell->concepts, "CELL.SATURATION");
-        if (cellSaturation < saturation) {
-            saturation = cellSaturation;
-        }
-        float cellBad = psMetadataLookupF32(NULL, cell->concepts, "CELL.BAD");
-        if (cellBad > bad) {
-            bad = cellBad;
-        }
-    }
-    psFree(sourcesIter);
-
-    gain      /= (float)nCells;
-    readnoise /= (float)nCells;
-    exposure  /= (float)nCells;
-    darktime  /= (float)nCells;
-    time      /= (double)nCells;
-
-    MD_UPDATE(target->concepts, "CELL.GAIN", F32, gain);
-    MD_UPDATE(target->concepts, "CELL.READNOISE", F32, readnoise);
-    MD_UPDATE(target->concepts, "CELL.SATURATION", F32, saturation);
-    MD_UPDATE(target->concepts, "CELL.BAD", F32, bad);
-    MD_UPDATE(target->concepts, "CELL.EXPOSURE", F32, exposure);
-    MD_UPDATE(target->concepts, "CELL.DARKTIME", F32, darktime);
-    MD_UPDATE(target->concepts, "CELL.TIMESYS", S32, timeSys);
-    MD_UPDATE(target->concepts, "CELL.X0", S32, 0);
-    MD_UPDATE(target->concepts, "CELL.Y0", S32, 0);
-    MD_UPDATE(target->concepts, "CELL.XPARITY", S32, 1);
-    MD_UPDATE(target->concepts, "CELL.YPARITY", S32, 1);
-    MD_UPDATE(target->concepts, "CELL.XBIN", S32, xBin);
-    MD_UPDATE(target->concepts, "CELL.YBIN", S32, yBin);
-    MD_UPDATE(target->concepts, "CELL.READDIR", S32, readdir);
-
-    // CELL.TIME needs special care
-    {
-        psMetadataItem *timeItem = psMetadataLookup(target->concepts, "CELL.TIME");
-        psFree(timeItem->data.V);
-        timeItem->data.V = psTimeFromMJD(time);
-    }
-
-    // CELL.TRIMSEC needs special care
-    {
-        psMetadataItem *trimsecItem = psMetadataLookup(target->concepts, "CELL.TRIMSEC");
-        psFree(trimsecItem->data.V);
-        trimsecItem->data.V = psMemIncrRefCounter(trimsec);
-    }
-
-    return success;
 }
 
@@ -1105 +995 @@
     // Set the concepts for the target cell
     psList *sourceCells = psArrayToList(source->cells); // List of cells
-    cellConcepts(targetCell, sourceCells, xBin, yBin, chipRegion);
+    pmConceptsAverageCells(targetCell, sourceCells, xBin, yBin, chipRegion, NULL);
     psFree(sourceCells);
     psFree(chipRegion);
@@ -1211 +1101 @@
         }
     }
-    cellConcepts(targetCell, sourceCells, xBin, yBin, fpaRegion);
+    pmConceptsAverageCells(targetCell, sourceCells, xBin, yBin, fpaRegion, NULL);
     psFree(sourceCells);
     psFree(fpaRegion);

trunk/psModules/src/concepts/Makefile.am

@@ -5 +5 @@
 libpsmoduleconcepts_la_SOURCES  = \
         pmConcepts.c \
+        pmConceptsAverage.c \
         pmConceptsRead.c \
         pmConceptsWrite.c \
@@ -13 +14 @@
 psmoduleinclude_HEADERS = \
         pmConcepts.h \
+        pmConceptsAverage.h \
         pmConceptsRead.h \
         pmConceptsWrite.h \

trunk/psModules/src/imcombine/pmReadoutCombine.c

@@ -5 +5 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.19 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-07-04 00:19:11 $
+ *  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-07-08 05:21:12 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -18 +18 @@
 #include "pmFPA.h"
 #include "pmFPAMaskWeight.h"
+#include "pmConceptsAverage.h"
 
 #include "pmReadoutCombine.h"
@@ -396 +397 @@
     psFree(mask);
     psFree(weights);
-
     psFree(stats);
+
+    // Update the "concepts"
+    psList *inputCells = psListAlloc(NULL); // List of cells
+    for (long i = 0; i < inputs->n; i++) {
+        pmReadout *readout = inputs->data[i]; // Readout of interest
+        psListAdd(inputCells, PS_LIST_TAIL, readout->parent);
+    }
+    pmConceptsAverageCells(output->parent, inputCells, 0, 0, NULL, NULL);
+    psFree(inputCells);
 
     return true;