Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions inc/CollectionFiller.hh
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
#include <TGListBox.h>


#include "DataCollections.hh"
#include "REve/inc/DataCollections.hh"

namespace ots{
namespace mu2e{

enum RecoDataProductName {ComboHits, CaloClusters, KalSeeds};
enum RecoDataProductName {ComboHits, CaloClusters, KalSeeds};

class CollectionFiller
{
Expand Down
2 changes: 1 addition & 1 deletion inc/DataCollections.hh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include <tuple>
#include <string>

namespace ots{
namespace mu2e{
class DataCollections
{
public:
Expand Down
36 changes: 18 additions & 18 deletions inc/EventDisplayManager.hh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef _MockEventDisplayManager_hh
#define _MockEventDisplayManager_hh
#ifndef _EventDisplayManager_hh
#define _EventDisplayManager_hh

#include <ROOT/REveElement.hxx>
#include <ROOT/REveScene.hxx>
Expand All @@ -12,27 +12,27 @@ namespace ROOT::Experimental {
class REveManager;
}

namespace ots {
namespace mu2e {

constexpr auto invalid_event = std::numeric_limits<unsigned>::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 */
2 changes: 1 addition & 1 deletion src/CollectionFiller.cc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include <TObject.h>
#include <TSystem.h>
#include <TFile.h>
#include "CollectionFiller.hh"
#include "REve/inc/CollectionFiller.hh"
#include "art/Framework/Principal/SubRun.h"

using namespace mu2e;
Expand Down
4 changes: 2 additions & 2 deletions src/EventDisplayManager.cc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "EventDisplayManager.hh"
#include "REve/inc/EventDisplayManager.hh"


namespace ots {
namespace mu2e {

EventDisplayManager::EventDisplayManager(
ROOT::Experimental::REveManager* eveMgr,
Expand Down
8 changes: 4 additions & 4 deletions src/REveEventDisplay_module.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/REveMainWindow.cc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "REveMainWindow.hh"
#include "REve/inc/REveMainWindow.hh"

namespace REX = ROOT::Experimental;
using namespace std;
Expand Down
2 changes: 1 addition & 1 deletion src/REveMu2eDataInterface.cc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

#include "REveMu2eDataInterface.hh"
#include "REve/inc/REveMu2eDataInterface.hh"
using namespace mu2e;
namespace REX = ROOT::Experimental;

Expand Down
83 changes: 83 additions & 0 deletions src/SConscript
Original file line number Diff line number Diff line change
@@ -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: