Merge branch 'SLC6_update' into 'Dev'

Small fixes for SLC6 and Antenna operations

See merge request cms_tk_ph2/Ph2_ACF!169

NetworkUtils/TCPClientBase.cc

@@ -7,6 +7,7 @@
 #include <netinet/in.h> // inet_aton, struct sockaddr_in
 #include <strings.h>    // bzero
 #include <thread>
+#include <sstream>
 
 //========================================================================================================================
 TCPClientBase::TCPClientBase(const std::string& serverIP, int serverPort) : fServerIP(serverIP), fServerPort(serverPort), fConnected(false) {}

src/feh_2s_test.cc

@@ -337,7 +337,7 @@ int main(int argc, char* argv[])
         cOpenFinder.Inherit(&cTool);
         cOpenFinder.Initialise(cOfp);
         LOG(INFO) << BOLDBLUE << "Starting open finding measurement [antenna potentiometer set to 0x" << std::hex << cOfp.potentiometer << std::dec << " written to the potentiometer" << RESET;
-        cOpenFinder.FindOpens();
+        cOpenFinder.FindOpens2S();
         // TODO: write this one from cLatencyScan.writeObjects();
         // cOpenFinder.writeObjects();
 #endif

src/miniDAQ.cc

@@ -149,6 +149,7 @@ int main(int argc, char* argv[])
         CicFEAlignment cCicAligner;
         cCicAligner.Inherit(&cTool);
         cCicAligner.Start(0);
+        cCicAligner.waitForRunToBeCompleted();
         // reset all chip and board registers
         // to what they were before this tool was called
         cCicAligner.Reset();

tools/AntennaTester.cc

@@ -257,7 +257,7 @@ void AntennaTester::Measure(uint8_t pDigiPotentiometer)
             uint32_t cN      = 1;
             uint32_t cNthAcq = 0;
 
-            this->Start(pBoard);
+            this->StartBoard(pBoard);
 
             while(cN <= fTotalEvents)
             {
@@ -279,7 +279,7 @@ void AntennaTester::Measure(uint8_t pDigiPotentiometer)
                 cNthAcq++;
             }
 
-            this->Stop(pBoard);
+            this->StopBoard(pBoard);
 
             /*Here the reconstruction of histograms happens*/
             for(uint16_t channel_id = 1; channel_id < fNCbc * 127 + 1; channel_id++)
@@ -307,4 +307,4 @@ void AntennaTester::Measure(uint8_t pDigiPotentiometer)
     LOG(INFO) << BOLDGREEN << "Mean occupancy (measured w/ antenna) for the Top side: " << GetMeanOccupancyTop() << "%." << RESET;
     LOG(INFO) << BOLDGREEN << "Mean occupancy (measured w/ antenna) for the Botton side: " << GetMeanOccupancyBottom() << "%." << RESET;
 }
-#endif
\ No newline at end of file
+#endif

tools/HybridTester.cc

@@ -1216,7 +1216,7 @@ void HybridTester::AntennaScan(uint8_t pDigiPotentiometer)
             uint32_t cN       = 1;
             uint32_t cNthAcq  = 0;
 
-            this->Start(theBoard);
+            this->StartBoard(theBoard);
 
             while(cN <= fTotalEvents)
             {
@@ -1239,7 +1239,7 @@ void HybridTester::AntennaScan(uint8_t pDigiPotentiometer)
                 cNthAcq++;
             }
 
-            this->Stop(theBoard);
+            this->StopBoard(theBoard);
 
             /*Here the reconstruction of histograms happens*/
             for(uint16_t channel_id = 1; channel_id < fNCbc * 127 + 1; channel_id++)