IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Apr 27, 2022, 10:14:37 AM (4 years ago)
Author:
eugene
Message:

fpcamera now builds, but does it run?

Location:
branches/eam_branches/ipp-20220316/fpcamera
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ipp-20220316/fpcamera/Makefile.am

    r42175 r42178  
    33CLEANFILES = *.pyc *~ core core.*
    44
    5 pkgconfigdir = $(libdir)/pkgconfig
    6 pkgconfig_DATA= fpcamera.pc
    7 
    8 EXTRA_DIST = \
    9         fpcamera.pc.in \
    10         autogen.sh
     5EXTRA_DIST = autogen.sh

  • branches/eam_branches/ipp-20220316/fpcamera/configure.ac

    r42175 r42178  
    185185PKG_CHECK_MODULES([PSLIB],    [pslib >= 1.0.0])
    186186PKG_CHECK_MODULES([PSMODULE], [psmodules >= 1.0.0])
     187PKG_CHECK_MODULES([PSPHOT],   [psphot >= 0.8.0])
    187188PKG_CHECK_MODULES([PPSTATS],  [ppStats >= 1.0.0])
    188189

  • branches/eam_branches/ipp-20220316/fpcamera/src/Makefile.am

    r42176 r42178  
    7171fpcameraVersion.c: fpcameraVersionDefinitions.h
    7272fpcameraVersionDefinitions.h: fpcameraVersionDefinitions.h.in FORCE
    73         pslib-setsvnversion.pl FPCAMERA fpcameraVersionDefinitions.h.in fpcameraVersionDefinitions.h
     73#pslib-setsvnversion.pl FPCAMERA fpcameraVersionDefinitions.h.in fpcameraVersionDefinitions.h
     74        cat fpcameraVersionDefinitions.h.in | tr '@' '"' > fpcameraVersionDefinitions.h
    7475FORCE: ;

  • branches/eam_branches/ipp-20220316/fpcamera/src/fpcamera.h

    r42176 r42178  
    2222#include <pslib.h>
    2323#include <psmodules.h>
     24#include <psphot.h>
    2425#include <ppStats.h>
    2526#include "fpcameraErrorCodes.h"

  • branches/eam_branches/ipp-20220316/fpcamera/src/fpcameraAnalysis.c

    r42175 r42178  
    77
    88    bool status;
    9     int nStars;
    109
    1110    // measure the total elapsed time in fpcameraAnalysis.

  • branches/eam_branches/ipp-20220316/fpcamera/src/fpcameraCleanup.c

    r42175 r42178  
    1 /** @file fpcameraCleanup.c
    2  *
    3  *  @brief
    4  *
    5  *  @ingroup fpcamera
    6  *
    7  *  @author IfA
    8  *  @version $Revision: 1.8.2.1 $ $Name: not supported by cvs2svn $
    9  *  @date $Date: 2009-02-19 17:59:50 $
    10  *  Copyright 2009 Institute for Astronomy, University of Hawaii
    11  */
     1# include "fpcamera.h"
    122
    13 # include "fpcameraStandAlone.h"
    14 
     3/* \brief this loop saves the photometry/astrometry data files */
    154void fpcameraCleanup (pmConfig *config, psMetadata *stats) {
    165

  • branches/eam_branches/ipp-20220316/fpcamera/src/fpcameraDataLoad.c

    r42175 r42178  
    66
    77bool fpcameraDataLoad (pmConfig *config) {
    8 
    9     pmChip *chip;
    10     pmCell *cell;
    11     pmReadout *readout;
    128
    139    psTimerStart ("fpcamera");

  • branches/eam_branches/ipp-20220316/fpcamera/src/fpcameraDataSave.c

    r42175 r42178  
    66bool fpcameraDataSave (pmConfig *config, psMetadata *stats) {
    77
     8    bool status;
    89    pmChip *chip;
    910    pmCell *cell;
    1011    pmReadout *readout;
    11 
    1212    pmFPAview *view = NULL;
    1313
    1414    // select the current recipe
    15     psMetadata *recipe  = psMetadataLookupPtr (NULL, config->recipes, FPCAMERA_RECIPE);
    16     if (!recipe) ESCAPE(FPCAMERA_ERR_CONFIG, "Can't find FPCAMERA recipe!");
     15    psMetadata *recipe  = psMetadataLookupPtr (&status, config->recipes, FPCAMERA_RECIPE);
     16    if (!recipe) ESCAPE (FPCAMERA_ERR_CONFIG, "Can't find FPCAMERA recipe");
    1717
    1818    // select the output data sources
    … …  
    4949                if (hdu && hdu != lastHDU) {
    5050                    fpcameraVersionHeaderFull(hdu->header);
    51                     // Append teh reference catalog to the header as well.
     51                    // Append the reference catalog to the header as well.
    5252                    char *catdir = psMetadataLookupStr(NULL,recipe,"FPCAMERA.CATDIR");
    53 
    54                     psMetadata *recipe = psMetadataLookupPtr(NULL, config->recipes, FPCAMERA_RECIPE);
    5553                    psMetadataAddStr(hdu->header,PS_LIST_TAIL, "PSREFCAT", PS_META_REPLACE, NULL, catdir);
    56 
    5754                    lastHDU = hdu;
    5855                }
    … …  
    6865    // XXX fix : if (!fpcameraMetadataStats (config, stats)) ESCAPE(FPCAMERA_ERR_UNKNOWN, "failure to save state in Metadata");
    6966
    70     bool status;
    7167    psString dump_file = psMetadataLookupStr(&status, config->arguments, "DUMP_CONFIG");
    7268    if (dump_file) {

  • branches/eam_branches/ipp-20220316/fpcamera/src/fpcameraLoadRefstars.c

    r42175 r42178  
    22# define ELIXIR_MODE 1
    33
    4 # define ESCAPE(ERROR,FORMAT,...) { psError(ERROR, false, FORMAT, __VA_ARGS__); return false; }
    5 
     4# define ESCAPE(ERROR,...) { p_psError(__FILE__,__LINE__,__func__,ERROR,false,__VA_ARGS__); return false; }
     5
     6/* \brief this loop saves the photometry/astrometry data files */
    67bool fpcameraLoadRefstars (pmFPAfile *input, pmConfig *config) {
    78
    … …  
    4243    // substitute abstract name with concrete name, if present in FPCAMERA.CATDIRS
    4344    psMetadata *catdirs = psMetadataLookupMetadata(&status, config->site, "FPCAMERA.CATDIRS"); // List of cameras
    44     if (!catdir) ESCAPE(FPCAMERA_ERR_CONFIG, "Unable to find FPCAMERA.CATDIRS in the system configuration.\n");
     45    if (!catdirs) ESCAPE(FPCAMERA_ERR_CONFIG, "Unable to find FPCAMERA.CATDIRS in the system configuration.\n");
    4546
    4647    // the name in the recipe may be one of:
    … …  
    140141        ESCAPE(FPCAMERA_ERR_REFSTARS, "error reading reference data");
    141142    }
    142     if (refstars->n == 0) ESCAPE(PSASTRO_ERR_REFSTARS, "no reference stars found");
     143    if (refstars->n == 0) ESCAPE(FPCAMERA_ERR_REFSTARS, "no reference stars found");
    143144
    144145    psLogMsg ("fpcamera", 3, "loaded %ld reference stars : %f sec\n", refstars->n, psTimerMark ("fpcamera"));

  • branches/eam_branches/ipp-20220316/fpcamera/src/fpcameraParseCamera.c

    r42175 r42178  
    11# include "fpcamera.h"
    22
    3 # define ESCAPE(ERROR,FORMAT,...) { psError(ERROR, false, FORMAT, __VA_ARGS__); return false; }
     3# define ESCAPE(ERROR,...) { p_psError(__FILE__,__LINE__,__func__,ERROR,false,__VA_ARGS__); return false; }
    44
    55bool fpcameraParseCamera (pmConfig *config) {

  • branches/eam_branches/ipp-20220316/fpcamera/src/fpcameraReadAstrometry.c

    r42175 r42178  
    44bool fpcameraReadAstrometry (pmFPAfile *input, pmConfig *config) {
    55
     6    bool status;
     7
    68    // select the current recipe (just needed for pixel scale)
    7     psMetadata *recipe  = psMetadataLookupPtr (NULL, config->recipes, FPCAMERA_RECIPE);
     9    psMetadata *recipe  = psMetadataLookupPtr (&status, config->recipes, FPCAMERA_RECIPE);
    810    if (!recipe) {
    911        psError(FPCAMERA_ERR_CONFIG, true, "Can't find FPCAMERA recipe!\n");
    … …  
    3133    }
    3234
     35    pmChip *chip;
    3336    while ((chip = pmFPAviewNextChip (view, input->fpa, 1)) != NULL) {
    3437        psTrace ("fpcamera", 4, "Chip %d: %x %x\n", view->chip, chip->file_exists, chip->process);
Note: See TracChangeset for help on using the changeset viewer.