IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 3536


Ignore:
Timestamp:
Mar 28, 2005, 4:48:19 PM (21 years ago)
Author:
eugene
Message:

adding PhotPars and PhotParsOld to autocode

Location:
trunk/Ohana/src
Files:
4 added
21 edited

Legend:

Unmodified
Added
Removed

  • trunk/Ohana/src/imregister/Makefile

    r3534 r3536  
    7373
    7474PHOTOBJ  = \
    75 $(PHOTREG)/db.$(ARCH).o     \
    76 $(PHOTREG)/delete.$(ARCH).o \
    77 $(PHOTREG)/match.$(ARCH).o  \
     75$(PHOTREG)/delete.$(ARCH).o  \
     76$(PHOTREG)/match.$(ARCH).o   \
    7877$(PHOTREG)/define.$(ARCH).o  \
    79 $(PHOTREG)/getImageData.$(ARCH).o  \
    80 $(PHOTREG)/output.$(ARCH).o
     78$(PHOTREG)/convert.$(ARCH).o \
     79$(PHOTREG)/output.$(ARCH).o  \
     80$(PHOTREG)/getImageData.$(ARCH).o
    8181
    8282DETOBJ  = \

  • trunk/Ohana/src/imregister/include/photreg.h

    r3466 r3536  
    2727int args (int argc, char **argv);
    2828int regargs (int argc, char **argv, PhotPars *);
    29 PhotPars *get_images (int *N);
    30 int set_images (PhotPars *new, int Nnew);
    31 int load_db ();
    32 void init_db ();
    33 int save_db ();
    34 int update_db (int *match, int Nmatch);
    35 int append_db (PhotPars *new, int Nnew);
    36 int create_db ();
    37 int close_db ();
    38 void DeleteSubset (int *match, int Nmatch);
    39 int *match_criteria (int *Nmatch);
    40 int *match_images (PhotPars *subset, int Nsubset, int *Nmatch);
    41 void ModifySubset (int *match, int Nmatch);
    42 void OutputSubset (int *match, int Nmatch);
     29
     30void DeleteSubset (FITS_DB *db, PhotPars *photpars, int Nphotpars, int *match, int Nmatch);
     31int *match_criteria (PhotPars *photpars, int Nphotpars, int *Nmatch);
     32
     33void OutputSubset (PhotPars *photpars, int Nphotpars, int *match, int Nmatch);
     34
    4335void DumpFitsBintable (char *filename, PhotPars *image, int *match, int Nmatch);
    4436void DumpFitsTable (char *filename, PhotPars *image, int *match, int Nmatch);
    4537int PrintSubset (PhotPars *image, int *match, int Nmatch);
    46 int define_table (Header *header, Matrix *matrix, Header *theader, FTable *table);
     38
    4739void set_timezone (double dt);
    48 void DumpCADCTable (char *filename, PhotPars *image, int *match, int Nmatch);
    4940void getImageData (char *Image, char *ImageCCD, char *ImageMode);
    50 void set_Binary_name (char *name);
    51 void set_ASCII_name (char *string);
    52 int load_old_db ();
    5341int escape (int mode, char *message);
     42
     43PhotPars *PhotParsOld_to_PhotPars (PhotParsOld *input, int Nphotpars);
     44

  • trunk/Ohana/src/imregister/photreg/args.photreg.c

    r2803 r3536  
    77
    88  int *list, Nlist;
    9   int N, required, Ntimes;
     9  int N, Ntimes;
    1010  unsigned long *tstart, *tstop;
    1111  PhotCode *photcode, *depcode;
    … …  
    1515  photcode = NULL;
    1616  output.modify = TRUE;
    17   required = 0x0;
    1817  bzero (newdata, sizeof(PhotPars));
    1918
    … …  
    6766  newdata[0].tstart = tstart[0];
    6867  newdata[0].tstop = tstop[0];
    69   required |= 0x03;
     68
     69  if (!get_argument (argc, argv, "-zp")) goto required;
     70  if (!get_argument (argc, argv, "-dzp")) goto required;
     71  if (!get_argument (argc, argv, "-photcode")) goto required;
    7072
    7173  /* observed zero point */
    … …  
    7476    newdata[0].ZP = atof (argv[N]);
    7577    remove_argument (N, &argc, argv);
    76     required |= 0x04;
    77   }
     78  }
    7879
    7980  /* error on observed zero point */
    … …  
    8283    newdata[0].dZP = atof (argv[N]);
    8384    remove_argument (N, &argc, argv);
    84     required |= 0x08;
    8585  }
    8686
    … …  
    9393    }
    9494    remove_argument (N, &argc, argv);
    95     required |= 0x10;
    96   }
    97 
    98   if (required ^ 0x1f) {
    99     fprintf (stderr, "missing required field\n");
    100     usage ();
    10195  }
    10296
    … …  
    121115  if (output.offset) newdata[0].ZP += newdata[0].ZPo;
    122116  return (TRUE);
     117
     118required:
     119  fprintf (stderr, "missing required fields\n");
     120  usage ();
    123121}
    124122

  • trunk/Ohana/src/imregister/photreg/args.photsearch.c

    r2803 r3536  
    8484    output.convert = TRUE;
    8585    if (output.delete || output.modify) {
    86       fprintf (stderr, "can't changed old format table\n");
     86      fprintf (stderr, "can't change old format table\n");
    8787      exit (1);
    8888    }

  • trunk/Ohana/src/imregister/photreg/delete.c

    r2823 r3536  
    22# include "photreg.h"
    33
    4 void DeleteSubset (int *match, int Nmatch) {
     4void DeleteSubset (FITS_DB *db, PhotPars *photdata, int Nphotdata, int *match, int Nmatch) {
    55
    66  int i, j;
    7   int *keep, Ndel, Nphotdata, Nsubset;
    8   PhotPars *photdata, *subset;
    9 
    10   photdata = get_images (&Nphotdata);
     7  int *keep, Ndel, Nsubset;
     8  PhotPars *subset;
    119
    1210  ALLOCATE (keep, int, MAX (Nphotdata, 1));
    … …  
    2523  if (Ndel == 0) {
    2624    fprintf (stderr, "SUCCESS\n");
    27     close_db ();
     25    fits_db_close (db);
     26    fits_db_free (db);
    2827    exit (0);
    2928  }
    … …  
    3938  }
    4039
    41   free (keep);
    42   free (photdata);
    43   set_images (subset, Nsubset);
     40  fits_table_set_PhotPars (&db[0].ftable, subset, Nsubset);
     41  fits_db_save (db);
     42  fits_db_close (db);
     43  fits_db_free (db);
    4444
    45   save_db ();
    4645  fprintf (stderr, "SUCCESS\n");
    4746  exit (0);
    48 
    4947}

  • trunk/Ohana/src/imregister/photreg/match.c

    r126 r3536  
    22# include "photreg.h"
    33
    4 int *match_criteria (int *Nmatch) {
     4int *match_criteria (PhotPars *photdata, int Nphotdata, int *Nmatch) {
    55
    6   int i, j, Nphotdata;
     6  int i, j;
    77  int N, NMATCH;
    88  int *match;
    99  int reject;
    10   PhotPars *photdata;
    1110
    1211  /* create selection index */
    … …  
    1413  NMATCH = 1000;
    1514  ALLOCATE (match, int, NMATCH);
    16 
    17   photdata = get_images (&Nphotdata);
    1815
    1916  /* find entries that matches criteria */

  • trunk/Ohana/src/imregister/photreg/output.c

    r2803 r3536  
    66static char *ASCIIName = (char *) NULL;
    77
    8 void set_ASCII_name (char *string) {
    9   ASCIIName = string;
    10 }
    11 
    128/* given a subset list, write out the selected images, if desired */
    13 void OutputSubset (int *match, int Nmatch) {
    14 
    15   int Nphotdata;
    16   PhotPars *photdata;
    17 
    18   photdata = get_images (&Nphotdata);
     9void OutputSubset (PhotPars *photdata, int Nphotdata, int *match, int Nmatch) {
    1910
    2011  if (output.table != (char *) NULL) {
    … …  
    3627
    3728  int i, j;
    38   Header header, theader;
     29  FILE *f;
     30  Header header;
    3931  Matrix matrix;
    40   FTable table;
     32  Header theader;
     33  FTable ftable;
    4134  PhotPars *subset;
    4235
    43   /* define table layout */
    44   define_table (&header, &matrix, &theader, &table);
    45 
     36  /* extract subset of input data */
    4637  ALLOCATE (subset, PhotPars, MAX (1, Nmatch));
    4738  for (i = 0; i < Nmatch; i++){
    … …  
    4940    memcpy (&subset[i], &photdata[j], sizeof (PhotPars));
    5041  }
    51   ConvertStruct ((char *) subset, sizeof (PhotPars), Nmatch, "photpars");
    52   fits_add_rows (&table, (char *) subset, Nmatch, sizeof (PhotPars));
     42
     43  /* open file for output */
     44  f = fopen (filename, "w");
     45  if (f == NULL) {
     46    fprintf (stderr, "ERROR: can't open output file %s\n", filename);
     47    exit (1);
     48  }
     49
     50  /* create primary header */
     51  fits_init_header (&header);   
     52  header.extend = TRUE;
     53  fits_create_header (&header);
     54  fits_create_matrix (&header, &matrix);
     55  fits_print (&header, "NEXTEND", "%d", 1, 1);
     56
     57  ftable.header = &theader;
     58  fits_table_set_PhotPars (&ftable, subset, Nmatch);
     59
     60  /* EXTNAME is set to ZERO_POINTS_3.0 by default */
     61  if (!strcmp (output.db, "trans")) {
     62    fits_modify (&theader, "EXTNAME", "%s", 1, "TRANS_POINTS_3.0");
     63  }
    5364
    5465  fits_write_header  (filename, &header);
    5566  fits_write_matrix  (filename, &matrix);
    5667  fits_write_Theader (filename, &theader);
    57   fits_write_table   (filename, &table);
     68  fits_write_table   (filename, &ftable);
     69  fclose (f);
    5870  exit (0);
    5971}
    6072
     73/** add ASCII table to autocode? **/
    6174void DumpFitsTable (char *filename, PhotPars *photdata, int *index, int Nkeep) {
    6275 
    … …  
    6780  FILE *f;
    6881  char *startstr, *stopstr, *datestr, *line;
    69   char *c1, *c2, *code, *photsys;
     82  char *c1, *c2, *code, *photsys, *extname;
    7083  int i;
    7184  unsigned int tsecond;
    … …  
    7992 
    8093  /* create table header */
    81   fits_create_table_header (&theader, "TABLE", ASCIIName);
     94  if (!strcmp (output.db, "phot")) {
     95    extname = strcreate ("IMAGE_ZPTS");
     96  } else {
     97    extname = strcreate ("SUMMARY_ZPTS");
     98  }
     99  fits_create_table_header (&theader, "TABLE", extname);
    82100   
    83101  /* add current date/time to header */
    … …  
    155173              newdata[0].K, newdata[0].X, startstr, stopstr,
    156174              c1, c2, newdata[0].Nmeas, newdata[0].Ntime, code, photsys, newdata[0].label);
    157     if (!fits_add_rows (&table, line, 1, strlen(line))) escape (IGNORE, "error writing dataline");
     175    if (!fits_add_rows (&table, line, 1, strlen(line))) {
     176      fprintf (stderr, "error writing dataline");
     177      exit (1);
     178    }
    158179
    159180    free (line);

  • trunk/Ohana/src/imregister/spreg/output.c

    r3509 r3536  
    6868  fits_fwrite_table   (f, &ftable);
    6969  fclose (f);
    70 
    7170  exit (0);
    7271}

  • trunk/Ohana/src/imregister/src/photreg.c

    r2823 r3536  
    11# include "imregister.h"
    22# include "photreg.h"
    3 static char *version = "photreg $Revision: 1.3 $";
     3static char *version = "photreg $Revision: 1.4 $";
    44
    55int main (int argc, char **argv) {
    66 
    7   int status;
    8   PhotPars newdata;
     7  char *filename;
     8  PhotPars newdata, *photdata;
     9  VTable vtable;
     10  FITS_DB db;
    911 
    10   /* data values are set in args by matching flags */
    1112  get_version (argc, argv, version);
    1213  regargs (argc, argv, &newdata);
    1314
    14   init_db ();
    15   status = load_db ();
    16   if (!status) {
    17     create_db ();
     15  db.lockstate = LCK_HARD;
     16  db.timeout   = 300.0;
     17  fits_db_init (&db);
     18
     19  if (!strcmp (output.db, "phot")) {
     20    filename = PhotDB;
     21  } else {
     22    filename = TransDB;
    1823  }
    19   append_db (&newdata, 1);
     24
     25  if (!fits_db_lock (&db, filename)) {
     26    fits_db_close (&db);
     27    exit (1);
     28  }
     29  if (db.dbstate == LCK_EMPTY) {
     30    fits_init_header (&db.header);   
     31    db.header.extend = TRUE;
     32    fits_create_header (&db.header);
     33    fits_create_matrix (&db.header, &db.matrix);
     34    fits_print (&db.header, "NEXTEND", "%d", 1, 1);
     35    db.ftable.header = &db.theader;
     36    fits_table_set_PhotPars (&db.ftable, NULL, 0);
     37    /* EXTNAME is set to ZERO_POINTS_3.0 by default */
     38    if (!strcmp (output.db, "trans")) {
     39      fits_modify (&db.theader, "EXTNAME", "%s", 1, "TRANS_POINTS_3.0");
     40    }
     41  } else { 
     42    if (!fits_db_load (&db)) {
     43      fits_db_close (&db);
     44      exit (1);
     45    }
     46  }
     47
     48  /** we may later want to pull this out and put it elsewhere **/
     49  fits_convert_PhotPars (&newdata, sizeof (PhotPars), 1);
     50  fits_table_to_vtable (&db.ftable, &vtable, 0, 1);
     51  fits_db_update (&db, &vtable);
     52  fits_db_close (&db);
     53  fits_db_free (&db);
    2054
    2155  fprintf (stderr, "SUCCESS\n");
    2256  exit (0);
     57}
    2358
    24 }
     59  /* data values are set in args by matching flags */
     60
     61/*** stick the header, table, theader, ftable creation in a single API? ***/

  • trunk/Ohana/src/imregister/src/photsearch.c

    r2823 r3536  
    11# include "imregister.h"
    22# include "photreg.h"
    3 static char *version = "photsearch $Revision: 1.3 $";
     3static char *version = "photsearch $Revision: 1.4 $";
    44
    55int main (int argc, char **argv) {
    66
    7   int status, Nmatch;
     7  char *filename;
     8  int status, Nmatch, Nphotpars;
    89  int *match;
     10  FITS_DB db;
     11  PhotPars *photpars;
     12  PhotParsOld *photpars_old;
    913
    10   /* db selection is set in args, based on -trans */
    1114  get_version (argc, argv, version);
    1215  args (argc, argv);
    1316
    14   init_db ();
    15   status = load_db ();
    16   if (!status) {
    17     close_db ();
    18     exit (0);
     17  db.lockstate = (output.modify || output.delete) ? LCK_HARD : LCK_SOFT;
     18  db.timeout   = 300.0;
     19  fits_db_init (&db);
     20
     21  if (!strcmp (output.db, "phot")) {
     22    filename = PhotDB;
     23  } else {
     24    filename = TransDB;
    1925  }
    20   if (!output.modify && !output.delete) close_db ();
    2126
    22   match = match_criteria (&Nmatch);
     27  if (!fits_db_lock (&db, filename)) {
     28    fits_db_close (&db);
     29    exit (1);
     30  }
     31 
     32  if (!fits_db_load (&db)) {
     33    fits_db_close (&db);
     34    exit (1);
     35  }
    2336
    24   if (output.delete) DeleteSubset (match, Nmatch);
     37  if (!output.modify && !output.delete) fits_db_close (&db);
    2538
    26   OutputSubset (match, Nmatch);
     39  /* add test to EXTNAME? */
     40  if (output.convert) {
     41    photpars_old = fits_table_get_PhotParsOld (&db.ftable, &Nphotpars);
     42    photpars = PhotParsOld_to_PhotPars (photpars_old, Nphotpars);
     43  } else {
     44    photpars = fits_table_get_PhotPars (&db.ftable, &Nphotpars);
     45  }
     46
     47  match = match_criteria (photpars, Nphotpars, &Nmatch);
     48
     49  if (output.delete) DeleteSubset (&db, photpars, Nphotpars, match, Nmatch);
     50
     51  OutputSubset (photpars, Nphotpars, match, Nmatch);
    2752  exit (0);
    2853}
     54
     55  /* db selection is set in args, based on -trans */
     56
     57/* valid EXTNAME values:
     58
     59   phot, !output.convert, bintable: "ZERO_POINTS_3.0"
     60   phot, !output.convert, table:    "IMAGE_ZPTS"
     61
     62   trans, !output.convert, bintable: "TRANS_POINTS_3.0"
     63   trans, !output.convert, table:    "SUMMARY_ZPTS"
     64
     65   phot, !output.convert, bintable: "ZERO_POINTS"
     66   phot, !output.convert, table:    "IMAGE_ZPTS"
     67
     68   trans, !output.convert, bintable: "TRANS_POINTS"
     69   trans, !output.convert, table:    "SUMMARY_ZPTS"
     70
     71*/

  • trunk/Ohana/src/imregister/src/spregister.c

    r3509 r3536  
    11# include "imregister.h"
    22# include "spreg.h"
    3 static char *version = "spregister $Revision: 1.4 $";
     3static char *version = "spregister $Revision: 1.5 $";
    44
    55int main (int argc, char **argv) {
    … …  
    2828  }
    2929  if (db.dbstate == LCK_EMPTY) {
    30     /* create db header & matrix */
     30    fits_init_header (&db.header);   
     31    db.header.extend = TRUE;
     32    fits_create_header (&db.header);
     33    fits_create_matrix (&db.header, &db.matrix);
     34    fits_print (&db.header, "NEXTEND", "%d", 1, 1);
     35    db.ftable.header = &db.theader;
     36    fits_table_set_Spectrum (&db.ftable, NULL, 0);
    3137  } else { 
    3238    if (!fits_db_load (&db)) {

  • trunk/Ohana/src/imregister/src/spsearch.c

    r3509 r3536  
    11# include "imregister.h"
    22# include "spreg.h"
    3 static char *version = "spsearch $Revision: 1.3 $";
     3static char *version = "spsearch $Revision: 1.4 $";
    44
    55int main (int argc, char **argv) {
    … …  
    1414  db.lockstate = (output.modify || output.delete) ? LCK_HARD : LCK_SOFT;
    1515  db.timeout   = 300.0;
    16 
    1716  fits_db_init (&db);
    1817

  • trunk/Ohana/src/libautocode/Makefile

    r3519 r3536  
    2727        @echo done autocode
    2828
     29# remember to add entries here to libohana/Makefile:AOBJ as well
    2930LIBOBJ = \
     31$(SRC)/photreg.$(ARCH).o \
     32$(SRC)/photreg-old.$(ARCH).o \
    3033$(SRC)/smpdata.$(ARCH).o \
    3134$(SRC)/spectrum.$(ARCH).o \
    … …  
    3336
    3437LIBINC = \
     38$(INC)/photreg.h \
     39$(INC)/photreg-old.h \
    3540$(INC)/smpdata.h \
    3641$(INC)/spectrum.h \

  • trunk/Ohana/src/libautocode/def/common.h

    r3517 r3536  
    3131# endif
    3232
     33# define e_time unsigned int
     34
     35/*** this file uses data types which must have fixed sizes regardless
     36     of the platform.  It originally used the basic C primitives:
     37       float, double, int, short int, unsigned long int, etc.
     38     this breaks under 64 bit (and probably on other systems).
     39     I should define internal data types which should be set by the
     40     use of # define statements if needed.  I will cheat for now and use
     41     the time_t to replace unsigned long int in this file
     42***/
     43

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

    r3515 r3536  
    1 # name of structure type
    21STRUCT  Spectrum
    32EXTNAME SPECTRUM_DATABASE

  • trunk/Ohana/src/libautocode/generate

    r3515 r3536  
    103103        if ($type eq "short")  { $pt1 = "I"; }
    104104        if ($type eq "int")    { $pt1 = "J"; }
     105        if ($type eq "e_time") { $pt1 = "J"; }
    105106        if ($type eq "float")  { $pt1 = "E"; }
    106107        if ($type eq "double") { $pt1 = "D"; }
    … …  
    125126        if ($type eq "short")  { $pt1 = sprintf "I%s", $length; }
    126127        if ($type eq "int")    { $pt1 = sprintf "I%s", $length; }
     128        if ($type eq "e_time") { $pt1 = sprintf "I%s", $length; }
    127129        if ($type eq "float")  { $pt1 = sprintf "F%s", $length; }
    128130        if ($type eq "double") { $pt1 = sprintf "F%s", $length; }
    … …  
    181183            $n = 2;
    182184        }
    183         if ($type eq "float")  {
     185        if ($type eq "int")    {
    184186            $T = "WORD";
    185187            $n = 4;
    186188        }
    187         if ($type eq "int")    {
     189        if ($type eq "e_time")    {
     190            $T = "WORD";
     191            $n = 4;
     192        }
     193        if ($type eq "float")  {
    188194            $T = "WORD";
    189195            $n = 4;
    … …  
    217223            }
    218224        }
     225        if ($type eq "byte")   { $Nbytes += 1; }
     226        if ($type eq "short")  { $Nbytes += 2; }
     227        if ($type eq "int")    { $Nbytes += 4; }
     228        if ($type eq "e_time") { $Nbytes += 4; }
     229        if ($type eq "float")  { $Nbytes += 4; }
    219230        if ($type eq "double") { $Nbytes += 8; }
    220         if ($type eq "int")    { $Nbytes += 4; }
    221         if ($type eq "short")  { $Nbytes += 2; }
    222         if ($type eq "float")  { $Nbytes += 4; }
    223231    }
    224232    return ($Nbytes);

  • trunk/Ohana/src/libohana/Makefile

    r3522 r3536  
    4848
    4949AOBJ = \
     50$(ASRC)/photreg.$(ARCH).o \
     51$(ASRC)/photreg-old.$(ARCH).o \
    5052$(ASRC)/smpdata.$(ARCH).o \
    5153$(ASRC)/spectrum.$(ARCH).o \
    … …  
    7880        rm -f */*.o
    7981        rm -f */*.a
    80 #       cd $(AUTO) && make clean
     82        cd $(AUTO) && make clean
    8183
    8284dist: clean

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

    r3517 r3536  
    66# define LONEOS    0
    77# define PANSTARRS 0
    8 
    9 /*** this file uses data types which must have fixed sizes regardless
    10      of the platform.  It originally used the basic C primitives:
    11        float, double, int, short int, unsigned long int, etc.
    12      this breaks under 64 bit (and probably on other systems).
    13      I should define internal data types which should be set by the
    14      use of # define statements if needed.  I will cheat for now and use
    15      the time_t to replace unsigned long int in this file
    16 ***/
    17 
    18 # define e_time unsigned int
    198
    209/* image data modes in RegImage */
    … …  
    132121void coords_precess (double *ra, double *dec, double in_epoch, double out_epoch);
    133122
     123# include <autocode.h>
     124
    134125# if (LONEOS)
    135126# include <loneos.h>
    … …  
    144135# endif
    145136
    146 # include <autocode.h>
    147 
    148137/* these functions refer to the DVO structures define in the includes above */
    149138int   Fread (void *ptr, int size, int nitems, FILE *f, char *type);

  • trunk/Ohana/src/libohana/include/elixir.h

    r3508 r3536  
    6161  char filename[256];
    6262} DetReg;    /* 416 bytes */
    63 
    64 /* Instant Zeropoint structure */
    65 typedef struct {
    66   float ZP;                   /* measured zero point */
    67   float ZPo;                  /* expected zero point */
    68   float dZP;                  /* error on zero point */
    69   float K;                    /* airmass term used */
    70   float X;                    /* color term used */
    71   e_time tstart;   /* start time of observation */
    72   e_time tstop;    /* end time of observation */
    73   short int c1;               /* photcode for color term */
    74   short int c2;               /* photcode for color term */
    75   short int photcode;         /* appropriate photcode */
    76   char label[64];
    77   short int refcode;          /* reference photometry system */
    78   int Ntime;                  /* number of measurement times */
    79   int Nmeas;                  /* number of data points */
    80 } PhotPars;    /* 108 bytes */
    8163
    8264/* average data as stored in the LONEOS database */

  • trunk/Ohana/src/libohana/include/loneos.h

    r3508 r3536  
    5151  char filename[256];
    5252} DetReg;    /* 416 bytes */
    53 
    54 /* Instant Zeropoint structure */
    55 typedef struct {
    56   float ZP;                   /* measured zero point */
    57   float ZPo;                  /* expected zero point */
    58   float dZP;                  /* error on zero point */
    59   float K;                    /* airmass term used */
    60   float X;                    /* color term used */
    61   e_time tstart;   /* start time of observation */
    62   e_time tstop;    /* end time of observation */
    63   short int c1;               /* photcode for color term */
    64   short int c2;               /* photcode for color term */
    65   short int photcode;         /* appropriate photcode */
    66   char label[64];
    67   short int refcode;          /* reference photometry system */
    68   int Ntime;                  /* number of measurement times */
    69   int Nmeas;                  /* number of data points */
    70 } PhotPars;    /* 108 bytes */
    7153
    7254/* average data as stored in the LONEOS database -- must be translated on load */

  • trunk/Ohana/src/libohana/include/panstarrs.h

    r3508 r3536  
    5151  char filename[256];
    5252} DetReg;    /* 416 bytes */
    53 
    54 /* Instant Zeropoint structure */
    55 typedef struct {
    56   float ZP;                   /* measured zero point */
    57   float ZPo;                  /* expected zero point */
    58   float dZP;                  /* error on zero point */
    59   float K;                    /* airmass term used */
    60   float X;                    /* color term used */
    61   e_time tstart;   /* start time of observation */
    62   e_time tstop;    /* end time of observation */
    63   short int c1;               /* photcode for color term */
    64   short int c2;               /* photcode for color term */
    65   short int photcode;         /* appropriate photcode */
    66   char label[64];
    67   short int refcode;          /* reference photometry system */
    68   int Ntime;                  /* number of measurement times */
    69   int Nmeas;                  /* number of data points */
    70 } PhotPars;    /* 108 bytes */
    7153
    7254/* average data as stored in the LONEOS database */
Note: See TracChangeset for help on using the changeset viewer.