Changeset 11205

Timestamp:

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

Author:

ogrimm

Message:

Adaptions to allow compilation on Ubuntu

Location:

fact

Files:

• BIASctrl/BIASctrl.cc (modified) (1 diff)
• BIASctrl/Crate.cc (modified) (1 diff)
• BIASctrl/History.txt (modified) (1 diff)
• BIASctrl/Makefile (modified) (1 diff)
• BIASctrl/User.cc (modified) (2 diffs)
• Evidence/DColl.cc (modified) (1 diff)
• FADctrl/FAD.cc (modified) (2 diffs)
• FADctrl/FAD.h (modified) (1 diff)
• FADctrl/FADBoard.cc (modified) (2 diffs)
• FADctrl/FADctrl.cc (modified) (1 diff)
• Feedback/Feedback.cc (modified) (2 diffs)
• Feedback/Makefile (modified) (1 diff)

fact/BIASctrl/BIASctrl.cc

@@ -29 +29 @@
   siginterrupt(SIGTERM, true);
 
-  system("clear");                   
+  if (system("clear") == -1) printf("Error with system() call\n");
+                   
   printf("\n*** BIASctrl (compiled %s, %s) ***\n\n", __DATE__, __TIME__);
    

fact/BIASctrl/Crate.cc

@@ -134 +134 @@
         FD_ZERO(&SelectDescriptor);   FD_SET(fDescriptor, &SelectDescriptor);
         if (select(fDescriptor+1, &SelectDescriptor, NULL, NULL, &WaitTime)==-1) {
-          if (errno = EINTR) goto ExitCommunicate;  // in case program is exiting
+          if (errno == EINTR) goto ExitCommunicate;  // in case program is exiting
       m->Message(m->FATAL, "Error with select() (%s)", strerror(errno));
         }

fact/BIASctrl/History.txt

@@ -12 +12 @@
                         Added 'crate' command. Changed signaling of program exit.
 3/6/2011        Fixed bug in channel addressing from board numbers above 7.
+28/6/2011       Adapted for compilation under ubuntu

fact/BIASctrl/Makefile

@@ -6 +6 @@
 
 CPPFLAGS = -O3 -Wall $(INCDIRS)
-LDLIBS = -L/usr/lib/termcap -lstdc++ -lpthread -lfl -lreadline -ltermcap $(DIMDIR)/linux/libdim.a
+LDLIBS = -L/usr/lib/termcap -lstdc++ -lpthread -lreadline -ltermcap $(DIMDIR)/linux/libdim.a
 
 BIASctrl: $(OBJECTS)

fact/BIASctrl/User.cc

@@ -114 +114 @@
   // Shell command
   if(Command[0]=='.') {
-    system(Command.c_str()+1);
+    if (system(Command.c_str()+1) == 1) {
+          PrintMessage("Error with system() call\n");
+        }
     return;
   }
@@ -620 +622 @@
 bool User::ConvertToRange(string String, struct User::Range &R) {
 
-  int N, M;
+  int N=0, M=0; // Init to avoid compiler warning
 
   // Full range

fact/Evidence/DColl.cc

@@ -260 +260 @@
         struct tm *TM = localtime(&RawTime);
 
-        fprintf(DataFile, "%s %d %d %d %d %d %d %d %d %lu ", I->getName(), I->getQuality(), TM->tm_year+1900, TM->tm_mon+1, TM->tm_mday, TM->tm_hour, TM->tm_min, TM->tm_sec, I->getTimestampMillisecs(), I->getTimestamp());
+        fprintf(DataFile, "%s %d %d %d %d %d %d %d %d %d ", I->getName(), I->getQuality(), TM->tm_year+1900, TM->tm_mon+1, TM->tm_mday, TM->tm_hour, TM->tm_min, TM->tm_sec, I->getTimestampMillisecs(), I->getTimestamp());
 
         // Translate data into ASCII

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);
 

fact/Feedback/Feedback.cc

@@ -224 +224 @@
 
   // Calculate average signal  
-  for (unsigned int i=0; i<Parameter.size()-1, i<fIDTable.size(); i++) {
+  for (unsigned int i=0; i<Parameter.size()-1 && i<fIDTable.size(); i++) {
         Average[i] += atof(Parameter[i+1].c_str());
         Sigma[i] += pow(atof(Parameter[i+1].c_str()), 2);
@@ -465 +465 @@
   char *Command;
 
-  system("clear");
+  if (system("clear") == -1) printf("Error with system() call\n");
   printf("\n*** Bias feedback (built %s, %s, revision %s) *** \n\n",__DATE__, __TIME__, REVISION);
 

fact/Feedback/Makefile

@@ -12 +12 @@
 
 CPPFLAGS = -DREVISION='"$(REVISION)"' -O3 -Wall
-LIBS = -L /usr/lib/termcap -lstdc++ -lz -lpthread -lutil -lfl -lreadline -ltermcap $(DIMDIR)/linux/libdim.a
+LIBS = -L /usr/lib/termcap -lstdc++ -lz -lpthread -lutil -lreadline -ltermcap $(DIMDIR)/linux/libdim.a
 
 Feedback: $(OBJECTS)