Changeset 37053 for trunk/psphot

Timestamp:

Jul 17, 2014, 10:24:26 AM (12 years ago)

Author:

eugene

Message:

merging changes from eam_branches/ipp-20140610

Location:

trunk

Files:

• . (modified) (1 prop)
• psphot/test/tap_psphot_galaxies.pro (modified) (4 diffs)

trunk/psphot/test/tap_psphot_galaxies.pro

@@ -32 +32 @@
 $FakeOptions = $BaseOptions
 $FakeOptions = $FakeOptions -exptime 30.0
+# $FakeOptions = $FakeOptions -D PSF.MODEL PS_MODEL_PS1_V1
 $FakeOptions = $FakeOptions -D PSF.MODEL PS_MODEL_GAUSS
   
@@ -44 +45 @@
 
 # basic config for ppSim with randomly distributed stars and gridded galaxies
-$FakeConfig = -camera SIMTEST
-$FakeConfig = $FakeConfig -recipe PPSIM STACKTEST.RUN
-$FakeConfig = $FakeConfig -D PSASTRO:PSASTRO.CATDIR catdir.ref
-$FakeConfig = $FakeConfig -Db STARS.FAKE F                         ; # only use stars from catdir.ref
-$FakeConfig = $FakeConfig -Db MATCH.DENSITY F
-$FakeConfig = $FakeConfig -Db PSF.CONVOLVE T
-$FakeConfig = $FakeConfig -Db GALAXY.FAKE T                        ; # generate a "realistic" distribution of galaxies
-$FakeConfig = $FakeConfig -Df GALAXY.MAG 17.0
-$FakeConfig = $FakeConfig -Db GALAXY.GRID T                        ; # generate a grid of galaxies (constant mag)
-#$FakeConfig = $FakeConfig -D GALAXY.MODEL PS_MODEL_GAUSS
-#$FakeConfig = $FakeConfig -D GALAXY.MODEL PS_MODEL_EXP
-#$FakeConfig = $FakeConfig -D GALAXY.MODEL PS_MODEL_SERSIC
-#$FakeConfig = $FakeConfig -D GALAXY.MODEL PS_MODEL_DEV
-$FakeConfig = $FakeConfig -Df GALAXY.RMAJOR.MIN 10.0
-$FakeConfig = $FakeConfig -Df GALAXY.RMAJOR.MAX 10.0
-$FakeConfig = $FakeConfig -Df GALAXY.ARATIO.MIN 0.25
-$FakeConfig = $FakeConfig -Df GALAXY.ARATIO.MAX 0.25
-$FakeConfig = $FakeConfig -Df GALAXY.THETA.MIN 0 
-$FakeConfig = $FakeConfig -Df GALAXY.THETA.MAX 180
-$FakeConfig = $FakeConfig -Df GALAXY.INDEX.MIN 1.66
-$FakeConfig = $FakeConfig -Df GALAXY.INDEX.MAX 1.66
-$FakeConfig = $FakeConfig -Di GALAXY.GRID.DX 120
-$FakeConfig = $FakeConfig -Di GALAXY.GRID.DY 120
+if (1)
+  $FakeConfig = -camera SIMTEST
+  $FakeConfig = $FakeConfig -recipe PPSIM STACKTEST.RUN
+  $FakeConfig = $FakeConfig -D PSASTRO:PSASTRO.CATDIR catdir.ref
+  $FakeConfig = $FakeConfig -Db STARS.FAKE F                         ; # only use stars from catdir.ref
+  $FakeConfig = $FakeConfig -Db MATCH.DENSITY F
+  $FakeConfig = $FakeConfig -Db PSF.CONVOLVE T
+  $FakeConfig = $FakeConfig -Db GALAXY.FAKE T                        ; # generate a "realistic" distribution of galaxies
+  $FakeConfig = $FakeConfig -Df GALAXY.MAG 17.0
+  $FakeConfig = $FakeConfig -Db GALAXY.GRID F                        ; # generate a grid of galaxies (constant mag)
+  #$FakeConfig = $FakeConfig -D GALAXY.MODEL PS_MODEL_GAUSS
+  #$FakeConfig = $FakeConfig -D GALAXY.MODEL PS_MODEL_EXP
+  #$FakeConfig = $FakeConfig -D GALAXY.MODEL PS_MODEL_SERSIC
+  #$FakeConfig = $FakeConfig -D GALAXY.MODEL PS_MODEL_DEV
+  $FakeConfig = $FakeConfig -Df GALAXY.RMAJOR.MIN 10.0
+  $FakeConfig = $FakeConfig -Df GALAXY.RMAJOR.MAX  1.0
+  $FakeConfig = $FakeConfig -Df GALAXY.ARATIO.MIN 0.25
+  $FakeConfig = $FakeConfig -Df GALAXY.ARATIO.MAX 1.00
+  $FakeConfig = $FakeConfig -Df GALAXY.THETA.MIN 0 
+  $FakeConfig = $FakeConfig -Df GALAXY.THETA.MAX 180
+  $FakeConfig = $FakeConfig -Df GALAXY.INDEX.MIN 1.66
+  $FakeConfig = $FakeConfig -Df GALAXY.INDEX.MAX 1.66
+  $FakeConfig = $FakeConfig -Di GALAXY.GRID.DX 120
+  $FakeConfig = $FakeConfig -Di GALAXY.GRID.DY 120
+end
+
+# basic config for ppSim with randomly distributed stars and gridded galaxies
+if (0) 
+  $FakeConfig = -camera SIMTEST
+  $FakeConfig = $FakeConfig -recipe PPSIM STACKTEST.RUN
+  $FakeConfig = $FakeConfig -D PSASTRO:PSASTRO.CATDIR catdir.ref
+  $FakeConfig = $FakeConfig -Db STARS.FAKE F                         ; # only use stars from catdir.ref
+  $FakeConfig = $FakeConfig -Db MATCH.DENSITY F
+  $FakeConfig = $FakeConfig -Db PSF.CONVOLVE T
+  $FakeConfig = $FakeConfig -Db GALAXY.FAKE T                        ; # generate a "realistic" distribution of galaxies
+  $FakeConfig = $FakeConfig -Df GALAXY.MAG 17.0
+  $FakeConfig = $FakeConfig -Db GALAXY.GRID T                        ; # generate a grid of galaxies (constant mag)
+  #$FakeConfig = $FakeConfig -D GALAXY.MODEL PS_MODEL_GAUSS
+  #$FakeConfig = $FakeConfig -D GALAXY.MODEL PS_MODEL_EXP
+  #$FakeConfig = $FakeConfig -D GALAXY.MODEL PS_MODEL_SERSIC
+  #$FakeConfig = $FakeConfig -D GALAXY.MODEL PS_MODEL_DEV
+  $FakeConfig = $FakeConfig -Df GALAXY.RMAJOR.MIN 10.0
+  $FakeConfig = $FakeConfig -Df GALAXY.RMAJOR.MAX 10.0
+  $FakeConfig = $FakeConfig -Df GALAXY.ARATIO.MIN 0.25
+  $FakeConfig = $FakeConfig -Df GALAXY.ARATIO.MAX 0.25
+  $FakeConfig = $FakeConfig -Df GALAXY.THETA.MIN 0 
+  $FakeConfig = $FakeConfig -Df GALAXY.THETA.MAX 180
+  $FakeConfig = $FakeConfig -Df GALAXY.INDEX.MIN 1.66
+  $FakeConfig = $FakeConfig -Df GALAXY.INDEX.MAX 1.66
+  $FakeConfig = $FakeConfig -Di GALAXY.GRID.DX 120
+  $FakeConfig = $FakeConfig -Di GALAXY.GRID.DY 120
+end
 
 list fwhm 
@@ -164 +194 @@
   $psphotConfig = $psphotConfig -Di PSPHOT:LMM_FIT_GAIN_FACTOR_MODE 2
   $psphotConfig = $psphotConfig -Db PSPHOT:SAVE.RESID T
+  $psphotConfig = $psphotConfig -D  PSPHOT:PSF_MODEL PS_MODEL_PS1_V1
+  # $psphotConfig = $psphotConfig -D  PSPHOT:PSF_MODEL PS_MODEL_GAUSS
   $psphotConfig = $psphotConfig -D  PSPHOT:EXTENDED_SOURCE_MODELS_SELECTION $fitModel
+  # $psphotConfig = $psphotConfig -D  PSPHOT:OUTPUT.FORMAT PS1_V5
+  $psphotConfig = $psphotConfig -D  PSPHOT:OUTPUT.FORMAT PS1_SV3
+  $psphotConfig = $psphotConfig -Db PSPHOT:LENSING_PARAMETERS T
 
   # ppImage / psphot on the output
@@ -217 +252 @@
 
   # plot (input - output) vs mag
+end
+
+macro ck.poserrors
+  reindex X_raw_m = X_raw using index2
+  reindex X_out_m = X_PSF_out using index1
+  reindex dX_out_m = X_PSF_SIG_out using index1
+  set Xoff = X_raw_m - X_out_m
+  reindex M_raw_m = PSF_INST_MAG_raw using index2
+
+  # lim M_raw_m Xoff; clear; box; plot M_raw_m Xoff
+  set dC = Xoff^2 / dX_out_m^2
+  lim M_raw_m dX_out_m; clear; box; plot M_raw_m dX_out_m
 end