Changeset 35770 for trunk

Timestamp:

Jul 3, 2013, 2:47:39 PM (13 years ago)

Author:

eugene

Message:

merge changes from eam_branches/ipp-20130509

Location:

trunk

Files:

• . (modified) (1 prop)
• Nebulous (modified) (1 prop)
• Nebulous-Server (modified) (1 prop)
• Ohana (modified) (1 prop)
• dbconfig/cam.md (modified) (1 prop)
• dbconfig/changes.txt (modified) (1 prop)
• dvodist/www-util/tracker.html (copied) (copied from branches/eam_branches/ipp-20130509/dvodist/www-util/tracker.html )
• ippMonitor (modified) (1 prop)
• ippScripts/scripts/chip_imfile.pl (modified) (1 prop)
• ippScripts/scripts/destreak_restore_camera.pl (modified) (1 prop)
• ippScripts/scripts/ipp_apply_burntool_single.pl (modified) (1 prop)
• ippScripts/scripts/magic_destreak.pl (modified) (1 prop)
• ippScripts/scripts/publish_file.pl (modified) (1 prop)
• ippScripts/scripts/warp_skycell.pl (modified) (1 prop)
• ippTasks (modified) (1 prop)
• ippToPsps (modified) (1 prop)
• ippTools/share (modified) (1 prop)
• ippTools/share/camtool_find_pendingimfile.sql (modified) (1 prop)
• ippTools/share/chiptool_setimfiletoupdate.sql (modified) (1 prop)
• ippTools/share/pxadmin_create_tables.sql (modified) (1 prop)
• ippTools/share/warptool_towarped.sql (modified) (1 prop)
• ippTools/src (modified) (1 prop)
• ippTools/src/camtool.c (modified) (1 prop)
• ippTools/src/camtoolConfig.c (modified) (1 prop)
• ippTools/src/magictool.c (modified) (1 prop)
• ippconfig (modified) (1 prop)
• ippconfig/gpc1/psphot.config (modified) (1 prop)
• ippconfig/recipes/ppSub.config (modified) (1 prop)
• ippconfig/recipes/psphot.config (modified) (3 diffs, 1 prop)
• ippconfig/recipes/reductionClasses.mdc (modified) (1 prop)
• ppImage/src (modified) (1 prop)
• ppSim/src/ppSimInsertStars.c (modified) (1 diff)
• ppSim/src/ppSimSetPSF.c (modified) (1 diff)
• psconfig (modified) (1 prop)
• pstamp/scripts (modified) (1 prop)
• psvideophot (modified) (1 prop)

trunk/ippconfig/recipes/psphot.config

@@ -106 +106 @@
 PSF_MIN_DS                          F32   0.01
 PSF_PARAM_WEIGHTS                   BOOL  FALSE
+
+LMM_FIT_CHISQ_CONVERGENCE           BOOL  TRUE            # use the (old) chisq convergence or the new parameter one 
+LMM_FIT_GAIN_FACTOR_MODE            S32   0               # there are 3 options to determine the gain factor (0,1,2)
 
 PSF_FIT_ITER                        S32   50              # Maximum number of fitting iterations for PSF
@@ -204 +207 @@
 # these models are used for high-quality shape analysis after all sources have been removed
 EXTENDED_SOURCE_FITS                BOOL  FALSE  # perform the detailed extended sourc fits?
+
+EXTENDED_SOURCE_MODELS_SELECTION    STR   ALL
 
 # extended source models applied to sources
@@ -613 +618 @@
 END
 
+GALAXY_TEST METADATA
+  # Extended source fit parameters
+  # these models are used for high-quality shape analysis after all sources have been removed
+  EXTENDED_SOURCE_FITS                BOOL  TRUE  # perform the detailed extended sourc fits?
+  EXT_MODEL                           STR   PS_MODEL_EXP
+
+  # if this is defined, it gives a list of the model names to fit below (ALL or NONE are also valid)
+  EXTENDED_SOURCE_MODELS_SELECTION    STR   NONE
+
+  # extended source models applied to sources
+  EXTENDED_SOURCE_MODELS METADATA 
+    TYPE      EXTENDED_SOURCE_MODEL  MODEL            SNLIM   PSF_CONVOLVED
+    EXP_CONV  EXTENDED_SOURCE_MODEL  PS_MODEL_EXP     10.0    TRUE
+    DEV_CONV  EXTENDED_SOURCE_MODEL  PS_MODEL_DEV     10.0    TRUE
+    SER_CONV  EXTENDED_SOURCE_MODEL  PS_MODEL_SERSIC  10.0    TRUE
+    GAU_CONV  EXTENDED_SOURCE_MODEL  PS_MODEL_GAUSS   10.0    TRUE
+    PGA_CONV  EXTENDED_SOURCE_MODEL  PS_MODEL_PGAUSS  10.0    TRUE
+    QGA_CONV  EXTENDED_SOURCE_MODEL  PS_MODEL_QGAUSS  10.0    TRUE
+    PS1_CONV  EXTENDED_SOURCE_MODEL  PS_MODEL_PS1_V1  10.0    TRUE
+
+    EXP_RAW   EXTENDED_SOURCE_MODEL  PS_MODEL_EXP     10.0    FALSE
+    DEV_RAW   EXTENDED_SOURCE_MODEL  PS_MODEL_DEV     10.0    FALSE
+    SER_RAW   EXTENDED_SOURCE_MODEL  PS_MODEL_SERSIC  10.0    FALSE
+    GAU_RAW   EXTENDED_SOURCE_MODEL  PS_MODEL_GAUSS   10.0    FALSE
+    PGA_RAW   EXTENDED_SOURCE_MODEL  PS_MODEL_PGAUSS  10.0    FALSE
+    QGA_RAW   EXTENDED_SOURCE_MODEL  PS_MODEL_QGAUSS  10.0    FALSE
+    PS1_RAW   EXTENDED_SOURCE_MODEL  PS_MODEL_PS1_V1  10.0    FALSE
+  END
+END

trunk/ppSim/src/ppSimInsertStars.c

@@ -125 +125 @@
         // XXX set the mag & err values (should this be done in pmSourceFromModel?)
         // XXX i should be applying the gain and the correct effective area
-        psEllipseAxes axes = pmPSF_ModelToAxes (model->params->data.F32, 20.0, model->type);
+        psEllipseAxes axes = pmPSF_ModelToAxes (model->params->data.F32, model->type);
         float Area = 2.0 * M_PI * axes.major * axes.minor;
 

trunk/ppSim/src/ppSimSetPSF.c

@@ -118 +118 @@
 
         pol = psEllipseAxesToPol (axes);
+        psEllipseAxes testaxes = psEllipsePolToAxes (pol, 0.1);
+        fprintf (stderr, "psf in axes: %f x %f @ %f\n", axes.major, axes.minor, axes.theta*PS_DEG_RAD);
+        fprintf (stderr, "psf ot axes: %f x %f @ %f\n", testaxes.major, testaxes.minor, testaxes.theta*PS_DEG_RAD);
     
         param = psf->params->data[PM_PAR_E0];