Changeset 42016

Timestamp:

Feb 6, 2022, 3:53:55 PM (4 years ago)

Author:

eugene

Message:

add functions to use polarization parameters for fitting rather than shape parameters (not quite a success)

Location:

branches/eam_branches/ipp-20211108/Ohana/src/opihi

Files:

• cmd.astro/Makefile (modified) (1 diff)
• cmd.astro/imfit-fgauss-pol.c (added)
• cmd.astro/imfit-rgauss-pol.c (added)
• cmd.astro/imfit.c (modified) (1 diff)
• cmd.astro/test/imfit.sh (modified) (4 diffs)
• include/imfit.h (modified) (1 diff)

branches/eam_branches/ipp-20211108/Ohana/src/opihi/cmd.astro/Makefile

@@ -95 +95 @@
 $(SRC)/imfit-qrgauss.$(ARCH).o     \
 $(SRC)/imfit-rgauss.$(ARCH).o      \
+$(SRC)/imfit-fgauss-pol.$(ARCH).o          \
+$(SRC)/imfit-rgauss-pol.$(ARCH).o          \
 $(SRC)/imfit-trail.$(ARCH).o
 

branches/eam_branches/ipp-20211108/Ohana/src/opihi/cmd.astro/imfit.c

@@ -72 +72 @@
     sgauss_psf_setup (argv[N]);
     qgauss_psf_setup (argv[N]);
+
+    fgauss_pol_setup (argv[N]);
+    rgauss_pol_setup (argv[N]); 
+
     if (fitfunc == NULL) {
       gprint (GP_ERR, "unknown function %s\n", argv[N]);

branches/eam_branches/ipp-20211108/Ohana/src/opihi/cmd.astro/test/imfit.sh

@@ -240 +240 @@
   $myfunc = $1 
 
-  mcreate zbuf 500 500
-  set tbuf = zbuf + 100
+  $NX = 101
+  $NY = 101
+  mcreate zbuf $NX $NY
+  set tbuf = zero(zbuf)
 
   # note the SXg, SYg are FWHM, not sigma values
-  $Xg_in   = 250
-  $Yg_in   = 250
-  $SXg_in  = 2.0
-  $SYg_in  = 2.0
+  $Xg_in   = 50
+  $Yg_in   = 50
+  $SXg_in  = 4.0
+  $SYg_in  = 4.0
   $SXYg_in = 0.0
   $Zpk_in  = 500.0
@@ -267 +269 @@
   imfit -func $myfunc tbuf $Xg $Yg 50 50 -insert
 
-  mgaussdev sigma 500 500 0.0 1.0
+  mgaussdev sigma $NX $NY 0.0 1.0
 
   set noise = sigma*sqrt(tbuf)
@@ -285 +287 @@
 end
 
+macro testfit.fgauss.pol
+  if ($0 != 1)
+    echo "USAGE: testfit.fgauss.pol"
+    break
+  end
+
+  $myfunc = fgauss
+
+  mcreate zbuf 101 101
+  set tbuf_o = zero(zbuf)
+  set tbuf_p = zero(zbuf)
+
+  # note the SXg, SYg are FWHM, not sigma values
+  $Xg_in   = 50
+  $Yg_in   = 50
+  $SXg_in  = 4.0
+  $SYg_in  = 4.0
+  $SXYg_in = 0.0
+  $Zpk_in  = 500.0
+  $Sg_in   = 0.0
+  $Sr_in   = 1.0
+  $Npow_in = 2.25
+
+  $Xg      = $Xg_in   
+  $Yg      = $Yg_in   
+  $SXg     = $SXg_in  
+  $SYg     = $SYg_in  
+  $SXYg    = $SXYg_in 
+  $Zpk     = $Zpk_in  
+  $Sg      = $Sg_in   
+  $Sr      = $Sr_in   
+  $Npow    = $Npow_in
+
+  # insert an object with the parameters above
+  imfit -func $myfunc     tbuf_o $Xg $Yg 50 50 -insert
+
+  # insert an object with the parameters using the -pol version
+  imfit -func $myfunc-pol tbuf_p $Xg $Yg 50 50 -insert
+
+  set dt = tbuf_o - tbuf_p
+  stat dt
+
+  tv -ch 1 tbuf_o 0 $Zpk_in
+  tv -ch 2 tbuf_p 0 $Zpk_in
+  tv -ch 3 dt {-0.1*$Zpk_in} {0.2*$Zpk_in}
+end
+
 macro set.input.pars
   if ($0 != 2)
@@ -297 +346 @@
   $Wg      = $Wg_$1  
   $Lg      = $Lg_$1 
-  $Zpk    = $Zpk_$1  
+  $Zpk     = $Zpk_$1  
   $Sg      = $Sg_$1   
 end

branches/eam_branches/ipp-20211108/Ohana/src/opihi/include/imfit.h

@@ -21 +21 @@
 void sgauss_psf_setup (char *name);
 
+void rgauss_pol_setup (char *name);
+void fgauss_pol_setup (char *name);
+
 void trail_setup (char *name);