Close file handles only when opened. Add make flag for debug build.

diff --git a/Makefile b/Makefile
index 3432d77..5dbdc5c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -23,8 +23,10 @@ LIBS = -lgsl -lgslcblas -lm
 
 ifeq ($(dbg),1)
        DBGFLAG = -g -DDEBUG  # -D_GLIBCXX_DEBUG
+       CFLAGS_MC = -g -DDEBUG
 else
        DBGFLAG = -O3 -combine -DHAVE_INLINE
+       CFLAGS_MC = -O2 -march=native
 endif
 
 # now the actual build rules, pretty general
@@ -38,7 +40,7 @@ $(EXECNAME_WF): $(SRCS_WF) $(SRCS_WF:%.cpp=%.h) Makefile
        $(CXX) $(SRCS_WF) $(CFLAGS) $(LIBDIR) $(INCLUDEDIR) -o $(EXECNAME_WF) $(LIBS)
 
 $(EXECNAME_MC): $(SRCS_MC) $(HEADERS_MC) Makefile
-       $(CXX) $(SRCS_MC) -O2 -march=native -o $(EXECNAME_MC)
+       $(CXX) $(SRCS_MC) $(CFLAGS_MC) -o $(EXECNAME_MC)
 
 $(EXECNAME_SS): $(SRCS_SS) $(SRCS_SS:%.cpp=%.h) Makefile
        $(CXX) $(SRCS_SS) $(CFLAGS) $(LIBDIR) $(INCLUDEDIR) -o $(EXECNAME_SS) $(LIBS)

diff --git a/qEpitopeEval.cpp b/qEpitopeEval.cpp
index b0acecc..c1472dd 100755 (executable)
--- a/qEpitopeEval.cpp
+++ b/qEpitopeEval.cpp
@@ -134,10 +134,10 @@ void runEpitopeEval(RunParameters &r, std::vector<std::vector<int> > &eStates, s
         \r
         } } }\r
         \r
+        fclose(p3Out);\r
+        \r
     }\r
     \r
-    fclose(p3Out);\r
-    \r
     \r
     FILE *pkOut=NULL;\r
     \r
@@ -147,10 +147,10 @@ void runEpitopeEval(RunParameters &r, std::vector<std::vector<int> > &eStates, s
         else         pkOut=fopen(r.getPkOutfile().c_str(),    "w");\r
     \r
         for (int i=0;i<pk.size();i++) fprintf(pkOut,"%.6e\n",pk[i]);\r
+    \r
+        fclose(pkOut);\r
         \r
     }\r
     \r
-    fclose(pkOut);\r
-    \r
 }\r
 \r