Changeset 33391 for branches/eam_branches/ipp-20111122/Ohana/src/addstar/test/relphot.reject.dvo

Timestamp:

Mar 1, 2012, 8:49:24 PM (14 years ago)

Author:

eugene

Message:

add photFlags to MeasureTiny, pass along to BrightStars; updates to the relphot.reject.dvo test set; tests prints for ubercalDist; add rejection of bad and poor stars in bcatalog (make "poor" optional?); reject outlier measures based on hypot(star_sigma, meas_sigma)

File:

• branches/eam_branches/ipp-20111122/Ohana/src/addstar/test/relphot.reject.dvo (modified) (10 diffs)

branches/eam_branches/ipp-20111122/Ohana/src/addstar/test/relphot.reject.dvo

@@ -34 +34 @@
   $CHIP_DY = 1000
   $DEFECT_FRAC = 0.03
+  $OFFSET_FRAC_UC = 0.1
+  $OFFSET_FRAC_NC = 0.5
   if (not($?VERBOSE)) set VERBOSE = 0
 
@@ -54 +56 @@
   # sequence to count images (only used in this function)
   # XXX  TEST create tmpseq 0 9
-  create tmpseq 0 3
+  create tmpseq 0 9
 
   ##### mjd and zpt values for ubercal'ed images
@@ -63 +65 @@
   $filt_uc:1 = g;  filtN_uc[1] = 1
   $filt_uc:2 = g;  filtN_uc[2] = 1
-  # $filt_uc:3 = r;  filtN_uc[3] = 2
-  # $filt_uc:4 = r;  filtN_uc[4] = 2
-  # $filt_uc:5 = r;  filtN_uc[5] = 2
-  # $filt_uc:6 = i;  filtN_uc[6] = 3
-  # $filt_uc:7 = i;  filtN_uc[7] = 3
-  # $filt_uc:8 = i;  filtN_uc[8] = 3
+  $filt_uc:3 = g;  filtN_uc[3] = 1
+  $filt_uc:4 = g;  filtN_uc[4] = 1
+  $filt_uc:5 = g;  filtN_uc[5] = 1
+  $filt_uc:6 = g;  filtN_uc[6] = 1
+  $filt_uc:7 = g;  filtN_uc[7] = 1
+  $filt_uc:8 = g;  filtN_uc[8] = 1
 
   # airmass slopes for this sequnece
@@ -87 +89 @@
   mjd_uc[1] = 55000.02
   mjd_uc[2] = 55000.03
-  # mjd_uc[3] = 55015.01
-  # mjd_uc[4] = 55015.02
-  # mjd_uc[5] = 55015.03
-  # mjd_uc[6] = 55025.01
-  # mjd_uc[7] = 55025.02
-  # mjd_uc[8] = 55025.03
+  mjd_uc[3] = 55015.01
+  mjd_uc[4] = 55015.02
+  mjd_uc[5] = 55015.03
+  mjd_uc[6] = 55025.01
+  mjd_uc[7] = 55025.02
+  mjd_uc[8] = 55025.03
 
   ##### mjd and zpt values for not-ubercal'ed images
@@ -101 +103 @@
   $filt_nc:1 = g;  filtN_nc[1] = 1
   $filt_nc:2 = g;  filtN_nc[2] = 1
-  # $filt_nc:3 = r;  filtN_nc[3] = 2
-  # $filt_nc:4 = r;  filtN_nc[4] = 2
-  # $filt_nc:5 = r;  filtN_nc[5] = 2
-  # $filt_nc:6 = i;  filtN_nc[6] = 3
-  # $filt_nc:7 = i;  filtN_nc[7] = 3
-  # $filt_nc:8 = i;  filtN_nc[8] = 3
+  $filt_nc:3 = g;  filtN_nc[3] = 1
+  $filt_nc:4 = g;  filtN_nc[4] = 1
+  $filt_nc:5 = g;  filtN_nc[5] = 1
+  $filt_nc:6 = g;  filtN_nc[6] = 1
+  $filt_nc:7 = g;  filtN_nc[7] = 1
+  $filt_nc:8 = g;  filtN_nc[8] = 1
 
   # airmass slopes for these sequnece
@@ -126 +128 @@
   mjd_nc[1] = 55000.12
   mjd_nc[2] = 55000.13
-  # mjd_nc[3] = 55015.11
-  # mjd_nc[4] = 55015.12
-  # mjd_nc[5] = 55015.13
-  # mjd_nc[6] = 55025.11
-  # mjd_nc[7] = 55025.12
-  # mjd_nc[8] = 55025.13
+  mjd_nc[3] = 55015.11
+  mjd_nc[4] = 55015.12
+  mjd_nc[5] = 55015.13
+  mjd_nc[6] = 55025.11
+  mjd_nc[7] = 55025.12
+  mjd_nc[8] = 55025.13
 end
 
@@ -152 +154 @@
   init
   mkzptfile
-  mkstars 500
+  mkstars 10000
 
   tapPLAN {(((mjd_uc[] + mjd_nc[])*4 + (mjd_uc[] + mjd_nc[])) + (mjd_uc[] + mjd_nc[]))}
 
   # generate the basic images and check they were correctly ingested by dvo
-  mksequence $fileroot $catdir
+  mksequence.drift $fileroot $catdir
   for i 0 mjd_uc[]
     ckexposure $catdir mjd_uc[$i] zpt_uc[$i] exptime_uc[$i] airmass_uc[$i] $filt_uc:$i raw
@@ -175 +177 @@
 
   # run relphot on the serial db and check that the images now match the expected values
-  if ($VERBOSE) echo relphot g,r,i -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 -keep-ubercal -D IMAGE_OFFSET 0.5 -update >& log.relphot.s0
-  exec relphot g,r,i -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 -keep-ubercal -D IMAGE_OFFSET 0.5 -update >& log.relphot.s0
+  # if ($VERBOSE) echo relphot g,r,i -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 -keep-ubercal -D IMAGE_OFFSET 0.5 -update >& log.relphot.s0
+  if ($VERBOSE) echo relphot g -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 -keep-ubercal -D IMAGE_OFFSET 0.5 -update -reset -D STAR_SCATTER 0.05>& log.relphot.s0
+  exec relphot g -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 -keep-ubercal -D IMAGE_OFFSET 0.5 -update -reset -D STAR_SCATTER 0.05>& log.relphot.s0
   for i 0 mjd_uc[]
     ckexposure $catdir mjd_uc[$i] zpt_uc[$i] exptime_uc[$i] airmass_uc[$i] $filt_uc:$i relphot
@@ -315 +318 @@
 end
 
-macro mksequence
+macro mksequence.drift
+  if ($0 != 3)
+    echo "mksequence.drift (fileroot) (catdir)"
+    break
+  end
+
+  echo "starting mksequence..."
+  local i T1 T2
+
+  ctimes -abs now -var T1
+  # we have a second set of mjd and zero point values for non-ubercal'ed images
+  echo -no-return "making mjd_uc[] UC images: "
+  for i 0 mjd_uc[]
+    echo -no-return "$i.. "
+    mkexposure $1.uc.$i $RA_CENTER {$DEC_CENTER + $i*$CHIP_DY*$PLATE_SCALE*$NCHIP_Y*$OFFSET_FRAC_UC/3600.0} zpt_uc[$i] exptime_uc[$i] airmass_uc[$i] mjd_uc[$i] $filt_uc:$i $2
+  end
+  echo ""
+  echo -no-return "making mjd_nc[] NC images: "
+  for i 0 mjd_nc[]
+    echo -no-return "$i.. "
+    mkexposure $1.nc.$i $RA_CENTER {$DEC_CENTER + $i*$CHIP_DY*$PLATE_SCALE*$NCHIP_Y*$OFFSET_FRAC_NC/3600.0} zpt_nc[$i] exptime_nc[$i] airmass_nc[$i] mjd_nc[$i] $filt_nc:$i $2
+  end
+  ctimes -abs now -var T2
+  echo "done ({86400*($T2 - $T1)} sec)"
+end
+
+macro mksequence.1pt
   if ($0 != 3)
     echo "mksequence (fileroot) (catdir)"
@@ -495 +524 @@
   # size of region of interest in linear arcseconds
   $RA_RANGE  = 1.25 * $CHIP_DX * $NCHIP_X * $PLATE_SCALE
-  $DEC_RANGE = 1.25 * $CHIP_DY * $NCHIP_Y * $PLATE_SCALE 
+  $DEC_RANGE = 1.25 * $CHIP_DY * $NCHIP_Y * $PLATE_SCALE * (1 + tmpseq[]*$OFFSET_FRAC_NC)
 
   create tmp 0 $1