Modified the PHOS HLT online display to account for

the changes aliroot/HLT/PHOS

diff --git a/HLT/PHOS/OnlineDisplay/AliHLTPHOSOnlineDisplay.cxx b/HLT/PHOS/OnlineDisplay/AliHLTPHOSOnlineDisplay.cxx
index 86ffdc4e73483afe6aaf4869ae7d76fbe5f5d492..7af48554fc0b81ed77fd04cc782bbeae79e07fab 100644 (file)
--- a/HLT/PHOS/OnlineDisplay/AliHLTPHOSOnlineDisplay.cxx
+++ b/HLT/PHOS/OnlineDisplay/AliHLTPHOSOnlineDisplay.cxx
@@ -1,4 +1,4 @@
-// $Id: AliHLTPHOSOnlineDisplay.cxx 33100 2009-06-22 09:47:35Z odjuvsla $
+// $Id$
 
 /**************************************************************************
  * This file is property of and copyright by the Experimental Nuclear     *
@@ -29,7 +29,7 @@
 
 #include  "AliHLTPHOSOnlineDisplay.h"
 #include  "AliHLTDataTypes.h"
-#include  "AliHLTPHOSRcuCellEnergyDataStruct.h"
+//#include  "AliHLTPHOSRcuCellEnergyDataStruct.h"
 #include  <vector>
 #include  "stdio.h"
 #include <string>
@@ -75,14 +75,17 @@ AliHLTPHOSOnlineDisplay::Instance(int argc, char** argv)
 }
 
 
-AliHLTPHOSOnlineDisplay::AliHLTPHOSOnlineDisplay() : AliHLTPHOSBase(), fRunNumber(-1)
+//AliHLTPHOSOnlineDisplay::AliHLTPHOSOnlineDisplay() : AliHLTPHOSBase(), fRunNumber(-1)
+AliHLTPHOSOnlineDisplay::AliHLTPHOSOnlineDisplay() : fRunNumber(-1)
+
 {
   // See header file for documentation
   cout << "ERROR ! level: FATAL, you cannot invoke the onlinedisplay without arguments" << endl;
 }
 
 
-AliHLTPHOSOnlineDisplay::AliHLTPHOSOnlineDisplay(int argc, char** argv) : AliHLTPHOSBase()
+//AliHLTPHOSOnlineDisplay::AliHLTPHOSOnlineDisplay(int argc, char** argv) : AliHLTPHOSBase()
+AliHLTPHOSOnlineDisplay::AliHLTPHOSOnlineDisplay(int argc, char** argv) 
 {
   // See header file for documentation
   gStyle->SetOptStat(false);

diff --git a/HLT/PHOS/OnlineDisplay/AliHLTPHOSOnlineDisplay.h b/HLT/PHOS/OnlineDisplay/AliHLTPHOSOnlineDisplay.h
index c6d1f78fe5d2ea33962264bbd432759671084a0e..dba1448c29a313f0f30783b35241e974e2f0e7e4 100644 (file)
--- a/HLT/PHOS/OnlineDisplay/AliHLTPHOSOnlineDisplay.h
+++ b/HLT/PHOS/OnlineDisplay/AliHLTPHOSOnlineDisplay.h
@@ -1,5 +1,5 @@
 //-*- Mode: C++ -*-
-// $Id: AliHLTPHOSOnlineDisplay.h 33100 2009-06-22 09:47:35Z odjuvsla $
+// $Id$
 
 #ifndef ALIHLTPHOSONLINEDISPLAY_H
 #define ALIHLTPHOSONLINEDISPLAY_H
@@ -26,7 +26,7 @@
 
 //#include "AliHLTPHOSOnlineDisplayEventTab.h"
 //#include "AliHLTPHOSOnlineDisplayFourierTab.h"
-#include "AliHLTPHOSBase.h"
+//#include "AliHLTPHOSBase.h"
 
 //#include "TSystem.h"
 //#include "TStyle.h"
@@ -60,7 +60,8 @@ using namespace PhosHLTConst;
 
 class TCanvas;
 
-class AliHLTPHOSOnlineDisplay : public  TGMainFrame, public AliHLTPHOSBase
+//class AliHLTPHOSOnlineDisplay : public  TGMainFrame, public AliHLTPHOSBase
+class AliHLTPHOSOnlineDisplay : public  TGMainFrame
 {
  public:
   ~AliHLTPHOSOnlineDisplay();
@@ -68,7 +69,7 @@ class AliHLTPHOSOnlineDisplay : public  TGMainFrame, public AliHLTPHOSBase
   /** Copy constructor */  
   AliHLTPHOSOnlineDisplay(const AliHLTPHOSOnlineDisplay &) : 
     TGMainFrame(),
-    AliHLTPHOSBase(),
+    //   AliHLTPHOSBase(),
     fRunNumber(0),
     fgRawDataCanvas(0)
   {

diff --git a/HLT/PHOS/OnlineDisplay/AliHLTPHOSOnlineDisplayEventTab.cxx b/HLT/PHOS/OnlineDisplay/AliHLTPHOSOnlineDisplayEventTab.cxx
index b969749838cccfa0856cfcec668559d9c509fa13..4e204a601fc62156ea019da4733991663715ac36 100644 (file)
--- a/HLT/PHOS/OnlineDisplay/AliHLTPHOSOnlineDisplayEventTab.cxx
+++ b/HLT/PHOS/OnlineDisplay/AliHLTPHOSOnlineDisplayEventTab.cxx
@@ -25,24 +25,14 @@
 #include "AliHLTHOMERData.h"
 #include "AliHLTHOMERReader.h"
 #include "AliHLTHOMERWriter.h"
-#include "AliHLTPHOSRcuCellEnergyDataStruct.h"
 #include "TRootEmbeddedCanvas.h"
-//#include "AliHLTPHOSRcuCellEnergyDataStruct.h"
-#include "AliHLTPHOSRcuCellEnergyDataStruct.h" 
 #include "AliHLTPHOSOnlineDisplay.h"
-
 #include "AliHLTPHOSChannelDataStruct.h"
-
 #include "AliHLTPHOSChannelDataHeaderStruct.h"
-
-//#include "AliHLTPHOSSharedMemoryInterface.h"
 #include "AliHLTPHOSSharedMemoryInterfacev2.h"
 #include "AliHLTPHOSCoordinate.h"
-//#include "TStyle.h"
- 
 #include "AliHLTPHOSChannelRawDataStruct.h"
 
-
 using namespace std;
 
 // MT Crap

diff --git a/HLT/PHOS/OnlineDisplay/AliHLTPHOSOnlineDisplayFourierTab.cxx b/HLT/PHOS/OnlineDisplay/AliHLTPHOSOnlineDisplayFourierTab.cxx
index 013f28437d3719d22ce1e9815ef7deb0e5eaace2..2be4043e9bf236b393162a6b209850da6ceecb5a 100644 (file)
--- a/HLT/PHOS/OnlineDisplay/AliHLTPHOSOnlineDisplayFourierTab.cxx
+++ b/HLT/PHOS/OnlineDisplay/AliHLTPHOSOnlineDisplayFourierTab.cxx
@@ -25,11 +25,11 @@
 #include "AliHLTHOMERData.h"
 #include "AliHLTHOMERReader.h"
 #include "AliHLTHOMERWriter.h"
-#include "AliHLTPHOSRcuCellEnergyDataStruct.h"
 //#include "AliHLTPHOSRcuCellEnergyDataStruct.h"
-#include "AliHLTPHOSRcuCellEnergyDataStruct.h" 
+//#include "AliHLTPHOSRcuCellEnergyDataStruct.h"
+//#include "AliHLTPHOSRcuCellEnergyDataStruct.h" 
 #include "AliHLTPHOSOnlineDisplay.h"
-#include "AliHLTPHOSSharedMemoryInterface.h"
+#include "AliHLTPHOSSharedMemoryInterfacev2.h"
 #include "AliHLTPHOSFourier.h"
 #include "AliHLTPHOSOnlineDisplayTH2D.h"
 
@@ -63,7 +63,7 @@ AliHLTPHOSOnlineDisplayFourierTab::AliHLTPHOSOnlineDisplayFourierTab(AliHLTPHOSO
   // gStyle->SetOptStat(false);
   
 
-  fShmPtr = new AliHLTPHOSSharedMemoryInterface();
+  fShmPtr = new AliHLTPHOSSharedMemoryInterfacev2();
   fOnlineDisplayPtr =  onlineDisplayPtr;
   fFourierPtr = new AliHLTPHOSFourier();
 
@@ -120,7 +120,7 @@ void
 AliHLTPHOSOnlineDisplayFourierTab::ReadBlockData(AliHLTHOMERReader * const homeReaderPtr)
 { 
   // See header file for documentation
-  AliHLTPHOSValidCellDataStruct *currentChannel =0;
+  //  AliHLTPHOSValidCellDataStruct *currentChannel =0;
   cout << "AliHLTPHOSOnlineDisplayFourierTab::ReadBlockDat, Reading block data, therere are " <<  homeReaderPtr->GetBlockCnt() << " blocks " <<endl;
   //  unsigned long blk = homeReaderPtr->FindBlockNdx("RENELLEC","SOHP", 0xFFFFFFFF );
 

diff --git a/HLT/PHOS/OnlineDisplay/AliHLTPHOSOnlineDisplayFourierTab.h b/HLT/PHOS/OnlineDisplay/AliHLTPHOSOnlineDisplayFourierTab.h
index d533aa8088afb31fd1c79633409029816aa5f94f..e1af06ecfc1b03f3405286679eb65972229aa583 100644 (file)
--- a/HLT/PHOS/OnlineDisplay/AliHLTPHOSOnlineDisplayFourierTab.h
+++ b/HLT/PHOS/OnlineDisplay/AliHLTPHOSOnlineDisplayFourierTab.h
@@ -48,7 +48,7 @@ class AliHLTPHOSGetEventButton;
 class AliHLTHOMERReader;
 class AliHLTPHOSRcuCellEnergyDataStruct;
 class AliHLTPHOSOnlineDisplay;
-class AliHLTPHOSSharedMemoryInterface;
+class AliHLTPHOSSharedMemoryInterfacev2;
 class AliHLTPHOSFourier;
 
 class AliHLTPHOSOnlineDisplayFourierTab : public AliHLTPHOSOnlineDisplayTab
@@ -95,7 +95,7 @@ class AliHLTPHOSOnlineDisplayFourierTab : public AliHLTPHOSOnlineDisplayTab
   AliHLTPHOSGetEventButton* fgEventButtPtr;  // fgEventButtPtr
   void InitDisplay(TGTab *tabPtr); //InitDisplay
   AliHLTPHOSOnlineDisplay *fOnlineDisplayPtr; //fOnlineDisplayPtr
-  AliHLTPHOSSharedMemoryInterface *fShmPtr;   //fShmPtr
+  AliHLTPHOSSharedMemoryInterfacev2 *fShmPtr;   //fShmPtr
 
   AliHLTPHOSFourier *fFourierPtr; //fFourierPtr
   char fGainText[256];  //fGainText

diff --git a/HLT/PHOS/OnlineDisplay/AliHLTPHOSOnlineDisplayTab.cxx b/HLT/PHOS/OnlineDisplay/AliHLTPHOSOnlineDisplayTab.cxx
index ebaae709279d9e70245709fb3fc9171e7b9f046c..6d24526db622e790cffb642e9cafea0b29a900a2 100644 (file)
--- a/HLT/PHOS/OnlineDisplay/AliHLTPHOSOnlineDisplayTab.cxx
+++ b/HLT/PHOS/OnlineDisplay/AliHLTPHOSOnlineDisplayTab.cxx
@@ -2,14 +2,14 @@
 
 #include "AliHLTPHOSOnlineDisplayTab.h"
 #include "AliHLTHOMERReader.h"
-#include <iostream>
+//#include <iostream>
 #include "AliHLTDataTypes.h"
 
 
 using namespace std;
 
 
-AliHLTPHOSOnlineDisplayTab::AliHLTPHOSOnlineDisplayTab():AliHLTPHOSBase(),
+AliHLTPHOSOnlineDisplayTab::AliHLTPHOSOnlineDisplayTab()://AliHLTPHOSBase(),
                                                         fgSyncronize(kFALSE), 
                                                         fRunNumber(-1)
 {

diff --git a/HLT/PHOS/OnlineDisplay/AliHLTPHOSOnlineDisplayTab.h b/HLT/PHOS/OnlineDisplay/AliHLTPHOSOnlineDisplayTab.h
index e804e4e54494a0db94a7825a25f67311a14b21ef..6589c8d44e253e389ac1849e5ebbdaa9855679db 100644 (file)
--- a/HLT/PHOS/OnlineDisplay/AliHLTPHOSOnlineDisplayTab.h
+++ b/HLT/PHOS/OnlineDisplay/AliHLTPHOSOnlineDisplayTab.h
@@ -1,5 +1,5 @@
 //-*- Mode: C++ -*-
-// $Id: AliHLTPHOSOnlineDisplayTab.h 31683 2009-03-24 21:17:03Z odjuvsla $
+// $Id$
 
 
 #ifndef ALIHLTPHOSONLINEDISPLAYTAB_H
@@ -9,7 +9,11 @@
 #include "AliHLTHOMERReader.h"
 #include "AliHLTPHOSCommonDefs.h"
 #include "AliHLTPHOSConstants.h"
-#include "AliHLTPHOSBase.h"
+
+#include <iostream>
+using namespace std;
+
+//#include "AliHLTPHOSBase.h"
 
 //#define XRANGESTART 120
 //#define XRANGELENGTH 80
@@ -25,7 +29,8 @@ using namespace PhosHLTConst;
 class AliHLTHOMERReader;
 
 
-class AliHLTPHOSOnlineDisplayTab : public TGTab, public AliHLTPHOSBase
+//class AliHLTPHOSOnlineDisplayTab : public TGTab, public AliHLTPHOSBase
+class AliHLTPHOSOnlineDisplayTab : public TGTab
 {
  public:
   virtual ~AliHLTPHOSOnlineDisplayTab();