IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Feb 26, 2016, 8:31:22 PM (10 years ago)
Author:
eugene
Message:

working on very pedantic gcc to track down memory corruption issues

Location:
branches/eam_branches/ohana.20160226/src/libdvo
Files:
20 edited

Legend:

Unmodified
Added
Removed

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

    r39245 r39409  
    6868  AstromOffsetMap **map;
    6969   int *imageIDtoTableSeq;
    70   int MaxImageID;
    71   int MaxTableID;
     70  unsigned int MaxImageID;
     71  unsigned int MaxTableID;
    7272} AstromOffsetTable;
    7373

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

    r38986 r39409  
    148148AstromOffsetTable *AstromOffsetMapToTable(AstromOffsetMap_Disk_6x6 *map_disk, off_t Nmap) {
    149149
    150   int i, j, k;
     150  unsigned int i;
     151  int j, k;
    151152
    152153  AstromOffsetTable *table = NULL;
    … …  
    157158
    158159  // find the max value of imageID
    159   int MaxTableID = 0;
    160   int MaxImageID = 0;
     160  unsigned int MaxTableID = 0;
     161  unsigned int MaxImageID = 0;
    161162  for (i = 0; i < Nmap; i++) {
    162     MaxTableID = MAX(map_disk[i].tableID, MaxTableID);
    163     MaxImageID = MAX(map_disk[i].imageID, MaxImageID);
     163    MaxTableID = MAX(MaxTableID, map_disk[i].tableID);
     164    MaxImageID = MAX(MaxImageID, map_disk[i].imageID);
    164165  }
    165166  table->MaxTableID = MaxTableID;
    … …  
    312313int AstromOffsetTableSetIDs (AstromOffsetTable *table) {
    313314
    314   int i;
    315 
    316315  // find the max value of imageID
    317   int MaxTableID = 0;
    318   int MaxImageID = 0;
    319   for (i = 0; i < table->Nmap; i++) {
    320     MaxTableID = MAX(table->map[i][0].tableID, MaxTableID);
    321     MaxImageID = MAX(table->map[i][0].imageID, MaxImageID);
    322   }
    323   table->MaxTableID = MaxTableID;
    324   table->MaxImageID = MaxImageID;
     316  unsigned int MaxTableID = 0;
     317  unsigned int MaxImageID = 0;
     318  {
     319    int j;
     320    for (j = 0; j < table->Nmap; j++) {
     321      MaxTableID = MAX(MaxTableID, table->map[j][0].tableID);
     322      MaxImageID = MAX(MaxImageID, table->map[j][0].imageID);
     323    }
     324    table->MaxTableID = MaxTableID;
     325    table->MaxImageID = MaxImageID;
     326  }
    325327
    326328  // generate the index and init values to -1
    327   ALLOCATE (table->imageIDtoTableSeq, int, MaxImageID + 1);
    328   for (i = 0; i <= MaxImageID; i++) {
    329     table->imageIDtoTableSeq[i] = -1;
     329  {
     330    unsigned int i;
     331    ALLOCATE (table->imageIDtoTableSeq, int, MaxImageID + 1);
     332    for (i = 0; i <= MaxImageID; i++) {
     333      table->imageIDtoTableSeq[i] = -1;
     334    }
    330335  }
    331336
    332337  // assign the ID values
    333   for (i = 0; i < table->Nmap; i++) {
    334     int ImageID = table->map[i][0].imageID;
    335     myAssert (table->imageIDtoTableSeq[ImageID] == -1, "oops, duplicate image IDs");
    336     table->imageIDtoTableSeq[ImageID] = i;
     338  {
     339    int j;
     340    for (j = 0; j < table->Nmap; j++) {
     341      int ImageID = table->map[j][0].imageID;
     342      myAssert (table->imageIDtoTableSeq[ImageID] == -1, "oops, duplicate image IDs");
     343      table->imageIDtoTableSeq[ImageID] = j;
     344    }
    337345  }
    338346  return TRUE;

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

    r38986 r39409  
    1111  off_t i;
    1212  for (i = 0; i < Nimages; i++) {
    13     int imageID = images[i].imageID;
    14     if (imageID < 0) continue;
     13    if (images[i].imageID < 0) continue;
     14
     15    unsigned int imageID = images[i].imageID;
    1516    if (imageID > table->MaxImageID) continue;
    1617   

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

    r37035 r39409  
    11# include <dvo.h>
    22
    3 int dvo_match_image (Image *image, int Nimage, unsigned int T, short int S) {
     3int dvo_match_image (Image *image, int Nimage, int T, short int S) {
    44
    55  int N, Nlo, Nhi, N1, N2;

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

    r38441 r39409  
    1717     it is not defined for a legacy database, we can generate them using the existing index values.
    1818     If it is missing, give a warning and recommend the user upgrade the DB */
    19   if (!gfits_scan (&catalog[0].header, "OBJID",    "%d", 1, &catalog[0].objID)) {
     19  if (!gfits_scan (&catalog[0].header, "OBJID",    "%u", 1, &catalog[0].objID)) {
    2020    if (VERBOSE) fprintf (stderr, "WARNING: OBJID is not set for %s: upgrade for full feature set\n", catalog[0].filename);
    2121    catalog[0].objID = 0;
    2222  }
    23   if (!gfits_scan (&catalog[0].header, "CATID",    "%d", 1, &catalog[0].catID)) {
     23  if (!gfits_scan (&catalog[0].header, "CATID",    "%u", 1, &catalog[0].catID)) {
    2424    if (VERBOSE) fprintf (stderr, "WARNING: CATID is not set for %s: upgrade for full feature set\n", catalog[0].filename);
    2525    catalog[0].catID = 0;

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

    r38441 r39409  
    2929     it is not defined for a legacy database, we can generate them using the existing index values.
    3030     If it is missing, give a warning and recommend the user upgrade the DB */
    31   if (!gfits_scan (&catalog[0].header, "OBJID",    "%d", 1, &catalog[0].objID)) {
     31  if (!gfits_scan (&catalog[0].header, "OBJID",    "%u", 1, &catalog[0].objID)) {
    3232    if (VERBOSE) fprintf (stderr, "WARNING: OBJID is not set for this database: upgrade for full feature set\n");
    3333    catalog[0].objID = 0;
    3434  }
    35   if (!gfits_scan (&catalog[0].header, "CATID",    "%d", 1, &catalog[0].catID)) {
     35  if (!gfits_scan (&catalog[0].header, "CATID",    "%u", 1, &catalog[0].catID)) {
    3636    if (VERBOSE) fprintf (stderr, "WARNING: CATID is not set for this database: upgrade for full feature set\n");
    3737    catalog[0].catID = 0;

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

    r38986 r39409  
    320320
    321321Missing *FtableToMissing (FTable *ftable, Average *average, off_t *Nmissing, DVOCatFormat *format, char nativeBytes) {
     322  OHANA_UNUSED_PARAM(average);
    322323
    323324  Missing *missing;
    … …  
    397398
    398399SecFilt *FtableToSecFilt (FTable *ftable, Average *average, off_t *Nsecfilt, DVOCatFormat *format, char nativeBytes) {
     400  OHANA_UNUSED_PARAM(average);
    399401
    400402  SecFilt *secfilt;
    … …  
    509511
    510512Lensing *FtableToLensing (FTable *ftable, Average *average, off_t *Nlensing, DVOCatFormat *format, char nativeBytes) {
     513  OHANA_UNUSED_PARAM(average);
    511514
    512515  Lensing *lensing;
    … …  
    652655
    653656Lensobj *FtableToLensobj (FTable *ftable, Average *average, off_t *Nlensobj, DVOCatFormat *format, char nativeBytes) {
     657  OHANA_UNUSED_PARAM(average);
    654658
    655659  Lensobj *lensobj;
    … …  
    769773
    770774StarPar *FtableToStarPar (FTable *ftable, Average *average, off_t *Nstarpar, DVOCatFormat *format, char nativeBytes) {
     775  OHANA_UNUSED_PARAM(average);
    771776
    772777  StarPar *starpar;
    … …  
    874879
    875880GalPhot *FtableToGalPhot (FTable *ftable, Average *average, off_t *Ngalphot, DVOCatFormat *format, char nativeBytes) {
     881  OHANA_UNUSED_PARAM(average);
    876882
    877883  GalPhot *galphot;

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

    r38462 r39409  
    100100// 'primary' is needed to conform with the API for Loneos and Elixir, but is not used
    101101Average *Average_PS1_DEV_1_ToInternal (Average_PS1_DEV_1 *in, off_t Nvalues, SecFilt **primary) {
     102  OHANA_UNUSED_PARAM(primary);
    102103
    103104  off_t i;
    … …  
    138139// 'primary' is needed to conform with the API for Loneos and Elixir, but is not used
    139140Average_PS1_DEV_1 *AverageInternalTo_PS1_DEV_1 (Average *in, off_t Nvalues, SecFilt *primary) {
     141  OHANA_UNUSED_PARAM(primary);
    140142
    141143  off_t i;

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

    r38462 r39409  
    9797// 'primary' is needed to conform with the API for Loneos and Elixir, but is not used
    9898Average *Average_PS1_DEV_2_ToInternal (Average_PS1_DEV_2 *in, off_t Nvalues, SecFilt **primary) {
     99  OHANA_UNUSED_PARAM(primary);
    99100
    100101  off_t i;
    … …  
    133134// 'primary' is needed to conform with the API for Loneos and Elixir, but is not used
    134135Average_PS1_DEV_2 *AverageInternalTo_PS1_DEV_2 (Average *in, off_t Nvalues, SecFilt *primary) {
     136  OHANA_UNUSED_PARAM(primary);
    135137
    136138  off_t i;

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

    r38462 r39409  
    5555// 'primary' is needed to conform with the API for Loneos and Elixir, but is not used
    5656Average *Average_PS1_REF_ToInternal (Average_PS1_REF *in, off_t Nvalues, SecFilt **primary) {
     57  OHANA_UNUSED_PARAM(primary);
    5758
    5859  off_t i;
    … …  
    8081// 'primary' is needed to conform with the API for Loneos and Elixir, but is not used
    8182Average_PS1_REF *AverageInternalTo_PS1_REF (Average *in, off_t Nvalues, SecFilt *primary) {
     83  OHANA_UNUSED_PARAM(primary);
    8284
    8385  off_t i;

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

    r39262 r39409  
    44
    55Measure *Measure_PS1_SIM_ToInternal (Average *ave, Measure_PS1_SIM *in, off_t Nvalues) {
     6  OHANA_UNUSED_PARAM(ave);
    67
    78  off_t i;
    … …  
    5152
    5253Measure_PS1_SIM *MeasureInternalTo_PS1_SIM (Average *ave, Measure *in, off_t Nvalues) {
     54  OHANA_UNUSED_PARAM(ave);
    5355
    5456  off_t i;
    … …  
    9799// 'primary' is needed to conform with the API for Loneos and Elixir, but is not used
    98100Average *Average_PS1_SIM_ToInternal (Average_PS1_SIM *in, off_t Nvalues, SecFilt **primary) {
     101  OHANA_UNUSED_PARAM(primary);
    99102
    100103  off_t i;
    … …  
    143146// 'primary' is needed to conform with the API for Loneos and Elixir, but is not used
    144147Average_PS1_SIM *AverageInternalTo_PS1_SIM (Average *in, off_t Nvalues, SecFilt *primary) {
     148  OHANA_UNUSED_PARAM(primary);
    145149
    146150  off_t i;

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

    r38462 r39409  
    115115// 'primary' is needed to conform with the API for Loneos and Elixir, but is not used
    116116Average *Average_PS1_V1_ToInternal (Average_PS1_V1 *in, off_t Nvalues, SecFilt **primary) {
     117  OHANA_UNUSED_PARAM(primary);
    117118
    118119  off_t i;
    … …  
    152153// 'primary' is needed to conform with the API for Loneos and Elixir, but is not used
    153154Average_PS1_V1 *AverageInternalTo_PS1_V1 (Average *in, off_t Nvalues, SecFilt *primary) {
     155  OHANA_UNUSED_PARAM(primary);
    154156
    155157  off_t i;

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

    r38462 r39409  
    116116// 'primary' is needed to conform with the API for Loneos and Elixir, but is not used
    117117Average *Average_PS1_V2_ToInternal (Average_PS1_V2 *in, off_t Nvalues, SecFilt **primary) {
     118  OHANA_UNUSED_PARAM(primary);
    118119
    119120  off_t i;
    … …  
    157158// 'primary' is needed to conform with the API for Loneos and Elixir, but is not used
    158159Average_PS1_V2 *AverageInternalTo_PS1_V2 (Average *in, off_t Nvalues, SecFilt *primary) {
     160  OHANA_UNUSED_PARAM(primary);
    159161
    160162  off_t i;

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

    r38462 r39409  
    116116// 'primary' is needed to conform with the API for Loneos and Elixir, but is not used
    117117Average *Average_PS1_V3_ToInternal (Average_PS1_V3 *in, off_t Nvalues, SecFilt **primary) {
     118  OHANA_UNUSED_PARAM(primary);
    118119
    119120  off_t i;
    … …  
    159160// 'primary' is needed to conform with the API for Loneos and Elixir, but is not used
    160161Average_PS1_V3 *AverageInternalTo_PS1_V3 (Average *in, off_t Nvalues, SecFilt *primary) {
     162  OHANA_UNUSED_PARAM(primary);
    161163
    162164  off_t i;

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

    r38462 r39409  
    134134// 'primary' is needed to conform with the API for Loneos and Elixir, but is not used
    135135Average *Average_PS1_V4_ToInternal (Average_PS1_V4 *in, off_t Nvalues, SecFilt **primary) {
     136  OHANA_UNUSED_PARAM(primary);
    136137
    137138  off_t i;
    … …  
    180181// 'primary' is needed to conform with the API for Loneos and Elixir, but is not used
    181182Average_PS1_V4 *AverageInternalTo_PS1_V4 (Average *in, off_t Nvalues, SecFilt *primary) {
     183  OHANA_UNUSED_PARAM(primary);
    182184
    183185  off_t i;

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

    r39262 r39409  
    44
    55Measure *Measure_PS1_V5_ToInternal (Average *ave, Measure_PS1_V5 *in, off_t Nvalues) {
     6  OHANA_UNUSED_PARAM(ave);
    67
    78  off_t i;
    … …  
    7980
    8081Measure_PS1_V5 *MeasureInternalTo_PS1_V5 (Average *ave, Measure *in, off_t Nvalues) {
     82  OHANA_UNUSED_PARAM(ave);
    8183
    8284  off_t i;
    … …  
    153155// 'primary' is needed to conform with the API for Loneos and Elixir, but is not used
    154156Average *Average_PS1_V5_ToInternal (Average_PS1_V5 *in, off_t Nvalues, SecFilt **primary) {
     157  OHANA_UNUSED_PARAM(primary);
    155158
    156159  off_t i;
    … …  
    225228// 'primary' is needed to conform with the API for Loneos and Elixir, but is not used
    226229Average_PS1_V5 *AverageInternalTo_PS1_V5 (Average *in, off_t Nvalues, SecFilt *primary) {
     230  OHANA_UNUSED_PARAM(primary);
    227231
    228232  off_t i;
    … …  
    16401644
    16411645Measure *Measure_PS1_V5alt_ToInternal (Average *ave, Measure_PS1_V5alt *in, off_t Nvalues) {
     1646  OHANA_UNUSED_PARAM(ave);
    16421647
    16431648  off_t i;

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

    r38462 r39409  
    106106// 'primary is needed to conform with the API for Loneos and Elixir, but is not used
    107107Average *Average_Panstarrs_DEV_0_ToInternal (Average_Panstarrs_DEV_0 *in, off_t Nvalues, SecFilt **primary) {
     108  OHANA_UNUSED_PARAM(primary);
    108109
    109110  off_t i;
    … …  
    143144// 'primary is needed to conform with the API for Loneos and Elixir, but is not used
    144145Average_Panstarrs_DEV_0 *AverageInternalTo_Panstarrs_DEV_0 (Average *in, off_t Nvalues, SecFilt *primary) {
     146  OHANA_UNUSED_PARAM(primary);
    145147
    146148  off_t i;

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

    r38462 r39409  
    106106// 'primary is needed to conform with the API for Loneos and Elixir, but is not used
    107107Average *Average_Panstarrs_DEV_1_ToInternal (Average_Panstarrs_DEV_1 *in, off_t Nvalues, SecFilt **primary) {
     108  OHANA_UNUSED_PARAM(primary);
    108109
    109110  off_t i;
    … …  
    143144// 'primary is needed to conform with the API for Loneos and Elixir, but is not used
    144145Average_Panstarrs_DEV_1 *AverageInternalTo_Panstarrs_DEV_1 (Average *in, off_t Nvalues, SecFilt *primary) {
     146  OHANA_UNUSED_PARAM(primary);
    145147
    146148  off_t i;

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

    r39277 r39409  
    467467/***/
    468468float PhotAve (PhotCode *code, Average *average, SecFilt *secfilt, dvoMagClassType class, dvoMagSourceType source) {
     469  OHANA_UNUSED_PARAM(average);
    469470
    470471  if (code == NULL) return NAN;
    … …  
    572573
    573574float PhotCalErr (Measure *measure, dvoMagClassType class) {
     575  OHANA_UNUSED_PARAM(class);
    574576
    575577  float dMcal = measure[0].dMcal;
    … …  
    578580
    579581float PhotAveErr (PhotCode *code, Average *average, SecFilt *secfilt, dvoMagClassType class, dvoMagSourceType source) {
     582  OHANA_UNUSED_PARAM(average);
    580583
    581584  if (code == NULL) return NAN;
    … …  
    640643
    641644float PhotZeroPoint (Measure *measure, Average *average, SecFilt *secfilt) {
     645  OHANA_UNUSED_PARAM(average);
     646  OHANA_UNUSED_PARAM(secfilt);
    642647
    643648  int Np;
    … …  
    710715
    711716float PhotMstdev (PhotCode *code, Average *average, SecFilt *secfilt, dvoMagClassType class, dvoMagSourceType source) {
     717  OHANA_UNUSED_PARAM(average);
    712718
    713719  if (code == NULL) return NAN;
    … …  
    757763// return the number of detections in this filter (gpc1)
    758764int PhotNcode (PhotCode *code, Average *average, SecFilt *secfilt) {
     765  OHANA_UNUSED_PARAM(average);
    759766
    760767  if (code == NULL) return 0;
    … …  
    768775// return the number of detections in this filter (gpc1)
    769776int PhotSecfiltFlags (PhotCode *code, Average *average, SecFilt *secfilt) {
     777  OHANA_UNUSED_PARAM(average);
    770778
    771779  if (code == NULL) return 0;
    … …  
    778786
    779787int PhotNphot (PhotCode *code, Average *average, SecFilt *secfilt, dvoMagClassType class, dvoMagSourceType source) {
     788  OHANA_UNUSED_PARAM(average);
    780789
    781790  if (code == NULL) return 0;
    … …  
    824833
    825834float PhotAveFluxPSF (PhotCode *code, Average *average, SecFilt *secfilt) {
     835  OHANA_UNUSED_PARAM(average);
    826836
    827837  int Ns;
    … …  
    836846
    837847float PhotAvedFluxPSF (PhotCode *code, Average *average, SecFilt *secfilt) {
     848  OHANA_UNUSED_PARAM(average);
    838849
    839850  int Ns;
    … …  
    848859
    849860float PhotAveFluxKron (PhotCode *code, Average *average, SecFilt *secfilt) {
     861  OHANA_UNUSED_PARAM(average);
    850862
    851863  int Ns;
    … …  
    860872
    861873float PhotAvedFluxKron (PhotCode *code, Average *average, SecFilt *secfilt) {
     874  OHANA_UNUSED_PARAM(average);
    862875
    863876  int Ns;
    … …  
    872885
    873886float PhotMmin (PhotCode *code, Average *average, SecFilt *secfilt) {
     887  OHANA_UNUSED_PARAM(average);
    874888
    875889  int Ns;
    … …  
    884898
    885899float PhotMmax (PhotCode *code, Average *average, SecFilt *secfilt) {
     900  OHANA_UNUSED_PARAM(average);
    886901
    887902  int Ns;
    … …  
    896911
    897912float PhotUCdist (PhotCode *code, Average *average, SecFilt *secfilt) {
     913  OHANA_UNUSED_PARAM(average);
    898914
    899915  int Ns;
    … …  
    921937// Xm is now (2014.07.03) stored as the chisq except in dvo formats which use as short
    922938float PhotXm (PhotCode *code, Average *average, SecFilt *secfilt) {
     939  OHANA_UNUSED_PARAM(average);
    923940
    924941  int Ns;
    … …  
    11881205/***/
    11891206float PhotFluxAve (PhotCode *code, Average *average, SecFilt *secfilt, dvoMagClassType class, dvoMagSourceType source) {
     1207  OHANA_UNUSED_PARAM(average);
    11901208
    11911209  if (code == NULL) return NAN;
    … …  
    12481266
    12491267float PhotFluxAveErr (PhotCode *code, Average *average, SecFilt *secfilt, dvoMagClassType class, dvoMagSourceType source) {
     1268  OHANA_UNUSED_PARAM(average);
    12501269
    12511270  if (code == NULL) return NAN;
    … …  
    16101629/***/
    16111630float PhotAveTiny (PhotCode *code, AverageTiny *average, SecFilt *secfilt, dvoMagClassType class, dvoMagSourceType source) {
     1631  OHANA_UNUSED_PARAM(average);
    16121632
    16131633  if (code == NULL) return NAN;
    … …  
    17461766
    17471767float PhotdMTiny (PhotCode *code, AverageTiny *average, SecFilt *secfilt) {
     1768  OHANA_UNUSED_PARAM(average);
    17481769
    17491770  int Ns;
    … …  
    17591780// Xm is now (2014.07.03) stored as the chisq except in dvo formats which use as short
    17601781float PhotXmTiny (PhotCode *code, AverageTiny *average, SecFilt *secfilt) {
     1782  OHANA_UNUSED_PARAM(average);
    17611783
    17621784  int Ns;
    … …  
    18531875}
    18541876
    1855 LENSFIELD(X11_sm_obj);
    1856 LENSFIELD(X12_sm_obj);
    1857 LENSFIELD(X22_sm_obj);
    1858 LENSFIELD(E1_sm_obj);
    1859 LENSFIELD(E2_sm_obj);
    1860 
    1861 LENSFIELD(X11_sh_obj);
    1862 LENSFIELD(X12_sh_obj);
    1863 LENSFIELD(X22_sh_obj);
    1864 LENSFIELD(E1_sh_obj);
    1865 LENSFIELD(E2_sh_obj);
    1866 
    1867 LENSFIELD(X11_sm_psf);
    1868 LENSFIELD(X12_sm_psf);
    1869 LENSFIELD(X22_sm_psf);
    1870 LENSFIELD(E1_sm_psf);
    1871 LENSFIELD(E2_sm_psf);
    1872 
    1873 LENSFIELD(X11_sh_psf);
    1874 LENSFIELD(X12_sh_psf);
    1875 LENSFIELD(X22_sh_psf);
    1876 LENSFIELD(E1_sh_psf);
    1877 LENSFIELD(E2_sh_psf);
    1878 
    1879 LENSFIELD( F_ApR5);
    1880 LENSFIELD(dF_ApR5);
    1881 LENSFIELD(sF_ApR5);
    1882 LENSFIELD(fF_ApR5);
    1883 
    1884 LENSFIELD( F_ApR6);
    1885 LENSFIELD(dF_ApR6);
    1886 LENSFIELD(sF_ApR6);
    1887 LENSFIELD(fF_ApR6);
    1888 
    1889 LENSFIELD( F_ApR7);
    1890 LENSFIELD(dF_ApR7);
    1891 LENSFIELD(sF_ApR7);
    1892 LENSFIELD(fF_ApR7);
    1893 
    1894 LENSFIELD(E1);
    1895 LENSFIELD(E2);
     1877LENSFIELD(X11_sm_obj)
     1878LENSFIELD(X12_sm_obj)
     1879LENSFIELD(X22_sm_obj)
     1880LENSFIELD(E1_sm_obj)
     1881LENSFIELD(E2_sm_obj)
     1882
     1883LENSFIELD(X11_sh_obj)
     1884LENSFIELD(X12_sh_obj)
     1885LENSFIELD(X22_sh_obj)
     1886LENSFIELD(E1_sh_obj)
     1887LENSFIELD(E2_sh_obj)
     1888
     1889LENSFIELD(X11_sm_psf)
     1890LENSFIELD(X12_sm_psf)
     1891LENSFIELD(X22_sm_psf)
     1892LENSFIELD(E1_sm_psf)
     1893LENSFIELD(E2_sm_psf)
     1894
     1895LENSFIELD(X11_sh_psf)
     1896LENSFIELD(X12_sh_psf)
     1897LENSFIELD(X22_sh_psf)
     1898LENSFIELD(E1_sh_psf)
     1899LENSFIELD(E2_sh_psf)
     1900
     1901LENSFIELD( F_ApR5)
     1902LENSFIELD(dF_ApR5)
     1903LENSFIELD(sF_ApR5)
     1904LENSFIELD(fF_ApR5)
     1905
     1906LENSFIELD( F_ApR6)
     1907LENSFIELD(dF_ApR6)
     1908LENSFIELD(sF_ApR6)
     1909LENSFIELD(fF_ApR6)
     1910
     1911LENSFIELD( F_ApR7)
     1912LENSFIELD(dF_ApR7)
     1913LENSFIELD(sF_ApR7)
     1914LENSFIELD(fF_ApR7)
     1915
     1916LENSFIELD(E1)
     1917LENSFIELD(E2)
    18961918
    18971919# if (1)

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

    r36084 r39409  
    7676/* sort a coordinate pair (X,Y) and the associated index (S) */
    7777void sort_coords_indexonly (double *X, double *Y, off_t *S, off_t N) {
     78  OHANA_UNUSED_PARAM(Y);
    7879 
    7980# define SWAPFUNC(A,B){ off_t itmp; \
Note: See TracChangeset for help on using the changeset viewer.