Rearranged file directories

dchao34 · Sep 23, 2014 · 9a87493 · 9a87493
1 parent 411db97
commit 9a87493
Show file tree

Hide file tree

Showing 31 changed files with 11 additions and 11 deletions.
diff --git a/create_database/tuple_reader/BDtaunuDef.cc → ...ader/bdtaunu_tuple_analyzer/BDtaunuDef.cc b/create_database/tuple_reader/BDtaunuDef.cc → ...ader/bdtaunu_tuple_analyzer/BDtaunuDef.cc
diff --git a/create_database/tuple_reader/BDtaunuDef.h → ...eader/bdtaunu_tuple_analyzer/BDtaunuDef.h b/create_database/tuple_reader/BDtaunuDef.h → ...eader/bdtaunu_tuple_analyzer/BDtaunuDef.h
diff --git a/...atabase/tuple_reader/BDtaunuGraphWriter.h → ...taunu_tuple_analyzer/BDtaunuGraphWriter.h b/...atabase/tuple_reader/BDtaunuGraphWriter.h → ...taunu_tuple_analyzer/BDtaunuGraphWriter.h
diff --git a/..._database/tuple_reader/BDtaunuMcReader.cc → ...bdtaunu_tuple_analyzer/BDtaunuMcReader.cc b/..._database/tuple_reader/BDtaunuMcReader.cc → ...bdtaunu_tuple_analyzer/BDtaunuMcReader.cc
diff --git a/...e_database/tuple_reader/BDtaunuMcReader.h → .../bdtaunu_tuple_analyzer/BDtaunuMcReader.h b/...e_database/tuple_reader/BDtaunuMcReader.h → .../bdtaunu_tuple_analyzer/BDtaunuMcReader.h
diff --git a/...te_database/tuple_reader/BDtaunuReader.cc → ...r/bdtaunu_tuple_analyzer/BDtaunuReader.cc b/...te_database/tuple_reader/BDtaunuReader.cc → ...r/bdtaunu_tuple_analyzer/BDtaunuReader.cc
diff --git a/create_database/tuple_reader/BDtaunuReader.h → ...er/bdtaunu_tuple_analyzer/BDtaunuReader.h b/create_database/tuple_reader/BDtaunuReader.h → ...er/bdtaunu_tuple_analyzer/BDtaunuReader.h
diff --git a/create_database/tuple_reader/BDtaunuUtils.cc → ...er/bdtaunu_tuple_analyzer/BDtaunuUtils.cc b/create_database/tuple_reader/BDtaunuUtils.cc → ...er/bdtaunu_tuple_analyzer/BDtaunuUtils.cc
diff --git a/create_database/tuple_reader/BDtaunuUtils.h → ...der/bdtaunu_tuple_analyzer/BDtaunuUtils.h b/create_database/tuple_reader/BDtaunuUtils.h → ...der/bdtaunu_tuple_analyzer/BDtaunuUtils.h
diff --git a/create_database/tuple_reader/GraphDef.cc → ...reader/bdtaunu_tuple_analyzer/GraphDef.cc b/create_database/tuple_reader/GraphDef.cc → ...reader/bdtaunu_tuple_analyzer/GraphDef.cc
diff --git a/create_database/tuple_reader/GraphDef.h → ..._reader/bdtaunu_tuple_analyzer/GraphDef.h b/create_database/tuple_reader/GraphDef.h → ..._reader/bdtaunu_tuple_analyzer/GraphDef.h
diff --git a/create_database/tuple_reader/GraphManager.h → ...der/bdtaunu_tuple_analyzer/GraphManager.h b/create_database/tuple_reader/GraphManager.h → ...der/bdtaunu_tuple_analyzer/GraphManager.h
diff --git a/create_database/tuple_reader/Makefile → ...le_reader/bdtaunu_tuple_analyzer/Makefile b/create_database/tuple_reader/Makefile → ...le_reader/bdtaunu_tuple_analyzer/Makefile
@@ -10,7 +10,7 @@ CXXFLAGS += -fPIC
 LIBNAME = libTupleReader.so
 
 # path to compiled libaries
-PKG_LIBPATH = lib
+PKG_LIBPATH = ../lib
 
 # package Contents
 SOURCES = BDtaunuDef.cc GraphDef.cc \
@@ -34,7 +34,7 @@ CUSTOM_CPP_UTIL_ROOT = /Users/dchao/bdtaunu/v4/custom_cpp_utilities
 INCFLAGS += -I$(CUSTOM_CPP_UTIL_ROOT)
 
 # particle data file
-PDT_FILE_PATHNAME = $(shell pwd | sed 's/\/[^/]*$$//')/tuple_reader/meta/pdt.dat
+PDT_FILE_PATHNAME = $(shell pwd | sed 's/\/[^/]*$$//')/meta/pdt.dat
 CXXFLAGS += -D__PDT_FILE_PATHNAME='"$(PDT_FILE_PATHNAME)"'
 
 # Build Rules

diff --git a/...e_database/tuple_reader/McGraphManager.cc → .../bdtaunu_tuple_analyzer/McGraphManager.cc b/...e_database/tuple_reader/McGraphManager.cc → .../bdtaunu_tuple_analyzer/McGraphManager.cc
diff --git a/...te_database/tuple_reader/McGraphManager.h → ...r/bdtaunu_tuple_analyzer/McGraphManager.h b/...te_database/tuple_reader/McGraphManager.h → ...r/bdtaunu_tuple_analyzer/McGraphManager.h
diff --git a/..._database/tuple_reader/McGraphVisitors.cc → ...bdtaunu_tuple_analyzer/McGraphVisitors.cc b/..._database/tuple_reader/McGraphVisitors.cc → ...bdtaunu_tuple_analyzer/McGraphVisitors.cc
diff --git a/...e_database/tuple_reader/McGraphVisitors.h → .../bdtaunu_tuple_analyzer/McGraphVisitors.h b/...e_database/tuple_reader/McGraphVisitors.h → .../bdtaunu_tuple_analyzer/McGraphVisitors.h
diff --git a/...database/tuple_reader/RecoGraphManager.cc → ...dtaunu_tuple_analyzer/RecoGraphManager.cc b/...database/tuple_reader/RecoGraphManager.cc → ...dtaunu_tuple_analyzer/RecoGraphManager.cc
diff --git a/..._database/tuple_reader/RecoGraphManager.h → ...bdtaunu_tuple_analyzer/RecoGraphManager.h b/..._database/tuple_reader/RecoGraphManager.h → ...bdtaunu_tuple_analyzer/RecoGraphManager.h
diff --git a/...atabase/tuple_reader/RecoGraphVisitors.cc → ...taunu_tuple_analyzer/RecoGraphVisitors.cc b/...atabase/tuple_reader/RecoGraphVisitors.cc → ...taunu_tuple_analyzer/RecoGraphVisitors.cc
diff --git a/...database/tuple_reader/RecoGraphVisitors.h → ...dtaunu_tuple_analyzer/RecoGraphVisitors.h b/...database/tuple_reader/RecoGraphVisitors.h → ...dtaunu_tuple_analyzer/RecoGraphVisitors.h
diff --git a/create_database/tuple_reader/RootReader.cc → ...ader/bdtaunu_tuple_analyzer/RootReader.cc b/create_database/tuple_reader/RootReader.cc → ...ader/bdtaunu_tuple_analyzer/RootReader.cc
diff --git a/create_database/tuple_reader/RootReader.h → ...eader/bdtaunu_tuple_analyzer/RootReader.h b/create_database/tuple_reader/RootReader.h → ...eader/bdtaunu_tuple_analyzer/RootReader.h
diff --git a/...database/tuple_reader/UpsilonCandidate.cc → ...dtaunu_tuple_analyzer/UpsilonCandidate.cc b/...database/tuple_reader/UpsilonCandidate.cc → ...dtaunu_tuple_analyzer/UpsilonCandidate.cc
diff --git a/..._database/tuple_reader/UpsilonCandidate.h → ...bdtaunu_tuple_analyzer/UpsilonCandidate.h b/..._database/tuple_reader/UpsilonCandidate.h → ...bdtaunu_tuple_analyzer/UpsilonCandidate.h
diff --git a/create_database/tuple_reader/tests/Makefile → ...der/bdtaunu_tuple_analyzer/tests/Makefile b/create_database/tuple_reader/tests/Makefile → ...der/bdtaunu_tuple_analyzer/tests/Makefile
@@ -16,8 +16,8 @@ BINARIES = mcreader_test1 mcreader_test2 mcreader_test3
 
 # tuple_reader 
 TUPLE_READER_LIBNAME = -lTupleReader
-TUPLE_READER_INC_PATH = ../
-TUPLE_READER_LIB_PATH = ../lib
+TUPLE_READER_INC_PATH = ../../
+TUPLE_READER_LIB_PATH = ../../lib
 INCFLAGS += -I $(TUPLE_READER_INC_PATH)
 LDFLAGS += -L $(TUPLE_READER_LIB_PATH) $(TUPLE_READER_LIBNAME)
 

diff --git a/...base/tuple_reader/tests/mcreader_test1.cc → ...nu_tuple_analyzer/tests/mcreader_test1.cc b/...base/tuple_reader/tests/mcreader_test1.cc → ...nu_tuple_analyzer/tests/mcreader_test1.cc
@@ -1,7 +1,7 @@
 #include <iostream> 
 #include <chrono>
 
-#include "BDtaunuMcReader.h"
+#include <bdtaunu_tuple_analyzer/BDtaunuMcReader.h>
 
 using namespace std;
 

diff --git a/...base/tuple_reader/tests/mcreader_test2.cc → ...nu_tuple_analyzer/tests/mcreader_test2.cc b/...base/tuple_reader/tests/mcreader_test2.cc → ...nu_tuple_analyzer/tests/mcreader_test2.cc
@@ -6,9 +6,9 @@
 #include <utility> 
 #include <cassert> 
 
-#include "BDtaunuDef.h"
-#include "BDtaunuMcReader.h"
-#include "UpsilonCandidate.h"
+#include <bdtaunu_tuple_analyzer/BDtaunuDef.h>
+#include <bdtaunu_tuple_analyzer/BDtaunuMcReader.h>
+#include <bdtaunu_tuple_analyzer/UpsilonCandidate.h>
 
 using namespace std;
 

diff --git a/...base/tuple_reader/tests/mcreader_test3.cc → ...nu_tuple_analyzer/tests/mcreader_test3.cc b/...base/tuple_reader/tests/mcreader_test3.cc → ...nu_tuple_analyzer/tests/mcreader_test3.cc
@@ -6,9 +6,9 @@
 #include <utility> 
 #include <cassert> 
 
-#include "BDtaunuDef.h"
-#include "BDtaunuMcReader.h"
-#include "UpsilonCandidate.h"
+#include <bdtaunu_tuple_analyzer/BDtaunuDef.h>
+#include <bdtaunu_tuple_analyzer/BDtaunuMcReader.h>
+#include <bdtaunu_tuple_analyzer/UpsilonCandidate.h>
 
 using namespace std;
 

diff --git a/...database/tuple_reader/tests/merge_pdf.cmd → ...dtaunu_tuple_analyzer/tests/merge_pdf.cmd b/...database/tuple_reader/tests/merge_pdf.cmd → ...dtaunu_tuple_analyzer/tests/merge_pdf.cmd
diff --git a/...ase/tuple_reader/tests/valgrind-root.supp → ...u_tuple_analyzer/tests/valgrind-root.supp b/...ase/tuple_reader/tests/valgrind-root.supp → ...u_tuple_analyzer/tests/valgrind-root.supp