rearranges the filval project to make root a sub-directory

analysis/MVA_Creation.cpp

@@ -38,7 +38,7 @@
 #include <limits>
 
 #include "filval/filval.hpp"
-#include "filval_root/filval_root.hpp"
+#include "filval/root/root_filval.hpp"
 
 #include "MiniTreeDataSet.hpp"
 #include <TSystem.h>

analysis/MiniTreeDataSet.hpp

@@ -35,7 +35,7 @@
 #include <tuple>
 
 #include "filval/filval.hpp"
-#include "filval_root/filval_root.hpp"
+#include "filval/root/root_filval.hpp"
 #include "MiniTree.hpp"
 
 using namespace std;

analysis/TTTT_Analysis.cpp

@@ -41,7 +41,7 @@
 #include <limits>
 
 #include "filval/filval.hpp"
-#include "filval_root/filval_root.hpp"
+#include "filval/root/root_filval.hpp"
 
 #include "analysis/common/obj_types.hpp"
 #include "analysis/common/constants.hpp"

analysis/selection.hpp

@@ -38,7 +38,7 @@
 #include <algorithm>
 
 #include "filval/filval.hpp"
-#include "filval_root/filval_root.hpp"
+#include "filval/root/root_filval.hpp"
 
 #include "analysis/common/obj_types.hpp"
 

filval/README.md

@@ -1,16 +1,6 @@
-A FILter-VALue System
+ROOT compatability layer for FilVal
-=====================
+================================================
-This is a header-only, generic, data analysis system that allows for creating performant generation of *Plots*. *Plots* contain *Values* and can make use of *Filters*.
+See [FilVal](../filval/README.md) for details on FilVal. This layer provides
-*Filters* can also depend of *Values*, and *Values* can depend on other *Values*. A *Dataset* is a generic object that contains a series of observations. The individual observations
+container classes wrapping ROOT histograms and Graph objects. It also provides
-consist of a series of *Observed Values*. One can also define *Derived Values* which are calculated from *Observed Values* or other *Derived Values*. Care is taken automatically 
+the ability to write these containers, as well as a variety of STL containers
-so *Derived Values* are calculated at most once per observation.
+to ROOT files.
-
-
-
-```C++
-MyDataSet myDataSet("somefile.root", "tree"); // MyDataSet subclasses DataSet
-TTreeValue<int> countmyDataSet;
-myDataSet.addValue
-
-Hist1D myplot(count, myDataSet, ); // Hist1D subclasses Plot
-```

filval_root/LinkDef.hpp

@@ -1,5 +1,5 @@
-#ifndef linkdev_hpp
+#ifndef linkdef_hpp
-#define linkdev_hpp
+#define linkdef_hpp
 #include <vector>
 #include <string>
 #include <map>

filval_root/api.hpp

@@ -4,7 +4,7 @@
 #include <vector>
 #include <tuple>
 #include "filval/api.hpp"
-#include "filval_root/value.hpp"
+#include "filval/root/root_value.hpp"
 namespace fv::root{
 
     decltype(auto)

filval/root/root_filval.hpp

@@ -0,0 +1,7 @@
+#ifndef root_filval_hpp
+#define root_filval_hpp
+#include "filval/root/root_value.hpp"
+#include "filval/root/root_container.hpp"
+#include "filval/root/root_api.hpp"
+/* #include "dataset.hpp" */
+#endif // root_filval_hpp

filval_root/README.md

@@ -1,6 +0,0 @@
-ROOT compatability layer for FilVal
-================================================
-See [FilVal](../filval/README.md) for details on FilVal. This layer provides
-container classes wrapping ROOT histograms and Graph objects. It also provides
-the ability to write these containers, as well as a variety of STL containers
-to ROOT files.

filval_root/filval_root.hpp

@@ -1,7 +0,0 @@
-#ifndef filval_root_hpp
-#define filval_root_hpp
-#include "filval_root/value.hpp"
-#include "filval_root/container.hpp"
-#include "filval_root/api.hpp"
-/* #include "dataset.hpp" */
-#endif // filval_root_hpp

python/.gitignore

@@ -1 +1,2 @@
 figures/
+env/