IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 28798


Ignore:
Timestamp:
Jul 30, 2010, 9:40:31 AM (16 years ago)
Author:
eugene
Message:

updates from trunk

Location:
branches/eam_branches/ipp-20100621/Ohana
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ipp-20100621/Ohana

  • branches/eam_branches/ipp-20100621/Ohana/src/addstar/include/skycells.h

    r27435 r28798  
    7272double CENTER_RA, CENTER_DEC;
    7373double RANGE_RA,  RANGE_DEC;
     74double OVERLAP_RA, OVERLAP_DEC;
    7475
    7576double EULER_A;

  • branches/eam_branches/ipp-20100621/Ohana/src/addstar/src/args_skycells.c

    r23914 r28798  
    8686      help ();
    8787    }
     88    OVERLAP_RA = 0;
     89    OVERLAP_DEC = 0;
     90    if ((N = get_argument (argc, argv, "-overlap"))) {
     91      remove_argument (N, &argc, argv);
     92      OVERLAP_RA  = atof (argv[N]);
     93      remove_argument (N, &argc, argv);
     94      OVERLAP_DEC  = atof (argv[N]);
     95      remove_argument (N, &argc, argv);
     96    }
    8897  }
    8998
    … …  
    113122  }
    114123
    115   /* pixel scale (arcsec/pixel) */
     124  /* padding fraction */
    116125  PADDING = 0.0;
    117126  if ((N = get_argument (argc, argv, "-padding"))) {

  • branches/eam_branches/ipp-20100621/Ohana/src/addstar/src/sky_tessalation.c

    r28241 r28798  
    671671  snprintf (format, 24, "%s.%%0%dd", input[0].name, Ndigit);
    672672
     673  // if requested extend, the skycell boundaries so that skycells overlap
     674  int pad_x = (int) (OVERLAP_RA / SCALE);
     675  int pad_y = (int) (OVERLAP_DEC / SCALE);
     676
    673677  N = 0;
    674678  for (j = 0; j < Ny; j++) {
    … …  
    679683
    680684      snprintf (output[N].name, DVO_IMAGE_NAME_LEN, format, N);
    681       output[N].NX = NX;
    682       output[N].NY = NY;
     685      output[N].NX = NX + 2 * pad_x;
     686      output[N].NY = NY + 2 * pad_y;
    683687      output[N].photcode = input[0].photcode;
    684688
    685       output[N].coords.crpix1 = input[0].coords.crpix1 - i*NX;
    686       output[N].coords.crpix2 = input[0].coords.crpix2 - j*NY;
     689      output[N].coords.crpix1 = input[0].coords.crpix1 - i*NX + pad_x;
     690      output[N].coords.crpix2 = input[0].coords.crpix2 - j*NY + pad_y;
    687691      N++;
    688692    }

  • branches/eam_branches/ipp-20100621/Ohana/src/libohana/include/ohana.h

    r28255 r28798  
    140140# endif
    141141# ifdef _DARWIN_C_SOURCE
    142 # define OFF_T_FMT "%jd"
     142# define OFF_T_FMT "%lld"
    143143#endif
    144144# ifndef OFF_T_FMT

  • branches/eam_branches/ipp-20100621/Ohana/src/relphot/src/bcatalog.c

    r28241 r28798  
    1515
    1616  /* we are moving only the subset of measurements from catalog[0] to subcatalog[0] */
     17  memset(subcatalog, 0, sizeof(*subcatalog));
    1718  NAVERAGE = 50;
    1819  NMEASURE = 1000;

  • branches/eam_branches/ipp-20100621/Ohana/src/uniphot/include/uniphot.h

    r27790 r28798  
    4141typedef struct {
    4242    float zpt;
     43    float zpt_err;
    4344    e_time time;
    4445    int found;

  • branches/eam_branches/ipp-20100621/Ohana/src/uniphot/src/load_zpt_table.c

    r27790 r28798  
    55  int Nzpts, NZPTS;
    66  ZptTable *zpts;
    7   double zpt, mjd;
     7  double zpt, mjd, zpt_err;
    88
    99  FILE *f;
    … …  
    1919  ALLOCATE (zpts, ZptTable, NZPTS);
    2020
    21   // format is fixed: (time) (zpt)
     21  // format is fixed: (time) (zpt) (zpt_err)
    2222  int status;
    23   while ((status = fscanf (f, "%lf %lf", &mjd, &zpt)) == 2) {
     23  while ((status = fscanf (f, "%lf %lf %lf", &mjd, &zpt, &zpt_err)) == 3) {
    2424    zpts[Nzpts].zpt = zpt;
     25    zpts[Nzpts].zpt_err = zpt_err;
    2526    zpts[Nzpts].time = ohana_mjd_to_sec (mjd);
    2627    zpts[Nzpts].found = FALSE;

  • branches/eam_branches/ipp-20100621/Ohana/src/uniphot/src/match_zpts_to_images.c

    r28723 r28798  
    7070    // we have a match: set zpt and record the match
    7171    image[Ni].Mcal = SCALE*code[0].C - zpts[Nz].zpt;
     72    image[Ni].dMcal = zpts[Nz].zpt_err;
    7273    image[Ni].flags &= ~ID_IMAGE_PHOTOM_NOCAL; // clear the NOCAL flag
    7374    zpts[Nz].found = TRUE;

  • branches/eam_branches/ipp-20100621/Ohana/src/uniphot/src/update_catalog_setphot.c

    r28241 r28798  
    7474
    7575  off_t i, j, m, id, idx, found;
    76   float Mcal;
     76  float Mcal, dMcal;
    7777
    7878  found = 0;   
    … …  
    8686      id = index[idx];
    8787      Mcal = image[id].Mcal;
     88      dMcal = image[id].dMcal;
    8889
    89       catalog[0].measure[m].Mcal = image[id].Mcal;
     90      catalog[0].measure[m].Mcal = Mcal;
     91      catalog[0].measure[m].dMcal = dMcal;
    9092      found ++;
    9193    }
Note: See TracChangeset for help on using the changeset viewer.