Changeset 39457 for trunk/Ohana/src/addstar

Timestamp:

Mar 11, 2016, 10:23:42 PM (11 years ago)

Author:

eugene

Message:

modify to pass with extremely pedantic build; force consistency for signed vs unsigned and int sizes; various relastro updates

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/addstar/src/ConfigInit.c (modified) (1 diff)
• src/addstar/src/LoadDataSDSS.c (modified) (1 diff)
• src/addstar/src/ReadImageHeader.c (modified) (2 diffs)
• src/addstar/src/ReadStarsFITS.c (modified) (1 diff)
• src/addstar/src/SkyRegionUtils.c (modified) (1 diff)
• src/addstar/src/build_links.c (modified) (3 diffs)
• src/addstar/src/calibrate.c (modified) (1 diff)
• src/addstar/src/greference.c (modified) (1 diff)
• src/addstar/src/loadgalphot_table.c (modified) (1 diff)
• src/addstar/src/loadsupercos_rawdata.c (modified) (1 diff)
• src/addstar/src/mkcmf.c (modified) (5 diffs)
• src/addstar/src/sky_tessalation.c (modified) (4 diffs)

trunk/Ohana/src/addstar/src/ConfigInit.c

@@ -224 +224 @@
 
   /* get detection filtering mask */
-  if (!ScanConfig (config, "DETECTIONFILTER", "%d", 0, &options.detectionFilter)) {
+  if (!ScanConfig (config, "DETECTIONFILTER", "%u", 0, &options.detectionFilter)) {
       options.detectionFilter = 0;
   }

trunk/Ohana/src/addstar/src/LoadDataSDSS.c

@@ -5 +5 @@
 // each SDSS data set corresponds to 5 images (ugriz)
 Catalog *LoadDataSDSS (FILE *f, char *imagename, Image **images, off_t *nvalid, Header **headers, off_t *extsize, HeaderSet *headerSets, off_t Nimages) {
+  OHANA_UNUSED_PARAM(Nimages);
 
   off_t Nskip, Nvalid, NVALID;

trunk/Ohana/src/addstar/src/ReadImageHeader.c

@@ -209 +209 @@
   }
 
-  if (!gfits_scan (header, ImageIDKeyword, "%d", 1, &image[0].externID)) {
+  if (!gfits_scan (header, ImageIDKeyword, "%u", 1, &image[0].externID)) {
     image[0].externID = 0;
   }
@@ -272 +272 @@
 
   /* find expected number of stars */
-  if (!gfits_scan (header, "NSTARS", "%d", 1, &image[0].nstar) && !NO_STARS) {
+  if (!gfits_scan (header, "NSTARS", "%u", 1, &image[0].nstar) && !NO_STARS) {
     fprintf (stderr, "WARNING: can't get NSTARS from header (TEXT mode will be invalid)\n");
   }

trunk/Ohana/src/addstar/src/ReadStarsFITS.c

@@ -43 +43 @@
 // corresponding image header, load the stars from the table
 Catalog *ReadStarsFITS (FILE *f, Header *header, Header *in_theader) {
+  OHANA_UNUSED_PARAM(header);
 
   off_t Nskip;

trunk/Ohana/src/addstar/src/SkyRegionUtils.c

@@ -2 +2 @@
 
 SkyList *SkyListExistingSubset (SkyList *input, char *path) {
+  OHANA_UNUSED_PARAM(path);
   
   int i, status, Nsubset, NSUBSET;

trunk/Ohana/src/addstar/src/build_links.c

@@ -27 +27 @@
    not partial, and has a correct set of average[].measureOffset,Nmeasure values */
 off_t *init_measure_links (Average *average, off_t Naverage, Measure *measure, off_t Nmeasure) {
+  OHANA_UNUSED_PARAM(measure);
 
   off_t i, j, N;
@@ -161 +162 @@
 /* build the initial links assuming the table is sorted */
 off_t *init_missing_links (Average *average, off_t Naverage, Missing *missing, off_t Nmissing) {
+  OHANA_UNUSED_PARAM(missing);
 
   off_t i, j, N;
@@ -229 +231 @@
    not partial, and has a correct set of average[].lensingOffset,Nlensing values */
 off_t *init_lensing_links (Average *average, off_t Naverage, Lensing *lensing, off_t Nlensing) {
+  OHANA_UNUSED_PARAM(lensing);
 
   off_t i, j, N;

trunk/Ohana/src/addstar/src/calibrate.c

@@ -157 +157 @@
   /* create a hash array from Nstar[] entries */
   ALLOCATE (Nlist, int, MaxN + 1);
-  memset (Nlist, 0, MAX (0, MaxN*sizeof(int)));
+  if (MaxN >= 0) {
+    memset (Nlist, 0, sizeof(int));
+  }
   for (i = 0; i < Ncal; i++) {
     Nlist[Nstar[i]] ++;

trunk/Ohana/src/addstar/src/greference.c

@@ -4 +4 @@
 
 Catalog *greference (char *Refcat, SkyRegion *region, int photcode) {
+  OHANA_UNUSED_PARAM(photcode);
 
   Catalog *catalog = NULL;

trunk/Ohana/src/addstar/src/loadgalphot_table.c

@@ -3 +3 @@
 
 int loadgalphot_table (SkyList *skylistInput, HostTable *hosts, char *filename, AddstarClientOptions *options) {
+  OHANA_UNUSED_PARAM(hosts);
   
   int i, Nstars;

trunk/Ohana/src/addstar/src/loadsupercos_rawdata.c

@@ -7 +7 @@
 
 int loadsupercos_rawdata (Image *image, int *imlist, int Nimage, SkyTable *skytable, char *filename, AddstarClientOptions options) {
+  OHANA_UNUSED_PARAM(Nimage);
   
   int i;

trunk/Ohana/src/addstar/src/mkcmf.c

@@ -1368 +1368 @@
 
 int WriteXSRCtable (FILE *fits, char *extroot, double *X, double *Y, double *M, unsigned int *Flag, int Nstars, float zeroPt, float exptime) {
+  OHANA_UNUSED_PARAM(Flag);
 
   int i, j;
@@ -1527 +1528 @@
 
 int WriteXFITtable (FILE *fits, char *extroot, double *X, double *Y, double *M, unsigned int *Flag, int Nstars) {
+  OHANA_UNUSED_PARAM(Flag);
 
   int i;
@@ -1688 +1690 @@
 
 int WriteXGALtable (FILE *fits, char *extroot, double *X, double *Y, double *M, unsigned int *Flag, int Nstars) {
+  OHANA_UNUSED_PARAM(Flag);
 
   int i;
@@ -1804 +1807 @@
 
 int WriteXRADtable (FILE *fits, char *extroot, double *X, double *Y, double *M, unsigned int *Flag, int Nstars, int Nrad) {
+  OHANA_UNUSED_PARAM(Flag);
 
   int i, j, k;
@@ -1881 +1885 @@
 
 int WriteDETFtable (FILE *fits, char *extroot, double *X, double *Y, double *M, unsigned int *Flag, int Nstars) {
+  OHANA_UNUSED_PARAM(X);
+  OHANA_UNUSED_PARAM(Y);
+  OHANA_UNUSED_PARAM(M);
+  OHANA_UNUSED_PARAM(Flag);
+  OHANA_UNUSED_PARAM(Nstars);
 
   int i;

trunk/Ohana/src/addstar/src/sky_tessalation.c

@@ -202 +202 @@
 // for local projects such as the PS1 Medium Deep fields
 int sky_tessellation_local (FITS_DB *db, int level, int Nmax) {
+  OHANA_UNUSED_PARAM(level);
+  OHANA_UNUSED_PARAM(Nmax);
 
   int Nimage;
@@ -239 +241 @@
 // we generate projects on uniform rings of constant dec height
 int sky_tessellation_rings (FITS_DB *db, int level, int Nmax) {
+  OHANA_UNUSED_PARAM(level);
+  OHANA_UNUSED_PARAM(Nmax);
 
   int j, nDEC, Nimage, Nring, Ntotal, Ndigit;
@@ -294 +298 @@
 // based on code supplied by Tamas 2012.07.23
 int sky_tessellation_tamas (FITS_DB *db, int level, int Nmax) {
+  OHANA_UNUSED_PARAM(level);
+  OHANA_UNUSED_PARAM(Nmax);
 
   int j, nDEC, Nimage, Nring, Ntotal, Ndigit;
@@ -740 +746 @@
 // format : guide to generate the filenames (c-type string format)
 SkyRectangle *sky_rectangle_tamas (double *Dec, double dm, double halfa, double halftheta, int *nring, char *format) {
+  OHANA_UNUSED_PARAM(halfa);
 
   static int Nname = 0;