Changeset 10049

Timestamp:

11/09/10 08:36:18 (14 years ago)

Author:

ogrimm

Message:

Large number of changes

Location:

fact/BIASctrl

Files:

• . (modified) (1 prop)
• BIASctrl.cc (modified) (2 diffs)
• Crate.cc (modified) (12 diffs)
• Crate.h (modified) (2 diffs)
• Makefile (modified) (1 diff)
• ProcessIO.cc (deleted)
• ProcessIO.h (deleted)
• User.cc (added)
• User.h (added)

fact/BIASctrl/BIASctrl.cc

@@ -11 +11 @@
 #include <stdio.h>
 
-#include "ProcessIO.h"
+#include "User.h"
 
 #include <readline/readline.h>
@@ -84 +84 @@
   
   // Construct main instance
-  static ProcessIO M;
+  static User M;
   
   // These signals were set during construction of EvidenceServer

fact/BIASctrl/Crate.cc

@@ -6 +6 @@
 
 #include "Crate.h"
-#include "ProcessIO.h" // Must be not in HV.h to avoid problem with declaring class ProcessIO
+#include "User.h" // Must not be in header file to avoid problem with declaring class User
 
 using namespace std;
@@ -13 +13 @@
 // Constructor
 //
-Crate::Crate(string CrateName, int Number, class ProcessIO *PIO) {
+Crate::Crate(string CrateName, int Number, class User *PIO) {
    
   struct termios tio;
@@ -78 +78 @@
   if(fDescriptor != -1) {
     SystemReset();
-    close(fDescriptor);
+    if (close(fDescriptor) == -1) m->PrintMessage("Error closing device %s (%s)\n", Name, strerror(errno));;
   }
 
@@ -92 +92 @@
 int Crate::Communicate(unsigned char* wbuf, int Bytes) {
 
-  unsigned char rbuf[3];
   int N, Ret = 0;
   fd_set SelectDescriptor;
@@ -117 +116 @@
         goto ExitCommunicate;
   }
+
   // Time-out expired?
   if (!FD_ISSET(fDescriptor, &SelectDescriptor)) {
@@ -124 +124 @@
 
   // Read data   
-  if ((N = read(fDescriptor, &rbuf, 1)) == -1) {
+  if ((N = read(fDescriptor, ReadBuffer, sizeof(ReadBuffer))) == -1) {
     m->Message(m->ERROR, "Read error (%s)", strerror(errno));
     ErrorCount++;
@@ -130 +130 @@
   }
 
-  // === Update status information if three bytes were returned ===
+  // === Check wrap counter if three bytes were returned ===
   if (N == 3) {
-    // This data only valid for channel set or channel read
-        LastCurrent = rbuf[1] + (rbuf[0]&15)*256;
-        LastOC = rbuf[0] & 128;
-        ResetHit = rbuf[2] & 128;
-
-        // Check wrap counter
         if (WrapCount != -1) {
-          if ((WrapCount+1)%8 == ((rbuf[0]>>4) & 7)) WrapOK = true;
+          if ((WrapCount+1)%8 == ((ReadBuffer[0]>>4) & 7)) WrapOK = true;
           else WrapOK = false;
         }
-        WrapCount = (rbuf[0]>>4) & 7;
+        WrapCount = (ReadBuffer[0]>>4) & 7;
         Ret = 1;
   }
@@ -148 +142 @@
   // === UnLock file descriptor ===
   ExitCommunicate:
-  if (lockf(fDescriptor, F_LOCK, 0) == -1) {
-        m->Message(m->ERROR, "Failed to lock file descriptor (%s)", strerror(errno));
+  if (lockf(fDescriptor, F_ULOCK, 0) == -1) {
+        m->Message(m->ERROR, "Failed to unlock file descriptor (%s)", strerror(errno));
         return 0;
   }
@@ -191 +185 @@
     
   if ((ret = Communicate(wbuf, 3)) == 1) {
-        Current[Board][Channel] = LastCurrent;
-        OC[Board][Channel] = LastOC;
+        Current[Board][Channel] = ReadBuffer[1] + (ReadBuffer[0]&15)*256;
+        OC[Board][Channel] = ReadBuffer[0] & 128;
+        ResetHit = ReadBuffer[2] & 128;
   }
   return ret;
@@ -213 +208 @@
   if ((ret = Communicate(wbuf, 3)) == 1) {
         for (int i=0; i<MAX_NUM_BOARDS; i++) {
-      for (int j=0; j<NUM_CHANNELS; j++) DAC[i][j] = SetPoint;
+      for (int j=0; j<NUM_CHANNELS; j++) {
+            DAC[i][j] = SetPoint;
+                Volt[i][j] = (double) SetPoint / 0xfff * 90;
+          }
         }
   }
@@ -243 +241 @@
   if ((ret = Communicate(wbuf, 3)) == 1) {
     DAC[Board][Channel] = SetPoint;
-        Current[Board][Channel] = LastCurrent;
-        OC[Board][Channel] = LastOC;
+        Volt[Board][Channel] = (double) SetPoint / 0xfff * 90;
   }
   return ret;
@@ -270 +267 @@
     for (int j=0; j<NUM_CHANNELS; j++){
       DAC[i][j] = 0;
-      //Volt[i][j] = 0.0;      
+      Volt[i][j] = 0.0;      
     }
   }

fact/BIASctrl/Crate.h

@@ -16 +16 @@
 #define BAUDRATE B115200
 
-class ProcessIO;
+class User;
 
 class Crate {
   
-    class ProcessIO *m;
+    class User *m;
         int CrateNumber;
         int fDescriptor; 
         DimService *NameService;
-        bool LastOC;
-        int LastCurrent;
+        char ReadBuffer[3];
 
         int Communicate(unsigned char*, int);
@@ -31 +30 @@
    
   public:
-    Crate(std::string, int, class ProcessIO *);
+    Crate(std::string, int, class User *);
     ~Crate();
 

fact/BIASctrl/Makefile

@@ -1 +1 @@
 #  Makefile for BIASctrl
 
-SOURCES = BIASctrl.cc Crate.cc ProcessIO.cc ../pixelmap/Pixel.cc ../pixelmap/PixelMap.cc ../Evidence/Evidence.cc 
+SOURCES = BIASctrl.cc Crate.cc User.cc ../pixelmap/Pixel.cc ../pixelmap/PixelMap.cc ../Evidence/Evidence.cc 
 OBJECTS = $(addsuffix .o, $(basename $(SOURCES))) 
 INCDIRS   = -I. -I../Evidence -I./src -I$(DIMDIR)/dim