Changeset 27517 for branches/eam_branches/20100225/ppSub/src

Timestamp:

Mar 29, 2010, 3:55:49 PM (16 years ago)

Author:

eugene

Message:

update merges from trunk

Location:

branches/eam_branches/20100225

Files:

• . (modified) (1 prop)
• ppSub/src (modified) (1 prop)
• ppSub/src/Makefile.am (modified) (3 diffs)
• ppSub/src/ppSub.c (modified) (2 diffs)
• ppSub/src/ppSub.h (modified) (1 diff)
• ppSub/src/ppSubArguments.c (modified) (1 diff)
• ppSub/src/ppSubConvolve.c (copied) (copied from trunk/ppSub/src/ppSubConvolve.c )
• ppSub/src/ppSubExit.c (copied) (copied from trunk/ppSub/src/ppSubExit.c )
• ppSub/src/ppSubFiles.c (modified) (1 diff)
• ppSub/src/ppSubMatchPSFs.c (modified) (4 diffs)
• ppSub/src/ppSubVarianceRescale.c (modified) (1 diff)

branches/eam_branches/20100225/ppSub/src

@@ -13 +13 @@
 ppSubErrorCodes.c
 ppSubVersionDefinitions.h
+ppSubConvolve

@@ -13 +13 @@
 ppSubErrorCodes.c
 ppSubVersionDefinitions.h
+ppSubConvolve

branches/eam_branches/20100225/ppSub/src/Makefile.am

@@ -1 @@
-bin_PROGRAMS = ppSub ppSubKernel
+bin_PROGRAMS = ppSub ppSubKernel ppSubConvolve
 
 if HAVE_SVNVERSION
@@ -34 +34 @@
         ppSubData.c                     \
         ppSubErrorCodes.c               \
+        ppSubExit.c                     \
         ppSubFiles.c                    \
         ppSubLoop.c                     \
@@ -53 +54 @@
 ppSubKernel_SOURCES =           \
         ppSubKernel.c
+
+ppSubConvolve_CPPFLAGS = $(PSLIB_CFLAGS) $(PSMODULE_CFLAGS) $(PPSTATS_CFLAGS) $(PSPHOT_CFLAGS) $(PPSUB_CFLAGS)
+ppSubConvolve_LDFLAGS  = $(PSLIB_LIBS)   $(PSMODULE_LIBS)   $(PPSTATS_LIBS)   $(PSPHOT_LIBS)   $(PPSUB_LIBS)
+
+ppSubConvolve_SOURCES =         \
+        ppSubConvolve.c         \
+        ppSubExit.c             \
+        ppSubVersion.c
 
 noinst_HEADERS = \

branches/eam_branches/20100225/ppSub/src/ppSub.c

@@ -26 +26 @@
     psLibInit(NULL);
     psTimerStart("ppSub");
+
+    pmErrorRegister();
+    ppSubErrorRegister();
+    psphotErrorRegister();
 
     ppSubData *data = NULL;             // Processing data
@@ -63 +67 @@
 
  die:
-    if (data && data->stats && data->statsFile) {
-        psString stats = psMetadataConfigFormat(data->stats); // Statistics to output
-        if (!stats || strlen(stats) == 0) {
-            psError(PPSUB_ERR_IO, false, "Unable to format statistics file");
-        } else if (fprintf(data->statsFile, "%s", stats) != strlen(stats)) {
-            psError(PPSUB_ERR_IO, true, "Unable to write statistics file");
+    {
+        psExit exitValue = ppSubExitCode(PS_EXIT_SUCCESS); // Exit code
+
+        if (data && data->stats && data->statsFile) {
+            psString stats = psMetadataConfigFormat(data->stats); // Statistics to output
+            if (!stats || strlen(stats) == 0) {
+                psError(PPSUB_ERR_IO, false, "Unable to format statistics file");
+            } else if (fprintf(data->statsFile, "%s", stats) != strlen(stats)) {
+                psError(PPSUB_ERR_IO, true, "Unable to write statistics file");
+            }
+            psFree(stats);
+            if (fclose(data->statsFile) == EOF) {
+                psError(PPSUB_ERR_IO, true, "Unable to close statistics file");
+            }
+            data->statsFile = NULL;
+            pmConfigRunFilenameAddWrite(data->config, "STATS", data->statsName);
+            exitValue = ppSubExitCode(exitValue);
         }
-        psFree(stats);
-        if (fclose(data->statsFile) == EOF) {
-            psError(PPSUB_ERR_IO, true, "Unable to close statistics file");
+
+        if (config && !ppSubFilesIterateUp(config, PPSUB_FILES_ALL)) {
+            psError(psErrorCodeLast(), false, "Unable to close files.");
+            exitValue = ppSubExitCode(exitValue);
+            pmFPAfileFreeSetStrict(false);
         }
-        data->statsFile = NULL;
-        pmConfigRunFilenameAddWrite(data->config, "STATS", data->statsName);
+
+        if (data) {
+            psString dump_file = psMetadataLookupStr(NULL, data->config->arguments, "-dumpconfig");
+            if (dump_file) {
+                if (!pmConfigDump(data->config, dump_file)) {
+                    psError(PPSUB_ERR_IO, false, "Unable to dump configuration.");
+                    exitValue = ppSubExitCode(exitValue);
+                }
+            }
+            psFree(data);
+        }
+
+        psTrace("ppSub", 1, "Finished at %f sec\n", psTimerMark("ppSub"));
+        psTimerStop();
+
+        pmVisualClose(); //close plot windows, if -visual is set
+        pmModelClassCleanup();
+        pmConfigDone();
+        psLibFinalize();
+
+        exitValue = ppSubExitCode(exitValue);
+        exit(exitValue);
     }
-
-    if (data) {
-        psString dump_file = psMetadataLookupStr(NULL, data->config->arguments, "-dumpconfig");
-        if (dump_file) {
-            if (!pmConfigDump(data->config, dump_file)) {
-                psError(PPSUB_ERR_IO, false, "Unable to dump configuration.");
-            }
-        }
-        psFree(data);
-    }
-
-    psExit exitValue = PS_EXIT_SUCCESS;        // Exit value for program
-    psErrorCode errorCode = psErrorCodeLast(); // Error code
-    if (errorCode != PS_ERR_NONE) {
-        psErrorStackPrint(stderr, "Unable to perform subtraction.");
-        switch (errorCode) {
-          case PPSUB_ERR_UNKNOWN:
-          case PS_ERR_UNKNOWN:
-            exitValue = PS_EXIT_UNKNOWN_ERROR;
-            break;
-          case PS_ERR_IO:
-          case PS_ERR_DB_CLIENT:
-          case PS_ERR_DB_SERVER:
-          case PS_ERR_BAD_FITS:
-          case PS_ERR_OS_CALL_FAILED:
-          case PPSUB_ERR_IO:
-            exitValue = PS_EXIT_SYS_ERROR;
-            break;
-          case PS_ERR_BAD_PARAMETER_VALUE:
-          case PS_ERR_BAD_PARAMETER_TYPE:
-          case PS_ERR_BAD_PARAMETER_NULL:
-          case PS_ERR_BAD_PARAMETER_SIZE:
-          case PPSUB_ERR_ARGUMENTS:
-          case PPSUB_ERR_CONFIG:
-            exitValue = PS_EXIT_CONFIG_ERROR;
-            break;
-          case PPSUB_ERR_DATA:
-          case PPSUB_ERR_NO_OVERLAP:
-            exitValue = PS_EXIT_DATA_ERROR;
-            break;
-          case PS_ERR_UNEXPECTED_NULL:
-          case PS_ERR_PROGRAMMING:
-          case PPSUB_ERR_NOT_IMPLEMENTED:
-          case PPSUB_ERR_PROG:
-          default:
-            // It's a programming error if we're not dealing with the error correctly
-            exitValue = PS_EXIT_PROG_ERROR;
-            break;
-        }
-    }
-
-    if (config && !ppSubFilesIterateUp(config, PPSUB_FILES_ALL)) {
-        psErrorStackPrint(stderr, "Unable to close files.");
-    }
-
-    psTrace("ppSub", 1, "Finished at %f sec\n", psTimerMark("ppSub"));
-    psTimerStop();
-
-    pmVisualClose(); //close plot windows, if -visual is set
-    pmModelClassCleanup();
-    pmConfigDone();
-    psLibFinalize();
-
-    exit(exitValue);
 }

branches/eam_branches/20100225/ppSub/src/ppSub.h

@@ -165 +165 @@
 bool ppSubCopyPSF (pmFPAfile *output, pmFPAfile *input, pmFPAview *view);
 
+/// Return appropriate exit code
+psExit ppSubExitCode(psExit exitValue   // Current exit value
+    );
+
 ///@}
 #endif

branches/eam_branches/20100225/ppSub/src/ppSubArguments.c

@@ -141 +141 @@
     if (data->statsName && strlen(data->statsName) > 0) {
         psString resolved = pmConfigConvertFilename(data->statsName, config, true, true); // Resolved filename
+        if (!resolved) {
+            psError(psErrorCodeLast(), false, "Unable to resolve statistics file: %s", data->statsName);
+            return false;
+        }
         data->statsFile = fopen(resolved, "w");
         if (!data->statsFile) {

branches/eam_branches/20100225/ppSub/src/ppSubFiles.c

@@ -183 +183 @@
     }
 
+    psFree(view);
+
+    // Disable writing of data now that we've written things out
+    if (files & PPSUB_FILES_CONV) {
+        pmFPAview *view = ppSubViewReadout(); // View to readout
+        {
+            pmReadout *ro = pmFPAfileThisReadout(config->files, view, "PPSUB.INPUT.CONV");
+            if (ro) {
+                ro->data_exists = ro->parent->data_exists = ro->parent->parent->data_exists = false;
+            }
+        }
+        {
+            pmReadout *ro = pmFPAfileThisReadout(config->files, view, "PPSUB.REF.CONV");
+            if (ro) {
+                ro->data_exists = ro->parent->data_exists = ro->parent->parent->data_exists = false;
+            }
+        }
+        psFree(view);
+    }
+    if (files & PPSUB_FILES_SUB) {
+        pmFPAview *view = ppSubViewReadout(); // View to readout
+        pmReadout *ro = pmFPAfileThisReadout(config->files, view, "PPSUB.OUTPUT");
+        if (ro) {
+            ro->data_exists = ro->parent->data_exists = ro->parent->parent->data_exists = false;
+        }
+        psFree(view);
+    }
+    // Disable writing of data now that we've written things out
+    if (files & PPSUB_FILES_INV) {
+        pmFPAview *view = ppSubViewReadout(); // View to readout
+        pmReadout *ro = pmFPAfileThisReadout(config->files, view, "PPSUB.INVERSE");
+        if (ro) {
+            ro->data_exists = ro->parent->data_exists = ro->parent->parent->data_exists = false;
+        }
+        psFree(view);
+    }
+
     ppSubFilesActivate(config, PPSUB_FILES_ALL, false);
 

branches/eam_branches/20100225/ppSub/src/ppSubMatchPSFs.c

@@ -331 +331 @@
     int threads = psMetadataLookupS32(NULL, config->arguments, "-threads"); // Number of threads
     if (threads > 0) {
-        pmSubtractionThreadsInit(inRO, refRO);
+        pmSubtractionThreadsInit();
     }
 
@@ -340 +340 @@
         psImageCovarianceTruncate(refRO->covariance, COVAR_FRAC);
     }
+
+    // Data doesn't exist until it's created in pmSubtraction...
+    inConv->data_exists = inConv->parent->data_exists = inConv->parent->parent->data_exists = false;
+    refConv->data_exists = refConv->parent->data_exists = refConv->parent->parent->data_exists = false;
 
     // Match the PSFs
@@ -349 +353 @@
     } else {
         success = pmSubtractionMatch(inConv, refConv, inRO, refRO, footprint, stride, regionSize,
-                                     spacing, threshold, detections->allSources, data->stamps, type, size, order,
-                                     widths, orders, inner, ringsOrder, binning, penalty, optimum,
-                                     optWidths, optOrder, optThresh, iter, rej, normFrac,
-                                     sysErr, skyErr, kernelErr, covarFrac, maskVal, maskBad, maskPoor,
-                                     poorFrac, badFrac, subMode);
+                                     spacing, threshold, detections ? detections->allSources : NULL,
+                                     data->stamps, type, size, order, widths, orders, inner, ringsOrder,
+                                     binning, penalty, optimum, optWidths, optOrder, optThresh, iter, rej,
+                                     normFrac, sysErr, skyErr, kernelErr, covarFrac,
+                                     maskVal, maskBad, maskPoor, poorFrac, badFrac, subMode);
     }
 
@@ -376 +380 @@
 
     psFree(optWidths);
-    pmSubtractionThreadsFinalize(inRO, refRO);
+    pmSubtractionThreadsFinalize();
 
     if (!success) {

branches/eam_branches/20100225/ppSub/src/ppSubVarianceRescale.c

@@ -54 +54 @@
     pmReadout *readout = pmFPAfileThisReadout(config->files, view, "PPSUB.OUTPUT"); // Output image
 
+    if (!readout->variance) {
+        // Nothing to renormalise
+        psWarning("Renormalisation of the variance requested, but no variance provided.");
+        return true;
+    }
+
     return pmReadoutVarianceRenormalise(readout, maskBad, num, minValid, maxValid);
 }

@@ -13 +13 @@
 ppSubErrorCodes.c
 ppSubVersionDefinitions.h
+ppSubConvolve