Changeset 36813

Timestamp:

Jun 4, 2014, 12:16:40 PM (12 years ago)

Author:

eugene

Message:

fix problem with image ID map for dvomerge if input catalog has no images; fix problem with bad photcodes causing segfaults in relastro

Location:

branches/eam_branches/ipp-20140423/Ohana/src

Files:

• dvomerge/src/dvo_image_merge_dbs.c (modified) (1 diff)
• dvomerge/src/dvomergeImageIDs.c (modified) (2 diffs)
• relastro/include/relastro.h (modified) (1 diff)
• relastro/src/GetAstromError.c (modified) (2 diffs)
• relastro/src/ImageOps.c (modified) (4 diffs)
• relastro/src/UpdateObjects.c (modified) (3 diffs)
• relastro/src/relastro_objects.c (modified) (1 diff)

branches/eam_branches/ipp-20140423/Ohana/src/dvomerge/src/dvo_image_merge_dbs.c

@@ -168 +168 @@
 
   if (!IDmap->old) {
+    fprintf (stderr, "input database has image IDs, but no Image table\n");
+    return FALSE;
+  }
+
+  if (!IDmap->Nmap) {
     fprintf (stderr, "input database has image IDs, but no Image table\n");
     return FALSE;

branches/eam_branches/ipp-20140423/Ohana/src/dvomerge/src/dvomergeImageIDs.c

@@ -18 +18 @@
   if (inDB.dbstate == LCK_EMPTY) {
     dvo_image_unlock (&inDB); // unlock input
+    IDmap->old = NULL;
+    IDmap->new = NULL;
     IDmap->Nmap = 0;
     return TRUE;
@@ -99 +101 @@
   if (inDB.dbstate == LCK_EMPTY) {
     dvo_image_unlock (&inDB); // unlock input
+    IDmap->old = NULL;
+    IDmap->new = NULL;
     IDmap->Nmap = 0;
     return TRUE;

branches/eam_branches/ipp-20140423/Ohana/src/relastro/include/relastro.h

@@ -535 +535 @@
 
 int strextend (char *input, char *format,...);
+
+int areImagesLoaded ();
+int areImagesMatched ();

branches/eam_branches/ipp-20140423/Ohana/src/relastro/src/GetAstromError.c

@@ -30 +30 @@
 
   code  = GetPhotcodebyCode (measure[0].photcode);
+  if (!code) return NAN;
 
   // do not raise an exception, just send back the result
@@ -72 +73 @@
 
   code  = GetPhotcodebyCode (measure[0].photcode);
+  if (!code) return NAN;
 
   // do not raise an exception, just send back the result

branches/eam_branches/ipp-20140423/Ohana/src/relastro/src/ImageOps.c

@@ -39 +39 @@
 // N_onImage was 'Nlist'
 // N_ONIMAGE was 'NLIST'
+
+int areImagesLoaded () {
+
+  if (image) return TRUE;
+  return FALSE;
+}
+
+int areImagesMatched () {
+
+  if (MeasureToImage) return TRUE;
+  return FALSE;
+}
 
 Image *getimages (off_t *N, off_t **line_number) {
@@ -574 +586 @@
 
   int Noff = NoffRAave + NoffDECave + NoffRAori + NoffDECori;
-  if (VERBOSE && (Noff > 0)) fprintf (stderr, "Noff ave RA %d, Noff ave DEC %d, Noff ori RA %d, Noff ori DEC %d\n", NoffRAave, NoffDECave, NoffRAori, NoffDECori);
+  if (VERBOSE2 && (Noff > 0)) fprintf (stderr, "Noff ave RA %d, Noff ave DEC %d, Noff ori RA %d, Noff ori DEC %d\n", NoffRAave, NoffDECave, NoffRAori, NoffDECori);
   saveOffsets (dPos, nPos, im);
 
@@ -1095 +1107 @@
     } else {
       code = GetPhotcodebyCode (measure[0].photcode);
+      if (!code) return FALSE;
       mask = code[0].astromBadMask;
     }
@@ -1161 +1174 @@
     } else {
       code = GetPhotcodebyCode (measure[0].photcode);
+      if (!code) return FALSE;
       mask = code[0].astromBadMask;
     }

branches/eam_branches/ipp-20140423/Ohana/src/relastro/src/UpdateObjects.c

@@ -80 +80 @@
   memset (&fitPAR, 0, sizeof(fitPAR));
   initObjectData (catalog, Ncatalog);
+
+  int setRefColor = areImagesMatched();
 
   /* project coordinates to a plane centered on the object with units of arcsec */
@@ -228 +230 @@
         dD[N] = dY[N] / 3600.0;
 
-        float color = getColor (m+k, i);
-        if (!isnan(color)) {
-          C[Nc] = color;
-          Nc++;
+        if (setRefColor) {
+          float color = getColor (m+k, i);
+          if (!isnan(color)) {
+            C[Nc] = color;
+            Nc++;
+          }
         }
 
@@ -354 +358 @@
       }
 
-      dsort (C, Nc);
-      float colorMedian = (Nc > 0) ? C[(int)(0.5*Nc)] : NAN;
-      catalog[i].average[j].refColor = colorMedian;
+      if (setRefColor) {
+        dsort (C, Nc);
+        float colorMedian = (Nc > 0) ? C[(int)(0.5*Nc)] : NAN;
+        catalog[i].average[j].refColor = colorMedian;
+      }
 
       /* choose the result based on the chisq values */

branches/eam_branches/ipp-20140423/Ohana/src/relastro/src/relastro_objects.c

@@ -40 +40 @@
     snprintf (hostfile, 1024, "%s/%s.cpt", hostpath, skylist[0].regions[i]->name);
     catalog.filename  = hostID ? hostfile : skylist[0].filename[i];
+
+    // set up the basic catalog info
     catalog.catformat = dvo_catalog_catformat (CATFORMAT);    // set the default catformat from config data
     catalog.catmode   = dvo_catalog_catmode (CATMODE);        // set the default catmode from config data