Changeset 30151

Timestamp:

Dec 24, 2010, 3:02:58 PM (15 years ago)

Author:

eugene

Message:

deprecate in-line photometry from ppSim

Location:

branches/eam_branches/ipp-20101205/ppSim/src

Files:

• Makefile.am (modified) (2 diffs)
• ppSimCreate.c (modified) (1 diff)
• ppSimLoadForceSources.c (deleted)
• ppSimLoadSpots.c (deleted)
• ppSimLoop.c (modified) (3 diffs)
• ppSimPhotom.c (deleted)
• ppSimPhotomFiles.c (deleted)
• ppSimPhotomReadout.c (deleted)
• ppSimPhotomReadoutFake.c (deleted)
• ppSimPhotomReadoutForce.c (deleted)

branches/eam_branches/ipp-20101205/ppSim/src/Makefile.am

@@ -47 +47 @@
         ppSimUtils.c              \
         ppSimLoop.c               \
-        ppSimLoadSpots.c          \
-        ppSimPhotom.c             \
-        ppSimPhotomFiles.c        \
-        ppSimLoadForceSources.c   \
         ppSimMergeReadouts.c      \
         ppSimDetections.c         \
@@ -59 +55 @@
         ppSimBadCTE.c             \
         ppSimVersion.c
-
-# these functions have been broken by the API change in psphot (Jan 2010)
-#       ppSimPhotomReadoutFake.c  
-#       ppSimPhotomReadoutForce.c 
 
 ppSimSequence_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(PSASTRO_CFLAGS) $(ppSim_CFLAGS)

branches/eam_branches/ipp-20101205/ppSim/src/ppSimCreate.c

@@ -132 +132 @@
     bool doPhotom = psMetadataLookupBool(&status, recipe, "PHOTOM"); // Density of fakes
     if (doPhotom) {
-
-        // XXX at the moment, we can perform photometry on the fake sources and the forced
-        // photometry positions, but not one or the other.  Also, we only support photometry in
-        // the context of an image previously analysed by psphot.  Add support for:
-        // * photometry of a pure fake image (requires peak detection and psf creation)
-        // * photometry of forced source positions without fake image (this might work, it just
-        // requires not generating any fake features).
-
-        if (!input) {
-            psError(PS_ERR_UNKNOWN, false, "input image not found; currently required for photometry");
-            return NULL;
-        }
-
-        // we need a chip image if we perform photometry (is it necessary to build it if we don't use it?)
-        pmFPAfile *fakeImage = pmFPAfileDefineChipMosaic(config, output->fpa, "PPSIM.FAKE.CHIP");
-        if (!fakeImage) {
-            psError(PS_ERR_IO, false, _("Unable to generate new file from PPSIM.FAKE.CHIP"));
-            psFree(fpa);
-            return NULL;
-        }
-        if (fakeImage->type != PM_FPA_FILE_IMAGE) {
-            psError(PS_ERR_IO, true, "PPSIM.FAKE.CHIP is not of type IMAGE");
-            psFree(fpa);
-            return NULL;
-        }
-
-        // we need a chip image if we perform photometry (is it necessary to build it if we don't use it?)
-        pmFPAfile *forceImage = NULL;
-        if (input) {
-            forceImage = pmFPAfileDefineChipMosaic(config, input->fpa, "PPSIM.FORCE.CHIP");
-            if (!forceImage) {
-                psError(PS_ERR_IO, false, _("Unable to generate new file from PPSIM.FORCE.CHIP"));
-                psFree(fpa);
-                return NULL;
-            }
-            if (forceImage->type != PM_FPA_FILE_IMAGE) {
-                psError(PS_ERR_IO, true, "PPSIM.FORCE.CHIP is not of type IMAGE");
-                psFree(fpa);
-                return NULL;
-            }
-        }
-
-        // define associated psphot input/output files
-        if (!ppSimPhotomFiles (config, fakeImage, forceImage)) {
-            psError(PSPHOT_ERR_CONFIG, false, "Trouble defining the additional input/output files for psphot");
-            psFree(fpa);
-            return NULL;
-        }
-    } else {
-        // have we supplied a psf model?  this happens in ppSimPhotomFiles if we request a photometry
-        // analysis.  however, even if we do not, a psf model may be used to generate the fake
-        // sources.
-        if (psMetadataLookupPtr(NULL, config->arguments, "PSPHOT.PSF")) {
-            // tie the psf file to the chipMosaic
-            pmFPAfileBindFromArgs(&status, output, config, "PSPHOT.PSF.LOAD", "PSPHOT.PSF");
-            if (!status) {
-                psError(PS_ERR_UNKNOWN, false, "Failed to find/build PSPHOT.PSF.LOAD");
-                psFree(fpa);
-                return NULL;
-            }
-        }
+        psError(PS_ERR_UNKNOWN, false, "in-line photometry in ppSim had been deprecated");
+        return NULL;
+    }
+
+    // have we supplied a psf model?  this happens in ppSimPhotomFiles if we request a photometry
+    // analysis.  however, even if we do not, a psf model may be used to generate the fake
+    // sources.
+    if (psMetadataLookupPtr(NULL, config->arguments, "PSPHOT.PSF")) {
+        // tie the psf file to the chipMosaic
+        pmFPAfileBindFromArgs(&status, output, config, "PSPHOT.PSF.LOAD", "PSPHOT.PSF");
+        if (!status) {
+            psError(PS_ERR_UNKNOWN, false, "Failed to find/build PSPHOT.PSF.LOAD");
+            psFree(fpa);
+            return NULL;
+        }
     }
 

branches/eam_branches/ipp-20101205/ppSim/src/ppSimLoop.c

@@ -42 +42 @@
     if (type == PPSIM_TYPE_OBJECT) {
         // Load forced-photometry positions (these are placed on fpa->analysis for use in ppSimPhotomReadout)
-        if (!ppSimLoadSpots (fpa, config)) ESCAPE (PS_ERR_UNKNOWN, "failed to load forced-photometry spots");
+        // if (!ppSimLoadSpots (fpa, config)) ESCAPE (PS_ERR_UNKNOWN, "failed to load forced-photometry spots");
 
         // Load catalogue stars
@@ -58 +58 @@
 
     pmFPAview *view = pmFPAviewAlloc(0);// View for iterating over FPA
-
-    // XXX if we include the psphot analysis, we will need to activate the correct pmFPAfiles
-    // at the correct times.  ppSim operates on PPSIM.OUTPUT and PPSIM.SOURCES
 
     // load any needed files (eg, input image, PSF)
@@ -209 +206 @@
 
         // we perform photometry on the readouts of this chip in the output
-        if (!ppSimPhotom (config, view)) ESCAPE (PS_ERR_UNKNOWN, "problem performing photometry");
+        // if (!ppSimPhotom (config, view)) ESCAPE (PS_ERR_UNKNOWN, "problem performing photometry");
 
         if (!pmFPAfileIOChecks(config, view, PM_FPA_AFTER)) {