From c86a43cda49de98830cb812253c0e041378b77bb Mon Sep 17 00:00:00 2001 From: sophieMu2e Date: Mon, 28 Jun 2021 08:38:09 -0500 Subject: [PATCH] Built succesfully, not tested --- inc/CollectionFiller.hh | 6 +-- inc/DataCollections.hh | 2 +- inc/EventDisplayManager.hh | 36 +++++++-------- src/CollectionFiller.cc | 2 +- src/EventDisplayManager.cc | 4 +- src/REveEventDisplay_module.cc | 8 ++-- src/REveMainWindow.cc | 2 +- src/REveMu2eDataInterface.cc | 2 +- src/SConscript | 83 ++++++++++++++++++++++++++++++++++ 9 files changed, 114 insertions(+), 31 deletions(-) create mode 100644 src/SConscript diff --git a/inc/CollectionFiller.hh b/inc/CollectionFiller.hh index e790490..045e882 100644 --- a/inc/CollectionFiller.hh +++ b/inc/CollectionFiller.hh @@ -14,11 +14,11 @@ #include -#include "DataCollections.hh" +#include "REve/inc/DataCollections.hh" -namespace ots{ +namespace mu2e{ - enum RecoDataProductName {ComboHits, CaloClusters, KalSeeds}; + enum RecoDataProductName {ComboHits, CaloClusters, KalSeeds}; class CollectionFiller { diff --git a/inc/DataCollections.hh b/inc/DataCollections.hh index 6474ae7..093abdb 100644 --- a/inc/DataCollections.hh +++ b/inc/DataCollections.hh @@ -20,7 +20,7 @@ #include #include -namespace ots{ +namespace mu2e{ class DataCollections { public: diff --git a/inc/EventDisplayManager.hh b/inc/EventDisplayManager.hh index 0d31cd6..dc8ee90 100644 --- a/inc/EventDisplayManager.hh +++ b/inc/EventDisplayManager.hh @@ -1,5 +1,5 @@ -#ifndef _MockEventDisplayManager_hh -#define _MockEventDisplayManager_hh +#ifndef _EventDisplayManager_hh +#define _EventDisplayManager_hh #include #include @@ -12,27 +12,27 @@ namespace ROOT::Experimental { class REveManager; } -namespace ots { +namespace mu2e { constexpr auto invalid_event = std::numeric_limits::max(); - class MockEventDisplayManager : public ROOT::Experimental::REveElement { - public: - MockEventDisplayManager() = default; // ROOT needs a dictionary + class EventDisplayManager : public ROOT::Experimental::REveElement { + public: + EventDisplayManager() = default; // ROOT needs a dictionary - explicit MockEventDisplayManager(ROOT::Experimental::REveManager* eveMgr, - std::condition_variable& cv, - std::mutex& m); + explicit EventDisplayManager(ROOT::Experimental::REveManager* eveMgr, + std::condition_variable& cv, + std::mutex& m); - void NextEvent(); - void QuitRoot(); + void NextEvent(); + void QuitRoot(); - private: - ROOT::Experimental::REveManager* eveMng_{nullptr}; - std::condition_variable* cv_{nullptr}; - std::mutex* m_{nullptr}; - bool doneProcessingEvents_{false}; - }; + private: + ROOT::Experimental::REveManager* eveMng_{nullptr}; + std::condition_variable* cv_{nullptr}; + std::mutex* m_{nullptr}; + bool doneProcessingEvents_{false}; + }; } -#endif /* MockEventDisplayManager_h */ +#endif /* EventDisplayManager_h */ diff --git a/src/CollectionFiller.cc b/src/CollectionFiller.cc index f58fc32..9095654 100644 --- a/src/CollectionFiller.cc +++ b/src/CollectionFiller.cc @@ -1,7 +1,7 @@ #include #include #include -#include "CollectionFiller.hh" +#include "REve/inc/CollectionFiller.hh" #include "art/Framework/Principal/SubRun.h" using namespace mu2e; diff --git a/src/EventDisplayManager.cc b/src/EventDisplayManager.cc index 10e9c6e..c32edda 100644 --- a/src/EventDisplayManager.cc +++ b/src/EventDisplayManager.cc @@ -1,7 +1,7 @@ -#include "EventDisplayManager.hh" +#include "REve/inc/EventDisplayManager.hh" -namespace ots { +namespace mu2e { EventDisplayManager::EventDisplayManager( ROOT::Experimental::REveManager* eveMgr, diff --git a/src/REveEventDisplay_module.cc b/src/REveEventDisplay_module.cc index 229b0cf..2b34b1f 100644 --- a/src/REveEventDisplay_module.cc +++ b/src/REveEventDisplay_module.cc @@ -60,10 +60,10 @@ #include "otsdaq/Macros/ProcessorPluginMacros.h"*/ //EveMu2e -#include "EveMainWindow.hh" -#include "EventDisplayManager.hh" -#include "CollectionFiller.hh" -#include "DataCollections.hh" +#include "REve/inc/EveMainWindow.hh" +#include "REve/inc/EventDisplayManager.hh" +#include "REve/inc/CollectionFiller.hh" +#include "REve/inc/DataCollections.hh" #include "RecoDataProducts/inc/CaloCluster.hh" #include "RecoDataProducts/inc/ComboHit.hh" diff --git a/src/REveMainWindow.cc b/src/REveMainWindow.cc index c86a80e..f9ef445 100644 --- a/src/REveMainWindow.cc +++ b/src/REveMainWindow.cc @@ -1,4 +1,4 @@ -#include "REveMainWindow.hh" +#include "REve/inc/REveMainWindow.hh" namespace REX = ROOT::Experimental; using namespace std; diff --git a/src/REveMu2eDataInterface.cc b/src/REveMu2eDataInterface.cc index a2afdcb..998120b 100644 --- a/src/REveMu2eDataInterface.cc +++ b/src/REveMu2eDataInterface.cc @@ -1,5 +1,5 @@ -#include "REveMu2eDataInterface.hh" +#include "REve/inc/REveMu2eDataInterface.hh" using namespace mu2e; namespace REX = ROOT::Experimental; diff --git a/src/SConscript b/src/SConscript new file mode 100644 index 0000000..30e1009 --- /dev/null +++ b/src/SConscript @@ -0,0 +1,83 @@ +#!/usr/bin/env python +# +# Original author Rob Kutschke. +# +#!/usr/bin/env python +# +# Original author Rob Kutschke. +# + +import os, re +Import('env') +Import('mu2e_helper') + +helper=mu2e_helper(env) + +babarlibs = env['BABARLIBS'] +rootlibs = env['ROOTLIBS'] +extrarootlibs = [ 'Geom', 'Geom', 'GeomPainter', 'Ged', 'Graf3d', 'Eve','EG', 'RGL','Gui', "Gdml" , "Core", "Rint", "ROOTEve","ROOTWebDisplay"] + +userlibs = [ rootlibs, + extrarootlibs, + babarlibs, + 'mu2e_DataProducts', + 'mu2e_Mu2eBTrk', + 'mu2e_TrkReco', + 'mu2e_BTrkData', + 'mu2e_Mu2eUtilities', + 'mu2e_MCDataProducts', + 'mu2e_RecoDataProducts', + 'mu2e_GlobalConstantsService_GlobalConstantsService_service', + 'mu2e_GlobalConstantsService', + 'mu2e_GeometryService', + 'mu2e_ConditionsService', + 'mu2e_CalorimeterGeom', + 'mu2e_TrackerGeom', + 'mu2e_CosmicRayShieldGeom', + 'mu2e_GeomPrimitives', + 'mu2e_ConfigTools', + 'mu2e_Mu2eInterfaces', + 'mu2e_GeneralUtilities', + 'art_Framework_Core', + 'art_Framework_Principal', + 'art_Framework_Services_Registry', + 'art_root_io_tfile_support', + 'art_root_io_TFileService', + 'art_Framework_Services_Optional_RandomNumberGenerator_service', + 'art_Persistency_Common', + 'art_Persistency_Provenance', + 'art_Utilities', + 'canvas', + 'MF_MessageLogger', + 'fhiclcpp', + 'fhiclcpp_types', + 'tbb', + 'cetlib', + 'cetlib_except', + 'Trajectory', + 'General', + 'CLHEP', + 'HepPDT', + 'HepPID', + 'Core', + 'boost_filesystem', + 'boost_system' + ] + + +# when using ClassDef, tell the build to include the +# dictionary in the mainlib +helper.classDef(True) + +helper.make_dict_and_map() + +mainlib = helper.make_mainlib([userlibs]) + +#helper.make_plugins( [ 'mu2e_REveEventDisplay',userlibs ] ) + + + +# This tells emacs to view this file in python mode. +# Local Variables: +# mode:python +# End: