Changeset 14174 for fact/FADctrl/FAD.cc

Timestamp:

06/13/12 15:44:01 (12 years ago)

Author:

ogrimm

Message:

Fixed hanging signal handler in Evidence before abort() was called. Added command to determine dynamic range to FADctrl.

File:

• fact/FADctrl/FAD.cc (modified) (4 diffs)

fact/FADctrl/FAD.cc

@@ -617 +617 @@
 void FAD::cmd_dynrange() {
 
-  // Set number of events required for measurement
-  if (Parameter.size()==1 || !ConvertToInt(Parameter[1], &NumEventsRequested) || NumEventsRequested<=0) {
-        NumEventsRequested = DEFAULT_NUM_CALIB_EVENTS;
-  }
-
-  // Start calibration by setting mode
   Mode = dynrange;
-  Message(INFO, "Starting determination of dynamic range with %d events", NumEventsRequested);
+  Message(INFO, "Starting determination of dynamic range");
 }
 
@@ -667 +661 @@
         else if (Mode == acalib) PrintMessage("Current mode is ACALIB (3x%d events, slowest board %d has %d events)\n", NumEventsRequested, SlowestBoard, MinCount);
         else if (Mode == datarun) PrintMessage("Current mode is DATARUN (%d events requested, %d events taken)\n", NumEventsRequested, NumEvents);
-        else if (Mode == dynrange) PrintMessage("Current mode is DYNRANGE (%d events requested)\n", NumEventsRequested);
+        else if (Mode == dynrange) PrintMessage("Current mode is DYNRANGE\n");
         return;
   }    
@@ -957 +951 @@
 
         // If amplitude calibration mode, check if all boards finished procedure
-        if (Mode == acalib) {
+        if (Mode == acalib || Mode == dynrange) {
           bool Done = true;
           for (unsigned int i=0; i<Boards.size(); i++) {
@@ -965 +959 @@
           // Amplitude calibration finished?
           if (Done) {
-            SaveAmplitudeCalibration();
+            if (Mode == acalib) {
+                  SaveAmplitudeCalibration();
+                  Message(INFO, "Amplitude calibration done, mode set to IDLE");
+                }
+            if (Mode == dynrange) {
+                  Message(INFO, "Dynamic range measurement done, mode set to IDLE");
+                }               
                 Mode = idle;
-                Message(INFO, "Amplitude calibration done, mode set to IDLE");
           }
         }