Changeset 10642

Timestamp:

05/10/11 13:11:19 (14 years ago)

Author:

ogrimm

Message:

FADctrl publishes amplitude calibration information as DIM service

Location:

fact

Files:

• FADctrl/FAD.cc (modified) (4 diffs)
• FADctrl/FADBoard.cc (modified) (5 diffs)
• FADctrl/FADBoard.h (modified) (3 diffs)
• tools/Edd/Edd.cc (modified) (4 diffs)

fact/FADctrl/FAD.cc

@@ -653 +653 @@
         }
         
-        PrintMessage("\nLast trigger: ID %d    Type %d   CRC %d     Run number %d\n", S.TriggerID, S.TriggerType, S.TriggerCRC, S.Runnumber);
+        PrintMessage("\nTrigger ID: Num %d    Type %d   CRC %d     Run number %d\n", S.TriggerNum, S.TriggerType, S.TriggerCRC, S.Runnumber);
   } // for()
 }
@@ -786 +786 @@
   // Open calibration data file
   string Filename = string(getenv("HOME"))+"/FAD_ACal";
-  FILE *File = fopen(Filename.c_str(), "ab");
+  FILE *File = fopen(Filename.c_str(), "wb");
 
   if (File == NULL) {
@@ -806 +806 @@
   if (fclose(File) != 0) PrintMessage("Could not close calibration file '%s'\n", Filename.c_str());
   
-  PrintMessage("Appended amplitude calibration to file '%s'\n", Filename.c_str());
+  PrintMessage("Wrote amplitude calibration to file '%s'\n", Filename.c_str());
 }
 
@@ -952 +952 @@
 
           // Update event header with ID and Type of current board
-          EHeader->EventNumber = S.TriggerID;
+          EHeader->EventNumber = S.TriggerNum;
           EHeader->TriggerType = S.TriggerType;
 
           // Register event number for data writing below
-          EventNumbers[Brd] = S.TriggerID;
+          EventNumbers[Brd] = S.TriggerNum;
 
           // Write trigger cells

fact/FADctrl/FADBoard.cc

@@ -54 +54 @@
   DIM_Rate = new DimService((ID.str()+"RateHz").c_str(), Status.Rate);
   DIM_Frequency = new DimService((ID.str()+"Frequency").c_str(), Status.Frequency);
+  DIM_TriggerNum = new DimService((ID.str()+"TriggerNum").c_str(), (char *) "I", &Status.TriggerNum, sizeof(Status.TriggerNum));
   DIM_Temp = new DimService((ID.str()+"Temperature").c_str(), (char *) "F", NULL, 0);
   DIM_DAC = new DimService((ID.str()+"DAC").c_str(), (char *) "S", NULL, 0);
   DIM_ROI = new DimService((ID.str()+"ROI").c_str(), (char *) "S", NULL, 0);
+  DIM_ACalData = new DimService((ID.str()+"ACalData").c_str(), (char *) "F", NULL, 0);
 
   // Create thread that connects and receives data
@@ -99 +101 @@
   delete DIM_Rate;
   delete DIM_Frequency;
+  delete DIM_TriggerNum;
   delete DIM_Temp;
   delete DIM_DAC;
-  delete DIM_ROI;  
+  delete DIM_ROI;
+  delete DIM_ACalData;  
   delete[] Name;
 }
@@ -334 +338 @@
         Send(DACCmd, sizeof(DACCmd));
         
+        // Update DIM service with calibration information
+        for (unsigned int i=0; i<NChips; i++) {
+          for (unsigned int j=0; j<NChannels; j++) {
+                for (unsigned int k=0; k<NBins; k++) {
+                  ACalData[0][i][j][k] = ACalib.Baseline[i][j][k];
+                  ACalData[1][i][j][k] = ACalib.Gain[i][j][k];
+                  ACalData[2][i][j][k] = ACalib.Secondary[i][j][k];
+                }
+          }
+        }
+        DIM_ACalData->updateService(ACalData, 3*NChips*NChannels*NBins*sizeof(float));
+
         State = wait;
         break;
@@ -456 +472 @@
           Status.BoardTime = ntohl(Header->time);
           Status.EventCounter = ntohl(Header->fad_evt_counter);
-          Status.TriggerID = ntohl(Header->trigger_id);
+          Status.TriggerNum = ntohl(Header->trigger_id);
           Status.Runnumber = ntohl(Header->runnumber);
           Status.TriggerType = ntohs(Header->trigger_type);
@@ -521 +537 @@
 
                 if (PrevStatus.Frequency != Status.Frequency) DIM_Frequency->updateService();
-
+                if (PrevStatus.TriggerNum != Status.TriggerNum) DIM_TriggerNum->updateService();
                 if (PrevStatus.Rate != Status.Rate) DIM_Rate->updateService();
                 

fact/FADctrl/FADBoard.h

@@ -28 +28 @@
         int Socket;
         pthread_mutex_t Mutex;
-        DimService *DIM_Name, *DIM_Status, *DIM_ID, *DIM_Frequency;
-        DimService *DIM_Rate, *DIM_Temp, *DIM_ROI, *DIM_DAC;
+        DimService *DIM_Name, *DIM_Status, *DIM_ID, *DIM_Frequency, *DIM_TriggerNum;
+        DimService *DIM_Rate, *DIM_Temp, *DIM_ROI, *DIM_DAC, *DIM_ACalData;
 
         void ReadLoop();
@@ -51 +51 @@
           float Rate;
 
-          uint32_t TriggerID;
+          uint32_t TriggerNum;
           uint32_t Runnumber;
           uint16_t TriggerType;
@@ -85 +85 @@
         } ACalib;
 
+    float ACalData[3][NChips][NChannels][NBins]; // for DIM service
+        
         void Send(const void *, size_t);
         void Send(unsigned short);

fact/tools/Edd/Edd.cc

@@ -12 +12 @@
 #include "Edd.h"
 
-QString DRSBoard = "drsdaq";
+QString DRSBoard = "FADctrl";
 std::string PixelMapText;
 
@@ -477 +477 @@
         }
 
-        for (int j=0; j<8; j++) {
-      Line = new EddLineDisplay(Board+"DAC", j);
-          Line->setMinimumWidth(40);
-      Button[i/20]->Layout()->addWidget(Line, i+7, 7+j, 1, 1);
-        }
+    Line = new EddLineDisplay(Board+"TriggerNum");
+        Line->setMinimumWidth(40);
+    Button[i/20]->Layout()->addWidget(Line, i+7, 7, 1, 1);
 
         Line = new EddLineDisplay(Board+"RateHz");
@@ -796 +794 @@
   TabWidget->setTabsClosable(true);
   connect(TabWidget, SIGNAL(tabCloseRequested(int)), SLOT(DetachTab(int)));
-  TabWidget->addTab(new TP_DAQ, "Event scope " + DRSBoard);
+  TabWidget->addTab(new TP_DAQ, "Event scope");
   TabWidget->addTab(new TP_FADctrl, "FADctrl");
   TabWidget->addTab(new TP_Bias, "Bias");
@@ -960 +958 @@
 int main(int argc, char *argv[]) {
 
-  if (argc > 1) DRSBoard = "FADctrl";
+  if (argc>1 && strcmp(argv[1],"drsdaq")==0) DRSBoard = "drsdaq";
 
   // Make RPC to get pixelmap