IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 37053


Ignore:
Timestamp:
Jul 17, 2014, 10:24:26 AM (12 years ago)
Author:
eugene
Message:

merging changes from eam_branches/ipp-20140610

Location:
trunk
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/ippScripts/Build.PL

    r36950 r37053  
    135135        scripts/psphot_fullforce_warp.pl
    136136        scripts/psphot_fullforce_summary.pl
     137        scripts/stack_bkg_mk_mdc.pl
    137138        scripts/sc_mk_stack_mdc.pl
    138139        scripts/sc_prepare_camera.pl

  • trunk/ippScripts/scripts/psphot_fullforce_warp.pl

    r36761 r37053  
    186186    $command .= " -F PSPHOT.OUTPUT PSPHOT.OUT.CMF.MEF";
    187187    $command .= " -F PSPHOT.BACKMDL PSPHOT.BACKMDL.MEF";
     188    $command .= " -photcode-rule '{DETECTOR}.{FILTER.ID}.ForcedWarp'";
    188189    $command .= " -tracedest $traceDest -log $logDest";
    189190    $command .= " -dbname $dbname" if defined $dbname;

  • trunk/ippScripts/scripts/queuestaticsky.pl

  • trunk/psastro/doc/outline.txt

    r26259 r37053  
    33
    44  psastroParseCamera
     5    psastroDefineFiles
    56  psastroDataLoad
    6     psastroConvertReadout (save PSASTRO.RAWSTARS & PSASTRO.RAWSTARS.SUBSET on readout->analysis)
     7    psastroConvertReadout (saves PSASTRO.RAWSTARS on readout->analysis)
     8      psastroCorrectKH
    79  psastroAnalysis
    810    psastroUseModel
    911    psastroAstromGuess (plots PSASTRO.RAWSTARS)
     12    psastroRemoveClumpsRawstars (saves PSASTRO.RAWSTARS.SUBSET on readout->analysis)
    1013    psastroLoadRefstars (loads full reference star set)
    1114    psastroChooseRefstars (save PSASTRO.REFSTARS & PSASTRO.REFSTARS.SUBSET on readout->analysis)

  • trunk/psphot/test/tap_psphot_galaxies.pro

    r35769 r37053  
    3232$FakeOptions = $BaseOptions
    3333$FakeOptions = $FakeOptions -exptime 30.0
     34# $FakeOptions = $FakeOptions -D PSF.MODEL PS_MODEL_PS1_V1
    3435$FakeOptions = $FakeOptions -D PSF.MODEL PS_MODEL_GAUSS
    3536 
    … …  
    4445
    4546# basic config for ppSim with randomly distributed stars and gridded galaxies
    46 $FakeConfig = -camera SIMTEST
    47 $FakeConfig = $FakeConfig -recipe PPSIM STACKTEST.RUN
    48 $FakeConfig = $FakeConfig -D PSASTRO:PSASTRO.CATDIR catdir.ref
    49 $FakeConfig = $FakeConfig -Db STARS.FAKE F                         ; # only use stars from catdir.ref
    50 $FakeConfig = $FakeConfig -Db MATCH.DENSITY F
    51 $FakeConfig = $FakeConfig -Db PSF.CONVOLVE T
    52 $FakeConfig = $FakeConfig -Db GALAXY.FAKE T                        ; # generate a "realistic" distribution of galaxies
    53 $FakeConfig = $FakeConfig -Df GALAXY.MAG 17.0
    54 $FakeConfig = $FakeConfig -Db GALAXY.GRID T                        ; # generate a grid of galaxies (constant mag)
    55 #$FakeConfig = $FakeConfig -D GALAXY.MODEL PS_MODEL_GAUSS
    56 #$FakeConfig = $FakeConfig -D GALAXY.MODEL PS_MODEL_EXP
    57 #$FakeConfig = $FakeConfig -D GALAXY.MODEL PS_MODEL_SERSIC
    58 #$FakeConfig = $FakeConfig -D GALAXY.MODEL PS_MODEL_DEV
    59 $FakeConfig = $FakeConfig -Df GALAXY.RMAJOR.MIN 10.0
    60 $FakeConfig = $FakeConfig -Df GALAXY.RMAJOR.MAX 10.0
    61 $FakeConfig = $FakeConfig -Df GALAXY.ARATIO.MIN 0.25
    62 $FakeConfig = $FakeConfig -Df GALAXY.ARATIO.MAX 0.25
    63 $FakeConfig = $FakeConfig -Df GALAXY.THETA.MIN 0
    64 $FakeConfig = $FakeConfig -Df GALAXY.THETA.MAX 180
    65 $FakeConfig = $FakeConfig -Df GALAXY.INDEX.MIN 1.66
    66 $FakeConfig = $FakeConfig -Df GALAXY.INDEX.MAX 1.66
    67 $FakeConfig = $FakeConfig -Di GALAXY.GRID.DX 120
    68 $FakeConfig = $FakeConfig -Di GALAXY.GRID.DY 120
     47if (1)
     48  $FakeConfig = -camera SIMTEST
     49  $FakeConfig = $FakeConfig -recipe PPSIM STACKTEST.RUN
     50  $FakeConfig = $FakeConfig -D PSASTRO:PSASTRO.CATDIR catdir.ref
     51  $FakeConfig = $FakeConfig -Db STARS.FAKE F                         ; # only use stars from catdir.ref
     52  $FakeConfig = $FakeConfig -Db MATCH.DENSITY F
     53  $FakeConfig = $FakeConfig -Db PSF.CONVOLVE T
     54  $FakeConfig = $FakeConfig -Db GALAXY.FAKE T                        ; # generate a "realistic" distribution of galaxies
     55  $FakeConfig = $FakeConfig -Df GALAXY.MAG 17.0
     56  $FakeConfig = $FakeConfig -Db GALAXY.GRID F                        ; # generate a grid of galaxies (constant mag)
     57  #$FakeConfig = $FakeConfig -D GALAXY.MODEL PS_MODEL_GAUSS
     58  #$FakeConfig = $FakeConfig -D GALAXY.MODEL PS_MODEL_EXP
     59  #$FakeConfig = $FakeConfig -D GALAXY.MODEL PS_MODEL_SERSIC
     60  #$FakeConfig = $FakeConfig -D GALAXY.MODEL PS_MODEL_DEV
     61  $FakeConfig = $FakeConfig -Df GALAXY.RMAJOR.MIN 10.0
     62  $FakeConfig = $FakeConfig -Df GALAXY.RMAJOR.MAX  1.0
     63  $FakeConfig = $FakeConfig -Df GALAXY.ARATIO.MIN 0.25
     64  $FakeConfig = $FakeConfig -Df GALAXY.ARATIO.MAX 1.00
     65  $FakeConfig = $FakeConfig -Df GALAXY.THETA.MIN 0
     66  $FakeConfig = $FakeConfig -Df GALAXY.THETA.MAX 180
     67  $FakeConfig = $FakeConfig -Df GALAXY.INDEX.MIN 1.66
     68  $FakeConfig = $FakeConfig -Df GALAXY.INDEX.MAX 1.66
     69  $FakeConfig = $FakeConfig -Di GALAXY.GRID.DX 120
     70  $FakeConfig = $FakeConfig -Di GALAXY.GRID.DY 120
     71end
     72
     73# basic config for ppSim with randomly distributed stars and gridded galaxies
     74if (0)
     75  $FakeConfig = -camera SIMTEST
     76  $FakeConfig = $FakeConfig -recipe PPSIM STACKTEST.RUN
     77  $FakeConfig = $FakeConfig -D PSASTRO:PSASTRO.CATDIR catdir.ref
     78  $FakeConfig = $FakeConfig -Db STARS.FAKE F                         ; # only use stars from catdir.ref
     79  $FakeConfig = $FakeConfig -Db MATCH.DENSITY F
     80  $FakeConfig = $FakeConfig -Db PSF.CONVOLVE T
     81  $FakeConfig = $FakeConfig -Db GALAXY.FAKE T                        ; # generate a "realistic" distribution of galaxies
     82  $FakeConfig = $FakeConfig -Df GALAXY.MAG 17.0
     83  $FakeConfig = $FakeConfig -Db GALAXY.GRID T                        ; # generate a grid of galaxies (constant mag)
     84  #$FakeConfig = $FakeConfig -D GALAXY.MODEL PS_MODEL_GAUSS
     85  #$FakeConfig = $FakeConfig -D GALAXY.MODEL PS_MODEL_EXP
     86  #$FakeConfig = $FakeConfig -D GALAXY.MODEL PS_MODEL_SERSIC
     87  #$FakeConfig = $FakeConfig -D GALAXY.MODEL PS_MODEL_DEV
     88  $FakeConfig = $FakeConfig -Df GALAXY.RMAJOR.MIN 10.0
     89  $FakeConfig = $FakeConfig -Df GALAXY.RMAJOR.MAX 10.0
     90  $FakeConfig = $FakeConfig -Df GALAXY.ARATIO.MIN 0.25
     91  $FakeConfig = $FakeConfig -Df GALAXY.ARATIO.MAX 0.25
     92  $FakeConfig = $FakeConfig -Df GALAXY.THETA.MIN 0
     93  $FakeConfig = $FakeConfig -Df GALAXY.THETA.MAX 180
     94  $FakeConfig = $FakeConfig -Df GALAXY.INDEX.MIN 1.66
     95  $FakeConfig = $FakeConfig -Df GALAXY.INDEX.MAX 1.66
     96  $FakeConfig = $FakeConfig -Di GALAXY.GRID.DX 120
     97  $FakeConfig = $FakeConfig -Di GALAXY.GRID.DY 120
     98end
    6999
    70100list fwhm
    … …  
    164194  $psphotConfig = $psphotConfig -Di PSPHOT:LMM_FIT_GAIN_FACTOR_MODE 2
    165195  $psphotConfig = $psphotConfig -Db PSPHOT:SAVE.RESID T
     196  $psphotConfig = $psphotConfig -D  PSPHOT:PSF_MODEL PS_MODEL_PS1_V1
     197  # $psphotConfig = $psphotConfig -D  PSPHOT:PSF_MODEL PS_MODEL_GAUSS
    166198  $psphotConfig = $psphotConfig -D  PSPHOT:EXTENDED_SOURCE_MODELS_SELECTION $fitModel
     199  # $psphotConfig = $psphotConfig -D  PSPHOT:OUTPUT.FORMAT PS1_V5
     200  $psphotConfig = $psphotConfig -D  PSPHOT:OUTPUT.FORMAT PS1_SV3
     201  $psphotConfig = $psphotConfig -Db PSPHOT:LENSING_PARAMETERS T
    167202
    168203  # ppImage / psphot on the output
    … …  
    217252
    218253  # plot (input - output) vs mag
     254end
     255
     256macro ck.poserrors
     257  reindex X_raw_m = X_raw using index2
     258  reindex X_out_m = X_PSF_out using index1
     259  reindex dX_out_m = X_PSF_SIG_out using index1
     260  set Xoff = X_raw_m - X_out_m
     261  reindex M_raw_m = PSF_INST_MAG_raw using index2
     262
     263  # lim M_raw_m Xoff; clear; box; plot M_raw_m Xoff
     264  set dC = Xoff^2 / dX_out_m^2
     265  lim M_raw_m dX_out_m; clear; box; plot M_raw_m dX_out_m
    219266end
    220267

  • trunk/pstamp/scripts/pstamp_checkdependent.pl

  • trunk/pstamp/scripts/pstamp_finish.pl

  • trunk/pstamp/scripts/pstampparse.pl

  • trunk/pswarp/src/pswarpCleanup.c

    r35563 r37053  
    5555        goto DONE;
    5656    }
     57
    5758    pmChip *chip;
    5859    while ((chip = pmFPAviewNextChip (view, output->fpa, 1)) != NULL) {
Note: See TracChangeset for help on using the changeset viewer.