Removing man-in-the-middle class

AliHLTPHOSRcuProcessor

diff --git a/HLT/EMCAL/AliHLTEMCALRawAnalyzerComponent.cxx b/HLT/EMCAL/AliHLTEMCALRawAnalyzerComponent.cxx
index aa1035351a0239583c478929692fd53ed9ebf4df..267ee9e773dfa2c55172fcb9111d1970f0530295 100644 (file)
--- a/HLT/EMCAL/AliHLTEMCALRawAnalyzerComponent.cxx
+++ b/HLT/EMCAL/AliHLTEMCALRawAnalyzerComponent.cxx
@@ -39,7 +39,7 @@ TStopwatch  fgWatch; //CRAP PTH
 AliHLTEMCALRawAnalyzerComponent::AliHLTEMCALRawAnalyzerComponent() : AliHLTCaloRawAnalyzerComponentv3("EMCAL")
 {
   
-  
+   cout << __FILE__ << __FUNCTION__ << __LINE__ <<  endl;
 }
 
 
@@ -79,6 +79,8 @@ AliHLTEMCALRawAnalyzerComponent::GetOutputDataSize(unsigned long& constBase, dou
 void 
 AliHLTEMCALRawAnalyzerComponent::DoInit() 
 {
+  cout << __FILE__ << __FUNCTION__ << __LINE__ <<  endl;
+
   //  fgWatch.Start();
  
 }
@@ -134,7 +136,9 @@ int
 AliHLTEMCALRawAnalyzerComponent::DoEvent( const AliHLTComponentEventData& evtData, const AliHLTComponentBlockData* blocks, AliHLTComponentTriggerData& /*trigData*/, 
                                         AliHLTUInt8_t* outputPtr, AliHLTUInt32_t& size, vector<AliHLTComponentBlockData>& outputBlocks )
 {
-
+  
+  //  cout << __FILE__ << __FUNCTION__ << __LINE__ <<  endl;
+  
    if(!IsDataEvent())
    {
       size = 0;
@@ -152,7 +156,7 @@ AliHLTEMCALRawAnalyzerComponent::DoEvent( const AliHLTComponentEventData& evtDat
       wlast =  wcurrent;
       wcurrent = fgWatch.RealTime();
       ////cout << wlast << ":" << wcurrent << endl;
-      ////cout << __FILE__ << __LINE__ << "The event rate is " <<  1000/( wcurrent  -  wlast ) << "  Hz" << endl; 
+      cout << __FILE__ << __LINE__ << "The event rate is " <<  1000/( wcurrent  -  wlast ) << "  Hz" << endl; 
       fgWatch.Start(kFALSE); 
       //     wlast =  fgWatch.RealTime(); 
     }

diff --git a/HLT/PHOS/AliHLTPHOSRcuHistogramProducer.h b/HLT/PHOS/AliHLTPHOSRcuHistogramProducer.h
index 06f21a9fc977a9ca2393119d250798cace6ddd04..6dde4441bd1b5573ce74c631bbf38efde2747309 100644 (file)
--- a/HLT/PHOS/AliHLTPHOSRcuHistogramProducer.h
+++ b/HLT/PHOS/AliHLTPHOSRcuHistogramProducer.h
@@ -18,7 +18,7 @@
 #include "TH2D.h"
 #include "AliHLTPHOSRcuCellAccumulatedEnergyDataStruct.h"
 //#include "AliHLTPHOSBase.h"
-#include "AliHLTPHOSRcuProcessor.h"
+//#include "AliHLTPHOSRcuProcessor.h"
 
 class TH1;
 class TH2D;

diff --git a/HLT/PHOS/AliHLTPHOSRcuHistogramProducerComponent.h b/HLT/PHOS/AliHLTPHOSRcuHistogramProducerComponent.h
index 3bbb5876f1ab77d681de1b0a6bfca9f3aeb5f0a0..ea9688701b81404338e119ab892401346bbb9cdd 100644 (file)
--- a/HLT/PHOS/AliHLTPHOSRcuHistogramProducerComponent.h
+++ b/HLT/PHOS/AliHLTPHOSRcuHistogramProducerComponent.h
@@ -7,7 +7,7 @@
 /* Copyright(c) 2006, ALICE Experiment at CERN, All rights reserved. *
  * See cxx source for full Copyright notice  */ 
 
-#include "AliHLTPHOSRcuProcessor.h"
+#include "AliHLTCaloProcessor.h"
 #include "AliHLTPHOSUtilities.h"
 
 //
@@ -22,7 +22,7 @@ class AliHLTPHOSRcuCellAccumulatedEnergyDataStruct;
 class AliHLTPHOSSharedMemoryInterfacev2;
 class AliHLTPHOSChannelDataHeaderStruct;
 
-class AliHLTPHOSRcuHistogramProducerComponent:public AliHLTPHOSRcuProcessor
+class AliHLTPHOSRcuHistogramProducerComponent:public AliHLTCaloProcessor
 {
  public:
   AliHLTPHOSRcuHistogramProducerComponent();
@@ -40,7 +40,7 @@ class AliHLTPHOSRcuHistogramProducerComponent:public AliHLTPHOSRcuProcessor
   virtual const char* GetComponentID();
 
  protected:
-  using AliHLTPHOSRcuProcessor::DoEvent;
+  //  using AliHLTPHOSRcuProcessor::DoEvent;
 
  private:
   AliHLTPHOSRcuHistogramProducerComponent(const AliHLTPHOSRcuHistogramProducerComponent &);

diff --git a/HLT/PHOS/AliHLTPHOSRcuProcessor.cxx b/HLT/PHOS/AliHLTPHOSRcuProcessor.cxx
deleted file mode 100644 (file)
index 8eaf296..0000000
--- a/HLT/PHOS/AliHLTPHOSRcuProcessor.cxx
+++ /dev/null
@@ -1,35 +0,0 @@
-// $Id$
-
-/**************************************************************************
- * 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 "AliHLTPHOSRcuProcessor.h"
-
-AliHLTPHOSRcuProcessor::AliHLTPHOSRcuProcessor():AliHLTCaloProcessor()
-                                                //                              AliHLTPHOSRcuProperties()
-{
-
-}
-
-
-AliHLTPHOSRcuProcessor::~AliHLTPHOSRcuProcessor()
-{
-
-}
-
-
-

diff --git a/HLT/PHOS/AliHLTPHOSRcuProcessor.h b/HLT/PHOS/AliHLTPHOSRcuProcessor.h
deleted file mode 100644 (file)
index 5812216..0000000
--- a/HLT/PHOS/AliHLTPHOSRcuProcessor.h
+++ /dev/null
@@ -1,31 +0,0 @@
-//-*- Mode: C++ -*-
-// $Id$
-
-#ifndef ALIHLTPHOSRCUPROCESSOR_H
-#define ALIHLTPHOSRCUPROCESSOR_H
-/* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
- * See cxx source for full Copyright notice                               */
-
-
-#include "AliHLTCaloProcessor.h"
-//#include "AliHLTPHOSRcuProperties.h"
-
-//class  AliHLTPHOSRcuProcessor : public AliHLTCaloProcessor, public AliHLTPHOSRcuProperties
-class  AliHLTPHOSRcuProcessor : public AliHLTCaloProcessor
-
-{
- public:
-  AliHLTPHOSRcuProcessor();
-  virtual ~AliHLTPHOSRcuProcessor();
-
- private:
-  AliHLTPHOSRcuProcessor (const AliHLTPHOSRcuProcessor & );
-  AliHLTPHOSRcuProcessor   & operator = (const  AliHLTPHOSRcuProcessor  &);
-
-
-
-};
-
-#endif
-
-

diff --git a/HLT/libAliHLTPHOS.pkg b/HLT/libAliHLTPHOS.pkg
index 2cfa0ffca79067c8813003bfd660aa3c2ff8f40a..9a6195e2229e5fa838ab756756715c0462f12232 100644 (file)
--- a/HLT/libAliHLTPHOS.pkg
+++ b/HLT/libAliHLTPHOS.pkg
@@ -16,7 +16,6 @@ CLASS_HDRS:=  AliHLTPHOSClusterizerComponent.h \
                  AliHLTPHOSRawAnalyzerCrude.h \
                  AliHLTPHOSRawAnalyzerCrudeComponent.h \
                  AliHLTPHOSDigitMakerComponent.h \
-                 AliHLTPHOSRcuProcessor.h \
                  AliHLTPHOSMapper.h \
                  AliHLTPHOSRawAnalyzerPeakFinder.h \
                  AliHLTPHOSSanityInspector.h \