IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 33615


Ignore:
Timestamp:
Mar 28, 2012, 8:10:40 AM (14 years ago)
Author:
eugene
Message:

added some features to make remote stats operations easier

Location:
branches/eam_branches/ipp-20111122/Ohana/src/opihi
Files:
1 added
10 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ipp-20111122/Ohana/src/opihi/dvo/Makefile

    r33600 r33615  
    5050$(SRC)/fitsed.$(ARCH).o                \
    5151$(SRC)/gcat.$(ARCH).o                   \
     52$(SRC)/catlist.$(ARCH).o                        \
    5253$(SRC)/gimages.$(ARCH).o                \
    5354$(SRC)/gstar.$(ARCH).o                  \
    … …  
    7273$(SRC)/paverage.$(ARCH).o               \
    7374$(SRC)/procks.$(ARCH).o         \
     75$(SRC)/remote.$(ARCH).o         \
    7476$(SRC)/skycat.$(ARCH).o         \
    7577$(SRC)/skycoverage.$(ARCH).o            \

  • branches/eam_branches/ipp-20111122/Ohana/src/opihi/dvo/dvo.c.in

    r33563 r33615  
    2929  set_str_variable ("PROMPT", opihi_prompt);
    3030  set_str_variable ("RCFILE", opihi_rcfile);
     31  set_int_variable ("DVO_CLIENT", FALSE);
    3132
    3233  {

  • branches/eam_branches/ipp-20111122/Ohana/src/opihi/dvo/dvo_client.c

    r33563 r33615  
    2828    free (modules);
    2929  }
     30
     31  set_int_variable ("DVO_CLIENT", TRUE);
     32  set_int_variable ("SCRIPT", FALSE);
    3033
    3134  // dvo_client should have 2 standard arguments: -hostID and -hostdir

  • branches/eam_branches/ipp-20111122/Ohana/src/opihi/dvo/gcat.c

    r33563 r33615  
    2727
    2828  if ((argc != 3) && (argc != 4)) {
    29     gprint (GP_ERR, "USAGE: gcat RA DEC [Radius]\n");
     29    gprint (GP_ERR, "USAGE: gcat RA DEC [Radius] [-host] [-backup] [-flags]\n");
    3030    return (FALSE);
    3131  }

  • branches/eam_branches/ipp-20111122/Ohana/src/opihi/dvo/hosts.c

    r33614 r33615  
    7474
    7575  if (!strncmp(argv[1], "get.results", MAX(strlen(argv[1]), 3))) {
     76    int N;
    7677
    7778    char *varname = NULL;

  • branches/eam_branches/ipp-20111122/Ohana/src/opihi/dvo/init.c

    r33600 r33615  
    2323int fitsed          PROTO((int, char **));
    2424int gcat            PROTO((int, char **));
     25int catlist         PROTO((int, char **));
    2526int getxtra         PROTO((int, char **));
    2627int gimages         PROTO((int, char **));
    … …  
    4849int paverage        PROTO((int, char **));
    4950int procks          PROTO((int, char **));
     51int remote          PROTO((int, char **));
    5052int showtile        PROTO((int, char **));
    5153int skycat          PROTO((int, char **));
    … …  
    7880  {1, "fitsed",      fitsed,       "fit stellar SEDs to objects"},
    7981  {1, "gcat",        gcat,         "get catalog at location"},
     82  {1, "catlist",     catlist,      "get list of catalogs for region / host"},
    8083  {1, "gimages",     gimages,      "get images at location"},
    8184  {1, "gstar",       gstar,        "get star statistics"},
    … …  
    101104  {1, "paverage",    paverage,     "plot average magnitude"},
    102105  {1, "procks",      procks,       "plot rocks"},
     106  {1, "remote",      remote,       "generic remote dvo client operation"},
    103107  {1, "showtile",    showtile,     "plot tile pattern"},
    104108  {1, "skycat",      skycat,       "show sky catalog boundaries"},

  • branches/eam_branches/ipp-20111122/Ohana/src/opihi/dvo/mextract.c

    r33600 r33615  
    2525  selection = NULL;
    2626
     27  fprintf (stderr, "start...");
    2728  if ((N = get_argument (argc, argv, "-h"))) goto help;
    2829  if ((N = get_argument (argc, argv, "--help"))) goto help;
    … …  
    145146  interrupt = FALSE;
    146147
     148  fprintf (stderr, "done setup...");
     149
    147150  for (i = 0; (i < skylist[0].Nregions) && !interrupt; i++) {
    148151
    … …  
    168171    /* XXX need to call dvo_catalog_chipcoords here passing the loaded images */
    169172
     173    fprintf (stderr, "done read...");
     174
    170175    for (j = 0; (j < catalog.Naverage) && !interrupt; j++) {
    171176      m = catalog.average[j].measureOffset;
    … …  
    175180      }
    176181
    177       dbExtractMeasuresInitAve (); // reset counters for saved fields
     182      dbExtractMeasuresInitAve (); // reset counters for saved fields (costs very little
    178183
    179184      for (k = 0; (k < catalog.average[j].Nmeasure); k++, m++) {
    … …  
    184189
    185190        // extract the relevant values for this measurement
    186         dbExtractMeasuresInitMeas (); // reset counters for saved fields
     191        dbExtractMeasuresInitMeas (); // reset counters for saved fields  (costs very little
    187192        for (n = 0; n < Nfields; n++) {
    188193          values[n] = dbExtractMeasures (&catalog.average[j], &catalog.secfilt[j*Nsecfilt], &catalog.measure[m], &fields[n]);
    … …  
    218223  interrupt = FALSE;
    219224
     225  fprintf (stderr, "done load...");
     226
    220227  for (n = 0; n < Nreturn; n++) {
    221228    ResetVector (vec[n], fields[n].type, Npts);
    … …  
    236243  SkyListFree (skylist);
    237244  FreeSkyRegionSelection (selection);
     245
     246  fprintf (stderr, "done extr...\n");
    238247  return (TRUE);
    239248

  • branches/eam_branches/ipp-20111122/Ohana/src/opihi/dvo/region_list.c

    r33313 r33615  
    195195    sprintf (filename, "%s/%s.cpt", CATDIR, selection->name);
    196196    skylist[0].filename[0] = strcreate (filename);
     197    skylist[0].Nregions = 1;
    197198    return (skylist);
    198199  }

  • branches/eam_branches/ipp-20111122/Ohana/src/opihi/dvo/skyregion.c

    r33543 r33615  
    11# include "dvoshell.h"
    2 
    3 #ifdef NO_MOVED_TO_DVO
    4 static double RAs = 0.0;
    5 static double RAe = 0.0;
    6 static double DECs = 0.0;
    7 static double DECe = 0.0;
    8 #endif
    92
    103// define the sky region for which extractions are limited
    114int skyregion (int argc, char **argv) {
    125 
     6  int N;
     7
     8  // dvo_client should have 2 standard arguments: -hostID and -hostdir
     9  int SaveRegion = FALSE;
     10  if ((N = get_argument (argc, argv, "-save"))) {
     11    remove_argument (N, &argc, argv);
     12    SaveRegion = TRUE;
     13  }
     14
    1315  if (argc == 1) {
    14     double RAs, RAe, DECs, DECe;
    15     get_skyregion(&RAs, &RAe, &DECs, &DECe);
     16    double Rmin, Rmax, Dmin, Dmax;
     17    get_skyregion(&Rmin, &Rmax, &Dmin, &Dmax);
    1618
    17     gprint (GP_ERR, "current skyregion: %f - %f : %f - %f\n", RAs, RAe, DECs, DECe);
    18     gprint (GP_ERR, "USAGE:  skyregion (min RA) (max RA) (min DEC) (max DEC)\n");
    19     return (FALSE);
     19    if (SaveRegion) {
     20      set_variable ("Rmin", Rmin);
     21      set_variable ("Rmax", Rmax);
     22      set_variable ("Dmin", Dmin);
     23      set_variable ("Dmax", Dmax);
     24      return TRUE;
     25    } else {
     26      gprint (GP_ERR, "current skyregion: %f - %f : %f - %f\n", Rmin, Rmax, Dmin, Dmax);
     27      gprint (GP_ERR, "USAGE:  skyregion (min RA) (max RA) (min DEC) (max DEC)\n");
     28      return FALSE;
     29    }
    2030  }
    2131
    … …  
    2939  return (TRUE);
    3040}
    31 #ifdef NOT_MOVED_TO_LIBDVO
    32 int get_skyregion (double *Rs, double *Re, double *Ds, double *De) {
    33 
    34   *Rs = RAs;
    35   *Re = RAe;
    36   *Ds = DECs;
    37   *De = DECe;
    38 
    39   return TRUE;
    40 }
    41 
    42 int set_skyregion (double Rs, double Re, double Ds, double De) {
    43 
    44   RAs  = Rs;
    45   RAe  = Re;
    46   DECs = Ds;
    47   DECe = De;
    48 
    49   return TRUE;
    50 }
    51 #endif
    5241
    5342/* find region which overlaps c at given depth (-1 : populated ) */

  • branches/eam_branches/ipp-20111122/Ohana/src/opihi/lib.shell/parse.c

    r30614 r33615  
    101101    V1 ++;
    102102    while (isspace (*V1)) V1++;
    103     if (*V1 == 0) goto error;
     103    if (*V1 == 0) {
     104      // assign empty vector
     105      set_str_variable (V0, "");
     106      goto escape;
     107    }
    104108
    105109    /* command replacement.  execute the line, place answer in val. */
Note: See TracChangeset for help on using the changeset viewer.