Changeset 35497 for trunk/pstamp

Timestamp:

May 3, 2013, 9:47:09 AM (13 years ago)

Author:

bills

Message:

fix a few really silly bugs with extracting sources from cmf file

Location:

trunk/pstamp

Files:

• scripts/pstamp_job_run.pl (modified) (1 diff)
• src/ppstampMakeStamp.c (modified) (2 diffs)
• src/ppstampParseCamera.c (modified) (1 diff)

trunk/pstamp/scripts/pstamp_job_run.pl

@@ -151 +151 @@
         } elsif ($params->{cmf}) {
             $argString .= " -write_cmf";
+            $fileArgs  .= " -sources $params->{cmf}";
             push @file_list, $params->{cmf};
         } else {

trunk/pstamp/src/ppstampMakeStamp.c

@@ -359 +359 @@
 
         if (options->writeCMF) {
-            pmReadout *astromReadout = NULL;
+            pmReadout *sourcesReadout = NULL;
             if (astrom->fpa != input->fpa) {
-                astromReadout = pmFPAviewThisReadout(srcView, astrom->fpa);
-            }
-            if (!copySources(outReadout, astromReadout, astromReadout, extractRegion)) {
+                sourcesReadout = pmFPAviewThisReadout(srcView, astrom->fpa);
+            } else {
+                sourcesReadout = readout;
+            }
+            if (!copySources(outReadout, sourcesReadout, sourcesReadout, extractRegion)) {
                 psError(PS_ERR_UNKNOWN, false, "failed to extract sources from region of interest.\n");
                 status = false;
@@ -784 +786 @@
 
     // first look for detections in the input readout. Those would have come from the -sources file
+    if (!inReadout->analysis) {
+        psLogMsg("ppstampMakeStamp", PS_LOG_WARN, "no analysis metadata found on input\n");
+        return false;
+    }
     pmDetections *inDetections = psMetadataLookupPtr (&status, inReadout->analysis, "PSPHOT.DETECTIONS");
     if (!inDetections) {

trunk/pstamp/src/ppstampParseCamera.c

@@ -119 +119 @@
         // see if -sources file was supplied. 
         // If so define the file.
-        psPtr sourcesFile = psMetadataLookupStr(&status, config->arguments, "SOURCES");
+        psPtr sourcesFile = psMetadataLookupPtr(&status, config->arguments, "SOURCES");
         if (sourcesFile) {
             pmFPAfile *sources = pmFPAfileBindFromArgs(&status, input, config, "PPSTAMP.INPUT.SOURCES", "SOURCES");