Index: trunk/ippMonitor/raw/czartool_labels.php
===================================================================
--- trunk/ippMonitor/raw/czartool_labels.php (revision 41558)
+++ trunk/ippMonitor/raw/czartool_labels.php (revision 41677)
@@ -19,5 +19,4 @@
$LD_LIBRARY_PATH = getenv("LD_LIBRARY_PATH");
putenv("LD_LIBRARY_PATH=$LIBDIR:$LD_LIBRARY_PATH");
-
if ($ID['menu']) {$myMenu = $ID['menu'];}
@@ -38,5 +37,4 @@
"pub",
);
- # "chipbackground");
$getFailures = array(
@@ -86,23 +84,17 @@
if ($proj == 'gpc1') {
$servers=array(
- #"addstar",
- #"addstarlap",
- "ippqub:stdscience_ws",
"cleanup",
- #"detrend",
"distribution",
+ "ippqub:stdscience_ws",
"pstamp",
- # "update",
- # "publishing",
"registration",
"stack",
- # "deepstack",
"stdscience",
"summitcopy");
} else {
$servers=array(
- "ippqub2:stdscience_ws",
"cleanup",
"distribution",
+ "ippqub2:stdscience_ws",
"registration",
"stdscience",
@@ -110,7 +102,5 @@
}
-
-// The Update mode of czartool is obsolete since we don't use the update
-// pantasks.
+// The Update mode of czartool is obsolete since we don't use the update pantasks.
// $selectedMode = $_GET[mode];
$selectedMode = "stdscience";
@@ -141,5 +131,4 @@
// tell all servers to stop or run
if ($allServerCmd) {
-
foreach ($servers as &$server) serverStopRun($czardb, $server, $allServerCmd);
}
@@ -147,5 +136,5 @@
$debug = 0;
-$table = "
\n";
+$table = "
\n";
// $labels is generated with sequential integer key values
@@ -187,5 +176,4 @@
// set up the form
echo "
";
-
-createLabelsTable($pass, $proj, $czardb, $selectedMode, $labels,
- $distLabelsExist, $pubLabelsExist, $stages, "new", $selectedLabel,
- $selectedStage, $plotType);
-if ($selectedMode == "update") {echo " "; createPStampDataTable();}
-
-# XXX EAM : 2017.09.17 : debugging slowness
-# CCL : 2019.11.09 : debugging slowness
-//createSummitDataTable($projectdb); // this is slow because of the join between summitExp and rawExp, but not the major one
-createSummitDataTable2($projectdb); // this is slow because of the join between summitExp and rawExp, but not the major one
-
-createServersTable($pass, $proj,$selectedMode,$czardb, $servers, $selectedLabel, $selectedStage, $plotType);
-// this was the major slowness part due to large table in czardb
-
-createChunkDataTable($projectdb); // this is another part for slowness during nightly processing
-
-createDatesTable($czardb, $proj);
-
-/////////////////////////////////////////
-// timer begin for Database status
-/////////////////////////////////////////
-$time = microtime();
-$time = explode(' ', $time);
-$time = $time[1] + $time[0];
-$start = $time;
-
-// status table at top
- echo $table;
- echo "
0 seconds "; // comment out if ippc70 is back
// timer finished
echo "
";
@@ -396,12 +342,56 @@
echo "
";
echo " ";
-
+
+createServersTable($pass, $proj,$selectedMode,$czardb, $servers, $selectedLabel, $selectedStage, $plotType); // this was the major slowness part due to large table in czardb
+
+# pantasks server status, if requested
+if ($selectedServer && !$serverCmd) showServerStatus($selectedServer, $proj);
+
+#2nd table column for space
+echo "
";
+
+#3rd table column for plots
+echo "
";
+# plots
+if ($selectedStage == "all_stages" & $selectedLabel == "all") {
+ # with all stages and all labels, the rate query is too slow so I use the old method until it get improved. CCL 20210117
+ # gnuplots
+ # time series plot
+ echo "
";
+ echo "
";
+ # rate series plot
+ echo "
";
+} else {
+ # google chart
+ # time series plot
+ echo Gettimeseries($czardb, $selectedMode, $selectedLabel, $proj, $selectedStage);
+ # rate series plot
+ echo Getrate($czardb, $selectedMode, $selectedLabel, $proj, $selectedStage);
+}
+
+# storage timeseries
+echo getSpaces($czardb);
+# storage plot
+echo getHosts($czardb);
+
+# timer for main page end
+echo "
";
}
-
echo "\n";
-
}
@@ -480,11 +465,9 @@
#do a query of raw/chip/cam/warp counts for this night, split by chunk.
#we need to do a subquery to find the total number of skycells in warpSkyfile, as well as the number of those with a bad quality
- $query = "SELECT suba.chunk,suba.Nvis1,suba.Nvis2,suba.Nvis3,suba.Nvis4,suba.Ncamgood,suba.Ncambad,subb.Nwarpgood,subb.Nwarpbad,suba.uniNvis1,suba.uniNvis2,suba.uniNvis3,suba.uniNvis4 FROM ";
+ $query = "SELECT suba.chunk,suba.Nvis1,suba.Nvis2,suba.Nvis3,suba.Nvis4,suba.Ncamgood,suba.Ncambad,subb.Nwarpgood,subb.Nwarpbad FROM ";
$query .= " (SELECT substr(comment, 1, position(' ' in comment)) AS chunk,count(if(rawExp.comment LIKE '%visit 1%',1,NULL)) AS Nvis1,";
$query .= " count(if(rawExp.comment LIKE '%visit 2%',1,NULL)) AS Nvis2,count(if(rawExp.comment LIKE '%visit 3%',1,NULL)) AS Nvis3,";
$query .= " count(if(rawExp.comment LIKE '%visit 4%',1,NULL)) AS Nvis4, count(if(camProcessedExp.sigma_ra <= 5 AND camProcessedExp.sigma_dec <= 5 AND camProcessedExp.quality = 0,1,NULL)) AS Ncamgood,";
- $query .= " count(if(camProcessedExp.sigma_ra > 5 OR camProcessedExp.sigma_dec > 5 OR camProcessedExp.quality > 0,1,NULL)) AS Ncambad, COUNT(DISTINCT CASE WHEN rawExp.comment LIKE '%visit 1%' THEN rawExp.comment END) AS uniNvis1,";
- $query .= " COUNT(DISTINCT CASE WHEN rawExp.comment LIKE '%visit 2%' THEN rawExp.comment END) AS uniNvis2,COUNT(DISTINCT CASE WHEN rawExp.comment LIKE '%visit 3%' THEN rawExp.comment END) AS uniNvis3,";
- $query .= " COUNT(DISTINCT CASE WHEN rawExp.comment LIKE '%visit 4%' THEN rawExp.comment END) AS uniNvis4";
+ $query .= " count(if(camProcessedExp.sigma_ra > 5 OR camProcessedExp.sigma_dec > 5 OR camProcessedExp.quality > 0,1,NULL)) AS Ncambad";
$query .= " FROM rawExp LEFT JOIN chipRun USING (exp_id) LEFT JOIN camRun USING (chip_id) JOIN camProcessedExp USING (cam_id) LEFT JOIN fakeRun USING (cam_id) LEFT JOIN warpRun USING (fake_id)";
$query .= " WHERE dateobs like '$date%' AND exp_id > $refExpID[0] AND exp_type = 'OBJECT' AND rawExp.comment like '%visit%'";
@@ -540,8 +523,4 @@
$NexpWWdiff = 0;
$Npubwarps = 0;
- $uniNvis1 = 0;
- $uniNvis2 = 0;
- $uniNvis3 = 0;
- $uniNvis4 = 0;
$chunkname = $row[0];
@@ -554,8 +533,4 @@
if($row[7] > 0) $Nwarpgood = $row[7];
if($row[8] > 0) $Nwarpbad = $row[8];
- if($row[9] > 0) $uniNvis1 = $row[9];
- if($row[10] > 0) $uniNvis2 = $row[10];
- if($row[11] > 0) $uniNvis3 = $row[11];
- if($row[12] > 0) $uniNvis4 = $row[12];
#set flags if present
@@ -629,11 +604,12 @@
if(($NWWdiffbad >= 1) or ($NWSdiffbad >= 1)) $baddiffflag = 1;
- if (($uniNvis1 != $uniNvis2) or ($uniNvis1 != $uniNvis3) or ($uniNvis1 != $uniNvis4)) {
+ if ($Nvis1 != $Nvis4) {
if ($NWWdiffpub != $NexpWWdiff) $complete = "chunk incomplete, not done";
if ($NWWdiffpub == $NexpWWdiff) $complete = "chunk incomplete, done";
}
- if (($uniNvis1 == $uniNvis2) and ($uniNvis1 == $uniNvis3) and ($uniNvis1 == $uniNvis4)) {
+ if ($Nvis1 == $Nvis4) {
if ($NWWdiffpub != $NexpWWdiff) $complete = "chunk complete, not done";
if ($NWWdiffpub == $NexpWWdiff) $complete = "chunk complete, done";
+
}
@@ -920,6 +896,5 @@
$pubLabelsExist,
$stages,
- $selectedState,
- $selectedLabel, $selectedStage, $plotType) {
+ $selectedState, $selectedLabel, $selectedStage, $plotType) {
// timer start
@@ -951,5 +926,5 @@
createFormattedTableCell(($selectedStage != "all_stages"), $link, "All stages", 0, "$columnHeaderColor");
- #echo "
Label (in order of priority)
";
+ //echo "
Label (in order of priority)
";
foreach ($stages as &$stage) {
@@ -965,5 +940,5 @@
createFormattedTableCell($showLink, $link, $stage, 0, "$columnHeaderColor");
-# createTableColumnHeader("Dates");
+ #createTableColumnHeader("Dates");
}
@@ -1006,26 +981,26 @@
foreach ($stages as &$stage) {
// Note: Do not include the state for chip, cam, and warp so that both new and update faults are listed
- $myTable = $mainTable[$stage];
- $myFailures = $getFailures[$stage];
+ $myTable = $mainTable[$stage];
+ $myFailures = $getFailures[$stage];
# echo "myTable: $myTable";
- if ("$myFailures" == "NONE") {
+ if ("$myFailures" == "NONE") {
$link = $defaultlink;
} else {
$link = $myFailures . "?pass=" . $pass . "&proj=" . $proj . "&" . $myTable . ".label=" . $thisLabel;
- if ($addSearchState[$stage]) {
+ if ($addSearchState[$stage]) {
// Note: Do not include the state for chip, cam, and warp so that both new and update faults are listed
$link .= "&" . $myTable . ".state=" . $searchState;
}
}
- // echo "getStateAndFaults $db, $thisLabel, $proj, $selectedState, $stage, $str, $anyFaults ";
- getStateAndFaults($db, $thisLabel, $proj, $selectedState, $stage, $str, $anyFaults);
-
- $cellcolor = 0;
- if ("$stage" == "dist") {
- $cellcolor = (!$isUpdate && !$distributing) ? "gray" : 0;
+ // echo "getStateAndFaults $db, $thisLabel, $proj, $selectedState, $stage, $str, $anyFaults ";
+ getStateAndFaults($db, $thisLabel, $proj, $selectedState, $stage, $str, $anyFaults);
+
+ $cellcolor = 0;
+ if ("$stage" == "dist") {
+ $cellcolor = (!$isUpdate && !$distributing) ? "gray" : 0;
}
if ("$stage" == "pub") {
- $cellcolor = (!$isUpdate && !$publishing) ? "gray" : 0;
+ $cellcolor = (!$isUpdate && !$publishing) ? "gray" : 0;
}
createFormattedTableCell($anyFaults, $link, $str, $anyFaults, $cellcolor);
@@ -1232,5 +1207,5 @@
// timer finished
- echo "
";
- createTableTitle("Data status tonight $date (UT) current time $datetime", 4);
+ createTableTitle("Data status tonight $date current time $datetime (UTC)", 4);
echo "
";
- createTableColumnHeader("Exp_type at summit");
- createTableColumnHeader("Status at summit");
- createTableColumnHeader("Status at mhpcc");
- createTableColumnHeader("Number");
+
+ createTableColumnHeader("Exposure type");
+ createTableColumnHeader("summitExp status");
+ createTableColumnHeader("downloadExp status");
+ createTableColumnHeader("rawExp /
+ newExp");
$sql = "SELECT summitExp.exp_type,pzDownloadExp.state,rawExp.state,COUNT(*) FROM summitExp
LEFT JOIN pzDownloadExp USING (summit_id) LEFT JOIN rawExp on summitExp.exp_name = rawExp.exp_name
@@ -1614,14 +1532,11 @@
if ($tmp[1] == NULL) {
echo "
Last night $datem1 (UTC)";
$sql = "SELECT summitExp.exp_type,pzDownloadExp.state,rawExp.state,COUNT(*) FROM summitExp
LEFT JOIN pzDownloadExp USING (summit_id) LEFT JOIN rawExp on summitExp.exp_name = rawExp.exp_name
@@ -1638,14 +1553,11 @@
if ($tmp[1] == NULL) {
echo "
";
-// createTableTitle("Data status > $date", 4);
-// echo "
";
-// createTableColumnHeader("Exposure type");
-// createTableColumnHeader("At summit");
-// createTableColumnHeader("Registered at MHPCC");
-// createTableColumnHeader("Summit (Drop/Null)");
-//
-// $msg = "No science images taken since $date";
-//
-// // list the results
-// while ($qry->fetchInto($expType)) {
-//
-// $sql = "SELECT COUNT(*) FROM summitExp LEFT JOIN pzDownloadExp USING (summit_id)
-// WHERE dateobs > '$date' AND exp_type = '$expType[0]'";
-// // AND state != 'drop' AND state is not null AND fault != 1042";
-// $qry2 = $projectdb->query($sql);
-// $qry2->fetchInto($summit);
-//
-// $sql = "SELECT COUNT(*) FROM summitExp JOIN rawExp ON summitExp.exp_name = rawExp.exp_name
-// WHERE summitExp.dateobs > '$date' AND rawExp.dateobs > '$date' AND summitExp.exp_type = '$expType[0]'";
-// $qry2 = $projectdb->query($sql);
-// $qry2->fetchInto($mhpcc);
-//
-// $sql = "SELECT COUNT(*) FROM summitExp LEFT JOIN pzDownloadExp USING (summit_id)
-// WHERE dateobs > '$date' AND exp_type = '$expType[0]' AND (state = 'drop' OR state is null)";
-// $qry2 = $projectdb->query($sql);
-// $qry2->fetchInto($dropped);
-//
-//
-// #Query with 30 minutes delay to check during the night if any exposures are missing.
-// $datehour = gmdate("Y-m-d H:i:s");
-// $sql = "SELECT COUNT(*) FROM summitExp LEFT JOIN pzDownloadExp USING (summit_id)
-// WHERE dateobs > '$date' AND dateobs <= date_sub('$datehour', interval 30 minute)
-// AND exp_type = '$expType[0]' AND (state != 'drop' OR state is null) and fault != 1042";
-//
-// $qry2 = $projectdb->query($sql);
-// $qry2->fetchInto($summitdelay);
-//
-// $sql = "SELECT COUNT(*) FROM summitExp JOIN rawExp ON summitExp.exp_name = rawExp.exp_name
-// WHERE summitExp.dateobs > '$date' AND summitExp.dateobs <= date_sub('$datehour', interval 30 minute)
-// AND rawExp.dateobs > '$date' AND summitExp.exp_type = '$expType[0]'";
-// $qry2 = $projectdb->query($sql);
-// $qry2->fetchInto($mhpccdelay);
-//
-// echo "