Changeset 29905

Timestamp:

Dec 3, 2010, 2:29:33 AM (15 years ago)

Author:

eugene

Message:

modify psphotReadout and equivalent to accept a filerule argument (allow filerules other than PSPHOT.INPUT)

Location:

branches/eam_branches/ipp-20101103

Files:

• ppImage/src/ppImagePhotom.c (modified) (4 diffs)
• ppStack/src/ppStackPhotometry.c (modified) (2 diffs)
• pswarp/src/pswarpLoop.c (modified) (1 diff)

branches/eam_branches/ipp-20101103/ppImage/src/ppImagePhotom.c

@@ -11 +11 @@
     pmCell *cell;
     pmReadout *readout;
-    printf("%x %s\n",psErrorCodeLast(),psErrorCodeString(psErrorCodeLast()));
+
     psphotInit();
-    printf("%x %s\n",psErrorCodeLast(),psErrorCodeString(psErrorCodeLast()));
+
     // find or define a pmFPAfile PSPHOT.INPUT
     pmFPAfile *input = psMetadataLookupPtr (&status, config->files, "PSPHOT.INPUT");
@@ -20 +20 @@
         return false;
     }
-    printf("%x %s\n",psErrorCodeLast(),psErrorCodeString(psErrorCodeLast()));
+
     // we make a new copy of the output chip to keep psphot from modifying the output image
     pmChip *oldChip = pmFPAviewThisChip (view, input->src);
     pmChip *newChip = pmFPAviewThisChip (view, input->fpa);
     pmChipCopy (newChip, oldChip);
-    printf("%x %s\n",psErrorCodeLast(),psErrorCodeString(psErrorCodeLast()));
+
     // iterate over the cells and readout for this chip
     while ((cell = pmFPAviewNextCell (view, input->fpa, 1)) != NULL) {
@@ -34 +34 @@
         while ((readout = pmFPAviewNextReadout (view, input->fpa, 1)) != NULL) {
             if (! readout->data_exists) { continue; }
-            printf("%x %s\n",psErrorCodeLast(),psErrorCodeString(psErrorCodeLast()));
+
             // run the actual photometry analysis
-            if (!psphotReadout (config, view)) {
+            if (!psphotReadout (config, view, "PSPHOT.INPUT")) {
                 // This is likely a data quality issue
                 // XXX Split into multiple cases using error codes?
@@ -60 +60 @@
     ppImageMemoryDump("photom");
 
-    // the PSPHOT.INPUT file is a temporary file used to carry PPIMAGE.CHIP to psphotReadout
-    // XXX not sure that this is needed...
-//    pmFPAfileActivate (config->files, false, "PSPHOT.INPUT");
-
     return true;
 }
-
-// XXX do we need to deactivate all files and activate the psphot ones explicitly?

branches/eam_branches/ipp-20101103/ppStack/src/ppStackPhotometry.c

@@ -54 +54 @@
     psImageMaskType maskValue = pmConfigMaskGet("BLANK", config); // Bits to mask
     psImageMaskType markValue = pmConfigMaskGet("MARK.VALUE", config); // Bits to use for marking
-    psMetadataAddImageMask(psphot, PS_LIST_TAIL, "MASK.PSPHOT", PS_META_REPLACE,
-                            "Bits to mask", maskValue);
-    psMetadataAddImageMask(psphot, PS_LIST_TAIL, "MARK.PSPHOT", PS_META_REPLACE,
-                           "Bits to use for mark", markValue);
+    psMetadataAddImageMask(psphot, PS_LIST_TAIL, "MASK.PSPHOT", PS_META_REPLACE, "Bits to mask", maskValue);
+    psMetadataAddImageMask(psphot, PS_LIST_TAIL, "MARK.PSPHOT", PS_META_REPLACE, "Bits to use for mark", markValue);
 
     psArray *inSources = options->sources;
@@ -67 +65 @@
 
     pmModelClassSetLimits(PM_MODEL_LIMITS_LAX);
-    if (!psphotReadoutKnownSources(config, photView, inSources)) {
+    if (!psphotReadoutKnownSources(config, photView, "PSPHOT.INPUT", inSources)) {
         // This is likely a data quality issue
         // XXX Split into multiple cases using error codes?

branches/eam_branches/ipp-20101103/pswarp/src/pswarpLoop.c

@@ -384 +384 @@
 
         // measure the PSF using these sources
-        if (!psphotReadoutFindPSF(config, view, sources)) {
+        if (!psphotReadoutFindPSF(config, view, "PSPHOT.INPUT", sources)) {
             // This is likely a data quality issue
             // XXX Split into multiple cases using error codes?