Index: /trunk/ippScripts/scripts/night_report.pl
===================================================================
--- /trunk/ippScripts/scripts/night_report.pl	(revision 41753)
+++ /trunk/ippScripts/scripts/night_report.pl	(revision 41754)
@@ -31,5 +31,5 @@
 
 # database connection information:
-$dbhost = 'scidbm';
+$dbhost = 'ippdb05';
 $dbname = 'gpc1' unless defined $dbname;
 $dbuser = 'ippuser';
@@ -372,68 +372,4 @@
 print "--- IPP Report for $dbname : $date ---\n\n";
 
-
-
-### testing the diff grouping -- this does not work for the Euclid data taken 2018.07.29 because the OBJECT
-### field is missing
-if (0) {
-    print "Expected number of WWdiffs excluding camRuns with bad quality:\n";
-    print "NOTE: multiple exposures with same comment string (xyz visit a) are treated as 1 exposure\n";
-
-    # my $query = "SELECT Nvisit, count(*) FROM";
-    # $query .= " (";
-    my $query = "   SELECT object, filter, chunk, count(*) as Nvisit FROM";
-    $query .= "   (";
-    $query .= "SELECT object, filter, comment, 'S', substr(comment, 1, position(' ' in comment)) as chunk, 'E'";
-    $query .= "     FROM rawExp";
-    $query .= "     LEFT JOIN chipRun using (exp_id)";
-    $query .= "     LEFT JOIN camRun using (chip_id)";
-    $query .= "     LEFT JOIN camProcessedExp using (cam_id)";
-    $query .= "     WHERE dateobs LIKE '$date%'";
-    $query .= "     AND exp_id > $refExpID"; #REF
-    $query .= "     AND exp_type = 'OBJECT'";
-    $query .= "     AND obs_mode NOT LIKE 'ENGINEERING'";
-    $query .= "     AND (obs_mode like '%SS%' or obs_mode like 'BRIGHT')";
-    $query .= "     AND rawExp.comment like '%visit%'";
-    $query .= "     AND (camProcessedExp.quality IS NULL or camProcessedExp.quality = 0)";
-#   $query .= "     GROUP BY comment, filter, substr(comment, 1, position(' ' in comment))";
-    $query .= "   ) AS tableChunks GROUP BY object, filter, chunk";
-#    $query .= " ) AS tableVisits GROUP BY Nvisit";
-
-    my $result = &mysql_select ($query);
-    &mysql_dump_result ($result);
-    die;
-
-    $diffExpect = 0;
-    while (@row = $result->fetchrow_array()) {
-	# printf "%8s %15s : ", $row[0], $row[1]; # c, count(*)
-	if ($row[0] == 1) {
-	    if ($row[1] == 1) { $verb = "tuple has"; } else { $verb = "tuples have"; }
-	    printf "%3d %-11s 1 visit, no WWdiffs\n", $row[1], $verb;
-	} elsif ($row[0] == 2) {
-	    if ($row[1] == 1) { $verb = "tuple has"; } else { $verb = "tuples have"; }
-	    printf "%3d %-11s 2 visits, expect $row[1] WWdiff(s)\n", $row[1], $verb;
-	    $diffExpect += $row[1];
-	} elsif ($row[0] == 3) {
-	    if ($row[1] == 1) { $verb = "tuple has"; } else { $verb = "tuples have"; }
-	    printf "%3d %-11s 3 visits, expect %d WWdiffs (2 per tuple)\n", $row[1], $verb,  2 * $row[1];
-	    $diffExpect += $row[1]*2;
-	} elsif ($row[0] == 4) {
-	    if ($row[1] == 1) { $verb = "tuple has"; } else { $verb = "tuples have"; }
-	    printf "%3d %-11s 4 visits, expect %d WWdiffs (2 per tuple)\n", $row[1], $verb,  2 * $row[1];
-	    $diffExpect += $row[1]*2;
-	} else {
-	    # print "I don't understand, there are more visits than I expect\n";
-	    if ($row[1] == 1) { $verb = "tuple has"; } else { $verb = "tuples have"; }
-	    if ($row[0] % 2) { $Ndiffs = int($row[0] / 2) + 1; } else { $Ndiffs = int($row[0] / 2); }
-	    printf "%3d %-11s %d visits, expect %d WWdiffs (2 per quad)\n", $row[1], $verb,  $row[0], $Ndiffs; 
-	    $diffExpect += $Ndiffs;
-	}
-    }
-    print "\n";
-    print " * $diffExpect diffRuns expected *\n";
-    if ($verbose) { print "\n"; }
-
-    die;
-}
 ######################
 
@@ -593,4 +529,5 @@
         }    
         $query .= " GROUP BY diff_id";
+
         my $result5 = &mysql_select ($query);
         #@row5 = $result5->fetchrow_array();
@@ -610,4 +547,5 @@
                   my $result6 = &mysql_select ($query2);
                   while (@row6 = $result6->fetchrow_array()) {
+                      #printf("%6s,%2s,%2s,%2s,%2s, %3d %3d %3d %3d\n",$row5[0],$row6[0],$row6[1],$row6[2],$row6[3],$NWSdiffgood,$NWSdiffbad,$NWSdiffdist1,$NWSdiffdist2);
                       #if all skycells have bad quality, this is a bad diff. If all the skycells are in a full state in publishRun, it is fully published 
                       if ($row6[1]<$row6[0]) {$NWSdiffgood ++;}
@@ -819,4 +757,5 @@
     $query .= "     AND obs_mode NOT LIKE 'ENGINEERING'";
     $query .= "     AND (obs_mode LIKE '%SS%' OR obs_mode LIKE '%BRIGHT%')";
+    $query .= "     AND rawExp.comment NOT LIKE '%XSS%'";
     $query .= "     AND rawExp.comment like '%visit%'";
     $query .= "     AND (camProcessedExp.quality IS NULL or camProcessedExp.quality = 0)";
@@ -1041,4 +980,5 @@
     $query .= "    AND label NOT LIKE '%WS.nigh%'";
     $query .= "    AND label NOT LIKE 'goto_cleaned'";
+    $query .= "    AND label NOT LIKE '%test%'";
     $query .= "    AND (quality IS NULL OR quality = 0)";
     $query .= "    GROUP BY label, state, diff_id";
@@ -1046,5 +986,4 @@
 
     my $result = &mysql_select ($query);
-
     @row = $result->fetchrow_array();
     if (not $report) { printf " * %d diffRuns can be published *   (has at least 1 skycell with quality = 0 or quality is NULL)\n", $row[0]; }
@@ -1222,4 +1161,5 @@
     $query .= "    AND (camProcessedExp.quality = 0)";
     $query .= "    AND (comment NOT LIKE '%twilight%')";
+    $query .= "    AND (comment NOT LIKE '%XSS%')";
     $query .= "  ) AS expall";
     $query .= "  LEFT JOIN";
@@ -1250,5 +1190,5 @@
     while (@row = $result->fetchrow_array()) {
 	if ($doHeader) {
-	    print "Unpublished Solar System Exposures WW diffs (obs_mode like %SS% or obs_mode like %BRIGHT%) with good camera quality :\n";
+	    print "Unpublished Solar System Exposures WW diffs (obs_mode like %SS% or obs_mode like %BRIGHT%, excluding XSS) with good camera quality :\n";
 	    printf "%12s %12s %12s | %-19s | %-16s\n", "exp_name", "warp_id", "diff_id", "dateobs", "comment";
 	    $doHeader = 0;
@@ -1259,5 +1199,5 @@
     }
 }
-print "\n\n";
+print "\n";
 
 # count the number of exposures per chunk, determine expected diffRuns: