Changeset 33447

Timestamp:

Mar 9, 2012, 7:06:29 AM (14 years ago)

Author:

eugene

Message:

clean up the tiny value stuff, put support functions in libdvo; would benefit from autocoding, esp for BrightCatalog stuff; check on sorted state: fail if not sorted

Location:

branches/eam_branches/ipp-20111122/Ohana/src/relphot

Files:

• include/relphot.h (modified) (2 diffs)
• src/BrightCatalog.c (modified) (3 diffs)
• src/bcatalog.c (modified) (4 diffs)
• src/load_catalogs.c (modified) (1 diff)
• src/reload_catalogs.c (modified) (1 diff)

branches/eam_branches/ipp-20111122/Ohana/src/relphot/include/relphot.h

@@ -306 +306 @@
 int LimitDensityCatalog (Catalog *subcatalog, Catalog *catalog);
 
-int populate_tiny_values (Catalog *catalog);
-int free_tiny_values (Catalog *catalog);
-
 BrightCatalog *BrightCatalogLoad(char *filename);
 int BrightCatalogSave(char *filename, BrightCatalog *catalog);
@@ -318 +315 @@
 int ImageSubsetSave(char *filename, ImageSubset *image, off_t Nimage);
 ImageSubset *ImageSubsetLoad(char *filename, off_t *nimage);
-
-int CopyAverageTiny (AverageTiny *averageT, Average *average);
-int CopyMeasureTiny (MeasureTiny *measureT, Measure *measure);

branches/eam_branches/ipp-20111122/Ohana/src/relphot/src/BrightCatalog.c

@@ -495 +495 @@
     if (!catalog[i].Naverage) continue;
     for (j = 0; j < catalog[i].Naverage; j++) {
-      // CopyAverageTiny (&bcatalog[0].average[Na], &catalog[i].average[j]);
       bcatalog[0].average[Na] = catalog[i].averageT[j];
-      bcatalog[0].average[Na].catID = catalog[i].catID;
       for (k = 0; k < Nsecfilt; k++) {
         bcatalog[0].secfilt[Nsecfilt*Na + k] = catalog[i].secfilt[Nsecfilt*j + k];
@@ -505 +503 @@
     }
     for (j = 0; j < catalog[i].Nmeasure; j++) {
-      // CopyMeasureTiny (&bcatalog[0].measure[Nm], &catalog[i].measure[j]);
-      bcatalog[0].measure[Nm] = catalog[i].measureT[j];
-      bcatalog[0].measure[Nm].catID = catalog[i].catID;
+      CopyMeasureToTiny (&bcatalog[0].measure[Nm], &catalog[i].measure[j]);
       Nm++;
       assert (Nm <= Nmeas);
@@ -609 +605 @@
     assert (Ncat >= 0);
     assert (Ncat < catalogs->NCATALOG);
+
+    catalogs->catalog[Ncat].Nsecfilt = Nsecfilt;
+    catalogs->catalog[Ncat].catID = catID;
 
     catalogs->index[catID] = Ncat;

branches/eam_branches/ipp-20111122/Ohana/src/relphot/src/bcatalog.c

@@ -1 +1 @@
 # include "relphot.h"
-
-extern double drand48();
-
-int CopyAverageTiny (AverageTiny *averageT, Average *average) {
-
-  averageT[0].R             = average[0].R;
-  averageT[0].D             = average[0].D;
-  averageT[0].flags         = average[0].flags;
-  averageT[0].Nmeasure      = average[0].Nmeasure;
-  averageT[0].measureOffset = average[0].measureOffset;
-
-  // make Nmeasure & measureOffset optional?
-
-  return (TRUE);
-}
-
-int CopyMeasureTiny (MeasureTiny *measureT, Measure *measure) {
-
-  measureT[0].dR        = measure[0].dR;
-  measureT[0].dD        = measure[0].dD;
-  measureT[0].M         = measure[0].M;
-  measureT[0].Mcal      = measure[0].Mcal;
-  measureT[0].dM        = measure[0].dM;
-  measureT[0].airmass   = measure[0].airmass;
-  measureT[0].Xccd      = measure[0].Xccd;
-  measureT[0].Yccd      = measure[0].Yccd;
-  measureT[0].t         = measure[0].t;
-  measureT[0].dt        = measure[0].dt;
-  measureT[0].averef    = measure[0].averef;
-  measureT[0].imageID   = measure[0].imageID;
-  measureT[0].dbFlags   = measure[0].dbFlags;
-  measureT[0].photFlags = measure[0].photFlags;
-  measureT[0].photcode  = measure[0].photcode;
-
-  return (TRUE);
-}
 
 int bcatalog (Catalog *subcatalog, Catalog *catalog) {
@@ -75 +39 @@
 
     /* start with all stars good */
-    CopyAverageTiny (&subcatalog[0].averageT[Naverage], &catalog[0].average[i]);
+    CopyAverageToTiny (&subcatalog[0].averageT[Naverage], &catalog[0].average[i]);
     subcatalog[0].averageT[Naverage].measureOffset = Nmeasure;
 
@@ -159 +123 @@
       }
 
-      CopyMeasureTiny (&subcatalog[0].measureT[Nmeasure], &catalog[0].measure[offset]);
+      CopyMeasureToTiny (&subcatalog[0].measureT[Nmeasure], &catalog[0].measure[offset]);
       subcatalog[0].measureT[Nmeasure].dbFlags &= ~ID_MEAS_SKIP_PHOTOM;
       subcatalog[0].measureT[Nmeasure].averef = Naverage;
@@ -312 +276 @@
   return (TRUE);
 }
-
-// for the cases where we are not using a subset of the data, we still need to have a copy of these fields
-int populate_tiny_values (Catalog *catalog) {
-
-  off_t i;
-
-  AverageTiny *averageT;
-  Average *average;
-
-  MeasureTiny *measureT;
-  Measure *measure;
-
-  ALLOCATE (catalog[0].measureT, MeasureTiny, catalog[0].Nmeasure);
-  ALLOCATE (catalog[0].averageT, AverageTiny, catalog[0].Naverage);
-
-  average  = catalog[0].average;
-  averageT = catalog[0].averageT;
-
-  measure  = catalog[0].measure;
-  measureT = catalog[0].measureT;
-
-  for (i = 0; i < catalog[0].Naverage; i++) {
-    // CopyAverageTiny (&catalog[0].averageT[i], &catalog[0].average[i]);
-    averageT[i].R             = average[i].R;
-    averageT[i].D             = average[i].D;
-    averageT[i].flags         = average[i].flags;
-    averageT[i].Nmeasure      = average[i].Nmeasure;
-    averageT[i].measureOffset = average[i].measureOffset;
-  }
-
-  for (i = 0; i < catalog[0].Nmeasure; i++) {
-    // CopyMeasureTiny (&catalog[0].measureT[i], &catalog[0].measure[i]);
-    measureT[i].dR        = measure[i].dR;
-    measureT[i].dD        = measure[i].dD;
-    measureT[i].M         = measure[i].M;
-    measureT[i].Mcal      = measure[i].Mcal;
-    measureT[i].dM        = measure[i].dM;
-    measureT[i].airmass   = measure[i].airmass;
-    measureT[i].Xccd      = measure[i].Xccd;
-    measureT[i].Yccd      = measure[i].Yccd;
-    measureT[i].t         = measure[i].t;
-    measureT[i].dt        = measure[i].dt;
-    measureT[i].averef    = measure[i].averef;
-    measureT[i].imageID   = measure[i].imageID;
-    measureT[i].dbFlags   = measure[i].dbFlags;
-    measureT[i].photFlags = measure[i].photFlags;
-    measureT[i].photcode  = measure[i].photcode;
-  }
-
-  return (TRUE);
-}
-
-int free_tiny_values (Catalog *catalog) {
-
-  if (catalog[0].averageT) free (catalog[0].averageT);
-  if (catalog[0].measureT) free (catalog[0].measureT);
-  return (TRUE);
-}
-

branches/eam_branches/ipp-20111122/Ohana/src/relphot/src/load_catalogs.c

@@ -56 +56 @@
         dvo_catalog_free (&tcatalog);
         continue;
+    }
+
+    if (!tcatalog.sorted) {
+      fprintf (stderr, "this database is not sorted.  please sort using addstar -resort\n");
+      exit (1);
     }
 

branches/eam_branches/ipp-20111122/Ohana/src/relphot/src/reload_catalogs.c

@@ -71 +71 @@
     TIMESTAMP(time2);
 
-    populate_tiny_values(&catalog);
+    populate_tiny_values(&catalog, DVO_TV_MEASURE | DVO_TV_AVERAGE);
     TIMESTAMP(time3a);