IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 28318


Ignore:
Timestamp:
Jun 14, 2010, 4:19:32 PM (16 years ago)
Author:
Paul Price
Message:

Merging changes from trunk (turn off extraneous print)

Location:
tags/ipp-20100610/Ohana
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • tags/ipp-20100610/Ohana

  • tags/ipp-20100610/Ohana/src/opihi/pcontrol/StartJob.c

    r28242 r28318  
    3636  }
    3737
    38   fprintf (stderr, "command: %s\n", line);
     38  // fprintf (stderr, "command: %s\n", line);
    3939
    4040  status = PclientCommand (host, line, PCLIENT_PROMPT, PCONTROL_RESP_START_JOB);
  • tags/ipp-20100610/Ohana/src/photdbc/src/copy_images.c

    r17284 r28318  
    33int copy_images (char *outdir) {
    44
    5   int status, Nimage;
     5  int status;
     6  off_t Nimage;
    67  char *ImageOut;
    78  FITS_DB in;
  • tags/ipp-20100610/Ohana/src/photdbc/src/join_stars.c

    r27435 r28318  
    77  off_t Naverage, Nmeasure, *index;
    88  double *X, *Y, dX, dY, dR, RADIUS2;
    9   double Sr, Sd, Rmid, Dmid;
     9  double Rmid, Dmid;
    1010  int basecode, baseNsec, Nsecfilt, *found;
    1111
     
    202202
    203203  if (Nmeas != Nmeasure) {
    204     fprintf (stderr, "failure to match %d measures (%d of %d matched)\n", Nmeasure - Nmeas, Nmeas, Nmeasure);
     204    fprintf (stderr, "failure to match "OFF_T_FMT" measures ("OFF_T_FMT" of "OFF_T_FMT" matched)\n", Nmeasure - Nmeas, Nmeas, Nmeasure);
    205205  }
    206206 
  • tags/ipp-20100610/Ohana/src/photdbc/src/make_subcatalog.c

    r17284 r28318  
    55int make_subcatalog (Catalog *subcatalog, Catalog *catalog) {
    66 
    7   int i, j, offset;
    8   int NAVERAGE, NMEASURE, Naverage, Nmeasure, Nm, Nsecfilt;
     7  off_t i, j, offset;
     8  off_t NAVERAGE, NMEASURE, Naverage, Nmeasure, Nm, Nsecfilt;
    99  double mag, minMag;
    1010
     
    105105
    106106  if (VERBOSE) {
    107     fprintf (stderr, "%d: using %d stars (%d measures) for catalog\n", i,
     107    fprintf (stderr, OFF_T_FMT": using "OFF_T_FMT" stars ("OFF_T_FMT" measures) for catalog\n", i,
    108108             subcatalog[0].Naverage, subcatalog[0].Nmeasure);
    109109  }
  • tags/ipp-20100610/Ohana/src/photdbc/src/photdbc.c

    r25757 r28318  
    6060       
    6161    // XXX add other filters here:
    62     join_stars (&outcatalog);
     62    // join_stars (&outcatalog);
    6363    // unique_measures (catalog);
    6464    // flag_measures (&db, catalog);
Note: See TracChangeset for help on using the changeset viewer.