diff --git a/docker/Dockerfile b/docker/Dockerfile index 51c343409e4815a846124bc4b6a940be1d9f648d..c7432ab0a42f6d14cbe7e0178c222f62911c97c0 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -184,7 +184,7 @@ RUN apt-get update -y && \ wget git python3-nose python3-coverage \ python3-astropy -RUN A=$CY; git clone https://git.astron.nl/ao/sdco/pyautoplot.git ${INSTALLDIR}/pyautoplot && \ +RUN A=$DA; git clone https://git.astron.nl/ao/sdco/pyautoplot.git ${INSTALLDIR}/pyautoplot && \ cd ${INSTALLDIR}/pyautoplot && \ git checkout master && \ python3 setup.py install diff --git a/scripts/create_html b/scripts/create_html index ae4f5c113b3557643159a42c3affffcff5755424..27b0bc69f838868cc8af8e3b1934de9e3c29d137 100755 --- a/scripts/create_html +++ b/scripts/create_html @@ -482,6 +482,14 @@ def observation_html(parset, file_size_data, f0seqnr_completeness_dict, obs_plot cobalt_error_file, obs_html_root) cobalt_error_log_html = '<h3><a href="%s">Cobalt ERROR log</a></h3>' % error_rel_path + cobalt_error_loss_file = os.path.join(obs_plot_root, 'rtcp-%d.losserrors' % int(parset['sas_id'])) + cobalt_error_loss_log_html = '' + if os.path.exists(cobalt_error_loss_file): + if len(open(cobalt_error_loss_file).read().strip()) > 0: + error_rel_path = os.path.relpath( + cobalt_error_loss_file, obs_html_root) + cobalt_error_loss_log_html = '<h3><a href="%s">Cobalt dataloss log</a></h3>' % error_rel_path + input_loss_html = observation_input_loss_html(os.path.join(obs_plot_root, 'rtcp-%d.loss' % int(parset['sas_id']))) if input_loss_html == '': @@ -1300,7 +1308,7 @@ def station_beamlet_statistics_plots_html(parset, rel_plot_files): <p> <ul> <li><a href="../%(index_filename)s">Observation</a> <a href="../../%(index_filename)s">Projects</a></li> - <li><a href="https://www.astron.nl/radio-observatory/observing-capabilities/depth-technical-information/data-quality-inspection/data-qu">What do I see here?</a></li> + <li><a href="https://science.astron.nl/telescopes/lofar/lofar-system-overview/observing-modes/data-quality-inspection/">What do I see here?</a></li> </ul> </p> @@ -1316,7 +1324,7 @@ def station_beamlet_statistics_plots_html(parset, rel_plot_files): <p> <ul> <li><a href="../%(index_filename)s">Observation</a> <a href="../../%(index_filename)s">Projects</a></li> - <li><a href="https://www.astron.nl/radio-observatory/observing-capabilities/depth-technical-information/data-quality-inspection/data-qu">What do I see here?</a></li> + <li><a href="https://science.astron.nl/telescopes/lofar/lofar-system-overview/observing-modes/data-quality-inspection/">What do I see here?</a></li> </ul> </p> @@ -1332,7 +1340,7 @@ def station_beamlet_statistics_plots_html(parset, rel_plot_files): <p> <ul> <li><a href="../%(index_filename)s">Observation</a> <a href="../../%(index_filename)s">Projects</a></li> - <li><a href="https://www.astron.nl/radio-observatory/observing-capabilities/depth-technical-information/data-quality-inspection/data-qu">What do I see here?</a></li> + <li><a href="https://science.astron.nl/telescopes/lofar/lofar-system-overview/observing-modes/data-quality-inspection/">What do I see here?</a></li> </ul> </p> @@ -1348,7 +1356,7 @@ def station_beamlet_statistics_plots_html(parset, rel_plot_files): <p> <ul> <li><a href="../%(index_filename)s">Observation</a> <a href="../../%(index_filename)s">Projects</a></li> - <li><a href="https://www.astron.nl/radio-observatory/observing-capabilities/depth-technical-information/data-quality-inspection/data-qu">What do I see here?</a></li> + <li><a href="https://science.astron.nl/telescopes/lofar/lofar-system-overview/observing-modes/data-quality-inspection/">What do I see here?</a></li> </ul> </p> diff --git a/scripts/report_global_status b/scripts/report_global_status index 97e389ee63f0630d06bfbd7668ea20bdf61e0890..ce1a474bb47ec61b521490034f0e6a5768f96d23 100755 --- a/scripts/report_global_status +++ b/scripts/report_global_status @@ -80,7 +80,7 @@ case `hostname_fqdn` in fi if [[ ! -e ${INSPECT_ROOT}/${sas_id}/rtcp-${sas_id}.loss ]] ; then echo " - determining input losses" - ssh -A ${COBALT_HEAD} "tail -100000 log/rtcp-${sas_id}.log|grep loss|sort -k 8"|grep GPUProc > ${INSPECT_ROOT}/${sas_id}/rtcp-${sas_id}.loss + ssh -A ${COBALT_HEAD} "grep loss log/rtcp-${sas_id}.log|sort -k 8"|grep GPUProc > ${INSPECT_ROOT}/${sas_id}/rtcp-${sas_id}.loss fi sleep 2 if [[ ! -e ${INSPECT_ROOT}/${sas_id}/rtcp-${sas_id}.errors ]] ; then