Changeset 10969 for fact/FADctrl/FADBoard.cc

Timestamp:

06/10/11 08:23:22 (13 years ago)

Author:

neise

Message:

support for Firmware Version 0200

File:

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

fact/FADctrl/FADBoard.cc

@@ -168 +168 @@
 
   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};
+  unsigned short DACCmd[] = {htons(CMD_Write | (BADDR_DAC + 1)), 0, htons(CMD_Write | (BADDR_DAC + 2)), 0, htons(CMD_Write | (BADDR_DAC + 3)), 0, htons(CMD_Execute) };
   string Message = string("ACALIBDONE")+Name+"\n";
 
@@ -183 +183 @@
         InitialStatus = GetStatus();
 
-        Send(CMD_TRIGGERS_OFF);
-        usleep(500000);
-
         for (unsigned int i=0; i<NChips*NChannels; i++) {
           ROICmd.push_back(htons(CMD_Write | (BADDR_ROI + i)));
           ROICmd.push_back(htons(NBins));
         }
+        ROICmd.push_back(htons(CMD_Execute));
         Send(&ROICmd[0], ROICmd.size()*sizeof(unsigned short));
 
-    DACCmd[1] = htons(0);
-    DACCmd[3] = htons(0);
-    DACCmd[5] = htons(0);
+        DACCmd[1] = htons(0);
+        DACCmd[3] = htons(0);
+        DACCmd[5] = htons(0);
         Send(DACCmd, sizeof(DACCmd));
-
-        Send(CMD_TRIGGERS_ON);
 
         // Clear sum vector and set state to accumulate
@@ -335 +331 @@
   case cleanup:
     // ROI values
-        Send(CMD_TRIGGERS_OFF);
-        usleep(100000);
 
         ROICmd.clear();
@@ -343 +337 @@
           ROICmd.push_back(htons(InitialStatus.ROI[i/NChannels][i%NChannels]));
         }
+        ROICmd.push_back(htons(CMD_Execute));
         Send(&ROICmd[0], ROICmd.size()*sizeof(unsigned short));
 
-        Send(CMD_TRIGGERS_ON);
-
         // DAC values
-    DACCmd[1] = htons(InitialStatus.DAC[1]);
-    DACCmd[3] = htons(InitialStatus.DAC[2]);
-    DACCmd[5] = htons(InitialStatus.DAC[3]);
+        DACCmd[1] = htons(InitialStatus.DAC[1]);
+        DACCmd[3] = htons(InitialStatus.DAC[2]);
+        DACCmd[5] = htons(InitialStatus.DAC[3]);
         Send(DACCmd, sizeof(DACCmd));