]> jspc29.x-matter.uni-frankfurt.de Git - coral.git/commitdiff
variable pixel size possible, corresponding to scan step size, acceptance counts...
authorMichael Wiebusch <m.wiebusch@gsi.de>
Tue, 11 Aug 2015 12:40:17 +0000 (14:40 +0200)
committerMichael Wiebusch <m.wiebusch@gsi.de>
Tue, 11 Aug 2015 12:40:17 +0000 (14:40 +0200)
user_interface/pmt_ro.pm
user_interface/selector.html
user_interface/selector.js

index 77e21de87bc64f99168536680857973388958ff5..6773a86e959db31883a84275e735a72f6c1c0850 100644 (file)
@@ -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;
 }
 
index ff1febf1d6020d039c92f939b94263e005d62227..84064679a9559b2b932c5c3270f5984576a06ecd 100644 (file)
@@ -1,7 +1,7 @@
 <html>
 
   <head>
-  <title>My website</title>
+  <title>Coral Analysis</title>
   <script src="./jquery.min.js"></script>
   <script src="./jquery-ui.js"></script>
   <script src="./jquery.mwiebusch.js"></script>
index 6f2314f54e2e82e72cc4526f447315edd360625a..8b585fb7fad4d8e8eba204c759546aceddba5df3 100644 (file)
@@ -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;