IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 42792


Ignore:
Timestamp:
Feb 19, 2025, 2:18:46 PM (17 months ago)
Author:
cclin33
Message:

update libdvo for reference catalog v2

Location:
trunk
Files:
7 added
14 edited

Legend:

Unmodified
Added
Removed

  • trunk/Nebulous/bin/whichnode

    r40387 r42792  
    1 #!/bin/env perl
     1#!/usr/bin/env perl
    22
    33# This script is a temporary "solution" to allow a client to determine whether

  • trunk/Ohana/src/addstar/src/grefstars.c

    r41801 r42792  
    4545
    4646    catalog->measure[N].photcode = photcode;
     47    catalog->measure[N].McalPSF = 0.0;
     48
    4749
    4850    catalog->average[N].Nmeasure = 1;

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

    r40291 r42792  
    1818$(ASRC)/average-ps1-sim.$(ARCH).o \
    1919$(ASRC)/average-ps1-ref.$(ARCH).o \
     20$(ASRC)/average-ps1-ref-v2.$(ARCH).o \
    2021$(ASRC)/secfilt.$(ARCH).o \
    2122$(ASRC)/secfilt-loneos.$(ARCH).o \
    … …  
    3435$(ASRC)/secfilt-ps1-sim.$(ARCH).o \
    3536$(ASRC)/secfilt-ps1-ref.$(ARCH).o \
     37$(ASRC)/secfilt-ps1-ref-v2.$(ARCH).o \
    3638$(ASRC)/measure.$(ARCH).o \
    3739$(ASRC)/measure-loneos.$(ARCH).o \
    … …  
    5052$(ASRC)/measure-ps1-sim.$(ARCH).o \
    5153$(ASRC)/measure-ps1-ref.$(ARCH).o \
     54$(ASRC)/measure-ps1-ref-v2.$(ARCH).o \
    5255$(ASRC)/lensing.$(ARCH).o \
    5356$(ASRC)/lensing-ps1-v5-r0.$(ARCH).o \
    … …  
    8689$(ASRC)/photcode-ps1-v5-ld.$(ARCH).o \
    8790$(ASRC)/photcode-ps1-ref.$(ARCH).o \
     91$(ASRC)/photcode-ps1-ref-v2.$(ARCH).o \
    8892$(ASRC)/image-loneos.$(ARCH).o \
    8993$(ASRC)/image-elixir.$(ARCH).o \
    … …  
    102106$(ASRC)/image-ps1-sim.$(ARCH).o \
    103107$(ASRC)/image-ps1-ref.$(ARCH).o \
     108$(ASRC)/image-ps1-ref-v2.$(ARCH).o \
    104109$(ASRC)/regimage.$(ARCH).o \
    105110$(ASRC)/detreg.$(ARCH).o \
    … …  
    149154$(AINC)/average-ps1-sim.h \
    150155$(AINC)/average-ps1-ref.h \
     156$(AINC)/average-ps1-ref-v2.h \
    151157$(AINC)/secfilt.h \
    152158$(AINC)/secfilt-loneos.h \
    … …  
    165171$(AINC)/secfilt-ps1-sim.h \
    166172$(AINC)/secfilt-ps1-ref.h \
     173$(AINC)/secfilt-ps1-ref-v2.h \
    167174$(AINC)/measure.h \
    168175$(AINC)/measure-loneos.h \
    … …  
    181188$(AINC)/measure-ps1-sim.h \
    182189$(AINC)/measure-ps1-ref.h \
     190$(AINC)/measure-ps1-ref-v2.h \
    183191$(AINC)/lensing.h \
    184192$(AINC)/lensing-ps1-v5-r0.h \
    … …  
    217225$(AINC)/photcode-ps1-v5-ld.h \
    218226$(AINC)/photcode-ps1-ref.h \
     227$(AINC)/photcode-ps1-ref-v2.h \
    219228$(AINC)/image-loneos.h \
    220229$(AINC)/image-elixir.h \
    … …  
    233242$(AINC)/image-ps1-sim.h \
    234243$(AINC)/image-ps1-ref.h \
     244$(AINC)/image-ps1-ref-v2.h \
    235245$(AINC)/regimage.h \
    236246$(AINC)/detreg.h \

  • trunk/Ohana/src/libautocode/def/average-ps1-ref.d

    r24746 r42792  
    2424FIELD pad,            PAD,         char[4],         padding
    2525
    26 # 2 x double
    27 # 2 x float
    28 # 4 x int
    29 # 2 x short
    30 # 4 x char
     26# 2 x double 8
     27# 2 x float 4
     28# 2 x int 4
     29# 2 x uint32_t 4
     30# 2 x short 2
     31# 4 x char 1
    3132# = 48

  • trunk/Ohana/src/libdvo/Makefile

    r42477 r42792  
    5353$(DESTINC)/ps1_v5_ld_defs.h \
    5454$(DESTINC)/ps1_ref_defs.h \
     55$(DESTINC)/ps1_ref_v2_defs.h \
    5556$(DESTINC)/ps1_sim_defs.h \
    5657$(DESTINC)/cmf-ps1-dv3.h \
    … …  
    105106$(SRC)/dvo_convert_PS1_V5_LOAD.$(ARCH).o \
    106107$(SRC)/dvo_convert_PS1_REF.$(ARCH).o \
     108$(SRC)/dvo_convert_PS1_REF_V2.$(ARCH).o \
    107109$(SRC)/dvo_convert_PS1_SIM.$(ARCH).o \
    108110$(SRC)/flatcorr_io.$(ARCH).o    \

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

    r42477 r42792  
    2727  DVO_FORMAT_PS1_DEV_3,
    2828  DVO_FORMAT_PS1_REF,
     29  DVO_FORMAT_PS1_REF_V2,
    2930  DVO_FORMAT_PS1_SIM,
    3031  DVO_FORMAT_PS1_V1,
    … …  
    10871088# include "ps1_v5_ld_defs.h"
    10881089# include "ps1_ref_defs.h"
     1090# include "ps1_ref_v2_defs.h"
    10891091# include "ps1_sim_defs.h"
    10901092

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

    r40291 r42792  
    5959  CONVERT_FORMAT("DVO_PHOTCODE_PS1_DEV_3",   PS1_DEV_3);
    6060  CONVERT_FORMAT("DVO_PHOTCODE_PS1_REF",     PS1_REF);
     61  CONVERT_FORMAT("DVO_PHOTCODE_PS1_REF_V2",  PS1_REF_V2);
    6162  CONVERT_FORMAT("DVO_PHOTCODE_PS1_V1",      PS1_V1);
    6263  CONVERT_FORMAT("DVO_PHOTCODE_PS1_V2",      PS1_V2);

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

    r40291 r42792  
    6060  if (!strcasecmp (catformat, "PS1_V5_LOAD"))     return (DVO_FORMAT_PS1_V5_LOAD);
    6161  if (!strcasecmp (catformat, "PS1_REF"))         return (DVO_FORMAT_PS1_REF);
     62  if (!strcasecmp (catformat, "PS1_REF_V2"))      return (DVO_FORMAT_PS1_REF_V2);
    6263  if (!strcasecmp (catformat, "PS1_SIM"))         return (DVO_FORMAT_PS1_SIM);
    6364  return (DVO_FORMAT_UNDEF);

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

    r40291 r42792  
    9494      FORMAT_CASE (PS1_V5_LOAD, PS1_V5_LOAD);
    9595      FORMAT_CASE (PS1_REF,     PS1_REF);
     96      FORMAT_CASE (PS1_REF_V2,  PS1_REF_V2);
    9697      FORMAT_CASE (PS1_SIM,     PS1_SIM);
    9798
    … …  
    292293  if (catalog[0].catformat == DVO_FORMAT_PS1_V5_LOAD)     gfits_modify (&catalog[0].header, "FORMAT", "%s", 1, "PS1_V5_LOAD");
    293294  if (catalog[0].catformat == DVO_FORMAT_PS1_REF)         gfits_modify (&catalog[0].header, "FORMAT", "%s", 1, "PS1_REF");
     295  if (catalog[0].catformat == DVO_FORMAT_PS1_REF_V2)      gfits_modify (&catalog[0].header, "FORMAT", "%s", 1, "PS1_REF_V2");
    294296  if (catalog[0].catformat == DVO_FORMAT_PS1_SIM)         gfits_modify (&catalog[0].header, "FORMAT", "%s", 1, "PS1_SIM");
    295297
    … …  
    399401      FORMAT_CASE (PS1_V5_LOAD, PS1_V5_LOAD);
    400402      FORMAT_CASE (PS1_REF,     PS1_REF);
     403      FORMAT_CASE (PS1_REF_V2,  PS1_REF_V2);
    401404      FORMAT_CASE (PS1_SIM,     PS1_SIM);
    402405
    … …  
    454457      FORMAT_CASE (PS1_V5_LOAD, PS1_V5_LOAD);
    455458      FORMAT_CASE (PS1_REF,     PS1_REF);
     459      FORMAT_CASE (PS1_REF_V2,  PS1_REF_V2);
    456460      FORMAT_CASE (PS1_SIM,     PS1_SIM);
    457461
    … …  
    512516      FORMAT_CASE (PS1_V5_LOAD, PS1_V5_LOAD);
    513517      FORMAT_CASE (PS1_REF,     PS1_REF);
     518      FORMAT_CASE (PS1_REF_V2,  PS1_REF_V2);
    514519      FORMAT_CASE (PS1_SIM,     PS1_SIM);
    515520
    … …  
    567572      FORMAT_CASE (PS1_V5_LOAD, PS1_V5_LOAD);
    568573      FORMAT_CASE (PS1_REF,     PS1_REF);
     574      FORMAT_CASE (PS1_REF_V2,  PS1_REF_V2);
    569575      FORMAT_CASE (PS1_SIM,     PS1_SIM);
    570576
    … …  
    626632      FORMAT_CASE (PS1_V5_LOAD, PS1_V5_LOAD);
    627633      FORMAT_CASE (PS1_REF,     PS1_REF);
     634      FORMAT_CASE (PS1_REF_V2,  PS1_REF_V2);
    628635      FORMAT_CASE (PS1_SIM,     PS1_SIM);
    629636
    … …  
    681688      FORMAT_CASE (PS1_V5_LOAD, PS1_V5_LOAD);
    682689      FORMAT_CASE (PS1_REF,     PS1_REF);
     690      FORMAT_CASE (PS1_REF_V2,  PS1_REF_V2);
    683691      FORMAT_CASE (PS1_SIM,     PS1_SIM);
    684692

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

    r40291 r42792  
    4545  CONVERT_FORMAT ("DVO_AVERAGE_PS1_V5_LOAD",     PS1_V5_LOAD);
    4646  CONVERT_FORMAT ("DVO_AVERAGE_PS1_REF",         PS1_REF);
     47  CONVERT_FORMAT ("DVO_AVERAGE_PS1_REF_V2",      PS1_REF_V2);
    4748  CONVERT_FORMAT ("DVO_AVERAGE_PS1_SIM",         PS1_SIM);
    4849# undef CONVERT_FORMAT
    … …  
    137138  CONVERT_FORMAT ("DVO_AVERAGE_PS1_V5_LOAD",     PS1_V5_LOAD,     PS1_V5_LOAD);
    138139  CONVERT_FORMAT ("DVO_AVERAGE_PS1_REF",         PS1_REF,         PS1_REF);
     140  CONVERT_FORMAT ("DVO_AVERAGE_PS1_REF_V2",      PS1_REF_V2,      PS1_REF_V2);
    139141  CONVERT_FORMAT ("DVO_AVERAGE_PS1_SIM",         PS1_SIM,         PS1_SIM);
    140142# undef CONVERT_FORMAT
    … …  
    176178      FORMAT_CASE (PS1_V5_LOAD,     PS1_V5_LOAD);
    177179      FORMAT_CASE (PS1_REF,         PS1_REF);
     180      FORMAT_CASE (PS1_REF_V2,      PS1_REF_V2);
    178181      FORMAT_CASE (PS1_SIM,         PS1_SIM);
    179182# undef FORMAT_CASE
    … …  
    276279  CONVERT_FORMAT ("DVO_MEASURE_PS1_V5_LOAD",     PS1_V5_LOAD,     PS1_V5_LOAD,     TRUE);
    277280  CONVERT_FORMAT ("DVO_MEASURE_PS1_REF",         PS1_REF,         PS1_REF,         FALSE);
     281  CONVERT_FORMAT ("DVO_MEASURE_PS1_REF_V2",      PS1_REF_V2,      PS1_REF_V2,      FALSE);
    278282  CONVERT_FORMAT ("DVO_MEASURE_PS1_SIM",         PS1_SIM,         PS1_SIM,         TRUE);
    279283# undef CONVERT_FORMAT
    … …  
    317321      FORMAT_CASE (PS1_V5_LOAD,     PS1_V5_LOAD,     TRUE);
    318322      FORMAT_CASE (PS1_REF,         PS1_REF,         FALSE);
     323      FORMAT_CASE (PS1_REF_V2,      PS1_REF_V2,      FALSE);
    319324      FORMAT_CASE (PS1_SIM,         PS1_SIM,         TRUE);
    320325# undef FORMAT_CASE
    … …  
    385390  SKIPPING_FORMAT ("DVO_MISSING_PS1_SIM",         PS1_SIM,         PS1_SIM);
    386391  SKIPPING_FORMAT ("DVO_MISSING_PS1_REF",         PS1_REF,         PS1_REF);
     392  SKIPPING_FORMAT ("DVO_MISSING_PS1_REF_V2",      PS1_REF_V2,      PS1_REF_V2);
    387393  SKIPPING_FORMAT ("DVO_MISSING_ELIXIR",          ELIXIR,          Elixir);
    388394  SKIPPING_FORMAT ("DVO_MISSING_LONEOS",          LONEOS,          Loneos);
    … …  
    475481  CONVERT_FORMAT ("DVO_SECFILT_PS1_V5_LOAD",     PS1_V5_LOAD,     PS1_V5_LOAD);
    476482  CONVERT_FORMAT ("DVO_SECFILT_PS1_REF",         PS1_REF,         PS1_REF);
     483  CONVERT_FORMAT ("DVO_SECFILT_PS1_REF_V2",      PS1_REF_V2,      PS1_REF_V2);
    477484  CONVERT_FORMAT ("DVO_SECFILT_PS1_SIM",         PS1_SIM,         PS1_SIM);
    478485# undef CONVERT_FORMAT
    … …  
    514521      FORMAT_CASE (PS1_V5_LOAD,     PS1_V5_LOAD);
    515522      FORMAT_CASE (PS1_REF,         PS1_REF);
     523      FORMAT_CASE (PS1_REF_V2,      PS1_REF_V2);
    516524      FORMAT_CASE (PS1_SIM,         PS1_SIM);
    517525# undef FORMAT_CASE
    … …  
    609617
    610618  SKIPPING_FORMAT ("DVO_LENSING_PS1_REF",         PS1_REF,         PS1_REF);
     619  SKIPPING_FORMAT ("DVO_LENSING_PS1_REF_V2",      PS1_REF_V2,      PS1_REF_V2);
    611620  SKIPPING_FORMAT ("DVO_LENSING_ELIXIR",          ELIXIR,          Elixir);
    612621  SKIPPING_FORMAT ("DVO_LENSING_LONEOS",          LONEOS,          Loneos);
    … …  
    650659
    651660//    FORMAT_CASE (PS1_REF,         PS1_REF);
     661//    FORMAT_CASE (PS1_REF_V2,      PS1_REF_V2);
    652662//    FORMAT_CASE (ELIXIR,          Elixir);
    653663//    FORMAT_CASE (LONEOS,          Loneos);
    … …  
    731741
    732742  SKIPPING_FORMAT ("DVO_LENSOBJ_PS1_REF",         PS1_REF,         PS1_REF);
     743  SKIPPING_FORMAT ("DVO_LENSOBJ_PS1_REF_V2",      PS1_REF_V2,      PS1_REF_V2);
    733744  SKIPPING_FORMAT ("DVO_LENSOBJ_ELIXIR",          ELIXIR,          Elixir);
    734745  SKIPPING_FORMAT ("DVO_LENSOBJ_LONEOS",          LONEOS,          Loneos);
    … …  
    772783
    773784//    FORMAT_CASE (PS1_REF,         PS1_REF);
     785//    FORMAT_CASE (PS1_REF_V2,      PS1_REF_V2);
    774786//    FORMAT_CASE (ELIXIR,          Elixir);
    775787//    FORMAT_CASE (LONEOS,          Loneos);
    … …  
    841853  CONVERT_FORMAT  ("DVO_STARPAR_PS1_SIM",         PS1_SIM,         PS1_SIM);
    842854  SKIPPING_FORMAT ("DVO_STARPAR_PS1_REF",         PS1_REF,         PS1_REF);
     855  SKIPPING_FORMAT ("DVO_STARPAR_PS1_REF_V2",      PS1_REF_V2,      PS1_REF_V2);
    843856  SKIPPING_FORMAT ("DVO_STARPAR_ELIXIR",          ELIXIR,          Elixir);
    844857  SKIPPING_FORMAT ("DVO_STARPAR_LONEOS",          LONEOS,          Loneos);
    … …  
    882895      FORMAT_CASE (PS1_SIM,         PS1_SIM);
    883896//    FORMAT_CASE (PS1_REF,         PS1_REF);
     897//    FORMAT_CASE (PS1_REF_V2,      PS1_REF_V2);
    884898//    FORMAT_CASE (ELIXIR,          Elixir);
    885899//    FORMAT_CASE (LONEOS,          Loneos);
    … …  
    964978
    965979  SKIPPING_FORMAT ("DVO_GALPHOT_PS1_REF",         PS1_REF,         PS1_REF);
     980  SKIPPING_FORMAT ("DVO_GALPHOT_PS1_REF_V2",      PS1_REF_V2,      PS1_REF_V2);
    966981  SKIPPING_FORMAT ("DVO_GALPHOT_ELIXIR",          ELIXIR,          Elixir);
    967982  SKIPPING_FORMAT ("DVO_GALPHOT_LONEOS",          LONEOS,          Loneos);
    … …  
    10051020
    10061021//    FORMAT_CASE (PS1_REF,         PS1_REF);
     1022//    FORMAT_CASE (PS1_REF_V2,      PS1_REF_V2);
    10071023//    FORMAT_CASE (ELIXIR,          Elixir);
    10081024//    FORMAT_CASE (LONEOS,          Loneos);
    … …  
    10941110  CONVERT_FORMAT ("DVO_IMAGE_PS1_V5_LOAD",     PS1_V5_LOAD,     PS1_V5_LOAD);
    10951111  CONVERT_FORMAT ("DVO_IMAGE_PS1_REF",         PS1_REF,         PS1_REF);
     1112  CONVERT_FORMAT ("DVO_IMAGE_PS1_REF_V2",      PS1_REF_V2,      PS1_REF_V2);
    10961113  CONVERT_FORMAT ("DVO_IMAGE_PS1_SIM",         PS1_SIM,         PS1_SIM);
    10971114
    … …  
    11351152    FORMAT_CASE (PS1_V5_LOAD,     PS1_V5_LOAD);
    11361153    FORMAT_CASE (PS1_REF,         PS1_REF);
     1154    FORMAT_CASE (PS1_REF_V2,      PS1_REF_V2);
    11371155    FORMAT_CASE (PS1_SIM,         PS1_SIM);
    11381156
    … …  
    11881206    FORMAT_CASE (PS1_V5_LOAD,     PS1_V5_LOAD);
    11891207    FORMAT_CASE (PS1_REF,         PS1_REF);
     1208    FORMAT_CASE (PS1_REF_V2,      PS1_REF_V2);
    11901209    FORMAT_CASE (PS1_SIM,         PS1_SIM);
    11911210

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

    r40291 r42792  
    226226  if (db[0].format == DVO_FORMAT_PS1_V5_LOAD)     gfits_modify (&db[0].header, "FORMAT", "%s", 1, "PS1_V5_LOAD");
    227227  if (db[0].format == DVO_FORMAT_PS1_REF)         gfits_modify (&db[0].header, "FORMAT", "%s", 1, "PS1_REF");
     228  if (db[0].format == DVO_FORMAT_PS1_REF_V2)      gfits_modify (&db[0].header, "FORMAT", "%s", 1, "PS1_REF_V2");
    228229  if (db[0].format == DVO_FORMAT_PS1_SIM)         gfits_modify (&db[0].header, "FORMAT", "%s", 1, "PS1_SIM");
    229230 

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

    r40291 r42792  
    6363  if (db[0].format == DVO_FORMAT_PS1_V5_LOAD)     ImageSize = sizeof(Image_PS1_V5_LOAD);
    6464  if (db[0].format == DVO_FORMAT_PS1_REF)         ImageSize = sizeof(Image_PS1_REF);
     65  if (db[0].format == DVO_FORMAT_PS1_REF_V2)      ImageSize = sizeof(Image_PS1_REF_V2);
    6566  if (db[0].format == DVO_FORMAT_PS1_SIM)         ImageSize = sizeof(Image_PS1_SIM);
    6667
    … …  
    9798  if (db[0].format == DVO_FORMAT_PS1_V5_LOAD)     gfits_table_mkheader_Image_PS1_V5_LOAD (&db[0].theader);
    9899  if (db[0].format == DVO_FORMAT_PS1_REF)         gfits_table_mkheader_Image_PS1_REF (&db[0].theader);
     100  if (db[0].format == DVO_FORMAT_PS1_REF_V2)      gfits_table_mkheader_Image_PS1_REF_V2 (&db[0].theader);
    99101  if (db[0].format == DVO_FORMAT_PS1_SIM)         gfits_table_mkheader_Image_PS1_SIM (&db[0].theader);
    100102   

  • trunk/Ohana/src/relphot/src/MagResidSave.c

    r41647 r42792  
    5454  gfits_create_table_header (&theader, "BINTABLE", "MAG_PSF_RESID");
    5555
    56   gfits_define_bintable_column (&theader, "D", "RA",       "ra",                         "degree", 1.0, 0.0);
    57   gfits_define_bintable_column (&theader, "D", "DEC",      "dec",                        "degree", 1.0, 0.0);
    58   gfits_define_bintable_column (&theader, "E", "MAG_RESID", "magnitude residual", "magnitudes", 1.0, 0.0);
    59   gfits_define_bintable_column (&theader, "E", "MAG_ERROR", "magnitude error", "magnitudes", 1.0, 0.0);
    60   gfits_define_bintable_column (&theader, "E", "MAG_CHISQ", "magnitude resid chisq", "unitless", 1.0, 0.0);
    61   gfits_define_bintable_column (&theader, "E", "MAG_MEDIAN", "median magnitude residual", "magnitudes", 1.0, 0.0);
     56  gfits_define_bintable_column (&theader, "D", "RA",         "ra",                           "degree",    1.0, 0.0);
     57  gfits_define_bintable_column (&theader, "D", "DEC",        "dec",                          "degree",    1.0, 0.0);
     58  gfits_define_bintable_column (&theader, "E", "MAG_RESID",  "magnitude residual",          "magnitudes", 1.0, 0.0);
     59  gfits_define_bintable_column (&theader, "E", "MAG_ERROR",  "magnitude error",              "magnitudes", 1.0, 0.0);
     60  gfits_define_bintable_column (&theader, "E", "MAG_CHISQ",  "magnitude resid chisq",        "unitless",  1.0, 0.0);
     61  gfits_define_bintable_column (&theader, "E", "MAG_MEDIAN", "median magnitude residual",    "magnitudes", 1.0, 0.0);
    6262  gfits_define_bintable_column (&theader, "E", "MAG_ALTSIG", "68 percentile range as sigma", "magnitudes", 1.0, 0.0);
    63   gfits_define_bintable_column (&theader, "E", "AIRMASS",   "", "unitless", 1.0, 0.0);
    64   gfits_define_bintable_column (&theader, "D", "MJD",       "", "unitless", 1.0, 0.0);
    65   gfits_define_bintable_column (&theader, "E", "EXPTIME",   "", "unitless", 1.0, 0.0);
    66   gfits_define_bintable_column (&theader, "J", "PHOTCODE",  "", "unitless", 1.0, 0.0);
    67   gfits_define_bintable_column (&theader, "J", "FLAGS",     "image flags", "unitless",   1.0, 0.0);
    68   gfits_define_bintable_column (&theader, "J", "NFIT",      "number of stars fitted", NULL, 1.0, FT_BZERO_INT32);
    69   gfits_define_bintable_column (&theader, "J", "NMEAS",     "number of stars on image", NULL, 1.0, FT_BZERO_INT32);
     63  gfits_define_bintable_column (&theader, "E", "AIRMASS",    "",                             "unitless",  1.0, 0.0);
     64  gfits_define_bintable_column (&theader, "D", "MJD",        "",                             "unitless",  1.0, 0.0);
     65  gfits_define_bintable_column (&theader, "E", "EXPTIME",    "",                             "unitless",  1.0, 0.0);
     66  gfits_define_bintable_column (&theader, "J", "PHOTCODE",   "",                             "unitless",  1.0, 0.0);
     67  gfits_define_bintable_column (&theader, "J", "FLAGS",      "image flags",                  "unitless",   1.0, 0.0);
     68  gfits_define_bintable_column (&theader, "J", "NFIT",       "number of stars fitted",       NULL,         1.0, 0.0);
     69  gfits_define_bintable_column (&theader, "J", "NMEAS",      "number of stars on image",     NULL,         1.0, 0.0);
    7070
    7171  // generate the output array that carries the data

  • trunk/ippTasks/mergedvodb.pro

    r33030 r42792  
    77
    88
    9 #There is a book for each task, because I don't use labels.
     9#There is a book for each task, because I dont use labels.
    1010
    1111if (not($?havemergedvodbBooks))
    … …  
    4444end
    4545
    46 ## you get no choice - you add all of them in at the same time. you can always turn off the tasks you don't want to run.
     46## you get no choice - you add all of them in at the same time. you can always turn off the tasks you dont want to run.
    4747macro add.mergedvodb
    4848  if ($0 != 2)
Note: See TracChangeset for help on using the changeset viewer.