Changeset 40552

Timestamp:

Oct 20, 2018, 9:10:12 PM (8 years ago)

Author:

eugene

Message:

initialize some values which make the optimizer complain

Location:

trunk/psastro/src

Files:

• psastroLoadGhosts.c (modified) (2 diffs)
• psastroLoadGlints.c (modified) (1 diff)

trunk/psastro/src/psastroLoadGhosts.c

@@ -278 +278 @@
   float zeropt, exptime, MAX_MAG;
   psMetadata *ghostModel = NULL;
-  psVector *C_terms;
-  psVector *R_terms;
-  float glintPixelScale;
+  psVector *C_terms = NULL;
+  psVector *R_terms = NULL;
+  float glintPixelScale = 0.0;
   
   psLogMsg ("psastro", PS_LOG_INFO, "determine ghost positions");
@@ -341 +341 @@
     R_terms = psMetadataLookupPtr(&status, refItem->data.md, "R_TERMS");
     glintPixelScale = psMetadataLookupF32(&status, refItem->data.md, "SCALE");
+  }
+
+  // really error-out here?  or just skip?
+  if (!R_terms) {
+    psLogMsg ("psastro", PS_LOG_INFO, "failed to find HSC ghost model for filter %s", filter);
+    goto escape;
   }
   

trunk/psastro/src/psastroLoadGlints.c

@@ -313 +313 @@
                       //                      star->FP->x,star->FP->y,star->Mag);
                       star->TP->x,star->TP->y,star->Mag);
-              psVector *C_terms;
-              psVector *R_terms;
+              psVector *C_terms = NULL;
+              psVector *R_terms = NULL;
               double scale_factor = 1.0;