Changeset 12537 for trunk/FACT++/src

Timestamp:

11/16/11 15:44:31 (13 years ago)

Author:

lyard

Message:

added services descriptions

Location:

trunk/FACT++/src

Files:

• EventBuilderWrapper.h (modified) (1 diff)
• fadctrl.cc (modified) (5 diffs)

trunk/FACT++/src/EventBuilderWrapper.h

@@ -171 +171 @@
         fFileFormat(FAD::kNone), fMaxRun(0), fLastOpened(0), fLastClosed(0),
         fDimWriteStats  ("FAD_CONTROL", imp),
-        fDimRuns        ("FAD_CONTROL/RUNS",               "I:5;C", ""),
-        fDimEvents      ("FAD_CONTROL/EVENTS",             "I:4", ""),
+        fDimRuns        ("FAD_CONTROL/RUNS",               "I:5;C",
+                                                           "Run files statistics"
+                                                           "|stats[int]:num. of open run files, min run num., max run num., lastest opened or closed run"
+                                                           "|file[string]:filename of last opened file"),
+        fDimEvents      ("FAD_CONTROL/EVENTS",             "I:4",
+                                                           "Event counts"
+                                                           "|evtsCount[int]:Num evts cur. run, total (all run), evt ID, trig. Num"),
         fDimRawData     ("FAD_CONTROL/RAW_DATA",           "S:1;I:1;S:1;I:1;I:2;I:40;S:1440;S:160;F", ""),
         fDimEventData   ("FAD_CONTROL/EVENT_DATA",         "F:1440;F:1440;F:1440;F:1440", ""),
         fDimFeedbackData("FAD_CONTROL/FEEDBACK_DATA",      "F:1440", ""),
-        fDimFwVersion   ("FAD_CONTROL/FIRMWARE_VERSION",   "F:42", ""),
-        fDimRunNumber   ("FAD_CONTROL/RUN_NUMBER",         "I:42", ""),
-        fDimStatus      ("FAD_CONTROL/STATUS",             "S:42", ""),
-        fDimDNA         ("FAD_CONTROL/DNA",                "X:40", ""),
-        fDimTemperature ("FAD_CONTROL/TEMPERATURE",        "F:82", ""),
-        fDimPrescaler   ("FAD_CONTROL/PRESCALER",          "S:42", ""),
-        fDimRefClock    ("FAD_CONTROL/REFERENCE_CLOCK",    "I:42", ""),
+        fDimFwVersion   ("FAD_CONTROL/FIRMWARE_VERSION",   "F:42",
+                                                           "Firmware version number of fad boards"
+                                                           "|firmware[float]:Version number of firmware, for each board. 40=min, 41=max"),
+        fDimRunNumber   ("FAD_CONTROL/RUN_NUMBER",         "I:42",
+                                                           "Run numbers coming from FAD boards"
+                                                           "|runNumbers[int]:current run number of each FAD board. 40=min, 41=max"),
+        fDimStatus      ("FAD_CONTROL/STATUS",             "S:42",
+                                                           "Status of FAD boards"
+                                                           "|status[bitpattern]:Status of each FAD board. Maybe buggy"),
+        fDimDNA         ("FAD_CONTROL/DNA",                "X:40",
+                                                           "DNA of FAD boards"
+                                                           "|DNA[hex]:Hex identifier of each FAD board"),
+        fDimTemperature ("FAD_CONTROL/TEMPERATURE",        "F:82",
+                                                           "FADs temperatures"
+                                                           "|temp[deg. C]:0 global min, 1-40 min, 41 global max, 42-81 max"),
+        fDimPrescaler   ("FAD_CONTROL/PRESCALER",          "S:42",
+                                                           "Trigger generator prescaler of fad boards"
+                                                           "|prescaler[int]:Trigger generator prescaler value, for each board"),
+        fDimRefClock    ("FAD_CONTROL/REFERENCE_CLOCK",    "I:42",
+                                                           "Reference clock of FAD boards"
+                                                           "|refClocks[t]:ref clocks of FAD boards. 40=min, 41=max"),
         fDimRoi         ("FAD_CONTROL/REGION_OF_INTEREST", "S:2",  ""),
-        fDimDac         ("FAD_CONTROL/DAC",                "S:336", ""),
+        fDimDac         ("FAD_CONTROL/DAC",                "S:336",
+                                                           "DAC counts of each FAD board"
+                                                           "|DAC[int]:DAC counts, sequentally DAC 0 board 0, DAC 0 board 1... (plus min max)"),
         fDimDrsCalibration("FAD_CONTROL/DRS_CALIBRATION",  "I:1;I:3;F:1474560;F:1474560;F:1474560;F:1474560;F:1474560;F:1474560;F:163840;F:163840", ""),
-        fDimStatistics1 ("FAD_CONTROL/STATISTICS1",        "I:3;I:5;X:4;I:3;I:3;I:40;I:1;I:2;C:40;I:40;I:40;X:40", ""),
-        fDimStatistics2 ("FAD_CONTROL/STATISTICS2",        "I:1;I:280;X:40;I:40;I:4;I:4;I:2;I:2;I:3;C:40",  ""),
+        fDimStatistics1 ("FAD_CONTROL/STATISTICS1",        "I:3;I:5;X:4;I:3;I:3;I:40;I:1;I:2;C:40;I:40;I:40;X:40",
+                                                           "Event Builder status for GUI display"
+                                                           "|threadInfo[int]:Number of read, proc and writes"
+                                                           "|bufferInfo[int]:Events in buffer, incomp., comp., tot., max past cycle, total"
+                                                           "|memInfo[int]:total buf. mem, used mem, max used, max past cycle"
+                                                           "|EvtCnt[int]:Number of events skipped, written, with errors"
+                                                           "|badRoi[int]:Num boards with wrong ROI in event, run or board"
+                                                           "|badRoiBoard[int]:Num boards with wrong ROI"
+                                                           "|deltaT[ms]:Time in ms for rates"
+                                                           "|rateNew[int]:Number of new start events received"
+                                                           "|numConn[int]:Number of connections per board"
+                                                           "|errConn[int]:IO errors per board"
+                                                           "|rateBytes[int]:Bytes read this cycle"
+                                                           "|totBytes[int]:Bytes read (counter)"),
+        fDimStatistics2 ("FAD_CONTROL/STATISTICS2",        "I:1;I:280;X:40;I:40;I:4;I:4;I:2;I:2;I:3;C:40",
+                                                           "Event Builder status, events oriented"
+                                                           "|reset[int]:If increased, reset all counters"
+                                                           "|numRead[int]:How often sucessful read from N sockets per loop"
+                                                           "|gotByte[int]:number of bytes read per board"
+                                                           "|gotErr[int]:number of com. errors per board"
+                                                           "|evtStat[int]:number of evts read, completed, with errors, incomplete"
+                                                           "|procStat[int]:num. of evts proc., w probs, acc. or rej. by SW trigger"
+                                                           "|feedStat[int]:number of evts used or rejected by feedback system"
+                                                           "|wrtStat[int]:number of evts written to disk, with errors"
+                                                           "|runStat[int]:number of run opened, closed, with open or close errors"
+                                                           "|numConn[int]:number of sockets successfully opened per board"),
         fDimFileFormat  ("FAD_CONTROL/FILE_FORMAT",        "S:1",  ""),
         fDebugStream(false), fDebugRead(false), fDebugLog(false)

trunk/FACT++/src/fadctrl.cc

@@ -1550 +1550 @@
         T(out, "FAD_CONTROL"), EventBuilderWrapper(*static_cast<MessageImp*>(this)), ba::io_service::work(static_cast<ba::io_service&>(*this)),
         fStatus1(40), fStatus2(40), fStatusC(40), fStatusT(false),
-        fDimStartRun("FAD_CONTROL/START_RUN", "X:2", "|run[idx]:Run number of last configured run (-1 if configuration was reset or no run was yet configured)|next[idx]:Run number which will be asigned to next configuration"),
-        fDimConnection("FAD_CONTROL/CONNECTIONS", "C:40;C:1", "")
+        fDimStartRun("FAD_CONTROL/START_RUN", "X:1;X:1",
+                                              "Run numbers"
+                                              "|run[idx]:Run number of last configured run (-1 if configuration was reset or no run was yet configured)"
+                                              "|next[idx]:Run number which will be assigned to next configuration"),
+        fDimConnection("FAD_CONTROL/CONNECTIONS", "C:40;C:1",
+                                                  "Connection status of FAD boards"
+                                                  "|status[bitpattern]:lower bits stat1, upper bits stat2, for every board. 40=thread"
+                                                  "|char[unknown]:to be completed")
     {
         // ba::io_service::work is a kind of keep_alive for the loop.
@@ -1895 +1901 @@
         fIsDataOutput = conf.Get<bool>("data-out");
         fDebugTx = conf.Get<bool>("debug-tx");
-
+cout << -1 << endl;
         // ---------- Setup event builder ---------
         SetMaxMemory(conf.Get<unsigned int>("max-mem"));
@@ -2152 +2158 @@
     if (!conf.DoParse(argc, argv, PrintHelp))
         return -1;
-
+cout << 1 << endl;
 //    try
     {
@@ -2163 +2169 @@
                 return RunShell<LocalStream, StateMachineDim>(conf);
         }
+        cout << 2 << endl;
         // Cosole access w/ and w/o Dim
 /*        if (conf.Get<bool>("no-dim"))
@@ -2178 +2185 @@
                 return RunShell<LocalConsole, StateMachineDim>(conf);
         }
+cout << 3 << endl;
     }
 /*    catch (std::exception& e)