Index: /trunk/FACT++/src/HeadersFAD.h =================================================================== --- /trunk/FACT++/src/HeadersFAD.h (revision 16531) +++ /trunk/FACT++/src/HeadersFAD.h (revision 16532) @@ -67,5 +67,5 @@ kConfiguring2, kConfigured, - kWritingData + kRunInProgress }; } Index: /trunk/FACT++/src/fadctrl.cc =================================================================== --- /trunk/FACT++/src/fadctrl.cc (revision 16531) +++ /trunk/FACT++/src/fadctrl.cc (revision 16532) @@ -1573,5 +1573,5 @@ // FIXME: Rename WritingData to TakingData - return IsRunInProgress() ? FAD::State::kWritingData : FAD::State::kConnected; + return IsRunInProgress() ? FAD::State::kRunInProgress : FAD::State::kConnected; } @@ -1670,13 +1670,13 @@ "The configuration of all boards was successfully cross checked. Waiting for events with a new run number to receive."); - T::AddStateName(FAD::State::kWritingData, "WritingData", - "The event builder has an open file which belongs to the last run started (that does not mean that new events are currently received)"); + T::AddStateName(FAD::State::kRunInProgress, "RunInProgress", + "Events currently received by the event builder will be flagged to be written, no end-of-run event occured yet."); // FAD Commands - T::AddEvent("SEND_CMD", "I:1", FAD::State::kConnecting, FAD::State::kConnected, FAD::State::kWritingData) + T::AddEvent("SEND_CMD", "I:1", FAD::State::kConnecting, FAD::State::kConnected, FAD::State::kRunInProgress) (bind(&StateMachineFAD::SendCmd, this, placeholders::_1)) ("Send a command to the FADs. Values between 0 and 0xffff are allowed." "|command[uint16]:Command to be transmittted."); - T::AddEvent("SEND_DATA", "I:2", FAD::State::kConnecting, FAD::State::kConnected, FAD::State::kWritingData) + T::AddEvent("SEND_DATA", "I:2", FAD::State::kConnecting, FAD::State::kConnected, FAD::State::kRunInProgress) (bind(&StateMachineFAD::SendCmdData, this, placeholders::_1)) ("Send a command with data to the FADs. Values between 0 and 0xffff are allowed." @@ -1684,33 +1684,33 @@ "|data[uint16]:Data to be sent with the command."); - T::AddEvent("ENABLE_SRCLK", "B:1", FAD::State::kConnecting, FAD::State::kConnected, FAD::State::kWritingData) + T::AddEvent("ENABLE_SRCLK", "B:1", FAD::State::kConnecting, FAD::State::kConnected, FAD::State::kRunInProgress) (bind(&StateMachineFAD::CmdEnable, this, placeholders::_1, FAD::kCmdSrclk)) ("Set SRCLK"); - T::AddEvent("ENABLE_BUSY_OFF", "B:1", FAD::State::kConnecting, FAD::State::kConnected, FAD::State::kWritingData) + T::AddEvent("ENABLE_BUSY_OFF", "B:1", FAD::State::kConnecting, FAD::State::kConnected, FAD::State::kRunInProgress) (bind(&StateMachineFAD::CmdEnable, this, placeholders::_1, FAD::kCmdBusyOff)) ("Set BUSY continously low"); - T::AddEvent("ENABLE_BUSY_ON", "B:1", FAD::State::kConnecting, FAD::State::kConnected, FAD::State::kWritingData) + T::AddEvent("ENABLE_BUSY_ON", "B:1", FAD::State::kConnecting, FAD::State::kConnected, FAD::State::kRunInProgress) (bind(&StateMachineFAD::CmdEnable, this, placeholders::_1, FAD::kCmdBusyOn)) ("Set BUSY constantly high (has priority over BUSY_OFF)"); - T::AddEvent("ENABLE_SCLK", "B:1", FAD::State::kConnecting, FAD::State::kConnected, FAD::State::kWritingData) + T::AddEvent("ENABLE_SCLK", "B:1", FAD::State::kConnecting, FAD::State::kConnected, FAD::State::kRunInProgress) (bind(&StateMachineFAD::CmdEnable, this, placeholders::_1, FAD::kCmdSclk)) ("Set SCLK"); - T::AddEvent("ENABLE_DRS", "B:1", FAD::State::kConnecting, FAD::State::kConnected, FAD::State::kWritingData) + T::AddEvent("ENABLE_DRS", "B:1", FAD::State::kConnecting, FAD::State::kConnected, FAD::State::kRunInProgress) (bind(&StateMachineFAD::CmdEnable, this, placeholders::_1, FAD::kCmdDrsEnable)) ("Switch Domino wave"); - T::AddEvent("ENABLE_DWRITE", "B:1", FAD::State::kConnecting, FAD::State::kConnected, FAD::State::kWritingData) + T::AddEvent("ENABLE_DWRITE", "B:1", FAD::State::kConnecting, FAD::State::kConnected, FAD::State::kRunInProgress) (bind(&StateMachineFAD::CmdEnable, this, placeholders::_1, FAD::kCmdDwrite)) ("Set Dwrite (possibly high / always low)"); - T::AddEvent("ENABLE_CONTINOUS_TRIGGER", "B:1", FAD::State::kConnecting, FAD::State::kConnected, FAD::State::kWritingData) + T::AddEvent("ENABLE_CONTINOUS_TRIGGER", "B:1", FAD::State::kConnecting, FAD::State::kConnected, FAD::State::kRunInProgress) (bind(&StateMachineFAD::CmdEnable, this, placeholders::_1, FAD::kCmdContTrigger)) ("Enable continous (internal) trigger."); - T::AddEvent("ENABLE_TRIGGER_LINE", "B:1", FAD::State::kConnecting, FAD::State::kConnected, FAD::State::kWritingData) + T::AddEvent("ENABLE_TRIGGER_LINE", "B:1", FAD::State::kConnecting, FAD::State::kConnected, FAD::State::kRunInProgress) (bind(&StateMachineFAD::CmdEnable, this, placeholders::_1, FAD::kCmdTriggerLine)) ("Incoming triggers can be accepted/will not be accepted"); - T::AddEvent("ENABLE_COMMAND_SOCKET_MODE", "B:1", FAD::State::kConnecting, FAD::State::kConnected, FAD::State::kWritingData) + T::AddEvent("ENABLE_COMMAND_SOCKET_MODE", "B:1", FAD::State::kConnecting, FAD::State::kConnected, FAD::State::kRunInProgress) (bind(&StateMachineFAD::CmdEnable, this, placeholders::_1, FAD::kCmdSocket)) ("Set debug mode (yes: dump events through command socket, no=dump events through other sockets)"); - T::AddEvent("SET_TRIGGER_RATE", "I:1", FAD::State::kConnecting, FAD::State::kConnected, FAD::State::kWritingData) + T::AddEvent("SET_TRIGGER_RATE", "I:1", FAD::State::kConnecting, FAD::State::kConnected, FAD::State::kRunInProgress) (bind(&StateMachineFAD::SetTriggerRate, this, placeholders::_1)) ("Enable continous trigger"); @@ -1718,26 +1718,26 @@ (bind(&StateMachineFAD::Trigger, this, 1)) ("Issue software triggers"); - T::AddEvent("SEND_N_TRIGGERS", "I", FAD::State::kConnecting, FAD::State::kConnected, FAD::State::kWritingData) + T::AddEvent("SEND_N_TRIGGERS", "I", FAD::State::kConnecting, FAD::State::kConnected, FAD::State::kRunInProgress) (bind(&StateMachineFAD::SendTriggers, this, placeholders::_1)) ("Issue N software triggers (note that these are the triggers sent, not the triggers executed)" "|N[int]: Number of triggers to be sent to the board."); /* - T::AddEvent("START_RUN", "", FAD::kConnecting, FAD::kConnected, FAD::kWritingData) + T::AddEvent("START_RUN", "", FAD::kConnecting, FAD::kConnected, FAD::kRunInProgress) (bind(&StateMachineFAD::StartRun, this, placeholders::_1, true)) ("Set FAD DAQ mode. when started, no configurations must be send."); - T::AddEvent("STOP_RUN", FAD::kConnecting, FAD::kConnected, FAD::kWritingData) + T::AddEvent("STOP_RUN", FAD::kConnecting, FAD::kConnected, FAD::kRunInProgress) (bind(&StateMachineFAD::StartRun, this, placeholders::_1, false)) (""); */ - T::AddEvent("PHASE_SHIFT", "S:1", FAD::State::kConnecting, FAD::State::kConnected, FAD::State::kWritingData) + T::AddEvent("PHASE_SHIFT", "S:1", FAD::State::kConnecting, FAD::State::kConnected, FAD::State::kRunInProgress) (bind(&StateMachineFAD::PhaseShift, this, placeholders::_1)) ("Adjust ADC phase (in 'steps')" "|phase[short]"); - T::AddEvent("RESET_EVENT_COUNTER", FAD::State::kConnecting, FAD::State::kConnected, FAD::State::kWritingData) + T::AddEvent("RESET_EVENT_COUNTER", FAD::State::kConnecting, FAD::State::kConnected, FAD::State::kRunInProgress) (bind(&StateMachineFAD::Cmd, this, FAD::kCmdResetEventCounter)) ("Reset the FAD boards' event counter to 0."); - T::AddEvent("SET_RUN_NUMBER", "X:1", FAD::State::kConnecting, FAD::State::kConnected, FAD::State::kWritingData) + T::AddEvent("SET_RUN_NUMBER", "X:1", FAD::State::kConnecting, FAD::State::kConnected, FAD::State::kRunInProgress) (bind(&StateMachineFAD::SetRunNumber, this, placeholders::_1)) ("Sent a new run-number to the boards" @@ -1749,5 +1749,5 @@ "|memory[short]:Buffer size in Mega-bytes."); - T::AddEvent("SET_REGISTER", "I:2", FAD::State::kConnecting, FAD::State::kConnected, FAD::State::kWritingData) + T::AddEvent("SET_REGISTER", "I:2", FAD::State::kConnecting, FAD::State::kConnected, FAD::State::kRunInProgress) (bind(&StateMachineFAD::SetRegister, this, placeholders::_1)) ("set register to value" @@ -1756,5 +1756,5 @@ // FIXME: Maybe add a mask which channels should be set? - T::AddEvent("SET_REGION_OF_INTEREST", "I:2", FAD::State::kConnecting, FAD::State::kConnected, FAD::State::kWritingData) + T::AddEvent("SET_REGION_OF_INTEREST", "I:2", FAD::State::kConnecting, FAD::State::kConnected, FAD::State::kRunInProgress) (bind(&StateMachineFAD::SetRoi, this, placeholders::_1)) ("Set region-of-interest to value" @@ -1763,5 +1763,5 @@ // FIXME: Maybe add a mask which channels should be set? - T::AddEvent("SET_DAC_VALUE", "I:2", FAD::State::kConnecting, FAD::State::kConnected, FAD::State::kWritingData) + T::AddEvent("SET_DAC_VALUE", "I:2", FAD::State::kConnecting, FAD::State::kConnected, FAD::State::kRunInProgress) (bind(&StateMachineFAD::SetDac, this, placeholders::_1)) ("Set DAC numbers in range to value" @@ -1769,5 +1769,5 @@ "|val[short]:Value to be set"); - T::AddEvent("CONFIGURE", "X:2;C", FAD::State::kConnected, FAD::State::kConfigured, FAD::State::kWritingData) + T::AddEvent("CONFIGURE", "X:2;C", FAD::State::kConnected, FAD::State::kConfigured, FAD::State::kRunInProgress) (bind(&StateMachineFAD::StartConfigure, this, placeholders::_1)) ("Configure a new run. If the internla trigger is enabled this might even start a new run." @@ -1832,5 +1832,5 @@ "|enable[bool]:Whether the event builder should ignore data from this slot (yes) or allowed (no)"); - T::AddEvent("CLOSE_OPEN_FILES", FAD::State::kDisconnected, FAD::State::kConnecting, FAD::State::kConnected, FAD::State::kWritingData) + T::AddEvent("CLOSE_OPEN_FILES", FAD::State::kDisconnected, FAD::State::kConnecting, FAD::State::kConnected, FAD::State::kRunInProgress) (bind(&StateMachineFAD::CloseOpenFiles, this)) ("Close all run files opened by the EventBuilder."); @@ -1847,17 +1847,17 @@ ("Start EventBuilder thread and connect all valid slots."); - T::AddEvent("STOP", FAD::State::kDisconnected, FAD::State::kConnecting, FAD::State::kConnected, FAD::State::kWritingData) + T::AddEvent("STOP", FAD::State::kDisconnected, FAD::State::kConnecting, FAD::State::kConnected, FAD::State::kRunInProgress) (bind(&StateMachineFAD::StopConnection, this)) ("Stop EventBuilder thread (still write buffered events) and disconnect all slots."); - T::AddEvent("ABORT", FAD::State::kDisconnected, FAD::State::kConnecting, FAD::State::kConnected, FAD::State::kWritingData) + T::AddEvent("ABORT", FAD::State::kDisconnected, FAD::State::kConnecting, FAD::State::kConnected, FAD::State::kRunInProgress) (bind(&StateMachineFAD::AbortConnection, this)) ("Immediately abort EventBuilder thread and disconnect all slots."); - T::AddEvent("SOFT_RESET", FAD::State::kConnected, FAD::State::kWritingData) + T::AddEvent("SOFT_RESET", FAD::State::kConnected, FAD::State::kRunInProgress) (bind(&StateMachineFAD::Reset, this, true)) ("Wait for buffers to drain, close all files and reinitialize event builder thread."); - T::AddEvent("HARD_RESET", FAD::State::kConnected, FAD::State::kWritingData) + T::AddEvent("HARD_RESET", FAD::State::kConnected, FAD::State::kRunInProgress) (bind(&StateMachineFAD::Reset, this, false)) ("Free all buffers, close all files and reinitialize event builder thread."); Index: /trunk/FACT++/src/mcp.cc =================================================================== --- /trunk/FACT++/src/mcp.cc (revision 16531) +++ /trunk/FACT++/src/mcp.cc (revision 16532) @@ -403,5 +403,5 @@ } - if (fDimFAD.state() != FAD::State::kWritingData) + if (fDimFAD.state() != FAD::State::kRunInProgress) return MCP::State::kTriggerOn; @@ -415,5 +415,5 @@ { if (/*fDimFTM.state()==FTM::State::kTriggerOn &&*/ - fDimFAD.state()==FAD::State::kWritingData) + fDimFAD.state()==FAD::State::kRunInProgress) return MCP::State::kTakingData; Index: /trunk/FACT++/src/smartfact.cc =================================================================== --- /trunk/FACT++/src/smartfact.cc (revision 16531) +++ /trunk/FACT++/src/smartfact.cc (revision 16532) @@ -2180,5 +2180,5 @@ if (hrz.zd<65) col = HTML::kYellow; - if (hrz.zd<30) + if (hrz.zd<30) # col = HTML::kGreen; @@ -2438,5 +2438,5 @@ case MCP::State::kTakingData: col = HTML::kBlue; - if (fDimFadControl.state()==FAD::State::kWritingData) + if (fDimFadControl.state()==FAD::State::kRunInProgress) col = HTML::kGreen; break;