Changeset 37978

Timestamp:

Mar 13, 2015, 1:20:49 PM (11 years ago)

Author:

eugene

Message:

free pthreads; initialize StarData; do not access BrightStar data after freeing

Location:

branches/eam_branches/ipp-20150112/Ohana/src/relastro/src

Files:

• BrightCatalog.c (modified) (2 diffs)
• ImageOps.c (modified) (1 diff)
• UpdateChips.c (modified) (1 diff)
• load_catalogs.c (modified) (2 diffs)

branches/eam_branches/ipp-20150112/Ohana/src/relastro/src/BrightCatalog.c

@@ -91 +91 @@
     ALLOCATE (measure, MeasureTiny, Nrow);
     for (i = 0; i < Nrow; i++) {
+      memset (&measure[i], 0, sizeof(MeasureTiny));
       measure[i].R         = R[i];
       measure[i].D         = D[i];
@@ -111 +112 @@
       measure[i].catID     = catID[i];
       measure[i].photcode  = photcode[i];
+      measure[i].dXccd     = 0.0;
+      measure[i].dYccd     = 0.0;
+      measure[i].dRsys     = 0.0;
+      measure[i].myDet     = 0;
     }
     // fprintf (stderr, "loaded data for %lld measures\n", (long long) Nrow);

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

@@ -763 +763 @@
     ref[i].dMag = measure[0].dM;
     ref[i].dPos = GetAstromErrorTiny (&measure[0], ERROR_MODE_POS);
+    ref[i].ColorBlue = NAN;
+    ref[i].ColorRed = NAN;
 
     if ((DCR_BLUE_NSEC_POS >= 0) && (DCR_BLUE_NSEC_NEG >= -1)) {

branches/eam_branches/ipp-20150112/Ohana/src/relastro/src/UpdateChips.c

@@ -223 +223 @@
 
   // all threads are done, free the threads array and grab the info
+  for (i = 0; i < NTHREADS; i++) {
+    pthread_detach (threads[i]);
+  }
   free (threads);
   

branches/eam_branches/ipp-20150112/Ohana/src/relastro/src/load_catalogs.c

@@ -271 +271 @@
   Catalog *catalog = catalogs->catalog;
   *Ncatalog = catalogs->Ncatalog;
-  BrightCatalogSplitFree (catalogs);
 
   int Nmeasure = 0;
@@ -279 +278 @@
     Naverage += catalogs->catalog[i].Naverage;
   }
-
   fprintf (stderr, "loaded %d catalogs, using a total of %d stars (%d measures)\n", catalogs->Ncatalog, Naverage, Nmeasure);
   client_logger_message ("loaded %d catalogs, using a total of %d stars (%d measures)\n", catalogs->Ncatalog, Naverage, Nmeasure);
 
+  BrightCatalogSplitFree (catalogs);
+
   return (catalog);
 }