From 9a87493be10071077948272f2085ea49f0cae54d Mon Sep 17 00:00:00 2001 From: dchao Date: Tue, 23 Sep 2014 15:36:02 -0700 Subject: [PATCH] Rearranged file directories --- .../tuple_reader/{ => bdtaunu_tuple_analyzer}/BDtaunuDef.cc | 0 .../tuple_reader/{ => bdtaunu_tuple_analyzer}/BDtaunuDef.h | 0 .../{ => bdtaunu_tuple_analyzer}/BDtaunuGraphWriter.h | 0 .../{ => bdtaunu_tuple_analyzer}/BDtaunuMcReader.cc | 0 .../{ => bdtaunu_tuple_analyzer}/BDtaunuMcReader.h | 0 .../{ => bdtaunu_tuple_analyzer}/BDtaunuReader.cc | 0 .../{ => bdtaunu_tuple_analyzer}/BDtaunuReader.h | 0 .../{ => bdtaunu_tuple_analyzer}/BDtaunuUtils.cc | 0 .../{ => bdtaunu_tuple_analyzer}/BDtaunuUtils.h | 0 .../tuple_reader/{ => bdtaunu_tuple_analyzer}/GraphDef.cc | 0 .../tuple_reader/{ => bdtaunu_tuple_analyzer}/GraphDef.h | 0 .../{ => bdtaunu_tuple_analyzer}/GraphManager.h | 0 .../tuple_reader/{ => bdtaunu_tuple_analyzer}/Makefile | 4 ++-- .../{ => bdtaunu_tuple_analyzer}/McGraphManager.cc | 0 .../{ => bdtaunu_tuple_analyzer}/McGraphManager.h | 0 .../{ => bdtaunu_tuple_analyzer}/McGraphVisitors.cc | 0 .../{ => bdtaunu_tuple_analyzer}/McGraphVisitors.h | 0 .../{ => bdtaunu_tuple_analyzer}/RecoGraphManager.cc | 0 .../{ => bdtaunu_tuple_analyzer}/RecoGraphManager.h | 0 .../{ => bdtaunu_tuple_analyzer}/RecoGraphVisitors.cc | 0 .../{ => bdtaunu_tuple_analyzer}/RecoGraphVisitors.h | 0 .../tuple_reader/{ => bdtaunu_tuple_analyzer}/RootReader.cc | 0 .../tuple_reader/{ => bdtaunu_tuple_analyzer}/RootReader.h | 0 .../{ => bdtaunu_tuple_analyzer}/UpsilonCandidate.cc | 0 .../{ => bdtaunu_tuple_analyzer}/UpsilonCandidate.h | 0 .../{ => bdtaunu_tuple_analyzer}/tests/Makefile | 4 ++-- .../{ => bdtaunu_tuple_analyzer}/tests/mcreader_test1.cc | 2 +- .../{ => bdtaunu_tuple_analyzer}/tests/mcreader_test2.cc | 6 +++--- .../{ => bdtaunu_tuple_analyzer}/tests/mcreader_test3.cc | 6 +++--- .../{ => bdtaunu_tuple_analyzer}/tests/merge_pdf.cmd | 0 .../{ => bdtaunu_tuple_analyzer}/tests/valgrind-root.supp | 0 31 files changed, 11 insertions(+), 11 deletions(-) rename create_database/tuple_reader/{ => bdtaunu_tuple_analyzer}/BDtaunuDef.cc (100%) rename create_database/tuple_reader/{ => bdtaunu_tuple_analyzer}/BDtaunuDef.h (100%) rename create_database/tuple_reader/{ => bdtaunu_tuple_analyzer}/BDtaunuGraphWriter.h (100%) rename create_database/tuple_reader/{ => bdtaunu_tuple_analyzer}/BDtaunuMcReader.cc (100%) rename create_database/tuple_reader/{ => bdtaunu_tuple_analyzer}/BDtaunuMcReader.h (100%) rename create_database/tuple_reader/{ => bdtaunu_tuple_analyzer}/BDtaunuReader.cc (100%) rename create_database/tuple_reader/{ => bdtaunu_tuple_analyzer}/BDtaunuReader.h (100%) rename create_database/tuple_reader/{ => bdtaunu_tuple_analyzer}/BDtaunuUtils.cc (100%) rename create_database/tuple_reader/{ => bdtaunu_tuple_analyzer}/BDtaunuUtils.h (100%) rename create_database/tuple_reader/{ => bdtaunu_tuple_analyzer}/GraphDef.cc (100%) rename create_database/tuple_reader/{ => bdtaunu_tuple_analyzer}/GraphDef.h (100%) rename create_database/tuple_reader/{ => bdtaunu_tuple_analyzer}/GraphManager.h (100%) rename create_database/tuple_reader/{ => bdtaunu_tuple_analyzer}/Makefile (94%) rename create_database/tuple_reader/{ => bdtaunu_tuple_analyzer}/McGraphManager.cc (100%) rename create_database/tuple_reader/{ => bdtaunu_tuple_analyzer}/McGraphManager.h (100%) rename create_database/tuple_reader/{ => bdtaunu_tuple_analyzer}/McGraphVisitors.cc (100%) rename create_database/tuple_reader/{ => bdtaunu_tuple_analyzer}/McGraphVisitors.h (100%) rename create_database/tuple_reader/{ => bdtaunu_tuple_analyzer}/RecoGraphManager.cc (100%) rename create_database/tuple_reader/{ => bdtaunu_tuple_analyzer}/RecoGraphManager.h (100%) rename create_database/tuple_reader/{ => bdtaunu_tuple_analyzer}/RecoGraphVisitors.cc (100%) rename create_database/tuple_reader/{ => bdtaunu_tuple_analyzer}/RecoGraphVisitors.h (100%) rename create_database/tuple_reader/{ => bdtaunu_tuple_analyzer}/RootReader.cc (100%) rename create_database/tuple_reader/{ => bdtaunu_tuple_analyzer}/RootReader.h (100%) rename create_database/tuple_reader/{ => bdtaunu_tuple_analyzer}/UpsilonCandidate.cc (100%) rename create_database/tuple_reader/{ => bdtaunu_tuple_analyzer}/UpsilonCandidate.h (100%) rename create_database/tuple_reader/{ => bdtaunu_tuple_analyzer}/tests/Makefile (93%) rename create_database/tuple_reader/{ => bdtaunu_tuple_analyzer}/tests/mcreader_test1.cc (92%) rename create_database/tuple_reader/{ => bdtaunu_tuple_analyzer}/tests/mcreader_test2.cc (99%) rename create_database/tuple_reader/{ => bdtaunu_tuple_analyzer}/tests/mcreader_test3.cc (98%) rename create_database/tuple_reader/{ => bdtaunu_tuple_analyzer}/tests/merge_pdf.cmd (100%) rename create_database/tuple_reader/{ => bdtaunu_tuple_analyzer}/tests/valgrind-root.supp (100%) diff --git a/create_database/tuple_reader/BDtaunuDef.cc b/create_database/tuple_reader/bdtaunu_tuple_analyzer/BDtaunuDef.cc similarity index 100% rename from create_database/tuple_reader/BDtaunuDef.cc rename to create_database/tuple_reader/bdtaunu_tuple_analyzer/BDtaunuDef.cc diff --git a/create_database/tuple_reader/BDtaunuDef.h b/create_database/tuple_reader/bdtaunu_tuple_analyzer/BDtaunuDef.h similarity index 100% rename from create_database/tuple_reader/BDtaunuDef.h rename to create_database/tuple_reader/bdtaunu_tuple_analyzer/BDtaunuDef.h diff --git a/create_database/tuple_reader/BDtaunuGraphWriter.h b/create_database/tuple_reader/bdtaunu_tuple_analyzer/BDtaunuGraphWriter.h similarity index 100% rename from create_database/tuple_reader/BDtaunuGraphWriter.h rename to create_database/tuple_reader/bdtaunu_tuple_analyzer/BDtaunuGraphWriter.h diff --git a/create_database/tuple_reader/BDtaunuMcReader.cc b/create_database/tuple_reader/bdtaunu_tuple_analyzer/BDtaunuMcReader.cc similarity index 100% rename from create_database/tuple_reader/BDtaunuMcReader.cc rename to create_database/tuple_reader/bdtaunu_tuple_analyzer/BDtaunuMcReader.cc diff --git a/create_database/tuple_reader/BDtaunuMcReader.h b/create_database/tuple_reader/bdtaunu_tuple_analyzer/BDtaunuMcReader.h similarity index 100% rename from create_database/tuple_reader/BDtaunuMcReader.h rename to create_database/tuple_reader/bdtaunu_tuple_analyzer/BDtaunuMcReader.h diff --git a/create_database/tuple_reader/BDtaunuReader.cc b/create_database/tuple_reader/bdtaunu_tuple_analyzer/BDtaunuReader.cc similarity index 100% rename from create_database/tuple_reader/BDtaunuReader.cc rename to create_database/tuple_reader/bdtaunu_tuple_analyzer/BDtaunuReader.cc diff --git a/create_database/tuple_reader/BDtaunuReader.h b/create_database/tuple_reader/bdtaunu_tuple_analyzer/BDtaunuReader.h similarity index 100% rename from create_database/tuple_reader/BDtaunuReader.h rename to create_database/tuple_reader/bdtaunu_tuple_analyzer/BDtaunuReader.h diff --git a/create_database/tuple_reader/BDtaunuUtils.cc b/create_database/tuple_reader/bdtaunu_tuple_analyzer/BDtaunuUtils.cc similarity index 100% rename from create_database/tuple_reader/BDtaunuUtils.cc rename to create_database/tuple_reader/bdtaunu_tuple_analyzer/BDtaunuUtils.cc diff --git a/create_database/tuple_reader/BDtaunuUtils.h b/create_database/tuple_reader/bdtaunu_tuple_analyzer/BDtaunuUtils.h similarity index 100% rename from create_database/tuple_reader/BDtaunuUtils.h rename to create_database/tuple_reader/bdtaunu_tuple_analyzer/BDtaunuUtils.h diff --git a/create_database/tuple_reader/GraphDef.cc b/create_database/tuple_reader/bdtaunu_tuple_analyzer/GraphDef.cc similarity index 100% rename from create_database/tuple_reader/GraphDef.cc rename to create_database/tuple_reader/bdtaunu_tuple_analyzer/GraphDef.cc diff --git a/create_database/tuple_reader/GraphDef.h b/create_database/tuple_reader/bdtaunu_tuple_analyzer/GraphDef.h similarity index 100% rename from create_database/tuple_reader/GraphDef.h rename to create_database/tuple_reader/bdtaunu_tuple_analyzer/GraphDef.h diff --git a/create_database/tuple_reader/GraphManager.h b/create_database/tuple_reader/bdtaunu_tuple_analyzer/GraphManager.h similarity index 100% rename from create_database/tuple_reader/GraphManager.h rename to create_database/tuple_reader/bdtaunu_tuple_analyzer/GraphManager.h diff --git a/create_database/tuple_reader/Makefile b/create_database/tuple_reader/bdtaunu_tuple_analyzer/Makefile similarity index 94% rename from create_database/tuple_reader/Makefile rename to create_database/tuple_reader/bdtaunu_tuple_analyzer/Makefile index c5b9969..fa00a04 100644 --- a/create_database/tuple_reader/Makefile +++ b/create_database/tuple_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/create_database/tuple_reader/McGraphManager.cc b/create_database/tuple_reader/bdtaunu_tuple_analyzer/McGraphManager.cc similarity index 100% rename from create_database/tuple_reader/McGraphManager.cc rename to create_database/tuple_reader/bdtaunu_tuple_analyzer/McGraphManager.cc diff --git a/create_database/tuple_reader/McGraphManager.h b/create_database/tuple_reader/bdtaunu_tuple_analyzer/McGraphManager.h similarity index 100% rename from create_database/tuple_reader/McGraphManager.h rename to create_database/tuple_reader/bdtaunu_tuple_analyzer/McGraphManager.h diff --git a/create_database/tuple_reader/McGraphVisitors.cc b/create_database/tuple_reader/bdtaunu_tuple_analyzer/McGraphVisitors.cc similarity index 100% rename from create_database/tuple_reader/McGraphVisitors.cc rename to create_database/tuple_reader/bdtaunu_tuple_analyzer/McGraphVisitors.cc diff --git a/create_database/tuple_reader/McGraphVisitors.h b/create_database/tuple_reader/bdtaunu_tuple_analyzer/McGraphVisitors.h similarity index 100% rename from create_database/tuple_reader/McGraphVisitors.h rename to create_database/tuple_reader/bdtaunu_tuple_analyzer/McGraphVisitors.h diff --git a/create_database/tuple_reader/RecoGraphManager.cc b/create_database/tuple_reader/bdtaunu_tuple_analyzer/RecoGraphManager.cc similarity index 100% rename from create_database/tuple_reader/RecoGraphManager.cc rename to create_database/tuple_reader/bdtaunu_tuple_analyzer/RecoGraphManager.cc diff --git a/create_database/tuple_reader/RecoGraphManager.h b/create_database/tuple_reader/bdtaunu_tuple_analyzer/RecoGraphManager.h similarity index 100% rename from create_database/tuple_reader/RecoGraphManager.h rename to create_database/tuple_reader/bdtaunu_tuple_analyzer/RecoGraphManager.h diff --git a/create_database/tuple_reader/RecoGraphVisitors.cc b/create_database/tuple_reader/bdtaunu_tuple_analyzer/RecoGraphVisitors.cc similarity index 100% rename from create_database/tuple_reader/RecoGraphVisitors.cc rename to create_database/tuple_reader/bdtaunu_tuple_analyzer/RecoGraphVisitors.cc diff --git a/create_database/tuple_reader/RecoGraphVisitors.h b/create_database/tuple_reader/bdtaunu_tuple_analyzer/RecoGraphVisitors.h similarity index 100% rename from create_database/tuple_reader/RecoGraphVisitors.h rename to create_database/tuple_reader/bdtaunu_tuple_analyzer/RecoGraphVisitors.h diff --git a/create_database/tuple_reader/RootReader.cc b/create_database/tuple_reader/bdtaunu_tuple_analyzer/RootReader.cc similarity index 100% rename from create_database/tuple_reader/RootReader.cc rename to create_database/tuple_reader/bdtaunu_tuple_analyzer/RootReader.cc diff --git a/create_database/tuple_reader/RootReader.h b/create_database/tuple_reader/bdtaunu_tuple_analyzer/RootReader.h similarity index 100% rename from create_database/tuple_reader/RootReader.h rename to create_database/tuple_reader/bdtaunu_tuple_analyzer/RootReader.h diff --git a/create_database/tuple_reader/UpsilonCandidate.cc b/create_database/tuple_reader/bdtaunu_tuple_analyzer/UpsilonCandidate.cc similarity index 100% rename from create_database/tuple_reader/UpsilonCandidate.cc rename to create_database/tuple_reader/bdtaunu_tuple_analyzer/UpsilonCandidate.cc diff --git a/create_database/tuple_reader/UpsilonCandidate.h b/create_database/tuple_reader/bdtaunu_tuple_analyzer/UpsilonCandidate.h similarity index 100% rename from create_database/tuple_reader/UpsilonCandidate.h rename to create_database/tuple_reader/bdtaunu_tuple_analyzer/UpsilonCandidate.h diff --git a/create_database/tuple_reader/tests/Makefile b/create_database/tuple_reader/bdtaunu_tuple_analyzer/tests/Makefile similarity index 93% rename from create_database/tuple_reader/tests/Makefile rename to create_database/tuple_reader/bdtaunu_tuple_analyzer/tests/Makefile index f404200..444af8a 100644 --- a/create_database/tuple_reader/tests/Makefile +++ b/create_database/tuple_reader/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/create_database/tuple_reader/tests/mcreader_test1.cc b/create_database/tuple_reader/bdtaunu_tuple_analyzer/tests/mcreader_test1.cc similarity index 92% rename from create_database/tuple_reader/tests/mcreader_test1.cc rename to create_database/tuple_reader/bdtaunu_tuple_analyzer/tests/mcreader_test1.cc index d609d84..d08740f 100644 --- a/create_database/tuple_reader/tests/mcreader_test1.cc +++ b/create_database/tuple_reader/bdtaunu_tuple_analyzer/tests/mcreader_test1.cc @@ -1,7 +1,7 @@ #include #include -#include "BDtaunuMcReader.h" +#include using namespace std; diff --git a/create_database/tuple_reader/tests/mcreader_test2.cc b/create_database/tuple_reader/bdtaunu_tuple_analyzer/tests/mcreader_test2.cc similarity index 99% rename from create_database/tuple_reader/tests/mcreader_test2.cc rename to create_database/tuple_reader/bdtaunu_tuple_analyzer/tests/mcreader_test2.cc index 2845ee7..f7b45a9 100644 --- a/create_database/tuple_reader/tests/mcreader_test2.cc +++ b/create_database/tuple_reader/bdtaunu_tuple_analyzer/tests/mcreader_test2.cc @@ -6,9 +6,9 @@ #include #include -#include "BDtaunuDef.h" -#include "BDtaunuMcReader.h" -#include "UpsilonCandidate.h" +#include +#include +#include using namespace std; diff --git a/create_database/tuple_reader/tests/mcreader_test3.cc b/create_database/tuple_reader/bdtaunu_tuple_analyzer/tests/mcreader_test3.cc similarity index 98% rename from create_database/tuple_reader/tests/mcreader_test3.cc rename to create_database/tuple_reader/bdtaunu_tuple_analyzer/tests/mcreader_test3.cc index 3cf4dd9..0cd75f3 100644 --- a/create_database/tuple_reader/tests/mcreader_test3.cc +++ b/create_database/tuple_reader/bdtaunu_tuple_analyzer/tests/mcreader_test3.cc @@ -6,9 +6,9 @@ #include #include -#include "BDtaunuDef.h" -#include "BDtaunuMcReader.h" -#include "UpsilonCandidate.h" +#include +#include +#include using namespace std; diff --git a/create_database/tuple_reader/tests/merge_pdf.cmd b/create_database/tuple_reader/bdtaunu_tuple_analyzer/tests/merge_pdf.cmd similarity index 100% rename from create_database/tuple_reader/tests/merge_pdf.cmd rename to create_database/tuple_reader/bdtaunu_tuple_analyzer/tests/merge_pdf.cmd diff --git a/create_database/tuple_reader/tests/valgrind-root.supp b/create_database/tuple_reader/bdtaunu_tuple_analyzer/tests/valgrind-root.supp similarity index 100% rename from create_database/tuple_reader/tests/valgrind-root.supp rename to create_database/tuple_reader/bdtaunu_tuple_analyzer/tests/valgrind-root.supp