Changeset 41900

Timestamp:

Nov 4, 2021, 6:15:09 PM (5 years ago)

Author:

eugene

Message:

merge changes from eam_branches/ipp-dev-20210817

Location:

trunk

Files:

• . (modified) (1 prop)
• psconfig (modified) (1 prop)
• psconfig/tagsets/ipp-3.1.perl (modified) (1 diff)
• tools (modified) (1 prop)
• tools/eam/teleff/cammask.pro (modified) (1 diff)
• tools/eam/teleff/teleff.pro (modified) (3 diffs)

trunk/psconfig/tagsets/ipp-3.1.perl

@@ -68 +68 @@
   55    IPC::Run                       IPC-Run-0.80.tar.gz                      0              NONE      NONE
   56    Cache                          Cache-2.04.tar.gz                        0              NONE      NONE
-  57    IPC::Cmd                       IPC-Cmd-0.36.tar.gz                      0.36           NONE      NONE
+  57    IPC::Cmd                       IPC-Cmd-0.36.tar.gz                     =0.36           NONE      NONE
   58    SOAP::Lite                     SOAP-Lite-0.69.v1.tar.gz                 0              NONE      yes,yes,no
   59    Log::Log4perl                  Log-Log4perl-1.10.v1.tar.gz              0              NONE      NONE

trunk/tools/eam/teleff/cammask.pro

@@ -294 +294 @@
  $camlabel = $3
 
-#$command = camtool -dbname $dbname -processedexp -exp_name $expname -label $camlabel
-#XXX need to generically handle the question of which version / label
- $command = camtool -dbname $dbname -processedexp -exp_name $expname
+# need to generically handle the question of which version / label
+# this will be a problem for old exposures without a useful label (cleanup)
+# instead of label, we could specify the cam_id (which we might know)
+
+ $command = camtool -dbname $dbname -processedexp -exp_name $expname -label $camlabel
+#$command = camtool -dbname $dbname -processedexp -exp_name $expname
  
  queueload  myqueue -x "$command"

trunk/tools/eam/teleff/teleff.pro

@@ -17 +17 @@
 input warpstats.sh
 
+## XXX I need to enable only parts of this analysis
+## for now, just comment out the warp & diff stages
+
 macro example.full.dvo
-  if ($0 != 2)
-    echo "USAGE: example.full.dvo (expname)"
+  if ($0 != 3)
+    echo "USAGE: example.full.dvo (expname) (label)"
     break
   end
 
-  local expname
+  local expname camlabel
   $expname = $1
+  $camlabel = $2
  
   $OUTVERSION = DVO
 
   make.truth.sources gpc1 $expname $PV3_CATDIR DVO
-  get.camera.eff     gpc1 $expname EU.nightlyscience $REFSOURCE
-  get.warp.eff       gpc1 $expname $camID            $REFSOURCE
-  get.diff.eff       gpc1 $expname $warpID           $REFSOURCE
-
-  return
+  get.camera.eff     gpc1 $expname $camlabel       $REFSOURCE
+# get.warp.eff       gpc1 $expname $camID          $REFSOURCE
+# get.diff.eff       gpc1 $expname $warpID         $REFSOURCE
 
   $KAPA = kapa -noX
-  camstats.glob $expname.stats/$expname.*.DVO.cam.stf
-  png -name  $expname.stats/$expname.dvo.camhist.png
+  antialias 0.5
+
+  load.camstats  $expname.stats/$expname.DVO.cam.stf
+  plot.camstats.fracs; png -name $expname.stats/$expname.dvo.fracs.png
+  plot.camstats.resid; png -name $expname.stats/$expname.dvo.resid.png
   
-  warpstats.glob $expname.stats/$expname.*.DVO.warp.stf
-  png -name  $expname.stats/$expname.dvo.warphist.png
-
-  camstats.glob $expname.stats/$expname.*.DVO.diff.stf
-  png -name  $expname.stats/$expname.dvo.diffhist.png
+# load.warpstats $expname.stats/$expname.DVO.wrp.stf
+# png -name  $expname.stats/$expname.dvo.warphist.png
+#
+# load.camstats  $expname.stats/$expname.DVO.dif.stf
+# png -name  $expname.stats/$expname.dvo.diffhist.png
 end
 
 macro example.full.mpc
-  if ($0 != 3)
-    echo "USAGE: example.full.mpc (expname) (mpcfile)"
+  if ($0 != 4)
+    echo "USAGE: example.full.mpc (expname) (label) (mpcfile)"
     break
   end
 
-  local expname mpcfile
+  local expname camlabel mpcfile
   $expname = $1
-  $mpcfile = $2
+  $camlabel = $2
+  $mpcfile = $3
  
   # download the most current MPCORB.DAT file with:
@@ -75 +81 @@
   $COPYMASKS = 0
 
-  make.truth.sources gpc1 $expname $mpcfile MPC; # sets the value of REFSOURCE 
-  get.camera.eff     gpc1 $expname EU.nightlyscience $REFSOURCE
-  # get.warp.eff     gpc1 $expname $camID            $REFSOURCE
-  # get.diff.eff     gpc1 $expname $warpID           $REFSOURCE
+  make.truth.sources gpc1 $expname $mpcfile  MPC; # sets the value of REFSOURCE 
+  get.camera.eff     gpc1 $expname $camlabel $REFSOURCE
+  # get.warp.eff     gpc1 $expname $camID    $REFSOURCE
+  # get.diff.eff     gpc1 $expname $warpID   $REFSOURCE
   # load data from cam stage output:
   $USE_CAMSOURCE = 1
-  get.warp.eff       gpc1 $expname $camID            $CAMSOURCE
-  get.diff.eff       gpc1 $expname $warpID           $CAMSOURCE
+  get.warp.eff       gpc1 $expname $camID    $CAMSOURCE
+  get.diff.eff       gpc1 $expname $warpID   $CAMSOURCE
 
   return
@@ -111 +117 @@
 
 if ($SCRIPT)
-  if ($argv:n < 2)
-    echo "USAGE: teleff.pro (mode) (expname) [mpcfile]"
+  if ($argv:n < 3)
+    echo "USAGE: teleff.pro (mode) (expname) (label) [mpcfile]"
     break
   end
 
   if ("$argv:0" == "mpc")
-    if ($argv:n != 3)
-      echo "USAGE: teleff.pro mpc (expname) (mpcfile)"
+    if ($argv:n != 4)
+      echo "USAGE: teleff.pro mpc (expname) (label) (mpcfile)"
       break
     end
 
-    example.full.mpc $argv:1 $argv:2
+    example.full.mpc $argv:1 $argv:2 $argv:3
     exit 0
   end
 
   if ("$argv:0" == "dvo")
-    if ($argv:n != 2)
-      echo "USAGE: teleff.pro dvo (expname)"
+    if ($argv:n != 3)
+      echo "USAGE: teleff.pro dvo (expname) (label)"
       break
     end
 
-    example.full.dvo $argv:1
+    example.full.dvo $argv:1 $argv:2
     exit 0
   end
 
-  echo "USAGE: teleff.pro (mode) (expname) [mpcfile]"
+  echo "USAGE: teleff.pro (mode) (expname) (label) [mpcfile]"
   echo "  mode may be 'dvo' or 'mpc'"
   exit 2