Changeset 38616

Timestamp:

Jul 22, 2015, 11:38:27 AM (11 years ago)

Author:

eugene

Message:

report number of bad objIDs, etc; check if detection is mis-located; mute ohana_memcheck a bit

Location:

branches/eam_branches/ipp-20150625/Ohana/src

Files:

• addstar/Makefile (modified) (1 diff)
• addstar/src/loadgalphot_readstars.c (modified) (1 diff)
• dvomerge/src/dvoverify.c (modified) (1 diff)
• dvomerge/src/dvoverify_args.c (modified) (1 diff)
• dvomerge/src/dvoverify_utils.c (modified) (1 diff)
• libohana/src/ohana_allocate.c (modified) (6 diffs)
• opihi/pantasks (modified) (1 prop)
• relastro/Makefile (modified) (1 diff)

branches/eam_branches/ipp-20150625/Ohana/src/addstar/Makefile

@@ -39 +39 @@
 # programs in 'SERVER' use the client-server concept and are out of date
 
-INSTALL = addstar sedstar loadgalphot loadstarpar loadstarpar_client loadICRF loadICRF_client load2mass loadwise loadtycho loadsupercos skycells mkcmf dumpskycells findskycell
+INSTALL = addstar sedstar loadstarpar loadstarpar_client loadICRF loadICRF_client load2mass loadwise loadtycho loadsupercos skycells mkcmf dumpskycells findskycell
 SERVER  = addstar_client addstarc addstard addstart
 

branches/eam_branches/ipp-20150625/Ohana/src/addstar/src/loadgalphot_readstars.c

@@ -231 +231 @@
     stars[i].galphot.modelType = MODEL_TYPE_gal[i];
     stars[i].galphot.detID     = ID_gal[i];
-    stars[i].galphot.phtocode  = options->photcode;
+    stars[i].galphot.photcode  = options->photcode;
 
     // I have a grid of measurements with (Flux, dFlux, Chisq) at each point

branches/eam_branches/ipp-20150625/Ohana/src/dvomerge/src/dvoverify.c

@@ -78 +78 @@
   SkyListFree (skylist);
 
-  ohana_memcheck (TRUE);
-  ohana_memdump (TRUE);
+  ohana_memcheck (VERBOSE);
+  ohana_memdump (VERBOSE);
   exit (0);
 }

branches/eam_branches/ipp-20150625/Ohana/src/dvomerge/src/dvoverify_args.c

@@ -50 +50 @@
     free (filename);
 
-    ohana_memcheck (TRUE);
-    ohana_memdump (TRUE);
+    ohana_memcheck (VERBOSE);
+    ohana_memdump (VERBOSE);
 
     if (!isGood) exit (1);

branches/eam_branches/ipp-20150625/Ohana/src/dvomerge/src/dvoverify_utils.c

@@ -312 +312 @@
   // check measure <-> average links
   {
-    int objIDsOK = TRUE;
-    int catIDsOK = TRUE;
-    int averefOK = TRUE;
+    int NobjIDsBAD = 0;
+    int NcatIDsBAD = 0;
+    int NaverefBAD = 0;
 
     for (i = 0; i < catalog.Naverage; i++) {
       m = catalog.average[i].measureOffset;
       for (j = 0; j < catalog.average[i].Nmeasure; j++) {
-        objIDsOK &= (catalog.average[i].objID == catalog.measure[m+j].objID);
-        catIDsOK &= (catalog.average[i].catID == catalog.measure[m+j].catID);
-        averefOK &= (catalog.measure[m+j].averef == i);
+        if (catalog.average[i].objID != catalog.measure[m+j].objID) {
+          NobjIDsBAD ++;
+
+          // check if objID matches R,D
+          int iTest = catalog.measure[m+j].objID;
+          if (catalog.average[iTest].objID == iTest) {
+            double dR = 3600.0*(catalog.average[iTest].R - catalog.measure[m+j].R) * cos (RAD_DEG*catalog.measure[m+j].D);
+            double dD = 3600.0*(catalog.average[iTest].D - catalog.measure[m+j].D);
+            double dRad = hypot (dR, dD);
+            fprintf (stderr, "matches ave %d = %d, %f, %f = %f\n", iTest, catalog.measure[m+j].objID, dR, dD, dRad);
+          } else {
+            fprintf (stderr, "cannot find averef\n");
+          }
+        }
+        if (catalog.average[i].catID != catalog.measure[m+j].catID) {
+          NcatIDsBAD ++;
+        }
+        if (catalog.measure[m+j].averef != i) {
+          NaverefBAD ++;
+        }
       }
     }
     
-    if (!objIDsOK) {
-      fprintf (stderr, "ERROR: catalog %s has invalid obj IDs\n", catalog.filename);
-      status = FALSE;
-    }
-    if (!catIDsOK) {
-      fprintf (stderr, "ERROR: catalog %s has invalid cat IDs\n", catalog.filename);
-      status = FALSE;
-    }
-    if (!averefOK) {
-      fprintf (stderr, "ERROR: catalog %s has invalid averef values\n", catalog.filename);
+    if (NobjIDsBAD) {
+      fprintf (stderr, "ERROR: catalog %s has %d invalid obj IDs\n", catalog.filename, NobjIDsBAD);
+      status = FALSE;
+    }
+    if (NcatIDsBAD) {
+      fprintf (stderr, "ERROR: catalog %s has %d invalid cat IDs\n", catalog.filename, NcatIDsBAD);
+      status = FALSE;
+    }
+    if (NaverefBAD) {
+      fprintf (stderr, "ERROR: catalog %s has %d invalid averef values\n", catalog.filename, NaverefBAD);
       status = FALSE;
     }

branches/eam_branches/ipp-20150625/Ohana/src/libohana/src/ohana_allocate.c

@@ -265 +265 @@
 }
 
-int ohana_memcheck_func (int allmemory) {
+int ohana_memcheck_func (int VERBOSE) {
 
   if (!lastBlock) {
-    fprintf (stderr, "no memory allocated\n");
+    if (VERBOSE) fprintf (stderr, "no memory allocated\n");
   }
 
@@ -308 +308 @@
     thisBlock = thisBlock->prevBlock;
   }
-  fprintf (stderr, "%zd memory blocks allocated (%zd bytes total), %zd good, %zd bad\n", Ntotal, Nbytes, Ngood, Nbad);
+
+  if (Ntotal || VERBOSE) {
+    fprintf (stderr, "%zd memory blocks allocated (%zd bytes total), %zd good, %zd bad\n", Ntotal, Nbytes, Ngood, Nbad);
+  }
+
   if (Nbad) status = FALSE;
 
@@ -356 +360 @@
     thisBlock = thisBlock->prevBlock;
   }
-  fprintf (stderr, "%zd memory blocks freed     (%zd bytes total), %zd good, %zd bad\n", Ntotal_free, Nbytes_free, Ngood_free, Nbad_free);
+
+  if (Ntotal_free || VERBOSE) {
+    fprintf (stderr, "%zd memory blocks freed     (%zd bytes total), %zd good, %zd bad\n", Ntotal_free, Nbytes_free, Ngood_free, Nbad_free);
+  }
+
   if (Nbad_free) status = FALSE;
 
@@ -405 +413 @@
     thisBlock = thisBlock->prevBlock;
   }
-  fprintf (stderr, "%zd memory blocks dropped   (%zd bytes total), %zd good, %zd bad\n", Ntotal_drop, Nbytes_drop, Ngood_drop, Nbad_drop);
+
+  if (Ntotal_drop || VERBOSE) {
+    fprintf (stderr, "%zd memory blocks dropped   (%zd bytes total), %zd good, %zd bad\n", Ntotal_drop, Nbytes_drop, Ngood_drop, Nbad_drop);
+  }
+
   if (Nbad_drop) status = FALSE;
 # endif
@@ -412 +424 @@
 }
 
-void ohana_memdump_func (int allmemory) {
+void ohana_memdump_func (int VERBOSE) {
 
   if (!lastBlock) {
-    fprintf (stderr, "no memory allocated\n");
+    if (VERBOSE) fprintf (stderr, "no memory allocated\n");
     return;
   }
@@ -452 +464 @@
     thisBlock = thisBlock->prevBlock;
   }
-  fprintf (stderr, "%zd memory blocks allocated (%zd bytes total)\n", Ntotal, Nbytes);
+
+  if (Ntotal || VERBOSE) {
+    fprintf (stderr, "%zd memory blocks allocated (%zd bytes total)\n", Ntotal, Nbytes);
+  }
 
   return;

branches/eam_branches/ipp-20150625/Ohana/src/relastro/Makefile

@@ -20 +20 @@
 relastro_client: $(BIN)/relastro_client.$(ARCH)
 
-install: $(DESTBIN)/relastro $(DESTBIN)/relastro_client $(DESTBIN)/testparallax
+install: $(DESTBIN)/relastro $(DESTBIN)/relastro_client 
+
+# $(DESTBIN)/testparallax
 
 RELASTRO = \