diff --git a/.clang-format b/.clang-format
new file mode 100644
index 0000000000000000000000000000000000000000..11bdfea9d58845f7a46b066e9e6682d4bcfd9e0d
--- /dev/null
+++ b/.clang-format
@@ -0,0 +1,10 @@
+---
+BasedOnStyle:  LLVM
+BreakConstructorInitializersBeforeComma: true
+ConstructorInitializerAllOnOneLineOrOnePerLine: true
+Cpp11BracedListStyle: true
+Standard: Cpp11
+#SpaceBeforeParens: ControlStatements
+SpaceAfterControlStatementKeyword: true
+PointerBindsToType: true
+...
diff --git a/.gitignore b/.gitignore
index 831c69456261a98ab4d5a87b60908cdb83f9c6e2..176904b71c3c7f8f56bc8d292949ad99b49e7151 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,37 @@
-results/*
-data/*
-datasets/*
-data
-calorimeters/test/
+# Compiled Object files
+*.slo
+*.lo
+*.o
+
+# Compiled Dynamic libraries
+*.so
+*.dylib
+
+# Compiled Static libraries
+*.lai
+*.la
+*.a
+
+# build trees
+DEBUG*/*
+BUILD*/*
+RELEASE*/*
+TEST*/*
+
+# cmake
+CMakeCache.txt
+CMakeFiles
+Makefile
+cmake_install.cmake
+install_manifest.txt
+
+# vim 
+~*
+*.swp
+*.swo
+
+# python
+__pycache__/
+*.py[cod]
+*$py.class
+.ipynb_checkpoints