Changeset 41719 for trunk/tools

Timestamp:

Jul 14, 2021, 10:00:13 AM (5 years ago)

Author:

eugene

Message:

fix minor bugs, update output names for consistency

Location:

trunk/tools/eam/teleff

Files:

• cammask.pro (modified) (5 diffs)
• diffmask.pro (modified) (8 diffs)
• run.teleff.pro (added)
• teleff.pro (modified) (3 diffs)
• truth.pro (modified) (2 diffs)
• warpmask.pro (modified) (3 diffs)

trunk/tools/eam/teleff/cammask.pro

@@ -2 +2 @@
 
 $VERBOSE    = 1        
-$COPYMASKS  = 1
+$COPYMASKS  = 0
 $OUTDIR     = .
 $OUTVERSION = XXX
@@ -65 +65 @@
  end
 
+  # delete any existing output vectors
+  foreach field $SMF_FIELDS_CAM $REF_FIELDS_CAM $XTR_FIELDS_CAM
+    delete -q $field\_out
+  end
+
  # find matching entries in smf file 
  for i 0 $chipName:n
@@ -70 +75 @@
    get.chip.mask.stats $camMask:$i
 
-   foreach field SMF_FIELDS_CAM
+   foreach field $SMF_FIELDS_CAM
      concat $field\_found $field\_out
      delete $field\_found
    end
-   foreach field REF_FIELDS_CAM $XTR_FIELDS_CAM
+   foreach field $REF_FIELDS_CAM $XTR_FIELDS_CAM
      concat $field\_onchp $field\_out
      delete $field\_onchp
@@ -81 +86 @@
 
  $OUT_FIELDS = 
- foreach field $SMP_FIELDS_CAM $REF_FIELDS_CAM $XTR_FIELDS_CAM
+ foreach field $SMF_FIELDS_CAM $REF_FIELDS_CAM $XTR_FIELDS_CAM
    $OUT_FIELDS = $OUT_FIELDS $field\_out
  end
@@ -309 +314 @@
 
 
-####
+#### this test macro generates the match table without measuring the mask fraction
+#### XXX the output formats are not consistent with the above version
 
 macro get.camera.matches

trunk/tools/eam/teleff/diffmask.pro

@@ -2 +2 @@
 
 $VERBOSE    = 1        
-$COPYMASKS  = 1
+$COPYMASKS  = 0
 $OUTDIR     = .
-$OUTVERSION = XXX
+if (not($?OUTVERSION))
+  $OUTVERSION = XXX
+end
 
 $DIFF_MODE_WW = 1
@@ -52 +54 @@
   if ($VERBOSE) echo "loaded Rref[] sources from reference $refsrcs"
 
+  # delete any existing output vectors
+  foreach field $SMF_FIELDS_DIF $REF_FIELDS_DIF $XTR_FIELDS_DIF
+    delete -q $field\_out
+  end
+
   # find matching entries in cmf files and measure mask fraction
   for i 0 $diffMask:n
@@ -67 +74 @@
     end
 
-   foreach field SMF_FIELDS_DIF
+   foreach field $SMF_FIELDS_DIF
      concat $field\_found $field\_out
      delete $field\_found
    end
-   foreach field REF_FIELDS_DIF $XTR_FIELDS_DIF
+   foreach field $REF_FIELDS_DIF $XTR_FIELDS_DIF
      concat $field\_onchp $field\_out
      delete $field\_onchp
@@ -78 +85 @@
 
   $OUT_FIELDS = 
-  foreach field $SMP_FIELDS_DIF $REF_FIELDS_DIF $XTR_FIELDS_DIF
+  foreach field $SMF_FIELDS_DIF $REF_FIELDS_DIF $XTR_FIELDS_DIF
     $OUT_FIELDS = $OUT_FIELDS $field\_out
   end
 
-  sprintf output "%s/%s.%s.diff.stf" $OUTDIR $expname $OUTVERSION
+  sprintf output "%s/%s.%s.dif.stf" $OUTDIR $expname $OUTVERSION
   write -fits DATA $output $OUT_FIELDS
 end
@@ -128 +135 @@
 
   # generate a subset of sources which are within the boundaries of the skycell
-  set keep = (XrefS >= 0) && (XrefS <= $NAXIS1) && (YrefS >= 0) && (YrefS <= $NAXIS2)
+  set keep = (Xref_tmp >= 0) && (Xref_tmp <= $NAXIS1) && (Yref_tmp >= 0) && (Yref_tmp <= $NAXIS2)
   foreach field $REF_FIELDS_DIF Nref Xref Yref
     subset $field\_onchp = $field\_tmp if keep
@@ -201 +208 @@
  for i 0 $diffPath:n
    sprintf filename "%s.mask.fits" $diffPath:$i
+   break -auto off   
    $diffMask:$i = `neb-locate -p $filename`
-   if ($COPYMASKS) exec neb-copy $filename $OUTDIR
+   break -auto on
+   if ("$diffMask:$i" == "")
+     echo "skipping $filename"
+   else 
+     if ($COPYMASKS) exec neb-copy $filename $OUTDIR
+   end
 
    sprintf filename "%s.cmf" $diffPath:$i
@@ -274 +287 @@
  
  if ($npages < 1) 
-  echo "ERROR: missing exposure : $command"
+  # try the template versoin
   book delete mybook
-  next
+ 
+  $command = difftool -dbname $dbname -listrun -exp_name $expname -warp_id $warpID -diff_mode $diffMode -template
+  
+  queueload  myqueue -x "$command"
+  queue2book myqueue mybook
+  
+  book npages mybook -var npages
+  
+  if ($npages < 1) 
+   echo "ERROR: missing exposure : $command"
+   book delete mybook
+   return
+  end
  end
  
@@ -282 +307 @@
   echo "ERROR: too many exposures : $command"
   book delete mybook
-  next
+  return
  end
  

trunk/tools/eam/teleff/teleff.pro

@@ -33 +33 @@
   get.diff.eff       gpc1 $expname $warpID           $REFSOURCE
 
-  break
+  return
 
   $KAPA = kapa -noX
@@ -66 +66 @@
   # this sample has ~1900 known asteroids covering 375 sq deg. we should expect ~ 35 asteroids per exposure
 
+  # mpcorb_predict trange mpc/mpcorb_extended.59396.dat 59375.2 59375.8 190 250 -10 20 trange.59375.fits
+  # this area covers exposures o9375g0060o - o9375g0341o (visit 1) and later visits
+
   # use a larger match radius for the asteroids
   $MATCH_RADIUS = 3.0
@@ -76 +79 @@
   get.diff.eff       gpc1 $expname $warpID           $REFSOURCE
 
-  break
+  return
 
   $KAPA = kapa -noX

trunk/tools/eam/teleff/truth.pro

@@ -76 +76 @@
 
  # the DVO truth file is specific to the exposure
- sprintf REFSOURCE "%s/%s.dvo.fits" $OUTDIR $expname 
+ sprintf REFSOURCE "%s/%s.DVO.fits" $OUTDIR $expname 
  write -fits DATA $REFSOURCE Rref Dref Mref
 end
@@ -120 +120 @@
  
  # mpcorb_predict generates a FITS table specific to the exposure with fields (Rref, Dref, Mref)
- sprintf REFSOURCE "%s/%s.mpc.fits" $OUTDIR $expname 
+ sprintf REFSOURCE "%s/%s.MPC.fits" $OUTDIR $expname 
  echo mpcorb_predict moment $mpcfile $MJD $Rmin $Rmax $Dmin $Dmax $REFSOURCE
  exec mpcorb_predict moment $mpcfile $MJD $Rmin $Rmax $Dmin $Dmax $REFSOURCE

trunk/tools/eam/teleff/warpmask.pro

@@ -2 +2 @@
 
 $VERBOSE    = 1        
-$COPYMASKS  = 1
+$COPYMASKS  = 0
 $OUTDIR     = .
 $OUTVERSION = XXX
@@ -46 +46 @@
   if ($VERBOSE) echo "loaded Rref[] sources from reference $refsrcs"
 
+  # delete any existing output vectors
+  foreach field $REF_FIELDS_WRP $XTR_FIELDS_WRP
+    delete -q $field\_out
+  end
+
   # find matching entries in smf file 
   for i 0 $warpMask:n
     get.warp.mask.stats $warpMask:$i
 
-    foreach field REF_FIELDS_WRP $XTR_FIELDS_WRP
+    foreach field $REF_FIELDS_WRP $XTR_FIELDS_WRP
       concat $field\_onchp $field\_out
       delete $field\_onchp
@@ -61 +66 @@
   end
 
-  sprintf output "%s/%s.%s.%s.warp.stf" $OUTDIR $expname $skycell:$i $OUTVERSION
+  sprintf output "%s/%s.%s.wrp.stf" $OUTDIR $expname $OUTVERSION
   write -fits DATA $output $OUT_FIELDS
 end