Removing unused class AliHLTEMCALSharedMemoryInterface,

Use AliHLTCaloSharedMemoryInterface  instead which
implements exactly the same functionality.

diff --git a/HLT/EMCAL/AliHLTEMCALGeometry.cxx b/HLT/EMCAL/AliHLTEMCALGeometry.cxx
index f4a06c6c139f378ffd54130211df6fae542ac73f..1d8c7bac5f5bd9a2fdb581aa5ce6fc11ac56b87b 100644 (file)
--- a/HLT/EMCAL/AliHLTEMCALGeometry.cxx
+++ b/HLT/EMCAL/AliHLTEMCALGeometry.cxx
@@ -16,30 +16,27 @@
 
 #include "AliHLTEMCALGeometry.h"
 #include "AliHLTEMCALConstants.h"
-// #include "AliHLTEMCALConstant.h"
-#include "assert.h"
-#include "AliHLTCaloConstantsHandler.h"
-#include "AliHLTEMCALSharedMemoryInterface.h" 
-#include "TVector3.h"
+#include "AliCDBEntry.h"
+#include "AliCDBManager.h"
+#include "AliCDBPath.h"
 
-// using namespace EmcalHLTConst;
 
 ClassImp(AliHLTEMCALGeometry);
 TGeoManager *gGeoManager = 0;
 
 AliHLTEMCALGeometry::AliHLTEMCALGeometry() :
        AliHLTCaloGeometry ("EMCAL"),
-       fShmPtr(0),
        fGeo(0),
        fEMCALGeometry(0)
 {
-       //fGeo = new AliEMCALGeoUtils("EMCAL_COMPLETE","EMCAL");
+
+  //fGeo = new AliEMCALGeoUtils("EMCAL_COMPLETE","EMCAL");
        //fGeo = new AliEMCALGeometry("EMCAL_COMPLETE","EMCAL");
        //fGeo =  AliEMCALGeometry::GetInstance(AliEMCALGeometry::GetDefaultGeometryName());
        //TGeoManager::Import("/home/fedro/work/AliRoot/test/QA/geometry.root");
        //fGeo = new AliEMCALGeoUtils("EMCAL_COMPLETE","EMCAL");
-       fShmPtr = new AliHLTEMCALSharedMemoryInterface();
-       GetGeometryFromCDB();
+
+  GetGeometryFromCDB();
 }
 
 Int_t AliHLTEMCALGeometry::InitialiseGeometry()

diff --git a/HLT/EMCAL/AliHLTEMCALGeometry.h b/HLT/EMCAL/AliHLTEMCALGeometry.h
index 9ec5586f96634b04736919bfd0618f298ae396ce..4acabf25df0a5ef1a502585c5ff04569a6ed7a57 100644 (file)
--- a/HLT/EMCAL/AliHLTEMCALGeometry.h
+++ b/HLT/EMCAL/AliHLTEMCALGeometry.h
@@ -17,14 +17,12 @@
  **************************************************************************/
 
 #include "AliHLTCaloGeometry.h"
-#include "AliHLTEMCALSharedMemoryInterface.h" 
 #include "AliEMCALGeoUtils.h"
-#include "AliEMCALGeometry.h"
-#include "TGeoManager.h"
-#include "AliCDBEntry.h"
-#include "AliCDBManager.h"
-#include "AliCDBPath.h"
-#include "AliHLTEMCALRecPointDataStruct.h"
+
+class TGeoManager;
+class AliCDBManager;
+class AliCDBPath;
+class AliHLTEMCALRecPointDataStruct;
 
 class AliEMCALGeoUtils;
 
@@ -38,19 +36,18 @@ class  AliHLTEMCALGeometry : public AliHLTCaloGeometry, public AliHLTLogging
        virtual void ConvertRecPointCoordinates(Double_t &x, Double_t &y, Double_t &z) const;
        virtual Int_t InitialiseGeometry();
 
+
 protected:
        int GetGeometryFromCDB();
-private:
 
-       AliHLTEMCALSharedMemoryInterface* fShmPtr;  
-       //AliEMCALGeometry *fGeo;
+private:
+       AliHLTEMCALGeometry(const AliHLTEMCALGeometry & );
+       AliHLTEMCALGeometry & operator = (const AliHLTEMCALGeometry &); 
        AliEMCALGeoUtils *fGeo;
+       
        /** The EMCAL geometry */
        AliEMCALGeoUtils *fEMCALGeometry;                  //!transient
-       AliHLTEMCALGeometry(const AliHLTEMCALGeometry & );
-       AliHLTEMCALGeometry & operator = (const AliHLTEMCALGeometry &);
-       //      static TGeoManager *fgGeoManager;
-
 
 };
+
 #endif

diff --git a/HLT/EMCAL/AliHLTEMCALSharedMemoryInterface.cxx b/HLT/EMCAL/AliHLTEMCALSharedMemoryInterface.cxx
deleted file mode 100644 (file)
index 0cab04f..0000000
--- a/HLT/EMCAL/AliHLTEMCALSharedMemoryInterface.cxx
+++ /dev/null
@@ -1,45 +0,0 @@
-/**************************************************************************
- * This file is property of and copyright by the Experimental Nuclear     *
- * Physics Group, Dep. of Physics                                         *
- * University of Oslo, Norway, 2007                                       *
- *                                                                        *
- * Author: Per Thomas Hille <perthi@fys.uio.no> for the ALICE HLT Project.*
- * Contributors are mentioned in the code where appropriate.              *
- * Please report bugs to perthi@fys.uio.no                                *
- *                                                                        *
- * Permission to use, copy, modify and distribute this software and its   *
- * documentation strictly for non-commercial purposes is hereby granted   *
- * without fee, provided that the above copyright notice appears in all   *
- * copies and that both the copyright notice and this permission notice   *
- * appear in the supporting documentation. The authors make no claims     *
- * about the suitability of this software for any purpose. It is          *
- * provided "as is" without express or implied warranty.                  *
- **************************************************************************/
-#include "AliHLTEMCALSharedMemoryInterface.h"
-#include "AliHLTEMCALMapper.h"
-
-
-AliHLTEMCALSharedMemoryInterface::AliHLTEMCALSharedMemoryInterface() : AliHLTCaloSharedMemoryInterfacev2("EMCAL")
-{
-  for(int i=0; i < 32; i++ )
-    {
-      fMapperPtr[i] = new  AliHLTEMCALMapper( AliHLTCaloMapper::GetSpecFromDDLIndex(i) ) ;
-    }
-}
-
-
- //  GetSpecFromDDLIndex
-  //  AliHLTCaloMapper  *fMapperPtr[32];
-
-  /*
-  for(int i=0; i < 32; i++)
-    {
-      fMapperPtr[i] = new AliHLTCaloMapper( AliHLTCaloMapper::GetSpecFromDDLIndex(i) ) ;
-    }
-  */
-
-AliHLTEMCALSharedMemoryInterface::~AliHLTEMCALSharedMemoryInterface()
-{
-
-}
-

diff --git a/HLT/EMCAL/AliHLTEMCALSharedMemoryInterface.h b/HLT/EMCAL/AliHLTEMCALSharedMemoryInterface.h
deleted file mode 100644 (file)
index 797615f..0000000
--- a/HLT/EMCAL/AliHLTEMCALSharedMemoryInterface.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#ifndef ALIHLTEMCALSHAREDMEMORYINTERFACE_H
-#define ALIHLTEMCALSHAREDMEMORYINTERFACE_H
-
-/**************************************************************************
- * This file is property of and copyright by the Experimental Nuclear     *
- * Physics Group, Dep. of Physics                                         *
- * University of Oslo, Norway, 2007                                       *
- *                                                                        *
- * Author: Per Thomas Hille <perthi@fys.uio.no> for the ALICE HLT Project.*
- * Contributors are mentioned in the code where appropriate.              *
- * Please report bugs to perthi@fys.uio.no                                *
- *                                                                        *
- * Permission to use, copy, modify and distribute this software and its   *
- * documentation strictly for non-commercial purposes is hereby granted   *
- * without fee, provided that the above copyright notice appears in all   *
- * copies and that both the copyright notice and this permission notice   *
- * appear in the supporting documentation. The authors make no claims     *
- * about the suitability of this software for any purpose. It is          *
- * provided "as is" without express or implied warranty.                  *
- **************************************************************************/
-
-
-#include "AliHLTCaloSharedMemoryInterfacev2.h"
-
-class  AliHLTEMCALSharedMemoryInterface : public AliHLTCaloSharedMemoryInterfacev2
-{
- public:
-  AliHLTEMCALSharedMemoryInterface();
-  virtual ~AliHLTEMCALSharedMemoryInterface();
-};
-
-#endif

diff --git a/HLT/libAliHLTEMCAL.pkg b/HLT/libAliHLTEMCAL.pkg
index 7e0e1b40178fd22a604e30ec82a7883aebd90603..77caddcab25508cc5d8eab50100cf7a1df2a9dad 100644 (file)
--- a/HLT/libAliHLTEMCAL.pkg
+++ b/HLT/libAliHLTEMCAL.pkg
@@ -12,7 +12,6 @@ CLASS_HDRS:= \
        AliHLTEMCALRawAnalyzerPeakFinderComponent.h \
        AliHLTEMCALRawAnalyzerFastFitComponent.h \
        AliHLTEMCALRawAnalyzerNNComponent.h \
-       AliHLTEMCALSharedMemoryInterface.h  \
        AliHLTEMCALConstants.h \
        AliHLTEMCALDigitMakerComponent.h \
        AliHLTEMCALClusterizerComponent.h \