Changeset 10280 for fact/Evidence

Timestamp:

04/01/11 09:39:25 (14 years ago)

Author:

ogrimm

Message:

Separated Edd into generic Evidence part and FACT-specific part

Location:

fact/Evidence

Files:

• Doc/Evidence.tex (modified) (15 diffs)
• Doc/INSTALL_Edd (copied) (copied from fact/Evidence/Edd/INSTALL ) (1 diff)
• Edd (deleted)
• GUI.cc (copied) (copied from fact/Evidence/Edd/Edd.cc ) (4 diffs)
• GUI.h (copied) (copied from fact/Evidence/Edd/Edd.h ) (3 diffs)

fact/Evidence/Doc/Evidence.tex

@@ -11 +11 @@
 \usepackage{url}
 \usepackage{listings} 
-\usepackage[light]{draftcopy}
+%\usepackage[light]{draftcopy}
 \usepackage{longtable}
 
@@ -39 +39 @@
 \maketitle
 
-This report describes the design and basic functionality of the \E control system. This essentially is a C++ class and a set of programs running on Linux for controlling small scale experiments. It is based on CERN's DIM library for interprocess communication over TCP/IP connections. \lstinline{$Rev$}
+This report describes the design and basic functionality of the \E control system. This essentially is a C++ class and a set of programs running on Linux for controlling small scale experiments. It is based on CERN's DIM library for interprocess communication over TCP/IP connections.
 
 \tableofcontents
@@ -48 +48 @@
 \label{Overview}
 
-The \E control system has been developed for application in small-scale experiments, for which established and comprehensive control systems like EPICS, DOOCS or PVS-II are too large and impose too much overburden.\footnote{Information on these systems can be found at \url{http://www.aps.anl.gov/epics/}, \url{http://tesla.desy.de/doocs}, \url{http://www.etm.at/}.} The development of \E has been started within the FACT project (\emph{First G-APD Cherenkov Telescope} \cite{Bra09,And10}).  
+The \E control system has been developed for application in small-scale experiments, for which established and comprehensive control systems like EPICS, DOOCS or PVS-II are too large and impose too much overburden.\footnote{Information on these systems can be found at \url{http://www.aps.anl.gov/epics/}, \url{http://tesla.desy.de/doocs}, \url{http://www.etm.at/}.} The development of \E has been started within the FACT project (\emph{First G-APD Cherenkov Telescope} \cite{Bra09,And11}).  
 
 An experiment control system often comprises several individual programs that require configuration information, produce data that should be stored and easily visualized, and at least partly need to exchange information between each other. The intention of \E is to a) integrate this with a minimum of extra coding on part of the applications, b) to achieve this using as far as reasonable established tools, c) to be centralized\footnote{This is a design choice that partly defines the range of applicable experiments. For large systems decentralization can be a better approach.}, and d) to be lean. 
@@ -130 +130 @@
 \item Provides a method for configuration requests. If the configuration data is not available, the application terminates with a  message of FATAL severity unless default data is given.
 \item Provides a method for safely translating DIM service data into text.
-\item Implements the virtual DIM methods \lstinline{exitHandler()}. It can be called through a standard DIM command \lstinline{SvrName/EXIT}, taking a single integer as argument. Upon first invocation, the handler just sets the flag \lstinline{ExitRequest} which should be handled by the application. Upon second invocation, it will call \lstinline{exit()}. The user application can override this handler.
+\item Implements the virtual DIM methods \lstinline{exitHandler()}. It can be called through a standard DIM command \lstinline{SvrName/EXIT}, taking a single integer as argument. The handler will issue a message with severity \lstinline{INFO}, including the received integer, and then calls \lstinline{exit(EXIT_SUCCESS)}. The user application can override this handler.
 \item Provides a DIM command \lstinline{SvrName/ResetMessage}. It will set the message service to INFO severity with the information which client issued the command. This can be used to remove a WARN, ERROR or FATAL serverity once the problem has been fixed. The \lstinline{Alarm} server uses this command if it is instructed to reset an alarm level. The command takes no arguments.
 \item Implements the virtual DIM methods \lstinline{errorHandler()}. The error handler will issue a message with ERROR severity that contains the DIM error code. The user application can override this handler.
@@ -153 +153 @@
     ~EvidenceServer();
 
-    enum MessageType {INFO=0, WARN=1, ERROR=2, FATAL=3};
-
-    void Message(MessageType, const char *, ...);
+    enum MessageType {INFO=0, WARN=10, ERROR=20, FATAL=30};
+
+    void Message(int, const char *, ...);
     void SendToLog(const char *, ...);
     string GetConfig(string, string = string());
@@ -164 +164 @@
     static bool ServiceOK(DimInfo *);
     static bool ServiceOK(DimRpcInfo *);
-        static bool ServiceOK(DimCurrentInfo *);
+    static bool ServiceOK(DimCurrentInfo *);
     static vector<string> Tokenize(const string &, const string & = " ");
 
@@ -181 +181 @@
 \underline{\lstinline{GetConfig()}} issues, on first invocation, a DIM remote procedure call to the configuration server to retrieve the required data and returns it as a string. The second argument gives the data to be returned in case the server is unavailable or cannot provide the requested data. If in this case the second string is empty, the program terminates with a FATAL message. Using the service \lstinline{Config/ModifyTime}, the server keeps track of changes to the configuration file in the background. Upon subsequent requests for the same configuration data, it only issues a remote procedure call again if the file changed in the meantime. If not, the same data already retrieved is returned. This way, this function can be repeatedly called, even at high rate, without generating unnecessary load to the configuration server (as the configuration file does not change frequently).
 
-The virtual method \underline{\lstinline{ConfigChanged()}} is executed in a separate thread when the configuration file changes. It can be reimplemented by the application. Calls to \lstinline{GetConfig()} from this method will be blocking and thus result in updated configuration data.
+The virtual method \underline{\lstinline{ConfigChanged()}} is executed in a separate thread when the configuration file changes. It can be reimplemented by the application. Calls to \lstinline{GetConfig()} from this method will be blocking and thus result in immediately updated configuration data. See Sect.\,\ref{ConfigHandling} for more details.
 
 The methods \underline{\lstinline{Lock()}} and \underline{\lstinline{Unlock()}} work on an internal mutex.\footnote{Its type is \lstinline{PTHREAD_MUTEX_ERRORCHECK}. In case an already locked mutex is re-locked, the corresponding system call will therefore return a error and thus avoid dead-locking. Error messages from \lstinline{Lock()} and \lstinline{Unlock()} are written to the console and to the log file. They are not published using \lstinline{Message()} since this method itself uses locking and calling it would result in an infinite recursion.} They are used by \lstinline{GetConfig()} but are also available for the user application to serialize access from multiple threads. Calling functions in the locked state should be avoided as it might result in re-locking.
@@ -265 +265 @@
 \subsection{\lstinline{Alarm} --- Handling of error conditions}
 
-The alarm server maintains a list of \emph{alarm levels} for a given set of servers. The alarm levels are defined as \lstinline{OK} (0), \lstinline{WARN} (1), \lstinline{ERROR} (2), \lstinline{FATAL} (3), and \lstinline{UNAVAILABLE} (4). The first four result from the corresponding severities of the message services, to which the alarm server subscribes. The alarm level does not decrease if, for example, a server issues a message with severity \lstinline{WARN} after one with \lstinline{ERROR}. It is only reset by command or by restarting the alarm server.
+The alarm server maintains a list of \emph{alarm levels} for a given set of servers. The standard alarm levels are defined as \lstinline{OK} (0), \lstinline{WARN} (10), \lstinline{ERROR} (20), \lstinline{FATAL} (30), and \lstinline{UNAVAILABLE} (40). The first four result from the corresponding severities of the message services, to which the alarm server subscribes. The alarm level does not decrease if, for example, a server issues a message with severity \lstinline{WARN} after one with \lstinline{ERROR}. Only if a server changes from \lstinline{UNAVAILABLE} to \lstinline{OK} (by restarting) or through the command \lstinline|ResetAlarm| can the alarm level be lowered.
 
 A master alarm is generated from the highest server alarm level. The alarm server also periodically checks if all required servers are up (searching for them with the DIM browser). It can send an email in case a server is down or in error. One email will be send with each increase of alarm level for each server.
@@ -277 +277 @@
 \lstinline|period| & Interval in seconds to check for server availability.\\[1ex]
 \multicolumn{2}{l}{\textbf{Commands}} \\
-\lstinline|ResetAlarm xyz| & Reset alarm level of server \lstinline|xyz|.\\[1ex]
+\lstinline|ResetAlarm xyz| & Reset alarm level of server \lstinline|xyz|.\\
+\lstinline|Switch on/off| & Switch alarm server on or off.\\[1ex]
 \multicolumn{2}{l}{\textbf{Services}} \\
 \lstinline|Alarm/Summary| & Text listing all observed servers and their alarm level.\\
@@ -360 +361 @@
 As a first step in achieving this, the application should not store the obtained configuration data internally, but always re-request it using the method \lstinline{GetConfig()} described in Sect.\,\ref{EvidenceServer-Methods}. This method will only issue a remote procedure call to the \lstinline{Config} server if the configuration file has been modified since the last invocation. So calling this method even at high rate will not load the configuration server at all if the configuraton file is unchanged, but will yield up-to-date information if it did change.
 
-The remote procedure call is blocking when called from the main thread or from the method \lstinline{ConfigChanged()} (which runs in a separate thread). It is non-blocking, using an \lstinline{rpcInfoHandler()}, when called from any other thread, especially also from the DIM handler thread. Blocking execution means that the remote procedure call will wait until the data has arrived from the server before returning to the application, whereas non-blocking execution will return immediately and invoke a handler later when the data arrived. This procedure is necessary since a blocking remote procedure call from \lstinline{infoHandler()} will result in a dead-lock.
+The remote procedure call is non-blocking (using an \lstinline{rpcInfoHandler()}) when invoked from the DIM handler thread and blocking otherwise. Blocking execution means that the remote procedure call will wait until the data has arrived from the server before returning to the application, whereas non-blocking execution will return immediately and invoke an internal handler later when the data arrived. This procedure is necessary since a blocking remote procedure call from the DIM handler thread (e.g. from an \lstinline{infoHandler()}) will result in a dead-lock.
 
 In the non-blocking case, the call to \lstinline{GetConfig()} returns still the previous, non-updated data even if the configuration file changed. The result of the non-blocking remote procedure call can only be processed by DIM once the current and all queued handler invocations have finished. When this is done, updated data will be returned by subsequent calls to \lstinline{GetConfig()}.
@@ -368 +369 @@
 An alternative, albeit for the programmer more demanding, procedure for semi-automatic updates on configuration information is to reimplement the virtual method \lstinline{ConfigChanged()} in the user class. This method is invoked as a separate thread by the \lstinline{EvidenceServer} class whenever the service \lstinline{Config/ModifyTime} changes (and also at program start-up). As it is not running within the DIM handler thread, \lstinline{GetConfig()} will use blocking connections to get immediately up-to-date data when called from \lstinline{ConfigChanged()}.
 
-Running in a separate thread requires suitable protection by the programmer when accessing common data structures. To ease that, the \lstinline{EvidenceServer} class contains the pair of methods \lstinline{Lock()} and \lstinline{Unlock()} that work on an class internal mutex. The mutex type is \lstinline{PTHREAD_MUTEX_ERRORCHECK} and therefore includes error checking: no dead-lock will occur if double locking, but the program will terminate with a \lstinline{FATAL} message.   
+Running in a separate thread requires suitable protection by the programmer when accessing common data structures. To ease that, the \lstinline{EvidenceServer} class contains the methods \lstinline{Lock()} and \lstinline{Unlock()} that work on an class internal mutex. The mutex type is \lstinline{PTHREAD_MUTEX_ERRORCHECK} and therefore includes error checking: no dead-lock will occur if double locking, but instead the program will terminate with a \lstinline{FATAL} message.   
 
 
@@ -450 +451 @@
 A graphical user interface (GUI), implemented using the Qt and Qwt frameworks\footnote{Information on these frameworks is available at \url{http://qt.nokia.com/} and \url{http://qwt.sourceforge.net/}.}, is available. It derives from standard widget classes extended versions that can display the contents of DIM services and history buffers. A widget to send generic text commands is also available. Qwt is used to display graphs which is not supported by Qt.
 
-The GUI is called \emph{Evidence Data Display} (\lstinline{EDD}). It has a single point interface to the DIM system and distributes received service updates to its widgets using the Qt signal/slot mechanism. This is necessary since the DIM \lstinline{infoHandler()} receiving the updates runs in a separate thread, but manipulations of GUI elements within Qt may only be done by the main thread. This mechanism also guarantees that one GUI instance subscribes not more than once to a particular service, even if the same data is shown by multiple widgets.
+The GUI is called \emph{Evidence Data Display} (\lstinline{Edd}). It has a single point interface to the DIM system and distributes received service updates to its widgets using the Qt signal/slot mechanism. This is necessary since the DIM \lstinline{infoHandler()} receiving the updates runs in a separate thread, but manipulations of GUI elements within Qt may only be done by the main thread. This mechanism also guarantees that one GUI instance subscribes not more than once to a particular service, even if the same data is shown by multiple widgets.
 
 The GUI implementation is designed to be easily portable and does not use operating-system specifics. It sticks to standard C++ code, to Qt capabilities and to DIM. Qt is explicitely designed for cross-platform applications.  
@@ -466 +467 @@
 \label{DIMDetails}
 
-\subsection{Format of \lstinline{DIM_DNS/SERVER_LIST} and \lstinline{xyz/SERVICE_LIST}}
+\subsection{Format of \lstinline{DIS_DNS/SERVER_LIST} and \lstinline{xyz/SERVICE_LIST}}
 \label{ServiceFormats}
  
@@ -497 +498 @@
 If server and client use the same structure definition, a cast like \lstinline{struct A *Pnt = getData()} will guarantee correct access to elements. For example, \lstinline{Pnt->b[1]} will contain the second integer, even if client and server pad structures differently. Padding can also be disabled for a server if desired.
 
-In general, no blocking functions should be called from within a DIM handler. Specifically, making a blocking remote procedure call in an \lstinline{infoHandler()} will dead lock.\footnote{Non-blocking reception using an \lstinline{rpcInfoHandler()} is possible}.
+In general, no blocking functions should be called from within a DIM handler. Specifically, making a blocking remote procedure call in an \lstinline{infoHandler()} will dead lock.\footnote{Non-blocking reception using an \lstinline{rpcInfoHandler()} is possible}. This also applies to the \lstinline{exitHandler()}. Calling \lstinline{exit()} from this handler will run destructors of static objects within the DIM thread. This might result in undesirable behaviour if DIM services are deleted in those destructors.
 
 If DIM is compiled without threads, it uses internally the signals SIGIO and SIGALRM for communication.
@@ -538 +539 @@
 \begin{thebibliography}{xxxx00}
 
-\bibitem[Gas01]{Gas01} C. Gaspar, M. D\"{o}nszelmann and Ph. Charpentier, \emph{DIM, a portable, light weight package for information publishing, data transfer and inter-process communication}, Computer Physics Communications 140 1+2 102-9, 2001
-\bibitem[Bra09]{Bra09} I. Braun et al., Nucl. Inst. and Methods A 610, 400 (2009)
-\bibitem[And10]{And10} H. Anderhub et al., Nucl. Inst. and Methods, to be published (2010)
-
+\bibitem[Gas01]{Gas01} C. Gaspar, M. D\"{o}nszelmann and Ph. Charpentier, \emph{DIM, a portable, light weight package for information publishing, data transfer and inter-process communication}, Computer Physics Communications \textbf{140}, 102 (2001)
+\bibitem[Bra09]{Bra09} I. Braun et al., Nucl. Inst. and Methods \textbf{A 610}, 400 (2009)
+\bibitem[And11]{And11} H. Anderhub et al., Nucl. Inst. and Methods, \textbf{A 628}, 107 (2011)
 \end{thebibliography}
 

fact/Evidence/Doc/INSTALL_Edd

@@ -36 +36 @@
 and DIMDIR to the DIM installation.
 
-The subversion repository should preferably be checked out fully, as
-the class describing the M0 raw data format is currently needed.
-
 Issue 'qmake', then 'make' will build the executable Edd.
 

fact/Evidence/GUI.cc

@@ -13 +13 @@
 ============================================================ */
 
-#include "Edd.h"
-
-Qt::GlobalColor LineColors[] = {Qt::black, Qt::blue, Qt::red, Qt::green, Qt::white,
-        Qt::darkRed, Qt::darkGreen, Qt::darkBlue, Qt::cyan,
-        Qt::darkCyan, Qt::magenta, Qt::darkMagenta,
-        Qt::gray, Qt::darkGray, Qt::lightGray};
-
+#include "GUI.h"
 
 class EddDim *Handler;
-QString DRSBoard = "drsdaq";
-std::string PixelMapText;
-
+
+//
 // History chooser function (opens plot for numeric data, TextHist for all other)
+//
 QWidget *OpenHistory(char *Service, int Index) {
 
@@ -54 +48 @@
 }
 
+//
 // Set status tip (returns true if service was available)
+//
 bool SetStatus(QWidget *W, QString Name, int Time, QString Format, int Index) {
 
@@ -589 +585 @@
 QwtPlotCurve *EddBasePlot::NewCurve(QwtText Title) {
 
+  static Qt::GlobalColor LineColors[] = {Qt::black, Qt::blue, Qt::red, Qt::green, Qt::white,
+        Qt::darkRed, Qt::darkGreen, Qt::darkBlue, Qt::cyan, Qt::darkCyan, Qt::magenta, Qt::darkMagenta,
+        Qt::gray, Qt::darkGray, Qt::lightGray};
   struct PlotItem N;
 
@@ -1006 +1005 @@
 }
 
-//
-//
-// ====== FACT specific part ======
-//
-//
-
-////////////////////////
-// Event oscilloscope //
-////////////////////////
+
+/////////////////////
+// Open new window //
+/////////////////////
 
 // Constructor
-EventScope::EventScope(QWidget *P): EddBasePlot(P), PixelMap(PixelMapText, false) {
-
-  Name = DRSBoard+"/EventData";
-
-  Tmpfile = tmpfile();
-  if(Tmpfile == NULL) {
-    QMessageBox::warning(this, "Edd Message", "Could not open temporary file.", QMessageBox::Ok);
-  }
-
-  // Open file with RawDataCTX
-  RD = new RawDataCTX(true);
-  ErrCode = CTX_NOTOPEN;
-
-  // Context menu
-  PhysPipeAction = new QAction("Physical pipeline", this);
-  PhysPipeAction->setCheckable(true);
-  connect(PhysPipeAction, SIGNAL(triggered()), SLOT(PlotTraces()));
-  Menu->insertAction(StripAction, PhysPipeAction);
-
-  PersistanceAction = new QAction("Persistance", this);
-  PersistanceAction->setCheckable(true);
-  Menu->insertAction(StripAction, PersistanceAction);
-  Menu->removeAction(StripAction);
-
-  // Initial trace
-  AddTrace(0,0,0);
-
-  // Connect to DIM handler
-  if (connect(Handler, SIGNAL(YEP(QString, int, QByteArray, QString, QString)), SLOT(Update(QString, int, QByteArray, QString, QString))) == false) {
-    printf("Failed connection for %s\n", Name.toAscii().data());
-  }
-  SetActive(true);
-}
-
-// Destructor (items with parent widget are automatically deleted)
-EventScope::~EventScope() {
-
-  SetActive(false);
-  while (!List.isEmpty()) DeleteCurve(List.last().Signal);
-  delete RD;
-  if (Tmpfile != NULL) fclose(Tmpfile);
-}  
-
-// Add trace
-void EventScope::AddTrace(int Board, int Chip, int Channel) {
-
-  struct ItemDetails N;
-  
-  N.Signal = NewCurve(QString::number(Board)+","+QString::number(Chip)+","+ QString::number(Channel)+ " (" + ToPixel(0, Board, Chip, Channel) + ")");
-  N.Board = Board;
-  N.Chip = Chip;
-  N.Channel = Channel;
-  N.Trigger = new QwtPlotMarker();
-  N.Trigger->setSymbol(QwtSymbol(QwtSymbol::Diamond, QBrush(N.Signal->pen().color()), N.Signal->pen(), QSize(10,10)));
-  N.Trigger->attach(this);
-
-  if (List.isEmpty()) {
-    QPen Pen = N.Signal->pen();
-        Pen.setWidth(2);
-        N.Signal->setPen(Pen);
-  }
-  List.append(N);
-    
-  PlotTraces();
-}
-
-// Update last trace (to reflect current setting of spin boxes in DAQ page)
-void EventScope::UpdateFirst(int Board, int Chip, int Channel) {
-
-  if (List.isEmpty()) return;
-  
-  // Clear in case persistance was activated
-  ClearCurve(0);
-
-  List.first().Signal->setTitle(QString::number(Board)+","+QString::number(Chip)+","+ QString::number(Channel) + " (" + ToPixel(0, Board, Chip, Channel) + ")");
-  List.first().Board = Board;
-  List.first().Chip = Chip;
-  List.first().Channel = Channel;
-    
-  PlotTraces();
-}
-  
-// Update event buffer
-void EventScope::Update(QString Name, int Time, QByteArray Data, QString Format, QString) {
-  
-  if (Name != this->Name) return;
-
-  // Check if service available
-  if (!SetStatus(this, Name, Time, Format)) return;
-  if (Data.size() < (int) sizeof(RunHeader)) return;
-  
-  // Disconnect while processing to avoid queing of events
-  disconnect(Handler, SIGNAL(YEP(QString, int, QByteArray, QString, QString)), this, SLOT(Update(QString, int, QByteArray, QString, QString)));
-  
-  // Open tempory file and write event data to this file
-  QTemporaryFile File;
-  if (!File.open()) {
-        QMessageBox::warning(this, "Edd Message","Could not open temporary file.",QMessageBox::Ok);
-        return;
-  }
-  if (File.write(Data) == -1) {
-        QMessageBox::warning(this, "Edd Message","Could not write data to temporary file.",QMessageBox::Ok);
-        return; 
-  }
-
-  // Prepare temporary file for run header  
-  ftruncate(fileno(Tmpfile), 0);
-  rewind(Tmpfile);
-
-  // Open file with RawDataCTX
-  switch (ErrCode = RD->OpenDataFile(File.fileName().toAscii().data(), Tmpfile)) {
-    case CTX_FOPEN:             QMessageBox::warning(this, "Edd Message","Could not open file.",QMessageBox::Ok);
-                                                return;
-    case CTX_RHEADER:   QMessageBox::warning(this, "Edd Message","Could not read run header.",QMessageBox::Ok);
-                                        return;
-    case CTX_BSTRUCT:   QMessageBox::warning(this, "Edd Message","Could not read board structures.",QMessageBox::Ok);
-                                                return;
-        default: break;
-  }
-
-  // Emit signal containing run header
-  rewind(Tmpfile);
-  QTextStream Stream(Tmpfile);
-  emit(RunHeaderChanged(Stream.readAll()));
-
-  // Prepare temporary file for event header  
-  ftruncate(fileno(Tmpfile), 0);
-  rewind(Tmpfile);
-
-  // Write event header text to file
-  if (RD->ReadEvent(0, Tmpfile) != CTX_OK) {
-    QMessageBox::warning(this, "Edd Warning","Could not read event.",QMessageBox::Ok);
-    return;
-  }
-
-  // Add trigger cells to file
-  fprintf(Tmpfile, "\nTrigger cells:");
-  int *TrigCells = (int *) RD->Data;
-  for (unsigned int i=0; i<RD->RHeader->NBoards; i++) {
-    fprintf(Tmpfile, "\n Board %d   ", i);
-        for (unsigned int j=0; j<RD->RHeader->NChips; j++) fprintf(Tmpfile, "%d ", *(TrigCells++));
-  }
-
-  // Emit signal containing run header
-  rewind(Tmpfile);
-  emit(EventHeaderChanged(Stream.readAll()));
-
-  // Update display
-  PlotTraces();
-  
-  // Reconnect after processing
-  connect(Handler, SIGNAL(YEP(QString, int, QByteArray, QString, QString)), SLOT(Update(QString, int, QByteArray, QString, QString)));
-}
-
-// Update curves
-void EventScope::PlotTraces() {
-
-  double x,y;
-  unsigned int Cell, Trig;
-  static int Last = 0;
-  
-  // Only process if valid data in RawDataCTX class
-  if (ErrCode != CTX_OK) return;
-  
-  // Set x axis title
-  if (PhysPipeAction->isChecked()) setAxisTitle(QwtPlot::xBottom, "Time from start of pipeline (ns)");
-  else setAxisTitle(QwtPlot::xBottom, "Time from trigger minus one revolution (ns)");
-
-  // Loop through event data to update event scope
-  RunHeader *R = RD->RHeader;
-  for (int i=0; i<List.size(); i++) {
-
-        if (PersistanceAction->isChecked()) List[i].Signal->setStyle(QwtPlotCurve::Dots);
-        else {
-          ClearCurve(i);
-          List[i].Signal->setStyle(QwtPlotCurve::Lines);
-        }
-
-        // Check if current event contains requested trace
-    if (List[i].Board>=R->NBoards || List[i].Chip>=R->NChips || List[i].Channel>=R->NChannels) continue;
-
-        // Set trigger marker visibility
-        List[i].Trigger->setVisible(PhysPipeAction->isChecked());
-        
-        // Determine trigger cell
-        Trig = *((int *) RD->Data + List[i].Board*R->NChips + List[i].Chip);
-
-        // Calulate point of curve
-        for (unsigned int j=0; j<R->Samples; j++) {
-
-          if (PhysPipeAction->isChecked()) Cell = (j - Trig) % 1024;
-          else Cell = j;
-
-          x = j / RD->BStruct[List[i].Board].NomFreq;
-          y = *((short *) (RD->Data + R->NBoards*R->NChips*sizeof(int)) +
-                List[i].Board*R->NChips*R->NChannels*R->Samples + List[i].Chip*R->NChannels*R->Samples +
-                List[i].Channel*R->Samples + Cell) * RD->BStruct[List[i].Board].ScaleFactor;
-
-          AddPoint(i, x, y);
-          
-          // Set trigger point indicator
-          if (Trig == j) List[i].Trigger->setValue(x, y);       
-    }
-  }
-
-  // Limit update rate in persistance mode 
-  if (!PersistanceAction->isChecked() || time(NULL) > Last) {
-    UpdatePlot();
-    Last = time(NULL);
-  }
-
-
-  // Loop through event data for pixel display
-  QVector<double> Pixel(R->NBoards*R->NChips*R->NChannels);
-  int Count = 0;
-
-  for (unsigned int Board=0; Board<R->NBoards; Board++) {
-  for (unsigned int Chip=0; Chip<R->NChips; Chip++) {
-  for (unsigned int Channel=0; Channel<R->NChannels; Channel++) {
-    Pixel[Count] = DBL_MIN;
-
-        for (unsigned int i=0; i<R->Samples; i++) {
-          y = *((short *) (RD->Data + R->NBoards*R->NChips*sizeof(int)) +
-                Board*R->NChips*R->NChannels*R->Samples + Chip*R->NChannels*R->Samples +
-                Channel*R->Samples + i) * RD->BStruct[Board].ScaleFactor;
-
-          if (y > Pixel[Count]) Pixel[Count] = y;
-    }
-        Count++;          
-  }}}
-  
-  emit(PixelData(Pixel));
-}
-
-// Remove list entry
-void EventScope::DeleteCurve(QwtPlotCurve *Curve) {
-
-  for (int i=0; i<List.size(); i++) if (List[i].Signal == Curve) {
-        delete List[i].Trigger;
-    List.removeAt(i);
-  }
-}
-
-// Set display active (if inactive, disconnect from server)
-void EventScope::SetActive(bool State) {
-
-  static bool Active = false;
-
-  if (State && !Active) Handler->Subscribe(DRSBoard+"/EventData");
-  if (!State && Active) Handler->Unsubscribe(DRSBoard+"/EventData");
-  Active = State;
-}
-
-// Translate FPA ID to Pixel ID (use '-' instead of PM_ERROR_CODE)
-QString EventScope::ToPixel(unsigned int Crate, unsigned int Board, unsigned int Patch, unsigned int Pixel) {
-  
-  if (FPA_to_Pixel(Crate, Board, Patch, Pixel) == PM_ERROR_CODE) return "-";
-  else return QString::number(FPA_to_Pixel(Crate, Board, Patch, Pixel));
-}
-  
-//------------------------------------------------------------------
-//**************************** Tab pages ***************************
-//------------------------------------------------------------------
-
-//
-// Environment page
-//
-TP_Environment::TP_Environment() {
-
-  QGridLayout *Layout = new QGridLayout(this);
-  setAttribute(Qt::WA_DeleteOnClose);
-
-  // Status display
-  EddLineDisplay *Line = new EddLineDisplay("ARDUINO/Message");
-  Line->setMaximumWidth(200);
-  Layout->addWidget(Line, 0, 0, 1, 2);      
-
-  // Generate plot and data displays
-  EddPlot *Plot = new EddPlot();
-  for (int i=0; i<10; i++) {
-    Line = new EddLineDisplay("ARDUINO/Data", i);
-    Layout->addWidget(Line, i%5+1, i/5, 1, 1);
-    Plot->AddService("ARDUINO/Data", i);
-  }
-  Layout->addWidget(Plot, 0, 2, 9, 7);      
-
-  // Night sky monitor
-  Line = new EddLineDisplay("SQM/Message");
-  Line->setMaximumWidth(200);
-  Layout->addWidget(Line, 6, 0, 1, 2);      
-
-  Line = new EddLineDisplay("SQM/NSB");
-  Layout->addWidget(Line, 7, 0, 1, 1);          
-}
-
-//
-// Bias page
-//
-TP_Bias::TP_Bias() {
-
-  QGridLayout *Layout = new QGridLayout(this);
-  setAttribute(Qt::WA_DeleteOnClose);
-  EddLineDisplay *Line;
-  
-  EddPlot *Plot = new EddPlot();
-  Plot->setMinimumWidth(400);
-  for (int i=0; i<18; i++) {
-    Line = new EddLineDisplay("Bias/VOLT/ID00", i+64);
-    Layout->addWidget(Line, i%9+1, 0+i/9, 1, 1);
-    Plot->AddService("Bias/VOLT/ID00", i+64);
-
-    Line = new EddLineDisplay("Bias/VOLT/ID00", i+96);
-    Layout->addWidget(Line, i%9+1, 2+i/9, 1, 1);
-    Plot->AddService("Bias/VOLT/ID00",i+96);
-  }
-
-  Layout->addWidget(Plot, 0, 4, 12, 3);
-  Line = new EddLineDisplay("Bias/Message");
-  Line->setMaximumWidth(200);
-  Layout->addWidget(Line, 0, 0, 1, 3);      
-
-  EddCommand *Command = new EddCommand("Bias/Command");
-  Layout->addWidget(Command, 10, 0, 1, 4);    
-
-  EddText *Text = new EddText("Bias/ConsoleOut", true);
-  Text->setFixedWidth(400);
-  Layout->addWidget(Text, 11, 0, 4, 4);
-  
-  QWidget *Button = new QPushButton("Currents");
-  Layout->addWidget(Button, 13, 4, 1, 1);      
-  connect(Button, SIGNAL(pressed()), SLOT(BiasCurrents()));
-}
-
-void TP_Bias::BiasCurrents() {
-
-  QMainWindow *M = new QMainWindow;
+EddWindow::EddWindow(QString ButtonName, QString WindowName): QPushButton(ButtonName) {
+  
+  M = new QMainWindow;
   M->setCentralWidget(new QWidget);
   M->setStatusBar(new QStatusBar(M));
-  M->setWindowTitle("Edd - Bias currents");
-  M->setAttribute(Qt::WA_DeleteOnClose);
-
-  QGridLayout *Layout = new QGridLayout(M->centralWidget());
-  EddLineDisplay *Line;
-  EddPlot *Plot = new EddPlot();
-
-  for (int i=0; i<36; i++) {
-    Line = new EddLineDisplay("Bias/MICROAMP/ID00", i+64);
-        Line->setMaximumWidth(60);
-    Layout->addWidget(Line, i%9, 0+i/9, 1, 1);
-    Plot->AddService("Bias/MICROAMP/ID00", i+64);       
-  }
-  Layout->addWidget(Plot, 0, 4, 30, 12);
-  
-  M->show();
-}
-
-//
-// Feedback page
-//
-TP_Feedback::TP_Feedback() {
-
-  setAttribute(Qt::WA_DeleteOnClose);
-  QGridLayout *Layout = new QGridLayout(this);
-  EddLineDisplay *Line;
-
-  EddPlot *Plot = new EddPlot();
-  for (int i=0; i<36; i++) {
-    Line = new EddLineDisplay("Feedback/Average", i);
-        Line->setMaximumWidth(60);
-    Layout->addWidget(Line, i%9+2, 0+i/9, 1, 1);
-    Plot->AddService("Feedback/Average", i);
-  }
-  Layout->addWidget(Plot, 0, 4, 12, 10);
-
-  Line = new EddLineDisplay("Feedback/Message");
-  Line->setMaximumWidth(200);
-  Layout->addWidget(Line, 0, 0, 1, 2);      
-
-  Line = new EddLineDisplay("Feedback/State");
-  Line->setMaximumWidth(150);
-  Layout->addWidget(Line, 1, 0, 1, 2);      
-  Line = new EddLineDisplay("Feedback/Count");
-  Line->setMaximumWidth(60);
-  Layout->addWidget(Line, 1, 2);      
-
-  QWidget *Button = new QPushButton("Details");
-  Layout->addWidget(Button, 12, 0, 1, 1);      
-  connect(Button, SIGNAL(pressed()), SLOT(FeedbackDetails()));
-}
-
-void TP_Feedback::FeedbackDetails() {
-
-  QMainWindow *M = new QMainWindow;
-  M->setCentralWidget(new QWidget);
-  M->setStatusBar(new QStatusBar(M));
-  M->setWindowTitle("Edd - Feedback Details");
-  M->setAttribute(Qt::WA_DeleteOnClose);
-
-  QGridLayout *Layout = new QGridLayout(M->centralWidget());
-  EddLineDisplay *Line;
-  EddPlot *Plot = new EddPlot();
-
-  for (int i=0; i<36; i++) {
-    Line = new EddLineDisplay("Feedback/Sigma", i);
-        Line->setMaximumWidth(60);
-    Layout->addWidget(Line, i%9, 0+i/9, 1, 1);
-    Plot->AddService("Feedback/Sigma", i);
-        
-    Line = new EddLineDisplay("Feedback/Target", i);
-        Line->setMaximumWidth(60);
-    Layout->addWidget(Line, i%9+10, 0+i/9, 1, 1);
-        
-        Line = new EddLineDisplay("Feedback/Response", i);
-        Line->setMaximumWidth(60);
-    Layout->addWidget(Line, i%9+20, 0+i/9, 1, 1);
-  }
-  Layout->addWidget(Plot, 0, 4, 30, 12);
-  
-  M->show();
-}
-
-//
-// FADctrl page
-//
-TP_FADctrl::TP_FADctrl() {
-
-  QString Board;
-  
-  QGridLayout *Layout = new QGridLayout(this);
-  setAttribute(Qt::WA_DeleteOnClose);
-  EddLineDisplay *Line;
-  
-  Line = new EddLineDisplay("FADctrl/Message");
-  Line->setMaximumWidth(200);
-  Layout->addWidget(Line, 0, 0, 1, 3);      
-
-  EddCommand *Command = new EddCommand("FADctrl/Command");
-  Layout->addWidget(Command, 1, 0, 1, 4);    
-
-  EddText *Text = new EddText("FADctrl/ConsoleOut", true);
-  Text->setFixedWidth(400);
-  Layout->addWidget(Text, 2, 0, 4, 4);
-
-  for (int i=0; i<10; i++) {
-    Board = Board.sprintf("FADctrl/Board%.2d/", i);
-    Line = new EddLineDisplay(Board+"Server");
-    Layout->addWidget(Line, i+7, 0, 1, 1);
-    Line = new EddLineDisplay(Board+"BoardID");
-    Layout->addWidget(Line, i+7, 1, 1, 1);
-    Line = new EddLineDisplay(Board+"Temperature", 0);
-    Layout->addWidget(Line, i+7, 2, 1, 1);
-    Line = new EddLineDisplay(Board+"Temperature", 1);
-    Layout->addWidget(Line, i+7, 3, 1, 1);
-    Line = new EddLineDisplay(Board+"Temperature", 2);
-    Layout->addWidget(Line, i+7, 4, 1, 1);
-    Line = new EddLineDisplay(Board+"Temperature", 3);
-    Layout->addWidget(Line, i+7, 5, 1, 1);
-  }
-}
-
-//
-// Event scope page
-//
-TP_DAQ::TP_DAQ() {
-
-  EddLineDisplay *Line;
-
-  setAttribute(Qt::WA_DeleteOnClose);
-  QGridLayout *Layout = new QGridLayout(this);
-
-  // Run-related information 
-  Line = new EddLineDisplay("drsdaq/RunNumber");
-  Line->setMaximumWidth(100);
-  Layout->addWidget(Line, 0, 1, 1, 1);      
-  Line = new EddLineDisplay(DRSBoard+"/EventNumber");
-  Line->setMaximumWidth(100);
-  Layout->addWidget(Line, 0, 2, 1, 1);      
-  Line = new EddLineDisplay("drsdaq/RunSizeMB");
-  Line->setMaximumWidth(100);
-  Layout->addWidget(Line, 0, 3, 1, 1);      
-  Line = new EddLineDisplay("drsdaq/FileSizeMB");
-  Line->setMaximumWidth(100);
-  Layout->addWidget(Line, 0, 4, 1, 1);      
-  Line = new EddLineDisplay("drsdaq/FileName");
-  Line->setMaximumWidth(200);
-  Layout->addWidget(Line, 0, 5, 1, 1);      
-
-  // Message service
-  Line = new EddLineDisplay(DRSBoard+"/Message");
-  Line->setMaximumWidth(200);
-  Layout->addWidget(Line, 1, 1, 1, 2);      
-
-  // Event scope
-  Scope = new EventScope;
-  Scope->setMinimumWidth(700);
-
-  // Text boxes for run and event header
-  RunHeaderDisplay = new QPlainTextEdit();
-  EventHeaderDisplay = new QPlainTextEdit();
-  RunHeaderDisplay->setReadOnly(true);
-  EventHeaderDisplay->setReadOnly(true);
-
-  // Tab widget
-  QTabWidget *TabWidget = new QTabWidget();
-  TabWidget->addTab(Scope, "&Signals");
-  TabWidget->addTab(RunHeaderDisplay, "&Run Header");
-  TabWidget->addTab(EventHeaderDisplay, "&Event Header");
-  Layout->addWidget(TabWidget, 2, 1, 6, 5);
-
-  // Channel number 
-  Channel = new QSpinBox;
-  connect(Channel, SIGNAL(valueChanged(int)), SLOT(UpdateScope(int)));
-  Channel->setToolTip("DRS channel number");
-
-  // Chip number 
-  Chip = new QSpinBox;
-  connect(Chip, SIGNAL(valueChanged(int)), SLOT(UpdateScope(int)));
-  Chip->setToolTip("DRS chip number");
-
-  // Board number 
-  Board = new QSpinBox;
-  connect(Board, SIGNAL(valueChanged(int)), SLOT(UpdateScope(int)));
-  Board->setToolTip("DRS board number");
-
-  // Pixel ID
-  PixelID = new QSpinBox;
-  PixelID->setMaximumWidth(60);
-  PixelID->setRange(-1, 9999);
-  PixelID->setSpecialValueText("n/a");
-  connect(PixelID, SIGNAL(valueChanged(int)), SLOT(TranslatePixelID(int)));
-  PixelID->setToolTip("Pixel identification");
-  
-  // Layout of pixel addressing widgets
-  QFormLayout *FormLayout = new QFormLayout();
-  FormLayout->setRowWrapPolicy(QFormLayout::WrapAllRows);
-  FormLayout->addRow("Board", Board);
-  FormLayout->addRow("Chip", Chip);
-  FormLayout->addRow("Channel", Channel);
-  FormLayout->addRow("Pixel ID", PixelID);
-  Layout->addLayout(FormLayout, 0, 0, 4, 1);
-  
-  // Add trace permanently
-  QPushButton *Button = new QPushButton("Keep trace");
-  Button->setToolTip("Keep trace in display");
-  Button->setMaximumWidth(80);
-  Layout->addWidget(Button, 4, 0);
-  connect(Button, SIGNAL(clicked()), SLOT(KeepCurrent()));
-
-  // Stop/start
-  StartStopButton = new QPushButton("Stop");
-  StartStopButton->setToolTip("Start/stop display");
-  StartStopButton->setMaximumWidth(80);
-  StartStopButton->setCheckable(true);
-  QPalette Palette = StartStopButton->palette();
-  Palette.setColor(QPalette::ButtonText, Qt::blue);
-  Palette.setColor(QPalette::Button, Qt::green);
-  StartStopButton->setPalette(Palette);
-  StartStopButton->setFont(QFont("Times", 10, QFont::Bold));
-  Layout->addWidget(StartStopButton, 6, 0);
-  connect(StartStopButton, SIGNAL(toggled(bool)), SLOT(StartStop(bool)));
-
-  // Button to show event display
-  QPushButton *PixDisplay = new QPushButton("Pixel display");
-  PixDisplay->setFont(QFont("Times", 10, QFont::Bold));
-  PixDisplay->setToolTip("Show event display window");
-  PixDisplay->setMaximumWidth(80);
-  Layout->addWidget(PixDisplay, 7, 0);
-  connect(PixDisplay, SIGNAL(clicked()), SLOT(ShowPixelDisplay()));
-
-  // Event display window
-  Display = new QWidget();
-  Display->setWindowTitle("Edd - Event display");
-  
-  Pixel = new QPushButton *[MAXPIXEL];
-  int Count = 0;
-  double x,y;
-  
-  for (int ix=-22; ix<=22; ix++) for (int iy=-19; iy<=20; iy++) {  
-    if (Count == MAXPIXEL) break;
-        
-        x = ix*0.866;
-        y = iy - (ix%2==0 ? 0.5:0);
-    if ((pow(x,2)+pow(y,2) >= 395) && !(abs(ix)==22 && iy==7)) continue;
-        
-    Pixel[Count] = new QPushButton(Display);
-        Pixel[Count]->setAutoFillBackground(true);
-        Pixel[Count]->setGeometry((int) (x*12.5 + 250), (int) (y*12.5 + 250), 10, 10);
-        Pixel[Count]->show();
-        Count++;
-  }
-
-  connect(Scope, SIGNAL(RunHeaderChanged(QString)), RunHeaderDisplay, SLOT(setPlainText(QString)));
-  connect(Scope, SIGNAL(EventHeaderChanged(QString)), EventHeaderDisplay, SLOT(setPlainText(QString)));
-
-  StartStop(false);
-  connect(Scope, SIGNAL(PixelData(QVector<double>)), SLOT(SetPixelData(QVector<double>)));
-
-  // Call to get initial pixel ID correct
-  UpdateScope(0);
-}
-
-TP_DAQ::~TP_DAQ() {
-
-  delete[] Pixel;
-}
-
-// Translate pixel ID to board, chip, channel
-void TP_DAQ::TranslatePixelID(int ID) {
-
-  // setValue() below will call UpdateScope() through signal, therefore need to store numbers here
-  unsigned int BoardNo = Scope->Pixel_to_FPAboard(ID);
-  unsigned int PatchNo = Scope->Pixel_to_FPApatch(ID);
-  unsigned int PixelNo = Scope->Pixel_to_FPApixel(ID);
-  
-  if (BoardNo == Scope->PM_ERROR_CODE) PixelID->setValue(-1);
-  else {
-    Board->setValue(BoardNo);
-    Chip->setValue(PatchNo);
-    Channel->setValue(PixelNo);
-  }
-}
-
-// Keep current trace
-void TP_DAQ::KeepCurrent() {
-
-  Scope->AddTrace(Board->value(), Chip->value(), Channel->value());
-}
-
-// Start/stop event acquisition
-void TP_DAQ::StartStop(bool State) {
-
-  Scope->SetActive(!State);
-  StartStopButton->setText(State ? "Start" : "Stop");
-  if (!State) connect(Handler, SIGNAL(YEP(QString, int, QByteArray, QString, QString)), Scope, SLOT(Update(QString, int, QByteArray, QString, QString)));
-  else disconnect(Handler, SIGNAL(YEP(QString, int, QByteArray, QString, QString)), Scope, SLOT(Update(QString, int, QByteArray, QString, QString)));
-}
-
-// Update event scope
-void TP_DAQ::UpdateScope(int) {
-
-  // Update pixel ID
-  PixelID->setValue(Scope->FPA_to_Pixel(0, Board->value(), Chip->value(), Channel->value()));
-  if (PixelID->value() == (int) Scope->PM_ERROR_CODE) PixelID->setValue(-1);
-  
-  // Update first trace
-  Scope->UpdateFirst(Board->value(), Chip->value(), Channel->value());
-}
-
-// Show/hide pixel display
-void TP_DAQ::ShowPixelDisplay() {
-
-  Display->show();
-  Display->raise();
-}
-
-void TP_DAQ::SetPixelData(QVector<double> Data) {
-
-  QwtLinearColorMap Map;
-
-  for (int i=0; i<Data.size(); i++) {
-        Pixel[i]->setPalette(QPalette(Map.color(QwtDoubleInterval(300, 400), Data[i])));
-  }
-}
-
-
-//
-// Evidence page
-//
-TP_Evidence::TP_Evidence() {
-
-  setAttribute(Qt::WA_DeleteOnClose);
-  QGridLayout *Layout = new QGridLayout(this);
-  EddLineDisplay *Line;
-  EddText *Text;
-  
-  Line = new EddLineDisplay("Alarm/Message");
-  Line->setMaximumWidth(200);
-  Layout->addWidget(Line, 0, 0, 1, 2);      
-
-  QPushButton *Button = new QPushButton();
-  Button->setText("ON/OFF");
-  Button->setCheckable(true);
-  connect(Button, SIGNAL(toggled(bool)), SLOT(ToggleAlarm(bool)));
-  Layout->addWidget(Button, 0, 3, 1, 1);
-
-  Line = new EddLineDisplay("Alarm/MasterAlarm");
-  Layout->addWidget(Line, 0, 1, 1, 1);
-
-  Text = new EddText("Alarm/Summary", true);
-  Text->Accumulate = false;
-  Text->setMaximumWidth(200);
-  Text->setMaximumHeight(150);
-  Layout->addWidget(Text, 1, 0, 1, 2);
-
-  Line = new EddLineDisplay("DColl/Message");
-  Line->setMaximumWidth(200);
-  Layout->addWidget(Line, 3, 0, 1, 2);      
-
-  Line = new EddLineDisplay("DColl/DataSizeMB");
-  Layout->addWidget(Line, 4, 0, 1, 1);
-
-  Line = new EddLineDisplay("DColl/LogSizeMB");
-  Layout->addWidget(Line, 4, 1, 1, 1);
-
-  Line = new EddLineDisplay("DColl/CurrentFile");
-  Line->setMaximumWidth(400);
-  Layout->addWidget(Line, 5, 0, 1, 3);
-
-  Line = new EddLineDisplay("Config/Message");
-  Line->setMaximumWidth(200);
-  Layout->addWidget(Line, 6, 0, 1, 2);      
-
-  Line = new EddLineDisplay("Config/ModifyTime");
-  Line->setMaximumWidth(200);
-  Line->ShowAsTime = true;
-  Layout->addWidget(Line, 7, 0, 1, 1);
-
-  Button = new QPushButton();
-  Button->setText("eLogBook");
-  connect(Button, SIGNAL(released()), SLOT(StartELog()));
-  Layout->addWidget(Button, 6, 1, 1, 1);
-
-  Button = new QPushButton();
-  Button->setText("Start DIM browser");
-  connect(Button, SIGNAL(released()), SLOT(StartDIMBrowser()));
-  Layout->addWidget(Button, 7, 1, 1, 1);
-
-  Line = new EddLineDisplay("Edd/Rate_kBSec");
-  Layout->addWidget(Line, 8, 0, 1, 1);
-}
-
-// Toggle state of Alarm server
-void TP_Evidence::ToggleAlarm(bool State) {
-
-  if (State) DimClient::sendCommandNB((char *) "Alarm/Switch", (char *) "off");
-  else DimClient::sendCommandNB((char *) "Alarm/Switch", (char *) "on");
-}
- 
-// Start DIM Browser
-void TP_Evidence::StartDIMBrowser() {
-
-  QProcess::startDetached("did", QStringList(), QString(getenv("DIMDIR"))+"/linux/");
-}
-
-// Start eLogBook
-void TP_Evidence::StartELog() {
-
-  QProcess::startDetached("firefox http://fact.ethz.ch/FACTelog/index.jsp");
-}
-
- 
-//--------------------------------------------------------------------
-//*************************** Main GUI *******************************
-//--------------------------------------------------------------------
-//
-// All widgets have ultimately Central as parent.
-//
-GUI::GUI() {
-
-  Handler = new EddDim();
-  
-  // Set features of main window
-  Central = new QWidget(this);
-  setCentralWidget(Central);
-  setStatusBar(new QStatusBar(this));
-  setWindowTitle("Edd - Evidence Data Display");
-
-  // Arrangement in tabs
-  TabWidget = new QTabWidget(Central);
-  TabWidget->setTabsClosable(true);
-  connect(TabWidget, SIGNAL(tabCloseRequested(int)), SLOT(DetachTab(int)));
-  TabWidget->addTab(new TP_DAQ, "Event scope " + DRSBoard);
-  TabWidget->addTab(new TP_FADctrl, "FADctrl");
-  TabWidget->addTab(new TP_Bias, "Bias");
-  TabWidget->addTab(new TP_Feedback, "Feedback");
-  TabWidget->addTab(new TP_Environment, "Environment");
-  TabWidget->addTab(new TP_Evidence, "Evidence");
-
-  // Menu bar
-  QMenu* Menu = menuBar()->addMenu("&Menu");
-  Menu->addAction("New history plot", this, SLOT(MenuNewHistory()));
-  Menu->addSeparator();
-  Menu->addAction("About", this, SLOT(MenuAbout()));
-  Menu->addSeparator();
-  QAction* QuitAction = Menu->addAction("Quit", qApp, SLOT(quit()));
-  QuitAction->setShortcut(Qt::CTRL + Qt::Key_Q);
-
-  // Show main window
-  resize(TabWidget->sizeHint()*1.1);
-  show();
-
-  // Set timer to regularly check the master alarm
-  QTimer *Timer = new QTimer(this);
-  connect(Timer, SIGNAL(timeout()), this, SLOT(CheckAlarm()));
-  Timer->start(5000);
-}  
-    
-GUI::~GUI() {
-  delete Central;
-}
-
-
-void GUI::MenuAbout() {
-  QString Rev(SVN_REVISION);
-  Rev.remove(0,1).chop(2);
-  
-  QMessageBox::about(this, "About Edd","Evidence Data Display\n\n"
-    "Written by Oliver Grimm, IPP, ETH Zurich\n"
-    "This version compiled "__DATE__" ("+Rev+")\n\n"
-    "Graphical user interface implemented with Qt and Qwt.\n"
-    "Evidence control system based on DIM (http://dim.web.cern.ch).\n\n"
-    "Comments to oliver.grimm@phys.ethz.ch.");
-}
-
-// Open request for new history plot
-void GUI::MenuNewHistory() {
-
-  QStringList List;
-  char *Name, *Format;
-  int Type;
-  bool OK;
-
-  // Find all DIM services and sort
-  getServices("*");
-  while ((Type = getNextService(Name, Format)) != 0) {
-    if (Type==DimSERVICE) List.append(Name);
-  }
-  List.sort();
-
-  // Open dialog and open history window
-  QString Result = QInputDialog::getItem(this, "Edd Request",
-    "Enter DIM service name", List, 0, true, &OK);
-  if (OK && !Result.isEmpty()) {
-    Result = Result.trimmed();
-    QWidget *Hist = OpenHistory(Result.toAscii().data(), 0);
-    if (Hist != NULL) Hist->show();
-  }
-}
-
-// Open tab as separate window
-void GUI::DetachTab(int Tab) {
-
-  QWidget *W = NULL;
-  QMainWindow *M = new QMainWindow;
-
-  M->setCentralWidget(new QWidget(M));
-  M->setStatusBar(new QStatusBar(M));
-
-  switch(Tab) {
-        case 0: W = new TP_DAQ; break;
-        case 1: W = new TP_Bias; break;
-        case 2: W = new TP_Feedback; break;
-        case 3: W = new TP_Environment; break;
-        case 4: W = new TP_Evidence; break;
-        default: break;
-  }
-
-  if (W == NULL) {
-    delete M->centralWidget();
-        delete M;
-        return;
-  }
-
-  W->setParent(M);
-  M->resize(size());
-  M->setWindowTitle("Edd - " + TabWidget->tabText(Tab));
-  M->show();
-}
-
-// Check alarm level and if Alarm server is alive
-void GUI::CheckAlarm() {
-
-  static int WarnedLevel = 0;
-  static bool AlarmServerWarned = false;
-
-  // === Check service Alarm/MasterAlarm ===
-  DimCurrentInfo MasterAlarm("Alarm/MasterAlarm", -1);
-
-  if (MasterAlarm.getInt() > WarnedLevel) {
-        QSound::play(QApplication::applicationDirPath() + "/Error.wav");
-
-    // Construct warning message box
-        QMessageBox Box;
-        Box.setWindowTitle("Edd Alarm");
-        Box.setText("Service 'Alarm/MasterAlarm' is at " + QString::number(MasterAlarm.getInt()));
-        Box.setInformativeText("Warn again for the same alarm level?");
-        Box.setIcon(QMessageBox::Warning);
-        Box.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
-        Box.setDefaultButton(QMessageBox::No);
-
-        // Check if user wants to reset warned level
-        if (Box.exec() == QMessageBox::Yes) WarnedLevel = 0;
-        else WarnedLevel = MasterAlarm.getInt();
-  }
-
-  // If MasterAlam decreased, lower also warned level
-  if (MasterAlarm.getInt() < WarnedLevel && MasterAlarm.getInt() >=0 ) WarnedLevel = MasterAlarm.getInt();
-  
-  // === Check Alarm server ===
-  DimCurrentInfo ServerList("DIS_DNS/SERVER_LIST", NO_LINK);
-  std::string Result = EvidenceServer::ToString((char *) "C", ServerList.getData(), ServerList.getSize());
-
-  // Warn if SERVER_LIST does not contain alarm server
-  if (Result.find("Alarm@") == std::string::npos && !AlarmServerWarned) {
-        QMessageBox Box;
-        Box.setWindowTitle("Edd Alarm");
-        Box.setText("Alarm server is unavailable or in error");
-        Box.setIcon(QMessageBox::Critical);
-        Box.setStandardButtons(QMessageBox::Ok);
-        Box.setDefaultButton(QMessageBox::Ok);
-        Box.exec();
-
-        AlarmServerWarned = true;
-  }
-  
-  if (Result.find("Alarm@") != std::string::npos) AlarmServerWarned = false; 
-}
-
-// Quit application when clicking close button on window
-void GUI::closeEvent(QCloseEvent *) {
-
-  qApp->quit();
-}
-
-
-//**************************** Main program ***************************
-int main(int argc, char *argv[]) {
-
-  if (argc > 1) DRSBoard = "FADctrl";
-
-  // Make RPC to get pixelmap
-  DimRpcInfo RPC((char *) "ConfigRequest", (char *) "");
-  RPC.setData((char *) "Misc PixelMap");
-  PixelMapText = std::string(RPC.getString(), RPC.getSize());
-
-  QApplication app(argc, argv); 
-  GUI MainWindow;
-
-  return app.exec();
-}
+  M->setWindowTitle(WindowName);
+
+  L = new QGridLayout(M->centralWidget());
+
+  connect(this, SIGNAL(pressed()), SLOT(Toggle()));
+}
+
+// Show or hide window
+void EddWindow::Toggle() {
+
+  if (M->isVisible()) M->hide();
+  else M->show();
+}
+
+// Return layout
+QGridLayout *EddWindow::Layout() {
+
+  return L;
+}
+
+// Return window
+QMainWindow *EddWindow::Window() {
+
+  return M;
+}

fact/Evidence/GUI.h

@@ -1 @@
-#ifndef EDD_H_SEEN
-#define EDD_H_SEEN
+#ifndef GUI_H_SEEN
+#define GUI_H_SEEN
 
 #include <QtGui>
@@ -26 +26 @@
 #include "dic.hxx"
 #include "Evidence.h"
-#include "RawDataCTX.h"
-#include "PixelMap.h"
-
-#define SVN_REVISION "$Revision$"
 
 const QColor EddPlotBackgroundColor(Qt::yellow);
@@ -258 +254 @@
 };
 
-//
-//
-// ====== FACT specific part ======
-//
-//
-
-// Event oscilloscope
-class EventScope: public EddBasePlot, public PixelMap {
-  Q_OBJECT
-
-  private:
-    struct ItemDetails {
-          unsigned int Board, Chip, Channel;
-      QwtPlotCurve *Signal;
-          QwtPlotMarker *Trigger;
-    };
-    QList<struct ItemDetails> List;
-
-    QString Name;
-        RawDataCTX *RD;
-        CTX_ErrCode ErrCode;
-        QAction *PhysPipeAction;
-        QAction *PersistanceAction;
-        FILE *Tmpfile;
-
-  public:
-    EventScope(QWidget * = NULL);
-    ~EventScope();
-        
-        void UpdateFirst(int, int, int);
-        void AddTrace(int, int, int);
-        void SetActive(bool);
-        QString ToPixel(unsigned int, unsigned int, unsigned int, unsigned int);
-
-  private slots:
-        void Update(QString, int, QByteArray, QString, QString);
-        void PlotTraces();
-        void DeleteCurve(QwtPlotCurve *);
-        
-  signals:
-        void RunHeaderChanged(QString);
-        void EventHeaderChanged(QString);
-        void PixelData(QVector<double>);
-};
-
-
-// Tab page classes
-class TP_Environment: public QWidget {
-  Q_OBJECT
-
-  public:
-    TP_Environment();
-};
-
-class TP_Bias: public QWidget {
-  Q_OBJECT
-
-  private slots:
-        void BiasCurrents();
-
-  public:
-    TP_Bias();
-};
-
-class TP_FADctrl: public QWidget {
-  Q_OBJECT
-
-  public:
-    TP_FADctrl();
-};
-
-class TP_Feedback: public QWidget {
-  Q_OBJECT
-
-  private slots:
-        void FeedbackDetails();
-
-  public:
-    TP_Feedback();
-};
-
-class TP_DAQ: public QWidget {
-  Q_OBJECT
-  static const int MAXPIXEL = 1440;
-
-  private:
-        EventScope *Scope;
-    QPlainTextEdit *RunHeaderDisplay, *EventHeaderDisplay;
-
-        QSpinBox *Channel, *Chip, *Board, *PixelID;
-        QFormLayout *FormLayout;
-        QWidget *Display;
-        QPushButton **Pixel;
-        QPushButton *StartStopButton;
-
-  private slots:
-        void TranslatePixelID(int);
-        void UpdateScope(int);
-        void KeepCurrent();
-        void StartStop(bool);
-        void ShowPixelDisplay();
-        void SetPixelData(QVector<double>);
-
-  public:
-        TP_DAQ();       
-        ~TP_DAQ();      
-};
-
-class TP_Evidence: public QWidget {
-  Q_OBJECT
-
-  private slots:
-        void ToggleAlarm(bool);
-        void StartDIMBrowser();
-        void StartELog();
-
-  public:
-        TP_Evidence();  
-};
-
-
-// Main window class
-class GUI: public QMainWindow, public DimBrowser {
-  Q_OBJECT
-
-  private:
-    QWidget *Central;
-    QTabWidget *TabWidget;
-            
-    void closeEvent(QCloseEvent *);
-        
-  public:
-    GUI();
-    ~GUI();
-    
-  private slots:
-    void MenuAbout();
-    void MenuNewHistory();
-        void DetachTab(int);
-        void CheckAlarm();
+// Open new window
+class EddWindow: public QPushButton {
+  Q_OBJECT
+
+  QMainWindow *M;
+  QGridLayout *L;
+
+  public:
+    EddWindow(QString, QString);
+        QGridLayout *Layout();
+        QMainWindow *Window();
+  private slots:
+        void Toggle();
 };