Reset config values to default one

Config.h

@@ -121,8 +121,7 @@ namespace Config
   // Config for Hit and BinInfoUtils
   constexpr int   nPhiPart   = 1260;
   constexpr float fPhiFactor = nPhiPart / TwoPI;
-  //constexpr int   nEtaPart   = 11;
-  constexpr int   nEtaPart   = 1;
+  constexpr int   nEtaPart   = 11;  // 1 is better for GPU best_hit
   constexpr int   nEtaBin    = 2 * nEtaPart - 1;
 
   constexpr float        fEtaFull  = 2 * Config::fEtaDet;

Makefile.config

@@ -19,7 +19,7 @@
 # OSXGCC5    := yes
 # To keep Dan's version working
 # TBB_PREFIX := tbb
-#TBB_PREFIX := ${TBBROOT}
+# TBB_PREFIX := ${TBBROOT}
 
 # 1. Use ROOT or not (never used on MIC)
 # Comment out to disable root ("yes" is not relevant)
@@ -28,7 +28,7 @@
 # 2. Use gcc (clang by default on mac) or icc
 # Comment out to force using standard c++. For mic only icc can be used.
 ifdef INTEL_LICENSE_FILE
-CXX := icpc
+CXX := icc
 else ifdef OSXGCC5
 CXX := c++-mp-5
 endif
@@ -39,7 +39,7 @@ CUBROOT=/home/ml15/tools/cub
 NV := nvcc -prec-sqrt=true -I${CUBROOT} 
 #-g -G -lineinfo
 # Comment out to compile for CPU
-USE_CUDA := yes
+#USE_CUDA := yes
 
 # 3. Optimization
 # -O3 implies vectorization and simd (but not AVX)
@@ -58,7 +58,7 @@ USE_INTRINSICS := -DMPLEX_USE_INTRINSICS
 # To enforce given vector size (does not work with intrinsics!)
 # USE_INTRINSICS := -DMPT_SIZE=1
 
-# USE_VTUNE_NOTIFY := yes
+USE_VTUNE_NOTIFY := yes
 
 # 6. MIC stuff is built when icc is the chosen compiler.
 # MIC build is always done without root.