ReadoutCard API change (#25)

* fix because of incompatible API change in ReadoutCard v0.9.1

Author: sy-c

CMakeLists.txt

@@ -180,4 +180,9 @@ install(
         FILES readout.cfg
         DESTINATION ${CMAKE_INSTALL_PREFIX}/etc
         PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
+	
+install(
+        FILES src/RAWDataHeader.h
+        DESTINATION ${CMAKE_INSTALL_PREFIX}/include/${MODULE_NAME}
+        PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
 

src/ReadoutEquipmentRORC.cxx

@@ -5,7 +5,7 @@
 #include <ReadoutCard/MemoryMappedFile.h>
 #include <ReadoutCard/DmaChannelInterface.h>
 #include <ReadoutCard/Exception.h>
-#include <ReadoutCard/Driver.h>
+
 
 #include <string>
 #include <mutex>
@@ -66,8 +66,8 @@ class ReadoutEquipmentRORC : public ReadoutEquipment {
 };
 
 
-std::mutex readoutEquipmentRORCLock;
-bool isDriverInitialized=false;
+//std::mutex readoutEquipmentRORCLock;
+
 
 
 struct ReadoutEquipmentRORCException : virtual Exception {};
@@ -133,14 +133,6 @@ ReadoutEquipmentRORC::ReadoutEquipmentRORC(ConfigFile &cfg, std::string name) :
       BOOST_THROW_EXCEPTION(ReadoutEquipmentRORCException() << ErrorInfo::Message("Superpage must be at least 32kB"));
     }
 
-    // make sure ROC driver is initialized once
-    readoutEquipmentRORCLock.lock();       
-    if (!isDriverInitialized) {
-      AliceO2::roc::driver::initialize();
-      isDriverInitialized=true;
-    }
-    readoutEquipmentRORCLock.unlock();
-    
     // open and configure ROC
     theLog.log("Opening ROC %s:%d",cardId.c_str(),cfgChannelNumber);
     AliceO2::roc::Parameters params;

src/testROC.cxx

@@ -12,7 +12,6 @@ InfoLogger theLog;
 #include <ReadoutCard/MemoryMappedFile.h>
 #include <ReadoutCard/DmaChannelInterface.h>
 #include <ReadoutCard/Exception.h>
-#include <ReadoutCard/Driver.h>
 
 #include <vector>
 #include <time.h>
@@ -257,8 +256,6 @@ int main(int argc, char**argv) {
 
 
 
-  AliceO2::roc::driver::initialize();
-
   std::vector<ROCdevice> devices;
 
   for (int i=argMin;i<argc;i++) {