IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Mar 11, 2016, 10:23:42 PM (10 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:
17 edited

Legend:

Unmodified
Added
Removed

  • trunk/Ohana

  • trunk/Ohana/src/opihi/cmd.astro/flux.c

    r27611 r39457  
    11# include "astro.h"
     2# include <signal.h>
    23
    34int flux (int argc, char **argv) {
    45 
    56  int i, j, k, xmin, ymin, xmax, ymax;
    6   void *oldsignal;
    77  double ax, ay, s, S, flux;
    88  double bx[5], by[5], x[5], y[5], bb[5];
    … …  
    5555   we have to add up the angles for concave contours */
    5656  flux = 0;
    57   oldsignal = signal (SIGINT, handle_interrupt);
    58   interrupt = FALSE;
     57
     58  struct sigaction *old_sigaction = SetInterrupt();
    5959  for (j = ymin; (j < ymax) && !interrupt; j++) {
    6060    V = (float *)(buf[0].matrix.buffer) + j*buf[0].matrix.Naxis[0] + xmin;
    … …  
    7272    }
    7373  }
    74   signal (SIGINT, oldsignal);
     74  ClearInterrupt (old_sigaction);
    7575
    7676  gprint (GP_LOG, "flux: %f\n", flux);

  • trunk/Ohana/src/opihi/cmd.astro/imfit-fgauss.c

    r20936 r39457  
    4141/* real 2D gaussian -- x, y, sx, sy, sxy, I, sky */
    4242opihi_flt fgaussTD (opihi_flt x, opihi_flt y, opihi_flt *par, int Npar, opihi_flt *dpar) {
     43  OHANA_UNUSED_PARAM(Npar);
    4344
    4445  opihi_flt X, Y, px, py;

  • trunk/Ohana/src/opihi/cmd.astro/imfit-pgauss-psf.c

    r20936 r39457  
    3939/* pseudo 2D gaussian -- x, y, (sx), (sy), (sxy), I, sky */
    4040opihi_flt pgauss_psfTD (opihi_flt x, opihi_flt y, opihi_flt *par, int Npar, opihi_flt *dpar) {
     41  OHANA_UNUSED_PARAM(Npar);
    4142
    4243  opihi_flt X, Y, px, py;

  • trunk/Ohana/src/opihi/cmd.astro/imfit-pgauss.c

    r20936 r39457  
    4141/* pseudo 2D gaussian -- x, y, sx, sy, sxy, I, sky */
    4242opihi_flt pgaussTD (opihi_flt x, opihi_flt y, opihi_flt *par, int Npar, opihi_flt *dpar) {
     43  OHANA_UNUSED_PARAM(Npar);
    4344
    4445  opihi_flt X, Y, px, py;

  • trunk/Ohana/src/opihi/cmd.astro/imfit-qfgauss.c

    r20936 r39457  
    4545/* one component, two slopes: (1 + z^M + z^N)^(-1) -- x, y, sx, sy, sxy, I, sky */
    4646opihi_flt qfgaussTD (opihi_flt x, opihi_flt y, opihi_flt *par, int Npar, opihi_flt *dpar) {
     47  OHANA_UNUSED_PARAM(Npar);
    4748
    4849  opihi_flt X, Y, px, py;

  • trunk/Ohana/src/opihi/cmd.astro/imfit-qgauss-psf.c

    r20936 r39457  
    4242/* one component, two slopes: (1 + z^M + z^N)^(-1) -- x, y, sx, sy, sxy, I, sky, sr */
    4343opihi_flt qgauss_psfTD (opihi_flt x, opihi_flt y, opihi_flt *par, int Npar, opihi_flt *dpar) {
     44  OHANA_UNUSED_PARAM(Npar);
    4445
    4546  opihi_flt X, Y, px, py;

  • trunk/Ohana/src/opihi/cmd.astro/imfit-qgauss.c

    r20936 r39457  
    4545/* one component, two slopes: (1 + z^M + z^N)^(-1) -- x, y, sx, sy, sxy, I, sky, sr */
    4646opihi_flt qgaussTD (opihi_flt x, opihi_flt y, opihi_flt *par, int Npar, opihi_flt *dpar) {
     47  OHANA_UNUSED_PARAM(Npar);
    4748
    4849  opihi_flt X, Y, px, py;

  • trunk/Ohana/src/opihi/cmd.astro/imfit-qrgauss.c

    r20936 r39457  
    4545
    4646opihi_flt qrgaussTD (opihi_flt x, opihi_flt y, opihi_flt *par, int Npar, opihi_flt *dpar) {
     47  OHANA_UNUSED_PARAM(Npar);
    4748
    4849  opihi_flt X, Y, px, py;

  • trunk/Ohana/src/opihi/cmd.astro/imfit-rgauss.c

    r20936 r39457  
    3737/* two components: (1 + z_1 + 0.5*z_1^2 + z_2^N)^(-1) -- x, y, sx1, sy1, sxy1, I, sky, sx2, sy2, sxy2 */
    3838opihi_flt rgaussTD (opihi_flt x, opihi_flt y, opihi_flt *par, int Npar, opihi_flt *dpar) {
     39  OHANA_UNUSED_PARAM(Npar);
    3940
    4041  opihi_flt X, Y, px1, py1, px2, py2;

  • trunk/Ohana/src/opihi/cmd.astro/imfit-serbulge.c

    r20936 r39457  
    4242/* exp (-b (r/r_e)^(1/n)) + pgauss (r) */
    4343opihi_flt serbulgeTD (opihi_flt x, opihi_flt y, opihi_flt *par, int Npar, opihi_flt *dpar) {
     44  OHANA_UNUSED_PARAM(Npar);
    4445
    4546  opihi_flt X, Y, px1, px2, py1, py2;

  • trunk/Ohana/src/opihi/cmd.astro/imfit-sersic.c

    r20936 r39457  
    3434/* exp (-b (r/r_e)^(1/n)) */
    3535opihi_flt sersicTD (opihi_flt x, opihi_flt y, opihi_flt *par, int Npar, opihi_flt *dpar) {
     36  OHANA_UNUSED_PARAM(Npar);
    3637
    3738  opihi_flt X, Y, px, py;

  • trunk/Ohana/src/opihi/cmd.astro/imfit-sgauss-psf.c

    r20936 r39457  
    4444/* two components: (1 + z_1 + z_2^N)^(-1) -- x, y, sx1, sy1, sxy1, I, sky, sx2, sy2, sxy2 */
    4545opihi_flt sgauss_psfTD (opihi_flt x, opihi_flt y, opihi_flt *par, int Npar, opihi_flt *dpar) {
     46  OHANA_UNUSED_PARAM(Npar);
    4647
    4748  opihi_flt X, Y, px1, py1, px2, py2;

  • trunk/Ohana/src/opihi/cmd.astro/imfit-sgauss.c

    r20936 r39457  
    5353/* two components: (1 + z_1 + z_2^N)^(-1) -- x, y, sx1, sy1, sxy1, I, sky, sx2, sy2, sxy2 */
    5454opihi_flt sgaussTD (opihi_flt x, opihi_flt y, opihi_flt *par, int Npar, opihi_flt *dpar) {
     55  OHANA_UNUSED_PARAM(Npar);
    5556
    5657  opihi_flt X, Y, px1, py1, px2, py2;

  • trunk/Ohana/src/opihi/cmd.astro/imfit-tgauss.c

    r20936 r39457  
    3232/* two components: (1 + z_1^M + z_2^N)^(-1) -- x, y, sx1, sy1, sxy1, I, sky, sx2, sy2, sxy2 */
    3333opihi_flt tgaussTD (opihi_flt x, opihi_flt y, opihi_flt *par, int Npar, opihi_flt *dpar) {
     34  OHANA_UNUSED_PARAM(Npar);
    3435
    3536  opihi_flt X, Y, px1, py1, px2, py2;

  • trunk/Ohana/src/opihi/cmd.astro/imfit-vgauss.c

    r20936 r39457  
    2727/* pseudo 2D gaussian with opihi_flting 2nd and 3rd order terms -- x, y, sx, sy, sxy, I, sky, f1, f2 */
    2828opihi_flt vgaussTD (opihi_flt x, opihi_flt y, opihi_flt *par, int Npar, opihi_flt *dpar) {
     29  OHANA_UNUSED_PARAM(Npar);
    2930
    3031  opihi_flt X, Y, px, py;

  • trunk/Ohana/src/opihi/cmd.astro/spexseq.c

    r33662 r39457  
    4343
    4444void get_sequence (Object *object, int Nobject, int idx1, float Dmax, float f1, float f2, int pin1, int pin2) {
     45  OHANA_UNUSED_PARAM(pin1);
     46  OHANA_UNUSED_PARAM(pin2);
    4547
    4648  int i, j, N;
Note: See TracChangeset for help on using the changeset viewer.