Changeset 40354 for trunk/pswarp/src/pswarpUpdateMetadata.c

Timestamp:

Mar 5, 2018, 4:17:43 PM (8 years ago)

Author:

watersc1

Message:

Be more aggressive at checking parameters for the PSREFCAT field, as dependent code isn't run when quality != 0 and the warping process is being aborted.

File:

• trunk/pswarp/src/pswarpUpdateMetadata.c (modified) (2 diffs)

trunk/pswarp/src/pswarpUpdateMetadata.c

@@ -20 +20 @@
     bool bilevelAstrometry = psMetadataLookupBool (NULL, skycell->analysis, "ASTROMETRY.BILEVEL");
 
-    psString refcat = psMetadataLookupStr (NULL, output->analysis, "REFERENCE_CATALOG");
+    psString refcat = NULL;
+
+    if ((output)&&(output->analysis)) {    
+      psMetadataItem *refItem = psMetadataLookup(output->analysis, "REFERENCE_CATALOG");
+      if (refItem) {
+        refcat = psMetadataLookupStr (NULL, output->analysis, "REFERENCE_CATALOG");
+      }
+    }
     pmChip *chip;
     while ((chip = pmFPAviewNextChip (view, output, 1)) != NULL) {
@@ -167 +174 @@
 
     if (refcat) {
-      psMetadataAddStr(output->hdu->header, PS_LIST_TAIL, "PSREFCAT", PS_META_REPLACE, "Reference catalog used for calibration", refcat);
+      if ((output)&&(output->hdu)&&(output->hdu->header)) {
+        psMetadataAddStr(output->hdu->header, PS_LIST_TAIL, "PSREFCAT", PS_META_REPLACE,
+                         "Reference catalog used for calibration", refcat);
+      }
     }