IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 33452


Ignore:
Timestamp:
Mar 9, 2012, 8:01:25 AM (14 years ago)
Author:
eugene
Message:

ensure RESET options do not collide (relphot only does photometry flags, relastro only does astrometry flags); make KEEP_UBERCAL the default, replace -keep-ubercal with -reset-ubercal

Location:
branches/eam_branches/ipp-20111122/Ohana/src
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ipp-20111122/Ohana/src/relastro/src/bcatalog.c

    r33448 r33452  
    2020  Nmeasure = Naverage = 0;
    2121
     22  DVOAverageFlags averageBits =
     23    ID_STAR_FEW     |
     24    ID_STAR_POOR    |
     25    ID_STAR_FIT_AVE |
     26    ID_STAR_FIT_PM  |
     27    ID_STAR_FIT_PAR |
     28    ID_STAR_USE_AVE |
     29    ID_STAR_USE_PM  |
     30    ID_STAR_USE_PAR;
     31
    2232  /* exclude stars not in range or with too few measurements */
    2333  for (i = 0; i < catalog[0].Naverage; i++) {
    … …  
    3444
    3545    if (RESET) {
    36       // XXX reset the ra,dec coords?
    37       // XXX define astrometry vs photometry average.dbFlags
    38       // XXX put photometry flags in secfilt (ie, per average mag?)
    39       subcatalog[0].average[Naverage].flags &= ~ID_STAR_FEW;
    40       subcatalog[0].average[Naverage].flags &= ~ID_STAR_POOR;
     46      subcatalog[0].average[Naverage].flags &= ~averageBits;
    4147    }
    4248

  • branches/eam_branches/ipp-20111122/Ohana/src/relastro/src/relastro_objects.c

    r33448 r33452  
    88
    99  Catalog catalog;
     10
     11  DVOMeasureFlags measureBits =
     12    ID_MEAS_POOR_ASTROM |
     13    ID_MEAS_SKIP_ASTROM |
     14    ID_MEAS_USED_OBJ    |
     15    ID_MEAS_USED_CHIP;
     16
     17  DVOAverageFlags averageBits =
     18    ID_STAR_FEW     |
     19    ID_STAR_POOR    |
     20    ID_STAR_FIT_AVE |
     21    ID_STAR_FIT_PM  |
     22    ID_STAR_FIT_PAR |
     23    ID_STAR_USE_AVE |
     24    ID_STAR_USE_PM  |
     25    ID_STAR_USE_PAR;
    1026
    1127  // XXX need to decide how to determine PARALLEL mode...
    … …  
    4662    }
    4763
    48     // XXX consider what gets reset (only ASTROM flags)
     64    // reset only the astrometry-related average and measure bits
    4965    if (RESET) {
    5066      for (j = 0; j < catalog.Naverage; j++) {
    51         catalog.average[j].flags = 0;
     67        catalog.average[j].flags &= ~averageBits;
    5268        m = catalog.average[j].measureOffset;
    5369        for (k = 0; k < catalog.average[j].Nmeasure; k++) {
    54           catalog.measure[m+k].dbFlags = 0;
     70          catalog.measure[m+k].dbFlags &= ~measureBits;
    5571        }
    5672      }

  • branches/eam_branches/ipp-20111122/Ohana/src/relastro/src/select_images.c

    r31160 r33452  
    243243    }
    244244    if (RESET) {
    245       // XXX do we need / want to do this in relastro?
    246       // assignMcal (&image[nimage], (double *) NULL, -1);
    247       // image[nimage].Mcal = NAN;
    248       // image[nimage].dMcal = NAN;
     245      // this only resets the astrometry image flags, not the photometry ones
    249246      image[nimage].flags &= ~badImage;
    250247    }

  • branches/eam_branches/ipp-20111122/Ohana/src/relphot/src/args.c

    r33403 r33452  
    237237  }
    238238
    239   KEEP_UBERCAL = FALSE;
    240   if ((N = get_argument (argc, argv, "-keep-ubercal"))) {
    241     remove_argument (N, &argc, argv);
    242     KEEP_UBERCAL = TRUE;
     239  KEEP_UBERCAL = TRUE;
     240  if ((N = get_argument (argc, argv, "-reset-ubercal"))) {
     241    remove_argument (N, &argc, argv);
     242    KEEP_UBERCAL = FALSE;
    243243  }
    244244
    … …  
    409409  }
    410410
    411   KEEP_UBERCAL = FALSE;
    412   if ((N = get_argument (argc, argv, "-keep-ubercal"))) {
    413     remove_argument (N, &argc, argv);
    414     KEEP_UBERCAL = TRUE;
     411  KEEP_UBERCAL = TRUE;
     412  if ((N = get_argument (argc, argv, "-reset-ubercal"))) {
     413    remove_argument (N, &argc, argv);
     414    KEEP_UBERCAL = FALSE;
    415415  }
    416416

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

    r33447 r33452  
    4949    if (RESET) {
    5050      int Ns;
     51      DVOSecfiltFlags secfiltBits =
     52        ID_SECF_STAR_FEW |
     53        ID_SECF_STAR_POOR |
     54        ID_PHOTOM_PASS_0 |
     55        ID_PHOTOM_PASS_1 |
     56        ID_PHOTOM_PASS_2 |
     57        ID_PHOTOM_PASS_3 |
     58        ID_PHOTOM_PASS_4;
    5159      for (Ns = 0; Ns < Nphotcodes; Ns++) {
    5260
    … …  
    5462        int Nsec = GetPhotcodeNsec(thisCode);
    5563
    56         subcatalog[0].secfilt[Nsecfilt*Naverage+Nsec].M  = NAN;
    57         subcatalog[0].secfilt[Nsecfilt*Naverage+Nsec].dM = NAN;
    58         subcatalog[0].secfilt[Nsecfilt*Naverage+Nsec].Xm = NAN_S_SHORT;
    59         subcatalog[0].secfilt[Nsecfilt*Naverage+Nsec].flags &= ~ID_STAR_FEW;
    60         subcatalog[0].secfilt[Nsecfilt*Naverage+Nsec].flags &= ~ID_STAR_POOR;
     64        subcatalog[0].secfilt[Nsecfilt*Naverage+Nsec].M      = NAN;
     65        subcatalog[0].secfilt[Nsecfilt*Naverage+Nsec].Map    = NAN;
     66        subcatalog[0].secfilt[Nsecfilt*Naverage+Nsec].dM     = NAN;
     67        subcatalog[0].secfilt[Nsecfilt*Naverage+Nsec].Xm     = NAN;
     68        subcatalog[0].secfilt[Nsecfilt*Naverage+Nsec].M_20   = NAN_S_SHORT;
     69        subcatalog[0].secfilt[Nsecfilt*Naverage+Nsec].M_80   = NAN_S_SHORT;
     70        subcatalog[0].secfilt[Nsecfilt*Naverage+Nsec].Ncode  = 0;
     71        subcatalog[0].secfilt[Nsecfilt*Naverage+Nsec].Nused  = 0;
     72        subcatalog[0].secfilt[Nsecfilt*Naverage+Nsec].flags &= ~secfiltBits;
     73        subcatalog[0].secfilt[Nsecfilt*Naverage+Nsec].ubercalDist = 1000;
    6174      }
    6275    }

  • branches/eam_branches/ipp-20111122/Ohana/src/relphot/src/help.c

    r33328 r33452  
    3737  fprintf (stderr, "  -imfreeze\n");
    3838  fprintf (stderr, "  -grid\n");
    39   fprintf (stderr, "  -keep-ubercal : do not change zero point for ubercal-ed images\n");
     39  fprintf (stderr, "  -reset-ubercal : also reset ubercal-ed zero points (otherwise they are sacrosanct)\n");
    4040  fprintf (stderr, "  -area Xmin Xmax Ymin Ymax\n");
    4141  fprintf (stderr, "  -instmag min max\n");

  • branches/eam_branches/ipp-20111122/Ohana/src/relphot/src/load_catalogs.c

    r33447 r33452  
    144144    if (VERBOSE2)      { snprintf (tmpline, 1024, "%s -vv",             command);                    strcpy (command, tmpline); }
    145145    if (RESET)         { snprintf (tmpline, 1024, "%s -reset",          command);                    strcpy (command, tmpline); }
    146     if (KEEP_UBERCAL)  { snprintf (tmpline, 1024, "%s -keep-ubercal",   command);                    strcpy (command, tmpline); }
     146    if (!KEEP_UBERCAL) { snprintf (tmpline, 1024, "%s -reset-ubercal",  command);                    strcpy (command, tmpline); }
    147147    if (DophotSelect)  { snprintf (tmpline, 1024, "%s -dophot %d",      command, DophotValue);       strcpy (command, tmpline); }
    148148    if (ImagSelect)    { snprintf (tmpline, 1024, "%s -instmag %f %f",  command, ImagMin, ImagMax);  strcpy (command, tmpline); }

  • branches/eam_branches/ipp-20111122/Ohana/src/relphot/src/reload_catalogs.c

    r33447 r33452  
    159159    if (VERBOSE2)         { snprintf (tmpline, 1024, "%s -vv",                  command);                                         strcpy (command, tmpline); }
    160160    if (RESET)            { snprintf (tmpline, 1024, "%s -reset",               command);                                         strcpy (command, tmpline); }
    161     if (KEEP_UBERCAL)     { snprintf (tmpline, 1024, "%s -keep-ubercal",        command);                                         strcpy (command, tmpline); }
     161    if (!KEEP_UBERCAL)    { snprintf (tmpline, 1024, "%s -reset-ubercal",       command);                                         strcpy (command, tmpline); }
    162162    if (UPDATE_CATFORMAT) { snprintf (tmpline, 1024, "%s -update-catformat %s", command, UPDATE_CATFORMAT);                       strcpy (command, tmpline); }
    163163    if (AreaSelect)       { snprintf (tmpline, 1024, "%s -area %f %f %f %f",    command, AreaXmin, AreaXmax, AreaYmin, AreaYmax); strcpy (command, tmpline); }

  • branches/eam_branches/ipp-20111122/Ohana/src/relphot/src/relphot_objects.c

    r33328 r33452  
    5656    }
    5757
    58     // XXX need to respect UBERCAL measurements (and not reset them?)
    59     // reset
     58    // reset the calculated average magnitudes (does not affect ubercal-tied measurements or images)
    6059    if (RESET) {
    6160      Nsecfilt = catalog.Nsecfilt;
     61      DVOSecfiltFlags secfiltBits =
     62        ID_SECF_STAR_FEW |
     63        ID_SECF_STAR_POOR |
     64        ID_PHOTOM_PASS_0 |
     65        ID_PHOTOM_PASS_1 |
     66        ID_PHOTOM_PASS_2 |
     67        ID_PHOTOM_PASS_3 |
     68        ID_PHOTOM_PASS_4;
     69
    6270      for (j = 0; j < catalog.Naverage; j++) {
    6371        catalog.average[j].flags = 0;
    6472        for (k = 0; k < Nsecfilt; k++) {
    65           catalog.secfilt[j*Nsecfilt + k].M     = NAN;
    66           catalog.secfilt[j*Nsecfilt + k].M_20  = NAN_S_SHORT;
    67           catalog.secfilt[j*Nsecfilt + k].M_80  = NAN_S_SHORT;
    68           catalog.secfilt[j*Nsecfilt + k].dM    = NAN;
    69           catalog.secfilt[j*Nsecfilt + k].Xm    = NAN_S_SHORT;
    70           catalog.secfilt[j*Nsecfilt + k].Ncode = 0;
    71           catalog.secfilt[j*Nsecfilt + k].Nused = 0;
    72           // XXX reset the photometry flags for secfilt entries?
     73          catalog.secfilt[j*Nsecfilt + k].M      = NAN;
     74          catalog.secfilt[j*Nsecfilt + k].Map    = NAN;
     75          catalog.secfilt[j*Nsecfilt + k].dM     = NAN;
     76          catalog.secfilt[j*Nsecfilt + k].Xm     = NAN;
     77          catalog.secfilt[j*Nsecfilt + k].M_20   = NAN_S_SHORT;
     78          catalog.secfilt[j*Nsecfilt + k].M_80   = NAN_S_SHORT;
     79          catalog.secfilt[j*Nsecfilt + k].Ncode  = 0;
     80          catalog.secfilt[j*Nsecfilt + k].Nused  = 0;
     81          catalog.secfilt[j*Nsecfilt + k].flags &= ~secfiltBits;
     82          catalog.secfilt[j*Nsecfilt + k].ubercalDist = 1000;
    7383        }
    7484      }
    … …  
    140150    if (VERBOSE2)      { snprintf (tmpline, 1024, "%s -vv",             command);                    strcpy (command, tmpline); }
    141151    if (RESET)         { snprintf (tmpline, 1024, "%s -reset",          command);                    strcpy (command, tmpline); }
    142     if (KEEP_UBERCAL)  { snprintf (tmpline, 1024, "%s -keep-ubercal",   command);                    strcpy (command, tmpline); }
     152    if (!KEEP_UBERCAL) { snprintf (tmpline, 1024, "%s -reset-ubercal",  command);                    strcpy (command, tmpline); }
    143153
    144154    fprintf (stderr, "command: %s\n", command);

  • branches/eam_branches/ipp-20111122/Ohana/src/relphot/src/select_images.c

    r33399 r33452  
    230230
    231231  found_it:
    232     // XXX We claim this is a good image: write to a test file
    233     // fprintf (ftest, "%s : %lf %lf  : %f %f %d %x\n", timage[i].name, RAo, DECo, timage[i].Mcal, timage[i].dMcal, timage[i].nstar, timage[i].flags);
    234 
    235232    image[nimage] = timage[i];
    236     /* always allow 'few' images to succeed, if possible */
     233    /* always allow 'few' images to succeed, if possible (new images / detections may have
     234     * been added) */
    237235    if (image[nimage].flags & ID_IMAGE_PHOTOM_FEW) {
    238236      image[nimage].flags &= ~(ID_IMAGE_PHOTOM_FEW | ID_IMAGE_PHOTOM_POOR);
    239237    }
    240238    if (RESET) {
    241       // XXX this needs to be thought through a bit more
    242239      if (!KEEP_UBERCAL) {
    243240        image[nimage].Mcal = 0.0;
    244241        image[nimage].dMcal = NAN;
     242        image[nimage].flags &= ~ID_IMAGE_PHOTOM_UBERCAL;
    245243      }
    246244      image[nimage].flags &= ~ID_IMAGE_PHOTOM_POOR;
    247       image[nimage].ubercalDist = 1000; // dummy3 == ubercalDist
     245      image[nimage].ubercalDist = 1000;
    248246    }
    249247    line_number[nimage] = i;

  • branches/eam_branches/ipp-20111122/Ohana/src/relphot/src/setMrelFinal.c

    r33406 r33452  
    3737      for (i = 0; i < catalog[0].Naverage; i++) {
    3838        off_t N = Nsecfilt*i+Nsec;
    39         catalog[0].secfilt[N].M  = NAN;
    40         catalog[0].secfilt[N].dM = NAN;
    41         catalog[0].secfilt[N].Xm = NAN_S_SHORT;
    42         catalog[0].secfilt[N].Ncode = 0;
    43         catalog[0].secfilt[N].Nused = 0;
     39        catalog[0].secfilt[N].M      = NAN;
     40        catalog[0].secfilt[N].Map    = NAN;
     41        catalog[0].secfilt[N].dM     = NAN;
     42        catalog[0].secfilt[N].Xm     = NAN;
     43        catalog[0].secfilt[N].M_20   = NAN_S_SHORT;
     44        catalog[0].secfilt[N].M_80   = NAN_S_SHORT;
     45        catalog[0].secfilt[N].Ncode  = 0;
     46        catalog[0].secfilt[N].Nused  = 0;
    4447        catalog[0].secfilt[N].flags &= ~PHOTOM_PASSES;
    4548        catalog[0].secfilt[N].ubercalDist = 1000;
Note: See TracChangeset for help on using the changeset viewer.