IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 5320


Ignore:
Timestamp:
Oct 13, 2005, 2:37:39 PM (21 years ago)
Author:
eugene
Message:

changed load_catalog to take the mode from the catalog structure rather than as an argument

Location:
trunk/Ohana/src
Files:
38 edited

Legend:

Unmodified
Added
Removed

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

    r5014 r5320  
    99
    1010  /* read catalog header */
    11   mode = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
    12   if (!load_catalog (catalog, mode, VERBOSE)) {
     11  catalog[0].catflags = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
     12  if (!load_catalog (catalog, VERBOSE)) {
    1313    fprintf (stderr, "ERROR: failure loading catalog\n");
    1414    exit (1);

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

    r5014 r5320  
    2525
    2626  /* CATMODE and CATFORMAT determined from catalog */
    27   if (!load_catalog (&catalog, LOAD_AVES | LOAD_MEAS, FALSE)) {
     27  catalog.catflags = LOAD_AVES | LOAD_MEAS;
     28  if (!load_catalog (&catalog, FALSE)) {
    2829    fprintf (stderr, "can't load catalog data\n");
    2930    return (FALSE);

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

    r5014 r5320  
    2727
    2828  /* CATMODE and CATFORMAT determined from catalog */
    29   if (!load_catalog (&catalog, LOAD_AVES | LOAD_MEAS, FALSE)) {
     29  catalog.catflags = LOAD_AVES | LOAD_MEAS;
     30  if (!load_catalog (&catalog, FALSE)) {
    3031    fprintf (stderr, "can't load catalog data %s\n", filename);
    3132    return ((GSCdata *)NULL);

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

    r5241 r5320  
    145145  int catmode;                          /* storage mode (raw, mef, split, mysql) */
    146146  int catformat;                        /* storage format (elixir, panstarrs, etc) */
     147  int catflags;                         /* choices to be loaded */
    147148  int sorted;                           /* is measure table average-sorted? */
    148149 
    … …  
    181182int lock_catalog (Catalog *catalog, int lockmode);
    182183int unlock_catalog (Catalog *catalog);
    183 int load_catalog (Catalog *catalog, char mode, int VERBOSE);
     184int load_catalog (Catalog *catalog, int VERBOSE);
    184185int save_catalog (Catalog *catalog, char VERBOSE);
    185186int update_catalog (Catalog *catalog, char VERBOSE);
    … …  
    292293int SecFiltToFtable (FTable *ftable, SecFilt *secfilt, int Nsecfilt, int format);
    293294
    294 int load_catalog_raw (Catalog *catalog, char mode, int VERBOSE);
     295int load_catalog_raw (Catalog *catalog, int VERBOSE);
    295296int save_catalog_raw (Catalog *catalog, char VERBOSE);
    296 int load_catalog_mef (Catalog *catalog, char mode, int VERBOSE);
     297int load_catalog_mef (Catalog *catalog, int VERBOSE);
    297298int save_catalog_mef (Catalog *catalog, char VERBOSE);
    298 int load_catalog_split (Catalog *catalog, char mode, int VERBOSE);
     299int load_catalog_split (Catalog *catalog, int VERBOSE);
    299300int save_catalog_split (Catalog *catalog, char VERBOSE);
    300301int update_catalog_split (Catalog *catalog, char VERBOSE);

  • trunk/Ohana/src/libdvo/src/dvo_catalog.c

    r5241 r5320  
    3535}
    3636
    37 int load_catalog (Catalog *catalog, char mode, int VERBOSE) {
     37int load_catalog (Catalog *catalog, int VERBOSE) {
    3838 
    3939  int Naxis, split;
    … …  
    6363    case DVO_MODE_RAW:
    6464      if (VERBOSE) fprintf (stderr, "reading catalog (mode DVO_MODE_RAW)\n");
    65       load_catalog_raw (catalog, mode, VERBOSE);
     65      load_catalog_raw (catalog, VERBOSE);
    6666      break;
    6767    case DVO_MODE_MEF:
    6868      if (VERBOSE) fprintf (stderr, "reading catalog (mode DVO_MODE_MEF)\n");
    69       load_catalog_mef (catalog, mode, VERBOSE);
     69      load_catalog_mef (catalog, VERBOSE);
    7070      break;
    7171    case DVO_MODE_SPLIT:
    7272      if (VERBOSE) fprintf (stderr, "reading catalog (mode DVO_MODE_SPLIT)\n");
    73       load_catalog_split (catalog, mode, VERBOSE);
     73      load_catalog_split (catalog, VERBOSE);
    7474      break;
    7575    default:

  • trunk/Ohana/src/libdvo/src/dvo_catalog_mef.c

    r5241 r5320  
    11# include <dvo.h>
    22
    3 int load_catalog_mef (Catalog *catalog, char mode, int VERBOSE) {
     3int load_catalog_mef (Catalog *catalog, int VERBOSE) {
    44 
    55  int Nitems, Nbytes, Nexpect, Naverage, Nmeasure, Nmissing, Nsecfilt;
    … …  
    3939  }
    4040  /* read Average table data (or skip) */
    41   if (mode & LOAD_AVES) {
     41  if (catalog[0].catflags & LOAD_AVES) {
    4242    if (!fits_fread_ftable_data (f, &ftable)) {
    4343      if (VERBOSE) fprintf (stderr, "can't read table average data");
    … …  
    6161  }
    6262  /* read Measure table data */
    63   if (mode & LOAD_MEAS) {
     63  if (catalog[0].catflags & LOAD_MEAS) {
    6464    if (!fits_fread_ftable_data (f, &ftable)) {
    6565      if (VERBOSE) fprintf (stderr, "can't read table measure data");
    … …  
    8181  }
    8282  /* read Missing table data */
    83   if (mode & LOAD_MISS) {
     83  if (catalog[0].catflags & LOAD_MISS) {
    8484    if (!fits_fread_ftable_data (f, &ftable)) {
    8585      if (VERBOSE) fprintf (stderr, "can't read table missing data");
    … …  
    105105  }
    106106  /* read secfilt table data */
    107   if (mode & LOAD_SECF) {
     107  if (catalog[0].catflags & LOAD_SECF) {
    108108    if (!fits_fread_ftable_data (f, &ftable)) {
    109109      if (VERBOSE) fprintf (stderr, "can't read table secfilt data");

  • trunk/Ohana/src/libdvo/src/dvo_catalog_raw.c

    r5241 r5320  
    33/* read data from raw-style catalog file; set data format values based on file */
    44
    5 int load_catalog_raw (Catalog *catalog, char mode, int VERBOSE) {
     5int load_catalog_raw (Catalog *catalog, int VERBOSE) {
    66 
    77  int Nitems, nitems;
    … …  
    113113
    114114  /* read and convert the averages (use a macro to clean this up?) */
    115   if (mode & LOAD_AVES) {
     115  if (catalog[0].catflags & LOAD_AVES) {
    116116    catalog[0].average = ReadRawAverage (catalog[0].f, catalog[0].Naverage, catalog[0].catformat);
    117117  } else {
    … …  
    122122 
    123123  /* read and convert the measures (use a macro to clean this up?) */
    124   if (mode & LOAD_MEAS) {
     124  if (catalog[0].catflags & LOAD_MEAS) {
    125125    catalog[0].measure = ReadRawMeasure (catalog[0].f, catalog[0].Nmeasure, catalog[0].catformat);
    126126  } else {
    … …  
    131131
    132132  /* read and convert missing */
    133   if (mode & LOAD_MISS) {
     133  if (catalog[0].catflags & LOAD_MISS) {
    134134    ALLOCATE (catalog[0].missing, Missing, MAX (catalog[0].Nmissing, 1));
    135135    Nitems = catalog[0].Nmissing;
    … …  
    147147 
    148148  /* read and convert secfilt */
    149   if (mode & LOAD_SECF) {
     149  if (catalog[0].catflags & LOAD_SECF) {
    150150    Nitems = catalog[0].Naverage * catalog[0].Nsecfilt;
    151151    catalog[0].secfilt = ReadRawSecFilt (catalog[0].f, Nitems, catalog[0].catformat);
    … …  
    160160
    161161  /* check data integrity */
    162   if (mode & LOAD_AVES) {
     162  if (catalog[0].catflags & LOAD_AVES) {
    163163    for (i = Nmeas = Nmiss = 0; i < catalog[0].Naverage; i++) {
    164164      Nmeas += catalog[0].average[i].Nm;

  • trunk/Ohana/src/libdvo/src/dvo_catalog_split.c

    r5241 r5320  
    11# include <dvo.h>
    22
    3 int load_catalog_split (Catalog *catalog, char mode, int VERBOSE) {
     3int load_catalog_split (Catalog *catalog, int VERBOSE) {
    44
    55  int Nitems, Nexpect, Naverage, Nmeasure, Nmissing, Nsecfilt;
    … …  
    3636  /*** Average Table ***/
    3737
    38   if (mode & LOAD_AVES) {
     38  if (catalog[0].catflags & LOAD_AVES) {
    3939    /* move pointer past header -- must be already read (load_catalog) */
    4040    fseek (catalog[0].f, catalog[0].header.size, SEEK_SET);
    … …  
    6666
    6767  /* (Full Load) */
    68   if (mode & LOAD_MEAS) {
     68  if (catalog[0].catflags & LOAD_MEAS) {
    6969    ALLOCATE (measure, Catalog, 1);
    7070
    … …  
    111111
    112112  /* (Meta Load) */
    113   if (mode & LOAD_MEAS_META) {
     113  if (catalog[0].catflags & LOAD_MEAS_META) {
    114114    ALLOCATE (measure, Catalog, 1);
    115115
    … …  
    143143
    144144  missing = NULL;
    145   if (mode & LOAD_MISS) {
     145  if (catalog[0].catflags & LOAD_MISS) {
    146146    ALLOCATE (missing, Catalog, 1);
    147147
    … …  
    190190
    191191  secfilt = NULL;
    192   if (mode & LOAD_SECF) {
     192  if (catalog[0].catflags & LOAD_SECF) {
    193193    ALLOCATE (secfilt, Catalog, 1);
    194194 

  • trunk/Ohana/src/misc/src/applyscat.c

    r4844 r5320  
    22# include <dvo.h>
    33# define BYTES_STAR 66
    4 
    5 typedef struct {
    6   double X;
    7   double Y;
    8   double M;
    9 } Stars;
    104
    115int main (int argc, char **argv) {

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

    r5014 r5320  
    2020
    2121  /* CATMODE and CATFORMAT determined from catalog */
    22   if (!load_catalog (&catalog, LOAD_AVES | LOAD_MEAS, FALSE)) {
     22  catalog.catflags = LOAD_AVES | LOAD_MEAS;
     23  if (!load_catalog (&catalog, FALSE)) {
    2324    fprintf (stderr, "can't load catalog data %s\n", filename);
    2425    *NSTARS = Nstars;

  • trunk/Ohana/src/opihi/dvo/avextract.c

    r5014 r5320  
    6767      continue;
    6868    }
    69     if (!load_catalog (&catalog, LOAD_AVES | LOAD_MEAS | LOAD_SECF, FALSE)) {
     69    catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
     70    if (!load_catalog (&catalog, FALSE)) {
    7071      unlock_catalog (&catalog);
    7172      continue;

  • trunk/Ohana/src/opihi/dvo/calextract.c

    r5014 r5320  
    7373      continue;
    7474    }
    75     if (!load_catalog (&catalog, LOAD_AVES | LOAD_MEAS | LOAD_SECF, FALSE)) {
     75    catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
     76    if (!load_catalog (&catalog, FALSE)) {
    7677      unlock_catalog (&catalog);
    7778      continue;

  • trunk/Ohana/src/opihi/dvo/calmextract.c

    r5014 r5320  
    8686      continue;
    8787    }
    88     if (!load_catalog (&catalog, LOAD_AVES | LOAD_MEAS | LOAD_SECF, FALSE)) {
     88    catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
     89    if (!load_catalog (&catalog, FALSE)) {
    8990      unlock_catalog (&catalog);
    9091      continue;

  • trunk/Ohana/src/opihi/dvo/catalog.c

    r5014 r5320  
    321321        continue;
    322322      }
    323       if (!load_catalog (&catalog, LOAD_AVES, TRUE)) {
     323      catalog.catflags = LOAD_AVES;
     324      if (!load_catalog (&catalog, TRUE)) {
    324325        unlock_catalog (&catalog);
    325326        continue;

  • trunk/Ohana/src/opihi/dvo/ccd.c

    r5014 r5320  
    7070        continue;
    7171    }
    72     if (!load_catalog (&catalog, LOAD_AVES | LOAD_MEAS | LOAD_SECF, FALSE)) {
     72    catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
     73    if (!load_catalog (&catalog, FALSE)) {
    7374      unlock_catalog (&catalog);
    7475      continue;

  • trunk/Ohana/src/opihi/dvo/cmatch.c

    r5014 r5320  
    4040    return (FALSE);
    4141  }
    42   if (!load_catalog (&catalog1, LOAD_AVES | LOAD_MEAS | LOAD_SECF, TRUE)) {
     42  catalog1.catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
     43  if (!load_catalog (&catalog1, TRUE)) {
    4344    unlock_catalog (&catalog1);
    4445    return (FALSE);

  • trunk/Ohana/src/opihi/dvo/cmd.c

    r5014 r5320  
    6868      continue;
    6969    }
    70     if (!load_catalog (&catalog, LOAD_AVES | LOAD_MEAS | LOAD_SECF, FALSE)) {
     70    catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
     71    if (!load_catalog (&catalog, FALSE)) {
    7172      unlock_catalog (&catalog);
    7273      continue;

  • trunk/Ohana/src/opihi/dvo/ddmags.c

    r5014 r5320  
    7070        continue;
    7171    }
    72     if (!load_catalog (&catalog, LOAD_AVES | LOAD_MEAS | LOAD_SECF, FALSE)) {
     72    catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
     73    if (!load_catalog (&catalog, FALSE)) {
    7374      unlock_catalog (&catalog);
    7475      continue;

  • trunk/Ohana/src/opihi/dvo/dmagaves.c

    r5014 r5320  
    6262      continue;
    6363    }
    64     if (!load_catalog (&catalog, LOAD_AVES | LOAD_MEAS | LOAD_SECF, FALSE)) {
     64    catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
     65    if (!load_catalog (&catalog, FALSE)) {
    6566      unlock_catalog (&catalog);
    6667      continue;

  • trunk/Ohana/src/opihi/dvo/dmagmeas.c

    r5014 r5320  
    7070        continue;
    7171    }
    72     if (!load_catalog (&catalog, LOAD_AVES | LOAD_MEAS | LOAD_SECF, FALSE)) {
     72    catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
     73    if (!load_catalog (&catalog, FALSE)) {
    7374      unlock_catalog (&catalog);
    7475      continue;

  • trunk/Ohana/src/opihi/dvo/dmags.c

    r5014 r5320  
    6868        continue;
    6969    }
    70     if (!load_catalog (&catalog, LOAD_AVES | LOAD_MEAS | LOAD_SECF, FALSE)) {
     70    catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
     71    if (!load_catalog (&catalog, FALSE)) {
    7172      unlock_catalog (&catalog);
    7273      continue;

  • trunk/Ohana/src/opihi/dvo/dmt.c

    r5014 r5320  
    7777      continue;
    7878    }
    79     if (!load_catalog (&catalog, LOAD_AVES | LOAD_MEAS | LOAD_SECF, TRUE)) {
     79    catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
     80    if (!load_catalog (&catalog, TRUE)) {
    8081      unlock_catalog (&catalog);
    8182      continue;

  • trunk/Ohana/src/opihi/dvo/extract.c

    r5014 r5320  
    264264        continue;
    265265      }
    266       if (!load_catalog (&catalog, loadmode, TRUE)) {
     266      catalog.catflags = loadmode;
     267      if (!load_catalog (&catalog, TRUE)) {
    267268        unlock_catalog (&catalog);
    268269        continue;

  • trunk/Ohana/src/opihi/dvo/fitcolors.c

    r5014 r5320  
    112112        continue;
    113113    }
    114     if (!load_catalog (&catalog[k], LOAD_AVES | LOAD_MEAS | LOAD_SECF, TRUE)) {
     114    catalog[k].catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
     115    if (!load_catalog (&catalog[k], TRUE)) {
    115116      catalog[k].Naverage = 0;
    116117      unlock_catalog (&catalog[k]);

  • trunk/Ohana/src/opihi/dvo/gstar.c

    r5014 r5320  
    6868    return (FALSE);
    6969  }
    70   if (!load_catalog (&catalog, LOAD_AVES | LOAD_MEAS | LOAD_SECF, TRUE)) {
     70  catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
     71  if (!load_catalog (&catalog, TRUE)) {
    7172    unlock_catalog (&catalog);
    7273    return (FALSE);

  • trunk/Ohana/src/opihi/dvo/imdata.c

    r5014 r5320  
    122122      continue;
    123123    }
    124     if (!load_catalog (&catalog, LOAD_AVES, TRUE)) {
     124    catalog.catflags = LOAD_AVES;
     125    if (!load_catalog (&catalog, TRUE)) {
    125126      unlock_catalog (&catalog);
    126127      continue;

  • trunk/Ohana/src/opihi/dvo/lcurve.c

    r5014 r5320  
    8888    return (FALSE);
    8989  }
    90   if (!load_catalog (&catalog, LOAD_AVES | LOAD_MEAS, TRUE)) {
     90  catalog.catflags = LOAD_AVES | LOAD_MEAS;
     91  if (!load_catalog (&catalog, TRUE)) {
    9192    unlock_catalog (&catalog);
    9293    return (FALSE);

  • trunk/Ohana/src/opihi/dvo/lightcurve.c

    r5014 r5320  
    6565    return (FALSE);
    6666  }
    67   if (!load_catalog (&catalog, LOAD_AVES | LOAD_MEAS | LOAD_SECF, TRUE)) {
     67  catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
     68  if (!load_catalog (&catalog, TRUE)) {
    6869    unlock_catalog (&catalog);
    6970    return (FALSE);

  • trunk/Ohana/src/opihi/dvo/mextract.c

    r5014 r5320  
    6969      continue;
    7070    }
    71     if (!load_catalog (&catalog, LOAD_AVES | LOAD_MEAS | LOAD_SECF, FALSE)) {
     71    catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
     72    if (!load_catalog (&catalog, FALSE)) {
    7273      unlock_catalog (&catalog);
    7374      continue;

  • trunk/Ohana/src/opihi/dvo/pmeasure.c

    r5014 r5320  
    103103      continue;
    104104    }
    105     if (!load_catalog (&catalog, LOAD_AVES | LOAD_MEAS, TRUE)) {
     105    catalog.catflags = LOAD_AVES | LOAD_MEAS;
     106    if (!load_catalog (&catalog, TRUE)) {
    106107      unlock_catalog (&catalog);
    107108      continue;

  • trunk/Ohana/src/opihi/dvo/subpix.c

    r5014 r5320  
    5050    return (FALSE);
    5151  }
    52   if (!load_catalog (&catalog, LOAD_AVES | LOAD_MEAS, TRUE)) {
     52  catalog.catflags = LOAD_AVES | LOAD_MEAS;
     53  if (!load_catalog (&catalog, TRUE)) {
    5354    unlock_catalog (&catalog);
    5455    return (FALSE);

  • trunk/Ohana/src/opihi/include/data.h

    r4704 r5320  
    77# ifndef DATA_H
    88# define DATA_H
    9 
    10 /* socket / pipe communication buffer */
    11 typedef struct {
    12   char *buffer;
    13   int   Nalloc;
    14   int   Nreset;
    15   int   Nblock;
    16   int   Nbuffer;
    17 } IOBuffer;
    189
    1910/*** typedef structs used by math functions ***/
    … …  
    2617
    2718void InitData ();
    28 
    29 /* IOBuffersOps.c */
    30 int InitIOBuffer (IOBuffer *buffer, int Nalloc);
    31 int FlushIOBuffer (IOBuffer *buffer);
    32 int ReadtoIOBuffer (IOBuffer *buffer, int fd);
    33 int EmptyIOBuffer (IOBuffer *buffer, int Nmax, int fd);
    34 void FreeIOBuffer (IOBuffer *buffer);
    3519
    3620/* in queues.c */

  • trunk/Ohana/src/opihi/lib.data/Makefile

    r5242 r5320  
    3737$(SDIR)/open_image.$(ARCH).o            \
    3838$(SDIR)/queues.$(ARCH).o                \
    39 $(SDIR)/IOBufferOps.$(ARCH).o           \
    4039$(SDIR)/PlotVectors.$(ARCH).o
    4140

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

    r5014 r5320  
    66
    77  if (FINAL) {
    8     mode = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
     8    catalog[0].catflags = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
    99  } else {
    10     mode = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
     10    catalog[0].catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
    1111  }   
    1212
    1313  /* CATMODE and CATFORMAT determined from catalog */
    1414
    15   if (!load_catalog (catalog, mode, VERBOSE)) {
     15  if (!load_catalog (catalog, VERBOSE)) {
    1616    fprintf (stderr, "ERROR: failure loading catalog %s\n", catalog[0].filename);
    1717    exit (1);

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

    r5014 r5320  
    9090void          sortB              PROTO((double *X, double *Y, int N));
    9191void          sortD              PROTO((double *X, double *Y, double *Z, int N));
    92 void          update_catalog    PROTO((Catalog *catalog, Group *sgroup, int warn));
     92void          update_dvo_catalog PROTO((Catalog *catalog, Group *sgroup, int warn));
    9393void          wcatalog           PROTO((Catalog *catalog));
    9494void          wimages            PROTO((Image *image, int Nimage));

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

    r5014 r5320  
    33int gcatalog (Catalog *catalog) {
    44
    5   int mode;
    6 
    7   mode = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
     5  catalog[0].catflags = LOAD_AVES | LOAD_MEAS | LOAD_MISS | LOAD_SECF;
    86
    97  /* CATMODE and CATFORMAT determined from catalog */
    … …  
    1412    exit (1);
    1513  case 1:
    16     if (!load_catalog (catalog, mode, VERBOSE)) {
     14    if (!load_catalog (catalog, VERBOSE)) {
    1715      fprintf (stderr, "ERROR: failure loading catalog %s\n", catalog[0].filename);
    1816      exit (1);

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

    r5014 r5320  
    6969
    7070    fprintf (stderr, "catalog: %s sgroup: %d %s %f\n", catalog.filename, Nmin, sgroup[Nmin].label, Rmin);
    71     update_catalog (&catalog, &sgroup[Nmin], (Rmin > 2*RADIUS));
     71    update_dvo_catalog (&catalog, &sgroup[Nmin], (Rmin > 2*RADIUS));
    7272    wcatalog (&catalog);
    7373  }

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

    r4865 r5320  
    11# include "uniphot.h"
    22
    3 void update_catalog (Catalog *catalog, Group *sgroup, int warn) {
     3void update_dvo_catalog (Catalog *catalog, Group *sgroup, int warn) {
    44
    55  int i, j, m, found;
Note: See TracChangeset for help on using the changeset viewer.