From: hadaq Date: Fri, 23 Jan 2026 13:18:13 +0000 (+0100) Subject: update hmon links, remove old MDC, add new ones X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=3c12a52becad265f3d5198e32c58050ca3c25dd6;p=hadesdaq.git update hmon links, remove old MDC, add new ones --- diff --git a/.gitignore b/.gitignore index b18c1c6..bc9e9ef 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,4 @@ threshold thr_trb3 *_bck test +oldconfs diff --git a/hmon/hmon_mdc_temp.pl b/hmon/hmon_mdc_temp.pl index d46902a..f3a7267 100755 --- a/hmon/hmon_mdc_temp.pl +++ b/hmon/hmon_mdc_temp.pl @@ -40,15 +40,15 @@ my $data = Perl2Epics::GetAll(); while (1) { my $rh_mdc_temp; - $rh_mdc_temp = trb_register_read(0xfffd, 0x0) or sleep 5 and next; - - foreach my $board (sort {$a <=> $b} keys %$rh_mdc_temp) { - my $id_0 = ($board >> 8) & 0x0f; - my $id_1 = ($board >> 4) & 0x0f; - my $id_2 = ($board >> 0) & 0x0f; - $store->{$id_0}->{$id_1}->{$id_2} = - (($rh_mdc_temp->{$board} >> 20) & 0xfff) / 16; - } +# $rh_mdc_temp = trb_register_read(0xfffd, 0x0) or sleep 5 and next; +# +# foreach my $board (sort {$a <=> $b} keys %$rh_mdc_temp) { +# my $id_0 = ($board >> 8) & 0x0f; +# my $id_1 = ($board >> 4) & 0x0f; +# my $id_2 = ($board >> 0) & 0x0f; +# $store->{$id_0}->{$id_1}->{$id_2} = +# (($rh_mdc_temp->{$board} >> 20) & 0xfff) / 16; +# } $rh_mdc_temp = trb_register_read(0xfe90, 0x0) or sleep 5 and next; diff --git a/hmon/hmon_mdcnew_triggererrors.pl b/hmon/hmon_mdcnew_triggererrors.pl deleted file mode 100644 index b9d4994..0000000 --- a/hmon/hmon_mdcnew_triggererrors.pl +++ /dev/null @@ -1,71 +0,0 @@ -#!/usr/bin/perl - -use warnings; -use strict; -use Data::Dumper; -use Data::TreeDumper; -use Hmon; -use QA; -use HPlot; -use lib '.'; -use MDC; -use Time::HiRes qw(usleep time); -use List::Util qw[min max]; - -use HADES::TrbNet; - -#$ENV{DAQOPSERVER} = 'localhost:40'; -trb_init_ports() or die trb_strerror(); - - -HPlot::PlotInit({ - name => "MDCNewTemps", - file => "files/MDCNewTemps", - title => "Temperatures", - entries => 80, - curves => 30, - type => HPlot::TYPE_HEATMAP, - output => HPlot::OUT_PNG, - zlabel => "Hitrate", - sizex => 610, - sizey => 510, - nokey => 1, - buffer => 1, - ymin => 29.5, - ymax => -0.5, - xmin => -0.5, - xmax => 79.5, - #cbmax => "100<*<1E7", - #cbmin => 0, - noinit => 1, - additional => "set format y \"%02o\";set ytics (0,5,8,13,16,21,24,29);set xtics('0' 0,'2' 10, '4' 20,'6' 30,'8' 40,'A' 50, 'C' 60, 'E' 70);", - showvalues => 0, } - ); - - -my $str = Hmon::MakeTitle(8, 11, "MDC Temperatures",0); -$str .= qq@
\n@; -$str .= Hmon::MakeFooter(); -Hmon::WriteFile("MDCNewTemps",$str); - - -while (1) { - HPlot::PlotClear('MDCNewTemps'); - my $mdc_temp; - $mdc_temp = trb_register_read(0xfffb, 0) or sleep 5 and next; - - foreach my $board (keys %$mdc_temp) { - my $t = ($mdc_temp->{$board}>>20)/16; - my ($p,$s,$b,$e) = MDC::get_position($board); - my $xpos = $b*5 + ($e==5?0:$e+1); - my $ypos = $p*8+$s; - next if $p == -1; -# printf("%x %i %i %i %i\n",$board,$p,$s,$b,$e) ; - HPlot::PlotFill('MDCNewTemps',$t,$xpos,$ypos); - } - - HPlot::PlotDraw('MDCNewTemps'); - - sleep 10; - } - diff --git a/hmon/index.cgi b/hmon/index.cgi index e89096a..4a36628 100755 --- a/hmon/index.cgi +++ b/hmon/index.cgi @@ -156,27 +156,29 @@ function openwin(url) {
  • Rich Gas Information
    • -

    MDC