Skip to content

Commit e646d0b

Browse files
sophiemiddletonsophiemiddleton
authored
Merge pull request #2 from sophiemiddleton/main
REve Mu2e code builds in Mu2e Muse Environment
2 parents c5998d7 + c86a43c commit e646d0b

9 files changed

Lines changed: 114 additions & 31 deletions

‎inc/CollectionFiller.hh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
#include <TGListBox.h>
1515

1616

17-
#include "DataCollections.hh"
17+
#include "REve/inc/DataCollections.hh"
1818

19-
namespace ots{
19+
namespace mu2e{
2020

21-
enum RecoDataProductName {ComboHits, CaloClusters, KalSeeds};
21+
enum RecoDataProductName {ComboHits, CaloClusters, KalSeeds};
2222

2323
class CollectionFiller
2424
{

‎inc/DataCollections.hh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include <tuple>
2121
#include <string>
2222

23-
namespace ots{
23+
namespace mu2e{
2424
class DataCollections
2525
{
2626
public:

‎inc/EventDisplayManager.hh‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#ifndef _MockEventDisplayManager_hh
2-
#define _MockEventDisplayManager_hh
1+
#ifndef _EventDisplayManager_hh
2+
#define _EventDisplayManager_hh
33

44
#include <ROOT/REveElement.hxx>
55
#include <ROOT/REveScene.hxx>
@@ -12,27 +12,27 @@ namespace ROOT::Experimental {
1212
class REveManager;
1313
}
1414

15-
namespace ots {
15+
namespace mu2e {
1616

1717
constexpr auto invalid_event = std::numeric_limits<unsigned>::max();
1818

19-
class MockEventDisplayManager : public ROOT::Experimental::REveElement {
20-
public:
21-
MockEventDisplayManager() = default; // ROOT needs a dictionary
19+
class EventDisplayManager : public ROOT::Experimental::REveElement {
20+
public:
21+
EventDisplayManager() = default; // ROOT needs a dictionary
2222

23-
explicit MockEventDisplayManager(ROOT::Experimental::REveManager* eveMgr,
24-
std::condition_variable& cv,
25-
std::mutex& m);
23+
explicit EventDisplayManager(ROOT::Experimental::REveManager* eveMgr,
24+
std::condition_variable& cv,
25+
std::mutex& m);
2626

27-
void NextEvent();
28-
void QuitRoot();
27+
void NextEvent();
28+
void QuitRoot();
2929

30-
private:
31-
ROOT::Experimental::REveManager* eveMng_{nullptr};
32-
std::condition_variable* cv_{nullptr};
33-
std::mutex* m_{nullptr};
34-
bool doneProcessingEvents_{false};
35-
};
30+
private:
31+
ROOT::Experimental::REveManager* eveMng_{nullptr};
32+
std::condition_variable* cv_{nullptr};
33+
std::mutex* m_{nullptr};
34+
bool doneProcessingEvents_{false};
35+
};
3636
}
3737

38-
#endif /* MockEventDisplayManager_h */
38+
#endif /* EventDisplayManager_h */

‎src/CollectionFiller.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include <TObject.h>
22
#include <TSystem.h>
33
#include <TFile.h>
4-
#include "CollectionFiller.hh"
4+
#include "REve/inc/CollectionFiller.hh"
55
#include "art/Framework/Principal/SubRun.h"
66

77
using namespace mu2e;

‎src/EventDisplayManager.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
#include "EventDisplayManager.hh"
1+
#include "REve/inc/EventDisplayManager.hh"
22

33

4-
namespace ots {
4+
namespace mu2e {
55

66
EventDisplayManager::EventDisplayManager(
77
ROOT::Experimental::REveManager* eveMgr,

‎src/REveEventDisplay_module.cc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,10 @@
6060
#include "otsdaq/Macros/ProcessorPluginMacros.h"*/
6161

6262
//EveMu2e
63-
#include "EveMainWindow.hh"
64-
#include "EventDisplayManager.hh"
65-
#include "CollectionFiller.hh"
66-
#include "DataCollections.hh"
63+
#include "REve/inc/EveMainWindow.hh"
64+
#include "REve/inc/EventDisplayManager.hh"
65+
#include "REve/inc/CollectionFiller.hh"
66+
#include "REve/inc/DataCollections.hh"
6767

6868
#include "RecoDataProducts/inc/CaloCluster.hh"
6969
#include "RecoDataProducts/inc/ComboHit.hh"

‎src/REveMainWindow.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "REveMainWindow.hh"
1+
#include "REve/inc/REveMainWindow.hh"
22

33
namespace REX = ROOT::Experimental;
44
using namespace std;

‎src/REveMu2eDataInterface.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
#include "REveMu2eDataInterface.hh"
2+
#include "REve/inc/REveMu2eDataInterface.hh"
33
using namespace mu2e;
44
namespace REX = ROOT::Experimental;
55

‎src/SConscript‎

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
#!/usr/bin/env python
2+
#
3+
# Original author Rob Kutschke.
4+
#
5+
#!/usr/bin/env python
6+
#
7+
# Original author Rob Kutschke.
8+
#
9+
10+
import os, re
11+
Import('env')
12+
Import('mu2e_helper')
13+
14+
helper=mu2e_helper(env)
15+
16+
babarlibs = env['BABARLIBS']
17+
rootlibs = env['ROOTLIBS']
18+
extrarootlibs = [ 'Geom', 'Geom', 'GeomPainter', 'Ged', 'Graf3d', 'Eve','EG', 'RGL','Gui', "Gdml" , "Core", "Rint", "ROOTEve","ROOTWebDisplay"]
19+
20+
userlibs = [ rootlibs,
21+
extrarootlibs,
22+
babarlibs,
23+
'mu2e_DataProducts',
24+
'mu2e_Mu2eBTrk',
25+
'mu2e_TrkReco',
26+
'mu2e_BTrkData',
27+
'mu2e_Mu2eUtilities',
28+
'mu2e_MCDataProducts',
29+
'mu2e_RecoDataProducts',
30+
'mu2e_GlobalConstantsService_GlobalConstantsService_service',
31+
'mu2e_GlobalConstantsService',
32+
'mu2e_GeometryService',
33+
'mu2e_ConditionsService',
34+
'mu2e_CalorimeterGeom',
35+
'mu2e_TrackerGeom',
36+
'mu2e_CosmicRayShieldGeom',
37+
'mu2e_GeomPrimitives',
38+
'mu2e_ConfigTools',
39+
'mu2e_Mu2eInterfaces',
40+
'mu2e_GeneralUtilities',
41+
'art_Framework_Core',
42+
'art_Framework_Principal',
43+
'art_Framework_Services_Registry',
44+
'art_root_io_tfile_support',
45+
'art_root_io_TFileService',
46+
'art_Framework_Services_Optional_RandomNumberGenerator_service',
47+
'art_Persistency_Common',
48+
'art_Persistency_Provenance',
49+
'art_Utilities',
50+
'canvas',
51+
'MF_MessageLogger',
52+
'fhiclcpp',
53+
'fhiclcpp_types',
54+
'tbb',
55+
'cetlib',
56+
'cetlib_except',
57+
'Trajectory',
58+
'General',
59+
'CLHEP',
60+
'HepPDT',
61+
'HepPID',
62+
'Core',
63+
'boost_filesystem',
64+
'boost_system'
65+
]
66+
67+
68+
# when using ClassDef, tell the build to include the
69+
# dictionary in the mainlib
70+
helper.classDef(True)
71+
72+
helper.make_dict_and_map()
73+
74+
mainlib = helper.make_mainlib([userlibs])
75+
76+
#helper.make_plugins( [ 'mu2e_REveEventDisplay',userlibs ] )
77+
78+
79+
80+
# This tells emacs to view this file in python mode.
81+
# Local Variables:
82+
# mode:python
83+
# End:

0 commit comments

Comments
 (0)