IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 35713


Ignore:
Timestamp:
Jun 26, 2013, 6:14:48 AM (13 years ago)
Author:
eugene
Message:

add stats reporting

Location:
branches/eam_branches/ipp-20130509/Ohana/src/delstar
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ipp-20130509/Ohana/src/delstar/include/delstar.h

    r35711 r35713  
    4848char  *IMAGENAME;
    4949char  *IMAGES;
     50char  *IMSTATS_FILE;
    5051
    5152double NSIGMA;
    … …  
    161162
    162163void sort_fullIDs (uint64_t *I, int *S, off_t N);
     164
     165int ImageValidSave(char *filename);
     166int ImageValidLoad(char *filename);
     167void SummaryImageStats (ImageSubset *image, off_t Nimage_comp);
     168void BumpInvalidImage (int Seq);
     169void BumpValidImage (int Seq);
     170

  • branches/eam_branches/ipp-20130509/Ohana/src/delstar/src/ImageOpsFixLAP.c

    r35711 r35713  
    1616int *imageIndex = NULL;
    1717
    18 // XX int *Nimage_valid = NULL;
    19 // XX int *Nimage_invalid = NULL;
     18int *Nimage_valid = NULL;
     19int *Nimage_invalid = NULL;
    2020
    2121void sort_image_externID (unsigned int *E, short *C, unsigned int *I, unsigned int *Q, off_t N);
    … …  
    3838  ALLOCATE (imageID_stk, unsigned int, Nimage);
    3939  ALLOCATE (imageSeq_stk, unsigned int, Nimage);
     40
     41  ALLOCATE (Nimage_valid, int, Nimage);
     42  ALLOCATE (Nimage_invalid, int, Nimage);
     43  memset (Nimage_valid, 0, sizeof(int)*Nimage);
     44  memset (Nimage_invalid, 0, sizeof(int)*Nimage);
    4045
    4146  int maxID = 0;
    … …  
    207212}
    208213
    209 # if (0)
    210214// increment the count of valid detections for this image
    211215void BumpValidImage (int Seq) {
    … …  
    249253
    250254  int Nfixed = 0;
     255  int Nskip  = 0;
    251256  int Nbad_1 = 0;
    252257  int Nbad_2 = 0;
    253258
    254259  for (i = 0; i < Nimage_comp; i++) {
    255     if (Nimage_valid[i] + Nimage_invalid[i] == 0) continue;     // XXX for now, skip (optionally?) images with no matched detections
    256260    if (image[i].photcode == 0) continue; // skip images with 0 photcode (eg, PHU)
     261
     262    if (Nimage_valid[i] + Nimage_invalid[i] == 0) Nskip ++;
    257263
    258264    if (Nimage_invalid[i] > 0) Nfixed ++;
    … …  
    264270  }
    265271
    266   fprintf (stderr, "Nfixed: %d, Ndrop (>1%%) %d, Ndrop (>5%%) %d\n", Nfixed, Nbad_1, Nbad_2);
     272  fprintf (stderr, "Nfixed: %d, Nskip %d, Ndrop (>1%%) %d, Ndrop (>5%%) %d\n", Nfixed, Nskip, Nbad_1, Nbad_2);
    267273}
    268274
    … …  
    383389  return TRUE;
    384390}
    385 # endif

  • branches/eam_branches/ipp-20130509/Ohana/src/delstar/src/args.c

    r35711 r35713  
    220220  }
    221221
     222  IMSTATS_FILE = NULL;
     223  if ((MODE == MODE_FIX_LAP) && (!PARALLEL)) {
     224    IMSTATS_FILE = strcreate ("delstar.fixLAP.stats.fits");
     225  }
     226
    222227goodtime:
    223228
    … …  
    381386  }
    382387
     388  IMSTATS_FILE = NULL;
     389  if (MODE == MODE_FIX_LAP) {
     390    N = get_argument (argc, argv, "-imstats");
     391    if (N == 0) {
     392      fprintf (stderr, "delstar_client -fix-LAP needs -imstats (FILE)\n");
     393      exit (2);
     394    }
     395    remove_argument (N, &argc, argv);
     396    IMSTATS_FILE = strcreate (argv[N]);
     397    remove_argument (N, &argc, argv);
     398  }
     399
    383400  if (MODE == MODE_NONE) delstar_client_usage ();
    384401  return (TRUE);

  • branches/eam_branches/ipp-20130509/Ohana/src/delstar/src/delete_fix_LAP.c

    r35712 r35713  
    7070    dvo_catalog_free (&catalog);
    7171  }
     72
     73  ImageValidSave (IMSTATS_FILE);
     74
    7275  return TRUE;
    7376}
    … …  
    122125    table->hosts[i].pathname = tmppath;
    123126
     127    ALLOCATE (table->hosts[i].results, char, 1024);
     128    snprintf (table->hosts[i].results, 1024, "%s/delstar.fixLAP.imstats.%s.dat", table->hosts[i].pathname, uniquer);
     129
    124130    char command[1024];
    125     snprintf (command, 1024, "delstar_client -hostID %d -D CATDIR %s -hostdir %s -images %s -region %f %f %f %f -fix-LAP",
    126               table->hosts[i].hostID, CATDIR, table->hosts[i].pathname, imageFile,
     131    snprintf (command, 1024, "delstar_client -hostID %d -D CATDIR %s -hostdir %s -images %s -imstats %s -region %f %f %f %f -fix-LAP",
     132              table->hosts[i].hostID, CATDIR, table->hosts[i].pathname, imageFile, table->hosts[i].results,
    127133              UserPatch.Rmin, UserPatch.Rmax, UserPatch.Dmin, UserPatch.Dmax);
    128134
    … …  
    163169  }
    164170
     171  for (i = 0; i < table->Nhosts; i++) {
     172    while (!ImageValidLoad (table->hosts[i].results)) {
     173      fprintf (stderr, "failed to read data from %s\n", table->hosts[i].hostname);
     174    }
     175  }
     176
    165177  return TRUE;
    166178}
    167179
    168180int UnpackPSPSStackDetectionID(int *sourceID, int *imageID, int *detID, uint64_t pspsStackID);
     181
     182int Nvalid = 0;
     183int Ninvalid = 0;
    169184
    170185int delete_fix_LAP_catalog (Catalog *catalog, ImageSubset *image, off_t Nimage) {
    … …  
    188203  SecFilt *secfilt = catalog[0].secfilt;
    189204 
     205  Nvalid = 0;
     206  Ninvalid = 0;
    190207  if (VERBOSE) fprintf (stderr, "starting with Nave, Nmeas: "OFF_T_FMT" "OFF_T_FMT"\n",  catalog[0].Naverage,  catalog[0].Nmeasure);
    191208
    … …  
    360377  off_t NdelMeas = Nmeasure - catalog[0].Nmeasure;
    361378  if (NdelAves || NdelMeas) {
    362     fprintf (stderr, "deleting "OFF_T_FMT" measures and "OFF_T_FMT" averages : %s\n",  NdelMeas, NdelAves, catalog[0].filename);
     379    fprintf (stderr, "deleting "OFF_T_FMT" measures and "OFF_T_FMT" averages (%d valid, %d invalid): %s\n",  NdelMeas, NdelAves, Nvalid, Ninvalid, catalog[0].filename);
    363380  }
    364381
    … …  
    392409
    393410  Measure *measure = catalog[0].measure;
    394   Average *average = catalog[0].average;
     411  // Average *average = catalog[0].average;
    395412 
    396413  uint64_t *fullID;
    … …  
    440457    if (!keep) {
    441458      measureDrop[j] = TRUE;
    442       off_t N = measure[j].averef;
    443       fprintf (stderr, "0x%08x 0x%08x %8.4f %8.4f %5d\n", measure[j].imageID, measure[j].detID, average[N].R, average[N].D, measure[j].photcode);
     459      // off_t N = measure[j].averef;
     460      // fprintf (stderr, "0x%08x 0x%08x %8.4f %8.4f %5d\n", measure[j].imageID, measure[j].detID, average[N].R, average[N].D, measure[j].photcode);
    444461    }
    445462  }
    … …  
    454471    // for gpc1 exposures, 10000 < photcode < 10600
    455472    if ((10000 < measure[j].photcode) && (measure[j].photcode < 10600)) {
    456       // int resetID = FALSE;
    457       int resetID = TRUE;
     473      int resetID = FALSE;
    458474      off_t imageID = measure[j].imageID;
    459475      if (imageID == 0) {
    … …  
    478494        // off_t N = measure[j].averef;
    479495        // fprintf (stderr, "no repair 0x%08x 0x%08x %8.4f %8.4f %5d\n", measure[j].imageID, measure[j].detID, average[N].R, average[N].D, measure[j].photcode);
     496        BumpValidImage (imageN);
     497        Nvalid ++;
     498          continue;
    480499      }
    481500
    482501    resetID_exp:
    483502      if (resetID) {
    484         off_t N = measure[j].averef;
    485         fprintf (stderr, "repair 0x%08x 0x%08x %8.4f %8.4f %5d\n", measure[j].imageID, measure[j].detID, average[N].R, average[N].D, measure[j].photcode);
     503        // off_t N = measure[j].averef;
     504        // fprintf (stderr, "repair 0x%08x 0x%08x %8.4f %8.4f %5d\n", measure[j].imageID, measure[j].detID, average[N].R, average[N].D, measure[j].photcode);
    486505        // update the image ID
    487506        short photcode = measure[j].photcode;
    … …  
    498517        }
    499518        measure[j].imageID = imageID;
     519        BumpInvalidImage (imageN);
     520        Ninvalid ++;
     521        continue;
    500522      }
    501523    }
    … …  
    503525    // for gpc1 exposures, 10000 < photcode < 10600
    504526    if ((11000 <= measure[j].photcode) && (measure[j].photcode < 11600)) {
    505       // int resetID = FALSE;
    506       int resetID = TRUE;
     527      int resetID = FALSE;
    507528      off_t imageID = measure[j].imageID;
    508529      if (imageID == 0) {
    … …  
    527548      }
    528549
     550      if (!resetID) {
     551        // off_t N = measure[j].averef;
     552        // fprintf (stderr, "no repair 0x%08x 0x%08x %8.4f %8.4f %5d\n", measure[j].imageID, measure[j].detID, average[N].R, average[N].D, measure[j].photcode);
     553        BumpValidImage (imageN);
     554        Nvalid ++;
     555        continue;
     556      }
     557
    529558    resetID_stk:
    530559      if (resetID) {
    531         off_t N = measure[j].averef;
    532         fprintf (stderr, "repair 0x%08x 0x%08x %8.4f %8.4f %5d\n", measure[j].imageID, measure[j].detID, average[N].R, average[N].D, measure[j].photcode);
     560        // off_t N = measure[j].averef;
     561        // fprintf (stderr, "repair 0x%08x 0x%08x %8.4f %8.4f %5d\n", measure[j].imageID, measure[j].detID, average[N].R, average[N].D, measure[j].photcode);
    533562        // update the image ID
    534563        off_t imageID, Seq;
    … …  
    539568        }
    540569        measure[j].imageID = imageID;
     570        BumpInvalidImage (imageN);
     571        Ninvalid ++;
     572        continue;
    541573      }
    542574    }

  • branches/eam_branches/ipp-20130509/Ohana/src/delstar/src/delstar.c

    r35711 r35713  
    4141
    4242        if (!delete_fix_LAP (subset, Nimage)) exit (1);
     43        SummaryImageStats (subset, Nimage);
     44
    4345        exit (0);
    4446        break;
Note: See TracChangeset for help on using the changeset viewer.