IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Jun 12, 2015, 6:18:23 PM (11 years ago)
Author:
eugene
Message:

merge changes from EAM dev branch ohana.20150429

Location:
trunk/Ohana
Files:
15 edited

Legend:

Unmodified
Added
Removed

  • trunk/Ohana

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

    r38062 r38441  
    213213char        *BOUNDARY_TREE;
    214214
    215 int SET_MREL_VERSION;
     215// XXX deprecate int SET_MREL_VERSION;
    216216int IS_DIFF_DB;
    217217
    … …  
    494494
    495495int launch_region_hosts (RegionHostTable *regionHosts);
    496 int strextend (char *input, char *format,...);
    497496
    498497Image *ImageTableLoad(char *filename, off_t *nimage);

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

    r37807 r38441  
    77  FITS_DB db;
    88
     9  gfits_db_init (&db);
    910  db.mode   = dvo_catalog_catmode (CATMODE);
    1011  db.format = dvo_catalog_catformat (CATFORMAT);
    … …  
    2728  // convert database table to internal structure (binary to Image)
    2829  // 'image' points to the same memory as db->ftable->buffer
    29   Image *image = gfits_table_get_Image (&db.ftable, &Nimage, &db.swapped);
     30  Image *image = gfits_table_get_Image (&db.ftable, &Nimage, &db.scaledValue, &db.nativeOrder);
    3031  if (!image) {
    3132    Shutdown ("ERROR: failed to read images");
    … …  
    4546
    4647  // setup image table format and lock
     48  gfits_db_init (&db);
    4749  db.mode   = dvo_catalog_catmode (CATMODE);
    4850  db.format = dvo_catalog_catformat (CATFORMAT);
     51
    4952  status    = dvo_image_lock (&db, filename, 60.0, LCK_XCLD);  // shorter timeout?
    5053  if (!status) Shutdown ("ERROR: failure to lock image catalog %s", db.filename);

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

    r37116 r38441  
    128128
    129129  for (i = 0; i < Ncatalog; i++) {
    130     // pass == -1 for anything other than the final pass
    131     switch (SET_MREL_VERSION) {
    132       case 0:
    133         setMrel_catalog (catalog, i, -1, flatcorr, &results, Nsecfilt);
    134         break;
    135       case 1:
    136         setMrel_catalog_alt (catalog, i, -1, flatcorr, &results, Nsecfilt);
    137         break;
    138       default:
    139         fprintf (stderr, "invalid setMrel version %d (use 0 or 1)\n", SET_MREL_VERSION);
    140         exit (2);
    141     }
     130    setMrel_catalog_alt (catalog, i, -1, flatcorr, &results, Nsecfilt);
    142131    SetMrelInfoAccum (&summary, &results);
    143132  }
    … …  
    175164
    176165  for (i = 0; i < Ncatalog; i++) {
    177     switch (SET_MREL_VERSION) {
    178       // case 0:
    179       // setMrel_catalog (catalog, i, pass, flatcorr, &results, Nsecfilt);
    180       // break;
    181       case 1:
    182         setMrel_catalog_alt (catalog, i, pass, flatcorr, &results, Nsecfilt);
    183         break;
    184       default:
    185         fprintf (stderr, "invalid setMrel version %d (use 1)\n", SET_MREL_VERSION);
    186         exit (2);
    187     }
     166    setMrel_catalog_alt (catalog, i, pass, flatcorr, &results, Nsecfilt);
    188167    SetMrelInfoAccum (&summary, &results);
    189168  }
    … …  
    293272
    294273    // pass == -1 for anything other than the final pass
    295     switch (SET_MREL_VERSION) {
    296       case 0:
    297         setMrel_catalog (catalog, i, -1, flatcorr, &results, Nsecfilt);
    298         break;
    299       case 1:
    300         setMrel_catalog_alt (catalog, i, -1, flatcorr, &results, Nsecfilt);
    301         break;
    302       default:
    303         fprintf (stderr, "invalid setMrel version %d (use 0 or 1)\n", SET_MREL_VERSION);
    304         exit (2);
    305     }
     274    setMrel_catalog_alt (catalog, i, -1, flatcorr, &results, Nsecfilt);
    306275    SetMrelInfoAccum (&threadinfo->summary, &results);
    307276  }

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

    r38062 r38441  
    7676  }
    7777
    78   SET_MREL_VERSION = 1;
    79   if ((N = get_argument (argc, argv, "-set-mrel-version"))) {
    80     remove_argument (N, &argc, argv);
    81     SET_MREL_VERSION = atof(argv[N]);
    82     remove_argument (N, &argc, argv);
    83   }
    84 
    8578  VERBOSE = VERBOSE2 = FALSE;
    8679  if ((N = get_argument (argc, argv, "-v"))) {
    … …  
    529522  }
    530523
    531   SET_MREL_VERSION = 1;
    532   if ((N = get_argument (argc, argv, "-set-mrel-version"))) {
    533     remove_argument (N, &argc, argv);
    534     SET_MREL_VERSION = atof(argv[N]);
    535     remove_argument (N, &argc, argv);
    536   }
    537 
    538524  VERBOSE = VERBOSE2 = FALSE;
    539525  if ((N = get_argument (argc, argv, "-v"))) {

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

    r37807 r38441  
    1111  // convert database table to internal structure (binary to Image)
    1212  // 'image' points to the same memory as db->ftable->buffer
    13   Image *image = gfits_table_get_Image (&db[0].ftable, &Nimage, &db[0].swapped);
     13  Image *image = gfits_table_get_Image (&db[0].ftable, &Nimage, &db[0].scaledValue, &db[0].nativeOrder);
    1414  if (!image) {
    1515      fprintf (stderr, "ERROR: failed to read images\n");

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

    r37116 r38441  
    245245  subcatalog[0].Nmeasure = Nmeasure;
    246246  subcatalog[0].Nsecfilt = catalog[0].Nsecfilt;
    247   subcatalog[0].Nsecf_mem = Naverage * catalog[0].Nsecfilt;
     247  subcatalog[0].Nsecfilt_mem = Naverage * catalog[0].Nsecfilt;
    248248
    249249  if (VERBOSE) {
    … …  
    368368  subcatalog[0].Nmeasure = Nmeasure;
    369369  subcatalog[0].Nsecfilt = oldcatalog[0].Nsecfilt;
    370   subcatalog[0].Nsecf_mem = Naverage * oldcatalog[0].Nsecfilt;
     370  subcatalog[0].Nsecfilt_mem = Naverage * oldcatalog[0].Nsecfilt;
    371371
    372372  return (TRUE);
    … …  
    461461  subcatalog[0].Nmeasure = Nmeasure;
    462462  subcatalog[0].Nsecfilt = catalog[0].Nsecfilt;
    463   subcatalog[0].Nsecf_mem = Naverage * catalog[0].Nsecfilt;
     463  subcatalog[0].Nsecfilt_mem = Naverage * catalog[0].Nsecfilt;
    464464
    465465  return (TRUE);

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

    r37037 r38441  
    11# include "relphot.h"
    22# define DEBUG 0
    3 
    4 int strextend (char *input, char *format,...) {
    5 
    6   char tmpextra[1024], tmpline[1024];
    7   va_list argp;
    8 
    9   va_start (argp, format);
    10   vsnprintf (tmpextra, 1024, format, argp);
    11   snprintf (tmpline, 1024, "%s %s", input, tmpextra);
    12   strcpy (input, tmpline);
    13 
    14   return TRUE;
    15 }
    163
    174int launch_region_hosts (RegionHostTable *regionHosts) {
    … …  
    5441    ImageTableSave (filename, host->image, host->Nimage);
    5542
    56     char command[1024];
    57     snprintf (command, 1024, "relphot %s", PhotcodeList);
    58     strextend (command, "-parallel-images %s", filename);
    59     strextend (command, "-region-hosts %s", REGION_FILE);
    60     strextend (command, "-region-hostID %d", host->hostID);
    61     strextend (command, "-D CATDIR %s", CATDIR);
    62     strextend (command, "-region %f %f %f %f", host->RminCat, host->RmaxCat, host->DminCat, host->DmaxCat);
    63     strextend (command, "-statmode %s", STATMODE);
    64     strextend (command, "-D CAMERA %s", CAMERA);
    65     strextend (command, "-D STAR_TOOFEW %d", STAR_TOOFEW);
    66     strextend (command, "-minerror %f", MIN_ERROR);
    67     strextend (command, "-cloud-limit %f", CLOUD_TOLERANCE);
     43    char *command = NULL;
     44    strextend (&command, "relphot %s", PhotcodeList);
     45    strextend (&command, "-parallel-images %s", filename);
     46    strextend (&command, "-region-hosts %s", REGION_FILE);
     47    strextend (&command, "-region-hostID %d", host->hostID);
     48    strextend (&command, "-D CATDIR %s", CATDIR);
     49    strextend (&command, "-region %f %f %f %f", host->RminCat, host->RmaxCat, host->DminCat, host->DmaxCat);
     50    strextend (&command, "-statmode %s", STATMODE);
     51    strextend (&command, "-D CAMERA %s", CAMERA);
     52    strextend (&command, "-D STAR_TOOFEW %d", STAR_TOOFEW);
     53    strextend (&command, "-minerror %f", MIN_ERROR);
     54    strextend (&command, "-cloud-limit %f", CLOUD_TOLERANCE);
    6855
    69     if (VERBOSE)             strextend (command, "-v");
    70     if (VERBOSE2)            strextend (command, "-vv");
    71     if (RESET)               strextend (command, "-reset");
    72     if (RESET_ZEROPTS)       strextend (command, "-reset-zpts");
    73     if (!KEEP_UBERCAL)       strextend (command, "-reset-ubercal");
    74     if (DophotSelect)        strextend (command, "-dophot %d", DophotValue);
    75     if (ImagSelect)          strextend (command, "-instmag %f %f", ImagMin, ImagMax);
    76     if (MaxDensityUse)       strextend (command, "-max-density %f", MaxDensityValue);
    77     if (SyntheticPhotometry) strextend (command, "-synthphot");
     56    if (VERBOSE)             strextend (&command, "-v");
     57    if (VERBOSE2)            strextend (&command, "-vv");
     58    if (RESET)               strextend (&command, "-reset");
     59    if (RESET_ZEROPTS)       strextend (&command, "-reset-zpts");
     60    if (!KEEP_UBERCAL)       strextend (&command, "-reset-ubercal");
     61    if (DophotSelect)        strextend (&command, "-dophot %d", DophotValue);
     62    if (ImagSelect)          strextend (&command, "-instmag %f %f", ImagMin, ImagMax);
     63    if (MaxDensityUse)       strextend (&command, "-max-density %f", MaxDensityValue);
     64    if (SyntheticPhotometry) strextend (&command, "-synthphot");
    7865
    79     if (UPDATE)              strextend (command, "-update");
    80     if (MOSAIC_ZEROPT)       strextend (command, "-mosaic");
    81     if (FREEZE_IMAGES)       strextend (command, "-imfreeze");
    82     if (FREEZE_MOSAICS)      strextend (command, "-mosfreeze");
    83     if (PARALLEL)            strextend (command, "-parallel");
    84     if (PARALLEL_MANUAL)     strextend (command, "-parallel-manual");
    85     if (PARALLEL_SERIAL)     strextend (command, "-parallel-serial");
     66    if (UPDATE)              strextend (&command, "-update");
     67    if (MOSAIC_ZEROPT)       strextend (&command, "-mosaic");
     68    if (FREEZE_IMAGES)       strextend (&command, "-imfreeze");
     69    if (FREEZE_MOSAICS)      strextend (&command, "-mosfreeze");
     70    if (PARALLEL)            strextend (&command, "-parallel");
     71    if (PARALLEL_MANUAL)     strextend (&command, "-parallel-manual");
     72    if (PARALLEL_SERIAL)     strextend (&command, "-parallel-serial");
    8673
    8774    // XXX deprecate this if we are happy with the new version
    88     if (SET_MREL_VERSION != 1) strextend (command, "-set-mrel-version %d", SET_MREL_VERSION);
     75    // if (SET_MREL_VERSION != 1) strextend (command, "-set-mrel-version %d", SET_MREL_VERSION);
    8976
    9077    fprintf (stderr, "command: %s\n", command);

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

    r37037 r38441  
    3434    // XXX keep in mind that not all catalogs are loaded
    3535    dvo_catalog_init (&catalog[i], TRUE);
     36    dvo_catalog_init (&tcatalog, TRUE);
    3637
    3738    // does this host ID match the desired location for the table?
    … …  
    4142    char hostfile[1024];
    4243    snprintf (hostfile, 1024, "%s/%s.cpt", hostpath, skylist[0].regions[i]->name);
    43     tcatalog.filename = hostID ? hostfile : skylist[0].filename[i];
    44 
    45     tcatalog.catformat = dvo_catalog_catformat (CATFORMAT);    // set the default catformat from config data
    46     tcatalog.catmode   = dvo_catalog_catmode (CATMODE);        // set the default catmode from config data
    47     tcatalog.catflags  = LOAD_AVES | LOAD_MEAS | LOAD_SECF;    // don't need to load all data at this point
    48     tcatalog.Nsecfilt  = GetPhotcodeNsecfilt ();               // set the desired number in case we need to create the catalog
     44    tcatalog.filename    = hostID ? hostfile : skylist[0].filename[i];
     45    tcatalog.catflags    = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT;    // don't need to load all data at this point
     46    tcatalog.Nsecfilt    = GetPhotcodeNsecfilt ();               // set the desired number in case we need to create the catalog
     47
     48    // tcatalog.catformat   = dvo_catalog_catformat (CATFORMAT);    // set the default catformat from config data
     49    // tcatalog.catmode     = dvo_catalog_catmode (CATMODE);        // set the default catmode from config data
     50    // tcatalog.catcompress = dvo_catalog_catcompress (CATCOMPRESS); // set the default catcompress from config data
    4951
    5052    if (!dvo_catalog_open (&tcatalog, skylist[0].regions[i], VERBOSE2, "r")) {
    … …  
    5254      exit (1);
    5355    }
    54     if (!tcatalog.Naves_disk) {
     56    if (!tcatalog.Naverage_disk) {
    5557        if (VERBOSE2) { fprintf (stderr, "no data in %s, skipping\n", tcatalog.filename); }
    5658        dvo_catalog_unlock (&tcatalog);
    … …  
    153155    // MaxDensityUse, MaxDensityValue
    154156
    155     char command[1024];
    156     snprintf (command, 1024, "relphot_client %s -load %s -hostID %d -D CATDIR %s -hostdir %s -region %f %f %f %f -D CAMERA %s -D MAG_LIM %f -D SIGMA_LIM %f",
     157    char *command = NULL;
     158    strextend (&command, "relphot_client %s -load %s -hostID %d -D CATDIR %s -hostdir %s -region %f %f %f %f -D CAMERA %s -D MAG_LIM %f -D SIGMA_LIM %f",
    157159              PhotcodeList, table->hosts[i].results, table->hosts[i].hostID, CATDIR, table->hosts[i].pathname, UserPatch.Rmin, UserPatch.Rmax, UserPatch.Dmin, UserPatch.Dmax, CAMERA, MAG_LIM, SIGMA_LIM);
    158160
    159     char tmpline[1024];
    160     if (VERBOSE)             { snprintf (tmpline, 1024, "%s -v",              command);                   strcpy (command, tmpline); }
    161     if (VERBOSE2)            { snprintf (tmpline, 1024, "%s -vv",             command);                   strcpy (command, tmpline); }
    162     if (RESET)               { snprintf (tmpline, 1024, "%s -reset",          command);                   strcpy (command, tmpline); }
    163     if (RESET_ZEROPTS)       { snprintf (tmpline, 1024, "%s -reset-zpts",     command);                   strcpy (command, tmpline); }
    164     if (!KEEP_UBERCAL)       { snprintf (tmpline, 1024, "%s -reset-ubercal",  command);                   strcpy (command, tmpline); }
    165     if (DophotSelect)        { snprintf (tmpline, 1024, "%s -dophot %d",      command, DophotValue);      strcpy (command, tmpline); }
    166     if (ImagSelect)          { snprintf (tmpline, 1024, "%s -instmag %f %f",  command, ImagMin, ImagMax); strcpy (command, tmpline); }
    167     if (MaxDensityUse)       { snprintf (tmpline, 1024, "%s -max-density %f", command, MaxDensityValue);  strcpy (command, tmpline); }
    168     if (SyntheticPhotometry) { snprintf (tmpline, 1024, "%s -synthphot",      command);                   strcpy (command, tmpline); }
     161    if (VERBOSE)             { strextend (&command, "-v"); }
     162    if (VERBOSE2)            { strextend (&command, "-vv"); }
     163    if (RESET)               { strextend (&command, "-reset"); }
     164    if (RESET_ZEROPTS)       { strextend (&command, "-reset-zpts"); }
     165    if (!KEEP_UBERCAL)       { strextend (&command, "-reset-ubercal"); }
     166    if (DophotSelect)        { strextend (&command, "-dophot %d", DophotValue); }
     167    if (ImagSelect)          { strextend (&command, "-instmag %f %f", ImagMin, ImagMax); }
     168    if (MaxDensityUse)       { strextend (&command, "-max-density %f", MaxDensityValue); }
     169    if (SyntheticPhotometry) { strextend (&command, "-synthphot"); }
    169170
    170171    if (TimeSelect) {
    171172      char *tstart = ohana_sec_to_date (TSTART);
    172173      char *tstop  = ohana_sec_to_date (TSTOP);
    173       snprintf (tmpline, 1024, "%s -time %s %s", command, tstart, tstop);
     174      strextend (&command, "-time %s %s", tstart, tstop);
    174175      free (tstart);
    175176      free (tstop);
    176       strcpy (command, tmpline);
    177177    }
    178178

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

    r37807 r38441  
    2121  // convert database table to internal structure (binary to Image)
    2222  // 'image' points to the same memory as db->ftable->buffer
    23   image = gfits_table_get_Image (&db[0].ftable, &Nimage, &db[0].swapped);
     23  image = gfits_table_get_Image (&db[0].ftable, &Nimage, &db[0].scaledValue, &db[0].nativeOrder);
    2424  if (!image) {
    2525      fprintf (stderr, "ERROR: failed to read images\n");

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

    r37907 r38441  
    5656    TIMESTAMP(time1);
    5757
    58     catalog.catformat = dvo_catalog_catformat (CATFORMAT);    // set the default catformat from config data
    59     catalog.catmode   = dvo_catalog_catmode (CATMODE);        // set the default catmode from config data
    60     catalog.catflags  = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
    61     catalog.Nsecfilt  = GetPhotcodeNsecfilt ();               // set the desired number in case we need to create the catalog
     58    // catalog.catformat   = dvo_catalog_catformat (CATFORMAT);    // set the default catformat from config data
     59    // catalog.catmode     = dvo_catalog_catmode (CATMODE);        // set the default catmode from config data
     60    // catalog.catcompress = dvo_catalog_catcompress (CATCOMPRESS); // set the default catcompress from config data
     61    catalog.catflags    = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
     62    catalog.Nsecfilt    = GetPhotcodeNsecfilt ();               // set the desired number in case we need to create the catalog
    6263
    6364    if (!dvo_catalog_open (&catalog, skylist[0].regions[i], VERBOSE, "w")) {
    … …  
    6566      exit (1);
    6667    }
    67     if (VERBOSE && (catalog.Naves_disk == 0)) {
     68    if (VERBOSE && (catalog.Naverage_disk == 0)) {
    6869        fprintf (stderr, "no data in %s, skipping\n", catalog.filename);
    6970        dvo_catalog_unlock (&catalog);
    … …  
    170171
    171172  int Ngroups;
    172   HostTableGroup *groups = HostTableGroups (table, &Ngroups);
     173  HostTableGroup *groups = HostTableGroupsUniqueMachines (table, &Ngroups);
    173174  // split the table into Ngroups, each with a unique set of machines (this avoids overloading the remote host machines)
    174175
    … …  
    206207    group->hosts[i][0].pathname = tmppath;
    207208
    208     char command[1024];
    209     snprintf (command, 1024, "relphot_client %s -update-catalogs %s -hostID %d -D CATDIR %s -hostdir %s -region %f %f %f %f -statmode %s -D CAMERA %s -D STAR_TOOFEW %d -minerror %f",
    210               PhotcodeList, imageFile, group->hosts[i][0].hostID, CATDIR, group->hosts[i][0].pathname, UserPatch.Rmin, UserPatch.Rmax, UserPatch.Dmin, UserPatch.Dmax, STATMODE, CAMERA, STAR_TOOFEW, MIN_ERROR);
     209    char *command = NULL;
     210    strextend (&command, "relphot_client %s -update-catalogs %s", PhotcodeList, imageFile);
     211    strextend (&command, "-hostID %d -D CATDIR %s -hostdir %s", group->hosts[i][0].hostID, CATDIR, group->hosts[i][0].pathname);
     212    strextend (&command, "-region %f %f %f %f", UserPatch.Rmin, UserPatch.Rmax, UserPatch.Dmin, UserPatch.Dmax);
     213    strextend (&command, "-statmode %s", STATMODE);
     214    strextend (&command, "-D CAMERA %s", CAMERA);
     215    strextend (&command, "-D STAR_TOOFEW %d -minerror %f", STAR_TOOFEW, MIN_ERROR);
    211216
    212217    // options & configs which affect relphot_client -update-catalogs
    … …  
    220225    // MIN_ERROR
    221226   
    222     char tmpline[1024];
    223     if (VERBOSE)          { snprintf (tmpline, 1024, "%s -v",                   command);                                         strcpy (command, tmpline); }
    224     if (VERBOSE2)         { snprintf (tmpline, 1024, "%s -vv",                  command);                                         strcpy (command, tmpline); }
    225     if (RESET)            { snprintf (tmpline, 1024, "%s -reset",               command);                                         strcpy (command, tmpline); }
    226     if (RESET_ZEROPTS)    { snprintf (tmpline, 1024, "%s -reset-zpts",          command);                                         strcpy (command, tmpline); }
    227     if (UPDATE)           { snprintf (tmpline, 1024, "%s -update",              command);                                         strcpy (command, tmpline); }
    228     if (IS_DIFF_DB)       { snprintf (tmpline, 1024, "%s -is-diff-db",          command);                                         strcpy (command, tmpline); }
    229     if (!KEEP_UBERCAL)    { snprintf (tmpline, 1024, "%s -reset-ubercal",       command);                                         strcpy (command, tmpline); }
    230     if (UPDATE_CATFORMAT) { snprintf (tmpline, 1024, "%s -update-catformat %s", command, UPDATE_CATFORMAT);                       strcpy (command, tmpline); }
    231     if (BOUNDARY_TREE)    { snprintf (tmpline, 1024, "%s -boundary-tree %s",    command, BOUNDARY_TREE);                          strcpy (command, tmpline); }
    232     if (SET_MREL_VERSION != 1) { snprintf (tmpline, 1024, "%s -set-mrel-version %d", command, SET_MREL_VERSION);                  strcpy (command, tmpline); }
    233     if (AreaSelect)       { snprintf (tmpline, 1024, "%s -area %f %f %f %f",    command, AreaXmin, AreaXmax, AreaYmin, AreaYmax); strcpy (command, tmpline); }
     227    if (VERBOSE)          { strextend (&command, "-v"); }
     228    if (VERBOSE2)         { strextend (&command, "-vv"); }
     229    if (RESET)            { strextend (&command, "-reset"); }
     230    if (RESET_ZEROPTS)    { strextend (&command, "-reset-zpts"); }
     231    if (UPDATE)           { strextend (&command, "-update"); }
     232    if (IS_DIFF_DB)       { strextend (&command, "-is-diff-db"); }
     233    if (!KEEP_UBERCAL)    { strextend (&command, "-reset-ubercal"); }
     234    if (UPDATE_CATFORMAT) { strextend (&command, "-update-catformat %s", UPDATE_CATFORMAT); }
     235    if (BOUNDARY_TREE)    { strextend (&command, "-boundary-tree %s", BOUNDARY_TREE); }
     236
     237    // deprecate
     238    // if (SET_MREL_VERSION != 1) { snprintf (tmpline, 1024, "%s -set-mrel-version %d", SET_MREL_VERSION); } // XXXX deprecate this...
     239
     240    if (AreaSelect)       { strextend (&command, "-area %f %f %f %f", AreaXmin, AreaXmax, AreaYmin, AreaYmax); }
    234241    if (TimeSelect) {
    235242      char *tstart = ohana_sec_to_date (TSTART);
    236243      char *tstop  = ohana_sec_to_date (TSTOP);
    237       snprintf (tmpline, 1024, "%s -time %s %s", command, tstart, tstop);
     244      strextend (&command, "-time %s %s", tstart, tstop);
    238245      free (tstart);
    239246      free (tstop);
    240       strcpy (command, tmpline);
    241247    }
    242248

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

    r37037 r38441  
    1818  /* register database handle with shutdown procedure */
    1919  set_db (&db);
     20  gfits_db_init (&db);
    2021  db.mode   = dvo_catalog_catmode (CATMODE);
    2122  db.format = dvo_catalog_catformat (CATFORMAT);
    … …  
    185186      // convert database table to internal structure (binary to Image)
    186187      // 'image' points to the same memory as db->ftable->buffer
    187       image = gfits_table_get_Image (&db.ftable, &Nimage, &db.swapped);
     188      image = gfits_table_get_Image (&db.ftable, &Nimage, &db.scaledValue, &db.nativeOrder);
    188189      if (!image) {
    189190        fprintf (stderr, "ERROR: failed to read images\n");

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

    r37807 r38441  
    3939    char hostfile[1024];
    4040    snprintf (hostfile, 1024, "%s/%s.cpt", hostpath, skylist[0].regions[i]->name);
    41     catalog.filename  = hostID ? hostfile : skylist[0].filename[i];
    42     catalog.catformat = dvo_catalog_catformat (CATFORMAT);    // set the default catformat from config data
    43     catalog.catmode   = dvo_catalog_catmode (CATMODE);        // set the default catmode from config data
    44     catalog.catflags  = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
    45     catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
     41    catalog.filename    = hostID ? hostfile : skylist[0].filename[i];
     42    // catalog.catformat   = dvo_catalog_catformat (CATFORMAT);    // set the default catformat from config data
     43    // catalog.catmode     = dvo_catalog_catmode (CATMODE);        // set the default catmode from config data
     44    // catalog.catcompress = dvo_catalog_catcompress (CATCOMPRESS); // set the default catcompress from config data
     45    catalog.catflags    = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_MISSING | DVO_LOAD_SECFILT;
     46    catalog.Nsecfilt    = GetPhotcodeNsecfilt ();
    4647
    4748    if (!dvo_catalog_open (&catalog, skylist[0].regions[i], VERBOSE, "w")) {
    … …  
    4950      exit (1);
    5051    }
    51     if (!catalog.Naves_disk) {
     52    if (!catalog.Naverage_disk) {
    5253      if (VERBOSE) fprintf (stderr, "no data in %s, skipping\n", catalog.filename);
    5354      dvo_catalog_unlock (&catalog);
    … …  
    153154    // MaxDensityUse, MaxDensityValue
    154155
    155     char command[1024];
    156     snprintf (command, 1024, "relphot_client -update-objects -hostID %d -D CATDIR %s -hostdir %s -region %f %f %f %f -statmode %s -D CAMERA %s -D STAR_TOOFEW %d -minerror %f",
     156    char *command = NULL;
     157    strextend (&command, "relphot_client -update-objects -hostID %d -D CATDIR %s -hostdir %s -region %f %f %f %f -statmode %s -D CAMERA %s -D STAR_TOOFEW %d -minerror %f",
    157158              table->hosts[i].hostID, CATDIR, table->hosts[i].pathname, UserPatch.Rmin, UserPatch.Rmax, UserPatch.Dmin, UserPatch.Dmax, STATMODE, CAMERA, STAR_TOOFEW, MIN_ERROR);
    158159
    159     char tmpline[1024];
    160     if (VERBOSE)       { snprintf (tmpline, 1024, "%s -v",              command);                    strcpy (command, tmpline); }
    161     if (VERBOSE2)      { snprintf (tmpline, 1024, "%s -vv",             command);                    strcpy (command, tmpline); }
    162     if (RESET)         { snprintf (tmpline, 1024, "%s -reset",          command);                    strcpy (command, tmpline); }
    163     if (RESET_ZEROPTS) { snprintf (tmpline, 1024, "%s -reset-zpts",     command);                    strcpy (command, tmpline); }
    164     if (UPDATE)        { snprintf (tmpline, 1024, "%s -update",         command);                    strcpy (command, tmpline); }
    165     if (!KEEP_UBERCAL) { snprintf (tmpline, 1024, "%s -reset-ubercal",  command);                    strcpy (command, tmpline); }
    166     if (SET_MREL_VERSION != 1) { snprintf (tmpline, 1024, "%s -set-mrel-version %d", command, SET_MREL_VERSION); strcpy (command, tmpline); }
     160    if (VERBOSE)       { strextend (&command, "-v"); }
     161    if (VERBOSE2)      { strextend (&command, "-vv"); }
     162    if (RESET)         { strextend (&command, "-reset"); }
     163    if (RESET_ZEROPTS) { strextend (&command, "-reset-zpts"); }
     164    if (UPDATE)        { strextend (&command, "-update"); }
     165    if (!KEEP_UBERCAL) { strextend (&command, "-reset-ubercal"); }
     166
     167    // if (SET_MREL_VERSION != 1) { strextend (&command, "-set-mrel-version %d", SET_MREL_VERSION); }
    167168
    168169    fprintf (stderr, "command: %s\n", command);

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

    r37807 r38441  
    2323  // register database handle with shutdown procedure
    2424  set_db (&db);
     25  gfits_db_init (&db);
    2526  db.mode   = dvo_catalog_catmode (CATMODE);
    2627  db.format = dvo_catalog_catformat (CATFORMAT);

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

    r38062 r38441  
    4040    char hostfile[1024];
    4141    snprintf (hostfile, 1024, "%s/%s.cpt", hostpath, skylist[0].regions[i]->name);
    42     catalog.filename  = hostID ? hostfile : skylist[0].filename[i];
    43     catalog.catformat = dvo_catalog_catformat (CATFORMAT);    // set the default catformat from config data
    44     catalog.catmode   = dvo_catalog_catmode (CATMODE);        // set the default catmode from config data
    45     catalog.catflags  = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
    46     catalog.Nsecfilt  = GetPhotcodeNsecfilt ();
     42    catalog.filename    = hostID ? hostfile : skylist[0].filename[i];
     43    // catalog.catformat   = dvo_catalog_catformat (CATFORMAT);    // set the default catformat from config data
     44    // catalog.catmode     = dvo_catalog_catmode (CATMODE);        // set the default catmode from config data
     45    // catalog.catcompress = dvo_catalog_catcompress (CATCOMPRESS); // set the default catcompress from config data
     46    catalog.catflags    = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT;
     47    catalog.Nsecfilt    = GetPhotcodeNsecfilt ();
    4748
    4849    if (!dvo_catalog_open (&catalog, skylist[0].regions[i], VERBOSE, "w")) {
    … …  
    5051      exit (1);
    5152    }
    52     if (!catalog.Naves_disk) {
     53    if (!catalog.Naverage_disk) {
    5354      if (VERBOSE) fprintf (stderr, "no data in %s, skipping\n", catalog.filename);
    5455      dvo_catalog_unlock (&catalog);
    … …  
    109110    // VERBOSE, VERBOSE2
    110111
    111     char command[1024];
    112     snprintf (command, 1024, "relphot_client -synthphot_means %s -hostID %d -D CATDIR %s -hostdir %s -region %f %f %f %f",
    113               SYNTH_ZERO_POINTS, table->hosts[i].hostID, CATDIR, table->hosts[i].pathname, UserPatch.Rmin, UserPatch.Rmax, UserPatch.Dmin, UserPatch.Dmax);
     112    char *command = NULL;
     113    strextend (&command, "relphot_client -synthphot_means %s", SYNTH_ZERO_POINTS);
     114    strextend (&command, "-hostID %d -D CATDIR %s -hostdir %s", table->hosts[i].hostID, CATDIR, table->hosts[i].pathname);
     115    strextend (&command, "-region %f %f %f %f", UserPatch.Rmin, UserPatch.Rmax, UserPatch.Dmin, UserPatch.Dmax);
    114116
    115     char tmpline[1024];
    116     if (VERBOSE)       { snprintf (tmpline, 1024, "%s -v",              command);                    strcpy (command, tmpline); }
    117     if (VERBOSE2)      { snprintf (tmpline, 1024, "%s -vv",             command);                    strcpy (command, tmpline); }
    118     if (UPDATE)        { snprintf (tmpline, 1024, "%s -update",         command);                    strcpy (command, tmpline); }
     117    if (VERBOSE)       { strextend (&command, "-v");      }
     118    if (VERBOSE2)      { strextend (&command, "-vv");     }
     119    if (UPDATE)        { strextend (&command, "-update"); }
    119120
    120121    fprintf (stderr, "command: %s\n", command);
Note: See TracChangeset for help on using the changeset viewer.