Changeset 40354

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.

Location:

trunk/pswarp/src

Files:

• pswarpLoop.c (modified) (1 diff)
• pswarpLoopBackground.c (modified) (1 diff)
• pswarpUpdateMetadata.c (modified) (2 diffs)

trunk/pswarp/src/pswarpLoop.c

@@ -124 +124 @@
 
                         // Determine the reference catalog used
-                        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);
+                            }
+                          }
                         }
-
                         
                     }

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);
+                          }
+                        }
                       }
                     }

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);
+      }
     }