Changeset 29330

Timestamp:

Oct 5, 2010, 3:35:07 PM (16 years ago)

Author:

bills

Message:

various postage stamp server fixes

Location:

trunk/pstamp/scripts

Files:

• Makefile.am (modified) (1 diff)
• pstamp_finish.pl (modified) (2 diffs)
• pstamp_webrequest.pl (modified) (1 diff)
• pstampparse.pl (modified) (2 diffs)
• pstampstopfaulted (added)

trunk/pstamp/scripts/Makefile.am

@@ -20 +20 @@
         pstamp_get_image_job.pl \
         psmkreq \
+        pstampstopfaulted \
         pstamp_checkdependent.pl \
         request_finish.pl \

trunk/pstamp/scripts/pstamp_finish.pl

@@ -191 +191 @@
             my $filter = $job_params->{filter};
             $filter = "0" if !$filter;
-            $exp_info = "0|0|0|$filter|0|0";
+            my $mjd_obs = $job_params->{mjd_obs};
+            $mjd_obs = "0" if !$mjd_obs;
+            $exp_info = "$mjd_obs|0|0|$filter|0|0";
         }
 
@@ -477 +479 @@
     my $ticks = timegm($sec, $min, $hr, $day, $mon-1, $year-1900);
 
+    # dateobs is UTC convert to TAI
+    # XXX: Do this properly
+    if ($year >= 2009) {
+        $ticks += 34;
+    } else {
+        $ticks += 33;
+    }
+
     return 40587.0 + ($ticks/86400.);
 }

trunk/pstamp/scripts/pstamp_webrequest.pl

@@ -33 +33 @@
     'dbname=s'      =>  \$dbname,
     'dbserver=s'    =>  \$dbserver,
-    'project=s'     => \$project,
+#    'project=s'     => \$project,
     'verbose'       => \$verbose,
 );

trunk/pstamp/scripts/pstampparse.pl

@@ -806 +806 @@
     my ($r_jobState, $r_fault, $r_dep_id, $imagedb, $state, $stage, $stage_id, $component, $need_magic) = @_;
 
-    # XXX: The update process for warp and subsequent stages requires # destreaking to be performed
-    # because the -pending queries require the inputs to have magicked >= 0
-    # The case of stack-stack diffs not needing to be destreaked is taken care of in pstamp_checkdependent
-    $need_magic = 1 if $imagedb eq 'gpc1';
+    if (($stage ne 'chip') and ($stage ne 'raw')) {
+        # XXX: The update process for warp and subsequent stages requires that destreaking to be performed
+        # because the -pending queries require the inputs to have magicked >= 0
+        # This is too conservative. For example stage is warp and the warp has never been destreaked we don't
+        # need magic either
+        # The case of stack-stack diffs not needing to be destreaked is taken care of in pstamp_checkdependent
+        # maybe we should put all of the smarts there and interpret the need_magic flag in the dependent as
+        # "The client needs to have magic performed" and let
+        # XXX: note the very nasty hard coding of gpc1
+        $need_magic = 1 if $imagedb eq 'gpc1';
+    }
 
     # chipRun's can be in full state if destreaking is necessary
@@ -900 +907 @@
                     $$r_newState = 'stop';
                     $$r_fault = $PSTAMP_NOT_AVAILABLE;
-                } elsif (!$image->{magicked}) {
+                } elsif ($need_magic and !$image->{magicked}) {
                     $$r_newState = 'stop';
                     $$r_fault = $PSTAMP_NOT_DESTREAKED;