Changeset 26543

Timestamp:

Jan 7, 2010, 5:37:07 PM (16 years ago)

Author:

eugene

Message:

update to use new PSPHOT.INPUT handling code which allows multiple images

Location:

branches/eam_branches/20091201

Files:

• ppImage/src/ppImageParseCamera.c (modified) (1 diff)
• ppImage/src/ppImageReplaceBackground.c (modified) (1 diff)
• ppSim/src/ppSimPhotomReadout.c (modified) (3 diffs)
• ppSim/src/ppSimPhotomReadoutFake.c (modified) (3 diffs)
• ppSim/src/ppSimPhotomReadoutForce.c (modified) (3 diffs)
• ppStack/src/ppStackCamera.c (modified) (2 diffs)
• ppStack/src/ppStackMatch.c (modified) (1 diff)
• ppSub/src/ppSubBackground.c (modified) (1 diff)
• ppSub/src/ppSubCamera.c (modified) (1 diff)
• pswarp/src/pswarpParseCamera.c (modified) (1 diff)

branches/eam_branches/20091201/ppImage/src/ppImageParseCamera.c

@@ -256 +256 @@
         PS_ASSERT (psphotInput, false);
 
+        // specify the number of psphot input images
+        psMetadataAddS32 (config->arguments, PS_LIST_TAIL, "PSPHOT.INPUT.NUM", PS_META_REPLACE, "number of inputs", 1);
+        
         // define associated psphot input/output files
         if (!psphotDefineFiles (config, psphotInput)) {

branches/eam_branches/20091201/ppImage/src/ppImageReplaceBackground.c

@@ -80 +80 @@
     // the background model has not been defined, or at least not generated
     if (!modelFile || !modelRO) {
-        if (!psphotModelBackground(config, &roView, "PPIMAGE.CHIP")) {
+        if (!psphotModelBackgroundReadoutFileIndex(config, &roView, "PPIMAGE.CHIP", 0)) {
             psError(PS_ERR_UNKNOWN, false, "Unable to model background");
             return false;

branches/eam_branches/20091201/ppSim/src/ppSimPhotomReadout.c

@@ -39 +39 @@
 # if 0    
     // set the photcode for this image
-    if (!psphotAddPhotcode (recipe, config, view, "PPSIM.CHIP")) {
+    if (!psphotAddPhotcodeReadout (recipe, config, view, "PPSIM.CHIP", 0)) {
         psError (PSPHOT_ERR_CONFIG, false, "trouble defining the photcode");
         return false;
@@ -74 +74 @@
 
     // Generate the mask and weight images, including the user-defined analysis region of interest
-    psphotSetMaskAndWeight (config, readout, recipe);
+    psphotSetMaskAndWeight (config, view, recipe);
 
     // load the psf model, if suppled.  FWHM_X,FWHM_Y,etc are saved in the recipe
@@ -85 +85 @@
 
     // generate a background model (median, smoothed image)
-    if (!psphotModelBackground (config, view, "PPSIM.CHIP")) {
+    if (!psphotModelBackgroundReadoutFileIndex (config, view, "PPSIM.CHIP", 0)) {
         return psphotReadoutCleanup (config, readout, recipe, NULL, NULL, NULL);
     }
-    if (!psphotSubtractBackground (config, view, "PPSIM.CHIP")) {
+    if (!psphotSubtractBackgroundReadout (config, view, "PPSIM.CHIP", 0)) {
         return psphotReadoutCleanup (config, readout, recipe, NULL, NULL, NULL);
     }

branches/eam_branches/20091201/ppSim/src/ppSimPhotomReadoutFake.c

@@ -14 +14 @@
 # if 0
     // set the photcode for this image
-    if (!psphotAddPhotcode (recipe, config, view, "PPSIM.FAKE.CHIP")) {
+    if (!psphotAddPhotcodeReadout (recipe, config, view, "PPSIM.FAKE.CHIP", 0)) {
         psError (PSPHOT_ERR_CONFIG, false, "trouble defining the photcode");
         return false;
@@ -36 +36 @@
 
     // Generate the mask and variance images, including the user-defined analysis region of interest
-    psphotSetMaskAndVariance (config, readout, recipe);
+    psphotSetMaskAndVariance (config, view, recipe);
 
     // XXX need to define the source pixels
@@ -65 +65 @@
 
     // generate a background model (median, smoothed image)
-    if (!psphotModelBackground (config, view, "PPSIM.FAKE.CHIP")) {
+    if (!psphotModelBackgroundReadoutFileIndex (config, view, "PPSIM.FAKE.CHIP", 0)) {
         return psphotReadoutCleanup (config, readout, recipe, NULL, NULL, NULL);
     }
-    if (!psphotSubtractBackground (config, view, "PPSIM.FAKE.CHIP")) {
+    if (!psphotSubtractBackgroundReadout (config, view, "PPSIM.FAKE.CHIP", 0)) {
         return psphotReadoutCleanup (config, readout, recipe, NULL, NULL, NULL);
     }

branches/eam_branches/20091201/ppSim/src/ppSimPhotomReadoutForce.c

@@ -14 +14 @@
 # if 0
     // set the photcode for this image
-    if (!psphotAddPhotcode (recipe, config, view, "PPSIM.FAKE.CHIP")) {
+    if (!psphotAddPhotcodeReadout (recipe, config, view, "PPSIM.FAKE.CHIP", 0)) {
         psError (PSPHOT_ERR_CONFIG, false, "trouble defining the photcode");
         return false;
@@ -36 +36 @@
 
     // Generate the mask and variance images, including the user-defined analysis region of interest
-    psphotSetMaskAndVariance (config, readout, recipe);
+    psphotSetMaskAndVariance (config, view, recipe);
 
     // XXX need to define the source pixels
@@ -58 +58 @@
 
     // generate a background model (median, smoothed image)
-    if (!psphotModelBackground (config, view, "PPSIM.FORCE.CHIP")) {
+    if (!psphotModelBackgroundReadoutFileIndex (config, view, "PPSIM.FORCE.CHIP", 0)) {
         return psphotReadoutCleanup (config, readout, recipe, NULL, NULL, NULL);
     }
-    if (!psphotSubtractBackground (config, view, "PPSIM.FORCE.CHIP")) {
+    if (!psphotSubtractBackgroundReadout (config, view, "PPSIM.FORCE.CHIP", 0)) {
         return psphotReadoutCleanup (config, readout, recipe, NULL, NULL, NULL);
     }

branches/eam_branches/20091201/ppStack/src/ppStackCamera.c

@@ -373 +373 @@
         psMetadataLookupBool(&mdok, config->arguments, "-photometry"); // perform photometry
     if (doPhotom) {
-        // This file, PSPHOT.INPUT, is just used as a carrier; output files (eg, PSPHOT.RESID) are defined by
-        // psphotDefineFiles
+        // This pmFPAfile, PSPHOT.INPUT, is just used as a carrier; output files (eg,
+        // PSPHOT.RESID) are defined by psphotDefineFiles
         pmFPAfile *psphotInput = pmFPAfileDefineFromFPA(config, output->fpa, 1, 1, "PSPHOT.INPUT");
         if (!psphotInput) {
@@ -380 +380 @@
             return false;
         }
+        // specify the number of psphot input images
+        psMetadataAddS32 (config->arguments, PS_LIST_TAIL, "PSPHOT.INPUT.NUM", PS_META_REPLACE, "number of inputs", 1);
 
         // Define associated psphot input/output files

branches/eam_branches/20091201/ppStack/src/ppStackMatch.c

@@ -144 +144 @@
     psMetadataAddU8(psphotRecipe, PS_LIST_TAIL, "MASK.PSPHOT", PS_META_REPLACE, "user-defined mask", maskBad);
 
-    psImage *binned = psphotBackgroundModel(ro, config); // Binned background model
+    psImage *binned = psphotModelBackgroundReadoutNoFile(ro, config); // Binned background model
     psImageBinning *binning = psMetadataLookupPtr(NULL, ro->analysis,
                                                   "PSPHOT.BACKGROUND.BINNING"); // Binning for model

branches/eam_branches/20091201/ppSub/src/ppSubBackground.c

@@ -42 +42 @@
     if (!modelRO) {
         // Create the background model
-        if (!psphotModelBackground(config, view, "PPSUB.OUTPUT")) {
+        if (!psphotModelBackgroundReadoutFileIndex(config, view, "PPSUB.OUTPUT", 0)) {
             psError(PS_ERR_UNKNOWN, false, "Unable to model background");
             psFree(view);

branches/eam_branches/20091201/ppSub/src/ppSubCamera.c

@@ -317 +317 @@
             return false;
         }
+        // specify the number of psphot input images
+        psMetadataAddS32 (config->arguments, PS_LIST_TAIL, "PSPHOT.INPUT.NUM", PS_META_REPLACE, "number of inputs", 1);
         pmFPAfileActivate(config->files, false, "PSPHOT.INPUT");
 

branches/eam_branches/20091201/pswarp/src/pswarpParseCamera.c

@@ -142 +142 @@
         }
         psphotInput->src = psMemIncrRefCounter(output->fpa);
+        // specify the number of psphot input images
+        psMetadataAddS32 (config->arguments, PS_LIST_TAIL, "PSPHOT.INPUT.NUM", PS_META_REPLACE, "number of inputs", 1);
 
         pmFPAfile *psphotInSources = pmFPAfileDefineSkycell(config, output->fpa, "PSPHOT.INPUT.CMF");