From 9b71069995108511d117d355edc83164d4011f14 Mon Sep 17 00:00:00 2001
From: Andrej Babic <andrej.babic@psi.ch>
Date: Wed, 8 Apr 2020 17:40:23 +0200
Subject: [PATCH] Refactor files around in project

---
 lib/Notify.cpp                         | 57 --------------------------
 sf-writer/{ => test}/test_sf_writer.py |  0
 sf/Makefile                            | 34 ---------------
 sf/conda-recipe/build.sh               |  4 --
 sf/conda-recipe/meta.yaml              | 26 ------------
 5 files changed, 121 deletions(-)
 delete mode 100644 lib/Notify.cpp
 rename sf-writer/{ => test}/test_sf_writer.py (100%)
 delete mode 100644 sf/Makefile
 delete mode 100644 sf/conda-recipe/build.sh
 delete mode 100644 sf/conda-recipe/meta.yaml

diff --git a/lib/Notify.cpp b/lib/Notify.cpp
deleted file mode 100644
index 157007a..0000000
--- a/lib/Notify.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-
-void PSIWriter::notify_first_pulse_id(uint64_t pulse_id) 
-{
-    string request_address(bsread_rest_address);
-
-    async(launch::async, [pulse_id, &request_address]{
-        try {
-
-            cout << "Sending first received pulse_id " << pulse_id <<;
-            cout << " to bsread_rest_address " << request_address << endl;
-
-            stringstream request;
-            request << "curl -X PUT " << request_address;
-            request << "/start_pulse_id/" << pulse_id;
-
-            string request_call(request.str());
-
-            #ifdef DEBUG_OUTPUT
-                using namespace date;
-                cout << "[" << chrono::system_clock::now() << "]";
-                cout << "[ProcessManager::notify_first_pulse_id] Sending request";
-                cout << "(" << request_call << ")." << endl;
-            #endif
-
-            system(request_call.c_str());
-        } catch (...){}
-        
-    });
-}
-
-
-void PSIWriter::notify_last_pulse_id(uint64_t pulse_id) 
-{
-
-    try {
-        cout << "Sending last received pulse_id " << pulse_id;
-        cout << " to bsread address " << bsread_rest_address << endl;
-
-        stringstream request;
-        request << "curl -X PUT " << bsread_rest_address;
-        request << "/stop_pulse_id/" << pulse_id;
-
-        cout << "Request: " << request.str() << endl;
-
-        string request_call(request.str());
-
-        #ifdef DEBUG_OUTPUT
-            using namespace date;
-            cout << "[" << chrono::system_clock::now() << "]";
-            cout << "[ProcessManager::notify_last_pulse_id] Sending request";
-            cout << "(" << request_call << ")." << endl;
-        #endif
-
-        system(request_call.c_str());
-    } catch (...){}
-}
-
diff --git a/sf-writer/test_sf_writer.py b/sf-writer/test/test_sf_writer.py
similarity index 100%
rename from sf-writer/test_sf_writer.py
rename to sf-writer/test/test_sf_writer.py
diff --git a/sf/Makefile b/sf/Makefile
deleted file mode 100644
index 1623d23..0000000
--- a/sf/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-SRC_DIR = .
-OBJ_DIR = ./obj
-BIN_DIR = ./bin
-MKDIR = mkdir -p
-
-CC = g++
-CFLAGS = -Wall -Wfatal-errors -std=c++11 -I${CONDA_PREFIX}/include -I${CONDA_PREFIX}/include/cpp_h5_writer
-LDFLAGS = -L${CONDA_PREFIX}/lib -L/usr/lib64 -lcpp_h5_writer -lzmq -lhdf5 -lhdf5_hl -lhdf5_cpp -lhdf5_hl_cpp -lboost_system -lboost_regex -lboost_thread -lpthread
-
-HEADERS = $(wildcard $(SRC_DIR)/*.hpp)
-SRCS = $(wildcard $(SRC_DIR)/*.cpp)
-OBJS = $(patsubst $(SRC_DIR)/%.cpp, $(OBJ_DIR)/%.o, $(SRCS))
-
-sf_h5_writer: export LD_LIBRARY_PATH=${CONDA_PREFIX}/lib
-sf_h5_writer: lib build_dirs $(OBJS)
-	$(CC) $(LDFLAGS) -o $(BIN_DIR)/sf_h5_writer $(OBJS) $(LDFLAGS)
-
-lib:
-	$(MAKE) -C ../lib deploy
-
-debug: CFLAGS += -DDEBUG_OUTPUT -g
-debug: sf_h5_writer
-
-deploy: sf_h5_writer
-	cp bin/* ${CONDA_PREFIX}/bin
-
-$(OBJ_DIR)/%.o: $(SRC_DIR)/%.cpp
-	$(CC) $(CFLAGS) $(LDFLAGS) -c -o $@ $<
-
-build_dirs:
-	$(MKDIR) $(OBJ_DIR) $(BIN_DIR)
-
-clean:
-	rm -rf $(OBJ_DIR) $(BIN_DIR)
\ No newline at end of file
diff --git a/sf/conda-recipe/build.sh b/sf/conda-recipe/build.sh
deleted file mode 100644
index 1b7a589..0000000
--- a/sf/conda-recipe/build.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-make
-
-cp bin/* ${PREFIX}/bin
-cp ../../bin/* ${PREFIX}/lib
\ No newline at end of file
diff --git a/sf/conda-recipe/meta.yaml b/sf/conda-recipe/meta.yaml
deleted file mode 100644
index 0a33f55..0000000
--- a/sf/conda-recipe/meta.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-package:
-    name: sf_h5_writer
-    version: 0.1.0
-
-build:
-  number: 0
-
-source:
-    path: ..
-
-requirements:
-    build:
-        - make
-        - gcc
-        - cppzmq ==4.2.1
-        - hdf5 ==1.10.1
-        - boost ==1.61.0
-
-    run:
-        - cppzmq ==4.2.1
-        - hdf5 ==1.10.1
-        - boost ==1.61.0
-
-
-about:
-    summary: "SF ZMQ to H5 writer."