IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 15671


Ignore:
Timestamp:
Nov 20, 2007, 9:19:48 PM (18 years ago)
Author:
eugene
Message:

mem leaks

Location:
trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/ippconfig/cfh12k/psastro.config

    r15632 r15671  
    1717PSASTRO.TWEAK.NSIGMA    F32      3
    1818
    19 PSASTRO.MAX.NRAW       S32      500   # max stars accepted for fitting (0 for all)
    20 PSASTRO.MAX.NREF       S32      500   # max stars accepted for fitting (0 for all)
     19PSASTRO.MATCH.RADIUS   F32     12.0
     20
     21PSASTRO.MAX.NRAW       S32      1500   # max stars accepted for fitting (0 for all)
     22PSASTRO.MAX.NREF       S32      1500   # max stars accepted for fitting (0 for all)
     23
     24PSASTRO.MIN.INST.MAG.RAW       F32      -14.0  # min instrumental magnitude for stars accepted for fitting
     25PSASTRO.MAX.INST.MAG.RAW       F32       -8.0  # max instrumental magnitude for stars accepted for fitting
    2126
    2227PSASTRO.MAX.ERROR      F32      10.0 # max error in pixels
    2328PSASTRO.MIN.NSTAR      S32      10   # min fitted stars in solution
    2429
    25 PSASTRO.MOSAIC.MAX.ERROR.N0 F32    0.90 # max allow error for valid solution (arcsec)
    26 PSASTRO.MOSAIC.MAX.ERROR.N1 F32    0.90 # max allow error for valid solution (arcsec)
     30PSASTRO.MOSAIC.MAX.ERROR.N0 F32    1.50 # max allow error for valid solution (arcsec)
     31PSASTRO.MOSAIC.MAX.ERROR.N1 F32    1.50 # max allow error for valid solution (arcsec)
    2732PSASTRO.MOSAIC.MAX.ERROR.N2 F32    0.90 # max allow error for valid solution (arcsec)
    2833PSASTRO.MOSAIC.MAX.ERROR.N3 F32    0.90 # max allow error for valid solution (arcsec)
    2934
    30 PSASTRO.MOSAIC.RADIUS.N0    F32    8.0
    31 PSASTRO.MOSAIC.RADIUS.N1    F32    0.0 # do not refine the match
    32 PSASTRO.MOSAIC.RADIUS.N2    F32    0.0
     35PSASTRO.MOSAIC.RADIUS.N0    F32   12.0 # initial match (after chip astrom)
     36PSASTRO.MOSAIC.RADIUS.N1    F32    0.0 # (after first mosaic pass)
     37PSASTRO.MOSAIC.RADIUS.N2    F32    0.0 # do not refine the match
     38PSASTRO.MOSAIC.RADIUS.N3    F32    6.0 #
    3339
    3440PSASTRO.MOSAIC.CHIP.ORDER.N0  S32      0 # fit order (-1 means use default)
    … …  
    4248# use this recipe to set a tight constraint
    4349PSASTRO.FINE METADATA
    44   PSASTRO.MOSAIC.MAX.ERROR.N0 F32    0.50 # max allow error for valid solution (arcsec)
    45   PSASTRO.MOSAIC.MAX.ERROR.N1 F32    0.40 # max allow error for valid solution (arcsec)
    46   PSASTRO.MOSAIC.MAX.ERROR.N2 F32    0.20 # max allow error for valid solution (arcsec)
    47   PSASTRO.MOSAIC.MAX.ERROR.N3 F32    0.10 # max allow error for valid solution (arcsec)
     50  PSASTRO.MOSAIC.MAX.ERROR.N0 F32    1.50 # max allow error for valid solution (arcsec)
     51  PSASTRO.MOSAIC.MAX.ERROR.N1 F32    1.50 # max allow error for valid solution (arcsec)
     52  PSASTRO.MOSAIC.MAX.ERROR.N2 F32    0.90 # max allow error for valid solution (arcsec)
     53  PSASTRO.MOSAIC.MAX.ERROR.N3 F32    0.90 # max allow error for valid solution (arcsec)
    4854
    49   PSASTRO.MOSAIC.RADIUS.N0    F32    3
    50   PSASTRO.MOSAIC.RADIUS.N1    F32    2
    51   PSASTRO.MOSAIC.RADIUS.N2    F32    1
     55  PSASTRO.MOSAIC.RADIUS.N0    F32    8.0
     56  PSASTRO.MOSAIC.RADIUS.N1    F32    0.0
     57  PSASTRO.MOSAIC.RADIUS.N2    F32    4.0
     58  PSASTRO.MOSAIC.RADIUS.N3    F32    4.0
    5259
    5360  PSASTRO.MOSAIC.CHIP.ORDER.N0  S32      0 # fit order (-1 means use default)
    54   PSASTRO.MOSAIC.CHIP.ORDER.N1  S32      0 # fit order (-1 means use default)
     61  PSASTRO.MOSAIC.CHIP.ORDER.N1  S32      1 # fit order (-1 means use default)
    5562  PSASTRO.MOSAIC.CHIP.ORDER.N2  S32      1 # fit order (-1 means use default)
    56   PSASTRO.MOSAIC.CHIP.ORDER.N3  S32      1 # fit order (-1 means use default)
     63  PSASTRO.MOSAIC.CHIP.ORDER.N3  S32      3 # fit order (-1 means use default)
    5764END

  • trunk/ippconfig/megacam/camera.config

    r15628 r15671  
    229229
    230230EXTNAME.RULES METADATA
    231   CMF.HEAD STR {CHIP.NAME}.hdr
    232   CMF.DATA STR {CHIP.NAME}.psf # use .PSF and .EXT?
    233 
    234   PSF.HEAD  STR {CHIP.NAME}.hdr
    235   PSF.TABLE STR {CHIP.NAME}.psf_model
    236   PSF.RESID STR {CHIP.NAME}.psf_resid
     231  CMF.HEAD   STR {CHIP.NAME}.hdr
     232  CMF.DATA   STR {CHIP.NAME}.psf # use .PSF and .EXT?
     233
     234  PSF.HEAD   STR {CHIP.NAME}.hdr
     235  PSF.TABLE  STR {CHIP.NAME}.psf_model
     236  PSF.RESID  STR {CHIP.NAME}.psf_resid
     237
     238  REF.ASTROM STR {CHIP.NAME}.ref_astrom
    237239END
    238240

  • trunk/ippconfig/megacam/psastro.config

    r15642 r15671  
    88# max grid offset in FP units (microns)
    99# use plate-scale to make this in pixels?
    10 PSASTRO.GRID.OFFSET    F32    200.
    11 PSASTRO.GRID.SCALE     F32     15.
     10PSASTRO.GRID.OFFSET    F32    1000.
     11PSASTRO.GRID.SCALE     F32      50.
    1212
    1313# these tweak are in FP units (pixels, currently)
    … …  
    1717PSASTRO.TWEAK.NSIGMA    F32      3
    1818
    19 PSASTRO.MAX.NRAW       S32      1000   # max stars accepted for fitting (0 for all)
    20 PSASTRO.MAX.NREF       S32      1000   # max stars accepted for fitting (0 for all)
     19PSASTRO.MATCH.RADIUS   F32     12.0
     20
     21PSASTRO.MAX.NRAW       S32      1500   # max stars accepted for fitting (0 for all)
     22PSASTRO.MAX.NREF       S32      1500   # max stars accepted for fitting (0 for all)
    2123
    2224PSASTRO.MIN.INST.MAG.RAW       F32      -14.5  # min instrumental magnitude for stars accepted for fitting
    23 PSASTRO.MAX.INST.MAG.RAW       F32       -9.0  # max instrumental magnitude for stars accepted for fitting
     25PSASTRO.MAX.INST.MAG.RAW       F32       -8.0  # max instrumental magnitude for stars accepted for fitting
    2426
    2527PSASTRO.MAX.ERROR      F32      10.0 # max error in pixels
    … …  
    3133PSASTRO.MOSAIC.MAX.ERROR.N3 F32    0.90 # max allow error for valid solution (arcsec)
    3234
    33 PSASTRO.MOSAIC.RADIUS.N0    F32    8.0
     35PSASTRO.MOSAIC.RADIUS.N0    F32    12.0
    3436PSASTRO.MOSAIC.RADIUS.N1    F32    0.0 # do not refine the match
    3537PSASTRO.MOSAIC.RADIUS.N2    F32    0.0 # do not refine the match
    36 PSASTRO.MOSAIC.RADIUS.N3    F32    0.0 # do not refine the match
     38PSASTRO.MOSAIC.RADIUS.N3    F32    6.0
    3739
    3840PSASTRO.MOSAIC.CHIP.ORDER.N0  S32      0 # fit order (-1 means use default)

  • trunk/ippconfig/recipes/psastro.config

    r15659 r15671  
    1414# pmAstromGridMatch:
    1515PSASTRO.GRID.SEARCH    BOOL TRUE
     16
    1617PSASTRO.GRID.MIN.ANGLE F32 -2.0 # start angle (degrees)
    1718PSASTRO.GRID.MAX.ANGLE F32 +2.0
    1819PSASTRO.GRID.DEL.ANGLE F32  0.5
     20
     21PSASTRO.GRID.MIN.SCALE F32  0.98
     22PSASTRO.GRID.MAX.SCALE F32  1.02
     23PSASTRO.GRID.DEL.SCALE F32  0.02
     24
    1925PSASTRO.GRID.MIN.SIGMA F32  5.0
    2026

  • trunk/psastro/src/psastroMosaicGetGrads.c

    r12806 r15671  
    4444        psFree (region);
    4545    }
     46    psFree (view);
    4647    return (grads);
    4748}

  • trunk/psastro/src/psastroMosaicGradients.c

    r15562 r15671  
    6363    if (!status) {
    6464        psError(PSASTRO_ERR_UNKNOWN, false, "failed to find single-chip fit order\n");
     65        psFree (gradients);
     66        psFree (view);
    6567        return false;
    6668    }
    … …  
    8082    if (!status) {
    8183        psError(PS_ERR_IO, false, "Failed to lookup pixel scale");
     84        psFree (gradients);
     85        psFree (view);
    8286        return false;
    8387    }

  • trunk/psastro/src/psastroMosaicSetMatch.c

    r15562 r15671  
    1515    if (!status) {
    1616        psError(PS_ERR_IO, false, "Failed to lookup matching radius: %s", radiusWord);
     17        psFree (view);
    1718        return false;
    1819    }
    … …  
    2122        if (iteration == 0) {
    2223            psError(PS_ERR_IO, false, "Invalid match radius for first iteration: %s", radiusWord);
     24            psFree (view);
    2325            return false;
    2426        }
    2527        psWarning ("skipping match for iteration %d\n", iteration);
     28        psFree (view);
    2629        return true;
    2730    }

  • trunk/psastro/src/psastroOneChip.c

    r15258 r15671  
    4141        }
    4242
    43         // find initial offset / rotation
     43        // find initial offset / rotation / scale
    4444        pmAstromStats *gridStats = pmAstromGridMatch (gridStars, refstars, recipe);
    4545        if (gridStats == NULL) {
Note: See TracChangeset for help on using the changeset viewer.