diff --git a/src/EventBuilder.h b/src/EventBuilder.h index 2232734..30379c7 100644 --- a/src/EventBuilder.h +++ b/src/EventBuilder.h @@ -26,7 +26,7 @@ #include //Mine -#include "evb/Logger.h" +#include "Logger.h" #endif diff --git a/src/evb/CompassRun.cpp b/src/evb/CompassRun.cpp index 6823044..1427cb9 100644 --- a/src/evb/CompassRun.cpp +++ b/src/evb/CompassRun.cpp @@ -175,23 +175,25 @@ namespace EventBuilder { if(!m_smap.IsValid()) { - std::cerr<<"Bad shift map at CompassRun::Convert()."<first<<" , "<first<first, yentry->first); return false; } diff --git a/src/evb/EVBApp.cpp b/src/evb/EVBApp.cpp index 454b165..4ff6e1b 100644 --- a/src/evb/EVBApp.cpp +++ b/src/evb/EVBApp.cpp @@ -30,11 +30,11 @@ namespace EventBuilder { bool EVBApp::ReadConfigFile(const std::string& fullpath) { - std::cout<<"Reading in configuration from file: "<second; @@ -67,7 +67,7 @@ namespace EventBuilder { auto data = elementTable.find(Z); if(data == elementTable.end()) { - std::cerr<<"Invaild nucleus at MassLookup! Returning empty symbol"<second; diff --git a/src/evb/OrderChecker.cpp b/src/evb/OrderChecker.cpp index da47f05..e7ad1f7 100644 --- a/src/evb/OrderChecker.cpp +++ b/src/evb/OrderChecker.cpp @@ -31,7 +31,7 @@ namespace EventBuilder { tree->GetEntry(); if(prevStamp >= ts) { - std::cerr<<"Bad order at entry "<GetEntries()<GetEntries()); return false; } } diff --git a/src/evb/RunCollector.cpp b/src/evb/RunCollector.cpp index bb54e7a..725afb1 100644 --- a/src/evb/RunCollector.cpp +++ b/src/evb/RunCollector.cpp @@ -45,7 +45,7 @@ namespace EventBuilder { if(!flist) //Make sure list is real. If not, means no directory { - std::cerr<<"Unable to find any files in directory; check name given to the input.txt"<Add(m_filelist[i].c_str()); - std::cout<<"Merging runs into single file..."<Merge(output,0,"fast"); - std::cout<<"Finished merging"<Add(m_filelist[i].c_str()); - std::cout<<"Merging runs "<Merge(output,0,"fast"); - std::cout<<"Finished merging"<GetEntries(); - if(m_pb) + long count=0, flush_val=blentries*0.1, flush_count=0; + if(m_pb) + { + flush_val = blentries*0.01; SetProgressBar(blentries); - std::cout<<"Total number of events: "<GetEntries(); i++) { @@ -266,14 +268,13 @@ namespace EventBuilder { } else { flush_count++; count=0; - std::cout<<"\rPercent of data processed: "<GetEntry(i); MakeUncutHistograms(*event_address, table); if(cutter.IsValid()) MakeCutHistograms(*event_address, table); } - std::cout<cd(); table->Write(); if(cutter.IsValid()) diff --git a/src/evb/SlowSort.cpp b/src/evb/SlowSort.cpp index 2c8c4c5..57db405 100644 --- a/src/evb/SlowSort.cpp +++ b/src/evb/SlowSort.cpp @@ -142,11 +142,7 @@ namespace EventBuilder { if(channel_info == cmap.End()) { - std::cout<second.type<<" attribute: "<second.attribute<second.type, channel_info->second.attribute); } } //Organize the SABRE data in descending energy order diff --git a/src/gui_main.cpp b/src/gui_main.cpp index f7f213c..c06da98 100644 --- a/src/gui_main.cpp +++ b/src/gui_main.cpp @@ -4,6 +4,7 @@ int main(int argc, char** argv) { + EventBuilder::Logger::Init(); EnforceDictionaryLinked(); TApplication app("app", &argc, argv); UInt_t h = 400; diff --git a/src/guidict/CMakeLists.txt b/src/guidict/CMakeLists.txt index a0bb65c..9dfc751 100644 --- a/src/guidict/CMakeLists.txt +++ b/src/guidict/CMakeLists.txt @@ -5,7 +5,7 @@ add_custom_command(TARGET GUIDict POST_BUILD COMMAND cp ${CMAKE_CURRENT_BINARY_DIR}/libGUIDict_rdict.pcm ${CMAKE_INSTALL_PREFIX}/lib/ VERBATIM) -target_include_directories(GUIDict PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${PCH_DIR} ${SPDLOG_INCLUDE}) +target_include_directories(GUIDict PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${PCH_DIR} ${SPDLOG_INCLUDE} ${CMAKE_CURRENT_SOURCE_DIR}/../evb) target_precompile_headers(GUIDict PUBLIC ${PCH_DIR}/EventBuilder.h) set_target_properties(GUIDict PROPERTIES PUBLIC_HEADER "EVBMainFrame.h;FileViewFrame.h") target_link_libraries(GUIDict diff --git a/src/spsdict/CMakeLists.txt b/src/spsdict/CMakeLists.txt index 08bf803..c6e51ef 100644 --- a/src/spsdict/CMakeLists.txt +++ b/src/spsdict/CMakeLists.txt @@ -5,7 +5,7 @@ add_custom_command(TARGET SPSDict POST_BUILD COMMAND cp ${CMAKE_CURRENT_BINARY_DIR}/libSPSDict_rdict.pcm ${CMAKE_INSTALL_PREFIX}/lib/ VERBATIM) -target_include_directories(SPSDict PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${PCH_DIR} ${SPDLOG_INCLUDE}) +target_include_directories(SPSDict PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${PCH_DIR} ${SPDLOG_INCLUDE} ${CMAKE_CURRENT_SOURCE_DIR}/../evb) target_precompile_headers(SPSDict PUBLIC ${PCH_DIR}/EventBuilder.h) set_target_properties(SPSDict PROPERTIES PUBLIC_HEADER "DataStructs.h") target_link_libraries(SPSDict