Oliver Keller
/
muonhunter-K8
experimental fork
Diff: main.cpp
- Revision:
- 4:87037e41c888
- Parent:
- 3:0a89a80bea94
- Child:
- 5:9c7c88f8f800
diff -r 0a89a80bea94 -r 87037e41c888 main.cpp --- a/main.cpp Tue Oct 04 17:08:38 2016 +0000 +++ b/main.cpp Wed Oct 05 16:56:33 2016 +0000 @@ -14,7 +14,7 @@ //set the coincidence time window in us int coincidence_wait = 150; bool mdet = 0; -bool buzzer = 0; +bool buzzer = 1; volatile int muon_total; volatile int gm1_total; @@ -173,8 +173,8 @@ //start main timer main_t.start(); -hv1.set_frequency(4500); -hv2.set_frequency(4500); +hv1.set_frequency(4300); +hv2.set_frequency(4350); GM1.fall(&GM1_hit); GM2.fall(&GM2_hit); @@ -182,12 +182,13 @@ hv1monitor.attach(&hv1monitor_, 0.1); hv2monitor.attach(&hv2monitor_, 0.1); + //ticker to monitor memory usage memory_checker.attach(&memory_checker_, 0.2); while(1){ while(!detections.empty()){ Detection temp = detections.front(); - pc.printf("%d, %d, %f, %f, %f \n\r", detections.size(), temp.get_channel(), temp.get_time(), v1, v2); + pc.printf("%d, %d, %f, %f, %f \n\r", detections.size(), temp.channel, temp.time, v1, v2); detections.pop(); } wait(1);