Changeset 33653 for trunk/Ohana/src/addstar/test

Timestamp:

Apr 1, 2012, 3:03:26 PM (14 years ago)

Author:

eugene

Message:

add tests for PS1_V3; add tests for flat-field correction & ubercal; add tests for parallel dvo; fix up WISE ingest; fix up superCOSMOS ingest; improvements to mkcmf for more detailed testing

Location:

trunk/Ohana/src/addstar/test

Files:

• relphot.flatcorr.dvo (copied) (copied from branches/eam_branches/ipp-20111122/Ohana/src/addstar/test/relphot.flatcorr.dvo )
• relphot.parallel.dvo (copied) (copied from branches/eam_branches/ipp-20111122/Ohana/src/addstar/test/relphot.parallel.dvo )
• relphot.reject.dvo (copied) (copied from branches/eam_branches/ipp-20111122/Ohana/src/addstar/test/relphot.reject.dvo )
• relphot.setphot.parallel.dvo (copied) (copied from branches/eam_branches/ipp-20111122/Ohana/src/addstar/test/relphot.setphot.parallel.dvo )
• relphot.variable.dvo (copied) (copied from branches/eam_branches/ipp-20111122/Ohana/src/addstar/test/relphot.variable.dvo )
• run.relastro.sh (copied) (copied from branches/eam_branches/ipp-20111122/Ohana/src/addstar/test/run.relastro.sh )
• simple.dvo (modified) (4 diffs)
• tap.dvo (modified) (3 diffs)

trunk/Ohana/src/addstar/test/simple.dvo

@@ -8 +8 @@
   test.fields PS1_V1    PS1_V1
   test.fields PS1_V2    PS1_V1
+  test.fields PS1_V3    PS1_V1
 
   test.fields PS1_DEV_0 PS1_V2
@@ -13 +14 @@
   test.fields PS1_V1    PS1_V2
   test.fields PS1_V2    PS1_V2
+  test.fields PS1_V3    PS1_V2
+
+  test.fields PS1_DEV_0 PS1_V3
+  test.fields PS1_DEV_1 PS1_V3
+  test.fields PS1_V1    PS1_V3
+  test.fields PS1_V2    PS1_V3
+  test.fields PS1_V3    PS1_V3
 end  
 
@@ -31 +39 @@
   mkinput
   exec mkcmf test.in.txt test.cmf -date 2008/1/1 -time 01:00:00 -radec $RA $DEC -type $1
-  exec addstar -D CATDIR catdir.test -D CAMERA simtest test.cmf -D CATFORMAT $2
+  exec addstar -D CATDIR catdir.test -D CAMERA simtest test.cmf -D CATFORMAT $2 -quick-airmass
 
   list testfields -copy testfields_$1
@@ -220 +228 @@
   N_FRAMES          : SKIP # no accessor        
 end
+
+# this list is good for PS1_V3
+list testfields_PS1_V3
+  IPP_IDET          : detid     
+  X_PSF             : xccd      
+  Y_PSF             : yccd      
+  X_PSF_SIG         : xccd:err # FAIL
+  Y_PSF_SIG         : yccd:err # FAIL
+  RA_PSF            : SKIP # astrometry is not calibrated in the cmf
+  DEC_PSF           : SKIP # astrometry is not calibrated in the cmf
+  POSANGLE          : SKIP # astrometry is not calibrated in the cmf
+  PLTSCALE          : SKIP # astrometry is not calibrated in the cmf
+  PSF_INST_MAG      : mag:inst  
+  PSF_INST_MAG_SIG  : mag:err   
+  AP_MAG_STANDARD   : mag:ap # FAIL
+  AP_MAG_RADIUS     : SKIP # no accessor
+  PEAK_FLUX_AS_MAG  : SKIP # no accessor
+  CAL_PSF_MAG       : SKIP # photometry is not calibrated in the cmf
+  CAL_PSF_MAG_SIG   : SKIP # photometry is not calibrated in the cmf
+  SKY               : sky       
+  SKY_SIG           : sky_err   
+  PSF_CHISQ         : psf_chisq 
+  CR_NSIGMA         : cr_nsigma 
+  EXT_NSIGMA        : ext_nsigma
+  PSF_MAJOR         : FWHM_MAJ  
+  PSF_MINOR         : FWHM_MIN  
+  PSF_THETA         : THETA # FAIL
+  PSF_QF            : PSF_QF    
+  PSF_NDOF          : SKIP # no accessor
+  PSF_NPIX          : SKIP # no accessor
+  MOMENTS_XX        : SKIP # no accessor
+  MOMENTS_XY        : SKIP # no accessor
+  MOMENTS_YY        : SKIP # no accessor
+  FLAGS             : phot_flags
+  N_FRAMES          : SKIP # no accessor        
+end

trunk/Ohana/src/addstar/test/tap.dvo

@@ -1 +1 @@
 # -*-sh-*-
+
+if (not($?TAP_BREAK)) set TAP_BREAK = 0
 
 macro tapOK
@@ -29 +31 @@
   $TAP_NTEST = $1
   $TAP_NFAIL = 0
+  $TAP_NSKIP = 0
   $TAP_NDONE = 0
   if (not($?TAP_BREAK)) set TAP_BREAK = 0
+end
+
+macro tapSKIP
+  if ($0 != 2) 
+    echo "USAGE: tapSKIP (nskip)"
+    break
+  end
+
+  $TAP_NSKIP ++
+  $TAP_NDONE ++
 end
 
@@ -47 +60 @@
   end
 
-  if ($TAP_NFAIL == 0) 
+  if ($TAP_NSKIP) 
+    echo "skipped $TAP_NSKIP of $TAP_NDONE"
+  end
+
+  if ($TAP_NFAIL + $TAP_NSKIP == 0) 
     echo "passed $TAP_NDONE tests"
   end