Changeset 10117 for fact/FADctrl/FAD.cc

Timestamp:

01/24/11 16:48:50 (13 years ago)

Author:

ogrimm

Message:

Amplitude calibration integrated into event loop

File:

• fact/FADctrl/FAD.cc (modified) (14 diffs)

fact/FADctrl/FAD.cc

@@ -37 +37 @@
    //{"rmode", &FAD::cmd_rmode, 0, "<first|stop>", "Readout start at first bin or stop position (DRS4)"},
    //{"dmode", &FAD::cmd_dmode, 0, "<single|continuous>", "Domino wave single shot or continuous"},
-   {"cancel", &FAD::cmd_cancel, false, 0, "", "Cancel current operation/run"},
+   {"stop", &FAD::cmd_stop, false, 0, "", "Stop current operation/run"},
    {"update", &FAD::cmd_update, false, 1, "<sec>", "Minimum delay between updates to DIM event service"},                 
    {"socketmode", &FAD::cmd_socketmode, true, 1, "<com|daq>", "Choose which Sockets are used for data transmission"},             
@@ -167 +167 @@
           // Check if idle mode required
           if (CommandList[i].NeedIdle && Mode != idle) {
-                PrintMessage("Current mode is not idle ('cancel' will stop current operation)\n");
+                PrintMessage("Current mode is not idle ('stop' will stop current operation)\n");
                 return;
           }
@@ -285 +285 @@
   if (Match(Parameter[1],"enable")) PrintMessage("all active boards accept now incoming triggers\n");
   else if (Match(Parameter[1],"disable")) PrintMessage("no active board accepts any incoming trigger anymore.\n");
- // else PrintUsage();
-
-  
 } 
 
@@ -483 +480 @@
 void FAD::cmd_acalib() {
 
-  pthread_t Thread;
-  int Code, Count;
+  int Count;
   FILE *File;
   vector<string> Items;
@@ -495 +491 @@
 
   // Read calibration data from file?
-  if (Parameter.size() == 2 && !ConvertToInt(Parameter[1], &NumCalibEvents)) {
+  //if (Parameter.size() == 2 && !ConvertToInt(Parameter[1], &NumCalibEvents)) {
+  if (Parameter.size() == 2 && !ConvertToInt(Parameter[1], &NumEventsRequested)) {
     // Open file
         if ((File = fopen(Parameter[1].c_str(), "r")) == NULL) {
@@ -546 +543 @@
 
   // Set number of events required for calibration
-  if (Parameter.size()==1 || !ConvertToInt(Parameter[1], &NumCalibEvents) || NumCalibEvents<=0) {
-        NumCalibEvents = DEFAULT_NUM_CALIB_EVENTS;
-  }
-
-  // Set mode before launching thread
+  if (Parameter.size()==1 || !ConvertToInt(Parameter[1], &NumEventsRequested) || NumEventsRequested<=0) {
+        NumEventsRequested = DEFAULT_NUM_CALIB_EVENTS;
+  }
+
+  // Start ca;ibration by setting mode
   Mode = acalib;
-  Cancel = false;
-  
-  // Create detached thread
-  if ((Code = pthread_create(&Thread, NULL, (void * (*)(void *)) FAD::LaunchAmplitudeCalibration,(void *) this)) != 0) {
-    Message(ERROR, "pthread_create() failed in FAD::cmd_acalib() (%s)\n", strerror(Code));
-        Mode = idle;
-        return;
-  }
-
-  if ((Code = pthread_detach(Thread)) != 0) {
-        Message(ERROR, "pthread_detach() failed in FAD::cmd_acalib() (%s)\n", strerror(Code));
-  }
 }
 
@@ -590 +575 @@
           if (Boards[i]->Active) PrintMessage(" %d", i);
         }
+
+        // Current mode
+        if (Mode == idle) PrintMessage("Current mode is IDLE\n");
+        else if (Mode == acalib) PrintMessage("Current mode is ACALIB (3x%d events)\n", NumEventsRequested);
+        else if (Mode == datarun) PrintMessage("Current mode is DATARUN (%d events requested, %d events taken)\n", NumEventsRequested, NumEvents);
+
         return;
   }    
@@ -711 +702 @@
 // Cancel current operation
 //
-void FAD::cmd_cancel() {
+void FAD::cmd_stop() {
 
   static char Stop[] = "stop";
 
-  if (Mode == idle) PrintMessage("Nothing to cancel\n");
-  else {
+  if (Mode == idle) {
+        PrintMessage("Nothing to stop\n");
+        return;
+  }
+  
+  if (Mode == acalib) Mode = idle;
+  
+  if (Mode == datarun) {  
         // Inform event thread to stop run in case datarun active
         if (write(Pipe[1], Stop, strlen(Stop)+1) == -1) {
           Message(ERROR, "write() to Pipe[1] failed in FAD::cmd_cancel() (%s)", strerror(errno));
         }
-    Cancel = true;
-    PrintMessage("Requested cancelation of current operation\n");
-  }
+  }
+  
+  PrintMessage("Requested stopping of current operation\n");
 }
 
@@ -741 +738 @@
 
 //
-// Amplitude calibration (lauched as thread by cmd_acalib())
-//
-void FAD::AmplitudeCalibration() {
-
-  vector<struct FADBoard::BoardStatus> Status;
-  vector<unsigned short> ROICmd;
-  unsigned short DACCmd[] = {htons(CMD_Write | (BADDR_DAC + 1)), 0, htons(CMD_Write | (BADDR_DAC + 2)), 0, htons(CMD_Write | (BADDR_DAC + 3)), 0};
-
-  PrintMessage("Staring amplitude calibration of all active boards (%d events)\n"
-                           "   Note: No input signals must be connected\n", NumCalibEvents);
-  
-  // Prepare command to set all ROIs to 1024
-  for (unsigned int i=0; i<NChips*NChannels; i++) {
-        ROICmd.push_back(htons(CMD_Write | (BADDR_ROI + i)));
-        ROICmd.push_back(htons(NBins));
-  }
-
-  // ====== Part A: Baseline measurement =====
-
-  // Initialise settings for baseline measurement
-  for (unsigned int Brd=0; Brd<Boards.size(); Brd++) {
-
-        // Invalidate current calibration
-        Boards[Brd]->ACalibTime = -1;
-
-        // Save initial board status
-        Status.push_back(Boards[Brd]->GetStatus());
-        
-    // Set all ROI to 1024
-        Boards[Brd]->Send(&ROICmd[0], ROICmd.size()*sizeof(unsigned short));
-
-    // Set DAC values and start accumulation
-    DACCmd[1] = htons(0);
-    DACCmd[3] = htons(0);
-    DACCmd[5] = htons(0);
-        Boards[Brd]->Send(DACCmd, sizeof(DACCmd));
-
-    Boards[Brd]->AccumulateSum(NumCalibEvents, true);   
-  }
-
-  // Wait until data for all boards taken
-  bool Done = false;
-  while (!Done && !Cancel) {
-    usleep(300000);
-        for (unsigned int Brd=0; Brd<Boards.size(); Brd++) {
-          Done = true;
-          if (Boards[Brd]->Active && Boards[Brd]->DoSum) Done = false;
-        }
-  }
-
-  // Determine baseline
-  for (unsigned int Brd=0; Brd<Boards.size(); Brd++) {
-        for (unsigned int i=0; i<NChips; i++) for (unsigned int j=0; j<NChannels; j++) {
-          for (unsigned int k=0; k<NBins; k++) {
-                Boards[Brd]->Baseline[i][j][k] = Boards[Brd]->Sum[i][j][k] / NumCalibEvents;
-          }
-        }
-  }
-  PrintMessage("Baseline measurement finished, next is gain measurement\n");
-
-  // ====== Part B: Gain measurement =====
-
-  // Set new DAC values and start accumulation
-  for (unsigned int Brd=0; Brd<Boards.size(); Brd++) {
-        DACCmd[1] = htons(50000);
-        DACCmd[3] = htons(50000);
-        DACCmd[5] = htons(50000);
-        Boards[Brd]->Send(DACCmd, sizeof(DACCmd));
-
-    Boards[Brd]->AccumulateSum(NumCalibEvents, true);   
-  }
-
-  // Wait until data for all boards taken
-  Done = false;
-  while (!Done && !Cancel) {
-    usleep(300000);
-        for (unsigned int Brd=0; Brd<Boards.size(); Brd++) {
-          Done = true;
-          if (Boards[Brd]->Active && Boards[Brd]->DoSum) Done = false;
-        }
-  }
-  
-  // Determine gain
-  for (unsigned int Brd=0; Brd<Boards.size(); Brd++) {
-        for (unsigned int i=0; i<NChips; i++) for (unsigned int j=0; j<NChannels; j++) {
-          for (unsigned int k=0; k<NBins; k++) {
-                Boards[Brd]->Gain[i][j][k] = (Boards[Brd]->Sum[i][j][k] / NumCalibEvents)-Boards[Brd]->Baseline[i][j][k];
-          }
-        }
-  }
-  PrintMessage("Gain measurement finished, next is secondary calibration\n");
-
-  // ====== Part C: Secondary calibration =====
-
-  // Initialise settings for secondary calibration and start accumulation
-  for (unsigned int Brd=0; Brd<Boards.size(); Brd++) {
-    DACCmd[1] = htons(0);
-    DACCmd[3] = htons(0);
-    DACCmd[5] = htons(0);
-        Boards[Brd]->Send(DACCmd, sizeof(DACCmd));
-
-    Boards[Brd]->AccumulateSum(NumCalibEvents, false);  
-  }
-
-  // Wait until data for all boards taken
-  Done = false;
-  while (!Done && !Cancel) {
-    usleep(300000);
-        for (unsigned int Brd=0; Brd<Boards.size(); Brd++) {
-          Done = true;
-          if (Boards[Brd]->Active && Boards[Brd]->DoSum) Done = false;
-        }
-  }
-
-  // Determine secondary calibration
-  for (unsigned int Brd=0; Brd<Boards.size(); Brd++) {
-        for (unsigned int i=0; i<NChips; i++) for (unsigned int j=0; j<NChannels; j++) {
-          for (unsigned int k=0; k<NBins; k++) {
-                Boards[Brd]->SecondaryBaseline[i][j][k] = Boards[Brd]->Sum[i][j][k] / (double) NumCalibEvents;
-          }
-        }
-  }
-
-  // ===== Part D: Finish calibration =====
- 
-  // Write back original ROI and DAC settings
-  for (unsigned int Brd=0; Brd<Boards.size(); Brd++) {
-
-        // Determine gain
-        for (unsigned int i=0; i<NChips; i++) for (unsigned int j=0; j<NChannels; j++) {
-          for (unsigned int k=0; k<NBins; k++) {
-                Boards[Brd]->Gain[i][j][k] = (Boards[Brd]->Sum[i][j][k] / NumCalibEvents)-Boards[Brd]->Baseline[i][j][k];
-          }
-        }
-
-        ROICmd.clear();
-        for (unsigned int i=0; i<NChips*NChannels; i++) {
-          ROICmd.push_back(htons(CMD_Write | (BADDR_ROI + i)));
-          ROICmd.push_back(htons(Status[Brd].ROI[i/NChannels][i%NChannels]));
-        }
-        Boards[Brd]->Send(&ROICmd[0], ROICmd.size()*sizeof(unsigned short));
-  
-    DACCmd[1] = htons(Status[Brd].DAC[1]);
-    DACCmd[3] = htons(Status[Brd].DAC[2]);
-    DACCmd[5] = htons(Status[Brd].DAC[3]);
-        Boards[Brd]->Send(DACCmd, sizeof(DACCmd));
-        
-        // Store calibration time and temperature
-        Boards[Brd]->ACalibTime = Cancel ? -1 : time(NULL);
-        Boards[Brd]->ACalibTemp = 0;
-        for (unsigned int i=0; i<NTemp; i++) Boards[Brd]->ACalibTemp += Status[Brd].Temp[i] / NTemp;
-  }
-
-  Mode = idle;
-  
-  if (Cancel) {
-    PrintMessage("Amplitude calibration cancelled\n");
-        return;
-  }
- 
+// Save amplitude calibration data to file
+//
+void FAD::SaveAmplitudeCalibration() {
+
   PrintMessage("Amplitude calibration of all active boards finished, original ROI and DAC set\n");
   
@@ -942 +783 @@
 }
 
-// Launch read thread inside class
-void FAD::LaunchAmplitudeCalibration(class FAD *m) {
-
-  m->AmplitudeCalibration();
-}
-
-
 //
 // Event thread (publishes/writes M0 format)
@@ -958 +792 @@
   struct FADBoard::BoardStatus S;
   vector<unsigned long> EventNumbers(Boards.size());
+  vector<bool> AcalibDone(Boards.size());
   double Temp;
   string IDString;
@@ -1012 +847 @@
         IDString = string(Buffer, Ret);
         
+        // If amplitude calibration mode, check if board finished procedure
+        if (Mode == acalib) {
+          bool Done = true;
+          for (unsigned int i=0; i<Boards.size(); i++) {
+                if (IDString.find(string("ACALIBDONE")+Boards[i]->Name) != string::npos) AcalibDone[i] = true;
+                if (!AcalibDone[i]) Done = false;
+          }
+          // Amplitude calibration finished?
+          if (Done) {
+            SaveAmplitudeCalibration();
+                Mode = idle;
+          }
+        }
+        else for (unsigned int i=0; i<Boards.size(); i++) AcalibDone[i] = false;
+
         // Update run and event header with current time
         gettimeofday(&Time, NULL);
@@ -1053 +903 @@
         for (unsigned int Brd=0; Brd<Boards.size(); Brd++) {
           // Identify board
-          if (IDString.find(Boards[Brd]->Name) == string::npos) continue;
+          if (IDString.find(string("EVENT")+Boards[Brd]->Name) == string::npos) continue;
 
           // Fill M0 BoardStructure             
@@ -1140 +990 @@
         NumEvents++;
         FileSize += EventSize-Offset;
-        
-        printf("Wrote event %d\n", NumEvents-1);
   }