Changeset 40354 for trunk/pswarp/src/pswarpLoopBackground.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/pswarpLoopBackground.c (modified) (1 diff)

trunk/pswarp/src/pswarpLoopBackground.c

@@ -137 +137 @@
                     if (astrom != input) {
                       pmReadout *astromRO = pmFPAviewThisReadout(view, astrom->fpa); // Readout for astrometry
-                      if (!refcat) {
-                        refcat = psMetadataLookupStr(NULL, astromRO->parent->parent->hdu->header, "PSREFCAT");
-
-                        psMetadataAddStr(output->fpa->analysis, PS_LIST_TAIL, "REFERENCE_CATALOG", PS_META_REPLACE, "Reference catalog used for calibration.", refcat);
+                      if ((!refcat)&&(astromRO)) {
+                        if ((astromRO->parent->parent->hdu->header)&&(output->fpa->analysis)) {
+                          psMetadataItem *refItem = psMetadataLookup(astromRO->parent->parent->hdu->header, "PSREFCAT");
+                          if (refItem) {
+                            refcat = psMetadataLookupStr(NULL, astromRO->parent->parent->hdu->header, "PSREFCAT");
+                            psMetadataAddStr(output->fpa->analysis, PS_LIST_TAIL, "REFERENCE_CATALOG", PS_META_REPLACE,
+                                             "Reference catalog used for calibration.", refcat);
+                          }
+                        }
                       }
                     }