Index: /hvcontrol/History.txt =================================================================== --- /hvcontrol/History.txt (revision 160) +++ /hvcontrol/History.txt (revision 161) @@ -26,4 +26,10 @@ 24/9/2009 Program is terminated if too many errors are encountered by the monitor thread -8/12/2009 Implemented DIM servers (currently only needs DIM_DNS_NODE - environment variable) +8/12/2009 Implemented DIM servers +15/12/2009 Removed local log file and implemented logging via DColl +17/12/2009 Implemented DIM command handling and 'Textout' DIM service +8/1/2010 Removed locale slow data writing, now handled by Evidence +13/1/2010 Only important messages are written to log file +20/1/2010 Removed local configuration, now dependent on Evidence configuration + server +29/1/2010 DAC value 0 is now equivilant to calibrated voltage value 0 Index: /hvcontrol/Makefile =================================================================== --- /hvcontrol/Makefile (revision 160) +++ /hvcontrol/Makefile (revision 161) @@ -3,12 +3,12 @@ # -SOURCES = hvcontrol.cpp src/HV.cc src/HVConfig.cc src/HVCalib.cc src/ProcessIO.cc ../pixelmap/Pixel.cc ../pixelmap/PixelMap.cc ../drsdaq/SlowData.cc ../Evidence/Evidence.cc +SOURCES = hvcontrol.cpp src/HV.cc src/HVCalib.cc src/ProcessIO.cc ../pixelmap/Pixel.cc ../pixelmap/PixelMap.cc ../Evidence/Evidence.cc OBJECTS = $(addsuffix .o, $(basename $(SOURCES))) -INCDIRS = -I. -I./src -I../Evidence/DIM/ +INCDIRS = -I. -I../Evidence -I./src -I$(DIMDIR)/dim -CPPFLAGS = -O3 -Wall -DOS_LINUX $(INCDIRS) -LDLIBS = -lstdc++ -lpthread -lfl -lreadline -ltermcap +CPPFLAGS = -O3 -Wall $(INCDIRS) +LDLIBS = -lstdc++ -lpthread -lfl -lreadline -ltermcap $(DIMDIR)/linux/libdim.a -hvcontrol: $(OBJECTS) ../Evidence/DIM/libdim.a +hvcontrol: $(OBJECTS) clean: Index: /hvcontrol/hvcontrol.cpp =================================================================== --- /hvcontrol/hvcontrol.cpp (revision 160) +++ /hvcontrol/hvcontrol.cpp (revision 161) @@ -93,5 +93,5 @@ signal(SIGQUIT, &CrashHandler); // CTRL-Backspace signal(SIGINT, &CrashHandler); // CTRL-C - signal(SIGHUP, &CrashHandler); // CTRL-Backspace + signal(SIGHUP, &CrashHandler); // Terminal closed signal(SIGTERM, &CrashHandler); @@ -170,5 +170,5 @@ // Log command - m->PrintMessage(MsgToLog, "CONSOLE> %s\n", Command); + m->PrintMessage(Log, "CONSOLE> %s\n", Command); // Process command @@ -208,5 +208,5 @@ // Set up server socket if ((ServerSocket = socket(PF_INET, SOCK_STREAM, 0)) == -1) { - m->PrintMessage("Could not open server socket, no remote connection possible (%s).\n", strerror(errno)); + m->PrintMessage(All, "Could not open server socket, no remote connection possible (%s).\n", strerror(errno)); return; } @@ -215,18 +215,18 @@ int Value=1; if (setsockopt(ServerSocket, SOL_SOCKET, SO_REUSEADDR, (char *) &Value, sizeof (Value)) == -1) { - m->PrintMessage("Warning: Could not set server socket option SO_REUSEADDR (%s)\n", strerror(errno)); + m->PrintMessage(All, "Warning: Could not set server socket option SO_REUSEADDR (%s)\n", strerror(errno)); } SocketAddress.sin_family = PF_INET; - SocketAddress.sin_port = htons((unsigned short) m->config->fCCPort); + SocketAddress.sin_port = htons((unsigned short) m->fCCPort); SocketAddress.sin_addr.s_addr = INADDR_ANY; if (bind(ServerSocket, (struct sockaddr *) &SocketAddress, sizeof(SocketAddress)) == -1) { - m->PrintMessage("Could not bind port to socket (%s)\n", strerror(errno)); + m->PrintMessage(All, "Could not bind port to socket (%s)\n", strerror(errno)); close(ServerSocket); return; } if (listen(ServerSocket, 0) == -1) { - m->PrintMessage("Could not set socket to listening (%s)\n", strerror(errno)); + m->PrintMessage(All, "Could not set socket to listening (%s)\n", strerror(errno)); close(ServerSocket); return; @@ -236,5 +236,5 @@ if ((ConnectionSocket = accept(ServerSocket, (struct sockaddr *) &ClientAddress, &SizeClientAddress)) == -1) { - if (errno!=EINTR) m->PrintMessage("Failed to accept incoming connection (%s)\n", strerror(errno)); + if (errno!=EINTR) m->PrintMessage(All, "Failed to accept incoming connection (%s)\n", strerror(errno)); close(ServerSocket); return; @@ -242,5 +242,5 @@ ClientName = gethostbyaddr((char *) &ClientAddress.sin_addr ,sizeof(struct sockaddr_in),AF_INET); - m->PrintMessage("Connected to client at %s (%s).\n", inet_ntoa(ClientAddress.sin_addr), ClientName!=NULL ? ClientName->h_name:"name unknown"); + m->PrintMessage(All, "Connected to client at %s (%s).\n", inet_ntoa(ClientAddress.sin_addr), ClientName!=NULL ? ClientName->h_name:"name unknown"); m->Socket = ConnectionSocket; @@ -253,11 +253,12 @@ if (ReadResult==0) break; // Client does not exist anymore if (ReadResult==-1) { - if (errno!=EINTR) m->PrintMessage("Error read from socket (%s)\n", strerror(errno)); - break; + if (errno!=EINTR) m->PrintMessage(All, "Error read from socket (%s)\n", strerror(errno)); + break; } if (Command[strlen(Command)-1]=='\n') Command[strlen(Command)-1]='\0'; // Remove trailing newline // Log command - m->PrintMessage(MsgToConsole|MsgToLog, "SOCKET> %s\n", Command); + //m->PrintMessage(Console, "SOCKET> %s\n", Command); + //m->PrintMessage(Log, "SOCKET> %s\n", Command); // Process command @@ -270,5 +271,5 @@ m->Socket = -1; - m->PrintMessage("Disconnected from client.\n"); + m->PrintMessage(All, "Disconnected from client.\n"); close(ConnectionSocket); } Index: /hvcontrol/src/HV.cc =================================================================== --- /hvcontrol/src/HV.cc (revision 160) +++ /hvcontrol/src/HV.cc (revision 161) @@ -22,5 +22,5 @@ m = PIO; - SetTimeOut(m->config->fTimeOut); + SetTimeOut(m->fTimeOut); BoardNumber = DeviceNumber; BoardName = DeviceName; @@ -34,6 +34,4 @@ snprintf(Buffer, sizeof(Buffer), SERVER_NAME"/VOLT/ID%.2d/%.2d-%.3d", BoardNumber, i, j); BiasVolt[i][j] = new DimService (Buffer, HVV[i][j]); - snprintf(Buffer, sizeof(Buffer), SERVER_NAME"/DAC/ID%.2d/%.2d-%.3d", BoardNumber, i, j); - BiasDAC[i][j] = new DimService (Buffer, HV[i][j]); } Overcurrent[i] = false; @@ -43,5 +41,5 @@ LastWrapCount = -1; ErrorCount = 0; - + ClearVoltageArrays(); @@ -49,5 +47,5 @@ snprintf(Buffer, BUFFER_LENGTH, "/dev/%s",DeviceName); if ((fDescriptor = open(Buffer, O_RDWR|O_NOCTTY|O_NDELAY)) == -1) { - if(errno != 2) m->PrintMessage("Error: Could not open device %d/%s (%s)\n", DeviceNumber,DeviceName, strerror(errno)); + if(errno != 2) m->PrintMessage(All, "Error: Could not open device %d/%s (%s)\n", DeviceNumber,DeviceName, strerror(errno)); return; } @@ -55,12 +53,12 @@ // Get current serial port settings if (tcgetattr(fDescriptor, &tio) == -1) { - m->PrintMessage("Error: tcgetattr() failed (%d/%s)\n", errno, strerror(errno)); + m->PrintMessage(All, "Error: tcgetattr() failed (%d/%s)\n", errno, strerror(errno)); return; } // Set baudrate and raw mode - if (cfsetspeed(&tio, BAUDRATE) == -1) m->PrintMessage("Error: Could not set baud rate (%s)\n", strerror(errno)); + if (cfsetspeed(&tio, BAUDRATE) == -1) m->PrintMessage(All, "Error: Could not set baud rate (%s)\n", strerror(errno)); cfmakeraw(&tio); - if (tcsetattr(fDescriptor, TCSANOW, &tio ) == -1) m->PrintMessage("Error: tcsetattr() failed (%s)\n", strerror(errno)); + if (tcsetattr(fDescriptor, TCSANOW, &tio ) == -1) m->PrintMessage(All, "Error: tcsetattr() failed (%s)\n", strerror(errno)); // Synchronize HV board (if fails, closes device and sets fDescriptor to -2) @@ -92,5 +90,4 @@ for (int j=0; jPrintMessage("Could not write data to HV board (%s)\n", strerror(errno)); - else m->PrintMessage("Could write only %d of %d bytes to HV board\n", ret, Bytes); + if (ret == -1) m->PrintMessage(All, "Could not write data to HV board (%s)\n", strerror(errno)); + else m->PrintMessage(All, "Could write only %d of %d bytes to HV board\n", ret, Bytes); ErrorCount++; return 0; - } - if (m->Verbose) { - m->PrintMessage("%d bytes written:\n", Bytes); - for (int i=0; iPrintMessage(" Byte %d: %#.2x\n",i,wbuf[i]); } @@ -123,15 +116,13 @@ struct timeval WaitTime = {(long) fTimeOut, (long) ((fTimeOut-(long) fTimeOut)*1e6)}; if (select(fDescriptor+1, &SelectDescriptor, NULL, NULL, &WaitTime)==-1) { - m->PrintMessage("Error with select() (%s)\n", strerror(errno)); + m->PrintMessage(All, "Error with select() (%s)\n", strerror(errno)); return 0; } // Time-out expired? - if (!FD_ISSET(fDescriptor, &SelectDescriptor)) { - if (m->Verbose) m->PrintMessage("Time-out of %.2f seconds expired while reading\n", fTimeOut); - return -1; - } + if (!FD_ISSET(fDescriptor, &SelectDescriptor)) return -1; + // Read error? if ((ret = read(fDescriptor, &rbuf, 1)) == -1) { - m->PrintMessage("Read error (%s)\n", strerror(errno)); + m->PrintMessage(All, "Read error (%s)\n", strerror(errno)); ErrorCount++; return 0; @@ -147,6 +138,4 @@ ResetButton = (bool) (rbuf & 0X80); - if (m->Verbose && ret==1) m->PrintMessage(" 1 byte read: %#.2x\n", rbuf); - return 1; } @@ -217,5 +206,4 @@ // Update DIM services BiasVolt[j][k]->updateService(); - BiasDAC[j][k]->updateService(); } } Index: /hvcontrol/src/HV.h =================================================================== --- /hvcontrol/src/HV.h (revision 160) +++ /hvcontrol/src/HV.h (revision 161) @@ -9,6 +9,7 @@ #include -#include "HVConfig.h" #include "dis.hxx" +#define NUM_CHAINS 4 +#define NUM_CHANNELS 32 #define BAUDRATE B115200 @@ -55,5 +56,4 @@ DimService *Name; DimService *BiasVolt[NUM_CHAINS][NUM_CHANNELS]; - DimService *BiasDAC[NUM_CHAINS][NUM_CHANNELS]; void ClearVoltageArrays(); Index: /hvcontrol/src/HVCalib.cc =================================================================== --- /hvcontrol/src/HVCalib.cc (revision 160) +++ /hvcontrol/src/HVCalib.cc (revision 161) @@ -19,8 +19,10 @@ #include "HVCalib.h" +#include "ProcessIO.h" // Must be not in HVCalib.h to avoid problem with declaring class ProcessIO + using namespace std; -HVCalib::HVCalib(HVConfig* hvConfig) { +HVCalib::HVCalib(class ProcessIO *hvConfig) { char calibfile[80], dLine[6000]; @@ -31,5 +33,5 @@ Config = hvConfig; - + iDACMin = Config->DACMin; fHVCalibSlope = Config->fHVCalibSlope; @@ -54,5 +56,5 @@ for(int i=0; iNumHVBoards; i++){ for(int j=0; jfUSBDevice[i],65+j,1); + sprintf(calibfile,"Calib/%s_%c%d.txt",hvConfig->fHVBoard[i]->BoardName,65+j,1); ifstream fin(calibfile); @@ -143,4 +145,7 @@ double HVCalib::DACToHV(int dac, int board, int chain, int channel) { + + if (dac == 0) return 0; + if (dac < iDACMin){ return HVArray[board][chain][channel][0] + (dac - iDACMin)*fHVCalibSlope; @@ -153,4 +158,6 @@ int HVCalib::HVToDAC(double hv, int board, int chain, int channel) { + + if (hv == 0) return 0; if (hv < HVArray[board][chain][channel][0]){ return iDACMin + (int)((hv - HVArray[board][chain][channel][0])/fHVCalibSlope); Index: /hvcontrol/src/HVCalib.h =================================================================== --- /hvcontrol/src/HVCalib.h (revision 160) +++ /hvcontrol/src/HVCalib.h (revision 161) @@ -4,6 +4,6 @@ #include -#include "HVConfig.h" - +//#include "HVConfig.h" +class ProcessIO; class HVCalib { @@ -19,9 +19,9 @@ double fHVCalibSlope; - HVConfig *Config; + class ProcessIO *Config; public: - HVCalib(HVConfig *); + HVCalib(class ProcessIO *); ~HVCalib(); Index: control/src/HVConfig.cc =================================================================== --- /hvcontrol/src/HVConfig.cc (revision 160) +++ (revision ) @@ -1,104 +1,0 @@ - -/********************************************************************\ - - Name: HVConfig.cc - - Created by: Sebastian Commichau, November 2008 - commichau@phys.ethz.ch - - Contents: Class reading the HV utility configuration file - -\********************************************************************/ - -#include "HVConfig.h" - - -HVConfig::HVConfig(const char *configfile) { - - // Read configuration file - FILE *f; - - if ((f = fopen(configfile,"r")) == NULL) { - printf("Could not open configuration file: %s\n", configfile); - throw; - } - printf("Opening configuration file: %s\n", configfile); - - // Determine number of entries in 'Boards' card and allocate memeory - NumHVBoards = (int) ReadCard("Boards", NULL, 'n', f); - fUSBDevice = new char* [NumHVBoards]; - for (int i=0; i1 read array) - while ((card_val=strtok(NULL," \t\n"))!=NULL && card_val[0]!='#' && Count++ -#include -#include -#include -#include - -#define MAX_COM_SIZE 5000 -#define NUM_CHAINS 4 -#define NUM_CHANNELS 32 -#define BUFFER_LENGTH 256 - -#define MIN_TIMEOUT 0.01 -#define MAX_TIMEOUT 5.0 - -#define MIN_RATE 0.01 -#define MAX_RATE 50.0 - - -class HVConfig { - - public: - - HVConfig(const char *); - ~HVConfig(); - - int NumHVBoards; - char **fUSBDevice; -// char (*fUSBDevice)[BUFFER_LENGTH]; - - char fLogFile[BUFFER_LENGTH]; - char fSlowDir[BUFFER_LENGTH]; - - char fPixMapTable[BUFFER_LENGTH]; - int fCCPort; - - float fTimeOut; - float fStatusRefreshRate; - - int DACMin; - int DACMax; - float fHVCalibOffset; - float fHVCalibSlope; - unsigned int fHVMaxDiff; -}; - -unsigned int ReadCard(const char *, void *, char, FILE *, unsigned int=1); - -#endif Index: /hvcontrol/src/ProcessIO.cc =================================================================== --- /hvcontrol/src/ProcessIO.cc (revision 160) +++ /hvcontrol/src/ProcessIO.cc (revision 161) @@ -15,18 +15,17 @@ -ProcessIO::ProcessIO(const char *ConfigFile): EvidenceServer(SERVER_NAME) { +ProcessIO::ProcessIO(const char *ConfigFile): + DimCommand((char *) SERVER_NAME"/Command", (char *) "C"), + EvidenceServer(SERVER_NAME) { // Get program start time time (&StartTime); - // Create instances - config = new HVConfig(ConfigFile); - calib = new HVCalib(config); - pm = new PixelMap(config->fPixMapTable); + // Create DIM text output service + Textout = new DimService (SERVER_NAME"/Textout", (char *) ""); // Initialize status variables state = active; Exit = false; - Verbose = false; CmdFromSocket = false; Socket = -1; @@ -37,35 +36,39 @@ FirstChain = 0; LastChain = NUM_CHAINS-1; - - if (config->fStatusRefreshRate >= MIN_RATE && config->fStatusRefreshRate <= MAX_RATE) - fStatusRefreshRate = config->fStatusRefreshRate; - else fStatusRefreshRate = 1.; - + + // Get configuration data + char *Boards = GetConfig(SERVER_NAME " Boards"); + fPixMapTable = GetConfig(SERVER_NAME " PixMapTable"); + fTimeOut = atof(GetConfig(SERVER_NAME " TimeOut")); + fStatusRefreshRate = atof(GetConfig(SERVER_NAME " StatusRefreshRate")); + fCCPort = atoi(GetConfig(SERVER_NAME " CCPort")); + DACMin = atoi(GetConfig(SERVER_NAME " DACMin")); + DACMax = atoi(GetConfig(SERVER_NAME " DACMax")); + fHVCalibOffset = atof(GetConfig(SERVER_NAME " HVCalibOffset")); + fHVCalibSlope = atof(GetConfig(SERVER_NAME " HVCalibSlope")); + fHVMaxDiff = atoi(GetConfig(SERVER_NAME " HVMaxDiff")); + + if (fStatusRefreshRate < MIN_RATE || fStatusRefreshRate > MAX_RATE) fStatusRefreshRate = 1; + // Open HV devices - fHVBoard = new HVBoard* [config->NumHVBoards]; - for (int i=0; iNumHVBoards; i++) { - fHVBoard[NumHVBoards] = new HVBoard(i, config->fUSBDevice[i], this); + fHVBoard = new HVBoard* [strlen(Boards)]; + char *Token = strtok(Boards, " \t"); + while (Token != NULL) { + fHVBoard[NumHVBoards] = new HVBoard(NumHVBoards, Token, this); if(fHVBoard[NumHVBoards]->fDescriptor >= 0) { - printf("Synchronized and reset HV board %d (%s)\n",i,config->fUSBDevice[i]); + PrintMessage("Synchronized and reset board %d (%s)\n",NumHVBoards,fHVBoard[NumHVBoards]->BoardName); NumHVBoards++; } else { - printf("Failed to synchronize to HV board %d (%s)\n",i,config->fUSBDevice[i]); + PrintMessage(All, "Failed to synchronize board %d (%s)\n",NumHVBoards,fHVBoard[NumHVBoards]->BoardName); delete fHVBoard[NumHVBoards]; } - } + Token = strtok(NULL, " \t"); + } LastBoard = NumHVBoards-1; - - // Open log file - if ((Logfile = fopen(config->fLogFile, "a")) == NULL) printf("Warning: Could not open log file '%s'\n", config->fLogFile); - PrintMessage(MsgToLog,"********** Logging started **********\n"); - - // Create instance of slow data class - SlowDataClass = new SlowData("HV", config->fSlowDir); - if (SlowDataClass->ErrorCode != 0) { - PrintMessage("Warning: Could not open slowdata file (%s)\n", strerror(SlowDataClass->ErrorCode)); - } - SlowDataClass->NewEntry("Value-Info", "Issued if new HV value set successfull: Board-Num HV-Board-Name Chain Channel DAC-Target Converted-Value"); - SlowDataClass->NewEntry("Error-Info", "Issued if error occurs when trying to set new HV value: Board-Num HV-Board-Name Chain Channel Attempted-DAC-Target Converted-Value"); + + // Create instances + calib = new HVCalib(this); + pm = new PixelMap(fPixMapTable); } @@ -73,14 +76,9 @@ ProcessIO::~ProcessIO() { - delete SlowDataClass; - for (int i=0; ifLogFile, config->fPixMapTable, - config->NumHVBoards); - for (int i=0; iNumHVBoards; i++) { - PrintMessage(" Board %d: %s\n", i, config->fUSBDevice[i]); + PrintMessage( " Pixel map table: %s\n" + " %d USB devices:\n", fPixMapTable, + NumHVBoards); + for (int i=0; iBoardName); } PrintMessage( " TimeOut: %.2f s\n" @@ -172,8 +169,8 @@ " HVCalibOffset : %f\n" " HVCalibSlope : %f\n" - " HVMaxDiff : %u\n", config->fTimeOut, - config->fStatusRefreshRate, config->fCCPort, config->DACMin, - config->DACMax, config->fHVCalibOffset, config->fHVCalibSlope, - config->fHVMaxDiff); + " HVMaxDiff : %u\n", fTimeOut, + fStatusRefreshRate, fCCPort, DACMin, + DACMax, fHVCalibOffset, fHVCalibSlope, + fHVMaxDiff); return; @@ -183,22 +180,21 @@ // Print help if (Match(Param[0], "help")) { - puts(" board | | Address board i, boards i-j or all boards or list boards"); - puts(" chain | | Address chain i, chains i-j or all chains"); - puts(" hv || Set HV of pixel ID, ch. or all ch. of active chain(s)/board(s)"); - puts(" hvdiff || Change HV by "); - puts(" status [dac] Show status information (DAC values if requested)"); - puts(" config Print configuration"); - puts(" load Load HV settings from "); - puts(" save Save current HV settings to [file]"); - puts(" exit Exit program"); - puts(" rate Set status refresh rate to [Hz]"); - puts(" timeout