IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Jun 12, 2015, 6:18:23 PM (11 years ago)
Author:
eugene
Message:

merge changes from EAM dev branch ohana.20150429

Location:
trunk/Ohana
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/Ohana

  • trunk/Ohana/src/dvosplit/src/dvosplit.c

    r37043 r38441  
    8080    incatalog.filename = skylist[0].filename[i];
    8181    incatalog.Nsecfilt = GetPhotcodeNsecfilt ();
    82     incatalog.catflags = LOAD_NONE;
     82    incatalog.catflags = DVO_LOAD_NONE;
    8383
    8484    // an error exit status here is a significant error
    … …  
    8989
    9090    // skip empty input catalogs
    91     if (!incatalog.Naves_disk) {
     91    if (!incatalog.Naverage_disk) {
    9292      dvo_catalog_unlock (&incatalog);
    9393      dvo_catalog_free (&incatalog);

  • trunk/Ohana/src/dvosplit/src/open_output_catalogs.c

    r33656 r38441  
    1414    outcatalogs[i].filename  = outlist[0].filename[i];
    1515    outcatalogs[i].Nsecfilt  = GetPhotcodeNsecfilt ();
    16     outcatalogs[i].catflags  = LOAD_NONE;
     16    outcatalogs[i].catflags  = DVO_LOAD_NONE;
    1717    outcatalogs[i].catformat = CATFORMAT ? dvo_catalog_catformat (CATFORMAT) : catformat;  // set the default catformat from config data
    1818    outcatalogs[i].catmode   = CATMODE   ? dvo_catalog_catmode (CATMODE)     : catmode;    // set the default catmode from config data

  • trunk/Ohana/src/dvosplit/src/split_averages.c

    r37807 r38441  
    1010  AveLinks *avelinks;
    1111
    12   ALLOCATE (outref, int, incatalog[0].Naves_disk);
    13   ALLOCATE (outcat, int, incatalog[0].Naves_disk);
     12  ALLOCATE (outref, int, incatalog[0].Naverage_disk);
     13  ALLOCATE (outcat, int, incatalog[0].Naverage_disk);
    1414  ALLOCATE (outmem, int, outlist[0].Nregions);
    1515
    … …  
    2525
    2626  // split out the average & secfilt entries:
    27   incatalog[0].catflags = LOAD_AVES | LOAD_SECF;
     27  incatalog[0].catflags = DVO_LOAD_AVERAGE | DVO_LOAD_SECFILT;
    2828
    2929  if ((incatalog[0].catmode == DVO_MODE_SPLIT) && !FULL_TABLE) {
    30     Nblocks = incatalog[0].Naves_disk / NROWS;
    31     if (incatalog[0].Naves_disk % NROWS) Nblocks ++;
     30    Nblocks = incatalog[0].Naverage_disk / NROWS;
     31    if (incatalog[0].Naverage_disk % NROWS) Nblocks ++;
    3232  } else {
    3333    Nblocks = 1;
    … …  
    4040      dvo_catalog_load_segment (incatalog, VERBOSE, block*NROWS, NROWS);
    4141      fprintf (stderr, "splitting %s (averages) .. %d of %d\n", incatalog[0].filename, block, Nblocks);
    42       assert (block*NROWS == incatalog[0].Naves_off);
     42      assert (block*NROWS == incatalog[0].Naverage_off);
    4343    } else {
    4444      dvo_catalog_load (incatalog, VERBOSE);
    … …  
    4848    // distribute data to the output catalogs
    4949    for (ave = 0; ave < incatalog[0].Naverage; ave++) {
    50       averef = ave + incatalog[0].Naves_off;
     50      averef = ave + incatalog[0].Naverage_off;
    5151       
    5252      inR = incatalog[0].average[ave].R;
    … …  
    7575
    7676      Nout = outcatalogs[Ncat].Naverage;
    77       outref[averef] = Nout + outcatalogs[Ncat].Naves_off;
     77      outref[averef] = Nout + outcatalogs[Ncat].Naverage_off;
    7878      outcat[averef] = Ncat;
    7979
    … …  
    8585      for (n = 0; n < Nsecfilt; n++) {
    8686        outcatalogs[Ncat].secfilt[Nout*Nsecfilt + n] = incatalog[0].secfilt[ave*Nsecfilt + n];
    87         outcatalogs[Ncat].Nsecf_mem++;
     87        outcatalogs[Ncat].Nsecfilt_mem++;
    8888      }
    8989
    … …  
    9696    dvo_catalog_free_data (incatalog);
    9797
    98     // double check the values of Naverage, Nsecf_mem?
     98    // double check the values of Naverage, Nsecfilt_mem?
    9999
    100100    // XXX for output.catformat == MEF, we probably need to skip this stuff and the free below
    … …  
    103103    if (!FULL_TABLE) {
    104104      for (cat = 0; cat < outlist[0].Nregions; cat++) {
    105         outcatalogs[cat].catflags = LOAD_AVES | LOAD_SECF;
     105        outcatalogs[cat].catflags = DVO_LOAD_AVERAGE | DVO_LOAD_SECFILT;
    106106
    107107        dvo_catalog_save (&outcatalogs[cat], VERBOSE);
    108         // fprintf (stderr, "secfilt: %d %d %d %d\n", outcatalogs[cat].Nsecf_mem, outcatalogs[cat].Nsecf_disk, outcatalogs[cat].Nsecf_off, outcatalogs[cat].Naverage, outcatalogs[cat].Nsecfilt);
     108        // fprintf (stderr, "secfilt: %d %d %d %d\n", outcatalogs[cat].Nsecfilt_mem, outcatalogs[cat].Nsecfilt_disk, outcatalogs[cat].Nsecfilt_off, outcatalogs[cat].Naverage, outcatalogs[cat].Nsecfilt);
    109109
    110110        // advance the pointers and free the current data
    111111        // XXX these should be done within save segment:
    112         outcatalogs[cat].Naves_disk += outcatalogs[cat].Naverage;
    113         outcatalogs[cat].Naves_off  += outcatalogs[cat].Naverage;
    114         outcatalogs[cat].Nsecf_disk += outcatalogs[cat].Nsecfilt * outcatalogs[cat].Naverage;
    115         outcatalogs[cat].Nsecf_off  += outcatalogs[cat].Nsecfilt * outcatalogs[cat].Naverage;
     112        outcatalogs[cat].Naverage_disk += outcatalogs[cat].Naverage;
     113        outcatalogs[cat].Naverage_off  += outcatalogs[cat].Naverage;
     114        outcatalogs[cat].Nsecfilt_disk += outcatalogs[cat].Nsecfilt * outcatalogs[cat].Naverage;
     115        outcatalogs[cat].Nsecfilt_off  += outcatalogs[cat].Nsecfilt * outcatalogs[cat].Naverage;
    116116        outcatalogs[cat].Nsecfilt    = Nsecfilt;
    117117
    118118        outcatalogs[cat].Naverage    = 0;
    119         outcatalogs[cat].Nsecf_mem   = 0;
     119        outcatalogs[cat].Nsecfilt_mem   = 0;
    120120      }
    121121    }

  • trunk/Ohana/src/dvosplit/src/split_measures.c

    r37807 r38441  
    1919
    2020  // split out the measure entries:
    21   incatalog[0].catflags = LOAD_MEAS | LOAD_AVES | LOAD_SECF;
     21  incatalog[0].catflags = DVO_LOAD_MEASURE | DVO_LOAD_AVERAGE | DVO_LOAD_SECFILT;
    2222
    2323  // if ((incatalog[0].catformat == DVO_FORMAT_ELIXIR) || (incatalog[0].catformat == DVO_FORMAT_LONEOS)) {
    2424  //   // for these two formats, we need the average and secfilt values around until we do the measures...
    2525  //   // XXX I am loading these 2x -- perhaps I can make the API smarter about reloading?
    26   //   incatalog[0].catflags |= LOAD_AVES | LOAD_SECF;
     26  //   incatalog[0].catflags |= DVO_LOAD_AVERAGE | DVO_LOAD_SECFILT;
    2727  // }
    2828
    2929  if ((incatalog[0].catmode == DVO_MODE_SPLIT) && !FULL_TABLE) {
    30     Nblocks = incatalog[0].Nmeas_disk / NROWS;
    31     if (incatalog[0].Nmeas_disk % NROWS) Nblocks ++;
     30    Nblocks = incatalog[0].Nmeasure_disk / NROWS;
     31    if (incatalog[0].Nmeasure_disk % NROWS) Nblocks ++;
    3232  } else {
    3333    Nblocks = 1;
    … …  
    4040      dvo_catalog_load_segment (incatalog, VERBOSE, block*NROWS, NROWS);
    4141      fprintf (stderr, "splitting %s (measures) .. %d of %d\n", incatalog[0].filename, block, Nblocks);
    42       assert (block*NROWS == incatalog[0].Nmeas_off);
     42      assert (block*NROWS == incatalog[0].Nmeasure_off);
    4343    } else {
    4444      dvo_catalog_load (incatalog, VERBOSE);
    … …  
    7272    if (!FULL_TABLE) {
    7373      for (cat = 0; cat < outlist[0].Nregions; cat++) {
    74         outcatalogs[cat].catflags = LOAD_MEAS;
     74        outcatalogs[cat].catflags = DVO_LOAD_MEASURE;
    7575        dvo_catalog_save (&outcatalogs[cat], VERBOSE);
    7676
    77         outcatalogs[cat].Nmeas_disk += outcatalogs[cat].Nmeasure;
    78         outcatalogs[cat].Nmeas_off  += outcatalogs[cat].Nmeasure;
     77        outcatalogs[cat].Nmeasure_disk += outcatalogs[cat].Nmeasure;
     78        outcatalogs[cat].Nmeasure_off  += outcatalogs[cat].Nmeasure;
    7979        outcatalogs[cat].Nmeasure    = 0;
    8080      }
    … …  
    8484  if (FULL_TABLE) {
    8585    for (cat = 0; cat < outlist[0].Nregions; cat++) {
    86       outcatalogs[cat].catflags = LOAD_AVES | LOAD_SECF | LOAD_MEAS;
     86      outcatalogs[cat].catflags = DVO_LOAD_AVERAGE | DVO_LOAD_SECFILT | DVO_LOAD_MEASURE;
    8787      dvo_catalog_save (&outcatalogs[cat], VERBOSE);
    8888    }

  • trunk/Ohana/src/dvosplit/src/split_missings.c

    r15743 r38441  
    1515
    1616  // split out the missing entries:
    17   incatalog[0].catflags = LOAD_MISS;
    18   Nblocks = incatalog[0].Nmiss_disk / NROWS;
    19   if (incatalog[0].Nmiss_disk % NROWS) Nblocks ++;
     17  incatalog[0].catflags = DVO_LOAD_MISSING;
     18  Nblocks = incatalog[0].Nmissing_disk / NROWS;
     19  if (incatalog[0].Nmissing_disk % NROWS) Nblocks ++;
    2020  for (block = 0; block < Nblocks; block++) {
    2121
    … …  
    3535
    3636    for (cat = 0; cat < outlist[0].Nregions; cat++) {
    37       outcatalogs[cat].catflags = LOAD_MISS;
     37      outcatalogs[cat].catflags = DVO_LOAD_MISSING;
    3838      dvo_catalog_save_segment (&outcatalog[cat], VERBOSE);
    3939
    40       outcatalog[cat].Nmiss_disk += outcatalog[cat].Nmissing;
    41       outcatalog[cat].Nmiss_off  += outcatalog[cat].Nmissing;
     40      outcatalog[cat].Nmissing_disk += outcatalog[cat].Nmissing;
     41      outcatalog[cat].Nmissing_off  += outcatalog[cat].Nmissing;
    4242      outcatalog[cat].Nmissing    = 0;
    4343
Note: See TracChangeset for help on using the changeset viewer.