Changeset 10113 for fact/FADctrl/FADBoard.cc

Timestamp:

01/21/11 15:46:15 (14 years ago)

Author:

ogrimm

Message:

Event thread informed through pipe of new incoming data

File:

• fact/FADctrl/FADBoard.cc (modified) (5 diffs)

fact/FADctrl/FADBoard.cc

@@ -89 +89 @@
   int Ret;
 
-  // Cancel thread and wait for it to quit
+  // Cancel thread (if it did not quit already) and wait for it to quit
   if (pthread_equal(Thread, pthread_self()) == 0) {
-        if ((Ret = pthread_cancel(Thread)) != 0) m->Message(m->ERROR, "pthread_cancel() failed in ~FADBoard() (%s)", strerror(Ret));
+        if ((Ret = pthread_cancel(Thread)) != 0 && Ret != ESRCH) m->Message(m->ERROR, "pthread_cancel() failed in ~FADBoard() (%s)", strerror(Ret));
         if ((Ret = pthread_join(Thread, NULL)) != 0) m->Message(m->ERROR, "pthread_join() failed in ~FADBoard (%s)", strerror(Ret));
   }
@@ -164 +164 @@
 // Initiate average
 //
-void FADBoard::AccumulateSum(unsigned int n) {
+void FADBoard::AccumulateSum(unsigned int n, bool Rotate) {
 
   if (!Active) return;
   
   Lock();
+  SumPhysPipeline = Rotate;
   memset(Sum, 0, sizeof(Sum));
   NumForSum = n;
@@ -253 +254 @@
           // Extract ID and type information
           Status.BoardID = ntohl(Header->board_id);
+          Status.FirmwareRevision = ntohl(Header->version_no);
           Status.TriggerID = ntohl(Header->local_trigger_id);
           Status.TriggerType = ntohs(Header->local_trigger_type);
@@ -287 +289 @@
                 for (unsigned int Chip=0; Chip<NChips; Chip++) for (unsigned int Chan=0; Chan<NChannels; Chan++) {
                   for (int i=0; i<Status.ROI[Chip][Chan]; i++) {
-                        Sum[Chip][Chan][(i+Status.TriggerCell[Chip]) % NBins] += Data[Chip][Chan][i];
+                        if (SumPhysPipeline) Sum[Chip][Chan][(i+Status.TriggerCell[Chip]) % NBins] += Data[Chip][Chan][i];
+                        else Sum[Chip][Chan][i] = Data[Chip][Chan][i]-Baseline[Chip][Chan][(i-Status.TriggerCell[Chip]) % NBins];
                   }
                 }
@@ -312 +315 @@
         else printf("End package flag incorrect, removing corrupt event\n");
 
+        // Inform event thread of new data
+        if (write(m->Pipe[1], Name, strlen(Name)+1) == -1) {
+          m->Message(m->ERROR, "write() to Pipe[1] failed in class FADBoard (%s)", strerror(errno));
+          m->ExitRequest = true;
+        }
+
         // Remove event data from internal buffer
         memmove(Buffer, Buffer+Length, Pos-Length);