Changeset 11205 for fact/FADctrl

Timestamp:

06/28/11 14:28:46 (13 years ago)

Author:

ogrimm

Message:

Adaptions to allow compilation on Ubuntu

Location:

fact/FADctrl

Files:

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

fact/FADctrl/FAD.cc

@@ -138 +138 @@
   // Shell command
   if (*Command == '.') {
-    system(Command+1);
+    if (system(Command+1) == -1) PrintMessage("Error with system() call\n");
     return;
   }
@@ -1216 +1216 @@
 bool FAD::ConvertToRange(string String, struct FAD::Range &R) {
 
-  int N, M;
+  int N=0, M=0;
 
   // Full range

fact/FADctrl/FAD.h

@@ -16 +16 @@
 #include <dirent.h>
 #include <sys/time.h>
+#include <sys/stat.h>
 #include <limits>
 #include <fcntl.h>

fact/FADctrl/FADBoard.cc

@@ -513 +513 @@
           for (unsigned int i=0; i<NDAC; i++) Status.DAC[i] = ntohs(Header->dac[i]);
 
-          short Buf;
           for (unsigned int Chip=0; Chip<NChips; Chip++) {
                 // Extract trigger cells          
@@ -522 +521 @@
                   Status.ROI[Chip][Chan] = ntohs(Channel[Chip+NChips*Chan]->roi);
 
-                  // Extract ADC data (stored in 12 bit signed twis complement with out-of-range-bit and leading zeroes)
-                  for (int i=0; i<Status.ROI[Chip][Chan]; i++) {
-                          Buf = (Channel[Chip+NChips*Chan]->adc_data[i]);
-                          (Buf <<= 4) >>= 4;                    //delete the sign-bit by shifting left and shift back
-                          Data[Chip][Chan][i] = Buf;                                    
+                  // Extract ADC data (stored as signed short)
+                  // FADs ADC is 12 bit (values -2048 .. 2047)
+                  // negative/positive overflow is -2049 / +2048
+                  for (int i=0; i<Status.ROI[Chip][Chan]; i++) {                          
+                        Data[Chip][Chan][i] = Channel[Chip+NChips*Chan]->adc_data[i];
                   }
                 }

fact/FADctrl/FADctrl.cc

@@ -28 +28 @@
   read_history(READLINE_HIST_FILE.c_str());
 
-  system("clear");
+  if (system("clear") == -1) {
+        printf("Error with system() call\n");
+  }
   printf("\n*** FADctrl (built %s, %s, revision %s) *** \n\n",__DATE__, __TIME__, REVISION);