Changeset 23199 for branches/cnb_branches/cnb_branch_20090215/ppStack/src/ppStackLoop.c

Timestamp:

Mar 5, 2009, 11:24:29 AM (17 years ago)

Author:

beaumont

Message:

sync with mainline

Location:

branches/cnb_branches/cnb_branch_20090215

Files:

• . (modified) (1 prop)
• ppStack/src/ppStackLoop.c (modified) (13 diffs)

branches/cnb_branches/cnb_branch_20090215/ppStack/src/ppStackLoop.c

@@ -257 +257 @@
     pmPSF *targetPSF = NULL;            // Target PSF
     float sumExposure = NAN;            // Sum of exposure times
+    psVector *inputMask = psVectorAlloc(num, PS_TYPE_VECTOR_MASK); // Mask for inputs
+    psVectorInit(inputMask, 0);
     if (psMetadataLookupBool(NULL, config->arguments, "HAVE.PSF")) {
         pmFPAfileActivate(config->files, false, NULL);
@@ -283 +285 @@
                 psFree(fileIter);
                 psFree(psfs);
+                psFree(inputMask);
                 return false;
             }
@@ -299 +302 @@
                 psFree(fileIter);
                 psFree(psfs);
+                psFree(inputMask);
                 return false;
             }
@@ -324 +328 @@
                     psFree(sourceLists);
                     psFree(targetPSF);
-                    return false;
+                    psFree(inputMask);
+                   return false;
                 }
 
@@ -333 +338 @@
                     psFree(sourceLists);
                     psFree(targetPSF);
+                    psFree(inputMask);
                     return false;
                 }
@@ -340 +346 @@
                     psFree(sourceLists);
                     psFree(targetPSF);
+                    psFree(inputMask);
                     return false;
                 }
@@ -351 +358 @@
 
         // Zero point calibration
-        sumExposure = ppStackSourcesTransparency(sourceLists, view, config);
+        sumExposure = ppStackSourcesTransparency(sourceLists, inputMask, view, config);
         if (!isfinite(sumExposure) || sumExposure <= 0) {
             psError(PS_ERR_UNKNOWN, false, "Unable to calculate transparency differences");
             psFree(sourceLists);
             psFree(targetPSF);
+            psFree(inputMask);
             return false;
         }
 
         // Generate target PSF
-        targetPSF = ppStackPSF(config, numCols, numRows, psfs);
+        targetPSF = ppStackPSF(config, numCols, numRows, psfs, inputMask);
         psFree(psfs);
         if (!targetPSF) {
@@ -366 +374 @@
             psFree(sourceLists);
             psFree(view);
+            psFree(inputMask);
             return false;
         }
@@ -409 +418 @@
     int numGood = 0;                    // Number of good frames
     int numCols = 0, numRows = 0;       // Size of image
-    psVector *inputMask = psVectorAlloc(num, PS_TYPE_VECTOR_MASK); // Mask for inputs
-    psVectorInit(inputMask, 0);
     psVector *matchChi2 = psVectorAlloc(num, PS_TYPE_F32); // chi^2 for stamps when matching
     psVectorInit(matchChi2, NAN);
@@ -419 +426 @@
     psArray *covariances = psArrayAlloc(num); // Covariance matrices
     for (int i = 0; i < num; i++) {
+        if (inputMask->data.U8[i]) {
+            continue;
+        }
         psTrace("ppStack", 2, "Convolving input %d of %d to target PSF....\n", i, num);
         pmFPAfileActivate(config->files, false, NULL);
@@ -1168 +1178 @@
         fileActivation(config, photFiles, true);
         pmFPAview *photView = filesIterateDown(config);
+        fileActivation(config, combineFiles, true);
+
         if (!ppStackPhotometry(config, outRO, photView)) {
             psError(PS_ERR_UNKNOWN, false, "Unable to perform photometry on output.");
+            filesIterateUp(config);
             psFree(outRO);
             psFree(photView);
@@ -1175 +1188 @@
         }
         psFree(photView);
-
-        fileActivation(config, combineFiles, true);
 
         if (stats) {
@@ -1217 +1228 @@
         hdu->header = psMetadataAlloc();
     }
-    ppStackVersionMetadata(hdu->header);
+    ppStackVersionHeader(hdu->header);
 
     psFree(outRO);