Changeset 41666

Timestamp:

Jun 23, 2021, 12:34:19 PM (5 years ago)

Author:

eugene

Message:

add forced photometry function and trail fitting function

Location:

trunk/Ohana/src/opihi/cmd.astro

Files:

• Makefile (modified) (2 diffs)
• forcedphot.c (added)
• imfit-trail.c (added)
• imfit.c (modified) (2 diffs)
• init.c (modified) (2 diffs)

trunk/Ohana/src/opihi/cmd.astro/Makefile

@@ -42 +42 @@
 $(SRC)/fixcols.$(ARCH).o           \
 $(SRC)/fiximage.$(ARCH).o          \
+$(SRC)/forcedphot.$(ARCH).o        \
 $(SRC)/gauss.$(ARCH).o             \
 $(SRC)/getvel.$(ARCH).o            \
@@ -90 +91 @@
 $(SRC)/imfit-qgauss-psf.$(ARCH).o          \
 $(SRC)/imfit-sgauss.$(ARCH).o      \
-$(SRC)/imfit-sgauss-psf.$(ARCH).o          \
+$(SRC)/imfit-sgauss-psf.$(ARCH).o  \
 $(SRC)/imfit-qfgauss.$(ARCH).o     \
-$(SRC)/imfit-qrgauss.$(ARCH).o     
+$(SRC)/imfit-qrgauss.$(ARCH).o     \
+$(SRC)/imfit-trail.$(ARCH).o
 
 # dependancy rules for include files ########################

trunk/Ohana/src/opihi/cmd.astro/imfit.c

@@ -65 +65 @@
     qfgauss_setup (argv[N]);
     qrgauss_setup (argv[N]);
+    trail_setup (argv[N]);
     if (fitfunc == NULL) {
       gprint (GP_ERR, "unknown function %s\n", argv[N]);
@@ -124 +125 @@
   dchisq = ochisq;
   chisq  = ochisq;
-  for (i = 0; (i < 25) && ((dchisq <= 0.0) || (dchisq > 0.01*(Npts - Npar))); i++) {
+
+//for (i = 0; (i < 25) && ((dchisq <= 0.0) || (dchisq > 0.01*(Npts - Npar))); i++) {
+
+  for (i = 0; (i < 25); i++) {
     chisq = mrq2dmin (x, y, z, dz, Npts, par, Npar, fitfunc, VERBOSE);
     dchisq = ochisq - chisq;
     ochisq = chisq;
+    fprintf (stderr, "%f -> %f : %f\n", ochisq, chisq, dchisq);
   }  
   set_int_variable ("Niter",  i);

trunk/Ohana/src/opihi/cmd.astro/init.c

@@ -27 +27 @@
 int fixcols                 PROTO((int, char **));
 int fixrows                 PROTO((int, char **));
+int forcedphot              PROTO((int, char **));
 int gauss                   PROTO((int, char **));
 int gaussfit                PROTO((int, char **));
@@ -100 +101 @@
   {1, "fixcols",     fixcols,      "fix bad columns by comparing with others"},
   {1, "fixrows",     fixrows,      "fix bad rows by comparing with others"},
+  {1, "forcedphot",  forcedphot,   "forced photometry on a star or set of stars, assuming gaussian profile"},
   {1, "gauss",       gauss,        "get statistics on a star, assuming gaussian profile"},
   {1, "getvel",      getvel,       "rotcurve to velocities"},