Changeset 34133

Timestamp:

Jul 10, 2012, 2:33:57 PM (14 years ago)

Author:

eugene

Message:

add TRAIL model & derivaties

Location:

branches/eam_branches/ipp-20120627/psModules

Files:

• . (modified) (1 prop)
• src/objects/Makefile.am (modified) (2 diffs)
• src/objects/models/pmModel_TRAIL.c (added)
• src/objects/models/pmModel_TRAIL.h (added)
• src/objects/pmModelClass.c (modified) (2 diffs)
• src/objects/pmModelFuncs.h (modified) (1 diff)

branches/eam_branches/ipp-20120627/psModules/src/objects/Makefile.am

@@ -80 +80 @@
         models/pmModel_SERSIC.c \
         models/pmModel_EXP.c \
-        models/pmModel_DEV.c
+        models/pmModel_DEV.c \
+        models/pmModel_TRAIL.c
 
 pkginclude_HEADERS = \
@@ -126 +127 @@
         models/pmModel_SERSIC.h \
         models/pmModel_EXP.h \
-        models/pmModel_DEV.h
+        models/pmModel_DEV.h \
+        models/pmModel_TRAIL.h
 
 CLEANFILES = *~

branches/eam_branches/ipp-20120627/psModules/src/objects/pmModelClass.c

@@ -51 +51 @@
 # include "models/pmModel_EXP.h"
 # include "models/pmModel_DEV.h"
+# include "models/pmModel_TRAIL.h"
 
 static pmModelClass defaultModels[] = {
@@ -59 +60 @@
     {"PS_MODEL_RGAUSS",       8, (pmModelFunc)pmModelFunc_RGAUSS,  (pmModelFlux)pmModelFlux_RGAUSS,  (pmModelRadius)pmModelRadius_RGAUSS,  (pmModelLimits)pmModelLimits_RGAUSS,  (pmModelGuessFunc)pmModelGuess_RGAUSS, (pmModelFromPSFFunc)pmModelFromPSF_RGAUSS, (pmModelParamsFromPSF)pmModelParamsFromPSF_RGAUSS, (pmModelFitStatusFunc)pmModelFitStatus_RGAUSS, (pmModelSetLimitsFunc)pmModelSetLimits_RGAUSS },
     {"PS_MODEL_SERSIC",       8, (pmModelFunc)pmModelFunc_SERSIC,  (pmModelFlux)pmModelFlux_SERSIC,  (pmModelRadius)pmModelRadius_SERSIC,  (pmModelLimits)pmModelLimits_SERSIC,  (pmModelGuessFunc)pmModelGuess_SERSIC, (pmModelFromPSFFunc)pmModelFromPSF_SERSIC, (pmModelParamsFromPSF)pmModelParamsFromPSF_SERSIC, (pmModelFitStatusFunc)pmModelFitStatus_SERSIC, (pmModelSetLimitsFunc)pmModelSetLimits_SERSIC },
-    {"PS_MODEL_EXP",          7, (pmModelFunc)pmModelFunc_EXP,     (pmModelFlux)pmModelFlux_EXP,     (pmModelRadius)pmModelRadius_EXP,     (pmModelLimits)pmModelLimits_EXP,     (pmModelGuessFunc)pmModelGuess_EXP,    (pmModelFromPSFFunc)pmModelFromPSF_EXP,    (pmModelParamsFromPSF)pmModelParamsFromPSF_EXP,    (pmModelFitStatusFunc)pmModelFitStatus_EXP,    (pmModelSetLimitsFunc)pmModelSetLimits_EXP },
-    {"PS_MODEL_DEV",          7, (pmModelFunc)pmModelFunc_DEV,     (pmModelFlux)pmModelFlux_DEV,     (pmModelRadius)pmModelRadius_DEV,     (pmModelLimits)pmModelLimits_DEV,     (pmModelGuessFunc)pmModelGuess_DEV,    (pmModelFromPSFFunc)pmModelFromPSF_DEV,    (pmModelParamsFromPSF)pmModelParamsFromPSF_DEV,    (pmModelFitStatusFunc)pmModelFitStatus_DEV,    (pmModelSetLimitsFunc)pmModelSetLimits_DEV },
+    {"PS_MODEL_EXP",          7, (pmModelFunc)pmModelFunc_EXP,     (pmModelFlux)pmModelFlux_EXP,     (pmModelRadius)pmModelRadius_EXP,     (pmModelLimits)pmModelLimits_EXP,     (pmModelGuessFunc)pmModelGuess_EXP,    (pmModelFromPSFFunc)pmModelFromPSF_EXP,    (pmModelParamsFromPSF)pmModelParamsFromPSF_EXP,    (pmModelFitStatusFunc)pmModelFitStatus_EXP,    (pmModelSetLimitsFunc)pmModelSetLimits_EXP    },
+    {"PS_MODEL_DEV",          7, (pmModelFunc)pmModelFunc_DEV,     (pmModelFlux)pmModelFlux_DEV,     (pmModelRadius)pmModelRadius_DEV,     (pmModelLimits)pmModelLimits_DEV,     (pmModelGuessFunc)pmModelGuess_DEV,    (pmModelFromPSFFunc)pmModelFromPSF_DEV,    (pmModelParamsFromPSF)pmModelParamsFromPSF_DEV,    (pmModelFitStatusFunc)pmModelFitStatus_DEV,    (pmModelSetLimitsFunc)pmModelSetLimits_DEV    },
+    {"PS_MODEL_TRAIL",        7, (pmModelFunc)pmModelFunc_TRAIL,   (pmModelFlux)pmModelFlux_TRAIL,   (pmModelRadius)pmModelRadius_TRAIL,   (pmModelLimits)pmModelLimits_TRAIL,   (pmModelGuessFunc)pmModelGuess_TRAIL,  (pmModelFromPSFFunc)pmModelFromPSF_TRAIL,  (pmModelParamsFromPSF)pmModelParamsFromPSF_TRAIL,  (pmModelFitStatusFunc)pmModelFitStatus_TRAIL,  (pmModelSetLimitsFunc)pmModelSetLimits_TRAIL  },
 };
 

branches/eam_branches/ipp-20120627/psModules/src/objects/pmModelFuncs.h

@@ -81 +81 @@
 #define PM_PAR_8    8   ///< Model-dependent parameter
 
+// these are used by pmModel_TRAIL, with refers to L and Theta explicitly
+#define PM_PAR_LENGTH 4 ///< trail length
+#define PM_PAR_THETA  5 ///< position angle
+#define PM_PAR_SIGMA  6 ///< position angle
+
 /*** these prototype classes are used to define elements of the pmModelClass structure below ***/