Просмотр исходного кода

Small bug fix, changed optimization option

ParfenovPeter лет назад: 2
Родитель
Сommit
09c7da853e
2 измененных файлов с 5 добавлено и 3 удалено
  1. 2 1
      CMakeLists.txt
  2. 3 2
      bin/main.cpp

+ 2 - 1
CMakeLists.txt

@@ -23,7 +23,8 @@ add_definitions(${ROOT_CXX_FLAGS})
 
 set(CMAKE_BUILD_TYPE Debug)
 #set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O0 -Wall -pthread")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -Wall")
+# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -Wall -ffast-math")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -Wall")
 
 set(QATOOLS_INCLUDE_DIRECTORIES
   ${CMAKE_CURRENT_SOURCE_DIR}

+ 3 - 2
bin/main.cpp

@@ -206,7 +206,8 @@ int main(int argc, char **argv)
   std::vector<Long64_t> vRejectedEvents;
 
   Long64_t Nentries_chain = readerManager->GetEntries();
-  Long64_t Nentries = (qaUtility::GetInstance()->Nevents < Nentries_chain) ? Nentries_chain : qaUtility::GetInstance()->Nevents;
+  Long64_t Nentries = (qaUtility::GetInstance()->Nevents > Nentries_chain) ? Nentries_chain : qaUtility::GetInstance()->Nevents;
+  if (qaUtility::GetInstance()->Nevents == -1) Nentries = Nentries_chain;
   Int_t Nparticles;
   Int_t Ncounter_minbias, Ncounter_refmult;
 
@@ -375,7 +376,7 @@ int main(int argc, char **argv)
   }
 
   std::cout << "Loop is closed, " << Minbias_counter << " minbias events were counted (" << Absolute_counter-1 << " events in total)." << std::endl;
-  if (qaUtility::GetInstance()->debug != 0)
+  if (qaUtility::GetInstance()->debug)
   {
     if (vRejectedEvents.size() > 0)
     {