Changeset 26237 for branches/eam_branches/20091113

Timestamp:

Nov 20, 2009, 4:15:17 PM (17 years ago)

Author:

eugene

Message:

updates from head

Location:

branches/eam_branches/20091113

Files:

• . (modified) (1 prop)
• ippconfig/gpc1/psastro.config (modified) (1 diff)
• ippconfig/recipes/psastro.config (modified) (2 diffs)
• ppStack/src/ppStackCleanup.c (modified) (3 diffs)
• ppStack/src/ppStackCombineFinal.c (modified) (2 diffs)
• ppStack/src/ppStackConvolve.c (modified) (2 diffs)
• psModules/src/imcombine/pmSubtractionKernels.c (modified) (1 diff)
• psModules/src/imcombine/pmSubtractionKernels.h (modified) (1 diff)
• psModules/src/objects/Makefile.am (modified) (2 diffs)
• psModules/src/objects/pmSourceGroups.c (copied) (copied from trunk/psModules/src/objects/pmSourceGroups.c )
• psModules/src/objects/pmSourceGroups.h (copied) (copied from trunk/psModules/src/objects/pmSourceGroups.h )
• psastro/src/Makefile.am (modified) (1 diff)
• psastro/src/psastro.h (modified) (1 diff)
• psastro/src/psastroLoadCrosstalk.c (copied) (copied from trunk/psastro/src/psastroLoadCrosstalk.c )
• psastro/src/psastroMaskUpdates.c (modified) (5 diffs)
• psphot/doc/efficiency.txt (modified) (1 prop)
• psphot/src/psphotFake.c (modified) (1 prop)

branches/eam_branches/20091113/ippconfig/gpc1/psastro.config

@@ -233 +233 @@
 END
 
+REFSTAR_MASK_CROSSTALK_MAG_SLOPE F32   3.44
+REFSTAR_MASK_CROSSTALK_MAG_MAX   F32 -14.47
+CROSSTALK_MAX_MAG                F32  20.0
+CROSSTALK_MASK                   BOOL TRUE

branches/eam_branches/20091113/ippconfig/recipes/psastro.config

@@ -154 +154 @@
 END
 
+REFSTAR_MASK_CROSSTALK_MAG_SLOPE F32 3.44
+REFSTAR_MASK_CROSSTALK_MAG_MAX   F32 -14.47
+CROSSTALK_MAX_MAG    F32  20.0
+CROSSTALK_MASK       BOOL FALSE
+
 EXTRACT_MAX_MAG                 F32 -15.0
 
@@ -217 +222 @@
 PR_RECIPE METADATA
 END
+

branches/eam_branches/20091113/ppStack/src/ppStackCleanup.c

@@ -9 +9 @@
 #include "ppStack.h"
 #include "ppStackLoop.h"
-
-#define WCS_TOLERANCE 0.001             // Tolerance for WCS
 
 
@@ -34 +32 @@
 
     // Close up
-    bool wcsDone = false;           // Have we done the WCS?
-    for (int i = 0; i < options->num; i++) {
-        if (options->inputMask->data.PS_TYPE_VECTOR_MASK_DATA[i]) {
-            continue;
-        }
-
-        ppStackThread *thread = stack->threads->data[0]; // Representative stack
-        pmReadout *inRO = thread->readouts->data[i]; // Template readout
-        if (inRO && !wcsDone) {
-            // Copy astrometry over
-            wcsDone = true;
-            pmHDU *inHDU = pmHDUFromCell(inRO->parent); // Template HDU
-            pmHDU *outHDU = pmHDUFromCell(options->outRO->parent); // Output HDU
-            pmChip *outChip = options->outRO->parent->parent; // Output chip
-            pmFPA *outFPA = outChip->parent; // Output FPA
-            if (!outHDU || !inHDU) {
-                psWarning("Unable to find HDU at FPA level to copy astrometry.");
-            } else {
-                if (!pmAstromReadWCS(outFPA, outChip, inHDU->header, 1.0)) {
-                    psErrorClear();
-                    psWarning("Unable to read WCS astrometry from input FPA.");
-                    wcsDone = false;
-                } else {
-                    if (!outHDU->header) {
-                        outHDU->header = psMetadataAlloc();
-                    }
-                    if (!pmAstromWriteWCS(outHDU->header, outFPA, outChip, WCS_TOLERANCE)) {
-                        psErrorClear();
-                        psWarning("Unable to write WCS astrometry to output FPA.");
-                        wcsDone = false;
-                    }
-                }
-            }
-        }
-    }
 
     ppStackMemDump("cleanup");
@@ -96 +59 @@
     }
 
-    // Put version information into the header
-    pmHDU *hdu = pmHDUFromCell(options->outRO->parent);
-    if (!hdu) {
-        psError(PS_ERR_UNKNOWN, false, "Unable to find HDU for output.");
-        return false;
-    }
-    if (!hdu->header) {
-        hdu->header = psMetadataAlloc();
-    }
-    ppStackVersionHeader(hdu->header);
-
     return true;
 }

branches/eam_branches/20091113/ppStack/src/ppStackCombineFinal.c

@@ -9 +9 @@
 #include "ppStack.h"
 #include "ppStackLoop.h"
+
+#define WCS_TOLERANCE 0.001             // Tolerance for WCS
 
 //#define TESTING                         // Enable test output
@@ -84 +86 @@
     }
 
+    // Propagate WCS
+    bool wcsDone = false;           // Have we done the WCS?
+    for (int i = 0; i < options->num && !wcsDone; i++) {
+        if (options->inputMask->data.PS_TYPE_VECTOR_MASK_DATA[i]) {
+            continue;
+        }
+
+        ppStackThread *thread = stack->threads->data[0]; // Representative stack
+        pmReadout *inRO = thread->readouts->data[i]; // Template readout
+        if (inRO && !wcsDone) {
+            // Copy astrometry over
+            wcsDone = true;
+            pmHDU *inHDU = pmHDUFromCell(inRO->parent); // Template HDU
+            pmHDU *outHDU = pmHDUFromCell(target->parent); // Output HDU
+            pmChip *outChip = target->parent->parent; // Output chip
+            pmFPA *outFPA = outChip->parent; // Output FPA
+            if (!outHDU || !inHDU) {
+                psWarning("Unable to find HDU at FPA level to copy astrometry.");
+            } else {
+                if (!pmAstromReadWCS(outFPA, outChip, inHDU->header, 1.0)) {
+                    psErrorClear();
+                    psWarning("Unable to read WCS astrometry from input FPA.");
+                    wcsDone = false;
+                } else {
+                    if (!outHDU->header) {
+                        outHDU->header = psMetadataAlloc();
+                    }
+                    if (!pmAstromWriteWCS(outHDU->header, outFPA, outChip, WCS_TOLERANCE)) {
+                        psErrorClear();
+                        psWarning("Unable to write WCS astrometry to output FPA.");
+                        wcsDone = false;
+                    }
+                }
+            }
+        }
+    }
+
+    // Put version information into the header
+    pmHDU *hdu = pmHDUFromCell(target->parent);
+    if (!hdu) {
+        psError(PS_ERR_UNKNOWN, false, "Unable to find HDU for output.");
+        return false;
+    }
+    if (!hdu->header) {
+        hdu->header = psMetadataAlloc();
+    }
+    ppStackVersionHeader(hdu->header);
+
+
 #ifdef TESTING
     static int pass = 0;                // Pass through

branches/eam_branches/20091113/ppStack/src/ppStackConvolve.c

@@ -213 +213 @@
         pmFPAview view;                 // View for output
         view.chip = view.cell = view.readout = 0;
+
         pmCell *outCell = pmFPAfileThisCell(config->files, &view, "PPSTACK.OUTPUT"); // Output cell
         pmFPA *outFPA = outCell->parent->parent; // Output FPA
+
+        pmCell *unconvCell = pmFPAfileThisCell(config->files, &view, "PPSTACK.UNCONV"); // Unconvolved cell
+        pmFPA *unconvFPA = unconvCell->parent->parent;                                  // Unconvolved FPA
+
         pmConceptsAverageFPAs(outFPA, fpaList);
         pmConceptsAverageCells(outCell, cellList, NULL, NULL, true);
+
+        pmConceptsAverageFPAs(unconvFPA, fpaList);
+        pmConceptsAverageCells(unconvCell, cellList, NULL, NULL, true);
+
         psFree(fpaList);
         psFree(cellList);
@@ -223 +232 @@
         UPDATE_CONCEPT(outCell, "CELL.EXPOSURE", options->sumExposure);
         UPDATE_CONCEPT(outCell, "CELL.DARKTIME", NAN);
+
+        UPDATE_CONCEPT(unconvFPA,  "FPA.EXPOSURE",  options->sumExposure);
+        UPDATE_CONCEPT(unconvCell, "CELL.EXPOSURE", options->sumExposure);
+        UPDATE_CONCEPT(unconvCell, "CELL.DARKTIME", NAN);
     }
 

branches/eam_branches/20091113/psModules/src/imcombine/pmSubtractionKernels.c

@@ -250 +250 @@
     int num = PS_SQR(2 * size + 1) - 1; // Number of basis functions
 
-    pmSubtractionKernels *kernels = pmSubtractionKernelsAlloc(num, PM_SUBTRACTION_KERNEL_POIS, size,
+    pmSubtractionKernels *kernels = pmSubtractionKernelsAlloc(0, PM_SUBTRACTION_KERNEL_POIS, size,
                                                               spatialOrder, penalty, mode); // The kernels
     psStringAppend(&kernels->description, "POIS(%d,%d,%.2e)", size, spatialOrder, penalty);

branches/eam_branches/20091113/psModules/src/imcombine/pmSubtractionKernels.h

@@ -52 +52 @@
     PS_ASSERT_PTR_NON_NULL(KERNELS, RETURNVALUE); \
     PS_ASSERT_STRING_NON_EMPTY((KERNELS)->description, RETURNVALUE); \
-    PS_ASSERT_INT_POSITIVE((KERNELS)->num, RETURNVALUE); \
+    PS_ASSERT_INT_NONNEGATIVE((KERNELS)->num, RETURNVALUE); \
     PS_ASSERT_VECTOR_NON_NULL((KERNELS)->u, RETURNVALUE); \
     PS_ASSERT_VECTOR_NON_NULL((KERNELS)->v, RETURNVALUE); \

branches/eam_branches/20091113/psModules/src/objects/Makefile.am

@@ -60 +60 @@
         pmSourceMatch.c \
         pmDetEff.c \
+        pmSourceGroups.c \
         models/pmModel_GAUSS.c \
         models/pmModel_PGAUSS.c \
@@ -96 +97 @@
         pmSourceMatch.h \
         pmDetEff.h \
+        pmSourceGroups.h \
         models/pmModel_GAUSS.h \
         models/pmModel_PGAUSS.h \

branches/eam_branches/20091113/psastro/src/Makefile.am

@@ -90 +90 @@
         psastroMaskUtils.c          \
         psastroChooseGlintStars.c   \
+        psastroLoadCrosstalk.c \
         psastroLoadGlints.c   \
         psastroLoadGhosts.c         \

branches/eam_branches/20091113/psastro/src/psastro.h

@@ -75 +75 @@
 bool              psastroLoadGlints (pmConfig *config);
 bool              psastroChooseGlintStars (pmConfig *config, psArray *refs, const char *source);
+
+bool              psastroLoadCrosstalk (pmConfig *config);
 
 psArray          *psastroLoadRefstars (pmConfig *config, const char *source);

branches/eam_branches/20091113/psastro/src/psastroMaskUpdates.c

@@ -34 +34 @@
     psImageMaskType spikeMaskValue = pmConfigMaskGet("SPIKE", config); // Mask value for ghost pixels
     psImageMaskType starMaskValue  = pmConfigMaskGet("STARCORE", config); // Mask value for ghost pixels
-
+    psImageMaskType crosstalkMaskValue = pmConfigMaskGet("GHOST", config); // Mask value for crosstalk ghosts
+    
     // psImageMaskType maskBlank  = pmConfigMaskGet("BLANK", config); // Mask value for blank pixels
 
@@ -48 +49 @@
     if (!REFSTAR_MASK) return true;
 
+    // convert star positions to crosstalk artifact positions and add to the readout->analysis data
+    bool CROSSTALK_MASK                    = psMetadataLookupBool (&status, recipe, "CROSSTALK_MASK");
+    if (CROSSTALK_MASK && !psastroLoadCrosstalk (config)) {
+      psError(PSASTRO_ERR_CONFIG, false, "Error loading crosstalk data");
+      return(false);
+    }
+    
     // convert star positions to ghost positions and add to the readout->analysis data
     if (!psastroLoadGhosts (config)) {
@@ -76 +84 @@
     double REFSTAR_MASK_BLEED_MAG_SLOPE    = psMetadataLookupF32 (&status, recipe, "REFSTAR_MASK_BLEED_MAG_SLOPE");
 
+    double REFSTAR_MASK_CROSSTALK_MAG_MAX  = psMetadataLookupF32 (&status, recipe, "REFSTAR_MASK_CROSSTALK_MAG_MAX");
+    double REFSTAR_MASK_CROSSTALK_MAG_SLOPE= psMetadataLookupF32 (&status, recipe, "REFSTAR_MASK_CROSSTALK_MAG_SLOPE");
+    
     // select the input data sources
     pmFPAfile *input = psMetadataLookupPtr (NULL, config->files, "PSASTRO.INPUT");
@@ -204 +215 @@
 
                     if (ref->Mag > REFSTAR_MASK_MAX_MAG) continue;
+
 
                     // the reference magnitudes have been converted from the instrumental
@@ -285 +297 @@
                 }
 
+                // Select the crosstalk artifact regions for this readout, and mask a circular region
+                // corresponding to the source star
+
+                psArray *crosstalks = psMetadataLookupPtr (&status, readout->analysis, "PSASTRO.CROSSTALKS");
+                if (crosstalks) {
+                  for (int i = 0; i < crosstalks->n; i++) {
+                    pmAstromObj *ref = crosstalks->data[i];
+                    float radius = REFSTAR_MASK_CROSSTALK_MAG_SLOPE * (REFSTAR_MASK_CROSSTALK_MAG_MAX - ref->Mag);
+                    psTrace("psastro.crosstalk",2,"Masking star on Chip %s @ (%f,%f) Magnitude: %f Radius %f\n",
+                            psMetadataLookupStr(&status,readout->parent->parent->concepts,"CHIP.NAME"),
+                            ref->chip->x,ref->chip->y,ref->Mag,radius);
+                    // XXX for now, assume cell binning is 1x1 relative to chip
+                    psastroMaskCircle (readoutMask->mask, crosstalkMaskValue, ref->chip->x, ref->chip->y, radius, radius);
+                  }
+                }
+                
                 // this probably should move into a function of its own:
                 {