Changeset 26837

Timestamp:

Feb 9, 2010, 8:24:35 PM (16 years ago)

Author:

Paul Price

Message:

Adding ppVizPattern to visualise pattern correction from pattern output.

Location:

branches/eam_branches/20091201/ppViz

Files:

• . (copied) (copied from trunk/ppViz ) (1 prop)
• configure.ac (modified) (1 diff)
• src/Makefile.am (modified) (1 diff)
• src/ppVizPattern (copied) (copied from trunk/ppViz/src/ppVizPSF )
• src/ppVizPattern/Makefile.am (modified) (1 diff)
• src/ppVizPattern/ppVizPSF.c (deleted)
• src/ppVizPattern/ppVizPSF.h (deleted)
• src/ppVizPattern/ppVizPSFArguments.c (deleted)
• src/ppVizPattern/ppVizPSFCamera.c (deleted)
• src/ppVizPattern/ppVizPSFData.c (deleted)
• src/ppVizPattern/ppVizPSFLoop.c (deleted)
• src/ppVizPattern/ppVizPSFVersion.c (deleted)
• src/ppVizPattern/ppVizPSFVersionDefinitions.h.in (deleted)
• src/ppVizPattern/ppVizPattern.c (copied) (copied from trunk/ppViz/src/ppVizPSF/ppVizPSF.c ) (4 diffs)
• src/ppVizPattern/ppVizPattern.h (copied) (copied from trunk/ppViz/src/ppVizPSF/ppVizPSF.h ) (1 diff)
• src/ppVizPattern/ppVizPatternArguments.c (copied) (copied from trunk/ppViz/src/ppVizPSF/ppVizPSFArguments.c ) (4 diffs)
• src/ppVizPattern/ppVizPatternCamera.c (copied) (copied from trunk/ppViz/src/ppVizPSF/ppVizPSFCamera.c ) (3 diffs)
• src/ppVizPattern/ppVizPatternData.c (copied) (copied from trunk/ppViz/src/ppVizPSF/ppVizPSFData.c ) (3 diffs)
• src/ppVizPattern/ppVizPatternLoop.c (copied) (copied from trunk/ppViz/src/ppVizPSF/ppVizPSFLoop.c ) (7 diffs)
• src/ppVizPattern/ppVizPatternVersion.c (copied) (copied from trunk/ppViz/src/ppVizPSF/ppVizPSFVersion.c ) (6 diffs)
• src/ppVizPattern/ppVizPatternVersionDefinitions.h.in (copied) (copied from trunk/ppViz/src/ppVizPSF/ppVizPSFVersionDefinitions.h.in ) (1 diff)

branches/eam_branches/20091201/ppViz/configure.ac

@@ -35 +35 @@
   src/ppVizPSF/Makefile
   src/ppCoord/Makefile
+  src/ppVizPattern/Makefile
 ])
 

branches/eam_branches/20091201/ppViz/src/Makefile.am

@@ -1 @@
-SUBDIRS = ppVizPSF ppCoord
+SUBDIRS = ppVizPSF ppCoord ppVizPattern
 
 CLEANFILES = *.pyc *~ core core.*

branches/eam_branches/20091201/ppViz/src/ppVizPattern/Makefile.am

@@ -1 @@
-bin_PROGRAMS = ppVizPSF
+bin_PROGRAMS = ppVizPattern
 
 if HAVE_SVNVERSION
-PPVIZPSF_VERSION=`$(SVNVERSION) ..`
+PPVIZPATTERN_VERSION=`$(SVNVERSION) ..`
 else
-PPVIZPSF_VERSION="UNKNOWN"
+PPVIZPATTERN_VERSION="UNKNOWN"
 endif
 
 if HAVE_SVN
-PPVIZPSF_BRANCH=`$(SVN) info .. | $(SED) -n -e '/URL:/ h' -e '/Repository Root:/ { x; H; x; s|Repository Root: \(.*\)\nURL: \1\(.*\)|\2| ; s|^/|| ; s|/[a-zA-Z]*/src.*|| ; p }'`
-PPVIZPSF_SOURCE=`$(SVN) info | $(SED) -n -e 's/Repository UUID: // p'`
+PPVIZPATTERN_BRANCH=`$(SVN) info .. | $(SED) -n -e '/URL:/ h' -e '/Repository Root:/ { x; H; x; s|Repository Root: \(.*\)\nURL: \1\(.*\)|\2| ; s|^/|| ; s|/[a-zA-Z]*/src.*|| ; p }'`
+PPVIZPATTERN_SOURCE=`$(SVN) info | $(SED) -n -e 's/Repository UUID: // p'`
 else
-PPVIZPSF_BRANCH="UNKNOWN"
-PPVIZPSF_SOURCE="UNKNOWN"
+PPVIZPATTERN_BRANCH="UNKNOWN"
+PPVIZPATTERN_SOURCE="UNKNOWN"
 endif
 
-# Force recompilation of ppVizPSFVersion.c, since it gets the version information
-ppVizPSFVersion.c: ppVizPSFVersionDefinitions.h
-ppVizPSFVersionDefinitions.h: ppVizPSFVersionDefinitions.h.in FORCE
-        -$(RM) ppVizPSFVersionDefinitions.h
-        $(SED) -e "s|@PPVIZPSF_VERSION@|\"$(PPVIZPSF_VERSION)\"|" -e "s|@PPVIZPSF_BRANCH@|\"$(PPVIZPSF_BRANCH)\"|" -e "s|@PPVIZPSF_SOURCE@|\"$(PPVIZPSF_SOURCE)\"|" ppVizPSFVersionDefinitions.h.in > ppVizPSFVersionDefinitions.h
+# Force recompilation of ppVizPatternVersion.c, since it gets the version information
+ppVizPatternVersion.c: ppVizPatternVersionDefinitions.h
+ppVizPatternVersionDefinitions.h: ppVizPatternVersionDefinitions.h.in FORCE
+        -$(RM) ppVizPatternVersionDefinitions.h
+        $(SED) -e "s|@PPVIZPATTERN_VERSION@|\"$(PPVIZPATTERN_VERSION)\"|" -e "s|@PPVIZPATTERN_BRANCH@|\"$(PPVIZPATTERN_BRANCH)\"|" -e "s|@PPVIZPATTERN_SOURCE@|\"$(PPVIZPATTERN_SOURCE)\"|" ppVizPatternVersionDefinitions.h.in > ppVizPatternVersionDefinitions.h
 FORCE: ;
 
-BUILT_SOURCES = ppVizPSFVersionDefinitions.h
+BUILT_SOURCES = ppVizPatternVersionDefinitions.h
 
 
-ppVizPSF_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(PPVIZPSF_CFLAGS)
-ppVizPSF_LDFLAGS  = $(PSLIB_LIBS)   $(PSMODULE_LIBS)   $(PPVIZPSF_LIBS)
+ppVizPattern_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(PPVIZPATTERN_CFLAGS)
+ppVizPattern_LDFLAGS  = $(PSLIB_LIBS)   $(PSMODULE_LIBS)   $(PPVIZPATTERN_LIBS)
 
-ppVizPSF_SOURCES =              \
-        ppVizPSF.c              \
-        ppVizPSFArguments.c     \
-        ppVizPSFCamera.c        \
-        ppVizPSFData.c          \
-        ppVizPSFLoop.c          \
-        ppVizPSFVersion.c            
+ppVizPattern_SOURCES =          \
+        ppVizPattern.c          \
+        ppVizPatternArguments.c \
+        ppVizPatternCamera.c    \
+        ppVizPatternData.c              \
+        ppVizPatternLoop.c              \
+        ppVizPatternVersion.c            
 
 noinst_HEADERS = \
-        ppVizPSF.h
+        ppVizPattern.h
 
 clean-local:

branches/eam_branches/20091201/ppViz/src/ppVizPattern/ppVizPattern.c

@@ -7 +7 @@
 #include <psmodules.h>
 
-#include "ppVizPSF.h"
+#include "ppVizPattern.h"
 
 int main(int argc, char *argv[])
 {
-    ppVizPSFVersionPrint();
+    ppVizPatternVersionPrint();
 
-    ppVizPSFData *data = ppVizPSFDataInit(&argc, argv);
+    ppVizPatternData *data = ppVizPatternDataInit(&argc, argv);
     if (!data) {
         psErrorStackPrint(stderr, "Unable to initialise.");
@@ -19 +19 @@
     }
 
-    if (!ppVizPSFArguments(data, argc, argv)) {
+    if (!ppVizPatternArguments(data, argc, argv)) {
         psErrorStackPrint(stderr, "Unable to parse arguments.");
         psFree(data);
@@ -25 +25 @@
     }
 
-    if (!ppVizPSFCamera(data)) {
+    if (!ppVizPatternCamera(data)) {
         psErrorStackPrint(stderr, "Unable to parse camera configuration.");
         psFree(data);
@@ -31 +31 @@
     }
 
-    if (!ppVizPSFLoop(data)) {
+    if (!ppVizPatternLoop(data)) {
         psErrorStackPrint(stderr, "Unable to process data.");
         psFree(data);

branches/eam_branches/20091201/ppViz/src/ppVizPattern/ppVizPattern.h

@@ -5 +5 @@
 #include <psmodules.h>
 
-#define PPVIZPSF_RECIPE "PPVIZPSF"      // Recipe name
+#define PPVIZPATTERN_RECIPE "PPVIZPATTERN"      // Recipe name
 
 // Data for processing
 typedef struct {
-    psString psfName;                   // Filename with PSF
-    psString sourcesName;               // Filename with sources
-    int fakeNum;                        // Number of fake sources
-    float fakeMag;                      // Magnitude of fake sources
+    psString patternName;               // Filename with pattern
     psString outRoot;                   // Output root name
-    float minFlux;                      // Minimum flux for sources
-    int size;                           // Size of PSF image
-    float x, y;                         // Position of fake source
     pmConfig *config;                   // Configuration
-} ppVizPSFData;
+} ppVizPatternData;
 
 /// Initialise data for processing
-ppVizPSFData *ppVizPSFDataInit(int *argc, char *argv[] // Command-line arguments
+ppVizPatternData *ppVizPatternDataInit(int *argc, char *argv[] // Command-line arguments
     );
 
 /// Parse command-line arguments
-bool ppVizPSFArguments(ppVizPSFData *data, // Data for processing
+bool ppVizPatternArguments(ppVizPatternData *data, // Data for processing
                         int argc, char *argv[] // Command-line arguments
     );
 
 /// Parse camera configurations
-bool ppVizPSFCamera(ppVizPSFData *data // Data for processing
+bool ppVizPatternCamera(ppVizPatternData *data // Data for processing
     );
 
 /// Loop over input data, processing
-bool ppVizPSFLoop(ppVizPSFData *data // Data for processing
+bool ppVizPatternLoop(ppVizPatternData *data // Data for processing
     );
 
 /// Add version information to header
-bool ppVizPSFVersionHeader(
+bool ppVizPatternVersionHeader(
     psMetadata *header                  // Header to supplement
     );
 
 /// Print version information to stdout
-void ppVizPSFVersionPrint(void);
+void ppVizPatternVersionPrint(void);
 
 #endif

branches/eam_branches/20091201/ppViz/src/ppVizPattern/ppVizPatternArguments.c

@@ -1 @@
-/** @file ppVizPSFArguments.c
+/** @file ppVizPatternArguments.c
  *
  *  @brief
  *
- *  @ingroup ppVizPSF
+ *  @ingroup ppVizPattern
  *
  *  @author Paul Price
@@ -18 +18 @@
 #include <psmodules.h>
 
-#include "ppVizPSF.h"
+#include "ppVizPattern.h"
 
 /// Print usage information and die
 static void usage(const char *program,  // Name of the program
                   psMetadata *arguments, // Command-line arguments
-                  ppVizPSFData *data   // Run-time data
+                  ppVizPatternData *data   // Run-time data
     )
 {
-    fprintf(stderr, "\nPan-STARRS PSF visualisation\n\n");
+    fprintf(stderr, "\nPan-STARRS pattern visualisation\n\n");
     fprintf(stderr,
-            "Usage: %s -psf PSF.psf -sources SOURCES.cmf OUTPUT_ROOT\n\n",
+            "Usage: %s -pattern PATTERN.ptn OUTPUT_ROOT\n\n",
             program);
     fprintf(stderr, "\n");
@@ -42 +42 @@
 
 
-bool ppVizPSFArguments(ppVizPSFData *data, int argc, char *argv[])
+bool ppVizPatternArguments(ppVizPatternData *data, int argc, char *argv[])
 {
     assert(data);
@@ -48 +48 @@
 
     psMetadata *arguments = psMetadataAlloc(); // Command-line arguments
-    psMetadataAddStr(arguments, PS_LIST_TAIL, "-psf", 0, "Filename of PSF", NULL);
-    psMetadataAddStr(arguments, PS_LIST_TAIL, "-sources", 0, "Filename of CMF sources", NULL);
-    psMetadataAddS32(arguments, PS_LIST_TAIL, "-fake-num", 0, "Number of fake sources", 0);
-    psMetadataAddF32(arguments, PS_LIST_TAIL, "-fake-mag", 0, "Magnitude of fake sources", NAN);
-    psMetadataAddF32(arguments, PS_LIST_TAIL, "-x", 0, "x position of fake source [0..1]", NAN);
-    psMetadataAddF32(arguments, PS_LIST_TAIL, "-y", 0, "y position of fake source [0..1]", NAN);
+    psMetadataAddStr(arguments, PS_LIST_TAIL, "-pattern", 0, "Filename of pattern correction", NULL);
     if (argc == 1 || !psArgumentParse(arguments, &argc, argv) || argc != 2) {
         usage(argv[0], arguments, data);
     }
 
-    bool mdok;                          // Status of MD lookup
-    data->psfName = psMemIncrRefCounter(psMetadataLookupStr(NULL, arguments, "-psf"));
-    data->sourcesName = psMemIncrRefCounter(psMetadataLookupStr(&mdok, arguments, "-sources"));
-    data->fakeNum = psMetadataLookupS32(NULL, arguments, "-fake-num");
-    data->fakeMag = psMetadataLookupF32(NULL, arguments, "-fake-mag");
+    data->patternName = psMemIncrRefCounter(psMetadataLookupStr(NULL, arguments, "-pattern"));
     data->outRoot = psStringCopy(argv[1]);
-    data->x = psMetadataLookupF32(NULL, arguments, "-x");
-    data->y = psMetadataLookupF32(NULL, arguments, "-y");
     psMetadataAddStr(data->config->arguments, PS_LIST_TAIL, "OUTPUT", 0, "Output root name", data->outRoot);
 
-    psTrace("ppVizPSF", 1, "Done reading command-line arguments\n");
+    psTrace("ppVizPattern", 1, "Done reading command-line arguments\n");
     psFree(arguments);
 
-    PS_ASSERT_STRING_NON_EMPTY(data->psfName, false);
+    PS_ASSERT_STRING_NON_EMPTY(data->patternName, false);
     PS_ASSERT_STRING_NON_EMPTY(data->outRoot, false);
 

branches/eam_branches/20091201/ppViz/src/ppVizPattern/ppVizPatternCamera.c

@@ -7 +7 @@
 #include <psmodules.h>
 
-#include "ppVizPSF.h"
+#include "ppVizPattern.h"
 
 /// Add a single filename to the arguments as an array, so that it can be used with pmFPAfileBindFromArgs, etc
@@ -27 +27 @@
 
 
-bool ppVizPSFCamera(ppVizPSFData *data // Run-time data
+bool ppVizPatternCamera(ppVizPatternData *data // Run-time data
     )
 {
     bool status;                        // Status of file definition
 
-    fileArguments("PSF", data->psfName, "Input PSF", data->config);
-    pmFPAfile *psf = pmFPAfileDefineFromArgs(&status, data->config, "PSPHOT.PSF.LOAD", "PSF"); // File
-    if (!status || !psf) {
-        psError(PS_ERR_IO, false, "Failed to build file from PSPHOT.LOAD.PSF");
+    fileArguments("PATTERN", data->patternName, "Input pattern", data->config);
+    pmFPAfile *input = pmFPAfileDefineFromArgs(&status, data->config, "PPVIZPATTERN.INPUT",
+                                               "PATTERN"); // File
+    if (!status || !input) {
+        psError(PS_ERR_IO, false, "Failed to build file from PPVIZPATTERN.INPUT");
         return false;
     }
 
-    if (data->sourcesName) {
-        fileArguments("SOURCES", data->sourcesName, "Input sources", data->config);
-        pmFPAfile *srcs = pmFPAfileBindFromArgs(&status, psf, data->config,
-                                                "PSPHOT.INPUT.CMF", "SOURCES"); // File
-        if (!status || !srcs) {
-            psError(PS_ERR_IO, false, "Failed to build file from PSPHOT.INPUT.CMF");
-            return false;
-        }
-    }
-
-    pmFPAfile *output = pmFPAfileDefineOutput(data->config, psf->fpa, "PPVIZPSF.OUTPUT");
+    pmFPAfile *output = pmFPAfileDefineOutput(data->config, input->fpa, "PPVIZPATTERN.OUTPUT");
     if (!output) {
         psError(psErrorCodeLast(), false, "Unable to define output.");
@@ -56 +47 @@
     output->save = true;
 
+#if 0
     // Now the camera has been determined, we can read the recipe
-    psMetadata *recipe = psMetadataLookupMetadata(NULL, data->config->recipes, PPVIZPSF_RECIPE); // Recipe
+    psMetadata *recipe = psMetadataLookupMetadata(NULL, data->config->recipes, PPVIZPATTERN_RECIPE); // Recipe
     if (!recipe) {
-        psError(PS_ERR_UNEXPECTED_NULL, false, "Unable to find recipe %s", PPVIZPSF_RECIPE);
+        psError(PS_ERR_UNEXPECTED_NULL, false, "Unable to find recipe %s", PPVIZPATTERN_RECIPE);
         return false;
     }
-
-    data->minFlux = psMetadataLookupF32(NULL, recipe, "MINFLUX"); // Minimum flux
-    if (!isfinite(data->minFlux) || data->minFlux <= 0) {
-        psError(PS_ERR_BAD_PARAMETER_VALUE, true, "Unable to find legitimate value for MINFLUX");
-        return false;
-    }
-
-    if (!data->sourcesName) {
-        data->size = psMetadataLookupS32(NULL, recipe, "SIZE"); // Size of PSF
-        if (data->size <= 0) {
-            psError(PS_ERR_BAD_PARAMETER_VALUE, true, "Unable to find legitimate value for SIZE");
-            return false;
-        }
-    }
+#endif
 
     return true;

branches/eam_branches/20091201/ppViz/src/ppVizPattern/ppVizPatternData.c

@@ -7 +7 @@
 #include <psmodules.h>
 
-#include "ppVizPSF.h"
+#include "ppVizPattern.h"
 
 // Destructor
-static void vizPSFDataFree(ppVizPSFData *data // Data to free
+static void vizPatternDataFree(ppVizPatternData *data // Data to free
     )
 {
-    psFree(data->psfName);
-    psFree(data->sourcesName);
+    psFree(data->patternName);
     psFree(data->outRoot);
     psFree(data->config);
@@ -21 +20 @@
 
 
-ppVizPSFData *ppVizPSFDataAlloc(void)
+ppVizPatternData *ppVizPatternDataAlloc(void)
 {
-    ppVizPSFData *data = psAlloc(sizeof(ppVizPSFData)); // Processing data, to return
-    psMemSetDeallocator(data, (psFreeFunc)vizPSFDataFree);
+    ppVizPatternData *data = psAlloc(sizeof(ppVizPatternData)); // Processing data, to return
+    psMemSetDeallocator(data, (psFreeFunc)vizPatternDataFree);
 
-    data->psfName = NULL;
-    data->sourcesName = NULL;
-    data->fakeNum = 0;
-    data->fakeMag = NAN;
+    data->patternName = NULL;
     data->outRoot = NULL;
     data->config = NULL;
-    data->minFlux = NAN;
-    data->size = 0;
-    data->x = NAN;
-    data->y = NAN;
 
     return data;
@@ -41 +33 @@
 
 
-ppVizPSFData *ppVizPSFDataInit(int *argc, char **argv)
+ppVizPatternData *ppVizPatternDataInit(int *argc, char **argv)
 {
     PS_ASSERT_PTR_NON_NULL(argc, NULL);
     PS_ASSERT_PTR_NON_NULL(argv, NULL);
 
-    ppVizPSFData *data = ppVizPSFDataAlloc(); // Processing data, to return
-    data->config = pmConfigRead(argc, argv, PPVIZPSF_RECIPE);
+    ppVizPatternData *data = ppVizPatternDataAlloc(); // Processing data, to return
+    data->config = pmConfigRead(argc, argv, PPVIZPATTERN_RECIPE);
     if (!data->config) {
         psError(PS_ERR_UNKNOWN, false, "Unable to read configuration.");

branches/eam_branches/20091201/ppViz/src/ppVizPattern/ppVizPatternLoop.c

@@ -7 +7 @@
 #include <psmodules.h>
 
-#include "ppVizPSF.h"
+#include "ppVizPattern.h"
 
+#define MASK_BAD 0xFFFF                 // Mask for bad pixels
 
-bool ppVizPSFLoop(ppVizPSFData *data // Run-time data
+bool ppVizPatternLoop(ppVizPatternData *data // Run-time data
     )
 {
     pmConfig *config = data->config;                                        // Configuration data
-    pmFPAfile *psfFile = pmFPAfileSelectSingle(config->files, "PSPHOT.PSF.LOAD", 0); // File with PSF
+    pmFPAfile *input = pmFPAfileSelectSingle(config->files, "PPVIZPATTERN.INPUT", 0); // File with PSF
 
     pmFPAview *view = pmFPAviewAlloc(0); // Pointer into FPA hierarchy
@@ -22 +23 @@
 
     pmChip *chip;                       // Chip from FPA
-    while ((chip = pmFPAviewNextChip(view, psfFile->fpa, 1))) {
+    while ((chip = pmFPAviewNextChip(view, input->fpa, 1))) {
         if (!chip->process || !chip->file_exists) {
             continue;
@@ -31 +32 @@
         }
 
-        if (chip->cells->n != 1) {
-            psWarning("More than one cell present for chip %d", view->chip);
-        }
-
         pmCell *cell;                   // Cell from chip
-        while ((cell = pmFPAviewNextCell(view, psfFile->fpa, 1))) {
+        while ((cell = pmFPAviewNextCell(view, input->fpa, 1))) {
             if (!cell->process || !cell->file_exists) {
                 continue;
@@ -45 +42 @@
             }
 
-            if (cell->readouts->n == 0) {
-                pmReadout *ro = pmReadoutAlloc(cell);
-                ro->data_exists = true;
-                cell->data_exists = true;
-                chip->data_exists = true;
-                psFree(ro);             // Drop reference
-            }
-
-            if (cell->readouts->n > 1) {
-                psWarning("More than one readout present for chip %d, cell %d", view->chip, view->cell);
-            }
-
             pmReadout *readout;         // Readout from cell
-            while ((readout = pmFPAviewNextReadout(view, psfFile->fpa, 1))) {
+            while ((readout = pmFPAviewNextReadout(view, input->fpa, 1))) {
                 if (!pmFPAfileIOChecks(config, view, PM_FPA_BEFORE)) {
                     psError(PS_ERR_UNKNOWN, false, "Error loading data from files.");
@@ -67 +52 @@
                 }
 
-                pmPSF *psf = psMetadataLookupPtr(NULL, chip->analysis, "PSPHOT.PSF");              // PSF
-                assert(psf);
+                int numCols = 0, numRows = 0; // Size of image
 
-                bool mdok;              // Status of MD lookup
-                psArray *sources = psMetadataLookupPtr(&mdok, readout->analysis, "PSPHOT.SOURCES"); // Sources
-                int numCols = 0, numRows = 0;              // Size of image
-                psVector *xOffset = NULL, *yOffset = NULL; // Offset from source to true position
+                // Get size of image from concepts
+                if (numCols == 0 || numRows == 0) {
+                    numCols = psMetadataLookupS32(NULL, cell->concepts, "CELL.XSIZE");
+                    numRows = psMetadataLookupS32(NULL, cell->concepts, "CELL.YSIZE");
+                }
 
-                if (sources || (data->fakeNum > 0 && isfinite(data->fakeMag))) {
-                  numCols = psf->fieldNx;
-                  numRows = psf->fieldNy;
-                  psLogMsg("ppVizPSF", PS_LOG_INFO, "Generating %dx%d image", numCols, numRows);
-                }
-                if (sources) {
-                    psMemIncrRefCounter(sources);
-                    psLogMsg("ppVizPSF", PS_LOG_INFO, "Using %ld input sources", sources->n);
-                }
-                if (data->fakeNum > 0 && isfinite(data->fakeMag)) {
-                  long numOld = 0; // Old number of sources
-                  long numNew = -1; // New number of sources
-                  psLogMsg("ppVizPSF", PS_LOG_INFO, "Adding %d fake sources", data->fakeNum);
-                  if (sources) {
-                    numOld = sources->n;
-                    numNew = numOld + data->fakeNum;
-                    sources = psArrayRealloc(sources, numNew);
-                    sources->n = numNew;
-                  } else {
-                    numNew = data->fakeNum;
-                    sources = psArrayAlloc(numNew);
-                  }
-
-                  psRandom *rng = psRandomAlloc(PS_RANDOM_TAUS); // Random number generator
-
-                  for (int i = numOld; i < numNew; i++) {
-                    pmSource *source = pmSourceAlloc(); // Fake source
-                    sources->data[i] = source;
-                    float xSrc = psRandomUniform(rng) * numCols, ySrc = psRandomUniform(rng) * numRows; // Position of source
-
-                    pmModel *model = pmModelFromPSFforXY(psf, xSrc, ySrc, 1.0); // Model for normalisation
-                    float fluxNorm = model->modelFlux(model->params);               // Flux for peak=1
-                    float fluxPeak = powf(10.0, -0.4 * data->fakeMag) / fluxNorm; // Peak flux
-                    source->peak = pmPeakAlloc(xSrc, ySrc, fluxPeak, PM_PEAK_LONE);
-                    source->psfMag = data->fakeMag;
-                    psFree(model);
-                  }
-                }                 
-                if (!sources) {
-                  // Generate fake image with only a single realisation of the PSF
-                    sources = psArrayAlloc(1);
-                    pmSource *source = pmSourceAlloc(); // Fake source
-                    sources->data[0] = source;
-                    float xRel = isfinite(data->x) ? data->x : 0.5; // Relative position in x
-                    float yRel = isfinite(data->y) ? data->y : 0.5; // Relative position in y
-                    float xSrc = xRel * psf->fieldNx, ySrc = yRel * psf->fieldNy; // Position of source
-                    source->peak = pmPeakAlloc(xSrc, ySrc, 1.0, PM_PEAK_LONE);
-                    pmModel *model = pmModelFromPSFforXY(psf, xSrc, ySrc, 1.0); // Model for normalisation
-                    float flux = model->modelFlux(model->params);               // Flux for peak=1
-                    psFree(model);
-                    source->psfMag = -2.5 * log10(flux);
-                    xOffset = psVectorAlloc(1, PS_TYPE_S32);
-                    yOffset = psVectorAlloc(1, PS_TYPE_S32);
-                    xOffset->data.S32[0] = data->size - xSrc;
-                    yOffset->data.S32[0] = data->size - ySrc;
-                    numCols = 2 * data->size + 1;
-                    numRows = 2 * data->size + 1;
-                    psLogMsg("ppVizPSF", PS_LOG_INFO, "Generating %dx%d image with single PSF",
-                             numCols, numRows);
+                // Get size of image from TRIMSEC
+                if (numCols == 0 || numRows == 0) {
+                    psRegion *trimsec = psMetadataLookupPtr(NULL, cell->concepts, "CELL.TRIMSEC");
+                    numCols = trimsec->x1 - trimsec->x0;
+                    numRows = trimsec->y1 - trimsec->y0;
                 }
 
@@ -141 +72 @@
                 }
 
-                if (!pmReadoutFakeFromSources(readout, numCols, numRows, sources, 0, xOffset, yOffset, psf,
-                                              data->minFlux, 0, false, true)) {
-                    psError(PS_ERR_UNKNOWN, false, "Unable to generate fake readout.");
+                readout->image = psImageAlloc(numCols, numRows, PS_TYPE_F32);
+                psImageInit(readout->image, 0.0);
+
+                if (!pmPatternRowApply(readout, MASK_BAD) || !pmPatternCellApply(readout, MASK_BAD)) {
+                    psError(PS_ERR_UNKNOWN, false, "Unable to apply pattern correction.");
                     return false;
                 }
 
-                psFree(sources);
-                psFree(xOffset);
-                psFree(yOffset);
-
-                pmHDU *hdu = pmHDUGetLowest(psfFile->fpa, chip, cell); // HDU for readout
+                pmHDU *hdu = pmHDUGetLowest(input->fpa, chip, cell); // HDU for readout
                 if (!hdu) {
                     psError(PS_ERR_UNEXPECTED_NULL, true, "Unable to find HDU for data.");
@@ -159 +88 @@
                     hdu->header = psMetadataAlloc();
                 }
-                ppVizPSFVersionHeader(hdu->header);
+                ppVizPatternVersionHeader(hdu->header);
 
 

branches/eam_branches/20091201/ppViz/src/ppVizPattern/ppVizPatternVersion.c

@@ -1 @@
-/** @file ppVizPSFVersion.c
+/** @file ppVizPatternVersion.c
  *
  *  @brief
  *
- *  @ingroup ppVizPSF
+ *  @ingroup ppVizPattern
  *
  *  @author IfA
@@ -19 +19 @@
 #include <psmodules.h>
 
-#include "ppVizPSF.h"
-#include "ppVizPSFVersionDefinitions.h"
+#include "ppVizPattern.h"
+#include "ppVizPatternVersionDefinitions.h"
 
-#ifndef PPVIZPSF_VERSION
-#error "PPVIZPSF_VERSION is not set"
+#ifndef PPVIZPATTERN_VERSION
+#error "PPVIZPATTERN_VERSION is not set"
 #endif
-#ifndef PPVIZPSF_BRANCH
-#error "PPVIZPSF_BRANCH is not set"
+#ifndef PPVIZPATTERN_BRANCH
+#error "PPVIZPATTERN_BRANCH is not set"
 #endif
-#ifndef PPVIZPSF_SOURCE
-#error "PPVIZPSF_SOURCE is not set"
+#ifndef PPVIZPATTERN_SOURCE
+#error "PPVIZPATTERN_SOURCE is not set"
 #endif
 
-psString ppVizPSFVersion(void)
+psString ppVizPatternVersion(void)
 {
     char *value = NULL;
-    psStringAppend(&value, "%s@%s", PPVIZPSF_BRANCH, PPVIZPSF_VERSION);
+    psStringAppend(&value, "%s@%s", PPVIZPATTERN_BRANCH, PPVIZPATTERN_VERSION);
     return value;
 }
 
-psString ppVizPSFSource(void)
+psString ppVizPatternSource(void)
 {
-    return psStringCopy(PPVIZPSF_SOURCE);
+    return psStringCopy(PPVIZPATTERN_SOURCE);
 }
 
-psString ppVizPSFVersionLong(void)
+psString ppVizPatternVersionLong(void)
 {
-    psString version = ppVizPSFVersion();  // Version, to return
-    psString source = ppVizPSFSource();    // Source
+    psString version = ppVizPatternVersion();  // Version, to return
+    psString source = ppVizPatternSource();    // Source
 
-    psStringPrepend(&version, "ppVizPSF ");
+    psStringPrepend(&version, "ppVizPattern ");
     psStringAppend(&version, " from %s, built %s, %s", source, __DATE__, __TIME__);
     psFree(source);
@@ -62 +62 @@
 };
 
-bool ppVizPSFVersionHeader(psMetadata *header)
+bool ppVizPatternVersionHeader(psMetadata *header)
 {
     PS_ASSERT_METADATA_NON_NULL(header, false);
@@ -70 +70 @@
     psFree(time);
     psString history = NULL;               // History string
-    psStringAppend(&history, "ppVizPSF at %s", timeString);
+    psStringAppend(&history, "ppVizPattern at %s", timeString);
     psFree(timeString);
     psMetadataAddStr(header, PS_LIST_TAIL, "HISTORY", PS_META_DUPLICATE_OK, NULL, history);
@@ -78 +78 @@
     psModulesVersionHeader(header);
 
-    psString version = ppVizPSFVersion(); // Software version
-    psString source  = ppVizPSFSource();  // Software source
+    psString version = ppVizPatternVersion(); // Software version
+    psString source  = ppVizPatternSource();  // Software source
 
-    psStringPrepend(&version, "ppVizPSF version: ");
-    psStringPrepend(&version, "ppVizPSF source: ");
+    psStringPrepend(&version, "ppVizPattern version: ");
+    psStringPrepend(&version, "ppVizPattern source: ");
 
     psMetadataAddStr(header, PS_LIST_TAIL, "HISTORY", PS_META_DUPLICATE_OK, NULL, version);
@@ -93 +93 @@
 }
 
-void ppVizPSFVersionPrint(void)
+void ppVizPatternVersionPrint(void)
 {
     psTime *time = psTimeGetNow(PS_TIME_TAI); // The time now
     psString timeString = psTimeToISO(time); // The time in an ISO string
     psFree(time);
-    psLogMsg("ppVizPSF", PS_LOG_INFO, "ppVizPSF at %s", timeString);
+    psLogMsg("ppVizPattern", PS_LOG_INFO, "ppVizPattern at %s", timeString);
     psFree(timeString);
 
     psString pslib = psLibVersionLong();// psLib version
     psString psmodules = psModulesVersionLong(); // psModules version
-    psString ppVizPSF = ppVizPSFVersionLong(); // ppVizPSF version
+    psString ppVizPattern = ppVizPatternVersionLong(); // ppVizPattern version
 
-    psLogMsg("ppVizPSF", PS_LOG_INFO, "%s", pslib);
-    psLogMsg("ppVizPSF", PS_LOG_INFO, "%s", psmodules);
-    psLogMsg("ppVizPSF", PS_LOG_INFO, "%s", ppVizPSF);
+    psLogMsg("ppVizPattern", PS_LOG_INFO, "%s", pslib);
+    psLogMsg("ppVizPattern", PS_LOG_INFO, "%s", psmodules);
+    psLogMsg("ppVizPattern", PS_LOG_INFO, "%s", ppVizPattern);
 
     psFree(pslib);
     psFree(psmodules);
-    psFree(ppVizPSF);
+    psFree(ppVizPattern);
 
     return;

branches/eam_branches/20091201/ppViz/src/ppVizPattern/ppVizPatternVersionDefinitions.h.in

@@ -1 @@
-#ifndef PPVIZPSF_VERSION_DEFINITIONS_H
-#define PPVIZPSF_VERSION_DEFINITIONS_H
+#ifndef PPVIZPATTERN_VERSION_DEFINITIONS_H
+#define PPVIZPATTERN_VERSION_DEFINITIONS_H
 
-#define PPVIZPSF_VERSION @PPVIZPSF_VERSION@ // SVN version
-#define PPVIZPSF_BRANCH  @PPVIZPSF_BRANCH@  // SVN branch
-#define PPVIZPSF_SOURCE  @PPVIZPSF_SOURCE@  // SVN source
+#define PPVIZPATTERN_VERSION @PPVIZPATTERN_VERSION@ // SVN version
+#define PPVIZPATTERN_BRANCH  @PPVIZPATTERN_BRANCH@  // SVN branch
+#define PPVIZPATTERN_SOURCE  @PPVIZPATTERN_SOURCE@  // SVN source
 
 #endif