IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 5320 for trunk/Ohana/src/opihi


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/opihi
Files:
23 edited

Legend:

Unmodified
Added
Removed

  • 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
Note: See TracChangeset for help on using the changeset viewer.