Commit e698f1c9 authored by rhenders's avatar rhenders
Browse files

Merged recent changes from trunk

parent 9abd0048

src/analyse.c

+4 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
*	You should have received a copy of the GNU General Public License

*	along with SExtractor. If not, see <http://www.gnu.org/licenses/>.

*

*	Last modified:		02/11/2011

*	Last modified:		12/09/2013

*

*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -830,6 +830,9 @@ void endobject(picstruct *field, picstruct *dfield, picstruct *wfield, 
      }

    }



  /* Clean (zero) all measurements */

  zerocat();



  return;

  }

src/back.c

+1 −8
Original line number Diff line number Diff line
@@ -253,7 +253,6 @@ void makeback(picstruct *field, picstruct *wfield, int wscale_flag) 
        {

        QFSEEK(wfield->file, wfcurpos2, SEEK_SET, wfield->filename);

        wtab->currentElement = (wfcurpos2 == 0) ? 1 : wfcurpos2; // CFITSIO



        wbm = wbackmesh;

        for (m=nx; m--; wbm++)

          if (wbm->mean <= -BIG)
@@ -266,14 +265,10 @@ void makeback(picstruct *field, picstruct *wfield, int wscale_flag) 
        {

        if (bufsize2>size)

          bufsize2 = size;



        read_body(field->tab, buf, bufsize2);



        if (wfield)

          {



          read_body(wfield->tab, wbuf, bufsize2);



          weight_to_var(wfield, wbuf, bufsize2);

          }

        backhisto(backmesh, wbackmesh, buf, wbuf, bufsize2, nx, w, bw,
@@ -313,11 +308,9 @@ void makeback(picstruct *field, picstruct *wfield, int wscale_flag) 
/* Go back to the original position */

  QFSEEK(field->file, fcurpos, SEEK_SET, field->filename);

  field->tab->currentElement = fcurpos; // CFITSIO



  if (wfield) {

    QFSEEK(wfield->file, wfcurpos, SEEK_SET, wfield->filename);

    wfield->tab->currentElement = (wfcurpos == 0) ? 1 : wfcurpos; // CFITSIO



  }



/* Median-filter and check suitability of the background map */

src/catout.c

+21 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
*	You should have received a copy of the GNU General Public License

*	along with SExtractor. If not, see <http://www.gnu.org/licenses/>.

*

*	Last modified:		05/07/2013

*	Last modified:		12/09/2013

*

*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
@@ -933,6 +933,8 @@ void reinitcat(picstruct *field) 
    init_writeobj(fitscat, objtab, &buf);

    }



  zerocat();



  return;

  }
@@ -1101,3 +1103,21 @@ void reendcat() 
  }





/********************************** zerocat **********************************/

/*

Reset to 0 all measurements in the current catalog.

*/

void	zerocat(void)

  {

   keystruct	*key;

   int		i;



  key = objtab->key;

  for (i=objtab->nkey; i--; key=key->nextkey)

    memset(key->ptr, 0, key->nbytes);



  return;

  }

src/field.c

+1 −0
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ picstruct *newfield(char *filename, int flags, int ext) 
    }

  if (!nok)

    error(EXIT_FAILURE, "Not a valid FITS image in ",filename);



  field->tab = tab;

  if (ntab<0)

    error(EXIT_FAILURE, "Not enough valid FITS image extensions in ",filename);

src/fits/fitsbody.c

+0 −4
Original line number Diff line number Diff line
@@ -389,7 +389,6 @@ void read_body(tabstruct *tab, PIXTYPE *ptr, size_t size) 
        }

        else

        QFREAD(bufdata, spoonful*tab->bytepix, cat->file, cat->filename);



        switch(tab->bitpix)

          {

          case BP_BYTE:
@@ -665,8 +664,6 @@ void read_body(tabstruct *tab, PIXTYPE *ptr, size_t size) 
    default:

      error(EXIT_FAILURE,"*Internal Error*: unknown compression mode in ",

                                "read_body()");





    }



  //printf("SSSS %f %f %f %f %f\n", bufdata[0], bufdata[10], bufdata[100], bufdata[1000], bufdata[spoonful-1]);
@@ -977,7 +974,6 @@ void write_body(tabstruct *tab, PIXTYPE *ptr, size_t size) 
            for (i=spoonful; i--;)

              *(bufdata++) = (*(ptr++)-bz)/bs;





            // CFITSIO - only perform byte-swap if we are NOT writing a tile-compressed format using cfitsio

            if (0 && tab->infptr == NULL) // TODO

            if (bswapflag)