Index: /trunk/FACT++/src/EventBuilderWrapper.h
===================================================================
--- /trunk/FACT++/src/EventBuilderWrapper.h	(revision 10860)
+++ /trunk/FACT++/src/EventBuilderWrapper.h	(revision 10861)
@@ -79,5 +79,5 @@
     }
 
-    void Start(const map<int,string> &addr)
+    void Start(const vector<string> &addr)
     {
         if (IsThreadRunning())
@@ -89,32 +89,19 @@
         fMsg.Message("Starting EventBuilder thread");
 
-        int cnt = 0;
-        for (int i=0; i<40; i++)
+        for (size_t i=0; i<addr.size(); i++)
         {
-            //g_ip[i].port = 5000;
-            memset(g_ip[cnt].addr, 0, sizeof(g_ip[cnt].addr));
-            //strncpy(g_ip[i].addr, it->c_str(), 99);
-
-            const map<int,string>::const_iterator it = addr.find(i);
-            if (it==addr.end())
-                continue;
-
-            const string &dest = it->second;
-
-            size_t pos = dest.find_first_of(':');
-            if (pos==string::npos)
-                continue;
-
-            string a = dest.substr(0, pos);
-            string p = dest.substr(pos+1);
-
-            strcpy(g_ip[cnt].addr, "127.0.0.1");
-            g_ip[cnt].port = atoi(p.c_str());
-
-            cnt++;
+            memset(g_ip[i].addr, 0, sizeof(g_ip[i].addr));
+
+            const size_t pos = addr[i].find_first_of(':');
+
+            const string a = addr[i].substr(0, pos);
+            const string p = addr[i].substr(pos+1);
+
+            strcpy(g_ip[i].addr, "127.0.0.1");
+            g_ip[i].port = atoi(p.c_str());
         }
 
-        g_maxBoards = cnt;
-        g_actBoards = cnt;
+        g_maxBoards = addr.size();
+        g_actBoards = addr.size();
 
         g_runStat   = kModeRun;