From e3a95ba761f5a5e4e3d5b56070887815112ebd30 Mon Sep 17 00:00:00 2001 From: Michael Wiebusch Date: Tue, 11 Aug 2015 14:40:17 +0200 Subject: [PATCH] variable pixel size possible, corresponding to scan step size, acceptance counts window now settable via software --- user_interface/pmt_ro.pm | 12 ++++++++++-- user_interface/selector.html | 2 +- user_interface/selector.js | 5 ++++- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/user_interface/pmt_ro.pm b/user_interface/pmt_ro.pm index 77e21de..6773a86 100644 --- a/user_interface/pmt_ro.pm +++ b/user_interface/pmt_ro.pm @@ -36,7 +36,9 @@ sub new { reset_counter => 24, dead_time => 25, acquisition_time => 26, - input_polarity => 27 + input_polarity => 27, + spikes_per_evt_lower => 28, + spikes_per_evt_upper => 29, }; $self->{constants} = { @@ -58,7 +60,9 @@ sub new { spectrum_start => -2000, spectrum_stop => 0, spectrum_bins => 24, - spectrum_delay => 1 + spectrum_delay => 1, + spikes_per_evt_lower => 4, + spikes_per_evt_upper => 15, }; $self->{settings_desc} = { # hard default settings @@ -74,6 +78,8 @@ sub new { spectrum_stop => "stop/end threshold of spectral scan", spectrum_bins => "number of bins for spectral scan", spectrum_delay => "count integration time for each bin of spectral scan", + spikes_per_evt_lower => "lower boundary of spikes per event that you accept as a count", + spikes_per_evt_upper => "upper boundary of spikes per event that you accept as a count", }; $self->{has_run} = {}; # remember which subs already have run @@ -120,6 +126,8 @@ sub apply_device_settings { $self->signal_thresh(value => $self->{settings}->{signal_thresh}); $self->veto_thresh(value => $self->{settings}->{veto_thresh}); $self->dead_time(value => $self->{settings}->{dead_time}); + $self->write_register(regName => "spikes_per_evt_lower", value => $self->{settings}->{spikes_per_evt_lower}); + $self->write_register(regName => "spikes_per_evt_upper", value => $self->{settings}->{spikes_per_evt_upper}); return; } diff --git a/user_interface/selector.html b/user_interface/selector.html index ff1febf..8406467 100644 --- a/user_interface/selector.html +++ b/user_interface/selector.html @@ -1,7 +1,7 @@ - My website + Coral Analysis diff --git a/user_interface/selector.js b/user_interface/selector.js index 6f2314f..8b585fb 100644 --- a/user_interface/selector.js +++ b/user_interface/selector.js @@ -59,7 +59,10 @@ $(document).ready(function(){ function init_widgets(){ - + + + pixel_size = scan.meta.step_size*10; + contrast_min = 0; contrast_max = scan.meta.unshadowed_counts/scan.meta.unshadowed_count_time*scan.meta.time_per_pixel; -- 2.43.0