Changeset 10212 for fact/FADctrl/FADBoard.cc

Timestamp:

03/02/11 13:35:50 (14 years ago)

Author:

ogrimm

Message:

Implemented new FAD data format

File:

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

fact/FADctrl/FADBoard.cc

@@ -20 +20 @@
   Continue = true;
   CommOK = false;
-  ACalibTime = -1;
+  ACalib.Time = -1;
   Status.Update.tv_sec = -1;
   Port = ServerPort;
@@ -166 +166 @@
   case init:
         // Invalidate current calibration
-        ACalibTime = -1;
+        ACalib.Time = -1;
 
         // Save initial board status, set all ROIs to 1024 and set DAC values
@@ -203 +203 @@
                 for (unsigned int j=0; j<NChannels; j++) {
                   for (unsigned int k=0; k<NBins; k++) {
-                        Baseline[i][j][k] = Sum[i][j][k] / m->NumEventsRequested;
+                        ACalib.Baseline[i][j][k] = Sum[i][j][k] / m->NumEventsRequested;
                   }
                 }
@@ -237 +237 @@
                 for (unsigned int j=0; j<NChannels; j++) {
                   for (unsigned int k=0; k<NBins; k++) {
-                        Gain[i][j][k] = (Sum[i][j][k] / m->NumEventsRequested) - Baseline[i][j][k];
+                        ACalib.Gain[i][j][k] = (Sum[i][j][k] / m->NumEventsRequested) - ACalib.Baseline[i][j][k];
                   }
                 }
@@ -260 +260 @@
           for (unsigned int Chan=0; Chan<NChannels; Chan++) {
                 for (int i=0; i<Status.ROI[Chip][Chan]; i++) {
-                  Sum[Chip][Chan][i] = Data[Chip][Chan][i] - Baseline[Chip][Chan][(i-Status.TriggerCell[Chip]) % NBins];
+                  Sum[Chip][Chan][i] = Data[Chip][Chan][i] - ACalib.Baseline[Chip][Chan][(i-Status.TriggerCell[Chip]) % NBins];
                 }
           }
@@ -271 +271 @@
                 for (unsigned int j=0; j<NChannels; j++) {
                   for (unsigned int k=0; k<NBins; k++) {
-                        SecondaryBaseline[i][j][k] = Sum[i][j][k] / (double) m->NumEventsRequested;
+                        ACalib.Secondary[i][j][k] = Sum[i][j][k] / (double) m->NumEventsRequested;
                   }
                 }
@@ -290 +290 @@
 
           // Store calibration time and temperature
-          ACalibTime = time(NULL);
-          ACalibTemp = 0;
-          for (unsigned int i=0; i<NTemp; i++) ACalibTemp += Status.Temp[i] / NTemp;
+          ACalib.DNA = Status.DNA;
+          ACalib.Frequency = Status.Frequency;
+          ACalib.Time = time(NULL);
+          ACalib.Temp = 0;
+          for (unsigned int i=0; i<NTemp; i++) ACalib.Temp += Status.Temp[i] / NTemp;
           
           // Inform event thread that calibration is finished
@@ -415 +417 @@
           gettimeofday(&Status.Update, NULL);
 
-          // Extract ID and type information
-          Status.BoardID = ntohl(Header->board_id);
+          // Extract board and trigger information
+          Status.BoardID = ntohl(Header->board_id);       
           Status.FirmwareRevision = ntohl(Header->version_no);
+          Status.BoardTime = ntohl(Header->time);
+          Status.EventCounter = ntohl(Header->fad_evt_counter);
           Status.TriggerID = ntohl(Header->trigger_id);
           Status.TriggerType = ntohs(Header->trigger_type);
+          Status.TriggerCRC = ntohs(Header->trigger_crc);
+          Status.DNA = Header->DNA;
+
+          // Extract frequency related information
+          Status.Frequency = ntohl(Header->REFCLK_frequency)/1.0e6;
+          Status.PhaseShift = ntohs(Header->adc_clock_phase_shift);
+          for (unsigned int i=0; i<NChips; i++) {
+                if ((Header->PLLLCK & (1<<i)) != 0) Status.Lock[i] = true;
+                else Status.Lock[i] = false;
+          }
 
           // Extract temperatures (MSB indicates if temperature is positive or negative)