Changeset 41396 for trunk/pswarp/src/pswarpLoop.c

Timestamp:

Aug 10, 2020, 3:39:50 PM (6 years ago)

Author:

eugene

Message:

fix segfault if inputs are not at chip level (e.g. simtest)

File:

• trunk/pswarp/src/pswarpLoop.c (modified) (1 diff)

trunk/pswarp/src/pswarpLoop.c

@@ -123 +123 @@
                         }
 
-                        // Determine the reference catalog used
-                        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);
+                        // Determine the reference catalog used for the astrometry
+                        if (!refcat && astromRO) {
+
+                            // find the HDU for this readout
+                            pmHDU *hdu = pmHDUFromReadout (astromRO);
+                            if (! hdu) {
+                                psWarning ("unable to find HDU for astrometry source, cannot save PSREFCAT");
+                            } 
+                            if (!output->fpa->analysis) {
+                                psWarning ("analysis metadata not defined for output, cannot save PSREFCAT");
                             }
-                          }
+
+                            psMetadataItem *refItem = psMetadataLookup(hdu->header, "PSREFCAT");
+                            if (!refItem) {
+                                psWarning ("PSREFCAT not found in astrometry HDU, cannot save PSREFCAT");
+                            }
+
+                            if (refItem && hdu && output->fpa->analysis) {
+                                refcat = psMetadataLookupStr(NULL, hdu->header, "PSREFCAT");
+                                psMetadataAddStr(output->fpa->analysis, PS_LIST_TAIL, "REFERENCE_CATALOG", PS_META_REPLACE,
+                                                 "Reference catalog used for calibration.", refcat);
+                            }
                         }
-                        
                     }