IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 36818


Ignore:
Timestamp:
Jun 5, 2014, 4:05:56 PM (12 years ago)
Author:
eugene
Message:

add Koppenhoefer correction concepts to psModules

Location:
branches/eam_branches/ipp-20140423/psModules/src
Files:
2 added
10 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ipp-20140423/psModules/src/astrom/Makefile.am

    r20801 r36818  
    1111        pmAstrometryRefstars.c \
    1212        pmAstrometryWCS.c \
    13         pmAstrometryVisual.c
     13        pmAstrometryVisual.c \
     14        pmKHcorrect.c
    1415
    1516pkginclude_HEADERS = \
    … …  
    2122        pmAstrometryRefstars.h \
    2223        pmAstrometryWCS.h \
    23         pmAstrometryVisual.h
     24        pmAstrometryVisual.h \
     25        pmKHcorrect.h
    2426
    2527CLEANFILES = *~

  • branches/eam_branches/ipp-20140423/psModules/src/astrom/pmAstrometryObjects.h

    r26260 r36818  
    4242    float Color;                        ///< object color
    4343    float dMag;                         ///< error on object magnitude
     44    float SBinst;                       ///< surface brightness, used for Koppenhoefer correction
    4445}
    4546pmAstromObj;

  • branches/eam_branches/ipp-20140423/psModules/src/camera/pmFPAfile.c

    r36441 r36818  
    531531      return PM_FPA_FILE_LINEARITY;
    532532    }
    533     // deprecate this?
    534533    if (!strcasecmp(type, "ASTROM"))     {
    535         return PM_FPA_FILE_ASTROM_MODEL;
     534      return PM_FPA_FILE_ASTROM_MODEL;
    536535    }
    537536    if (!strcasecmp(type, "ASTROM.MODEL"))     {
    … …  
    540539    if (!strcasecmp(type, "ASTROM.REFSTARS"))     {
    541540        return PM_FPA_FILE_ASTROM_REFSTARS;
     541    }
     542    if (!strcasecmp(type, "KH.CORRECT"))     {
     543        return PM_FPA_FILE_KH_CORRECT;
    542544    }
    543545    if (!strcasecmp(type, "SUBKERNEL"))     {
    … …  
    593595      case PM_FPA_FILE_ASTROM_REFSTARS:
    594596        return ("ASTROM.REFSTARS");
     597      case PM_FPA_FILE_KH_CORRECT:
     598        return ("KH.CORRECT");
    595599      case PM_FPA_FILE_SUBKERNEL:
    596600        return ("SUBKERNEL");

  • branches/eam_branches/ipp-20140423/psModules/src/camera/pmFPAfile.h

    r36375 r36818  
    4848    PM_FPA_FILE_ASTROM_MODEL,
    4949    PM_FPA_FILE_ASTROM_REFSTARS,
     50    PM_FPA_FILE_KH_CORRECT,
    5051    PM_FPA_FILE_SUBKERNEL,
    5152    PM_FPA_FILE_SRCTEXT,

  • branches/eam_branches/ipp-20140423/psModules/src/camera/pmFPAfileFitsIO.c

    r29833 r36818  
    150150      case PM_FPA_FILE_PSF:
    151151      case PM_FPA_FILE_ASTROM_MODEL:
    152       case PM_FPA_FILE_ASTROM_REFSTARS: {
     152      case PM_FPA_FILE_ASTROM_REFSTARS:
     153      case PM_FPA_FILE_KH_CORRECT:
     154        {
    153155          pmHDU *hdu = pmFPAviewThisHDU(view, fpa);
    154156          if (hdu) {

  • branches/eam_branches/ipp-20140423/psModules/src/camera/pmFPAfileIO.c

    r36623 r36818  
    4848#include "pmPSF_IO.h"
    4949
     50#include "pmKHcorrect.h"
    5051#include "pmAstrometryModel.h"
    5152#include "pmAstrometryRefstars.h"
    … …  
    234235        status = pmAstromModelReadForView (view, file, config);
    235236        break;
     237      case PM_FPA_FILE_KH_CORRECT:
     238        status = pmKHcorrectReadForView (view, file, config);
     239        break;
    236240      case PM_FPA_FILE_EXPNUM:
    237241        status = pmExpNumRead(view, file, config);
    … …  
    324328      case PM_FPA_FILE_ASTROM_MODEL:
    325329      case PM_FPA_FILE_ASTROM_REFSTARS:
     330      case PM_FPA_FILE_KH_CORRECT:
    326331      case PM_FPA_FILE_JPEG:
    327332      case PM_FPA_FILE_KAPA:
    … …  
    408413      }
    409414    }
     415    if (file->type == PM_FPA_FILE_KH_CORRECT) {
     416      psTrace("psModules.camera", 6, "skip write for %s, no write function defined", file->name);
     417      return true;
     418    }
    410419
    411420    // open the file if not yet opened
    … …  
    500509      case PM_FPA_FILE_ASTROM_REFSTARS:
    501510        status = pmAstromRefstarsWriteForView (view, file, config);
     511        break;
     512
     513      case PM_FPA_FILE_KH_CORRECT:
     514        psError(PS_ERR_IO, true, "cannot write type KH.CORRECT (%s)", file->name);
    502515        break;
    503516
    … …  
    576589      case PM_FPA_FILE_ASTROM_MODEL:
    577590      case PM_FPA_FILE_ASTROM_REFSTARS:
     591      case PM_FPA_FILE_KH_CORRECT:
    578592      case PM_FPA_FILE_LINEARITY:
    579593      case PM_FPA_FILE_EXPNUM:
    … …  
    653667      case PM_FPA_FILE_ASTROM_MODEL:
    654668      case PM_FPA_FILE_ASTROM_REFSTARS:
     669      case PM_FPA_FILE_KH_CORRECT:
    655670      case PM_FPA_FILE_EXPNUM:
    656671        psTrace ("psModules.camera", 6, "NOT freeing %s (%s) : save for further analysis\n", file->filename, file->name);
    … …  
    815830      case PM_FPA_FILE_ASTROM_MODEL:
    816831      case PM_FPA_FILE_ASTROM_REFSTARS:
     832      case PM_FPA_FILE_KH_CORRECT:
    817833      case PM_FPA_FILE_LINEARITY:
    818834      case PM_FPA_FILE_EXPNUM:
    … …  
    10181034      case PM_FPA_FILE_EXPNUM:
    10191035      case PM_FPA_FILE_ASTROM_MODEL:
     1036      case PM_FPA_FILE_KH_CORRECT:
    10201037      case PM_FPA_FILE_SX:
    10211038      case PM_FPA_FILE_RAW:

  • branches/eam_branches/ipp-20140423/psModules/src/detrend/pmDetrendDB.c

    r35531 r36818  
    111111        DETREND_STRING_CASE(LINEARITY);
    112112        DETREND_STRING_CASE(AUXMASK);
     113        DETREND_STRING_CASE(KH_CORRECT);
    113114    default:
    114115        return NULL;

  • branches/eam_branches/ipp-20140423/psModules/src/detrend/pmDetrendDB.h

    r35531 r36818  
    4040    PM_DETREND_TYPE_LINEARITY,
    4141    PM_DETREND_TYPE_AUXMASK,
     42    PM_DETREND_TYPE_KH_CORRECT,
    4243} pmDetrendType;
    4344

  • branches/eam_branches/ipp-20140423/psModules/src/objects/pmModel.c

    r36375 r36818  
    3939{
    4040    psTrace("psModules.objects", 10, "---- %s() begin ----\n", __func__);
     41    if (!tmp) return;
     42
    4143    psFree(tmp->params);
    4244    psFree(tmp->dparams);

  • branches/eam_branches/ipp-20140423/psModules/src/psmodules.h

    r36623 r36818  
    9595#include <pmAstrometryDistortion.h>
    9696#include <pmAstrometryVisual.h>
     97#include <pmKHcorrect.h>
    9798
    9899// the following headers are from psModule:imcombine
Note: See TracChangeset for help on using the changeset viewer.