IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Dec 1, 2021, 6:23:13 PM (5 years ago)
Author:
eugene
Message:

enable PS_FITS_SCALE_ASINH_MANUAL (was incompletely implemented)

Location:
branches/eam_branches/ipp-20211108
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ipp-20211108/ippTests/ippCheck/Makefile.am

    r41941 r41948  
    11module_files = \
    2   cammask.pro   /
    3   camstats.pro  /
    4   diffmask.pro  /
    5   truth.pro     /
    6   warpmask.pro  /
     2  cammask.pro   \
     3  camstats.pro  \
     4  diffmask.pro  \
     5  truth.pro     \
     6  warpmask.pro  \
    77  warpstats.pro
    88
    9 dvo_dir = $(datadir)/dvo
    10 module_dir = $(dvo_dir)/modules
     9ippchecksdir = $(datadir)/dvo/modules
     10
    1111ippchecks_DATA = $(module_files)
    1212
     13bin_SCRIPTS = ippCheck
     14
    1315install-data-hook:
    14         chmod 0755 $(dvo_dir) $(module_dir)
     16        chmod 0755 $(ippchecksdir)
    1517
    1618EXTRA_DIST = $(module_files)

  • branches/eam_branches/ipp-20211108/ippTests/ippCheck/configure.ac

    r41941 r41948  
    22
    33AC_INIT([ippCheck], [1.1.0], [ipp-dev@ifa.hawaii.edu])
    4 AC_CONFIG_SRCDIR([pantasks.pro])
     4AC_CONFIG_SRCDIR([ippCheck])
    55
    66AM_INIT_AUTOMAKE([1.6 foreign dist-bzip2])

  • branches/eam_branches/ipp-20211108/ippconfig/recipes/filerules-mef.mdc

    r41898 r41948  
    354354PPSTACK.OUTPUT.EXPNUM   OUTPUT {OUTPUT}.num.fits                 MASK      EXPNUM     FPA        TRUE      NONE
    355355PPSTACK.OUTPUT.EXPWT    OUTPUT {OUTPUT}.expwt.fits               VARIANCE  EXP        FPA        TRUE      NONE
    356 PPSTACK.UNCONV          OUTPUT {OUTPUT}.unconv.fits              IMAGE     COMP_IMG   FPA        TRUE      NONE
     356#PPSTACK.UNCONV          OUTPUT {OUTPUT}.unconv.fits              IMAGE     COMP_IMG   FPA        TRUE      NONE
     357PPSTACK.UNCONV          OUTPUT {OUTPUT}.unconv.fits              IMAGE     UNIONS_STACK   FPA        TRUE      NONE
    357358PPSTACK.UNCONV.MASK     OUTPUT {OUTPUT}.unconv.mask.fits         MASK      COMP_MASK  FPA        TRUE      NONE
    358359PPSTACK.UNCONV.VARIANCE OUTPUT {OUTPUT}.unconv.wt.fits           VARIANCE  COMP_WT    FPA        TRUE      NONE

  • branches/eam_branches/ipp-20211108/ippconfig/recipes/fitstypes.mdc

    r39174 r41948  
    129129END
    130130
     131# Compressed log flux image for stacks.
     132UNIONS_STACK     METADATA
     133        BITPIX          S32     16
     134        SCALING         STR     ASINH_RANGE
     135        BSCALE          F32     0.00061 # 2^15 ~ 100M DN
     136        BZERO           F32     0.0     # symmetric about 0.0 DN
     137        BOFFSET         F32     0.0     # symmetric about 0.0 DN
     138        BSOFTEN         F32     1.0     # bend the curve at 1 DN
     139        COMPRESSION     STR     RICE
     140        TILE.X          S32     0
     141        TILE.Y          S32     1
     142        TILE.Z          S32     1
     143        NOISE           S32     8
     144END
     145
    131146# Compressed exposure image
    132147EXP     METADATA

  • branches/eam_branches/ipp-20211108/ppStack/src/ppStackArguments.c

    r34800 r41948  
    197197    }
    198198
    199     // stack-type : used to define the stack for PSPS
     199    // stack-type : used to define the stack for PSPS (added as metadata to header key STK_TYPE)
    200200    if ((argNum = psArgumentGet (argc, argv, "-stack-type"))) {
    201201        if (argc <= argNum+1) {

  • branches/eam_branches/ipp-20211108/psLib/src/fits/psFits.h

    r31633 r41948  
    6060    PS_FITS_SCALE_ASINH_STDEV_NEGATIVE, ///< Do asinh scaling, auto-scale to sample stdev, place mean at upper limit
    6161    PS_FITS_SCALE_ASINH_STDEV_BOTH,     ///< Do asinh scaling, auto-scale to sample stdev, place mean at middle
    62     PS_FITS_SCALE_ASINH_MANUAL          ///< Manual scaling after doing asinh scaling.
     62    PS_FITS_SCALE_ASINH_MANUAL          ///< Manual scaling after doing asinh scaling.(use specified BSCALE, BZERO, BOFFSET, BSOFTEN)
    6363} psFitsScaling;
    6464

  • branches/eam_branches/ipp-20211108/psLib/src/fits/psFitsImage.c

    r41521 r41948  
    744744      }
    745745    }   
    746     // Remove any BSOFTENvalues that exist in the header if we are not using that scaling anymore
     746    // Remove any BSOFTEN values that exist in the header if we are not using that scaling anymore
    747747    if (options && (!((options->scaling == PS_FITS_SCALE_ASINH_RANGE)||
    748748                      (options->scaling == PS_FITS_SCALE_ASINH_MANUAL)||

  • branches/eam_branches/ipp-20211108/psLib/src/fits/psFitsScale.c

    r41521 r41948  
    963963        *bzero = options->bzero;
    964964        *boffset = options->boffset;
     965        break;
     966      case PS_FITS_SCALE_ASINH_MANUAL:
     967        *bscale = options->bscale;
     968        *bzero = options->bzero;
     969        *boffset = options->boffset;
     970        *bsoften = options->bsoften;
    965971        break;
    966972      default:
Note: See TracChangeset for help on using the changeset viewer.