Diff: main.cpp

Revision:

6:e95598c44a7f

Parent:

5:9c7c88f8f800

Child:

7:6a0958c2be7e

--- a/main.cpp	Thu Oct 06 15:00:05 2016 +0000
+++ b/main.cpp	Sat Oct 08 13:34:52 2016 +0000
@@ -123,6 +123,7 @@
             add_detection(3, main_t.read());
             muon_buzz();
             muon_total++;
+            gm2_total++;
             mdet = 1;
             }
         wait(1e-7);
@@ -143,6 +144,7 @@
             add_detection(3, main_t.read());
             muon_buzz();
             muon_total++;
+            gm1_total++;
             mdet = 1;
             }
         wait(1e-7);
@@ -199,7 +201,8 @@
     while(1){
         while(!detections.empty()){
             Detection temp = detections.front();
-            pc.printf("%d, %d, %f, %f, %f \n\r", detections.size(), temp.channel, temp.time, v1, v2);
+            pc.printf("Ch: %d, Time: %.2fs, V1: %.1fV, V2: %.1fV \n\r", temp.channel, temp.time, v1, v2);
+            pc.printf("Total GM1: %d, Total GM2: %d, Total Coinc: %d \n\r \n\r", gm1_total, gm2_total, muon_total);
             detections.pop();
             }
         wait(1);