Skip to content

Commit d2fa036

Browse files
sophiemiddletonsophiemiddleton
authored
Merge pull request #194 from sophiemiddleton/Mu2eDisplay
Name changes
2 parents 7c506a4 + c2c35fd commit d2fa036

26 files changed

+240
-240
lines changed

‎CustomGUIv2/controller/MyNewMain.controller.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ sap.ui.define(['rootui5/eve7/controller/Main.controller',
6666
let title = (p > 0) ? fname.substr(p+1) : fname;
6767
this.amtfn = fname;
6868
let cmd = "FileDialogSaveAs(\"" + fname + "\")";
69-
this.mgr.SendMIR(cmd, this.fw2gui.fElementId, "mu2e::REveMu2eGUI");
69+
this.mgr.SendMIR(cmd, this.fw2gui.fElementId, "mu2e::GUI");
7070
},
7171
onCancel: function() { },
7272
onFailure: function() { console.log("DIALOF fail");}
@@ -78,7 +78,7 @@ sap.ui.define(['rootui5/eve7/controller/Main.controller',
7878
var world = this.mgr.childs[0].childs;
7979

8080
world.forEach((item) => {
81-
if (item._typename == "mu2e::REveMu2eGUI") {
81+
if (item._typename == "mu2e::GUI") {
8282
this.fw2gui = item;
8383
var pthis = this;
8484
this.mgr.UT_refresh_event_info = function () {

‎inc/CollectionFiller.hh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include <TGComboBox.h>
1414
#include <TGListBox.h>
1515

16-
#include "Mu2eEventDisplay/inc/DataCollections.hh"
16+
#include "EventDisplay/inc/DataCollections.hh"
1717

1818
namespace mu2e{
1919

inc/REveMu2eDataInterface.hh renamed to inc/DataInterface.hh

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#ifndef REveMu2eDataInterface_hh
2-
#define REveMu2eDataInterface_hh
1+
#ifndef DataInterface_hh
2+
#define DataInterface_hh
33
#include <ROOT/REveElement.hxx>
44
#include <ROOT/REvePointSet.hxx>
55
#include <ROOT/REveManager.hxx>
@@ -42,14 +42,14 @@
4242
using namespace mu2e;
4343
namespace REX = ROOT::Experimental;
4444
namespace mu2e{
45-
class REveMu2eDataInterface {
45+
class DataInterface {
4646
public:
4747
static int const mstyle = 1;
4848
static int const msize = 5;
49-
explicit REveMu2eDataInterface(){};
50-
explicit REveMu2eDataInterface(const REveMu2eDataInterface &);
51-
REveMu2eDataInterface& operator=(const REveMu2eDataInterface &);
52-
virtual ~REveMu2eDataInterface() = default;
49+
explicit DataInterface(){};
50+
explicit DataInterface(const DataInterface &);
51+
DataInterface& operator=(const DataInterface &);
52+
virtual ~DataInterface() = default;
5353
#ifndef __CINT__
5454

5555
inline constexpr double pointmmTocm(double mm){ return mm/10; };
@@ -69,7 +69,7 @@ namespace mu2e{
6969
void AddCosmicTrackFit(REX::REveManager *&eveMng, bool firstLoop_, const mu2e::CosmicTrackSeedCollection *cosmiccol, REX::REveElement* &scene);
7070

7171
#endif
72-
ClassDef(REveMu2eDataInterface, 0);
72+
ClassDef(DataInterface, 0);
7373
};
7474
}
7575

‎inc/DataProduct.hh‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
#ifndef DataProduct_HH_
2+
#define DataProduct_HH_
3+
4+
#include <string>
5+
6+
namespace mu2e {
7+
8+
class DataProduct {
9+
public:
10+
DataProduct(std::string name) : _name(name) {};
11+
DataProduct(){};
12+
std::string& name() { return _name; }
13+
14+
private:
15+
std::string _name;
16+
17+
};
18+
} // namespace mu2e
19+
20+
#endif

‎inc/EventDisplayManager.hh‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
#include <mutex>
99
#include <stdexcept>
1010
#include <iostream>
11-
#include "Mu2eEventDisplay/inc/REveMu2eGUI.hh"
12-
#include "Mu2eEventDisplay/inc/REveMu2eTextSelect.hh"
11+
#include "EventDisplay/inc/GUI.hh"
12+
#include "EventDisplay/inc/TextSelect.hh"
1313
#include "nlohmann/json.hpp"
1414

1515
namespace ROOT::Experimental {
@@ -27,8 +27,8 @@ namespace mu2e {
2727
explicit EventDisplayManager(ROOT::Experimental::REveManager* eveMgr,
2828
std::condition_variable& cv,
2929
std::mutex& m,
30-
REveMu2eGUI *fGui,
31-
REveMu2eTextSelect *fText);
30+
GUI *fGui,
31+
TextSelect *fText);
3232

3333
void NextEvent();
3434
void QuitRoot();
@@ -42,8 +42,8 @@ namespace mu2e {
4242
std::condition_variable* cv_{nullptr};
4343
std::mutex* m_{nullptr};
4444
bool doneProcessingEvents_{false};
45-
REveMu2eGUI *fGui_{nullptr};
46-
REveMu2eTextSelect *fText_{nullptr};
45+
GUI *fGui_{nullptr};
46+
TextSelect *fText_{nullptr};
4747
};
4848
}
4949

inc/REveMu2eGUI.hh renamed to inc/GUI.hh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
#ifndef _REveMu2eGUI_hh
2-
#define _REveMu2eGUI_hh
1+
#ifndef _GUI_hh
2+
#define _GUI_hh
33

44
#include <ROOT/REveElement.hxx>
55
#include "nlohmann/json.hpp"
66
namespace REX = ROOT::Experimental;
77
using namespace ROOT::Experimental;
88

99
namespace mu2e {
10-
class REveMu2eGUI : public ROOT::Experimental::REveElement
10+
class GUI : public ROOT::Experimental::REveElement
1111
{
1212
public:
1313
int feventid{0};

inc/REveMu2eGeomUtil.hh renamed to inc/GeomUtil.hh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#ifndef _REveMu2eGeomUtil_hh
2-
#define _REveMu2eGeomUtil_hh
1+
#ifndef _GeomUtil_hh
2+
#define _GeomUtil_hh
33

44
#include <ROOT/REveElement.hxx>
55
#include <ROOT/REveManager.hxx>
@@ -10,18 +10,18 @@
1010
namespace REX = ROOT::Experimental;
1111

1212
namespace mu2e {
13-
class REveMu2eGeomUtil : public REX::REveElement {
13+
class GeomUtil : public REX::REveElement {
1414

1515
public :
16-
explicit REveMu2eGeomUtil() { SetErrorHandler(DefaultErrorHandler); }
17-
virtual ~REveMu2eGeomUtil() {}
16+
explicit GeomUtil() { SetErrorHandler(DefaultErrorHandler); }
17+
virtual ~GeomUtil() {}
1818
#ifndef __CINT__
1919
double FindStoppingTarget_z();
2020
double GetStoppingTarget_z(){ return StoppingTarget_z; }
2121
double StoppingTarget_z;
2222

2323
#endif
24-
ClassDef(REveMu2eGeomUtil, 0);
24+
ClassDef(GeomUtil, 0);
2525

2626

2727

inc/REveMu2eMCInterface.hh renamed to inc/MCInterface.hh

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#ifndef REveMu2eMCInterface_hh
2-
#define REveMu2eMCInterface_hh
1+
#ifndef MCInterface_hh
2+
#define MCInterface_hh
33
#include <ROOT/REveElement.hxx>
44
#include <ROOT/REvePointSet.hxx>
55
#include <ROOT/REveManager.hxx>
@@ -25,14 +25,14 @@
2525
using namespace mu2e;
2626
namespace REX = ROOT::Experimental;
2727
namespace mu2e{
28-
class REveMu2eMCInterface {
28+
class MCInterface {
2929
public:
3030
static int const mstyle = 20 ;
3131
static int const msize = 5;
32-
explicit REveMu2eMCInterface(){};
33-
explicit REveMu2eMCInterface(const REveMu2eMCInterface &);
34-
REveMu2eMCInterface& operator=(const REveMu2eMCInterface &);
35-
virtual ~REveMu2eMCInterface() = default;
32+
explicit MCInterface(){};
33+
explicit MCInterface(const MCInterface &);
34+
MCInterface& operator=(const MCInterface &);
35+
virtual ~MCInterface() = default;
3636
#ifndef __CINT__
3737
inline constexpr double pointmmTocm(double mm){ return mm/10; };
3838
int Contains(std::vector<int> v, int x);
@@ -42,7 +42,7 @@ namespace mu2e{
4242
void AddMCTrajectoryCollection(REX::REveManager *&eveMng,bool firstloop, std::tuple<std::vector<std::string>, std::vector<const MCTrajectoryCollection*>> track_tuple, REX::REveElement* &scene, std::vector<int> particles, bool extracted );
4343
void AddSurfaceStepCollection(REX::REveManager *&eveMng,bool firstloop, std::tuple<std::vector<std::string>, std::vector<const SurfaceStepCollection*>> track_tuple, REX::REveElement* &scene, std::vector<int> particles, bool extracted );
4444
#endif
45-
ClassDef(REveMu2eMCInterface, 0);
45+
ClassDef(MCInterface, 0);
4646
};
4747
}
4848

inc/REveMu2eMainWindow.hh renamed to inc/MainWindow.hh

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#ifndef _REveMu2eMainWindow_hh
2-
#define _REveMu2eMainWindow_hh
1+
#ifndef _MainWindow_hh
2+
#define _MainWindow_hh
33

44
#include <vector>
55
#include <string>
@@ -40,10 +40,10 @@
4040
#include <ROOT/REveTableInfo.hxx>
4141
#include <ROOT/REveViewContext.hxx>
4242
#include "art/Framework/Principal/Event.h"
43-
#include "Mu2eEventDisplay/inc/DataCollections.hh"
44-
#include "Mu2eEventDisplay/inc/REveMu2eDataInterface.hh"
45-
#include "Mu2eEventDisplay/inc/REveMu2eMCInterface.hh"
46-
#include "Mu2eEventDisplay/inc/REveMu2eGeomUtil.hh"
43+
#include "EventDisplay/inc/DataCollections.hh"
44+
#include "EventDisplay/inc/DataInterface.hh"
45+
#include "EventDisplay/inc/MCInterface.hh"
46+
#include "EventDisplay/inc/GeomUtil.hh"
4747
#include "Offline/StoppingTargetGeom/inc/StoppingTarget.hh"
4848

4949
#include <utility>
@@ -136,14 +136,14 @@ namespace mu2e {
136136
: addCosmicTracks(cosmictracks), addHelices(helices), addTracks(tracks), addCaloDigis(calodigis), addClusters(clusters), addComboHits(combohits), addCRVInfo(crv), addCRVClusters(crvclu), addTimeClusters(timeclusters), addTrkHits(trkhits), addMCTrajectories(mctraj), addSurfaceSteps(surfsteps), addTrkErrBar(errbar), addCrystalDraw(crys), addCRVBars(crvbars) {};
137137
};
138138

139-
class REveMu2eMainWindow : public REX::REveElement {
139+
class MainWindow : public REX::REveElement {
140140

141141
public :
142-
explicit REveMu2eMainWindow() { SetErrorHandler(DefaultErrorHandler); }
143-
virtual ~REveMu2eMainWindow() {}
142+
explicit MainWindow() { SetErrorHandler(DefaultErrorHandler); }
143+
virtual ~MainWindow() {}
144144
#ifndef __CINT__
145-
REveMu2eDataInterface *pass_data;
146-
REveMu2eMCInterface *pass_mc;
145+
DataInterface *pass_data;
146+
MCInterface *pass_mc;
147147

148148
void makeEveGeoShape(TGeoNode* n, REX::REveTrans& trans, REX::REveElement* holder, int j, bool crys1, bool crys2, std::string name, int color);
149149
void changeEveGeoShape(TGeoNode* n, REX::REveTrans& trans, REX::REveElement* holder, int j, bool crys1, bool crys2, std::string name);
@@ -178,7 +178,7 @@ namespace mu2e {
178178
REX::REveViewer *rhoZView = nullptr;
179179

180180
#else
181-
ClassDef(REveMu2eMainWindow, 0);
181+
ClassDef(MainWindow, 0);
182182
#endif
183183

184184
};

inc/REveMu2ePrintInfo.hh renamed to inc/PrintInfo.hh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#ifndef _REveMu2ePrintInfo_hh
2-
#define _REveMu2ePrintInfo_hh
1+
#ifndef _PrintInfo_hh
2+
#define _PrintInfo_hh
33

44
#include <ROOT/REveElement.hxx>
55
#include "Offline/RecoDataProducts/inc/CaloCluster.hh"
@@ -17,10 +17,10 @@ namespace REX = ROOT::Experimental;
1717
using namespace ROOT::Experimental;
1818

1919
namespace mu2e {
20-
class REveMu2ePrintInfo : public ROOT::Experimental::REveElement
20+
class PrintInfo : public ROOT::Experimental::REveElement
2121
{
2222
public:
23-
REveMu2ePrintInfo() = default;
23+
PrintInfo() = default;
2424
const mu2e::CaloClusterCollection* clustercol = 0;
2525
std::vector<const mu2e::CaloClusterCollection*> calocluster_list;
2626
std::vector<std::string> calocluster_labels;

0 commit comments

Comments
 (0)