Commit c50a3433 authored by Daniel Hynds's avatar Daniel Hynds
Browse files

added namespace to object classes

parent a8670096
......@@ -16,6 +16,8 @@
// clipboard is wiped clean.
//-------------------------------------------------------------------------------
using namespace corryvreckan;
class Clipboard {
public:
......
......@@ -12,6 +12,8 @@
*/
using namespace corryvreckan;
class Cluster : public TestBeamObject {
public:
......
......@@ -24,6 +24,8 @@
#include "TRootEmbeddedCanvas.h"
#include "TSystem.h"
using namespace corryvreckan;
class GuiDisplay : public TestBeamObject {
RQ_OBJECT("GuiDisplay")
......
......@@ -14,6 +14,8 @@
*/
using namespace corryvreckan;
class KDTree : public TestBeamObject {
public:
......
......@@ -3,12 +3,14 @@
#include "TestBeamObject.h"
using namespace corryvreckan;
class Pixel : public TestBeamObject {
public:
// Constructors and destructors
Pixel() {}
virtual ~Pixel() {}
Pixel() = default;
// virtual ~Pixel() {}
Pixel(std::string detectorID, int row, int col, int tot) {
m_detectorID = detectorID;
m_row = row;
......
#ifndef SPIDRSIGNAL_H
#define SPIDRSIGNAL_H 1
using namespace corryvreckan;
class SpidrSignal : public TestBeamObject {
public:
......@@ -10,7 +12,7 @@ public:
m_type = type;
m_timestamp = timestamp;
}
virtual ~SpidrSignal() {}
// virtual ~SpidrSignal() {}
// Functions
......
// local
#include "TestBeamObject.h"
#include "Cluster.h"
#include "Pixel.h"
#include "Cluster.h"
#include "Track.h"
#include "core/utils/exceptions.h"
using namespace corryvreckan;
ClassImp(TestBeamObject)
// Return class type for fixed object types (that don't depend on detector
......
......@@ -12,6 +12,8 @@
// placed on the clipboard and written out to file.
//-------------------------------------------------------------------------------
namespace corryvreckan {
class TestBeamObject : public TObject {
public:
......@@ -44,4 +46,5 @@ public:
// Vector type declaration
typedef std::vector<TestBeamObject*> TestBeamObjects;
}
#endif // TESTBEAMOBJECT_H
......@@ -13,6 +13,8 @@
*/
using namespace corryvreckan;
class Track : public TestBeamObject {
public:
......@@ -21,7 +23,7 @@ public:
m_direction.SetZ(1.);
m_state.SetZ(0.);
}
virtual ~Track() {}
// virtual ~Track() {}
// Copy constructor (also copies clusters from the original track)
Track(Track* track) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment