Changeset 38318 for branches/eam_branches/ipp-20150419/Ohana/src/addstar/test

Timestamp:

May 25, 2015, 12:43:23 PM (11 years ago)

Author:

eugene

Message:

add mode option to dvo_secfilt_init (so chip, warp, stack can be reset independently); add HAS_TYCHO, FIX_SYNTH to secfilt flags

File:

• branches/eam_branches/ipp-20150419/Ohana/src/addstar/test/relphot.flatcorr.dvo (modified) (12 diffs)

branches/eam_branches/ipp-20150419/Ohana/src/addstar/test/relphot.flatcorr.dvo

@@ -21 +21 @@
 if (not($?PLOT)) set PLOT = 0
 
-$USE_CELL_OFFSETS = 0; # turn on non-zero cell offsets
+$USE_CELL_OFFSETS = 1; # turn on non-zero cell offsets
 $SET_UC_RESID = 1; # write a non-zero resid value to the ubercal table (should not have an impact)
-$DO_2MASS = 0
-$DO_SYNTH = 0
-$DO_TYCHO = 0
+$DO_2MASS = 1
+$DO_SYNTH = 1
+$DO_TYCHO = 1
 $NC_CLOUDS = 0.08
 $UC_CLOUDS = 0.02
@@ -196 +196 @@
   tapEXEC relphot -images g,r -v -region 9.5 10.5 19.5 20.5 -D CATDIR $catdir -D STAR_TOOFEW 1 -D SIGMA_LIM 0.07 -statmode WT_MEAN -cloud-limit 0.5 -D IMAGE_OFFSET 0.5 -update -synthphot_zpts $fileroot.synthzpts.fits
   for i 0 mjd_uc[]
-    ckexposure $catdir mjd_uc[$i] zpt_uc[$i] exptime_uc[$i] airmass_uc[$i] $filt_uc:$i relphot
+    ckexposure $catdir mjd_uc[$i] zpt_uc[$i] exptime_uc[$i] airmass_uc[$i] $filt_uc:$i relphot_uc
   end
   for i 0 mjd_nc[]
-    ckexposure $catdir mjd_nc[$i] zpt_nc[$i] exptime_nc[$i] airmass_nc[$i] $filt_nc:$i relphot
+    ckexposure $catdir mjd_nc[$i] zpt_nc[$i] exptime_nc[$i] airmass_nc[$i] $filt_nc:$i relphot_nc
   end
   ck2mass relphot
+  cksynth relphot
+  cktycho relphot
 
   tapDONE
@@ -207 +209 @@
 
 macro try.relphot
+  if ($0 != 3)
+    echo "go (fileroot) (catdir)"
+    break
+  end
+
+  local i fileroot rootdir catdir
+
+  $fileroot = $1
+  $catdir = $2
+
   # run relphot on the db and check that the images now match the expected values
-  # tapEXEC relphot -images g,r -v -region 9.5 10.5 19.5 20.5 -D CATDIR $1 -D STAR_TOOFEW 1 -D SIGMA_LIM 0.07 -statmode WT_MEAN -cloud-limit 0.5 -D IMAGE_OFFSET 0.5 -update -synthphot_zpts $fileroot.synthzpts.fits
-  tapEXEC relphot -images g,r -v -region 9.5 10.5 19.5 20.5 -D CATDIR $1 -D STAR_TOOFEW 1 -D SIGMA_LIM 0.07 -statmode WT_MEAN -cloud-limit 0.5 -D IMAGE_OFFSET 0.5 -update
+  tapEXEC relphot -images g,r -v -region 9.5 10.5 19.5 20.5 -D CATDIR $catdir -D STAR_TOOFEW 1 -D SIGMA_LIM 0.07 -statmode WT_MEAN -cloud-limit 0.5 -D IMAGE_OFFSET 0.5 -update -synthphot_zpts $fileroot.synthzpts.fits -nloop 24
+
   for i 0 mjd_uc[]
-    ckexposure $1 mjd_uc[$i] zpt_uc[$i] exptime_uc[$i] airmass_uc[$i] $filt_uc:$i relphot
+    # ckexposure $catdir mjd_uc[$i] zpt_uc[$i] exptime_uc[$i] airmass_uc[$i] $filt_uc:$i relphot_uc
+      ckexposure $catdir mjd_uc[$i] zpt_uc[$i] exptime_uc[$i] airmass_uc[$i] $filt_uc:$i relphot_uc
   end
   for i 0 mjd_nc[]
-    ckexposure $1 mjd_nc[$i] zpt_nc[$i] exptime_nc[$i] airmass_nc[$i] $filt_nc:$i relphot
+    # ckexposure $catdir mjd_nc[$i] zpt_nc[$i] exptime_nc[$i] airmass_nc[$i] $filt_nc:$i relphot_nc
+      ckexposure $catdir mjd_nc[$i] zpt_nc[$i] exptime_nc[$i] airmass_nc[$i] $filt_nc:$i relphot_nc
   end
 end
@@ -256 +270 @@
   $AIRMASS     = $5
   $FILTER      = $6
-  $MODE        = $7
+  $FUNC_MODE   = $7
 
   # XXX need a function to extract the nominal zpt for a given filter / photcode from the db
@@ -325 +339 @@
   $ZPT_REAL_NORM = $ZPT_REAL - 2.5*log($EXPTIME) - $KLAM_NOMINAL*($AIRMASS - 1.0)
 
-  if ("$MODE" == "raw") 
+  if ("$FUNC_MODE" == "raw") 
     for ix 0 $NCELL_X
       for iy 0 $NCELL_Y
@@ -342 +356 @@
   end
 
-  if ("$MODE" == "setphot_uc") 
+  if ("$FUNC_MODE" == "setphot_uc") 
     vstat -q dm_good
     sprintf line "setphot_uc  ZP %8.2f $FILTER %6.3f %6.3f %6.3f: %7.4f %7.4f : %3d" $MJD_IMAGE $ZPT_REAL $ZPT_REAL_NORM $ZPT_NOMINAL $MEAN $SIGMA dm_good[]
@@ -357 +371 @@
   end
 
-  if ("$MODE" == "setphot_nc") 
+  if ("$FUNC_MODE" == "setphot_nc") 
     vstat -q dm_good
     sprintf line "setphot_nc  ZP %8.2f $FILTER %6.3f %6.3f %6.3f: %7.4f %7.4f : %3d" $MJD_IMAGE $ZPT_REAL $ZPT_REAL_NORM $ZPT_NOMINAL $MEAN $SIGMA dm_good[]
@@ -372 +386 @@
   end
 
-  if ("$MODE" == "relphot") 
+  if (("$FUNC_MODE" == "relphot_uc") || ("$FUNC_MODE" == "relphot_nc"))
     vstat -q dm_good
     sprintf line "relphot     ZP %8.2f $FILTER %6.3f %6.3f %6.3f: %7.4f %7.4f : %3d" $MJD_IMAGE $ZPT_REAL $ZPT_REAL_NORM $ZPT_NOMINAL $MEAN $SIGMA dm_good[]
-    tapOK {abs($MEAN) < 0.001} "$line"
-    tapOK {abs($SIGMA) < 0.001} "$line"
+
+    if ("$FUNC_MODE" == "relphot_uc")
+      tapOK {abs($MEAN) < 0.001} "$line"
+      tapOK {abs($SIGMA) < 0.001} "$line"
+    end
+    if ("$FUNC_MODE" == "relphot_nc")
+      # XXX NOTE relaxed condition : bad photometry points are partly clipped but still cause a bias
+      tapOK {abs($MEAN) < 0.020} "$line"
+      tapOK {abs($SIGMA) < 0.020} "$line"
+    end
 
     mextract ra dec dbflags
@@ -390 +412 @@
     return
   end
+
+  echo "ERROR: unknown mode for ckexposure : $FUNC_MODE"
 
 end
@@ -704 +728 @@
   tapEXEC addstar -ref $ROOT.tycho.dat -D CATDIR $CATDIR -D CAMERA gpc1 -quick-airmass -photcode TYCHO_B
 
-  # $KAPA = kapa -noX
+  $KAPA = kapa -noX
   dev -n tmpdev
   # resize 100 100
@@ -714 +738 @@
   cdensify tmpmap tmp tmp
   set map = zero(tmpmap) + 0.2
-  # close
+  close
   $KAPA = kapa
 
@@ -746 +770 @@
 
   if ("$1" == "relphot")
-    subset rs = r_tycho if (m_tycho < 12)
-    subset ds = d_tycho if (m_tycho < 12)
-    avmatch rs ds 0.1 g:flags
-    subset tmp = rs if (g:flags & 0x04); # tycho used for photometry
-    tapOK {tmp[] == rs[]} "tycho objects used for photometry properly marked"
+    subset rst = r_tycho if (m_tycho < 12)
+    subset dst = d_tycho if (m_tycho < 12)
+    # XXX : should not restrict to 'g'
+    avmatch rst dst 0.1 g:flags
+    subset tmp = rst if (g:flags & 0x40); # tycho used for photometry
+    tapOK {tmp[] == rst[]} "tycho objects used for photometry properly marked"
+
+    # non-tycho stars with synth phot should be repaired
+    subset rsn = r_synth if (m_synth > 12) && (m_synth < 13.5)
+    subset dsn = d_synth if (m_synth > 12) && (m_synth < 13.5)
+    # XXX : should not restrict to 'g'
+    avmatch rsn dsn 0.1 g:flags
+    subset tmp = rsn if (g:flags & 0x80); # synth photometry repaired
+    tapOK {tmp[] == rsn[]} "tycho objects used for photometry properly marked"
   end
 end