Changeset 14278 for fact/FADctrl/FAD.cc


Ignore:
Timestamp:
07/19/12 15:33:14 (12 years ago)
Author:
ogrimm
Message:
Added modified calibration procedure for FADctrl for new FAD-based stand-alone oscilloscope.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • fact/FADctrl/FAD.cc

    r14260 r14278  
    6363  Mode = idle;
    6464  Datafile = -1;
    65   EventUpdateDelay = atof(GetConfig("EventUpdateDelay", "2").c_str());
     65  EventUpdateDelay = atof(GetConfig("EventUpdateDelay", "1").c_str());
     66  ModifiedCalibration = false;
    6667
    6768  // Create pipe for data exchange
     
    606607  }
    607608
     609  // Modified calibration procedure for new FAD-based scope (Ulf)
     610  if (Parameter.size() == 3 && Match(Parameter[2], "modified")) ModifiedCalibration = true;
     611  else ModifiedCalibration = false;
     612
    608613  // Start calibration by setting mode
    609614  Mode = acalib;
    610   Message(INFO, "Starting amplitude calibration run with 3x%d events", NumEventsRequested);
     615  if (!ModifiedCalibration) Message(INFO, "Starting amplitude calibration run with 3x%d events", NumEventsRequested);
     616  else Message(INFO, "Starting modified amplitude calibration run with 3x%d events", NumEventsRequested);
    611617}
    612618
Note: See TracChangeset for help on using the changeset viewer.