Changeset 13884 for trunk/Ohana/src/libdvo/src/dvo_catalog_raw.c

Timestamp:

Jun 19, 2007, 2:02:52 PM (19 years ago)

Author:

eugene

Message:

adding the PANSTARRS-DEV-1 format

File:

• trunk/Ohana/src/libdvo/src/dvo_catalog_raw.c (modified) (8 diffs)

trunk/Ohana/src/libdvo/src/dvo_catalog_raw.c

@@ -73 +73 @@
       SecFiltSize = sizeof(SecFiltPanstarrs_DEV_0);
       break;
+    case DVO_FORMAT_PANSTARRS_DEV_1:
+      AverageSize = sizeof(AveragePanstarrs_DEV_1);
+      MeasureSize = sizeof(MeasurePanstarrs_DEV_1);
+      SecFiltSize = sizeof(SecFiltPanstarrs_DEV_1);
+      break;
 # if 0
     case DVO_FORMAT_PANSTARRS:
@@ -262 +267 @@
   if (catalog[0].catformat == DVO_FORMAT_ELIXIR)    gfits_modify (&catalog[0].header, "FORMAT", "%s", 1, "ELIXIR");
   if (catalog[0].catformat == DVO_FORMAT_PANSTARRS_DEV_0) gfits_modify (&catalog[0].header, "FORMAT", "%s", 1, "PANSTARRS_DEV_0");
+  if (catalog[0].catformat == DVO_FORMAT_PANSTARRS_DEV_1) gfits_modify (&catalog[0].header, "FORMAT", "%s", 1, "PANSTARRS_DEV_1");
   // if (catalog[0].catformat == DVO_FORMAT_PANSTARRS) gfits_modify (&catalog[0].header, "FORMAT", "%s", 1, "PANSTARRS");
   // if (catalog[0].catformat == DVO_FORMAT_PMTEST)    gfits_modify (&catalog[0].header, "FORMAT", "%s", 1, "PMTEST");
@@ -371 +377 @@
       free (tmpAverage);
       break; }
+    case DVO_FORMAT_PANSTARRS_DEV_1: {
+      AveragePanstarrs_DEV_1 *tmpAverage;
+      ALLOCATE (tmpAverage, AveragePanstarrs_DEV_1, MAX (Naverage, 1));
+      nitems = fread (tmpAverage, sizeof(AveragePanstarrs_DEV_1), Naverage, f);
+      if (nitems != Naverage) {
+        fprintf (stderr, "failed to read averages (%d vs %d)\n", nitems, Naverage);
+        return (NULL);
+      }
+      gfits_convert_AveragePanstarrs_DEV_1 (tmpAverage, sizeof(AveragePanstarrs_DEV_1), Naverage);
+      average = AveragePanstarrs_DEV_1_ToInternal (tmpAverage, Naverage);
+      free (tmpAverage);
+      break; }
 # if 0
     case DVO_FORMAT_PANSTARRS: {
@@ -446 +464 @@
       gfits_convert_AveragePanstarrs_DEV_0 (tmpAverage, sizeof(AveragePanstarrs_DEV_0), Naverage);
       nitems = fwrite (tmpAverage, sizeof(AveragePanstarrs_DEV_0), Naverage, f);
+      free (tmpAverage);
+      if (nitems != Naverage) {
+        fprintf (stderr, "failed to write averages (%d vs %d)\n", nitems, Naverage);
+        return (FALSE);
+      }
+      break; }
+    case DVO_FORMAT_PANSTARRS_DEV_1: {
+      AveragePanstarrs_DEV_1 *tmpAverage;
+      tmpAverage = AverageInternalToPanstarrs_DEV_1 (average, Naverage);
+      gfits_convert_AveragePanstarrs_DEV_1 (tmpAverage, sizeof(AveragePanstarrs_DEV_1), Naverage);
+      nitems = fwrite (tmpAverage, sizeof(AveragePanstarrs_DEV_1), Naverage, f);
       free (tmpAverage);
       if (nitems != Naverage) {
@@ -536 +565 @@
       free (tmpMeasure);
       break; }
+    case DVO_FORMAT_PANSTARRS_DEV_1: {
+      MeasurePanstarrs_DEV_1 *tmpMeasure;
+      ALLOCATE (tmpMeasure, MeasurePanstarrs_DEV_1, MAX (Nmeasure, 1));
+      nitems = fread (tmpMeasure, sizeof(MeasurePanstarrs_DEV_1), Nmeasure, f);
+      if (nitems != Nmeasure) {
+        fprintf (stderr, "failed to read measures (%d vs %d)\n", nitems, Nmeasure);
+        return (NULL);
+      }
+      gfits_convert_MeasurePanstarrs_DEV_1 (tmpMeasure, sizeof(MeasurePanstarrs_DEV_1), Nmeasure);
+      measure = MeasurePanstarrs_DEV_1_ToInternal (tmpMeasure, Nmeasure);
+      free (tmpMeasure);
+      break; }
 # if 0
     case DVO_FORMAT_PANSTARRS: {
@@ -599 +640 @@
       gfits_convert_MeasurePanstarrs_DEV_0 (tmpMeasure, sizeof(MeasurePanstarrs_DEV_0), Nmeasure);
       nitems = fwrite (tmpMeasure, sizeof(MeasurePanstarrs_DEV_0), Nmeasure, f);
+      free (tmpMeasure);
+      if (nitems != Nmeasure) {
+        fprintf (stderr, "failed to write measures (%d vs %d)\n", nitems, Nmeasure);
+        return (FALSE);
+      }
+      break; }
+    case DVO_FORMAT_PANSTARRS_DEV_1: {
+      MeasurePanstarrs_DEV_1 *tmpMeasure;
+      tmpMeasure = MeasureInternalToPanstarrs_DEV_1 (measure, Nmeasure);
+      gfits_convert_MeasurePanstarrs_DEV_1 (tmpMeasure, sizeof(MeasurePanstarrs_DEV_1), Nmeasure);
+      nitems = fwrite (tmpMeasure, sizeof(MeasurePanstarrs_DEV_1), Nmeasure, f);
       free (tmpMeasure);
       if (nitems != Nmeasure) {
@@ -678 +730 @@
       free (tmpSecFilt);
       break; }
+    case DVO_FORMAT_PANSTARRS_DEV_1: {
+      SecFiltPanstarrs_DEV_1 *tmpSecFilt;
+      ALLOCATE (tmpSecFilt, SecFiltPanstarrs_DEV_1, MAX (Nsecfilt, 1));
+      nitems = fread (tmpSecFilt, sizeof(SecFiltPanstarrs_DEV_1), Nsecfilt, f);
+      if (nitems != Nsecfilt) {
+        fprintf (stderr, "failed to read secfilts (%d vs %d)\n", nitems, Nsecfilt);
+        return (NULL);
+      }
+      gfits_convert_SecFiltPanstarrs_DEV_1 (tmpSecFilt, sizeof(SecFiltPanstarrs_DEV_1), Nsecfilt);
+      secfilt = SecFiltPanstarrs_DEV_1_ToInternal (tmpSecFilt, Nsecfilt);
+      free (tmpSecFilt);
+      break; }
 # if 0
     case DVO_FORMAT_PANSTARRS: {
@@ -741 +805 @@
       gfits_convert_SecFiltPanstarrs_DEV_0 (tmpSecFilt, sizeof(SecFiltPanstarrs_DEV_0), Nsecfilt);
       nitems = fwrite (tmpSecFilt, sizeof(SecFiltPanstarrs_DEV_0), Nsecfilt, f);
+      free (tmpSecFilt);
+      if (nitems != Nsecfilt) {
+        fprintf (stderr, "failed to write secfilts (%d vs %d)\n", nitems, Nsecfilt);
+        return (FALSE);
+      }
+      break; }
+    case DVO_FORMAT_PANSTARRS_DEV_1: {
+      SecFiltPanstarrs_DEV_1 *tmpSecFilt;
+      tmpSecFilt = SecFiltInternalToPanstarrs_DEV_1 (secfilt, Nsecfilt);
+      gfits_convert_SecFiltPanstarrs_DEV_1 (tmpSecFilt, sizeof(SecFiltPanstarrs_DEV_1), Nsecfilt);
+      nitems = fwrite (tmpSecFilt, sizeof(SecFiltPanstarrs_DEV_1), Nsecfilt, f);
       free (tmpSecFilt);
       if (nitems != Nsecfilt) {