Removed AliceO2Config.h.in and updated run_sim.C

.gitignore

@@ -29,6 +29,8 @@
 
 # build directory
 build/
+build_o2/
+xbuild/
 
 # common editor backups
 *.swp

CCDB/CMakeLists.txt

@@ -0,0 +1,97 @@
+configure_file(${CMAKE_SOURCE_DIR}/CCDB/config/conditions-server.json ${CMAKE_BINARY_DIR}/bin/config/conditions-server.json)
+configure_file(${CMAKE_SOURCE_DIR}/CCDB/config/conditions-client.json ${CMAKE_BINARY_DIR}/bin/config/conditions-client.json)
+configure_file(${CMAKE_SOURCE_DIR}/CCDB/example/fill_local_ocdb.C ${CMAKE_BINARY_DIR}/bin/config/fill_local_ocdb.C)
+
+set(INCLUDE_DIRECTORIES
+  ${CMAKE_SOURCE_DIR}/CCDB/include
+  ${CMAKE_SOURCE_DIR}/CCDB
+
+)
+
+set(SYSTEM_INCLUDE_DIRECTORIES
+  ${BASE_INCLUDE_DIRECTORIES}
+  ${Boost_INCLUDE_DIR}
+  ${ROOT_INCLUDE_DIR}
+  ${FAIRROOT_INCLUDE_DIR}
+  ${ZMQ_INCLUDE_DIR}
+)
+
+include_directories(${INCLUDE_DIRECTORIES})
+include_directories(SYSTEM ${SYSTEM_INCLUDE_DIRECTORIES})
+
+set(LINK_DIRECTORIES
+  ${ROOT_LIBRARY_DIR}
+  ${Boost_LIBRARY_DIRS}
+  ${FAIRROOT_LIBRARY_DIR}
+)
+link_directories(${LINK_DIRECTORIES})
+
+set(SRCS
+  src/Manager.cxx
+  src/Condition.cxx
+  src/GridStorage.cxx
+  src/LocalStorage.cxx
+  src/FileStorage.cxx
+  src/ConditionMetaData.cxx
+  src/ConditionId.cxx
+  src/IdPath.cxx
+  src/IdRunRange.cxx
+  src/Storage.cxx
+  src/XmlHandler.cxx
+)
+
+set(HEADERS
+  include/Condition.h
+  include/ConditionId.h
+  include/ConditionMetaData.h
+  include/FileStorage.h
+  include/GridStorage.h
+  include/IdPath.h
+  include/IdRunRange.h
+  include/LocalStorage.h
+  include/Manager.h
+  include/Storage.h
+  include/XmlHandler.h
+)
+
+Set(NO_DICT_SRCS
+  src/ConditionsMQServer.cxx
+  src/ConditionsMQClient.cxx
+)
+
+set(DEPENDENCIES
+  ${Boost_PROGRAM_OPTIONS_LIBRARY}
+  ${Boost_SYSTEM_LIBRARY}
+  ${Boost_LOG_SETUP_LIBRARY}
+  ${Boost_LOG_LIBRARY}
+  Base
+  ParBase
+  FairMQ ParMQ
+  fairmq_logger pthread Core Tree XMLParser Hist
+)
+
+set(LIBRARY_NAME CCDB)
+set(LINKDEF src/CCDBLinkDef.h)
+GENERATE_LIBRARY()
+
+Set(Exe_Names
+  conditions-server
+  conditions-client
+)
+
+Set(Exe_Source
+  src/runConditionsServer.cxx
+  src/runConditionsClient.cxx
+)
+
+list(LENGTH Exe_Names _length)
+math(EXPR _length ${_length}-1)
+
+ForEach(_file RANGE 0 ${_length})
+  list(GET Exe_Names ${_file} _name)
+  list(GET Exe_Source ${_file} _src)
+  Set(EXE_NAME ${_name})
+  Set(SRCS ${_src})
+  Set(DEPENDENCIES CCDB)
+  GENERATE_EXECUTABLE()
+EndForEach(_file RANGE 0 ${_length})

CCDB/README

@@ -0,0 +1,14 @@
+To run the MQ server-client example with the MQ server replying with CDB objects to the client requests, follow the following steps:
+
+0) In each shell configure the AliceO2 environment: source <your ${CMAKE_BINARY_DIR}>/config.sh
+
+1) To create a local O2CDB instance run the macro
+   root -l fill_local_ocdb.C
+   in ${CMAKE_BINARY_DIR}/bin/config/. This will create "DET/Calib/Histo" calibration objects for a hundred runs in the same directory/O2CDB/.
+
+2a) In one shell run the server example:
+<your ${CMAKE_BINARY_DIR}>/bin/conditions-server --id parmq-server --config-json-file <your ${CMAKE_BINARY_DIR}>/bin/config/conditions-server.json
+    --first-input-name local://<your ${CMAKE_BINARY_DIR}>/bin/config/O2CDB --first-input-type OCDB
+
+2b) In a separate shell run the client example:
+<your ${CMAKE_BINARY_DIR}>/bin/conditions-client --id parmq-client --config-json-file <your ${CMAKE_BINARY_DIR}>/bin/config/conditions-client.json

CCDB/config/conditions-client.json

@@ -0,0 +1,23 @@
+{
+    "fairMQOptions":
+    {
+        "device":
+        {
+            "id": "parmq-client",
+            "channel":
+            {
+                "name": "data",
+                "socket":
+                {
+                    "type": "req",
+                    "method": "connect",
+                    "address": "tcp://localhost:5005",
+                    "sndBufSize": "1000",
+                    "rcvBufSize": "1000",
+                    "rateLogging": "0"
+                }
+            }
+        }
+    }
+}
+

CCDB/config/conditions-server.json

@@ -0,0 +1,22 @@
+{
+    "fairMQOptions":
+    {
+        "device":
+        {
+            "id": "parmq-server",
+            "channel":
+            {
+                "name": "data",
+                "socket":
+                {
+                    "type": "rep",
+                    "method": "bind",
+                    "address": "tcp://*:5005",
+                    "sndBufSize": "1000",
+                    "rcvBufSize": "1000",
+                    "rateLogging": "0"
+                }
+            }
+        }
+    }
+}

CCDB/example/fill_local_ocdb.C

@@ -0,0 +1,17 @@
+void fill_local_ocdb()
+{
+  gSystem->Load("libAliceO2Base");
+  gSystem->Load("libAliceO2Cdb");
+  AliceO2::CDB::Manager* cdb = AliceO2::CDB::Manager::Instance();
+  cdb->setDefaultStorage("local://O2CDB");
+  TH1F* h = 0;
+  for (int run = 2000; run < 2100; run++) {
+    cdb->setRun(run);
+    h = new TH1F(Form("histo for %d run", run), "gauss", 100, -5, 5);
+    h->FillRandom("gaus", 1000);
+    AliceO2::CDB::ConditionId* id = new AliceO2::CDB::ConditionId("DET/Calib/Histo", run, run, 1, 0);
+    AliceO2::CDB::ConditionMetaData* md = new AliceO2::CDB::ConditionMetaData();
+    cdb->putObject(h, *id, md);
+    h = 0;
+  }
+}

CCDB/include/ConditionsMQClient.h

@@ -0,0 +1,53 @@
+/********************************************************************************
+ *    Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    *
+ *                                                                              *
+ *              This software is distributed under the terms of the             * 
+ *         GNU Lesser General Public Licence version 3 (LGPL) version 3,        *  
+ *                  copied verbatim in the file "LICENSE"                       *
+ ********************************************************************************/
+/**
+ * ConditionsMQClient.h
+ *
+ * @since 2016-01-11
+ * @author R. Grosso, from examples/MQ/7-parameters/FairMQExample7Client.h
+ */
+
+#ifndef ALICEO2_CDB_CONDITIONSMQCLIENT_H_
+#define ALICEO2_CDB_CONDITIONSMQCLIENT_H_
+
+#include <string>
+
+#include "FairMQDevice.h"
+
+namespace AliceO2 {
+namespace CDB {
+
+class ConditionsMQClient : public FairMQDevice
+{
+  public:
+    enum
+    {
+        ParameterName = FairMQDevice::Last,
+        Last
+    };
+    ConditionsMQClient();
+    virtual ~ConditionsMQClient();
+
+    static void CustomCleanup(void* data, void* hint);
+
+    virtual void SetProperty(const int key, const std::string& value);
+    virtual std::string GetProperty(const int key, const std::string& default_ = "");
+    virtual void SetProperty(const int key, const int value);
+    virtual int GetProperty(const int key, const int default_ = 0);
+
+  protected:
+    virtual void Run();
+
+  private:
+    int fRunId;
+    std::string fParameterName;
+};
+}
+}
+
+#endif /* ALICEO2_CDB_CONDITIONSMQCLIENT_H_ */

CCDB/include/ConditionsMQServer.h

@@ -0,0 +1,41 @@
+/********************************************************************************
+ *    Copyright (C) 2014 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    *
+ *                                                                              *
+ *              This software is distributed under the terms of the             * 
+ *         GNU Lesser General Public Licence version 3 (LGPL) version 3,        *  
+ *                  copied verbatim in the file "LICENSE"                       *
+ ********************************************************************************/
+/**
+ * ConditionsMQServer.h
+ *
+ * @since 2016-01-11
+ * @author R. Grosso, from parmq/ParameterMQServer.h
+ */
+
+#ifndef ALICEO2_CDB_CONDITIONSMQSERVER_H_
+#define ALICEO2_CDB_CONDITIONSMQSERVER_H_
+
+#include <string>
+
+#include "ParameterMQServer.h"
+#include "Manager.h"
+
+namespace AliceO2 {
+namespace CDB {
+
+class ConditionsMQServer : public ParameterMQServer
+{
+  public:
+    ConditionsMQServer();
+    virtual ~ConditionsMQServer();
+
+    virtual void Run();
+    virtual void InitTask();
+
+  private:
+    Manager* fCdbManager;
+};
+}
+}
+
+#endif /* ALICEO2_CDB_CONDITIONSMQSERVER_H_ */