Changeset 37068 for branches/eam_branches/ipp-ops-20130712/ippTasks

Timestamp:

Jul 17, 2014, 12:36:19 PM (12 years ago)

Author:

eugene

Message:

merge changes (from past YEAR) from trunk

Location:

branches/eam_branches/ipp-ops-20130712

Files:

• . (modified) (1 prop)
• ippTasks (modified) (1 prop)
• ippTasks/Makefile.am (modified) (1 diff)
• ippTasks/dist.pro (modified) (1 diff)
• ippTasks/fullforce.pro (copied) (copied from trunk/ippTasks/fullforce.pro )
• ippTasks/minidvodb.pro (modified) (1 diff)
• ippTasks/pstamp.pro (modified) (1 diff, 1 prop)
• ippTasks/rawcheck.pro (modified) (1 prop)
• ippTasks/register.pro (modified) (1 prop)
• ippTasks/remote.pro (copied) (copied from trunk/ippTasks/remote.pro )
• ippTasks/staticsky.pro (modified) (2 diffs)
• ippTasks/survey.pro (modified) (1 prop)

branches/eam_branches/ipp-ops-20130712/ippTasks/Makefile.am

@@ -48 +48 @@
         lapgroup.pro \
         vp.pro \
-        bg.regeneration.pro
+        bg.regeneration.pro \
+        remote.pro \
+        fullforce.pro
 
 other_files = \

branches/eam_branches/ipp-ops-20130712/ippTasks/dist.pro

@@ -31 +31 @@
 list DIST_STAGE -add "warp_bg"
 list DIST_STAGE -add "sky"
+list DIST_STAGE -add "skycal"
+list DIST_STAGE -add "ff"
 
 $currentStage = 0

branches/eam_branches/ipp-ops-20130712/ippTasks/minidvodb.pro

@@ -449 +449 @@
     stderr $LOGDIR/minidvodb.premerge.run.log
 
-    $run = minidvodb_premerge.pl --camera $CAMERA --minidvodb $MINIDVODB_PATH --minidvodb_group $MINIDVODB_GROUP --minidvodb_id $MINIDVODB_ID
+    #still buggy
+
+    $run = minidvodb_premerge.pl --camera GPC1 --minidvodb $MINIDVODB_PATH --minidvodb_group $MINIDVODB_GROUP --minidvodb_id $MINIDVODB_ID
     
   if ($DB:n == 0)

branches/eam_branches/ipp-ops-20130712/ippTasks/pstamp.pro

@@ -175 +175 @@
 macro pstamp.find.off
     task pstamp.request.find
+        active false
+    end
+end
+macro pstamp.parse.on
+    task pstamp.request.load
+        active true
+    end
+    task pstamp.request.run
+        active true
+    end
+end
+macro pstamp.parse.off
+    task pstamp.request.load
+        active false
+    end
+    task pstamp.request.run
+        active false
+    end
+end
+macro pstamp.job.on
+    task pstamp.job.load
+        active true
+    end
+    task pstamp.job.run
+        active true
+    end
+end
+macro pstamp.job.off
+    task pstamp.job.load
+        active false
+    end
+    task pstamp.job.run
+        active false
+    end
+end
+macro pstamp.finish.on
+    task pstamp.finish.load
+        active true
+    end
+    task pstamp.finish.run
+        active true
+    end
+end
+macro pstamp.finish.off
+    task pstamp.finish.load
+        active false
+    end
+    task pstamp.finish.run
         active false
     end

branches/eam_branches/ipp-ops-20130712/ippTasks/staticsky.pro

@@ -64 +64 @@
 end
 
+$RA_POLL_MAX = 0
+
+macro set.ra.max
+    if ($0 != 2) 
+        echo "USAGE: set.ra.max (ra_max_deg)"
+        break
+    end
+    $RA_POLL_MAX = $1
+end
+macro get.ra.max
+    echo $RA_POLL_MAX
+end
+
 ### Load tasks for staticsky
 ### Tasks are loaded into staticskyResult.
@@ -80 +93 @@
     if ($LABEL:n == 0) break
     $run = staticskytool -todo
+    if ($RA_POLL_MAX > 0) 
+        $run = $run -ra_max $RA_POLL_MAX
+    end
     if ($DB:n == 0)
       option DEFAULT