Refactoring: Using common CALO constants

class.

diff --git a/HLT/EMCAL/OnlineDisplay/AliHLTEMCALOnlineDisplay.h b/HLT/EMCAL/OnlineDisplay/AliHLTEMCALOnlineDisplay.h
index 5b4511cae283fe3806404c9d6d6bf86423991a9e..8b144fa5ecf886000cdba01067e427131728d552 100644 (file)
--- a/HLT/EMCAL/OnlineDisplay/AliHLTEMCALOnlineDisplay.h
+++ b/HLT/EMCAL/OnlineDisplay/AliHLTEMCALOnlineDisplay.h
@@ -12,6 +12,8 @@
 #include "TH2.h"
 #include "AliHLTCaloConstants.h"
 
+using CALO::MAXHOSTS;
+#define DEFAULTEVENTPORT 42001
 
 class TStyle;
 class TSystem;

diff --git a/HLT/EMCAL/OnlineDisplay/AliHLTEMCALOnlineDisplayTH2D.h b/HLT/EMCAL/OnlineDisplay/AliHLTEMCALOnlineDisplayTH2D.h
index c958497d56fa4e97e0a784988f3e3c01fb894a19..97ee1fff24533e342ad59a52c972c3d3be28b5b2 100644 (file)
--- a/HLT/EMCAL/OnlineDisplay/AliHLTEMCALOnlineDisplayTH2D.h
+++ b/HLT/EMCAL/OnlineDisplay/AliHLTEMCALOnlineDisplayTH2D.h
@@ -28,20 +28,23 @@
 
 #include <TH2D.h>
 #include <TCanvas.h>
-
 #include <iostream>
 
 //#include "AliHLTEMCALBase.h"
 //#include   "AliHLTEMCALOnlineDisplayTH2D.h"
 
-#include  "AliHLTCaloConstants.h" 
-#include  "AliHLTEMCALConstants.h" 
+//#include  "AliHLTCaloConstants.h" 
+//#include  "AliHLTEMCALConstants.h" 
+
+#include "AliHLTCaloConstants.h"
 
+//using namespace EmcalHLTConst;
+//using namespace CaloHLTConst;
 
-using namespace EmcalHLTConst;
-using namespace CaloHLTConst;
+using std::cout;
+using std::endl;
 
-using namespace std;
+using CALO::NGAINS; 
 
 class AliHLTEMCALOnlineDisplay;
 

diff --git a/HLT/EMCAL/OnlineDisplay/AliHLTEMCALOnlineDisplayTab.h b/HLT/EMCAL/OnlineDisplay/AliHLTEMCALOnlineDisplayTab.h
index 549805c1c044723a74a93a9fe7bb64771d01ee72..8e1d94e536f4d5313c2bce2261b1c40faaecf751 100644 (file)
--- a/HLT/EMCAL/OnlineDisplay/AliHLTEMCALOnlineDisplayTab.h
+++ b/HLT/EMCAL/OnlineDisplay/AliHLTEMCALOnlineDisplayTab.h
@@ -8,7 +8,7 @@
 #include "TGTab.h"
 #include "AliHLTHOMERReader.h"
 //#include "AliHLTEMCALCommonDefs.h"
-#include "AliHLTEMCALConstants.h"
+//#include "AliHLTEMCALConstants.h"
 #include "AliHLTCaloConstants.h"
 
 
@@ -29,12 +29,14 @@ using namespace std;
 #define XRANGEEND  XRANGESTART + XRANGELENGTH
 
 
-using namespace EmcalHLTConst;
-using namespace CaloHLTConst;
+//using namespace EmcalHLTConst;
+//using namespace CaloHLTConst;
 
 
 class AliHLTHOMERReader;
 
+using CALO::MAXHOSTS;
+
 
 //class AliHLTEMCALOnlineDisplayTab : public TGTab, public AliHLTEMCALBase
 class AliHLTEMCALOnlineDisplayTab : public TGTab