Changeset 40762

Timestamp:

May 30, 2019, 8:43:43 AM (7 years ago)

Author:

eugene

Message:

merge changes from trunk (night_report tweaks)

Location:

tags/ipp-ps2-20190404

Files:

• . (modified) (1 prop)
• ippScripts/scripts/night_report.pl (modified) (6 diffs)
• tools/fixburntool (modified) (1 diff)

tags/ipp-ps2-20190404/ippScripts/scripts/night_report.pl

@@ -768 +768 @@
 # count the number of chunks, and their status:
 if ($verbose or $chunks) {
-    print "Current status of SS chunks:\n";
+    print "Current status of SS and Euclid chunks:\n";
 
     #This is a long query, but it efficiently gathers all the necessary information
@@ -775 +775 @@
     $query .= "     SELECT dateobs,comment,substr(comment, 1, position(' ' in comment)) AS chunk,count(*) AS Nquad_firstvisit";
     $query .= "     FROM rawExp";
-    $query .= "     WHERE dateobs LIKE '$date%' AND obs_mode LIKE '%SS%'";
-    $query .= "     AND obs_mode LIKE '%SS%' AND obs_mode NOT LIKE 'ENGINEERING'";
+    $query .= "     WHERE dateobs LIKE '$date%'";
+    $query .= "     AND (obs_mode LIKE '%SS%' OR obs_mode LIKE '%BRIGHT%') AND obs_mode NOT LIKE 'ENGINEERING'";
     $query .= "     AND comment LIKE '%visit 1%'";
     $query .= "     GROUP BY chunk";
@@ -785 +785 @@
     $query .= "       (SELECT substr(comment, 1, position(' ' in comment)) AS chunk,count(*) AS Nvisits";
     $query .= "         FROM rawExp";
-    $query .= "         WHERE obs_mode LIKE '%' AND dateobs LIKE '$date%' AND obs_mode like '%SS%'";
+    $query .= "         WHERE dateobs LIKE '$date%' AND (obs_mode LIKE '%SS%' OR obs_mode LIKE '%BRIGHT%')";
     $query .= "         AND obs_mode NOT LIKE 'ENGINEERING' AND comment LIKE '%visit%'";
     $query .= "         GROUP BY object, filter, chunk";
@@ -798 +798 @@
     $query .= "       (SELECT exp_name,comment,dateobs";
     $query .= "         FROM rawExp ";
-    $query .= "         WHERE dateobs LIKE '$date%' AND obs_mode LIKE '%SS%' AND obs_mode NOT LIKE 'ENGINEERING'";
+    $query .= "         WHERE dateobs LIKE '$date%' AND (obs_mode LIKE '%SS%' OR obs_mode LIKE '%BRIGHT%') AND obs_mode NOT LIKE 'ENGINEERING'";
     $query .= "       ) AS expall ";
     $query .= "     LEFT JOIN";
@@ -806 +806 @@
     $query .= "           diffRun JOIN diffInputSkyfile USING (diff_id) JOIN publishRun ON (diff_id = stage_id) JOIN warpRun ON (warp1=warp_id)";
     $query .= "           JOIN fakeRun USING (fake_id) JOIN camRun USING (cam_id) JOIN camProcessedExp USING (cam_id) JOIN chipRun USING (chip_id) JOIN rawExp USING (exp_id)";
-    $query .= "           WHERE rawExp.dateobs LIKE '$date%' AND diffRun.reduction LIKE 'SWEETSPOT'";
+    $query .= "           WHERE rawExp.dateobs LIKE '$date%' AND (obs_mode LIKE '%SS%' OR obs_mode LIKE '%BRIGHT%')";
     $query .= "           AND stack2 IS NULL AND diffRun.diff_id=stage_id";
     $query .= "         )  ";
@@ -813 +813 @@
     $query .= "           diffRun JOIN diffInputSkyfile USING (diff_id) JOIN publishRun ON (diff_id = stage_id) JOIN warpRun ON (warp2=warp_id)";
     $query .= "           JOIN fakeRun USING (fake_id) JOIN camRun USING (cam_id) JOIN camProcessedExp USING (cam_id) JOIN chipRun USING (chip_id) JOIN rawExp USING (exp_id)";
-    $query .= "           WHERE rawExp.dateobs LIKE '$date%' AND diffRun.reduction LIKE 'SWEETSPOT'";
+    $query .= "           WHERE rawExp.dateobs LIKE '$date%' AND (obs_mode LIKE '%SS%' OR obs_mode LIKE '%BRIGHT%')";
     $query .= "           AND stack2 IS NULL AND diffRun.diff_id=stage_id";
     $query .= "         )";

tags/ipp-ps2-20190404/tools/fixburntool

@@ -48 +48 @@
         run(command => $command, verbose => $verbose);
     unless ($success) {
+        print "error_code: $error_code\n";
         $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
         carp("Unable to perform $command: $error_code");