Changeset 10118 for fact/Feedback

Timestamp:

01/25/11 09:47:27 (14 years ago)

Author:

ogrimm

Message:

Adapted various programs to new PixelMap class

Location:

fact/Feedback

Files:

• Feedback.cc (modified) (7 diffs)
• Makefile (modified) (1 diff)

fact/Feedback/Feedback.cc

@@ -10 +10 @@
 #include "Feedback.h"
 #include "PixelMap.h"
-
-#define PIXMAP_LOCATION "../config/PixelMap.txt"
 
 static const char* FBState_Description[] = {
@@ -42 +40 @@
 Feedback::Feedback(): EvidenceServer(SERVER_NAME) {
 
-  PixMap = new PixelMap(PIXMAP_LOCATION, false);
+  // Make RPC to get pixelmap
+  DimRpcInfo RPC((char *) "ConfigRequest", (char *) "");
+  RPC.setData((char *) "Misc PixelMap");
+
+  PixMap = new PixelMap(std::string(RPC.getString(), RPC.getSize()));
   TimeBarrier = 0;
 
@@ -52 +54 @@
   fIDTable = Tokenize(GetConfig("IDTable"), " \t");
   Multiplicity = new unsigned int [fIDTable.size()];
-  
-  multiset<string> A;
-  char *Buf;
-  
+
+  // Determine multiplicity of bias to pixel connection  
+  std::vector<unsigned int> A;
   for (unsigned int i=0; i<fIDTable.size(); i++) {
-        if (asprintf(&Buf, "BiasID%d%d%d", PixMap->Pixel_to_HVboard(fIDTable[i]),
-                PixMap->Pixel_to_HVchain(fIDTable[i]), PixMap->Pixel_to_HVchannel(fIDTable[i])) == -1) Message(FATAL, "asprintf() failed");
-        A.insert(Buf);
-        free(Buf);
-  }
-  
-  for (unsigned int i=0; i<fIDTable.size(); i++) {
-        if (asprintf(&Buf, "BiasID%d%d%d", PixMap->Pixel_to_HVboard(fIDTable[i]),
-                PixMap->Pixel_to_HVchain(fIDTable[i]), PixMap->Pixel_to_HVchannel(fIDTable[i])) == -1) Message(FATAL, "asprintf() failed");
-        Multiplicity[i] = A.count(Buf);
-        free(Buf);
-  }
-
+        A = PixMap->HV_to_Pixel(PixMap->Pixel_to_HVcrate(atoi(fIDTable[i].c_str())), PixMap->Pixel_to_HVboard(atoi(fIDTable[i].c_str())), PixMap->Pixel_to_HVchannel(atoi(fIDTable[i].c_str())));
+        Multiplicity[i] = A.size();
+  }
+  
   // Initialise with zero content ???
   Average    = new float [fIDTable.size()];
@@ -227 +219 @@
   float Correction;
 
-  // Refect data is feedback off or timestamp too early
+  // Reject data if feedback off or timestamp too early
   if (FBMode == Off || getCommand()->getTimestamp() < TimeBarrier) return;
   TimeBarrier = 0;
@@ -298 +290 @@
   // Send command (non-blocking since in handler thread)
   if (!Cmd.str().empty()) {
-        DimClient::sendCommandNB("Bias/Command", (char *) ("hv "+Cmd.str()).c_str());
+        DimClient::sendCommandNB("Bias/Command", (char *) ("pixel "+Cmd.str()).c_str());
   }
 
@@ -385 +377 @@
   // Build command
   for (unsigned int i=0; i<fIDTable.size(); i++) { 
-        Cmd << fIDTable[i] << " " << std::showpos << -U/2/Multiplicity[i] << " ";                                 
+        Cmd << fIDTable[i] << " " << std::showpos << -U/2/Multiplicity[i] << " ";
   }
   
   // Send command
   if (!Cmd.str().empty()) {
-        DimClient::sendCommand("Bias/Command", ("hv "+Cmd.str()).c_str());
+        DimClient::sendCommand("Bias/Command", ("pixel "+Cmd.str()).c_str());
   }
 
   DiffVoltage = U;
   SetFBMode(ResponseFirst);
-  PrintMessage("HV Feedback: Decreasing voltages by %f for response measurement, acquiring data.\n",DiffVoltage/2);
+  PrintMessage("Feedback: Decreasing voltages by %f for response measurement, acquiring data.\n",DiffVoltage/2);
 }
 
@@ -439 +431 @@
 void Feedback::commandHandler() {
 
-  string Command = ToString("C", getCommand()->getData(), getCommand()->getSize());
+  string Command = ToString((char *) "C", getCommand()->getData(), getCommand()->getSize());
   
   // Parse command into tokens

fact/Feedback/Makefile

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