IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 39998


Ignore:
Timestamp:
Mar 6, 2017, 3:12:03 PM (9 years ago)
Author:
eugene
Message:

fix build to allow parse_time, but do not actually use it; set tzero to 1 and exptime to 1

Location:
trunk/Ohana/src/getstar
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/Ohana/src/getstar/Makefile

    r24914 r39998  
    5353$(SRC)/Shutdown.$(ARCH).o                \
    5454$(SRC)/SetSignals.$(ARCH).o              \
     55$(SRC)/parse_time.$(ARCH).o          \
    5556$(SRC)/ReadImageFiles.$(ARCH).o          \
    5657$(SRC)/ReadImageHeader.$(ARCH).o         \
    … …  
    7071$(SRC)/Shutdown.$(ARCH).o                \
    7172$(SRC)/SetSignals.$(ARCH).o              \
     73$(SRC)/parse_time.$(ARCH).o          \
    7274$(SRC)/ReadImageFiles.$(ARCH).o          \
    7375$(SRC)/ReadImageHeader.$(ARCH).o         \

  • trunk/Ohana/src/getstar/include/dvoImageOverlaps.h

    r37807 r39998  
    11# include <ohana.h>
    22# include <dvo.h>
     3# include <ReadImageFiles.h>
    34# include <signal.h>
    4 # include <glob.h>
    55
    66enum {NONE, SIMPLE_CMP, SIMPLE_CMF, SIMPLE_MEF, MOSAIC_CMP, MOSAIC_CMF, MOSAIC_MEF, MOSAIC_PHU};
    … …  
    2929int  SetSignals       PROTO((void));
    3030
    31 Image *ReadImageFiles (char *filename, off_t *Nimages);
    32 int ReadImageHeader (Header *header, Image *image);
    3331off_t *MatchImage (Image *dbImages, off_t NdbImages, Image *image, off_t *Nmatch);
    3432int ListImageOverlaps (Image *dbImages, Image *image, off_t *matches, off_t Nmatches);

  • trunk/Ohana/src/getstar/include/dvoImagesAtCoords.h

    r31238 r39998  
    11# include <ohana.h>
    22# include <dvo.h>
     3# include <ReadImageFiles.h>
    34# include <signal.h>
    4 # include <glob.h>
    55
    66enum {NONE, SIMPLE_CMP, SIMPLE_CMF, SIMPLE_MEF, MOSAIC_CMP, MOSAIC_CMF, MOSAIC_MEF, MOSAIC_PHU};
    … …  
    5151int  SetSignals       PROTO((void));
    5252
    53 Image *ReadImageFiles (char *filename, off_t *Nimages);
    54 int ReadImageHeader (Header *header, Image *image);
    5553off_t MatchCoords (Image *dbImages, off_t NdbImages, Point *points, int Npoints);
    56 
    5754int GetFileMode (Header *header);

  • trunk/Ohana/src/getstar/src/ConfigInit_coords.c

    r27435 r39998  
    2727  sprintf (ImageCat, "%s/Images.dat", CATDIR);
    2828
     29  /* used by parse_time to find time-related keywords */
     30  strcpy (DateKeyword, "NONE");
     31  strcpy (DateMode, "NONE");
     32  strcpy (UTKeyword, "NONE");
     33  strcpy (JDKeyword, "NONE");
     34  strcpy (MJDKeyword, "NONE");
     35  ScanConfig (config, "DATE-KEYWORD",           "%s",  0, DateKeyword);
     36  ScanConfig (config, "DATE-MODE",              "%s",  0, DateMode);
     37  ScanConfig (config, "UT-KEYWORD",             "%s",  0, UTKeyword);
     38  ScanConfig (config, "MJD-KEYWORD",            "%s",  0, MJDKeyword);
     39  ScanConfig (config, "JD-KEYWORD",             "%s",  0, JDKeyword);
     40
     41  ScanConfig (config, "EXPTIME-KEYWORD",        "%s",  0, ExptimeKeyword);
     42
    2943  if (*CATMODE == 0) strcpy (CATMODE, "RAW");
    3044  if (*CATFORMAT == 0) strcpy (CATFORMAT, "ELIXIR");

  • trunk/Ohana/src/getstar/src/ConfigInit_overlaps.c

    r27435 r39998  
    2727  sprintf (ImageCat, "%s/Images.dat", CATDIR);
    2828
     29  /* used by parse_time to find time-related keywords */
     30  strcpy (DateKeyword, "NONE");
     31  strcpy (DateMode, "NONE");
     32  strcpy (UTKeyword, "NONE");
     33  strcpy (JDKeyword, "NONE");
     34  strcpy (MJDKeyword, "NONE");
     35  ScanConfig (config, "DATE-KEYWORD",           "%s",  0, DateKeyword);
     36  ScanConfig (config, "DATE-MODE",              "%s",  0, DateMode);
     37  ScanConfig (config, "UT-KEYWORD",             "%s",  0, UTKeyword);
     38  ScanConfig (config, "MJD-KEYWORD",            "%s",  0, MJDKeyword);
     39  ScanConfig (config, "JD-KEYWORD",             "%s",  0, JDKeyword);
     40
     41  ScanConfig (config, "EXPTIME-KEYWORD",        "%s",  0, ExptimeKeyword);
     42
    2943  if (*CATMODE == 0) strcpy (CATMODE, "RAW");
    3044  if (*CATFORMAT == 0) strcpy (CATFORMAT, "ELIXIR");

  • trunk/Ohana/src/getstar/src/ReadImageHeader.c

    r37807 r39998  
    4949  image[0].NY = Ny;
    5050
    51   // if (!gfits_scan (header, "TZERO",   "%d",  1, &image[0].tzero)) {
    52   // image[0].tzero = parse_time (header);
    53   // }
     51  /*
     52  if (!gfits_scan (header, "TZERO",   "%d",  1, &image[0].tzero)) {
     53    image[0].tzero = parse_time (header);
     54  }
     55  gfits_scan (header, ExptimeKeyword,  "%lf", 1, &tmp);
     56  image[0].exptime = tmp;
     57  */
     58  image[0].tzero = 1;
     59  image[0].exptime = 1;
    5460
    5561  /* only load astrometry, NAXIS1,2, and time if this is a MOSAIC_PHU (ctype is ....-DIS) */

  • trunk/Ohana/src/getstar/src/parse_time.c

    r12774 r39998  
    1 # include "addstar.h"
     1# include <ohana.h>
     2# include <dvo.h>
     3# include "ReadImageFiles.h"
    24
    35int parse_time (Header *header) {
    … …  
    5860  /* parse mode line */
    5961  uppercase (DateMode);
    60   for (Ny = 0, c = strchr (DateMode, 'Y'); c != (char ) NULL; c = strchr (c + 1, 'Y'), Ny++);
     62  for (Ny = 0, c = strchr (DateMode, 'Y'); c != (char *) NULL; c = strchr (c + 1, 'Y'), Ny++);
    6163  if ((Ny != 2) && (Ny != 4)) {
    6264    fprintf (stderr, "error in DATE-MODE format: %s\n", DateMode);
Note: See TracChangeset for help on using the changeset viewer.