IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 40453 for trunk/ppImage/src


Ignore:
Timestamp:
Jun 12, 2018, 10:12:18 AM (8 years ago)
Author:
eugene
Message:

build the ppImageErrorCodes.c,h files; add NO_PIXELS error as 5007 (was hard-wired)

Location:
trunk/ppImage/src
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/ppImage/src

    • Property svn:ignore

      •  

        old new  
        1111ppImageVersionDefinitions.h
        1212ppImageVersionDefinitions.h.tmp
         13ppImageErrorCodes.c
         14ppImageErrorCodes.h

  • trunk/ppImage/src/Makefile.am

    r38233 r40453  
    11bin_PROGRAMS = ppImage
    22
    3 noinst_HEADERS = \
    4         ppImage.h
     3noinst_HEADERS  = ppImage.h ppImageErrorCodes.h
    54
    65# Force recompilation of ppImageVersion.c, since it gets the version information
    … …  
    109FORCE: ;
    1110
    12 BUILT_SOURCES = ppImageVersionDefinitions.h
     11BUILT_SOURCES = ppImageErrorCodes.h ppImageErrorCodes.c ppImageVersionDefinitions.h
    1312
    1413ppImage_CFLAGS = $(PPIMAGE_CFLAGS) $(PPSTATS_CFLAGS) $(PSASTRO_CFLAGS) $(PSPHOT_CFLAGS) $(PSMODULE_CFLAGS) $(PSLIB_CFLAGS)
    … …  
    2726        ppImageDetrendFree.c \
    2827        ppImageDetrendPattern.c \
     28        ppImageErrorCodes.c \
    2929        ppImageRebinReadout.c \
    3030        ppImageMosaic.c \
    … …  
    5555        ppImageBurntoolApply.c
    5656
    57 CLEANFILES = *~
     57CLEANFILES = *~ ppImageErrorCodes.h ppImageErrorCodes.c
     58
     59EXTRA_DIST = ppImageErrorCodes.dat ppImageErrorCodes.c.in ppImageErrorCodes.h.in
     60
    5861
    5962clean-local:
    … …  
    6265tags:
    6366        etags `find . -name \*.[ch] -print`
     67
     68ppImageErrorCodes.h : ppImageErrorCodes.dat ppImageErrorCodes.h.in
     69        $(ERRORCODES) --data=ppImageErrorCodes.dat --outdir=. ppImageErrorCodes.h
     70
     71ppImageErrorCodes.c : ppImageErrorCodes.dat ppImageErrorCodes.c.in ppImageErrorCodes.h
     72        $(ERRORCODES) --data=ppImageErrorCodes.dat --outdir=. ppImageErrorCodes.c

  • trunk/ppImage/src/ppImage.h

    r38233 r40453  
    1515#include "psastro.h"
    1616#include "ppStats.h"
     17#include "ppImageErrorCodes.h"
    1718
    1819#define RECIPE_NAME "PPIMAGE"           // Name of the recipe to use

  • trunk/ppImage/src/ppImageErrorCodes.c.in

    r11259 r40453  
    1818    for (int i = 0; i < nerror; i++) {
    1919       psErrorDescription *tmp = psAlloc(sizeof(psErrorDescription));
    20        p_psMemSetPersistent(tmp, true);
     20       psMemSetPersistent(tmp, true);
    2121       *tmp = errors[i];
    2222       psErrorRegister(tmp, 1);

  • trunk/ppImage/src/ppImageErrorCodes.dat

    r23695 r40453  
    99PROG                    Programming error
    1010DATA                    invalid data
     11UNKNOWN                 unspecified error, not defined
     12NO_PIXELS               No good pixels in image

  • trunk/ppImage/src/ppImageMaskStats.c

    r28132 r40453  
    8989            (float) Npix_dynamic / Npix_valid, (float) Npix_magic / Npix_valid,
    9090            (float) Npix_advisory / Npix_valid);
     91
     92  if ((Npix_valid == 0)||(Npix_static + Npix_dynamic >= Npix_valid)) {
     93    if (psMetadataLookupS32(NULL, stats, "QUALITY") == 0) {
     94      psMetadataAddS32(stats, PS_LIST_TAIL, "QUALITY", PS_META_REPLACE, "No good pixels in image.", PPIMAGE_ERR_NO_PIXELS);
     95    }
     96  }
     97 
    9198  return(true);
    9299}
Note: See TracChangeset for help on using the changeset viewer.