IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 39411


Ignore:
Timestamp:
Feb 27, 2016, 8:59:21 AM (10 years ago)
Author:
eugene
Message:

fixing build to be extremely pedantic

Location:
branches/eam_branches/ohana.20160226/src
Files:
31 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ohana.20160226/src/libdvo/include/dvo_util.h

    r27435 r39411  
    6161// There is no need to release memory pointed to by return value.
    6262// It will be freed when dvoConfigFree() is invoked.
    63 Image *dvoImageByExternID(dvoConfig *dvoConfig, int sourceID, int externID);
     63Image *dvoImageByExternID(dvoConfig *dvoConfig, unsigned short sourceID, unsigned int externID);
    6464
    6565// Loads the sky table for the database.
    … …  
    7272// return a list of detections from a particular image id
    7373// Use dvoFree() to free the memory pointed to by results
    74 off_t dvoGetDetections(SkyList *skylist, int imageID, dvoDetection **results, int *pMaxDetID);
     74off_t dvoGetDetections(SkyList *skylist, unsigned int imageID, dvoDetection **results, unsigned int *pMaxDetID);
    7575
    7676// free memory returned by various dvo util functions

  • branches/eam_branches/ohana.20160226/src/libdvo/include/dvodb.h

    r39308 r39411  
    490490double        TimeValue (time_t time, time_t TimeReference, int TimeFormat);
    491491
    492 void          image_subset          PROTO((Image *image, off_t Nimage, off_t **Subset, off_t *Nsubset, SkyRegionSelection *selection, unsigned long int tzero, double trange, int TimeSelect));
    493 off_t         match_image_subset    PROTO((Image *image, off_t *subset, off_t Nsubset, unsigned int T, short int S));
     492void          image_subset          PROTO((Image *image, off_t Nimage, off_t **Subset, off_t *Nsubset, SkyRegionSelection *selection, e_time tzero, double trange, int TimeSelect));
     493off_t         match_image_subset    PROTO((Image *image, off_t *subset, off_t Nsubset, e_time T, short int S));
    494494
    495495// dvo DB field functions

  • branches/eam_branches/ohana.20160226/src/libdvo/src/AstromOffsetMapUtils.c

    r39409 r39411  
    1111  off_t i;
    1212  for (i = 0; i < Nimages; i++) {
    13     if (images[i].imageID < 0) continue;
     13    // if (images[i].imageID < 0) continue;
    1414
    1515    unsigned int imageID = images[i].imageID;

  • branches/eam_branches/ohana.20160226/src/libdvo/src/ImageOps.c

    r39347 r39411  
    55void image_subset (Image *image, off_t Nimage, off_t **Subset, off_t *Nsubset,
    66                   SkyRegionSelection *selection,
    7                    unsigned long int tzero, double trange, int TimeSelect)
     7                   e_time tzero, double trange, int TimeSelect)
    88{
    99

  • branches/eam_branches/ohana.20160226/src/libdvo/src/dbExtractImages.c

    r39308 r39411  
    5555/* return image.field based on the selection */
    5656dbValue dbExtractImages (Image *image, off_t Nimage, off_t N, dbField *field) {
     57  OHANA_UNUSED_PARAM(Nimage); // XXX: not sure why this is supplied
    5758
    5859  double x, y;

  • branches/eam_branches/ohana.20160226/src/libdvo/src/db_utils.c

    r31636 r39411  
    1010// by default, no graphdata
    1111int GetGraphdata(Graphdata *graph, int *kapa, char *name) {
     12  OHANA_UNUSED_PARAM(graph);
     13  OHANA_UNUSED_PARAM(kapa);
     14  OHANA_UNUSED_PARAM(name);
    1215    return FALSE;
    1316}

  • branches/eam_branches/ohana.20160226/src/libdvo/src/dvo_util.c

    r38553 r39411  
     1#include <dvo_util.h>
     2
    13// dvo_util.c
    24// This file contains a set of functions that provide simple read-only access to a dvo database
    35//
    4 #include <dvo_util.h>
    5 
    6 void dvoFree(void *ptr)
    7 {
    8     if (ptr) {
    9         FREE(ptr);
    10     }
    11 }
    12 
    13 dvoConfig * dvoConfigAlloc()
    14 {
    15     dvoConfig *config;
    16 
    17     ALLOCATE(config, dvoConfig, 1);
    18 
    19     memset(config, 0, sizeof(dvoConfig));
    20     return config;
    21 }
    22 
    23 void dvoConfigFree(dvoConfig *dvoConfig)
    24 {
    25     if (dvoConfig) {
    26         if (dvoConfig->skyTable) {
    27             SkyTableFree(dvoConfig->skyTable);
    28         }
    29         if (dvoConfig->images) {
    30             gfits_db_free(&dvoConfig->imageDB);
    31         }
    32         FREE(dvoConfig);
    33     }
    34 }
    35 
    36 dvoConfig *dvoConfigRead(int *argc, char **argv)
    37 {
    38     dvoConfig *dvoConfig = dvoConfigAlloc();
    39     char MasterPhotcodeFile[256];
    40 
    41     char *file = SelectConfigFile(argc, argv, "ptolemy");
    42     char *configData = LoadConfigFile(file);
    43     if (!configData) {
    44         fprintf(stderr, "ERROR: can't find configuration file %s\n", file);
    45         if (file) {
    46             FREE(file);
    47         }
    48         exit(3);
    49     }
    50     FREE (file);
    51     file = NULL;
    52 
    53     ScanConfig (configData, "GSCFILE",         "%s", 0, dvoConfig->gscfile);
    54     ScanConfig (configData, "CATDIR",          "%s", 0, dvoConfig->catdir);
    55     ScanConfig (configData, "CATMODE",         "%s",  0, dvoConfig->catmode);
    56     ScanConfig (configData, "CATFORMAT",       "%s",  0, dvoConfig->catformat);
    57     ScanConfig (configData, "PHOTCODE_FILE",   "%s",  0, MasterPhotcodeFile);
    58     if (!ScanConfig (configData, "SKY_DEPTH",    "%d",  0, &dvoConfig->skyDepth)) {
    59         dvoConfig->skyDepth = 2;
    60     }
    61     if (!ScanConfig (configData, "SKY_TABLE",    "%s",  0, dvoConfig->skyTableFile)) {
    62         dvoConfig->skyTableFile[0] = 0;
    63     }
    64 
    65     snprintf (dvoConfig->photcodeFile, 256, "%s/Photcodes.dat", dvoConfig->catdir);
    66     if (!LoadPhotcodes (dvoConfig->photcodeFile, MasterPhotcodeFile, FALSE)) {
    67         fprintf (stderr, "error loading photcode table %s or master file %s\n",
    68             dvoConfig->photcodeFile, MasterPhotcodeFile);
    69         exit (1);
    70     }
    71 
    72     double zero_point;
    73     ScanConfig (configData, "ZERO_PT",                "%lf", 0, &zero_point);
    74     SetZeroPoint (zero_point);
     6
     7void dvoFree(void *ptr) {
     8  if (ptr) {
     9    FREE(ptr);
     10  }
     11}
     12
     13dvoConfig *dvoConfigAlloc() {
     14  dvoConfig *config;
     15
     16  ALLOCATE(config, dvoConfig, 1);
     17
     18  memset(config, 0, sizeof(dvoConfig));
     19  return config;
     20}
     21
     22void dvoConfigFree(dvoConfig *dvoConfig) {
     23  if (dvoConfig) {
     24    if (dvoConfig->skyTable) {
     25      SkyTableFree(dvoConfig->skyTable);
     26    }
     27    if (dvoConfig->images) {
     28      gfits_db_free(&dvoConfig->imageDB);
     29    }
     30    FREE(dvoConfig);
     31  }
     32}
     33
     34dvoConfig *dvoConfigRead(int *argc, char **argv) {
     35  dvoConfig *dvoConfig = dvoConfigAlloc();
     36  char MasterPhotcodeFile[256];
     37
     38  char *file = SelectConfigFile(argc, argv, "ptolemy");
     39  char *configData = LoadConfigFile(file);
     40  if (!configData) {
     41    fprintf(stderr, "ERROR: can't find configuration file %s\n", file);
     42    if (file) {
     43      FREE(file);
     44    }
     45    exit(3);
     46  }
     47  FREE (file);
     48  file = NULL;
     49
     50  ScanConfig (configData, "GSCFILE",         "%s", 0, dvoConfig->gscfile);
     51  ScanConfig (configData, "CATDIR",          "%s", 0, dvoConfig->catdir);
     52  ScanConfig (configData, "CATMODE",         "%s",  0, dvoConfig->catmode);
     53  ScanConfig (configData, "CATFORMAT",       "%s",  0, dvoConfig->catformat);
     54  ScanConfig (configData, "PHOTCODE_FILE",   "%s",  0, MasterPhotcodeFile);
     55  if (!ScanConfig (configData, "SKY_DEPTH",    "%d",  0, &dvoConfig->skyDepth)) {
     56    dvoConfig->skyDepth = 2;
     57  }
     58  if (!ScanConfig (configData, "SKY_TABLE",    "%s",  0, dvoConfig->skyTableFile)) {
     59    dvoConfig->skyTableFile[0] = 0;
     60  }
     61
     62  snprintf (dvoConfig->photcodeFile, 256, "%s/Photcodes.dat", dvoConfig->catdir);
     63  if (!LoadPhotcodes (dvoConfig->photcodeFile, MasterPhotcodeFile, FALSE)) {
     64    fprintf (stderr, "error loading photcode table %s or master file %s\n",
     65             dvoConfig->photcodeFile, MasterPhotcodeFile);
     66    exit (1);
     67  }
     68
     69  double zero_point;
     70  ScanConfig (configData, "ZERO_PT",                "%lf", 0, &zero_point);
     71  SetZeroPoint (zero_point);
    7572
    7673#if (DVO_UTIL_READ_CAMERA_CONFIG)
    77     // at one point I thought reading the camera configuration might be useful
    78     // but we didn't need it
    79     if (!ScanConfig (configData, "CAMERA_CONFIG", "%s", 0, dvoConfig->cameraConfig)) {
    80         fprintf (stderr, "can't find CAMERA_CONFIG in configuration\n");
    81         exit (3);
    82     }
    83     char * cameraConfigData = LoadConfigFile(dvoConfig->cameraConfig);
    84     if (!cameraConfigData) {
    85         fprintf (stderr, "failed to load %s\n", dvoConfig->cameraConfig);
    86         exit (3);
    87     }
    88 
    89     ScanConfig (cameraConfigData, "NCCD", "%d", 1, &dvoConfig->nCCD);
     74  // at one point I thought reading the camera configuration might be useful
     75  // but we didn't need it
     76  if (!ScanConfig (configData, "CAMERA_CONFIG", "%s", 0, dvoConfig->cameraConfig)) {
     77    fprintf (stderr, "can't find CAMERA_CONFIG in configuration\n");
     78    exit (3);
     79  }
     80  char * cameraConfigData = LoadConfigFile(dvoConfig->cameraConfig);
     81  if (!cameraConfigData) {
     82    fprintf (stderr, "failed to load %s\n", dvoConfig->cameraConfig);
     83    exit (3);
     84  }
     85
     86  ScanConfig (cameraConfigData, "NCCD", "%d", 1, &dvoConfig->nCCD);
    9087#endif
    9188
    92     return (dvoConfig);
    93 }
    94 
    95 int dvoLoadImages(dvoConfig *dvoConfig)
    96 {
    97     if (dvoConfig->images) {
    98         return TRUE;
    99     }
    100 
    101     char filename[256];
     89  return (dvoConfig);
     90}
     91
     92int dvoLoadImages(dvoConfig *dvoConfig) {
     93  if (dvoConfig->images) {
     94    return TRUE;
     95  }
     96
     97  char filename[256];
    10298 
    103     snprintf (filename, 256, "%s/Images.dat", dvoConfig->catdir);
    104 
    105     gfits_db_init (&dvoConfig->imageDB);
    106     dvoConfig->imageDB.lockstate = LCK_SOFT;
    107     dvoConfig->imageDB.timeout   = 120.0;
    108 
    109     if (!gfits_db_lock (&dvoConfig->imageDB, filename)) {
    110         fprintf (stderr, "error opening image catalog %s (1)\n", filename);
    111         return (FALSE);
    112     }
    113 
    114     if (dvoConfig->imageDB.dbstate == LCK_EMPTY) {
    115         fprintf (stderr, "note: image catalog is empty\n");
    116         ALLOCATE (dvoConfig->images, Image, 1);
    117         dvoConfig->nImages = 1;
    118         return (TRUE);
    119     }
    120 
    121     int status = dvo_image_load (&dvoConfig->imageDB, TRUE, FALSE);
    122     gfits_db_close (&dvoConfig->imageDB);
    123 
    124     if (!status) {
    125         fprintf (stderr, "problem loading image database table\n");
    126         return (FALSE);
    127     }
    128 
    129     dvoConfig->images = gfits_table_get_Image (&dvoConfig->imageDB.ftable, &dvoConfig->nImages, &dvoConfig->imageDB.scaledValue, &dvoConfig->imageDB.nativeOrder);
    130     if (!dvoConfig->images) {
    131         fprintf (stderr, "problem loading images\n");
    132         return (FALSE);
    133     }
    134 
     99  snprintf (filename, 256, "%s/Images.dat", dvoConfig->catdir);
     100
     101  gfits_db_init (&dvoConfig->imageDB);
     102  dvoConfig->imageDB.lockstate = LCK_SOFT;
     103  dvoConfig->imageDB.timeout   = 120.0;
     104
     105  if (!gfits_db_lock (&dvoConfig->imageDB, filename)) {
     106    fprintf (stderr, "error opening image catalog %s (1)\n", filename);
     107    return (FALSE);
     108  }
     109
     110  if (dvoConfig->imageDB.dbstate == LCK_EMPTY) {
     111    fprintf (stderr, "note: image catalog is empty\n");
     112    ALLOCATE (dvoConfig->images, Image, 1);
     113    dvoConfig->nImages = 1;
    135114    return (TRUE);
    136 }
    137 Image *dvoImageByExternID(dvoConfig *dvoConfig, int sourceID, int externID)
    138 {
    139     int i;
     115  }
     116
     117  int status = dvo_image_load (&dvoConfig->imageDB, TRUE, FALSE);
     118  gfits_db_close (&dvoConfig->imageDB);
     119
     120  if (!status) {
     121    fprintf (stderr, "problem loading image database table\n");
     122    return (FALSE);
     123  }
     124
     125  dvoConfig->images = gfits_table_get_Image (&dvoConfig->imageDB.ftable, &dvoConfig->nImages, &dvoConfig->imageDB.scaledValue, &dvoConfig->imageDB.nativeOrder);
     126  if (!dvoConfig->images) {
     127    fprintf (stderr, "problem loading images\n");
     128    return (FALSE);
     129  }
     130
     131  return (TRUE);
     132}
     133
     134Image *dvoImageByExternID(dvoConfig *dvoConfig, unsigned short sourceID, unsigned int externID) {
     135
     136  unsigned int i;
    140137   
    141     if (!dvoLoadImages(dvoConfig)) return NULL;
    142 
    143     for (i=0; i<dvoConfig->nImages; i++) {
    144         Image *image = dvoConfig->images + i;
    145         if ((image->externID == externID) && (image->sourceID == sourceID)) {
    146             BuildChipMatch(dvoConfig->images, dvoConfig->nImages);
    147             return image;
    148         }
    149     }
    150     fprintf(stderr, "can't find image for %d %d\n", sourceID, externID);
    151     return NULL;
    152 }
    153 
    154 SkyTable *dvoLoadSkyTable(dvoConfig *dvoConfig)
    155 {
    156     if (!dvoConfig->skyTable) {
    157         char *skyfile = "";
    158         dvoConfig->skyTable = SkyTableLoadOptimal(dvoConfig->catdir, skyfile, dvoConfig->gscfile,
    159                                                     FALSE, dvoConfig->skyDepth, 0);
    160     }
    161 
    162     if (dvoConfig->skyTable == NULL) {
    163         fprintf(stderr, "failed to load SkyTable\n");
    164         return NULL;
    165     }
    166 
    167     SkyTableSetFilenames(dvoConfig->skyTable, dvoConfig->catdir, "cpt");
    168 
    169     return dvoConfig->skyTable;
    170 }
    171 
    172 SkyList *dvoSkyListByExternID(dvoConfig *dvoConfig, int sourceID, int externID, Image **ppImage)
    173 {
    174     Image *image = dvoImageByExternID(dvoConfig, sourceID, externID);
    175     if (image == NULL) {
    176         // fprintf(stderr, "can't find image for %d %d\n", sourceID, externID);
    177         return NULL;
    178     }
    179 
    180     if (dvoLoadSkyTable(dvoConfig) == NULL) {
    181         fprintf(stderr, "failed to load Sky table\n");
    182         return NULL;
    183     }
    184     SkyList *skylist = SkyListByImage(dvoConfig->skyTable, -1, image);
    185     if (!skylist->Nregions) {
    186         fprintf(stderr, "failed to find SkyList for image  %d %d\n", sourceID, externID);
    187         return NULL;
    188     }
    189 
    190     *ppImage = image;
    191 
    192     return skylist;
    193 }
    194 
    195 off_t dvoGetDetections(SkyList *skylist, int imageID, dvoDetection **results, int *pMaxDetID)
    196 {
     138  if (!dvoLoadImages(dvoConfig)) return NULL;
     139
     140  for (i = 0; i < dvoConfig->nImages; i++) {
     141    Image *image = dvoConfig->images + i;
     142    if ((image->externID == externID) && (image->sourceID == sourceID)) {
     143      BuildChipMatch(dvoConfig->images, dvoConfig->nImages);
     144      return image;
     145    }
     146  }
     147  fprintf(stderr, "can't find image for %d %d\n", sourceID, externID);
     148  return NULL;
     149}
     150
     151SkyTable *dvoLoadSkyTable(dvoConfig *dvoConfig) {
     152  if (!dvoConfig->skyTable) {
     153    char *skyfile = "";
     154    dvoConfig->skyTable = SkyTableLoadOptimal(dvoConfig->catdir, skyfile, dvoConfig->gscfile,
     155                                              FALSE, dvoConfig->skyDepth, 0);
     156  }
     157
     158  if (dvoConfig->skyTable == NULL) {
     159    fprintf(stderr, "failed to load SkyTable\n");
     160    return NULL;
     161  }
     162
     163  SkyTableSetFilenames(dvoConfig->skyTable, dvoConfig->catdir, "cpt");
     164
     165  return dvoConfig->skyTable;
     166}
     167
     168SkyList *dvoSkyListByExternID(dvoConfig *dvoConfig, int sourceID, int externID, Image **ppImage) {
     169  Image *image = dvoImageByExternID(dvoConfig, sourceID, externID);
     170  if (image == NULL) {
     171    // fprintf(stderr, "can't find image for %d %d\n", sourceID, externID);
     172    return NULL;
     173  }
     174
     175  if (dvoLoadSkyTable(dvoConfig) == NULL) {
     176    fprintf(stderr, "failed to load Sky table\n");
     177    return NULL;
     178  }
     179  SkyList *skylist = SkyListByImage(dvoConfig->skyTable, -1, image);
     180  if (!skylist->Nregions) {
     181    fprintf(stderr, "failed to find SkyList for image  %d %d\n", sourceID, externID);
     182    return NULL;
     183  }
     184
     185  *ppImage = image;
     186
     187  return skylist;
     188}
     189
     190off_t dvoGetDetections(SkyList *skylist, unsigned int imageID, dvoDetection **results, unsigned int *pMaxDetID) {
    197191  int GetMeasures = 1;
    198192  int reg;
    … …  
    204198  *pMaxDetID = -1;
    205199  for (reg=0; reg< skylist->Nregions; reg++) {
    206       /* lock, load, unlock catalog */
    207       Catalog catalog;
    208 
    209       dvo_catalog_init (&catalog, TRUE);
    210       catalog.filename = skylist->filename[reg];
    211       catalog.catflags = GetMeasures ? DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT : DVO_LOAD_AVERAGE | DVO_LOAD_SECFILT;
    212       catalog.Nsecfilt = 0;
    213 
    214       // an error exit status here is a significant error
    215       if (!dvo_catalog_open (&catalog, NULL, FALSE, "r")) {
    216           fprintf (stderr, "ERROR: failure to open catalog file %s\n", catalog.filename);
    217           exit (2);
     200    /* lock, load, unlock catalog */
     201    Catalog catalog;
     202
     203    dvo_catalog_init (&catalog, TRUE);
     204    catalog.filename = skylist->filename[reg];
     205    catalog.catflags = GetMeasures ? DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT : DVO_LOAD_AVERAGE | DVO_LOAD_SECFILT;
     206    catalog.Nsecfilt = 0;
     207
     208    // an error exit status here is a significant error
     209    if (!dvo_catalog_open (&catalog, NULL, FALSE, "r")) {
     210      fprintf (stderr, "ERROR: failure to open catalog file %s\n", catalog.filename);
     211      exit (2);
     212    }
     213    dvo_catalog_unlock (&catalog);
     214
     215    off_t Nmeasure = catalog.Nmeasure;
     216
     217    off_t i;
     218    for (i=0; i< Nmeasure; i++) {
     219      Measure *m = catalog.measure + i;
     220      if (m->imageID != imageID) {
     221        continue;
    218222      }
    219       dvo_catalog_unlock (&catalog);
    220 
    221       off_t Nmeasure = catalog.Nmeasure;
    222 
    223       off_t i;
    224       for (i=0; i< Nmeasure; i++) {
    225         Measure *m = catalog.measure + i;
    226         if (m->imageID != imageID) {
    227             continue;
    228         }
    229         Average *a = catalog.average + m->averef;
     223      Average *a = catalog.average + m->averef;
    230224       
    231         dvoDetection *det = detections + Ndetect;
    232 
    233         det->valid     = 1;
    234         det->ave      = *a;
    235         det->meas     = *m;
     225      dvoDetection *det = detections + Ndetect;
     226
     227      det->valid     = 1;
     228      det->ave      = *a;
     229      det->meas     = *m;
    236230#ifdef notdfe
    237         det->objID     = a->objID;
    238         det->catID     = m->catID;
    239         det->detID     = m->detID;
    240         det->pspsObjID = a->extID;
    241         det->pspsDetID = m->extID;
     231      det->objID     = a->objID;
     232      det->catID     = m->catID;
     233      det->detID     = m->detID;
     234      det->pspsObjID = a->extID;
     235      det->pspsDetID = m->extID;
    242236#endif
    243237       
    244         if ((int) det->meas.detID > *pMaxDetID) {
    245             *pMaxDetID = det->meas.detID;
    246         }
    247 
    248         Ndetect++;
    249         CHECK_REALLOCATE(detections, dvoDetection, detectionsArrayLength, Ndetect, 1000);
     238      if (det->meas.detID > *pMaxDetID) {
     239        *pMaxDetID = det->meas.detID;
    250240      }
    251241
    252       dvo_catalog_free (&catalog);
     242      Ndetect++;
     243      CHECK_REALLOCATE(detections, dvoDetection, detectionsArrayLength, Ndetect, 1000);
     244    }
     245
     246    dvo_catalog_free (&catalog);
    253247  }
    254248  size_t NInvalidDetID = 0;
    255249  if (Ndetect) {
    256       dvoDetection *sorted;
    257       ALLOCATE(sorted, dvoDetection, *pMaxDetID + 1);
    258 
    259       memset(sorted, 0, sizeof(dvoDetection) * *pMaxDetID);
    260       off_t i;
    261       for (i = 0; i < Ndetect; i++) {
    262 
    263           if (detections[i].meas.detID < 0 || detections[i].meas.detID > (*pMaxDetID + 1))
    264               NInvalidDetID++;
    265           else
    266               sorted[detections[i].meas.detID] = detections[i];
    267       }
    268       *results = sorted;
     250    dvoDetection *sorted;
     251    ALLOCATE(sorted, dvoDetection, *pMaxDetID + 1);
     252
     253    memset(sorted, 0, sizeof(dvoDetection) * *pMaxDetID);
     254    off_t i;
     255    for (i = 0; i < Ndetect; i++) {
     256
     257      // if (detections[i].meas.detID < 0 || detections[i].meas.detID > (*pMaxDetID + 1))
     258
     259      if (detections[i].meas.detID > (*pMaxDetID + 1))
     260        NInvalidDetID++;
     261      else
     262        sorted[detections[i].meas.detID] = detections[i];
     263    }
     264    *results = sorted;
    269265  } else {
    270       *results = NULL;
     266    *results = NULL;
    271267  }
    272268

  • branches/eam_branches/ohana.20160226/src/libdvo/src/match_image.c

    r31635 r39411  
    11# include "dvo.h"
    22
    3 off_t match_image (Image *image, off_t Nimage, unsigned int T, short int S) {
     3off_t match_image (Image *image, off_t Nimage, e_time T, short int S) {
    44
    55  off_t N, Nlo, Nhi, N1, N2;
    … …  
    3737}
    3838
    39 off_t match_image_subset (Image *image, off_t *subset, off_t Nsubset, unsigned int T, short int S) {
     39off_t match_image_subset (Image *image, off_t *subset, off_t Nsubset, e_time T, short int S) {
    4040
    4141  off_t N, Nlo, Nhi, N1, N2;

  • branches/eam_branches/ohana.20160226/src/libkapa/rotfont/courier12.h

    r38991 r39411  
    6363static unsigned char courier12_31_bits[] = {
    64640x00};
    65 static unsigned char courier12_32_bits[] = {};
     65static unsigned char courier12_32_bits[] = {
     660x00};
    6667static unsigned char courier12_33_bits[] = {
    67680x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x02};

  • branches/eam_branches/ohana.20160226/src/libkapa/rotfont/courier24.h

    r38991 r39411  
    6363static unsigned char courier24_31_bits[] = {
    64640x00};
    65 static unsigned char courier24_32_bits[] = {};
     65static unsigned char courier24_32_bits[] = {
     660x00};
    6667static unsigned char courier24_33_bits[] = {
    67680x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x00, 0x00, 0x07,

  • branches/eam_branches/ohana.20160226/src/libkapa/rotfont/courier8.h

    r38991 r39411  
    6363static unsigned char courier8_31_bits[] = {
    64640x00};
    65 static unsigned char courier8_32_bits[] = {};
     65static unsigned char courier8_32_bits[] = {
     660x00};
    6667static unsigned char courier8_33_bits[] = {
    67680x01, 0x01, 0x01, 0x01};

  • branches/eam_branches/ohana.20160226/src/libkapa/rotfont/fixed.h

    r5854 r39411  
    6262static unsigned char fixed_31_bits[] = {
    63630x01};
    64 static unsigned char fixed_32_bits[] = {};
     64static unsigned char fixed_32_bits[] = {
     650x00};
    6566static unsigned char fixed_33_bits[] = {
    66670x1, 0x1, 0x1, 0x1, 0x1, 0x0, 0x01};

  • branches/eam_branches/ohana.20160226/src/libkapa/src/DrawRotString.c

    r38986 r39411  
    3636  unsigned char *bitmap;
    3737  char *currentname, basename[64];
    38   int i, dy, dx, N, X, Y, code, protect;
     38  int dy, dx, N, X, Y, code, protect;
    3939  int dX, Xoff, dY, Yoff, YoffBase;
    4040  int currentsize, basesize;
    … …  
    7676  YoffBase = Yoff;
    7777  /* draw characters one-by-one */
     78  unsigned int i;
    7879  for (i = 0; i < strlen(string); i++) {
    7980    N = (int)(string[i]);
    … …  
    150151  int ii, jj, byte_line, byte, bit, flag;
    151152  unsigned long int fore;
    152   double i, j, cs, sn, rscale, tmp;
     153  double ix, iy, cs, sn, rscale, tmp;
    153154  int X, Y, X0, X1, X2, Y0, Y1, Y2, x0, y0;
    154155
    … …  
    212213  XSetForeground (RotDisplay, RotGC, fore);
    213214  if (scale > 1) {
    214     for (i = X1; i <= X2; i+=1) {
    215       for (j = Y1; j <= Y2; j+=1) {
    216         tmp = rscale*(cs*(i - X0) + sn*(j - Y0)) + x0;  ii = NEARINT (tmp);
    217         tmp = rscale*(cs*(j - Y0) - sn*(i - X0)) + y0;  jj = NEARINT (tmp);
     215    for (ix = X1; ix <= X2; ix += 1) {
     216      for (iy = Y1; iy <= Y2; iy += 1) {
     217        tmp = rscale*(cs*(ix - X0) + sn*(iy - Y0)) + x0;  ii = NEARINT (tmp);
     218        tmp = rscale*(cs*(iy - Y0) - sn*(ix - X0)) + y0;  jj = NEARINT (tmp);
    218219        /* fprintf (stderr, "%d %d  %d %d\n", i, j, ii, jj);  */
    219220        if ((ii < 0) || (ii >= dx) || (jj < 0) || (jj >= dy)) continue;
    … …  
    221222        bit = ii % 8;
    222223        flag = 0x01 & (bitmap[byte] >> bit);
    223         if (flag) XDrawPoint (RotDisplay, RotWindow, RotGC, x + i, y + j);
     224        if (flag) XDrawPoint (RotDisplay, RotWindow, RotGC, x + ix, y + iy);
    224225      }
    225226    }
    226227  } else {
    227     for (i = X1; i <= X2; i+=scale) {
    228       for (j = Y1; j <= Y2; j+=scale) {
    229         tmp = rscale*(cs*(i - X0) + sn*(j - Y0)) + x0;  ii = NEARINT (tmp);
    230         tmp = rscale*(cs*(j - Y0) - sn*(i - X0)) + y0;  jj = NEARINT (tmp);
     228    for (ix = X1; ix <= X2; ix+=scale) {
     229      for (iy = Y1; iy <= Y2; iy+=scale) {
     230        tmp = rscale*(cs*(ix - X0) + sn*(iy - Y0)) + x0;  ii = NEARINT (tmp);
     231        tmp = rscale*(cs*(iy - Y0) - sn*(ix - X0)) + y0;  jj = NEARINT (tmp);
    231232        /* fprintf (stderr, "%d %d  %d %d\n", i, j, ii, jj);  */
    232233        if ((ii < 0) || (ii >= dx) || (jj < 0) || (jj >= dy)) continue;
    … …  
    236237        /* fprintf (stderr, "%2d %2d  %3d %3d  %1d  %f  %f\n", i, j, ii, jj, flag,
    237238           rscale*(cs*(i - X0) + sn*(j - Y0)) + x0, rscale*(cs*(j - Y0) - sn*(i - X0)) + y0);  */
    238         if (flag) XDrawPoint (RotDisplay, RotWindow, RotGC, x + i, y + j);
     239        if (flag) XDrawPoint (RotDisplay, RotWindow, RotGC, x + ix, y + iy);
    239240      }
    240241    }
    241242# if (0)
    242     for (i = 0; i < dx; i++) {
    243       for (j = 0; j < dy; j++) {
    244         tmp = scale*(cs*(i - x0) - sn*(j - y0)) + X0; ii = NEARINT (tmp);
    245         tmp = scale*(cs*(j - y0) + sn*(i - x0)) + Y0; jj = NEARINT (tmp);
     243    for (ix = 0; ix < dx; ix++) {
     244      for (iy = 0; iy < dy; iy++) {
     245        tmp = scale*(cs*(ix - x0) - sn*(iy - y0)) + X0; ii = NEARINT (tmp);
     246        tmp = scale*(cs*(iy - y0) + sn*(ix - x0)) + Y0; jj = NEARINT (tmp);
    246247        /* if ((ii < 0) || (ii >= dx) || (jj < 0) || (jj >= dy)) continue; */
    247         byte = byte_line * j + (i / 8);
    248         bit = i % 8;
     248        byte = byte_line * iy + (ix / 8);
     249        bit = ix % 8;
    249250        flag = 0x01 & (bitmap[byte] >> bit);
    250         fprintf (stderr, "%2d %2d  %3d %3d  %1d  %f  %f\n", i, j, ii, jj, flag,
    251                  scale*(cs*(i - x0) - sn*(j - y0)) + X0, scale*(cs*(j - y0) + sn*(i - x0)) + Y0);
     251        fprintf (stderr, "%2d %2d  %3d %3d  %1d  %f  %f\n", ix, iy, ii, jj, flag,
     252                 scale*(cs*(ix - x0) - sn*(iy - y0)) + X0, scale*(cs*(iy - y0) + sn*(ix - x0)) + Y0);
    252253        if (flag) XDrawPoint (RotDisplay, RotWindow, RotGC, x + ii, y + jj);
    253254      }

  • branches/eam_branches/ohana.20160226/src/libkapa/src/KapaOpen.c

    r39225 r39411  
    1010
    1111static int Nvalid = 0;
    12 static int *VALID = NULL;
     12static u_int32_t *VALID = NULL;
    1313
    1414int KapaLaunchCommand (char *line);
    … …  
    146146  if (Nvalid == 0) {
    147147    Nvalid = 1;
    148     ALLOCATE (VALID, int, Nvalid);
     148    ALLOCATE (VALID, u_int32_t, Nvalid);
    149149  } else {
    150150    Nvalid ++;
    151     REALLOCATE (VALID, int, Nvalid);
     151    REALLOCATE (VALID, u_int32_t, Nvalid);
    152152  }
    153153

  • branches/eam_branches/ohana.20160226/src/libkapa/src/PSRotFont.c

    r38986 r39411  
    77
    88  char *segment, basename[64], *currentname;
    9   int i, N, code, protect;
     9  int N, code, protect;
    1010  int dX, dY, Xoff, Yoff, X, Y, Nseg, NSEG, YoffBase;
    1111  double cs, sn, currentscale;
    … …  
    7878  YoffBase = 0;
    7979  /* accumulate string segments with common state */
     80
     81  unsigned int i;
    8082  for (i = 0; i < strlen (string); i++) {
    8183    N = (int)(string[i]);
    … …  
    198200int PSRotStrlen (char *c) {
    199201
    200   int i, N, dX, code;
     202  int N, dX, code;
    201203  double currentscale, scale;
    202204
    … …  
    208210
    209211  code = FALSE;
     212
     213  unsigned int i;
    210214  for (i = 0; i < strlen (c); i++) {
    211215    N = (int)(c[i]);

  • branches/eam_branches/ohana.20160226/src/libkapa/src/RotFont.c

    r39339 r39411  
    9595int RotStrlen (char *c) {
    9696
    97   int i, N, dX, code;
     97  int N, dX, code;
    9898  double scale;
    9999 
    … …  
    106106
    107107  code = FALSE;
     108
     109  unsigned int i;
    108110  for (i = 0; i < strlen (c); i++) {
    109111    N = (int)(c[i]);

  • branches/eam_branches/ohana.20160226/src/libkapa/src/bDrawRotFont.c

    r30603 r39411  
    1414  unsigned char *bitmap;
    1515  char *currentname, basename[64];
    16   int i, dy, dx, N, X, Y, code, protect;
     16  int dy, dx, N, X, Y, code, protect;
    1717  int dX, Xoff, dY, Yoff, YoffBase;
    1818  int currentsize, basesize;
    … …  
    5757  YoffBase = Yoff;
    5858  /* draw characters one-by-one */
     59
     60  unsigned int i;
    5961  for (i = 0; i < strlen(string); i++) {
    6062    N = (int)(string[i]);
    … …  
    125127
    126128int bDrawRotBitmap (bDrawBuffer *buffer, int x, int y, int dx, int dy, unsigned char *bitmap, int mode, double angle, double scale) {
     129  OHANA_UNUSED_PARAM(mode);
    127130
    128131  int ii, jj, byte_line, byte, bit, flag;

  • branches/eam_branches/ohana.20160226/src/relastro/include/relastro.h

    r39396 r39411  
    8888  off_t *NMEASURE;            // allocated Measures per catalog
    8989  int   *index;               // lookup table catID -> catalog[i]
    90   int  *catIDs;              // lookup table catID <- catalog[i]
    91   int    maxID;               // max catID value to date
     90  unsigned int *catIDs;       // lookup table catID <- catalog[i]
     91  unsigned int  maxID;        // max catID value to date
    9292} CatalogSplitter;
    9393

  • branches/eam_branches/ohana.20160226/src/relastro/src/BrightCatalog.c

    r39396 r39411  
    798798  catalogs->maxID = 0;
    799799  ALLOCATE (catalogs->index, int, catalogs->maxID + 1);
    800   for (i = 0; i <= catalogs->maxID; i++) catalogs->index[i] = -1;
     800
     801  unsigned int ID;
     802  for (ID = 0; ID <= catalogs->maxID; ID++) catalogs->index[ID] = -1;
    801803
    802804  catalogs->Nsecfilt = Nsecfilt;
    … …  
    807809  ALLOCATE (catalogs->catalog, Catalog, catalogs->NCATALOG);
    808810
    809   ALLOCATE (catalogs->catIDs,   int,  catalogs->NCATALOG);
    810   ALLOCATE (catalogs->NAVERAGE, off_t, catalogs->NCATALOG);
    811   ALLOCATE (catalogs->NMEASURE, off_t, catalogs->NCATALOG);
     811  ALLOCATE (catalogs->catIDs,   unsigned int, catalogs->NCATALOG);
     812  ALLOCATE (catalogs->NAVERAGE, off_t,        catalogs->NCATALOG);
     813  ALLOCATE (catalogs->NMEASURE, off_t,        catalogs->NCATALOG);
    812814
    813815  for (i = 0; i < catalogs->NCATALOG; i++) {
    … …  
    844846
    845847  // find the max value of catID in this BrightCatalog
    846   int catIDmax = 0;
     848  unsigned int catIDmax = 0;
    847849  for (i = 0; i < bcatalog->Naverage; i++) {
    848850    catIDmax = MAX(catIDmax, bcatalog->average[i].catID);
    … …  
    850852  // XXX validate the measure ID range here
    851853   
    852   int maxIDold = catalogs->maxID;
     854  unsigned int maxIDold = catalogs->maxID;
    853855  catalogs->maxID = MAX (maxIDold, catIDmax);
    854856   
    855857  // extend the index array and init
    856858  REALLOCATE (catalogs->index, int, catalogs->maxID + 1);
    857   for (i = maxIDold + 1; i <= catalogs->maxID; i++) catalogs->index[i] = -1;
     859
     860  unsigned int id;
     861  for (id = maxIDold + 1; id <= catalogs->maxID; id++) catalogs->index[id] = -1;
    858862
    859863  // identify the new catID values
    860864  for (i = 0; i < bcatalog->Naverage; i++) {
    861     int catID = bcatalog->average[i].catID;
     865    unsigned int catID = bcatalog->average[i].catID;
    862866    assert (catID > 0);
    863867    assert (catID < catalogs->maxID + 1);
    … …  
    881885
    882886    if (catalogs->Ncatalog >= catalogs->NCATALOG) {
     887      int oldNCATALOG = catalogs->NCATALOG;
    883888      catalogs->NCATALOG += 16;
    884889      // fprintf (stderr, "realloc catalogs->catalog: old: %llx  ", (long long) catalogs->catalog);
    … …  
    894899      // fprintf (stderr, "new: %llx  -  %llx\n", (long long) catalogs->NMEASURE, (long long) (catalogs->NMEASURE + sizeof(off_t)*catalogs->NCATALOG));
    895900
    896       REALLOCATE (catalogs->catIDs,   int,  catalogs->NCATALOG);
     901      REALLOCATE (catalogs->catIDs, unsigned int, catalogs->NCATALOG);
    897902
    898903      int j;
    899       for (j = catalogs->NCATALOG - 16; j < catalogs->NCATALOG; j++) {
     904      for (j = oldNCATALOG; j < catalogs->NCATALOG; j++) {
    900905        dvo_catalog_init (&catalogs->catalog[j], TRUE);
    901906        catalogs->catIDs[j] = 0;
    … …  
    917922  // assign the averages to the corresponding catalog
    918923  for (i = 0; i < bcatalog->Naverage; i++) {
    919     int ID = bcatalog->average[i].catID;
     924    unsigned int ID = bcatalog->average[i].catID;
    920925    int Nc = catalogs->index[ID];
    921926    assert (Nc > -1);
    … …  
    942947  // XXX what about averef and related links?  Do I need them?
    943948  for (i = 0; i < bcatalog->Nmeasure; i++) {
    944     int ID = bcatalog->measure[i].catID;
     949    unsigned int ID = bcatalog->measure[i].catID;
    945950    int Nc = catalogs->index[ID];
    946951    assert (Nc > -1);

  • branches/eam_branches/ohana.20160226/src/relastro/src/ImageOps.c

    r39381 r39411  
    508508    m = ImageToMeasure[im][i];
    509509    c = ImageToCatalog[im][i];
     510    myAssert (c < Ncatalog, "oops");
    510511
    511512    Measure *measure = &catalog[c].measure[m];
    … …  
    653654    m = ImageToMeasure[im][i];
    654655    c = ImageToCatalog[im][i];
     656    myAssert (c < Ncatalog, "oops");
    655657
    656658    MeasureTiny *measure = &catalog[c].measureT[m];
    … …  
    753755    m = ImageToMeasure[im][i];
    754756    c = ImageToCatalog[im][i];
     757    myAssert (c < Ncatalog, "oops");
    755758
    756759    MeasureTiny *measure = &catalog[c].measureT[m];
    … …  
    829832    m = ImageToMeasure[im][i];
    830833    c = ImageToCatalog[im][i];
     834    myAssert (c < Ncatalog, "oops");
    831835
    832836    // XXX should I use the raw coords or just measure.X,Y -> R,D?
    … …  
    871875    m = ImageToMeasure[im][i];
    872876    c = ImageToCatalog[im][i];
     877    myAssert (c < Ncatalog, "oops");
    873878
    874879    MeasureTiny *measure = &catalog[c].measureT[m];

  • branches/eam_branches/ohana.20160226/src/relastro/src/MosaicOps.c

    r37038 r39411  
    274274// extend each host image table to include the mosaic 'images' needed by the host
    275275int select_mosaics_hostregion (RegionHostTable *regionHosts, Image *image, off_t Nimage) {
     276  OHANA_UNUSED_PARAM(Nimage);
    276277
    277278  int i;

  • branches/eam_branches/ohana.20160226/src/relastro/src/UpdateObjects.c

    r39409 r39411  
    121121// be called with just MeasureTiny set and Measure == NULL
    122122int UpdateObjects_Chips (Average *average, SecFilt *secfilt, MeasureTiny *measure, Measure *measureBig, int Nsecfilt, FitStats *fitStats, int cat, off_t measOff) {
     123  OHANA_UNUSED_PARAM(Nsecfilt);
    123124
    124125  int k;
    … …  
    552553// be called with just MeasureTiny set and Measure == NULL
    553554int UpdateObjects_Stack (Average *average, SecFilt *secfilt, MeasureTiny *measure, Measure *measureBig, int Nsecfilt, FitStats *fitStats) {
     555  OHANA_UNUSED_PARAM(Nsecfilt);
    554556
    555557  int status;
    … …  
    651653
    652654int UpdateObjects_SelectMeasures (FitStats *fit, Average *average, SecFilt *secfilt, MeasureTiny *measure, Measure *measureBig, int isStack, int *stackEntry) {
     655  OHANA_UNUSED_PARAM(secfilt);
    653656
    654657  // I've already allocated fit->points (and fit->sample) with space for fit->NpointsAlloc entries

  • branches/eam_branches/ohana.20160226/src/relastro/src/dvo_astrom_ops.c

    r37038 r39411  
    22/* the Measure carries the instantaneous mean position at the epoch t */
    33
     4// average & secfilt no longer used since R and D are now in measure
     5
    46double getMeanR (MeasureTiny *measure, Average *average, SecFilt *secfilt) {
     7  OHANA_UNUSED_PARAM(average);
     8  OHANA_UNUSED_PARAM(secfilt);
    59
    610  double ra;
    … …  
    1418
    1519double getMeanD (MeasureTiny *measure, Average *average, SecFilt *secfilt) {
     20  OHANA_UNUSED_PARAM(average);
     21  OHANA_UNUSED_PARAM(secfilt);
    1622
    1723  double dec;
    … …  
    2531
    2632int setMeanR (double ra_fit, MeasureTiny *measure, Average *average, SecFilt *secfilt) {
     33  OHANA_UNUSED_PARAM(average);
     34  OHANA_UNUSED_PARAM(secfilt);
    2735
    2836  // old: measure[0].dR += (ra_fit - average[0].R) * 3600.0;
    … …  
    3442
    3543int setMeanD (double dec_fit, MeasureTiny *measure, Average *average, SecFilt *secfilt) {
     44  OHANA_UNUSED_PARAM(average);
     45  OHANA_UNUSED_PARAM(secfilt);
    3646
    3747  // old: measure[0].dD += (dec_fit - average[0].D) * 3600.0;
    … …  
    4353
    4454double getMeanR_Big (Measure *measure, Average *average, SecFilt *secfilt) {
     55  OHANA_UNUSED_PARAM(average);
     56  OHANA_UNUSED_PARAM(secfilt);
    4557
    4658  double ra;
    … …  
    5466
    5567double getMeanD_Big (Measure *measure, Average *average, SecFilt *secfilt) {
     68  OHANA_UNUSED_PARAM(average);
     69  OHANA_UNUSED_PARAM(secfilt);
    5670
    5771  double dec;
    … …  
    6579
    6680int setMeanR_Big (double ra_fit, Measure *measure, Average *average, SecFilt *secfilt) {
     81  OHANA_UNUSED_PARAM(average);
     82  OHANA_UNUSED_PARAM(secfilt);
    6783
    6884  // old: measure[0].dR += (ra_fit - average[0].R) * 3600.0;
    … …  
    7490
    7591int setMeanD_Big (double dec_fit, Measure *measure, Average *average, SecFilt *secfilt) {
     92  OHANA_UNUSED_PARAM(average);
     93  OHANA_UNUSED_PARAM(secfilt);
    7694
    7795  // measure[0].dD += (dec_fit - average[0].D) * 3600.0;

  • branches/eam_branches/ohana.20160226/src/relastro/src/high_speed_utils.c

    r38601 r39411  
    88#define DEFAULT_WHERE_B  "((flags & 0x01000000) == 0) && ((flags & 0x04000000) && ((y:nphot > 1) || (z:nphot > 1)) &&((y:err < 0.2) || (z:err < 0.2)))"
    99
    10 
    11 extern char **isolate_elements(int, char **, int *);
    1210
    1311int print_error();
    … …  
    7674    // parse it into elements of the where condition
    7775    char **cstack = NULL;
    78     int Ncstack;
     76    unsigned int Ncstack;
    7977    cstack = isolate_elements(nWords, words, &Ncstack);
    8078    free(words);

  • branches/eam_branches/ohana.20160226/src/relastro/src/indexCatalogs.c

    r36630 r39411  
    11# include "relastro.h"
    22
    3 static int   catIDmax = 0;
    4 static int  *catIDseq = NULL;
    5 static int  *objIDmax = NULL;
    6 static int **objIDseq = NULL;
     3static unsigned int   catIDmax = 0;
     4static          int  *catIDseq = NULL;
     5static unsigned int  *objIDmax = NULL;
     6static          int **objIDseq = NULL;
    77
    88int indexCatalogs (Catalog *catalog, int Ncatalog) {
    … …  
    1919
    2020  ALLOCATE (catIDseq, int, catIDmax + 1);
    21   for (i = 0; i < catIDmax + 1; i++) {
    22     catIDseq[i] = -1;
     21
     22  unsigned int ID;
     23  for (ID = 0; ID < catIDmax + 1; ID++) {
     24    catIDseq[ID] = -1;
    2325  }
    2426
    2527  for (i = 0; i < Ncatalog; i++) {
    26     int catID = catalog[i].catID;
     28    unsigned int catID = catalog[i].catID;
    2729    catIDseq[catID] = i;
    2830  }
    2931 
    30   ALLOCATE (objIDmax, int,   Ncatalog);
    31   ALLOCATE (objIDseq, int *, Ncatalog);
     32  ALLOCATE (objIDmax, unsigned int,   Ncatalog);
     33  ALLOCATE (objIDseq,          int *, Ncatalog);
    3234  for (i = 0; i < Ncatalog; i++) {
    3335    objIDmax[i] = 0;
    … …  
    3739
    3840    ALLOCATE (objIDseq[i], int, objIDmax[i] + 1);
    39     for (j = 0; j < objIDmax[i] + 1; j++) {
    40       objIDseq[i][j] = -1;
     41    for (ID = 0; ID < objIDmax[i] + 1; ID++) {
     42      objIDseq[i][ID] = -1;
    4143    }
    4244
    4345    for (j = 0; j < catalog[i].Naverage; j++) {
    44       int objID = catalog[i].average[j].objID;
     46      unsigned int objID = catalog[i].average[j].objID;
    4547      objIDseq[i][objID] = j;
    4648    }

  • branches/eam_branches/ohana.20160226/src/relastro/src/plot_scatter.c

    r17203 r39411  
    22   
    33void plot_scatter (Catalog *catalog, int Ncatalog) {
     4  OHANA_UNUSED_PARAM(catalog);
     5  OHANA_UNUSED_PARAM(Ncatalog);
    46
    57# if (0)   

  • branches/eam_branches/ohana.20160226/src/relastro/src/plotstuff.c

    r39396 r39411  
    4444
    4545void JpegPlot (Graphdata *graphmode, int N, char *filename) {
     46  OHANA_UNUSED_PARAM(graphmode);
    4647
    4748  if (Xgraph[N] == 0) return;
    … …  
    5253
    5354void PSPlot (Graphdata *graphmode, int N, char *filename) {
     55  OHANA_UNUSED_PARAM(graphmode);
    5456
    5557  if (Xgraph[N] == 0) return;
    … …  
    7981
    8082void PlotVector (int Npts, double *vect, int mode, int N, char *type) {
     83  OHANA_UNUSED_PARAM(mode);
    8184
    8285  float *values;

  • branches/eam_branches/ohana.20160226/src/relastro/src/relastro_merge_source.c

    r38986 r39411  
    2222  // load data from each region file, only use bright stars
    2323  for (i = 0; i < sky[0].Nregions; i++) {
    24     if (sky[0].regions[i].index == CAT_ID_SRC) {
     24    myAssert (sky[0].regions[i].index >= 0, "oops");
     25    if ((unsigned int) sky[0].regions[i].index == CAT_ID_SRC) {
    2526      catalog_src.filename = sky[0].filename[i];
    2627      region_src = &sky[0].regions[i];
    2728    }
    2829    // currently, we only accept dst == src...
    29     if (sky[0].regions[i].index == CAT_ID_DST) {
     30    if ((unsigned int) sky[0].regions[i].index == CAT_ID_DST) {
    3031      catalog_dst.filename = sky[0].filename[i];
    3132      // region_dst = &sky[0].regions[i];

  • branches/eam_branches/ohana.20160226/src/relastro/src/share_icrf_obj.c

    r37807 r39411  
    9999    int cat, ave, meas;
    100100    ICRFdata (i, &cat, &ave, &meas);
     101    myAssert (cat < Ncatalog, "oops");
    101102
    102103    Average *average = &catalog[cat].average[ave];

  • branches/eam_branches/ohana.20160226/src/relastro/src/share_mean_pos.c

    r38062 r39411  
    107107        continue;
    108108    }
    109 
     109    myAssert (catSeq < Ncatalog, "oops");
     110   
    110111    catalog[catSeq].average[objSeq].R = meanpos[i].R;
    111112    catalog[catSeq].average[objSeq].D = meanpos[i].D;

  • branches/eam_branches/ohana.20160226/src/relastro/src/share_meas_pos.c

    r38062 r39411  
    101101        continue;
    102102    }
     103    myAssert (catSeq < Ncatalog, "oops");
     104
    103105    off_t m = catalog[catSeq].average[objSeq].measureOffset;
    104106    for (k = 0; k < catalog[catSeq].average[objSeq].Nmeasure; k++, m++) {
Note: See TracChangeset for help on using the changeset viewer.