files changed to us the new standalone HOMER library in aliroot

diff --git a/HLT/PHOS/OnlineDisplay/AliHLTPHOSOnlineDisplay.h b/HLT/PHOS/OnlineDisplay/AliHLTPHOSOnlineDisplay.h
index 0d01d5ab0d02cfc917573aac497fb70af2346448..031334e3381d933f3f25f04c78ba6d05454bc50b 100644 (file)
--- a/HLT/PHOS/OnlineDisplay/AliHLTPHOSOnlineDisplay.h
+++ b/HLT/PHOS/OnlineDisplay/AliHLTPHOSOnlineDisplay.h
@@ -5,9 +5,9 @@
  * See cxx source for full Copyright notice */
 
 
-#include "HOMERData.h"
-#include "HOMERReader.h"
-#include "HOMERWriter.h"
+#include "AliHLTHOMERData.h"
+#include "AliHLTHOMERReader.h"
+#include "AliHLTHOMERWriter.h"
 #include "Rtypes.h"
 #include <TGFrame.h>
 #include "TH2.h"
@@ -72,8 +72,8 @@ class AliHLTPHOSOnlineDisplay : public  TGMainFrame, public AliHLTPHOSBase
   static AliHLTPHOSOnlineDisplay* fgInstancePtr;
   static unsigned int fgNHosts;
   static unsigned int fgNPorts;
-  static HOMERReader* fgHomerReaderPtr;
-  static HOMERReader* fgHomerReadersPtr[MAX_HOSTS];
+  static AliHLTHOMERReader* fgHomerReaderPtr;
+  static AliHLTHOMERReader* fgHomerReadersPtr[MAX_HOSTS];
   static char  *fgHosts[MAX_HOSTS];
   static short unsigned    *fgPorts;
   static Bool_t fgAccumulate;

diff --git a/HLT/PHOS/OnlineDisplay/AliHLTPHOSOnlineDisplayCalibTab.cxx b/HLT/PHOS/OnlineDisplay/AliHLTPHOSOnlineDisplayCalibTab.cxx
index 944d097630487e0c4b5af59bf73c05f9448e06cb..f52809bbe51919139a0651ea60dee8fdbea69afc 100644 (file)
--- a/HLT/PHOS/OnlineDisplay/AliHLTPHOSOnlineDisplayCalibTab.cxx
+++ b/HLT/PHOS/OnlineDisplay/AliHLTPHOSOnlineDisplayCalibTab.cxx
@@ -1,7 +1,8 @@
 #include  "AliHLTPHOSOnlineDisplayCalibTab.h"
-#include <iostream>
-#include "AliHLTPHOSRcuCellAccumulatedEnergyDataStruct.h"
-#include "AliHLTPHOSGetEventButton.h"
+#include  <iostream>
+#include  "AliHLTPHOSRcuCellAccumulatedEnergyDataStruct.h"
+#include  "AliHLTPHOSGetEventButton.h"
+#include  "AliHLTHOMERReader.h"
 
 using namespace std;
 
@@ -12,7 +13,7 @@ AliHLTPHOSOnlineDisplayCalibTab::AliHLTPHOSOnlineDisplayCalibTab()
   cout << "AliHLTPHOSOnlineDisplayCalibTab:ERROR: You cannot create a onlinedisplay Tab without arguments" << endl;
 }
 
-AliHLTPHOSOnlineDisplayCalibTab::AliHLTPHOSOnlineDisplayCalibTab(TGTab  *tabPtr, HOMERReader *homerSyncPtr, HOMERReader *homerPtrs[MAX_HOSTS], int nHosts)
+AliHLTPHOSOnlineDisplayCalibTab::AliHLTPHOSOnlineDisplayCalibTab(TGTab  *tabPtr, AliHLTHOMERReader *homerSyncPtr, AliHLTHOMERReader *homerPtrs[MAX_HOSTS], int nHosts)
 {
   for(int i=0; i<MAX_HOSTS; i++)
     {
@@ -38,7 +39,7 @@ AliHLTPHOSOnlineDisplayCalibTab::~AliHLTPHOSOnlineDisplayCalibTab()
 }
 
 void
-AliHLTPHOSOnlineDisplayCalibTab::ReadBlockData(HOMERReader *homerReaderPtr)
+AliHLTPHOSOnlineDisplayCalibTab::ReadBlockData(AliHLTHOMERReader *homerReaderPtr)
 {
   unsigned long blk = homerReaderPtr->FindBlockNdx("UCCARENE","SOHP", 0xFFFFFFFF );
 

diff --git a/HLT/PHOS/OnlineDisplay/AliHLTPHOSOnlineDisplayCalibTab.h b/HLT/PHOS/OnlineDisplay/AliHLTPHOSOnlineDisplayCalibTab.h
index b76b98e05380fe84de57a4ce67724b9a5d4fbe93..18ccba4a6ac5b8f21e10c0f02ead6509864ef849 100644 (file)
--- a/HLT/PHOS/OnlineDisplay/AliHLTPHOSOnlineDisplayCalibTab.h
+++ b/HLT/PHOS/OnlineDisplay/AliHLTPHOSOnlineDisplayCalibTab.h
@@ -18,13 +18,13 @@ class AliHLTPHOSOnlineDisplayCalibTab : public AliHLTPHOSOnlineDisplayTab
 {
  public:
   AliHLTPHOSOnlineDisplayCalibTab();
-  AliHLTPHOSOnlineDisplayCalibTab(TGTab  *tabPtr, HOMERReader *homerSyncPtr, HOMERReader *homerPtrs[MAX_HOSTS], int nHosts);
+  AliHLTPHOSOnlineDisplayCalibTab(TGTab  *tabPtr, AliHLTHOMERReader *homerSyncPtr, AliHLTHOMERReader *homerPtrs[MAX_HOSTS], int nHosts);
   virtual ~AliHLTPHOSOnlineDisplayCalibTab();
 
   void InitDisplay(TGTab *tabPtr);
   void UpdateDisplay();
   int GetNextEvent();
-  virtual void ReadBlockData(HOMERReader *homeReaderPtr);
+  virtual void ReadBlockData(AliHLTHOMERReader *homeReaderPtr);
   void ResetDisplay();
 
   TH2D *fgCalibHistPtr[N_GAINS];

diff --git a/HLT/PHOS/OnlineDisplay/AliHLTPHOSOnlineDisplayEventTab.cxx b/HLT/PHOS/OnlineDisplay/AliHLTPHOSOnlineDisplayEventTab.cxx
index 27ac5a9e472f2839811d6fd060e8c793fa7216c0..78f43e08151b883da6b54a48566b16972d1b47f9 100644 (file)
--- a/HLT/PHOS/OnlineDisplay/AliHLTPHOSOnlineDisplayEventTab.cxx
+++ b/HLT/PHOS/OnlineDisplay/AliHLTPHOSOnlineDisplayEventTab.cxx
@@ -4,9 +4,9 @@
 #include "AliHLTPHOSGetEventButton.h"
 #include "AliHLTPHOSCommonDefs.h"
 #include "AliHLTDataTypes.h"
-#include "HOMERData.h"
-#include "HOMERReader.h"
-#include "HOMERWriter.h"
+#include "AliHLTHOMERData.h"
+#include "AliHLTHOMERReader.h"
+#include "AliHLTHOMERWriter.h"
 #include "AliHLTPHOSRcuCellEnergyDataStruct.h"
 //#include "AliHLTPHOSRcuCellEnergyDataStruct.h"
 #include "AliHLTPHOSRcuCellEnergyDataStruct.h" 

diff --git a/HLT/PHOS/OnlineDisplay/AliHLTPHOSOnlineDisplayEventTab.h b/HLT/PHOS/OnlineDisplay/AliHLTPHOSOnlineDisplayEventTab.h
index 3afdef4f06441007fd36e551cf674eb683084003..ac5940bff08211576df67b036e074eb6a42a97f2 100644 (file)
--- a/HLT/PHOS/OnlineDisplay/AliHLTPHOSOnlineDisplayEventTab.h
+++ b/HLT/PHOS/OnlineDisplay/AliHLTPHOSOnlineDisplayEventTab.h
@@ -23,7 +23,7 @@ using namespace PhosHLTConst;
 
  
 class AliHLTPHOSGetEventButton;
-class HOMERReader;
+class AliHLTHOMERReader;
 //class AliHLTPHOSRcuCellEnergyDataStruct;
 class AliHLTPHOSRcuCellEnergyDataStruct;
 class AliHLTPHOSOnlineDisplay;
@@ -34,7 +34,7 @@ class AliHLTPHOSOnlineDisplayEventTab : public AliHLTPHOSOnlineDisplayTab
 {
  public:
   virtual ~AliHLTPHOSOnlineDisplayEventTab();
-  AliHLTPHOSOnlineDisplayEventTab(AliHLTPHOSOnlineDisplay *onlineDisplayPtr, TGTab *tabPtr, HOMERReader *fgHomerReaderPtr, HOMERReader *fgHomerReadersPtr[MAX_HOSTS], int nHosts);
+  AliHLTPHOSOnlineDisplayEventTab(AliHLTPHOSOnlineDisplay *onlineDisplayPtr, TGTab *tabPtr, AliHLTHOMERReader *fgHomerReaderPtr, AliHLTHOMERReader *fgHomerReadersPtr[MAX_HOSTS], int nHosts);
   //  void GetRawData(TH1D *histPtr);
   //AliHLTPHOSOnlineDisplayEventTab::GetRawData(TH1D *histPtr, int mod, int rcuX, int rcuZ, int x, int z, int gain)
   void GetRawData(TH1D *histPtr, int mod, int rcuX, int rcuZ, int x, int z, int gain);
@@ -42,7 +42,7 @@ class AliHLTPHOSOnlineDisplayEventTab : public AliHLTPHOSOnlineDisplayTab
 
   void UpdateDisplay();
   int GetNextEvent();
-  virtual void ReadBlockData(HOMERReader *homeReaderPtr);
+  virtual void ReadBlockData(AliHLTHOMERReader *homeReaderPtr);
   void ResetDisplay();
   TGTab               *fTab;
   TGTab               *fSubTab1;

diff --git a/HLT/PHOS/OnlineDisplay/AliHLTPHOSOnlineDisplayRawTab.cxx b/HLT/PHOS/OnlineDisplay/AliHLTPHOSOnlineDisplayRawTab.cxx
index 016924cc60c7265c591d33068830926c80d5da68..363a26dda47fac87056765f558f60031931bf7ea 100644 (file)
--- a/HLT/PHOS/OnlineDisplay/AliHLTPHOSOnlineDisplayRawTab.cxx
+++ b/HLT/PHOS/OnlineDisplay/AliHLTPHOSOnlineDisplayRawTab.cxx
@@ -4,6 +4,7 @@
 #include "AliHLTPHOSGetEventButton.h"
 //#include "AliHLTPHOSRcuChannelDataStruct.h"
 #include "AliHLTPHOSRcuCellEnergyDataStruct.h"
+#include "AliHLTHOMERReader.h"
 
 using namespace std;
 
@@ -12,7 +13,7 @@ AliHLTPHOSOnlineDisplayRawTab::AliHLTPHOSOnlineDisplayRawTab()
   cout << "AliHLTPHOSOnlineDisplayRawTab:ERROR: You cannot create a onlinedisplay Tab without arguments" << endl;
 }
 
-AliHLTPHOSOnlineDisplayRawTab::AliHLTPHOSOnlineDisplayRawTab(TGTab  *tabPtr, HOMERReader *homerSyncPtr, HOMERReader *homerPtrs[MAX_HOSTS], int nHosts)
+AliHLTPHOSOnlineDisplayRawTab::AliHLTPHOSOnlineDisplayRawTab(TGTab  *tabPtr, AliHLTHOMERReader *homerSyncPtr, AliHLTHOMERReader *homerPtrs[MAX_HOSTS], int nHosts)
 {
   for(int i=0; i<MAX_HOSTS; i++)
     {
@@ -39,7 +40,7 @@ AliHLTPHOSOnlineDisplayRawTab::~AliHLTPHOSOnlineDisplayRawTab()
 
 
 void
-AliHLTPHOSOnlineDisplayRawTab::ReadBlockData(HOMERReader *homerReaderPtr)
+AliHLTPHOSOnlineDisplayRawTab::ReadBlockData(AliHLTHOMERReader *homerReaderPtr)
 {
   unsigned long blk = homerReaderPtr->FindBlockNdx("ATADNAHC","SOHP", 0xeFFFFFFF );
   

diff --git a/HLT/PHOS/OnlineDisplay/AliHLTPHOSOnlineDisplayRawTab.h b/HLT/PHOS/OnlineDisplay/AliHLTPHOSOnlineDisplayRawTab.h
index 57396193b0c3f0b07fece485de966e7cafc4031a..3247a52f4cf1bb705554d6ac2bbb90413ad3a336 100644 (file)
--- a/HLT/PHOS/OnlineDisplay/AliHLTPHOSOnlineDisplayRawTab.h
+++ b/HLT/PHOS/OnlineDisplay/AliHLTPHOSOnlineDisplayRawTab.h
@@ -18,13 +18,13 @@ class AliHLTPHOSOnlineDisplayRawTab : public AliHLTPHOSOnlineDisplayTab
 {
  public:
   AliHLTPHOSOnlineDisplayRawTab();
-  AliHLTPHOSOnlineDisplayRawTab(TGTab  *tabPtr, HOMERReader *homerSyncPtr, HOMERReader *homerPtrs[MAX_HOSTS], int nHosts);
+  AliHLTPHOSOnlineDisplayRawTab(TGTab  *tabPtr, AliHLTHOMERReader *homerSyncPtr, AliHLTHOMERReader *homerPtrs[MAX_HOSTS], int nHosts);
   virtual ~AliHLTPHOSOnlineDisplayRawTab();
 
   void InitDisplay(TGTab *tabPtr);
   void UpdateDisplay();
   int GetNextEvent();
-  virtual void ReadBlockData(HOMERReader *homeReaderPtr);
+  virtual void ReadBlockData(AliHLTHOMERReader *homeReaderPtr);
   void ResetDisplay();
 
   TH2D *fgRawHistPtr[N_GAINS];

diff --git a/HLT/PHOS/OnlineDisplay/AliHLTPHOSOnlineDisplayTab.cxx b/HLT/PHOS/OnlineDisplay/AliHLTPHOSOnlineDisplayTab.cxx
index 528a250c9732c58aa18344a404ad085609cd4f91..c17b8c45777a514bd36197c124eaf58f1fa18570 100644 (file)
--- a/HLT/PHOS/OnlineDisplay/AliHLTPHOSOnlineDisplayTab.cxx
+++ b/HLT/PHOS/OnlineDisplay/AliHLTPHOSOnlineDisplayTab.cxx
@@ -1,5 +1,5 @@
 #include "AliHLTPHOSOnlineDisplayTab.h"
-#include "HOMERReader.h"
+#include "AliHLTHOMERReader.h"
 #include <iostream>
 #include "AliHLTDataTypes.h"
 
@@ -20,7 +20,7 @@ AliHLTPHOSOnlineDisplayTab::~AliHLTPHOSOnlineDisplayTab()
 
 
 void 
-AliHLTPHOSOnlineDisplayTab::PrintBlockInfo(HOMERReader *homeReaderPtr, int i)
+AliHLTPHOSOnlineDisplayTab::PrintBlockInfo(AliHLTHOMERReader *homeReaderPtr, int i)
 {
   char tmp1[9], tmp2[5];
   memset( tmp1, 0, 9 );
@@ -36,7 +36,7 @@ AliHLTPHOSOnlineDisplayTab::PrintBlockInfo(HOMERReader *homeReaderPtr, int i)
 
 
 int 
-AliHLTPHOSOnlineDisplayTab::GetEventInfo(HOMERReader *homeReaderPtr, int i)
+AliHLTPHOSOnlineDisplayTab::GetEventInfo(AliHLTHOMERReader *homeReaderPtr, int i)
 {
   int ret = 0;
   ret =homeReaderPtr->ReadNextEvent();  

diff --git a/HLT/PHOS/OnlineDisplay/AliHLTPHOSOnlineDisplayTab.h b/HLT/PHOS/OnlineDisplay/AliHLTPHOSOnlineDisplayTab.h
index 77f1da94f31c985dad47d1dd33332a872e3da2b0..0e9a07f5e809e549fd65cd6ca116e14e1a7f7cfd 100644 (file)
--- a/HLT/PHOS/OnlineDisplay/AliHLTPHOSOnlineDisplayTab.h
+++ b/HLT/PHOS/OnlineDisplay/AliHLTPHOSOnlineDisplayTab.h
@@ -2,7 +2,7 @@
 #define ALIHLTPHOSONLINEDISPLAYTAB_H
 
 #include "TGTab.h"
-#include "HOMERReader.h"
+//#include "AliHLTHOMERReader.h"
 #include "AliHLTPHOSCommonDefs.h"
 #include "AliHLTPHOSConstants.h"
 #include "AliHLTPHOSBase.h"
@@ -18,7 +18,7 @@
 
 using namespace PhosHLTConst;
 
-class HOMERReader;
+class AliHLTHOMERReader;
 
 
 class AliHLTPHOSOnlineDisplayTab : public TGTab, public AliHLTPHOSBase
@@ -27,15 +27,15 @@ class AliHLTPHOSOnlineDisplayTab : public TGTab, public AliHLTPHOSBase
   virtual ~AliHLTPHOSOnlineDisplayTab();
   AliHLTPHOSOnlineDisplayTab();
   virtual void InitDisplay(TGTab *tabPtr) = 0;
-  void PrintBlockInfo(HOMERReader *homeReaderPtr, int i);
-  int GetEventInfo(HOMERReader *homeReaderPtr, int i);
-  virtual void ReadBlockData(HOMERReader *homeReaderPtr) = 0;
+  void PrintBlockInfo(AliHLTHOMERReader *homeReaderPtr, int i);
+  int GetEventInfo(AliHLTHOMERReader *homeReaderPtr, int i);
+  virtual void ReadBlockData(AliHLTHOMERReader *homeReaderPtr) = 0;
 
  protected:
   Bool_t fgAccumulate;
   Bool_t fgSyncronize;
-  HOMERReader* fgHomerReaderPtr;
-  HOMERReader* fgHomerReadersPtr[MAX_HOSTS];
+  AliHLTHOMERReader* fgHomerReaderPtr;
+  AliHLTHOMERReader* fgHomerReadersPtr[MAX_HOSTS];
   int DoGetNextEvent();
   int fgEvntCnt;
   int fgNHosts;

diff --git a/HLT/PHOS/OnlineDisplay/Makefile b/HLT/PHOS/OnlineDisplay/Makefile
index ea2380304da230ea99e195cf561bf14956956cfa..560fc00ebe7179d9a2818ba478a7bfdd8ba07379 100755 (executable)
--- a/HLT/PHOS/OnlineDisplay/Makefile
+++ b/HLT/PHOS/OnlineDisplay/Makefile
@@ -2,32 +2,12 @@ ObjSuf                = o
 SrcSuf         = cxx
 HeadSuf                = h
 
-#ROOTLIBS      = -L$(ROOTSYS)/lib -lNew -lCint \
-#              -lGraf -lGraf3d -lHist -lHtml -lMatrix -lMinuit\
-#              -lPostscript -lTree -lASImage \
-#              -lCore -lEG -lFoam -lFumili -lGedOld -lGed \
-#              -lGeom -lGpad -lGraf -lGuiBld -lGui -lMatrix\
-#              -lRint -lRootAuth  -lThread -lVMC
-
-
 ROOTLIBS       = `root-config --libs --glibs`
+ALIROOTLIBS    = -L$(ALIHLT_TOPDIR)/build/lib  -lHLTbase  -lAliHLTHOMER  -lAliHLTPHOS  -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET)  
+ALIHLTPHOSINCLUDE      =-I$(ALIHLT_TOPDIR)/PHOS
+ALIHLTINCLUDE  = -I$(ALIHLT_TOPDIR)/BASE/HOMER  -I$(ALIHLT_TOPDIR)/BASE
+INCLUDES        = -I$(ROOTSYS)/include $(ALIHLTPHOSINCLUDE) $(ALIHLTINCLUDE)
 
-###ALIROOTLIBS = -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET) -lESD -lSTEER -lRAWDatarec   -lRAWDatabase 
-##ALIROOTLIBS  = -L$(ALIHLT_TOPDIR)/build/lib -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET)  
-ALIROOTLIBS    = -L$(ALIHLT_TOPDIR)/build/lib  -lHLTbase  -lAliHLTPHOS  -L$(ALICE_ROOT)/lib/tgt_$(ALICE_TARGET)  
-
-#HLTLIBS               =-L$(ALIHLT_DC_DIR)/lib/Linux-x86_64-debug -lHOMER
-#HLTLIBS               =-L$(ALIHLT_DC_DIR)/lib/Linux-i686/  -lHOMER
-#HLTLIBS               =-L$(ALIHLT_DC_DIR)/lib/Linux-x86_64-debug -lHOMER
-HLTLIBS                =-L$(ALIHLT_DC_DIR)/lib/Linux-i686-debug -lHOMER
-
-HOMERINCLUDE   =$(ALIHLT_DC_DIR)/src/Util/HOMER/include 
-
-##echo $(HOMERINCLUDE)
-
-ALIHLTPHOSINCLUDE      =$(ALIHLT_TOPDIR)/PHOS
-
-ALIHLTINCLUDE  =$(ALIHLT_TOPDIR)/BASE
 
 MAINO                                  = main.$(ObjSuf)
 MAINS                                  = main.$(SrcSuf)
@@ -36,10 +16,6 @@ GETEVENTBUTTONO                              =AliHLTPHOSGetEventButton.$(ObjSuf)
 GETEVENTBUTTONS                                =AliHLTPHOSGetEventButton.$(SrcSuf)
 GETEVENTBUTTONH                                =AliHLTPHOSGetEventButton.$(HeadSuf)
 
-#ALIHLTPHOSTH1DO                               =AliHLTPHOSTH1D.$(ObjSuf)
-#ALIHLTPHOSTH1DS                               =AliHLTPHOSTH1D.$(SrcSuf)
-#ALIHLTPHOSTH1DH                               =AliHLTPHOSTH1D.$(HeadSuf)
-
 ALIHLTPHOSONLINEDISPLAYO               =AliHLTPHOSOnlineDisplay.$(ObjSuf)
 ALIHLTPHOSONLINEDISPLAYS               =AliHLTPHOSOnlineDisplay.$(SrcSuf)
 ALIHLTPHOSONLINEDISPLAYH               =AliHLTPHOSOnlineDisplay.$(HeadSuf)
@@ -52,12 +28,10 @@ ALIHLTPHOSONLINEDISPLAYBUTTONO              =AliHLTPHOSOnlineDisplayButton.$(ObjSuf)
 ALIHLTPHOSONLINEDISPLAYBUTTONS         =AliHLTPHOSOnlineDisplayButton.$(SrcSuf)
 ALIHLTPHOSONLINEDISPLAYBUTTONH         =AliHLTPHOSOnlineDisplayButton.$(HeadSuf)
 
-
 ALIHLTPHOSONLINEDISPLAYNUMBERENTRYO            =AliHLTPHOSOnlineDisplayNumberEntry.$(ObjSuf)
 ALIHLTPHOSONLINEDISPLAYNUMBERENTRYS            =AliHLTPHOSOnlineDisplayNumberEntry.$(SrcSuf)
 ALIHLTPHOSONLINEDISPLAYNUMBERENTRYH            =AliHLTPHOSOnlineDisplayNumberEntry.$(HeadSuf)
 
-
 ALIHLTPHOSONLINEDISPLAYRAWDATAMENUO            =AliHLTPHOSOnlineDisplayRawDataMenu.$(ObjSuf)
 ALIHLTPHOSONLINEDISPLAYRAWDATAMENUS            =AliHLTPHOSOnlineDisplayRawDataMenu.$(SrcSuf)
 ALIHLTPHOSONLINEDISPLAYRAWDATAMENUH            =AliHLTPHOSOnlineDisplayRawDataMenu.$(HeadSuf)
@@ -78,53 +52,47 @@ ALIHLTPHOSONLINEDISPLAYCALIBTABO    =AliHLTPHOSOnlineDisplayCalibTab.$(ObjSuf)
 ALIHLTPHOSONLINEDISPLAYCALIBTABS       =AliHLTPHOSOnlineDisplayCalibTab.$(SrcSuf)
 ALIHLTPHOSONLINEDISPLAYCALIBTABH       =AliHLTPHOSOnlineDisplayCalibTab.$(HeadSuf)
 
+
 OBJS   = $(MAINO)  $(ALIHLTPHOSONLINEDISPLAYO)  $(ALIHLTPHOSONLINEDISPLAYTH2DO) $(ALIHLTPHOSONLINEDISPLAYTABO) $(ALIHLTPHOSONLINEDISPLAYRAWDATAMENUO)\
        $(ALIHLTPHOSONLINEDISPLAYEVENTTABO) $(ALIHLTPHOSONLINEDISPLAYRAWTABO)  $(ALIHLTPHOSONLINEDISPLAYCALIBTABO) \
        $(GETEVENTBUTTONO) $(ALIHLTPHOSONLINEDISPLAYNUMBERENTRYO) $(ALIHLTPHOSONLINEDISPLAYBUTTONO)
 
+
 pftest:$(OBJS)
        g++ -ggdb -g $(ROOTLIBS) $(ALIROOTLIBS) $(HLTLIBS)  $(OBJS) -o onlinedisplay
 
 $(MAINO):$(MAINS)
-       g++ -ggdb -g -I$(ROOTSYS)/include -I$(ALIHLTPHOSINCLUDE) -I$(HOMERINCLUDE) -I$(ALIHLTINCLUDE) -c $(MAINS)
+       g++ -ggdb -g $(INCLUDES)  -c $(MAINS)
 
 $(ALIHLTPHOSONLINEDISPLAYO):$(ALIHLTPHOSONLINEDISPLAYS) $(ALIHLTPHOSONLINEDISPLAYH)
-       g++ -ggdb -g -I$(ROOTSYS)/include -I$(ALIHLTPHOSINCLUDE) -I$(HOMERINCLUDE) -I$(ALIHLTINCLUDE) -c $(ALIHLTPHOSONLINEDISPLAYS)
-
+       g++ -ggdb -g $(INCLUDES)  -c $(ALIHLTPHOSONLINEDISPLAYS)
 
 $(ALIHLTPHOSONLINEDISPLAYTH2DO):$(ALIHLTPHOSONLINEDISPLAYTH2DS) $(ALIHLTPHOSONLINEDISPLAYTH2DH)
-       g++ -ggdb -g -I$(ROOTSYS)/include -I$(ALIHLTPHOSINCLUDE) -I$(HOMERINCLUDE) -I$(ALIHLTINCLUDE) -c $(ALIHLTPHOSONLINEDISPLAYTH2DS)
-
+       g++ -ggdb -g $(INCLUDES)  -c $(ALIHLTPHOSONLINEDISPLAYTH2DS)
 
 $(ALIHLTPHOSONLINEDISPLAYBUTTONO):$(ALIHLTPHOSONLINEDISPLAYBUTTONS) $(ALIHLTPHOSONLINEDISPLAYBUTTONH)
-       g++ -ggdb -g -I$(ROOTSYS)/include -I$(ALIHLTPHOSINCLUDE) -I$(HOMERINCLUDE) -I$(ALIHLTINCLUDE) -c $(ALIHLTPHOSONLINEDISPLAYBUTTONS)
+       g++ -ggdb -g $(INCLUDES)  -c $(ALIHLTPHOSONLINEDISPLAYBUTTONS)
 
 $(ALIHLTPHOSONLINEDISPLAYNUMBERENTRYO):$(ALIHLTPHOSONLINEDISPLAYNUMBERENTRYS) $(ALIHLTPHOSONLINEDISPLAYNUMBERENTRYH)
-       g++ -ggdb -g -I$(ROOTSYS)/include -I$(ALIHLTPHOSINCLUDE) -I$(HOMERINCLUDE) -I$(ALIHLTINCLUDE) -c $(ALIHLTPHOSONLINEDISPLAYNUMBERENTRYS)
-
+       g++ -ggdb -g $(INCLUDES)  -c $(ALIHLTPHOSONLINEDISPLAYNUMBERENTRYS)
 
 $(ALIHLTPHOSONLINEDISPLAYRAWDATAMENUO):$(ALIHLTPHOSONLINEDISPLAYRAWDATAMENUS) $(ALIHLTPHOSONLINEDISPLAYRAWDATAMENUH)
-       g++ -ggdb -g -I$(ROOTSYS)/include -I$(ALIHLTPHOSINCLUDE) -I$(HOMERINCLUDE) -I$(ALIHLTINCLUDE) -c $(ALIHLTPHOSONLINEDISPLAYRAWDATAMENUS)
-
-
-#$(ALIHLTPHOSTH1DO):$(ALIHLTPHOSTH1DS) $(ALIHLTPHOSTH1DH)                                           
-#      g++ -ggdb -g -I$(ROOTSYS)/include -I$(ALIHLTPHOSINCLUDE) -I$(HOMERINCLUDE) -I$(ALIHLTINCLUDE) -c $(ALIHLTPHOSTH1DS)
-
+       g++ -ggdb -g $(INCLUDES)  -c $(ALIHLTPHOSONLINEDISPLAYRAWDATAMENUS)
 
 $(ALIHLTPHOSONLINEDISPLAYTABO):$(ALIHLTPHOSONLINEDISPLAYTABS) $(ALIHLTPHOSONLINEDISPLAYTABH)
-       g++ -ggdb -g -I$(ROOTSYS)/include -I$(ALIHLTPHOSINCLUDE) -I$(HOMERINCLUDE) -I$(ALIHLTINCLUDE) -c $(ALIHLTPHOSONLINEDISPLAYTABS)
+       g++ -ggdb -g $(INCLUDES)  -c $(ALIHLTPHOSONLINEDISPLAYTABS)
 
 $(ALIHLTPHOSONLINEDISPLAYEVENTTABO):$(ALIHLTPHOSONLINEDISPLAYEVENTTABS) $(ALIHLTPHOSONLINEDISPLAYEVENTTABH)
-       g++ -ggdb -g -I$(ROOTSYS)/include -I$(ALIHLTPHOSINCLUDE) -I$(HOMERINCLUDE) -I$(ALIHLTINCLUDE) -c $(ALIHLTPHOSONLINEDISPLAYEVENTTABS)
+       g++ -ggdb -g $(INCLUDES)  -c $(ALIHLTPHOSONLINEDISPLAYEVENTTABS)
 
 $(ALIHLTPHOSONLINEDISPLAYRAWTABO):$(ALIHLTPHOSONLINEDISPLAYRAWTABS) $(ALIHLTPHOSONLINEDISPLAYRAWTABH)
-       g++ -ggdb -g -I$(ROOTSYS)/include -I$(ALIHLTPHOSINCLUDE) -I$(HOMERINCLUDE) -I$(ALIHLTINCLUDE) -c $(ALIHLTPHOSONLINEDISPLAYRAWTABS)
+       g++ -ggdb -g $(INCLUDES)  -c $(ALIHLTPHOSONLINEDISPLAYRAWTABS)
 
 $(ALIHLTPHOSONLINEDISPLAYCALIBTABO):$(ALIHLTPHOSONLINEDISPLAYCALIBTABS) $(ALIHLTPHOSONLINEDISPLAYCALIBTABH)
-       g++ -ggdb -g -I$(ROOTSYS)/include -I$(ALIHLTPHOSINCLUDE) -I$(HOMERINCLUDE) -I$(ALIHLTINCLUDE) -c $(ALIHLTPHOSONLINEDISPLAYCALIBTABS)
+       g++ -ggdb -g $(INCLUDES)  -c $(ALIHLTPHOSONLINEDISPLAYCALIBTABS)
 
 $(GETEVENTBUTTONO):$(GETEVENTBUTTONS) $(GETEVENTBUTTONH)
-       g++ -ggdb -g -I$(ROOTSYS)/include -I$(ALIHLTPHOSINCLUDE) -I$(HOMERINCLUDE) -I$(ALIHLTINCLUDE) -c $(GETEVENTBUTTONS)
+       g++ -ggdb -g $(INCLUDES)  -c $(GETEVENTBUTTONS)
 
 clean:
        @rm -f *o *~ *# pftest