Changeset 10224

Timestamp:

03/04/11 09:58:04 (14 years ago)

Author:

neise

Message:

new FAD data format implemented

Location:

fact/FADctrl

Files:

• FAD.cc (modified) (2 diffs)
• FADBoard.cc (modified) (2 diffs)
• FADBoard.h (modified) (1 diff)
• FADFormat.h (modified) (2 diffs)

fact/FADctrl/FAD.cc

@@ -293 +293 @@
         else if (Match(Parameter[1],"continuous")) {
           Boards[i]->Send(CMD_Trigger_C);
-          if (Parameter.size() == 3 && ConvertToInt(Parameter[2], &Num)) {
-            if (Num == 0) Boards[i]->Send(CMD_Trigger_S);               
-                else Boards[i]->Send(0x2100 + (unsigned char) (1000.0/Num/12.5));
+          if (Parameter.size() == 3 && ConvertToInt(Parameter[2], &Num)) {                      
+            if (Num == 0) 
+                                Boards[i]->Send(CMD_Trigger_S);         
+                        else { 
+                                //Boards[i]->Send(0x2100 + (unsigned char) (1000.0/Num/12.5));
+                                Boards[i]->Send( CMD_Write | BADDR_CONT_TRIGGER_TIME );
+                                Boards[i]->Send((unsigned short) (1000.0/Num/12.5));
+                        }
           }
         }
@@ -617 +622 @@
 
         // Board identification
-        PrintMessage("Board ID %d      Firmware revision %d      Serial %llx\n", S.BoardID, S.FirmwareRevision, S.DNA);
-        PrintMessage("Board time %d      Event counter %d\n", S.BoardTime, S.EventCounter);
+        PrintMessage("Board ID %.4x      Firmware revision %.4x      Serial %llx\n", S.BoardID, S.FirmwareRevision, S.DNA);
+        PrintMessage("Board time %gs       Event counter %d\n", S.BoardTime/1.0e4 , S.EventCounter);
 
         // Slow data
         PrintMessage("Frequency %.2f GHz    Phase shift %d    PLL lock %d %d %d %d\n", S.Frequency, S.PhaseShift, S.Lock[0], S.Lock[1], S.Lock[2], S.Lock[3]);
+        PrintMessage("DENABLE %d  DWRITE %d  SPI_clk %d DCM_lock: %d DCM_ready %d\n", S.denable, S.dwrite, S.spi_clk, S.DCM_lock, S.DCM_ready); 
         PrintMessage("DAC %d %d %d %d   %d %d %d %d\n", S.DAC[0], S.DAC[1], S.DAC[2], S.DAC[3], S.DAC[4], S.DAC[5], S.DAC[6], S.DAC[7] );
         PrintMessage("Temperature %.2f %.2f %.2f %.2f", S.Temp[0], S.Temp[1], S.Temp[2], S.Temp[3]);

fact/FADctrl/FADBoard.cc

@@ -418 +418 @@
 
           // Extract board and trigger information
-          Status.BoardID = ntohl(Header->board_id);       
-          Status.FirmwareRevision = ntohl(Header->version_no);
+          Status.BoardID = ntohs(Header->board_id);       
+          Status.FirmwareRevision = ntohs(Header->version_no);
           Status.BoardTime = ntohl(Header->time);
           Status.EventCounter = ntohl(Header->fad_evt_counter);
@@ -428 +428 @@
 
           // Extract frequency related information
-          Status.Frequency = ntohl(Header->REFCLK_frequency)/1.0e6;
-          Status.PhaseShift = ntohs(Header->adc_clock_phase_shift);
+          Status.Frequency = ntohl(Header->REFCLK_frequency)/1.0e3*2.048;
+          Status.PhaseShift = Header->adc_clock_phase_shift;
           for (unsigned int i=0; i<NChips; i++) {
-                if ((Header->PLLLCK & (1<<i)) != 0) Status.Lock[i] = true;
+                if ((ntohs(Header->PLLLCK)>>12 & (1<<i)) != 0) Status.Lock[i] = true;
                 else Status.Lock[i] = false;
           }
+
+                // Extract Firmware status info
+                Status.denable = (bool) ( ntohs(Header->PLLLCK) & (1<<11) );
+                Status.dwrite = (bool) ( ntohs(Header->PLLLCK) & (1<<10) );
+                Status.DCM_lock = (bool) ( ntohs(Header->PLLLCK) & (1<<9) );
+                Status.DCM_ready = (bool) ( ntohs(Header->PLLLCK) & (1<<8) );
+                Status.spi_clk = (bool) ( ntohs(Header->PLLLCK) & (1<<7) );
+
 
           // Extract temperatures (MSB indicates if temperature is positive or negative)

fact/FADctrl/FADBoard.h

@@ -49 +49 @@
           float Frequency;
           bool Lock[NChips];
-          uint16_t PhaseShift;
+                bool denable;
+                bool dwrite;
+                bool DCM_lock;
+                bool DCM_ready;
+                bool spi_clk;
+          int8_t PhaseShift;
           uint16_t ROI[NChips][NChannels];
           uint16_t DAC[NDAC];

fact/FADctrl/FADFormat.h

@@ -39 +39 @@
 #define BADDR_ROI 0x00          // Baseaddress ROI-Values
 #define BADDR_DAC 0x24          // Baseaddress DAC-Values
+#define BADDR_CONT_TRIGGER_TIME 0x2C // Baseaddress for the continouus trigger timing.
 #define MAX_VAL 65535
 #define MAX_ROIVAL 1024
@@ -67 +68 @@
 
   uint16_t board_id;
-  uint16_t adc_clock_phase_shift;
+        uint8_t  zeroes;
+  int8_t adc_clock_phase_shift;
   uint16_t number_of_triggers_to_generate;
   uint16_t trigger_generator_prescaler;