IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Jul 17, 2014, 12:32:26 PM (12 years ago)
Author:
eugene
Message:

merge changes (from past YEAR) into trunk

Location:
branches/eam_branches/ipp-ops-20130712/Ohana
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ipp-ops-20130712/Ohana

    • Property svn:mergeinfo deleted

  • branches/eam_branches/ipp-ops-20130712/Ohana/src/getstar

  • branches/eam_branches/ipp-ops-20130712/Ohana/src/getstar/src/GetFileMode.c

    r34088 r37067  
    88  int simple, extend, haveNaxis, haveCTYPE;
    99
     10  // NOTE target of %t must be int length
    1011  gfits_scan_alt (header, "SIMPLE", "%t", 1, &simple);
    1112  haveNaxis = gfits_scan (header, "NAXIS",  "%d", 1, &Naxis);
    12   haveCTYPE = gfits_scan (header, "CTYPE1", "%s", 1, ctype);
     13  haveCTYPE = gfits_scan (header, "CTYPE2", "%s", 1, ctype);
    1314
    1415  gfits_scan_alt (header, "EXTEND", "%t", 1, &extend);

  • branches/eam_branches/ipp-ops-20130712/Ohana/src/getstar/src/MatchImages.c

    r34430 r37067  
    3636    tcoords.pc1_2 = tcoords.pc2_1 = 0.0;
    3737    tcoords.Npolyterms = 1;
    38     strcpy (tcoords.ctype, "RA---TAN");
     38    strcpy (tcoords.ctype, "DEC--TAN");
    3939    /* register so image->sky conversions below have correct mosaic */
    4040  } else {
    … …  
    4444    tcoords.pc1_2 = tcoords.pc2_1 = 0.0;
    4545    tcoords.Npolyterms = 1;
    46     strcpy (tcoords.ctype, "RA---TAN");
     46    strcpy (tcoords.ctype, "DEC--TAN");
    4747  }
    4848

  • branches/eam_branches/ipp-ops-20130712/Ohana/src/getstar/src/ReadImageFiles.c

    r34088 r37067  
    138138          !strcmp (tmpword, "PS1_V1") || 
    139139          !strcmp (tmpword, "PS1_V2") || 
    140           !strcmp (tmpword, "PS1_V3")) {
     140          !strcmp (tmpword, "PS1_V3") || 
     141          !strcmp (tmpword, "PS1_V4") || 
     142          !strcmp (tmpword, "PS1_V5")) {
    141143
    142144          exttype[Nimage] = strcreate (tmpword);

  • branches/eam_branches/ipp-ops-20130712/Ohana/src/getstar/src/dvoImagesAtCoords.c

  • branches/eam_branches/ipp-ops-20130712/Ohana/src/getstar/src/select_by_region.c

    r35066 r37067  
    7373        for (m = 0; m < catalog[0].average[i].Nmeasure; m++) {
    7474          if (catalog[0].measure[offset + m].photcode == code) {
    75             mag = PhotRel (&catalog[0].measure[offset + m], &catalog[0].average[i], &catalog[0].secfilt[i*Nsecfilt]);
     75            mag = PhotRel (&catalog[0].measure[offset + m], &catalog[0].average[i], &catalog[0].secfilt[i*Nsecfilt], MAG_CLASS_PSF);
    7676            break;
    7777          }
    … …  
    126126        for (m = 0; m < catalog[0].average[i].Nmeasure; m++) {
    127127          if (catalog[0].measure[offset + m].photcode == code) {
    128             mag = PhotRel (&catalog[0].measure[offset + m], &catalog[0].average[i], &catalog[0].secfilt[i*Nsecfilt]);
     128            mag = PhotRel (&catalog[0].measure[offset + m], &catalog[0].average[i], &catalog[0].secfilt[i*Nsecfilt], MAG_CLASS_PSF);
    129129            break;
    130130          }

  • branches/eam_branches/ipp-ops-20130712/Ohana/src/getstar/src/write_getstar_ps1_dev_0.c

    r21508 r37067  
    6161      for (m = 0; m < average[i].Nmeasure; m++) {
    6262        if (measure[offset + m].photcode == code_c0) {
    63           output[i].mag = PhotRel (&measure[offset + m], &average[i], &secfilt[i*Nsecfilt]);
     63          output[i].mag = PhotRel (&measure[offset + m], &average[i], &secfilt[i*Nsecfilt], MAG_CLASS_PSF);
    6464          break;
    6565        }
    … …  
    7575      for (m = 0; m < average[i].Nmeasure; m++) {
    7676        if (measure[offset + m].photcode == code_c1) {
    77           output[i].c1 = PhotRel (&measure[offset + m], &average[i], &secfilt[i*Nsecfilt]);
     77          output[i].c1 = PhotRel (&measure[offset + m], &average[i], &secfilt[i*Nsecfilt], MAG_CLASS_PSF);
    7878          break;
    7979        }
    … …  
    8989      for (m = 0; m < average[i].Nmeasure; m++) {
    9090        if (measure[offset + m].photcode == code_c2) {
    91           output[i].c2 = PhotRel (&measure[offset + m], &average[i], &secfilt[i*Nsecfilt]);
     91          output[i].c2 = PhotRel (&measure[offset + m], &average[i], &secfilt[i*Nsecfilt], MAG_CLASS_PSF);
    9292          break;
    9393        }

  • branches/eam_branches/ipp-ops-20130712/Ohana/src/getstar/src/write_getstar_ps1_dev_1.c

    r21508 r37067  
    6464      for (m = 0; m < average[i].Nmeasure; m++) {
    6565        if (measure[offset + m].photcode == code_c0) {
    66           output[i].mag = PhotRel (&measure[offset + m], &average[i], &secfilt[i*Nsecfilt]);
     66          output[i].mag = PhotRel (&measure[offset + m], &average[i], &secfilt[i*Nsecfilt], MAG_CLASS_PSF);
    6767          break;
    6868        }
    … …  
    7878      for (m = 0; m < average[i].Nmeasure; m++) {
    7979        if (measure[offset + m].photcode == code_c1) {
    80           output[i].c1 = PhotRel (&measure[offset + m], &average[i], &secfilt[i*Nsecfilt]);
     80          output[i].c1 = PhotRel (&measure[offset + m], &average[i], &secfilt[i*Nsecfilt], MAG_CLASS_PSF);
    8181          break;
    8282        }
    … …  
    9292      for (m = 0; m < average[i].Nmeasure; m++) {
    9393        if (measure[offset + m].photcode == code_c2) {
    94           output[i].c2 = PhotRel (&measure[offset + m], &average[i], &secfilt[i*Nsecfilt]);
     94          output[i].c2 = PhotRel (&measure[offset + m], &average[i], &secfilt[i*Nsecfilt], MAG_CLASS_PSF);
    9595          break;
    9696        }

  • branches/eam_branches/ipp-ops-20130712/Ohana/src/getstar/src/write_getstar_ps1_dev_2.c

    r21508 r37067  
    7070      for (m = 0; m < average[i].Nmeasure; m++) {
    7171        if (measure[offset + m].photcode == code_c0) {
    72           output[i].mag = PhotRel (&measure[offset + m], &average[i], &secfilt[i*Nsecfilt]);
     72          output[i].mag = PhotRel (&measure[offset + m], &average[i], &secfilt[i*Nsecfilt], MAG_CLASS_PSF);
    7373          break;
    7474        }
    … …  
    8484      for (m = 0; m < average[i].Nmeasure; m++) {
    8585        if (measure[offset + m].photcode == code_c1) {
    86           output[i].c1 = PhotRel (&measure[offset + m], &average[i], &secfilt[i*Nsecfilt]);
     86          output[i].c1 = PhotRel (&measure[offset + m], &average[i], &secfilt[i*Nsecfilt], MAG_CLASS_PSF);
    8787          break;
    8888        }
    … …  
    9898      for (m = 0; m < average[i].Nmeasure; m++) {
    9999        if (measure[offset + m].photcode == code_c2) {
    100           output[i].c2 = PhotRel (&measure[offset + m], &average[i], &secfilt[i*Nsecfilt]);
     100          output[i].c2 = PhotRel (&measure[offset + m], &average[i], &secfilt[i*Nsecfilt], MAG_CLASS_PSF);
    101101          break;
    102102        }
Note: See TracChangeset for help on using the changeset viewer.