Changeset 36912 for branches/eam_branches/ipp-20140610/Ohana/src/addstar/test/simple.dvo

Timestamp:

Jun 19, 2014, 2:41:50 PM (12 years ago)

Author:

eugene

Message:

fix bugs to make addstar work with new PS1_V5 format & dvo tests to verify; fix PS1_V5 I/O functions for table column order error (RA_PSF,DEC_PSF not on 8-byte block in FITS table)

File:

• branches/eam_branches/ipp-20140610/Ohana/src/addstar/test/simple.dvo (modified) (6 diffs)

branches/eam_branches/ipp-20140610/Ohana/src/addstar/test/simple.dvo

@@ -34 +34 @@
 end  
 
+if (not($?NO_NOISE)) 
+  $NO_NOISE = ""
+end
+
 # create a populated catdir with a single cmf -- test each field
 macro test.fields
@@ -50 +54 @@
 
   mkinput
-  echo mkcmf test.in.txt test.cmf -date 2008/1/1 -time 01:00:00 -radec $RA $DEC -type $1
-  exec mkcmf test.in.txt test.cmf -date 2008/1/1 -time 01:00:00 -radec $RA $DEC -type $1
+  echo mkcmf test.in.txt test.cmf -date 2008/1/1 -time 01:00:00 -radec $RA $DEC -type $1 $NO_NOISE
+  exec mkcmf test.in.txt test.cmf -date 2008/1/1 -time 01:00:00 -radec $RA $DEC -type $1 $NO_NOISE
   if ($TAP_VERBOSE)
     echo exec addstar -D CATDIR catdir.test -D CAMERA simtest test.cmf -D CATFORMAT $2 -quick-airmass
     exec addstar -D CATDIR catdir.test -D CAMERA simtest test.cmf -D CATFORMAT $2 -quick-airmass
   else
+    echo addstar -D CATDIR catdir.test -D CAMERA simtest test.cmf -D CATFORMAT $2 -quick-airmass
     exec addstar -D CATDIR catdir.test -D CAMERA simtest test.cmf -D CATFORMAT $2 -quick-airmass >& tmp.log
   end
@@ -113 +118 @@
 
     # some fields require arithmetic manipulations
-    if ("$name:0" == "KRON_FLUX") 
-     set v1 = -2.5*log(v1)
-    end
-    if ("$name:0" == "KRON_FLUX_ERR") 
-     set v1 = KRON_FLUX_ERR / KRON_FLUX
+    ## if ("$name:0" == "KRON_FLUX") 
+    ##  set v1 = -2.5*log(v1)
+    ## end
+    ## if ("$name:0" == "KRON_FLUX_ERR") 
+    ##  set v1 = KRON_FLUX_ERR / KRON_FLUX
+    ## end
+    if (("$name:0" == "X_PSF_SIG") || ("$name:0" == "Y_PSF_SIG"))
+     set v1 = int(100*(v1))
+     set v2 = int(100*(v2 + 0.0001))
+    end
+    if ("$name:0" == "POSANGLE")
+     set v1 = int((0xffff/360.0)*(v1))
+     set v2 = int((0xffff/360.0)*(v2 + 0.0028))
     end
 
@@ -335 +348 @@
   Y_PSF_SIG         : yccd:err
   POSANGLE          : posangle
-  PLTSCALE          : pltscale
+  PLTSCALE          : platescale
   PSF_INST_MAG      : mag:inst  
   PSF_INST_MAG_SIG  : mag:err   
@@ -345 +358 @@
   AP_FLUX           : flux:aper:inst  
   AP_FLUX_SIG       : flux:aper:inst:err
-  CAL_PSF_MAG       : mag:rel
-  CAL_PSF_MAG_SIG   : mag:rel:err
+  CAL_PSF_MAG       : mag:cal
+  CAL_PSF_MAG_SIG   : mag:cal:err
   RA_PSF            : ra
   DEC_PSF           : dec
@@ -386 +399 @@
   N_FRAMES          : SKIP # not ingested into DVO                    
 end                                                                   
-
-  
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-