Index: trunk/ippMonitor/INSTALL =================================================================== --- trunk/ippMonitor/INSTALL (revision 42736) +++ trunk/ippMonitor/INSTALL (revision 42790) @@ -39,4 +39,5 @@ # $CZARPLOTDIR and $METRICSPLOTDIR will be generated as links in the same folder as ippMonitor # the structure of the names for these two directories are defined in Makefile.in a +# pltdir in ipp117 is /var/www/localhost/htdocs/ippMonitor psconfigure --htdocs /var/www/localhost/htdocs --wwwbin /var/www/localhost/wwwbin --pltdir /some/path --site ~/ippconfig/ippmonitor.config Index: trunk/ippMonitor/raw/czartool_labels.php =================================================================== --- trunk/ippMonitor/raw/czartool_labels.php (revision 42736) +++ trunk/ippMonitor/raw/czartool_labels.php (revision 42790) @@ -1668,4 +1668,9 @@ $qry = $db->query($sql); if (dberror($qry)) {echo "error with $sql
\n";} + + // Set environment variables + putenv("PATH=/usr/local/bin:/usr/bin:/bin:/data/ippc65.0/ipp/src/psconfig//ipp-20210708-gentoo.lin64/bin"); + putenv("PERL5LIB=/data/ippc65.0/ipp/src/psconfig//ipp-20210708-gentoo.lin64/lib"); + # not sure why neb-host doesn't work on ipp113 CCL.20210216 exec("neb-host |cut -b 17-30,86-", $hostnoteall); Index: trunk/ippMonitor/raw/dataquality.php =================================================================== --- trunk/ippMonitor/raw/dataquality.php (revision 42790) +++ trunk/ippMonitor/raw/dataquality.php (revision 42790) @@ -0,0 +1,858 @@ +"; +echo ""; +echo " "; +echo "

Data Quality Report

"; +echo "
"; +echo ' Today (MJD: '.getMJD().') | '; +echo ' Past week (default) | '; +echo ' Past month | '; +echo ' Past year | '; +echo " "; +echo ""; +echo ""; +echo getDataQuality2($projectdb, $range); + +menu_end(); + +///////////////////////////////////////////////////////////////////////////// +// // +// Functions // +// // +///////////////////////////////////////////////////////////////////////////// + +########################################################################### +# +# Get data quality +# +########################################################################### +function getDataQuality2($db, $range = 'week') { + // Start timer + $start = microtime(true); + + $mjdDay = getMJD(); + $mjdDay_yearback = $mjdDay - 366; + $mjdDay_monthback = $mjdDay - 32; + $min_exp_id = 0; + + // Determine the reference exp_name based on the selected range + if ($range === 'year') { + $expname = "o" . $mjdDay_yearback . "%"; + } elseif ($range === 'month') { + $expname = "o" . $mjdDay_monthback . "%"; + } else { + $expname = "o" . ($mjdDay - 7) . "%"; // Default week-based constraint + } + + // Query to get the minimum exp_id + $expIdQuery = "SELECT MIN(exp_id) AS min_exp_id FROM rawExp WHERE rawExp.exp_name LIKE '$expname';"; + + $result = $db->query($expIdQuery); + + // Fetch result into $row as an associative array + $result->fetchInto($row, DB_FETCHMODE_ASSOC); + + if (!empty($row['min_exp_id'])) { + $min_exp_id = $row['min_exp_id']; + echo "Minimum exp_id: " . $min_exp_id; + } else { + echo "No results found."; + } + + echo "

"; + + // Apply different constraints based on the selected range + if ($range === 'year') { + // Constraint by dateobs within the last 365 days + $dateConstraint = "dateobs >= NOW() - INTERVAL 365 DAY AND rawExp.exp_id >= $min_exp_id"; + } elseif ($range === 'month') { + // Constraint by dateobs within the last 30 days + $dateConstraint = "dateobs >= NOW() - INTERVAL 30 DAY AND rawExp.exp_id >= $min_exp_id"; + } else { + // Constraint by exp_name for week and day ranges + $expnames = array(); + $days = ($range === 'day') ? 1 : 7; // Set days to 1 for 'day', otherwise default to 7 (week) + + for ($i = 0; $i < $days; $i++) { + $expnames[] = "'o" . ($mjdDay - $i) . "%'"; + } + $expnameFilter = " (rawExp.exp_name LIKE " . implode(" OR rawExp.exp_name LIKE ", $expnames) . ") AND rawExp.exp_id >= $min_exp_id"; + $dateConstraint = $expnameFilter; + } + + // Updated SQL query + $sql = "select * from (SELECT SUBTIME(dateobs, '10:00:00') AS time, + round(( 367*YEAR(dateobs)- FLOOR((7 * (YEAR(dateobs) + FLOOR((MONTH(dateobs) + 9) / 12))) / 4) + FLOOR(275 * MONTH(dateobs) / 9) + + DAY(dateobs) + 1721013.5 + (HOUR(dateobs) / 24.0) + (MINUTE(dateobs) / 1440.0) + (SECOND(dateobs) / 86400.0) - 2400000.5), 5) AS MJD, + filter, comment, ra*180/pi() as RA, decl*180/pi() as DECL, exp_name, alt, az, fwhm_major, fwhm_minor, zpt_obs, zpt_stdev, rawExp.exp_id + FROM rawExp + JOIN chipRun USING (exp_id) + JOIN camRun USING (chip_id) + JOIN camProcessedExp USING (cam_id) + WHERE $dateConstraint + AND exp_type = 'OBJECT' + AND camRun.state LIKE 'full' + AND camProcessedExp.fault = 0 + AND camProcessedExp.zpt_obs != 0 ORDER BY RAND() limit 5000) as sub order by time;"; + + $DQarray = array(); + $qry = $db->query($sql); + if (dberror($qry)) { + echo "Error with $sql
\n"; + return; + } + echo "Error with $sql
\n"; + + while ($qry->fetchInto($row)) { + $DQarray[] = $row; + } + + // Ensure $DQarray is not empty + if (empty($DQarray)) { + echo "
No data for MJD: $mjdDay
"; + return; // Stop execution if no data to encode + } + + // Convert data array to JSON for easier handling in JavaScript + $dataJson = json_encode($DQarray); + + if ($dataJson === false) { + echo "Error encoding JSON: " . json_last_error_msg(); // Display any JSON encoding errors + return; // Stop execution if JSON encoding fails + } + + echo ""; // Log JSON output to console for debugging +echo << + + + +
+
+
+
+ +
+
+
+
+ +
+
+
+
+ +HTML; + // End timer + $total_time = round(microtime(true) - $start, 3); + echo "
loading plot in $total_time seconds
"; + +} + + +########################################################################### +# +# Get data quality +# +########################################################################### +function getDataQuality($db, $range = 'week') { + // Start timer + $start = microtime(true); + + $mjdDay = getMJD(); + + $expnames = array(); + // Determine the number of days based on the selected range + switch ($range) { + case 'week': + $days = 7; + break; + case 'month': + $days = 30; + break; + case 'day': + default: + $days = 1; + break; + } + + for ($i = 0; $i < $days; $i++) { + $expnames[] = "'o" . ($mjdDay - $i) . "%'"; + } + $expnameFilter = implode(" OR rawExp.exp_name LIKE ", $expnames); + $sql = "SELECT SUBTIME(dateobs, '10:00:00') AS time, AST_R0, AST_D0, + round(( 367*YEAR(dateobs)- FLOOR((7 * (YEAR(dateobs) + FLOOR((MONTH(dateobs) + 9) / 12))) / 4) + FLOOR(275 * MONTH(dateobs) / 9) + + DAY(dateobs) + 1721013.5 + (HOUR(dateobs) / 24.0) + (MINUTE(dateobs) / 1440.0) + (SECOND(dateobs) / 86400.0) - 2400000.5), 5) AS MJD, + filter, exp_time, comment, ra*180/pi() as RA, decl*180/pi() as DECL, AST_RS, AST_DS, AST_T0, posang, exp_name, alt, az, rawExp.exp_id + FROM rawExp JOIN chipRun using (exp_id) JOIN camRun using (chip_id) JOIN camProcessedExp using (cam_id) + WHERE (rawExp.exp_name LIKE " . $expnameFilter . ") + AND exp_type = 'OBJECT' + AND camRun.state like 'full' + AND camProcessedExp.fault = 0 + AND camProcessedExp.zpt_obs != 0; "; + + $DQarray = array(); + $qry = $db->query($sql); + if (dberror($qry)) { + echo "Error with $sql
\n"; + return; + } + + while ($qry->fetchInto($row)) { + $DQarray[] = $row; + } + + // Ensure $DQarray is not empty + if (empty($DQarray)) { + echo "Error: Data array is empty."; + return; // Stop execution if no data to encode + } + + // Convert data array to JSON for easier handling in JavaScript + $dataJson = json_encode($DQarray); + + if ($dataJson === false) { + echo "Error encoding JSON: " . json_last_error_msg(); // Display any JSON encoding errors + return; // Stop execution if JSON encoding fails + } + + echo ""; // Log JSON output to console for debugging + + echo << + + + + + + +
+
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+
+HTML; + +// End timer +$total_time = round(microtime(true) - $start, 3); +echo "
Loading plot in $total_time seconds
"; + +} + +?> + Index: trunk/ippMonitor/raw/ipp.czar.dat =================================================================== --- trunk/ippMonitor/raw/ipp.czar.dat (revision 42736) +++ trunk/ippMonitor/raw/ipp.czar.dat (revision 42790) @@ -5,4 +5,6 @@ menulink | menuselect | link | czartool | czartool_labels.php menulink | menuselect | link | storage status | storage.php +menulink | menuselect | link | pointing | pointing.php +menulink | menuselect | link | data quality | dataquality.php menulink | menuselect | link | mask stats | maskStats.php menulink | menuselect | link | night summary | nightSummary.php Index: trunk/ippMonitor/raw/pointing.php =================================================================== --- trunk/ippMonitor/raw/pointing.php (revision 42790) +++ trunk/ippMonitor/raw/pointing.php (revision 42790) @@ -0,0 +1,478 @@ +"; +echo ""; +echo " "; +echo "

Pointing Report

"; +echo "
"; +echo ' Today (MJD: '.getMJD().') | '; +echo ' Past week (default) | '; +echo ' Past month | '; +echo ' Past year | '; +echo " "; +echo ""; +echo ""; +echo getDataQuality($projectdb, $range); + +menu_end(); + + +///////////////////////////////////////////////////////////////////////////// +// // +// Functions // +// // +///////////////////////////////////////////////////////////////////////////// +########################################################################### +# +# Get data quality +# +########################################################################### +function getDataQuality($db, $range = 'week') { + // Start timer + $start = microtime(true); + + $mjdDay = getMJD(); + $mjdDay_yearback = $mjdDay - 366; + $mjdDay_monthback = $mjdDay - 32; + $min_exp_id = 0; + + // Determine the reference exp_name based on the selected range + if ($range === 'year') { + $expname = "o" . $mjdDay_yearback . "%"; + } elseif ($range === 'month') { + $expname = "o" . $mjdDay_monthback . "%"; + } else { + $expname = "o" . ($mjdDay - 7) . "%"; // Default week-based constraint + } + + // Query to get the minimum exp_id + $expIdQuery = "SELECT MIN(exp_id) AS min_exp_id FROM rawExp WHERE rawExp.exp_name LIKE '$expname';"; + + $result = $db->query($expIdQuery); + + // Fetch result into $row as an associative array + $result->fetchInto($row, DB_FETCHMODE_ASSOC); + + if (!empty($row['min_exp_id'])) { + $min_exp_id = $row['min_exp_id']; + echo "Minimum exp_id: " . $min_exp_id; + } else { + echo "No results found."; + } + + echo "

"; + + // Apply different constraints based on the selected range + if ($range === 'year') { + // Constraint by dateobs within the last 365 days + $dateConstraint = "dateobs >= NOW() - INTERVAL 365 DAY AND rawExp.exp_id >= $min_exp_id"; + } elseif ($range === 'month') { + // Constraint by dateobs within the last 30 days + $dateConstraint = "dateobs >= NOW() - INTERVAL 30 DAY AND rawExp.exp_id >= $min_exp_id"; + } else { + // Constraint by exp_name for week and day ranges + $expnames = array(); + $days = ($range === 'day') ? 1 : 7; // Set days to 1 for 'day', otherwise default to 7 (week) + + for ($i = 0; $i < $days; $i++) { + $expnames[] = "'o" . ($mjdDay - $i) . "%'"; + } + $expnameFilter = " (rawExp.exp_name LIKE " . implode(" OR rawExp.exp_name LIKE ", $expnames) . ") AND rawExp.exp_id >= $min_exp_id"; + $dateConstraint = $expnameFilter; + } + + // Updated SQL query + $sql = "select * from (SELECT SUBTIME(dateobs, '10:00:00') AS time, AST_R0, AST_D0, + round(( 367*YEAR(dateobs)- FLOOR((7 * (YEAR(dateobs) + FLOOR((MONTH(dateobs) + 9) / 12))) / 4) + FLOOR(275 * MONTH(dateobs) / 9) + + DAY(dateobs) + 1721013.5 + (HOUR(dateobs) / 24.0) + (MINUTE(dateobs) / 1440.0) + (SECOND(dateobs) / 86400.0) - 2400000.5), 5) AS MJD, + filter, exp_time, comment, ra*180/pi() as RA, decl*180/pi() as DECL, AST_RS, AST_DS, AST_T0, posang, exp_name, alt, az, rawExp.exp_id + FROM rawExp + JOIN chipRun USING (exp_id) + JOIN camRun USING (chip_id) + JOIN camProcessedExp USING (cam_id) + WHERE $dateConstraint + AND exp_type = 'OBJECT' + AND camRun.state LIKE 'full' + AND camProcessedExp.fault = 0 + AND camProcessedExp.zpt_obs != 0 ORDER BY RAND() limit 5000) as sub order by time;"; + + $DQarray = array(); + $qry = $db->query($sql); + if (dberror($qry)) { + echo "Error with $sql
\n"; + return; + } + echo "$sql

\n"; + + while ($qry->fetchInto($row)) { + $DQarray[] = $row; + } + + // Ensure $DQarray is not empty + if (empty($DQarray)) { + echo "Error: Data array is empty."; + return; // Stop execution if no data to encode + } + + // Convert data array to JSON for easier handling in JavaScript + $dataJson = json_encode($DQarray); + + if ($dataJson === false) { + echo "Error encoding JSON: " . json_last_error_msg(); // Display any JSON encoding errors + return; // Stop execution if JSON encoding fails + } + + echo ""; // Log JSON output to console for debugging + + echo << + + + + + + +
+
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+
+HTML; + +// End timer +$total_time = round(microtime(true) - $start, 3); +echo "
Loading plot in $total_time seconds
"; + +} + +?> +