IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 4828


Ignore:
Timestamp:
Aug 19, 2005, 5:10:19 PM (21 years ago)
Author:
eugene
Message:

modifications to use CATMODE, CATFORMAT

Location:
trunk/Ohana/src
Files:
33 edited

Legend:

Unmodified
Added
Removed

  • trunk/Ohana/src/gastro/Makefile

    r3303 r4828  
    1717# 
    1818INCS    =       -I$(INC) -I$(LINC) -I$(XINC)
    19 LIBS    =       -L$(LLIB) -lFITS -lohana -lm -lsocket -lnsl
     19LIBS    =       -L$(LLIB) -lohana -lFITS -lm -lsocket -lnsl
    2020CFLAGS  =       $(INCS)
    2121LFLAGS  =       $(LIBS)

  • trunk/Ohana/src/gastro/include/gastro.h

    r3466 r4828  
    3131char CDROM[256];
    3232char CATDIR[256];
     33char CATMODE[16];    /* raw, mef, split, mysql */
     34char CATFORMAT[16];  /* internal, elixir, loneos, panstarrs */
    3335char REFCAT[256];
    3436char HEADER[256];

  • trunk/Ohana/src/gastro/src/ConfigInit.c

    r2435 r4828  
    4444  ScanConfig (config, "ASTRO_REFCAT",      "%s",  0, REFCAT);
    4545  ScanConfig (config, "CATDIR",            "%s",  0, CATDIR);
     46  ScanConfig (config, "CATMODE",                "%s",  0, CATMODE);
     47  ScanConfig (config, "CATFORMAT",              "%s",  0, CATFORMAT);
    4648  ScanConfig (config, "ROUGH_ASTROMETRY",  "%s",  0, ROUGH_ASTROMETRY);
    4749  ScanConfig (config, "PHOTCODE_FILE",     "%s",  0, PhotCodeFile);
     50
     51  if (*CATMODE == 0) strcpy (CATMODE, "RAW");
     52  if (*CATFORMAT == 0) strcpy (CATFORMAT, "ELIXIR");
    4853
    4954  if (strcasecmp (ROUGH_ASTROMETRY, "header") &&

  • trunk/Ohana/src/gastro/src/gptolemy.c

    r4800 r4828  
    88  char filename[256], *fileroot, *filepath, *subdir;
    99  Catalog catalog;
     10
     11  strcpy (catalog.catmode, CATMODE);
    1012
    1113  filepath = pathname (fullpath);

  • trunk/Ohana/src/gastro2/include/gastro2.h

    r3520 r4828  
    114114char CDROM[256];
    115115char CATDIR[256];
     116char   CATMODE[16];    /* raw, mef, split, mysql */
     117char   CATFORMAT[16];  /* internal, elixir, loneos, panstarrs */
    116118char REFCAT[256];
    117119char HEADER[256];

  • trunk/Ohana/src/gastro2/src/ConfigInit.c

    r3390 r4828  
    4343  ScanConfig (config, "ASTRO_REFCAT",      "%s",  0, REFCAT);
    4444  ScanConfig (config, "CATDIR",            "%s",  0, CATDIR);
     45  ScanConfig (config, "CATMODE",           "%s",  0, CATMODE);
     46  ScanConfig (config, "CATFORMAT",         "%s",  0, CATFORMAT);
    4547  ScanConfig (config, "ROUGH_ASTROMETRY",  "%s",  0, ROUGH_ASTROMETRY);
    4648  ScanConfig (config, "PHOTCODE_FILE",     "%s",  0, PhotCodeFile);
    4749  ScanConfig (config, "GASTRO_MAX_NSTARS", "%d",  0, &GASTRO_MAX_NSTARS);
    4850  ScanConfig (config, "GASTRO_MAX_MAG_ERROR", "%lf", 0, &MAX_ERROR);
     51
     52  if (*CATMODE == 0) strcpy (CATMODE, "RAW");
     53  if (*CATFORMAT == 0) strcpy (CATFORMAT, "ELIXIR");
    4954
    5055  if (strcasecmp (ROUGH_ASTROMETRY, "header") &&

  • trunk/Ohana/src/gastro2/src/gptolemy2.c

    r4800 r4828  
    1010  GSCdata *stars;
    1111
    12   filepath = pathname (fullpath);
     12  strcpy (catalog.catmode, CATMODE);
     13
     14 filepath = pathname (fullpath);
    1315  fileroot = filebasename (fullpath);
    1416  subdir = filebasename (filepath);

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

    r3466 r4828  
    2222char   GSCFILE[256];
    2323char   CATDIR[256];
     24char   CATMODE[16];    /* raw, mef, split, mysql */
     25char   CATFORMAT[16];  /* internal, elixir, loneos, panstarrs */
    2426double DEFAULT_RADIUS, NSIGMA, SNLIMIT;
    2527double ZeroPt;

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

    r2490 r4828  
    4040  ScanConfig (config, "GSCFILE",                "%s", 0, GSCFILE);
    4141  ScanConfig (config, "CATDIR",                 "%s", 0, CATDIR);
     42  ScanConfig (config, "CATMODE",                "%s",  0, CATMODE);
     43  ScanConfig (config, "CATFORMAT",              "%s",  0, CATFORMAT);
    4244  ScanConfig (config, "MIN_SN_FSTAT",           "%lf", 0, &SNLIMIT);
    4345  ScanConfig (config, "PHOTCODE_FILE",          "%s", 0, PhotCodeFile);
    … …  
    5355  ScanConfig (config, "CCDNUM-KEYWORD",         "%s", 0, CCDNumKeyword);
    5456
     57  if (*CATMODE == 0) strcpy (CATMODE, "RAW");
     58  if (*CATFORMAT == 0) strcpy (CATFORMAT, "ELIXIR");
     59
    5560  if (!LoadPhotcodes (PhotCodeFile)) {
    5661    fprintf (stderr, "error loading photcodes\n");

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

    r2490 r4828  
    55  int Nsecfilt;
    66  char mode;
     7
     8  /* no autodetect for CATMODE yet */
     9  strcpy (catalog[0].catmode, CATMODE);
    710
    811  /* read catalog header */

  • trunk/Ohana/src/markrock/include/markrock.h

    r3466 r4828  
    2929char   GSCDIR[256];
    3030char   CATDIR[256];
     31char   CATMODE[16];    /* raw, mef, split, mysql */
     32char   CATFORMAT[16];  /* internal, elixir, loneos, panstarrs */
    3133char   RockCat[256];
    3234

  • trunk/Ohana/src/markrock/src/ConfigInit.c

    r2490 r4828  
    1818  /* used in other pipeline functions */
    1919  ScanConfig (config, "CATDIR",                 "%s",  0, CATDIR);
     20  ScanConfig (config, "CATMODE",                "%s",  0, CATMODE);
     21  ScanConfig (config, "CATFORMAT",              "%s",  0, CATFORMAT);
    2022
    2123  /* unique to markrock */
    … …  
    3638  ScanConfig (config, "ZERO_PT",                "%lf", 0, &ZERO_POINT);
    3739
     40  if (*CATMODE == 0) strcpy (CATMODE, "RAW");
     41  if (*CATFORMAT == 0) strcpy (CATFORMAT, "ELIXIR");
     42
    3843  if (!LoadPhotcodes (PhotCodeFile, &photcodes)) {
    3944    fprintf (stderr, "error loading photcodes\n");

  • trunk/Ohana/src/markrock/src/gcatalog.c

    r2490 r4828  
    99
    1010  mode = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
     11
     12  /* no autodetect for CATMODE yet */
     13  strcpy (catalog[0].catmode, CATMODE);
    1114
    1215  if (!load_catalog (catalog, mode, VERBOSE)) {

  • trunk/Ohana/src/markrock/src/wcatalog.c

    r2490 r4828  
    33wcatalog (Catalog *catalog) {
    44 
    5   int status;
    6   char filename[256];
     5  /* set catalog format (elixir, loneos, etc) */
     6  if (!strcmp (CATFORMAT, "INTERNAL")) {
     7    sprintf (catalog[0].average_format, "DVO_AVERAGE");
     8    sprintf (catalog[0].measure_format, "DVO_MEASURE");
     9  } else {
     10    sprintf (catalog[0].average_format, "DVO_AVERAGE_%s", CATFORMAT);
     11    sprintf (catalog[0].measure_format, "DVO_MEASURE_%s", CATFORMAT);
     12  }
    713
    8   fits_modify (&catalog[0].header, "MARKROCK", "%t", 1, TRUE);
     14  if (!save_catalog (catalog, VERBOSE)) {
     15    fprintf (stderr, "ERROR: failure saving catalog\n");
     16    exit (1);
     17  }
    918
    10   save_catalog (catalog, VERBOSE);
     19  /* free, initialize data structures */
    1120
    1221  if (catalog[0].Naverage) {
    … …  
    2635    catalog[0].Nsecfilt = 0;
    2736  }
    28 
    29   switch (status) {
    30   case 0:
    31     fprintf (stderr, "error saving catalog\n");
    32     exit (0);
    33   case 1:
    34   case 2:
    35     return (status);
    36   default:
    37     fprintf (stderr, "unknown exit status for save_catalog\n");
    38     return (FALSE);
    39   }
     37  fits_free_header (&catalog[0].header);
    4038}
    4139

  • trunk/Ohana/src/markstar/include/markstar.h

    r3466 r4828  
    88/* global variables set in parameter file */
    99char   CATDIR[256];
     10char   CATMODE[16];    /* raw, mef, split, mysql */
     11char   CATFORMAT[16];  /* internal, elixir, loneos, panstarrs */
     12
    1013char   GSCDIR[256];
    1114char   ImageCat[256];

  • trunk/Ohana/src/markstar/src/ConfigInit.c

    r2490 r4828  
    1919  ScanConfig (config, "IMAGE_CATALOG",   "%s",  0, ImageCat);
    2020  ScanConfig (config, "CATDIR",          "%s",  0, CATDIR);
     21  ScanConfig (config, "CATMODE",                "%s",  0, CATMODE);
     22  ScanConfig (config, "CATFORMAT",              "%s",  0, CATFORMAT);
     23
    2124  ScanConfig (config, "GSCDIR",          "%s",  0, GSCDIR);
    2225  ScanConfig (config, "GSCFILE",         "%s",  0, GSCFILE);
    … …  
    4447  ScanConfig (config, "PHOTCODE_FILE",          "%s", 0, PhotCodeFile);
    4548 
     49  if (*CATMODE == 0) strcpy (CATMODE, "RAW");
     50  if (*CATFORMAT == 0) strcpy (CATFORMAT, "ELIXIR");
     51
    4652  if (!LoadPhotcodes (PhotCodeFile, &photcodes)) {
    4753    fprintf (stderr, "error loading photcodes\n");

  • trunk/Ohana/src/markstar/src/gcatalog.c

    r2490 r4828  
    99
    1010  sprintf (filename, "%s/%s\0", CATDIR, catname);
     11
     12  /* no autodetect for CATMODE yet */
     13  strcpy (catalog[0].catmode, CATMODE);
    1114
    1215  mode = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;

  • trunk/Ohana/src/markstar/src/wcatalog.c

    r2490 r4828  
    11# include "markstar.h"
    22
    3 wcatalog (char *catname, Catalog *catalog) {
     3wcatalog (Catalog *catalog) {
    44 
    5   int status;
    6   char filename[256];
     5  /* set catalog format (elixir, loneos, etc) */
     6  if (!strcmp (CATFORMAT, "INTERNAL")) {
     7    sprintf (catalog[0].average_format, "DVO_AVERAGE");
     8    sprintf (catalog[0].measure_format, "DVO_MEASURE");
     9  } else {
     10    sprintf (catalog[0].average_format, "DVO_AVERAGE_%s", CATFORMAT);
     11    sprintf (catalog[0].measure_format, "DVO_MEASURE_%s", CATFORMAT);
     12  }
    713
    8   fits_modify (&catalog[0].header, "MARKSTAR", "%t", 1, TRUE);
    9 
    10   sprintf (filename, "%s/%s\0", CATDIR, catname);
    11   status = save_catalog (filename, catalog, VERBOSE);
     14  if (!save_catalog (catalog, VERBOSE)) {
     15    fprintf (stderr, "ERROR: failure saving catalog\n");
     16    exit (1);
     17  }
    1218
    1319  if (catalog[0].Naverage) {
    … …  
    2733    catalog[0].Nsecfilt = 0;
    2834  }
    29 
    30   switch (status) {
    31   case 0:
    32     exit (0);
    33   case 1:
    34   case 2:
    35     return (status);
    36   default:
    37     fprintf (stderr, "unknown exit status for save_catalog\n");
    38     return (FALSE);
    39   }
     35  fits_free_header (&catalog[0].header);
    4036}
    4137

  • trunk/Ohana/src/mosastro/include/mosastro.h

    r4805 r4828  
    108108char REFCAT[256];
    109109char CATDIR[256];
     110char   CATMODE[16];    /* raw, mef, split, mysql */
     111char   CATFORMAT[16];  /* internal, elixir, loneos, panstarrs */
    110112char ExptimeKeyword[256];
    111113char DateKeyword[256];

  • trunk/Ohana/src/mosastro/src/ConfigInit.c

    r3466 r4828  
    2727  GetConfig (config, "ASTRO_REFCAT",      "%s",  0, REFCAT);
    2828  ScanConfig (config, "CATDIR",           "%s",  0, CATDIR);
     29  ScanConfig (config, "CATMODE",                "%s",  0, CATMODE);
     30  ScanConfig (config, "CATFORMAT",              "%s",  0, CATFORMAT);
    2931  ScanConfig (config, "GSCFILE",          "%s",  0, GSCFILE);
    3032  ScanConfig (config, "GSCDIR",           "%s",  0, GSC_DIR);
    … …  
    4749  ScanConfig (config, "INST_BRIGHT",      "%lf", 0, &INST_BRIGHT);
    4850 
     51  if (*CATMODE == 0) strcpy (CATMODE, "RAW");
     52  if (*CATFORMAT == 0) strcpy (CATFORMAT, "ELIXIR");
     53
    4954  free (config);
    5055  free (file);

  • trunk/Ohana/src/mosastro/src/gptolemy.c

    r4800 r4828  
    66  Catalog catalog;
    77  StarData *stars;
     8
     9  /* no autodetect for CATMODE yet */
     10  strcpy (catalog.catmode, CATMODE);
    811
    912  Nstars = 0;

  • trunk/Ohana/src/photdbc/include/photdbc.h

    r4808 r4828  
    3232char   GSCFILE[256];
    3333char   CATDIR[256];
     34char   CATMODE[16];    /* raw, mef, split, mysql */
     35char   CATFORMAT[16];  /* internal, elixir, loneos, panstarrs */
    3436char   PhotCodeFile[256];
    3537

  • trunk/Ohana/src/photdbc/src/ConfigInit.c

    r2494 r4828  
    5151  WarnConfig (config, "GSCFILE",                "%s",  0, GSCFILE);
    5252  WarnConfig (config, "CATDIR",                 "%s",  0, CATDIR);
     53  ScanConfig (config, "CATMODE",                "%s",  0, CATMODE);
     54  ScanConfig (config, "CATFORMAT",              "%s",  0, CATFORMAT);
     55
    5356  WarnConfig (config, "PHOTCODE_FILE",          "%s",  0, PhotCodeFile);
    5457  WarnConfig (config, "ZERO_PT",                "%lf", 0, &ZERO_POINT);
    … …  
    6164  SetZeroPoint (ZERO_POINT);
    6265
     66  if (*CATMODE == 0) strcpy (CATMODE, "RAW");
     67  if (*CATFORMAT == 0) strcpy (CATFORMAT, "ELIXIR");
     68
    6369  if (!LoadPhotcodes (PhotCodeFile)) {
    6470    fprintf (stderr, "error loading photcodes\n");

  • trunk/Ohana/src/photdbc/src/gcatalog.c

    r4808 r4828  
    55  char mode;
    66
     7  /* no autodetect for CATMODE yet */
     8  strcpy (catalog[0].catmode, CATMODE);
     9
     10  /* read catalog header */
    711  mode = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
    8 
    912  if (!load_catalog (catalog, mode, VERBOSE)) {
    1013    fprintf (stderr, "ERROR: failure loading catalog %s\n", catalog[0].filename);

  • trunk/Ohana/src/photdbc/src/wcatalog.c

    r2494 r4828  
    33void wcatalog (Catalog *catalog) {
    44 
    5   fits_modify (&catalog[0].header, "NRPHOT", "%t", 1, TRUE);
     5  /* set catalog format (elixir, loneos, etc) */
     6  if (!strcmp (CATFORMAT, "INTERNAL")) {
     7    sprintf (catalog[0].average_format, "DVO_AVERAGE");
     8    sprintf (catalog[0].measure_format, "DVO_MEASURE");
     9  } else {
     10    sprintf (catalog[0].average_format, "DVO_AVERAGE_%s", CATFORMAT);
     11    sprintf (catalog[0].measure_format, "DVO_MEASURE_%s", CATFORMAT);
     12  }
    613
    7   save_catalog (catalog, VERBOSE);
     14  if (!save_catalog (catalog, VERBOSE)) {
     15    fprintf (stderr, "ERROR: failure saving catalog\n");
     16    exit (1);
     17  }
    818
    919  if (catalog[0].Naverage) {
    … …  
    2333    catalog[0].Nsecfilt = 0;
    2434  }
     35  fits_free_header (&catalog[0].header);
    2536}

  • trunk/Ohana/src/relphot/include/relphot.h

    r4810 r4828  
    4040char   GSCFILE[256];
    4141char   CATDIR[256];
     42char   CATMODE[16];    /* raw, mef, split, mysql */
     43char   CATFORMAT[16];  /* internal, elixir, loneos, panstarrs */
    4244char   CameraConfig[256];
    4345

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

    r4796 r4828  
    3838  GetConfig (config, "GSCFILE",                "%s",  0, GSCFILE);
    3939  GetConfig (config, "CATDIR",                 "%s",  0, CATDIR);
     40  ScanConfig (config, "CATMODE",                "%s",  0, CATMODE);
     41  ScanConfig (config, "CATFORMAT",              "%s",  0, CATFORMAT);
    4042  GetConfig (config, "PHOTCODE_FILE",          "%s",  0, PhotCodeFile);
    4143  GetConfig (config, "ZERO_PT",                "%lf", 0, &ZERO_POINT);
    … …  
    4547  GetConfig (config, "RELPHOT_GRID_BINNING",   "%d",  0, &RELPHOT_GRID_BINNING);
    4648  GetConfig (config, "CAMERA_CONFIG",          "%s",  0, CameraConfig);
     49
     50  if (*CATMODE == 0) strcpy (CATMODE, "RAW");
     51  if (*CATFORMAT == 0) strcpy (CATFORMAT, "ELIXIR");
    4752
    4853  if (!LoadPhotcodes (PhotCodeFile)) {

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

    r4796 r4828  
    44 
    55  char mode;
     6
     7  /* no autodetect for CATMODE yet */
     8  strcpy (catalog[0].catmode, CATMODE);
    69
    710  if (FINAL) {

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

    r2486 r4828  
    33void wcatalog (Catalog *catalog) {
    44 
    5   fits_modify (&catalog[0].header, "NRPHOT", "%t", 1, TRUE);
     5  /* set catalog format (elixir, loneos, etc) */
     6  if (!strcmp (CATFORMAT, "INTERNAL")) {
     7    sprintf (catalog[0].average_format, "DVO_AVERAGE");
     8    sprintf (catalog[0].measure_format, "DVO_MEASURE");
     9  } else {
     10    sprintf (catalog[0].average_format, "DVO_AVERAGE_%s", CATFORMAT);
     11    sprintf (catalog[0].measure_format, "DVO_MEASURE_%s", CATFORMAT);
     12  }
    613
    7   save_catalog (catalog, VERBOSE);
     14  if (!save_catalog (catalog, VERBOSE)) {
     15    fprintf (stderr, "ERROR: failure saving catalog\n");
     16    exit (1);
     17  }
    818
    919  if (catalog[0].Naverage) {
    … …  
    2333    catalog[0].Nsecfilt = 0;
    2434  }
     35  fits_free_header (&catalog[0].header);
    2536}

  • trunk/Ohana/src/uniphot/include/uniphot.h

    r4809 r4828  
    4141char         ImageCat[256];
    4242char         CATDIR[256];
     43char         CATMODE[16];    /* raw, mef, split, mysql */
     44char         CATFORMAT[16];  /* internal, elixir, loneos, panstarrs */
    4345char         STATMODE[64];
    4446int          VERBOSE;

  • trunk/Ohana/src/uniphot/src/ConfigInit.c

    r2492 r4828  
    1818
    1919  ScanConfig (config, "CATDIR",                 "%s",  0, CATDIR);
     20  ScanConfig (config, "CATMODE",                "%s",  0, CATMODE);
     21  ScanConfig (config, "CATFORMAT",              "%s",  0, CATFORMAT);
     22
    2023  ScanConfig (config, "IMAGE_CATALOG",          "%s",  0, ImageCat);
    2124  ScanConfig (config, "PHOTCODE_FILE",          "%s",  0, PhotCodeFile);
    … …  
    2629  free (file);
    2730
     31  if (*CATMODE == 0) strcpy (CATMODE, "RAW");
     32  if (*CATFORMAT == 0) strcpy (CATFORMAT, "ELIXIR");
     33
    2834  if (!LoadPhotcodes (PhotCodeFile)) {
    2935    fprintf (stderr, "error loading photcodes\n");

  • trunk/Ohana/src/uniphot/src/gcatalog.c

    r2492 r4828  
    44
    55  int mode;
     6
     7  /* no autodetect for CATMODE yet */
     8  strcpy (catalog[0].catmode, CATMODE);
    69
    710  mode = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;

  • trunk/Ohana/src/uniphot/src/wcatalog.c

    r4797 r4828  
    33void wcatalog (Catalog *catalog) {
    44
     5  /* set catalog format (elixir, loneos, etc) */
     6  if (!strcmp (CATFORMAT, "INTERNAL")) {
     7    sprintf (catalog[0].average_format, "DVO_AVERAGE");
     8    sprintf (catalog[0].measure_format, "DVO_MEASURE");
     9  } else {
     10    sprintf (catalog[0].average_format, "DVO_AVERAGE_%s", CATFORMAT);
     11    sprintf (catalog[0].measure_format, "DVO_MEASURE_%s", CATFORMAT);
     12  }
     13
    514  /** write out catalog, free memory **/
    6   save_catalog (catalog, VERBOSE);
     15  if (!save_catalog (catalog, VERBOSE)) {
     16    fprintf (stderr, "ERROR: failure saving catalog\n");
     17    exit (1);
     18  }
    719     
    820  if (catalog[0].Naverage) {
    … …  
    2234    catalog[0].Nsecfilt = 0;
    2335  }
     36  fits_free_header (&catalog[0].header);
    2437  unlock_catalog (catalog);
    2538}
Note: See TracChangeset for help on using the changeset viewer.