IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 13884


Ignore:
Timestamp:
Jun 19, 2007, 2:02:52 PM (19 years ago)
Author:
eugene
Message:

adding the PANSTARRS-DEV-1 format

Location:
trunk/Ohana/src
Files:
5 added
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/Ohana/src/libautocode/Makefile.Targets

    r12461 r13884  
    66$(ASRC)/average-elixir.$(ARCH).o \
    77$(ASRC)/average-panstarrs-dev-0.$(ARCH).o \
     8$(ASRC)/average-panstarrs-dev-1.$(ARCH).o \
    89$(ASRC)/average-panstarrs.$(ARCH).o \
    910$(ASRC)/average-pmtest.$(ARCH).o \
    … …  
    1213$(ASRC)/secfilt-elixir.$(ARCH).o \
    1314$(ASRC)/secfilt-panstarrs-dev-0.$(ARCH).o \
     15$(ASRC)/secfilt-panstarrs-dev-1.$(ARCH).o \
    1416$(ASRC)/secfilt-panstarrs.$(ARCH).o \
    1517$(ASRC)/measure.$(ARCH).o \
    … …  
    1719$(ASRC)/measure-elixir.$(ARCH).o \
    1820$(ASRC)/measure-panstarrs-dev-0.$(ARCH).o \
     21$(ASRC)/measure-panstarrs-dev-1.$(ARCH).o \
    1922$(ASRC)/measure-panstarrs.$(ARCH).o \
    2023$(ASRC)/missing.$(ARCH).o \
    … …  
    2427$(ASRC)/image-elixir.$(ARCH).o \
    2528$(ASRC)/image-panstarrs-dev-0.$(ARCH).o \
     29$(ASRC)/image-panstarrs-dev-1.$(ARCH).o \
    2630$(ASRC)/image-panstarrs.$(ARCH).o \
    2731$(ASRC)/regimage.$(ARCH).o \
    … …  
    4448$(AINC)/average-elixir.h \
    4549$(AINC)/average-panstarrs-dev-0.h \
     50$(AINC)/average-panstarrs-dev-1.h \
    4651$(AINC)/average-panstarrs.h \
    4752$(AINC)/average-pmtest.h \
    … …  
    5055$(AINC)/secfilt-elixir.h \
    5156$(AINC)/secfilt-panstarrs-dev-0.h \
     57$(AINC)/secfilt-panstarrs-dev-1.h \
    5258$(AINC)/secfilt-panstarrs.h \
    5359$(AINC)/measure.h \
    … …  
    5561$(AINC)/measure-elixir.h \
    5662$(AINC)/measure-panstarrs-dev-0.h \
     63$(AINC)/measure-panstarrs-dev-1.h \
    5764$(AINC)/measure-panstarrs.h \
    5865$(AINC)/missing.h \
    … …  
    6269$(AINC)/image-elixir.h \
    6370$(AINC)/image-panstarrs-dev-0.h \
     71$(AINC)/image-panstarrs-dev-1.h \
    6472$(AINC)/image-panstarrs.h \
    6573$(AINC)/regimage.h \

  • trunk/Ohana/src/libautocode/def/image.d

    r12491 r13884  
    22EXTNAME      DVO_IMAGE
    33TYPE         BINTABLE
    4 SIZE         256
     4SIZE         288
    55DESCRIPTION  DVO Image Table
    66
    … …  
    3939# 40 bytes
    4040
    41 FIELD     name,             NAME,                 char[32],       name of original image
     41FIELD     name,             NAME,                 char[64],       name of original image
    4242FIELD     detection_limit,  DETECTION_LIMIT,      unsigned char,  detection limit,           10*mag
    4343FIELD     saturation_limit, SATURATION_LIMIT,     unsigned char,  saturation limit,          10*mag

  • trunk/Ohana/src/libdvo/Makefile

    r12879 r13884  
    5151$(SRC)/dvo_convert_loneos.$(ARCH).o    \
    5252$(SRC)/dvo_convert_panstarrs_DEV_0.$(ARCH).o \
     53$(SRC)/dvo_convert_panstarrs_DEV_1.$(ARCH).o \
    5354$(SRC)/skyregion_io.$(ARCH).o    \
    5455$(SRC)/skyregion_gsc.$(ARCH).o    \

  • trunk/Ohana/src/libdvo/include/dvo.h

    r12840 r13884  
    2424      DVO_FORMAT_PANSTARRS,
    2525      DVO_FORMAT_PMTEST,
    26       DVO_FORMAT_PANSTARRS_DEV_0
     26      DVO_FORMAT_PANSTARRS_DEV_0,
     27      DVO_FORMAT_PANSTARRS_DEV_1
    2728} DVOTableFormat;
    2829

  • trunk/Ohana/src/libdvo/src/dvo_catalog.c

    r12332 r13884  
    5151  if (!strcasecmp (catformat, "PMTEST"))    return (DVO_FORMAT_PMTEST);
    5252  if (!strcasecmp (catformat, "PANSTARRS_DEV_0")) return (DVO_FORMAT_PANSTARRS_DEV_0);
     53  if (!strcasecmp (catformat, "PANSTARRS_DEV_1")) return (DVO_FORMAT_PANSTARRS_DEV_1);
    5354  return (DVO_FORMAT_UNDEF);
    5455}

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

    r12391 r13884  
    7373      SecFiltSize = sizeof(SecFiltPanstarrs_DEV_0);
    7474      break;
     75    case DVO_FORMAT_PANSTARRS_DEV_1:
     76      AverageSize = sizeof(AveragePanstarrs_DEV_1);
     77      MeasureSize = sizeof(MeasurePanstarrs_DEV_1);
     78      SecFiltSize = sizeof(SecFiltPanstarrs_DEV_1);
     79      break;
    7580# if 0
    7681    case DVO_FORMAT_PANSTARRS:
    … …  
    262267  if (catalog[0].catformat == DVO_FORMAT_ELIXIR)    gfits_modify (&catalog[0].header, "FORMAT", "%s", 1, "ELIXIR");
    263268  if (catalog[0].catformat == DVO_FORMAT_PANSTARRS_DEV_0) gfits_modify (&catalog[0].header, "FORMAT", "%s", 1, "PANSTARRS_DEV_0");
     269  if (catalog[0].catformat == DVO_FORMAT_PANSTARRS_DEV_1) gfits_modify (&catalog[0].header, "FORMAT", "%s", 1, "PANSTARRS_DEV_1");
    264270  // if (catalog[0].catformat == DVO_FORMAT_PANSTARRS) gfits_modify (&catalog[0].header, "FORMAT", "%s", 1, "PANSTARRS");
    265271  // if (catalog[0].catformat == DVO_FORMAT_PMTEST)    gfits_modify (&catalog[0].header, "FORMAT", "%s", 1, "PMTEST");
    … …  
    371377      free (tmpAverage);
    372378      break; }
     379    case DVO_FORMAT_PANSTARRS_DEV_1: {
     380      AveragePanstarrs_DEV_1 *tmpAverage;
     381      ALLOCATE (tmpAverage, AveragePanstarrs_DEV_1, MAX (Naverage, 1));
     382      nitems = fread (tmpAverage, sizeof(AveragePanstarrs_DEV_1), Naverage, f);
     383      if (nitems != Naverage) {
     384        fprintf (stderr, "failed to read averages (%d vs %d)\n", nitems, Naverage);
     385        return (NULL);
     386      }
     387      gfits_convert_AveragePanstarrs_DEV_1 (tmpAverage, sizeof(AveragePanstarrs_DEV_1), Naverage);
     388      average = AveragePanstarrs_DEV_1_ToInternal (tmpAverage, Naverage);
     389      free (tmpAverage);
     390      break; }
    373391# if 0
    374392    case DVO_FORMAT_PANSTARRS: {
    … …  
    446464      gfits_convert_AveragePanstarrs_DEV_0 (tmpAverage, sizeof(AveragePanstarrs_DEV_0), Naverage);
    447465      nitems = fwrite (tmpAverage, sizeof(AveragePanstarrs_DEV_0), Naverage, f);
     466      free (tmpAverage);
     467      if (nitems != Naverage) {
     468        fprintf (stderr, "failed to write averages (%d vs %d)\n", nitems, Naverage);
     469        return (FALSE);
     470      }
     471      break; }
     472    case DVO_FORMAT_PANSTARRS_DEV_1: {
     473      AveragePanstarrs_DEV_1 *tmpAverage;
     474      tmpAverage = AverageInternalToPanstarrs_DEV_1 (average, Naverage);
     475      gfits_convert_AveragePanstarrs_DEV_1 (tmpAverage, sizeof(AveragePanstarrs_DEV_1), Naverage);
     476      nitems = fwrite (tmpAverage, sizeof(AveragePanstarrs_DEV_1), Naverage, f);
    448477      free (tmpAverage);
    449478      if (nitems != Naverage) {
    … …  
    536565      free (tmpMeasure);
    537566      break; }
     567    case DVO_FORMAT_PANSTARRS_DEV_1: {
     568      MeasurePanstarrs_DEV_1 *tmpMeasure;
     569      ALLOCATE (tmpMeasure, MeasurePanstarrs_DEV_1, MAX (Nmeasure, 1));
     570      nitems = fread (tmpMeasure, sizeof(MeasurePanstarrs_DEV_1), Nmeasure, f);
     571      if (nitems != Nmeasure) {
     572        fprintf (stderr, "failed to read measures (%d vs %d)\n", nitems, Nmeasure);
     573        return (NULL);
     574      }
     575      gfits_convert_MeasurePanstarrs_DEV_1 (tmpMeasure, sizeof(MeasurePanstarrs_DEV_1), Nmeasure);
     576      measure = MeasurePanstarrs_DEV_1_ToInternal (tmpMeasure, Nmeasure);
     577      free (tmpMeasure);
     578      break; }
    538579# if 0
    539580    case DVO_FORMAT_PANSTARRS: {
    … …  
    599640      gfits_convert_MeasurePanstarrs_DEV_0 (tmpMeasure, sizeof(MeasurePanstarrs_DEV_0), Nmeasure);
    600641      nitems = fwrite (tmpMeasure, sizeof(MeasurePanstarrs_DEV_0), Nmeasure, f);
     642      free (tmpMeasure);
     643      if (nitems != Nmeasure) {
     644        fprintf (stderr, "failed to write measures (%d vs %d)\n", nitems, Nmeasure);
     645        return (FALSE);
     646      }
     647      break; }
     648    case DVO_FORMAT_PANSTARRS_DEV_1: {
     649      MeasurePanstarrs_DEV_1 *tmpMeasure;
     650      tmpMeasure = MeasureInternalToPanstarrs_DEV_1 (measure, Nmeasure);
     651      gfits_convert_MeasurePanstarrs_DEV_1 (tmpMeasure, sizeof(MeasurePanstarrs_DEV_1), Nmeasure);
     652      nitems = fwrite (tmpMeasure, sizeof(MeasurePanstarrs_DEV_1), Nmeasure, f);
    601653      free (tmpMeasure);
    602654      if (nitems != Nmeasure) {
    … …  
    678730      free (tmpSecFilt);
    679731      break; }
     732    case DVO_FORMAT_PANSTARRS_DEV_1: {
     733      SecFiltPanstarrs_DEV_1 *tmpSecFilt;
     734      ALLOCATE (tmpSecFilt, SecFiltPanstarrs_DEV_1, MAX (Nsecfilt, 1));
     735      nitems = fread (tmpSecFilt, sizeof(SecFiltPanstarrs_DEV_1), Nsecfilt, f);
     736      if (nitems != Nsecfilt) {
     737        fprintf (stderr, "failed to read secfilts (%d vs %d)\n", nitems, Nsecfilt);
     738        return (NULL);
     739      }
     740      gfits_convert_SecFiltPanstarrs_DEV_1 (tmpSecFilt, sizeof(SecFiltPanstarrs_DEV_1), Nsecfilt);
     741      secfilt = SecFiltPanstarrs_DEV_1_ToInternal (tmpSecFilt, Nsecfilt);
     742      free (tmpSecFilt);
     743      break; }
    680744# if 0
    681745    case DVO_FORMAT_PANSTARRS: {
    … …  
    741805      gfits_convert_SecFiltPanstarrs_DEV_0 (tmpSecFilt, sizeof(SecFiltPanstarrs_DEV_0), Nsecfilt);
    742806      nitems = fwrite (tmpSecFilt, sizeof(SecFiltPanstarrs_DEV_0), Nsecfilt, f);
     807      free (tmpSecFilt);
     808      if (nitems != Nsecfilt) {
     809        fprintf (stderr, "failed to write secfilts (%d vs %d)\n", nitems, Nsecfilt);
     810        return (FALSE);
     811      }
     812      break; }
     813    case DVO_FORMAT_PANSTARRS_DEV_1: {
     814      SecFiltPanstarrs_DEV_1 *tmpSecFilt;
     815      tmpSecFilt = SecFiltInternalToPanstarrs_DEV_1 (secfilt, Nsecfilt);
     816      gfits_convert_SecFiltPanstarrs_DEV_1 (tmpSecFilt, sizeof(SecFiltPanstarrs_DEV_1), Nsecfilt);
     817      nitems = fwrite (tmpSecFilt, sizeof(SecFiltPanstarrs_DEV_1), Nsecfilt, f);
    743818      free (tmpSecFilt);
    744819      if (nitems != Nsecfilt) {

  • trunk/Ohana/src/libdvo/src/dvo_convert.c

    r12332 r13884  
    5656    return (average);
    5757  }
     58  if (!strcmp (extname, "DVO_AVERAGE_PANSTARRS_DEV_1")) {
     59    AveragePanstarrs_DEV_1 *tmpAverage;
     60    tmpAverage = gfits_table_get_AveragePanstarrs_DEV_1 (ftable, Naverage, NULL);
     61    average = AveragePanstarrs_DEV_1_ToInternal (tmpAverage, *Naverage);
     62    free (tmpAverage);
     63    *format = DVO_FORMAT_PANSTARRS_DEV_1;
     64    return (average);
     65  }
    5866/* disable the new and minimally-used versions for now. 
    5967   put them back in after dev work is further along
    … …  
    110118      free (tmpAverage);
    111119      break; }
     120    case DVO_FORMAT_PANSTARRS_DEV_1: {
     121      AveragePanstarrs_DEV_1 *tmpAverage;
     122      tmpAverage = AverageInternalToPanstarrs_DEV_1 (average, Naverage);
     123      gfits_table_set_AveragePanstarrs_DEV_1 (ftable, tmpAverage, Naverage);
     124      free (tmpAverage);
     125      break; }
    112126# if 0
    113127    case DVO_FORMAT_PANSTARRS: {
    … …  
    172186    return (measure);
    173187  }
     188  if (!strcmp (extname, "DVO_MEASURE_PANSTARRS_DEV_1")) {
     189    MeasurePanstarrs_DEV_1 *tmpMeasure;
     190    tmpMeasure = gfits_table_get_MeasurePanstarrs_DEV_1 (ftable, Nmeasure, NULL);
     191    measure = MeasurePanstarrs_DEV_1_ToInternal (tmpMeasure, *Nmeasure);
     192    free (tmpMeasure);
     193    *format = DVO_FORMAT_PANSTARRS_DEV_1;
     194    return (measure);
     195  }
    174196# if 0
    175197  if (!strcmp (extname, "DVO_MEASURE_PANSTARRS") || !strcmp (extname, "DVO_MEASURE_PMTEST")) {
    … …  
    215237      free (tmpMeasure);
    216238      break; }
     239    case DVO_FORMAT_PANSTARRS_DEV_1: {
     240      MeasurePanstarrs_DEV_1 *tmpMeasure;
     241      tmpMeasure = MeasureInternalToPanstarrs_DEV_1 (measure, Nmeasure);
     242      gfits_table_set_MeasurePanstarrs_DEV_1 (ftable, tmpMeasure, Nmeasure);
     243      free (tmpMeasure);
     244      break; }
    217245# if 0
    218246    case DVO_FORMAT_PANSTARRS: {
    … …  
    271299    return (secfilt);
    272300  }
     301  if (!strcmp (extname, "DVO_SECFILT_PANSTARRS_DEV_1")) {
     302    SecFiltPanstarrs_DEV_1 *tmpSecFilt;
     303    tmpSecFilt = gfits_table_get_SecFiltPanstarrs_DEV_1 (ftable, Nsecfilt, NULL);
     304    secfilt = SecFiltPanstarrs_DEV_1_ToInternal (tmpSecFilt, *Nsecfilt);
     305    free (tmpSecFilt);
     306    *format = DVO_FORMAT_PANSTARRS_DEV_1;
     307    return (secfilt);
     308  }
    273309# if 0
    274310  if (!strcmp (extname, "DVO_SECFILT_PANSTARRS") || !strcmp (extname, "DVO_SECFILT_PMTEST")) {
    … …  
    313349      free (tmpSecFilt);
    314350      break; }
     351    case DVO_FORMAT_PANSTARRS_DEV_1: {
     352      SecFiltPanstarrs_DEV_1 *tmpSecFilt;
     353      tmpSecFilt = SecFiltInternalToPanstarrs_DEV_1 (secfilt, Nsecfilt);
     354      gfits_table_set_SecFiltPanstarrs_DEV_1 (ftable, tmpSecFilt, Nsecfilt);
     355      free (tmpSecFilt);
     356      break; }
    315357# if 0
    316358    case DVO_FORMAT_PANSTARRS: {
    … …  
    379421    goto set_header;
    380422  }
     423  if (!strcmp (extname, "DVO_IMAGE_PANSTARRS_DEV_1")) {
     424    ImagePanstarrs_DEV_1 *tmpimage;
     425    *format = DVO_FORMAT_PANSTARRS_DEV_1;
     426    tmpimage = gfits_table_get_ImagePanstarrs_DEV_1 (ftable, &Nimage, NULL);
     427    ftable[0].buffer = (char *) ImagePanstarrs_DEV_1_ToInternal (tmpimage, Nimage);
     428    free (tmpimage);
     429    goto set_header;
     430  }
    381431# if 0
    382432  if (!strcmp (extname, "DVO_IMAGE_PANSTARRS") || !strcmp (extname, "DVO_IMAGE_PMTEST")) {
    … …  
    431481      free (ftable[0].buffer);
    432482      gfits_table_set_ImagePanstarrs_DEV_0 (ftable, tmpImage, Nimage);
     483      free (tmpImage);
     484      break; }
     485    case DVO_FORMAT_PANSTARRS_DEV_1: {
     486      ImagePanstarrs_DEV_1 *tmpImage;
     487      tmpImage = ImageInternalToPanstarrs_DEV_1 ((Image *) ftable[0].buffer, Nimage);
     488      free (ftable[0].buffer);
     489      gfits_table_set_ImagePanstarrs_DEV_1 (ftable, tmpImage, Nimage);
    433490      free (tmpImage);
    434491      break; }
    … …  
    519576      vtable[0].size = gfits_matrix_size (theader);
    520577      return (TRUE); }
     578    case DVO_FORMAT_PANSTARRS_DEV_1: {
     579      ImagePanstarrs_DEV_1 *tmpImage;
     580      /* convert table rows from internal to external format */
     581      for (i = 0; i < Nrow; i++) {
     582        tmpImage = ImageInternalToPanstarrs_DEV_1 ((Image *) vtable[0].buffer[i], 1);
     583        gfits_convert_ImagePanstarrs_DEV_1 (tmpImage, sizeof(ImagePanstarrs_DEV_1), 1);
     584        free (vtable[0].buffer[i]);
     585        vtable[0].buffer[i] = (char *) tmpImage;
     586      }
     587      /* convert header from old format to new format */
     588      gfits_scan (theader, "NAXIS2", "%d", 1, &Nimage);
     589      gfits_free_header (theader);
     590      gfits_table_mkheader_ImagePanstarrs_DEV_1 (theader);
     591      gfits_modify (theader, "NAXIS2", "%d", 1, Nimage);
     592      theader[0].Naxis[1] = Nimage;
     593      vtable[0].size = gfits_matrix_size (theader);
     594      return (TRUE); }
    521595# if 0
    522596    case DVO_FORMAT_PANSTARRS: {

  • trunk/Ohana/src/libdvo/src/dvo_image.c

    r12332 r13884  
    191191  if (db[0].format == DVO_FORMAT_ELIXIR)          gfits_modify (&db[0].header, "FORMAT", "%s", 1, "ELIXIR");
    192192  if (db[0].format == DVO_FORMAT_PANSTARRS_DEV_0) gfits_modify (&db[0].header, "FORMAT", "%s", 1, "PANSTARRS_DEV_0");
     193  if (db[0].format == DVO_FORMAT_PANSTARRS_DEV_1) gfits_modify (&db[0].header, "FORMAT", "%s", 1, "PANSTARRS_DEV_1");
    193194  // if (db[0].format == DVO_FORMAT_PANSTARRS)    gfits_modify (&db[0].header, "FORMAT", "%s", 1, "PANSTARRS");
    194195  // if (db[0].format == DVO_FORMAT_PMTEST)       gfits_modify (&db[0].header, "FORMAT", "%s", 1, "PMTEST");

  • trunk/Ohana/src/libdvo/src/dvo_image_raw.c

    r12332 r13884  
    5252  if (db[0].format == DVO_FORMAT_PANSTARRS)       ImageSize = sizeof(ImagePanstarrs);
    5353  if (db[0].format == DVO_FORMAT_PANSTARRS_DEV_0) ImageSize = sizeof(ImagePanstarrs_DEV_0);
     54  if (db[0].format == DVO_FORMAT_PANSTARRS_DEV_1) ImageSize = sizeof(ImagePanstarrs_DEV_1);
    5455
    5556  /* check that filesize makes sense */
    … …  
    7475  if (db[0].format == DVO_FORMAT_PANSTARRS)       gfits_table_mkheader_ImagePanstarrs (&db[0].theader);
    7576  if (db[0].format == DVO_FORMAT_PANSTARRS_DEV_0) gfits_table_mkheader_ImagePanstarrs_DEV_0 (&db[0].theader);
     77  if (db[0].format == DVO_FORMAT_PANSTARRS_DEV_1) gfits_table_mkheader_ImagePanstarrs_DEV_1 (&db[0].theader);
    7678   
    7779  /* read data from file */

  • trunk/Ohana/src/opihi/dvo/mextract.c

    r13479 r13884  
    77  char *RegionName, *RegionList, *p;
    88  double *M1;
    9   char **cstack;
     9  char **cstack, name[1024];
    1010  float *values;
    1111
    … …  
    6363  ALLOCATE (vec, Vector *, Nreturn);
    6464  for (i = 0; i < Nreturn; i++) {
    65     if ((vec[i] = SelectVector (fields[i].name, ANYVECTOR, TRUE)) == NULL) goto escape;
     65    if (ISNUM(fields[i].name[0])) {
     66      sprintf (name, "v_%s", fields[i].name);
     67    } else {
     68      sprintf (name, "%s", fields[i].name);
     69    }
     70    if ((vec[i] = SelectVector (name, ANYVECTOR, TRUE)) == NULL) goto escape;
    6671  }
    6772
Note: See TracChangeset for help on using the changeset viewer.