Changeset 26523

Timestamp:

Jan 6, 2010, 11:41:09 AM (16 years ago)

Author:

eugene

Message:

starting work on psphotStack

Location:

branches/eam_branches/20091201

Files:

• psModules/src/objects/pmObjects.c (deleted)
• psModules/src/objects/pmObjects.h (deleted)
• psModules/src/objects/pmPhotObj.c (added)
• psModules/src/objects/pmPhotObj.h (added)
• psModules/src/objects/pmSource.c (modified) (1 diff)
• psphot/src/psphotMaskReadout.c (modified) (1 diff)
• psphot/src/psphotModelBackground.c (modified) (2 diffs)
• psphot/src/psphotReadoutStack.c (added)
• psphot/src/psphotStack.c (added)
• psphot/src/psphotStackArguments.c (added)
• psphot/src/psphotStackImageLoop.c (added)
• psphot/src/psphotStackParseCamera.c (added)
• psphot/src/psphotSubtractBackground.c (modified) (1 diff)

branches/eam_branches/20091201/psModules/src/objects/pmSource.c

@@ -3 +3 @@
  *  Functions to define and manipulate sources on images
  *
- *  @author GLG, MHPCC
- *  @author EAM, IfA: significant modifications.
+ *  @author EAM, IfA
+ *  @author GLG, MHPCC (initial code base)
  *
  *  @version $Revision: 1.70 $ $Name: not supported by cvs2svn $
  *  @date $Date: 2009-02-16 22:29:59 $
- *
- *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
- *
+ *  Copyright 2009 Institute for Astronomy, University of Hawaii
  */
 

branches/eam_branches/20091201/psphot/src/psphotMaskReadout.c

@@ -75 +75 @@
     return true;
 }
+
+bool psphotStackSetMaskAndVariance (pmConfig *config, const pmFPAview *view, psMetadata *recipe) {
+
+    int num = psMetadataAddS32 (&status, config->arguments, "INPUTS.NUM");
+    psAbort (!status, "programming error: must define INPUTS.NUM");
+
+    // loop over the available readouts
+    for (int i = 0; i < num; i++) {
+
+        pmFPAfile *file = pmFPAfileSelectSingle(config->files, "PSPHOT.INPUT", i); // File of interest
+
+        // find the currently selected readout
+        pmReadout  *readout = pmFPAviewThisReadout (view, file->fpa);
+        PS_ASSERT_PTR_NON_NULL (readout, false);
+
+        // Generate the mask and weight images, including the user-defined analysis region of interest
+        psphotSetMaskAndVariance (config, readout, recipe);
+
+        // display the image, weight, mask (ch 1,2,3)
+        psphotVisualShowImage (readout);
+    }
+
+}

branches/eam_branches/20091201/psphot/src/psphotModelBackground.c

@@ -328 +328 @@
 }
 
-
+// XXX these two functions are absurdly-named and very similar -- fix!
 
 psImage *psphotBackgroundModel(pmReadout *ro, const pmConfig *config)
@@ -376 +376 @@
     return true;
 }
+
+// XXX supply filename or keep PSPHOT.INPUT fixed?
+bool psphotStackModelBackground (pmConfig *config, const pmFPAview *view)
+{
+    bool status = true;
+
+    int num = psMetadataAddS32 (&status, config->arguments, "INPUTS.NUM");
+    psAbort (!status, "programming error: must define INPUTS.NUM");
+
+    // loop over the available readouts
+    for (int i = 0; i < num; i++) {
+
+        pmFPAfile *file = pmFPAfileSelectSingle(config->files, "PSPHOT.INPUT", i); // File of interest
+
+        // find the currently selected readout
+        pmReadout  *readout = pmFPAviewThisReadout (view, file->fpa);
+        PS_ASSERT_PTR_NON_NULL (readout, false);
+
+        psImageBinning *binning = psphotBackgroundBinning(readout->image, config); // Image binning parameters
+        pmReadout *model = pmFPAGenerateReadout(config, view, "PSPHOT.BACKMDL", inFPA, binning); // this needs to be a MULTI like PSPHOT.INPUT
+        pmReadout *modelStdev = pmFPAGenerateReadout(config, view, "PSPHOT.BACKMDL.STDEV", inFPA, binning); // this needs to be a MULTI like PSPHOT.INPUT
+
+        // XXX save results on model->analysis or readout->analysis??
+        if (!backgroundModel(model->image, modelStdev->image, model->analysis, readout, binning, config)) {
+            psError(PS_ERR_UNKNOWN, false, "Unable to generate background model");
+            return false;
+        }
+        npass ++;
+    }
+    return true;
+}

branches/eam_branches/20091201/psphot/src/psphotSubtractBackground.c

@@ -112 +112 @@
     return true;
 }
+
+// XXX supply filename or keep PSPHOT.INPUT fixed?
+bool psphotStackSubtractBackground (pmConfig *config, const pmFPAview *view)
+{
+    bool status = true;
+
+    int num = psMetadataAddS32 (&status, config->arguments, "INPUTS.NUM");
+    psAbort (!status, "programming error: must define INPUTS.NUM");
+
+    // loop over the available readouts
+    for (int i = 0; i < num; i++) {
+
+        pmFPAfile *file = pmFPAfileSelectSingle(config->files, "PSPHOT.INPUT", i); // File of interest
+
+        // find the currently selected readout
+        pmReadout  *readout = pmFPAviewThisReadout (view, file->fpa);
+        PS_ASSERT_PTR_NON_NULL (readout, false);
+
+        psImageBinning *binning = psphotBackgroundBinning(readout->image, config); // Image binning parameters
+        pmReadout *model = pmFPAGenerateReadout(config, view, "PSPHOT.BACKMDL", inFPA, binning); // this needs to be a MULTI like PSPHOT.INPUT
+        pmReadout *modelStdev = pmFPAGenerateReadout(config, view, "PSPHOT.BACKMDL.STDEV", inFPA, binning); // this needs to be a MULTI like PSPHOT.INPUT
+
+        // XXX save results on model->analysis or readout->analysis??
+        // XXX need to create a worker function from the function above...
+        if (!backgroundModel(model->image, modelStdev->image, model->analysis, readout, binning, config)) {
+            psError(PS_ERR_UNKNOWN, false, "Unable to generate background model");
+            return false;
+        }
+        // display the backsub and backgnd images
+        psphotVisualShowBackground (config, view, readout);
+
+        npass ++;
+    }
+    return true;
+}