some further adjustments after merge

diff --git a/hadesoperator/daqcontrol.tex b/hadesoperator/daqcontrol.tex
index 9252391d45ad8a9c905c3c97349f72530343a4ca..6ede4d6c852780b6ce30b05b7373d1885dc9d1bd 100644 (file)
--- a/hadesoperator/daqcontrol.tex
+++ b/hadesoperator/daqcontrol.tex
@@ -30,7 +30,6 @@
 
 \subsection{Eventbuilder Tools}
 \begin{description}
-<<<<<<< HEAD
  \item[StartTDC CAL] Start calibration run for the trb3 TDCs. This will disable the regular CTS trigger inputs and send special calibration events with a 500 Hz pulser. 
  At the same time, the eventbuilders will record files of prefix ''TC''.
   \item[Stop TDC CAL] Stop the calibration run for trb3 TDCs that was started with the above button. This button has to be pressed when all DAQ input subsystems as shown 
@@ -49,18 +48,6 @@
    Change only on request. E.g. 1 EB for cosmics, 8 or 12 EB for beam data.
  
  \end{description}
-=======
- \item[Start TDC CAL] Start process of TDC calibration
- \item[Stop TDC CAL] Stops the TDC calibration, returns to normal data taking
- \item[BEAM Files] Start to write "be" beam files
- \item[COSMICS Files] Start to write "co" cosmics files
- \item[TEST file] Start to write "te" test files without important data
- \item[NO file] Leave eventbuilder running, but don't write data to disk
- \item[Restart EB] Start eventbuilders again (with new settings or after stop / failure)
- \item[Stop EB] Stop eventbuilders (not actually needed, select "NO file" instead)
- \item[Set N EB] Sets the number of running instances of eventbuilders. Change only on request. E.g. 1 Builder for cosmics, 6/8 for beam data.
-\end{description}
->>>>>>> 3b2a03d2619e1b12a39f0716a97d1f584112e0af
 
 \subsection{Expert Tools}
 {\it This section is visible only when the ''Show Expert Tools'' box on the upper left corner is checked. 
@@ -72,11 +59,7 @@ It contains actions which are not necessary for regular DAQ operation.}
  \item[BLR Reload Settings]
  \item[CTS Scope]
  \item[MDC LV Turn On All Relais]
-<<<<<<< HEAD
- \item[Reload RICH]
-=======
  \item[Relaod RICH]
->>>>>>> 3b2a03d2619e1b12a39f0716a97d1f584112e0af
  \item[Reload RPC Thresholds]
  \item[Restart BNET Control] Restart the DABC master process on lxhadeb07 that controls the building network (BNET).
   This process also delivers the eventbuilder monitoring at  \url{https://hades33/eb}
@@ -89,7 +72,6 @@ It contains actions which are not necessary for regular DAQ operation.}
  \item[Stop Speech Output]
 \end{description}
 
-<<<<<<< HEAD
 
 \subsection{Power Tools}
 This section offers buttons to cycle the low voltage supplies of several detector systems. These are convenience
@@ -113,19 +95,3 @@ clicking these buttons in the DAQ-Operator section!}
 
 
 \end{description}
-=======
-\subsection{Power Tools}
-\begin{description}
- \item[Powercycle all]
- \item[RICH Powercycle]
- \item[RICH Fan Powercycle] Switches RICH fans on/off
- \item[ECal 5V Entrance Powercycle]
- \item[ECal LV5 Powercycle]
- \item[Wall Powercycle]
- \item[Start Powercycle]
- \item[Hubs Powercycle]
- \item[MDC LV Powercycle]
- \item[RPC special PwrCyc]
- 
-\end{description}
->>>>>>> 3b2a03d2619e1b12a39f0716a97d1f584112e0af