Moving the fourieranalysis classes back to the PHOS

directory since they were actually used by the Online minitoring

diff --git a/HLT/CMake_libAliHLTPHOS.txt b/HLT/CMake_libAliHLTPHOS.txt
index 9e602fc6377ae73bfd1cfc4d94c559106c5b996f..351862d419a1cae5974ead8a87ec4be3578fa4dd 100644 (file)
--- a/HLT/CMake_libAliHLTPHOS.txt
+++ b/HLT/CMake_libAliHLTPHOS.txt
@@ -48,6 +48,7 @@ PHOS/AliHLTPHOSMonitorTriggerComponent.cxx
 PHOS/AliHLTPHOSESDEntriesMakerComponent.cxx
 PHOS/AliHLTPHOSESDCaloClusterWriterComponent.cxx
 PHOS/AliHLTPHOSPhysicsHistogramProducer.cxx
+PHOS/AliHLTPHOSFourier.cxx
 )
 
 # fill list of header files from list of source files

diff --git a/HLT/PHOS/debug/AliHLTPHOSFourier.cxx b/HLT/PHOS/AliHLTPHOSFourier.cxx
similarity index 100%
rename from HLT/PHOS/debug/AliHLTPHOSFourier.cxx
rename to HLT/PHOS/AliHLTPHOSFourier.cxx

diff --git a/HLT/PHOS/debug/AliHLTPHOSFourier.h b/HLT/PHOS/AliHLTPHOSFourier.h
similarity index 100%
rename from HLT/PHOS/debug/AliHLTPHOSFourier.h
rename to HLT/PHOS/AliHLTPHOSFourier.h

diff --git a/HLT/PHOS/AliHLTPHOSRawAnalyzerComponentv3.cxx b/HLT/PHOS/AliHLTPHOSRawAnalyzerComponentv3.cxx
index 1a15b407d23aca300411a8276a9ccafff1ee72f7..17b66299dd0a8dce924d79151db8dbbdb81145f7 100644 (file)
--- a/HLT/PHOS/AliHLTPHOSRawAnalyzerComponentv3.cxx
+++ b/HLT/PHOS/AliHLTPHOSRawAnalyzerComponentv3.cxx
@@ -117,6 +117,7 @@ int
 AliHLTPHOSRawAnalyzerComponentv3::DoEvent( const AliHLTComponentEventData& evtData, const AliHLTComponentBlockData* blocks, AliHLTComponentTriggerData& /*trigData*/, 
                                         AliHLTUInt8_t* outputPtr, AliHLTUInt32_t& size, vector<AliHLTComponentBlockData>& outputBlocks )
 {
+  cout << __FILE__<<"::"<<__FUNCTION__<<":"<<__LINE__<< "DoEvent" << endl;
   //comment
   Int_t blockSize          = 0;
   UInt_t totSize           = 0;
@@ -129,6 +130,11 @@ AliHLTPHOSRawAnalyzerComponentv3::DoEvent( const AliHLTComponentEventData& evtDa
       iter = blocks+ndx;
       if ( iter->fDataType != AliHLTPHOSDefinitions::fgkDDLPackedRawDataType  )
        {
+         cout << __FILE__<<"::"<<__FUNCTION__<<":"<<__LINE__<< "Data block is not of type fgkDDLPackedRawDataType" << endl;
+         
+         cout << "Data type is "<< iter->fDataType.fID<<":" <<   iter->fDataType.fOrigin  << endl;
+
+
          HLTDebug("Data block is not of type fgkDDLPackedRawDataType");
          continue; 
        }

diff --git a/HLT/PHOS/AliHLTPHOSRawAnalyzerCrudeComponent.cxx b/HLT/PHOS/AliHLTPHOSRawAnalyzerCrudeComponent.cxx
index 97377338bbf94e138da98172494860874b9ae6bf..70fc21cb82fcf442cd328231eb095db5647ff084 100644 (file)
--- a/HLT/PHOS/AliHLTPHOSRawAnalyzerCrudeComponent.cxx
+++ b/HLT/PHOS/AliHLTPHOSRawAnalyzerCrudeComponent.cxx
@@ -39,7 +39,7 @@ AliHLTPHOSRawAnalyzerCrudeComponent::~AliHLTPHOSRawAnalyzerCrudeComponent()
 }
 
 //___________________________________________________________________________
-AliHLTPHOSRawAnalyzerCrudeComponent::AliHLTPHOSRawAnalyzerCrudeComponent(const AliHLTPHOSRawAnalyzerCrudeComponent & ):AliHLTPHOSRawAnalyzerComponent()
+AliHLTPHOSRawAnalyzerCrudeComponent::AliHLTPHOSRawAnalyzerCrudeComponent(const AliHLTPHOSRawAnalyzerCrudeComponent & ):AliHLTPHOSRawAnalyzerComponentv3()
 {
 
 }

diff --git a/HLT/PHOS/AliHLTPHOSRawAnalyzerCrudeComponent.h b/HLT/PHOS/AliHLTPHOSRawAnalyzerCrudeComponent.h
index 9e2203528e3e908b4b650519ebc87dae5e432ff6..685828641019b8779342dcf1a459895f18740cb6 100644 (file)
--- a/HLT/PHOS/AliHLTPHOSRawAnalyzerCrudeComponent.h
+++ b/HLT/PHOS/AliHLTPHOSRawAnalyzerCrudeComponent.h
@@ -4,14 +4,16 @@
 #ifndef ALIHLTPHOSRAWANALYZERCRUDECOMPONENT_H
 #define ALIHLTPHOSRAWANALYZERCRUDECOMPONENT_H
 
-#include "AliHLTPHOSRawAnalyzerComponent.h"
+//#include "AliHLTPHOSRawAnalyzerComponent.h"
+#include "AliHLTPHOSRawAnalyzerComponentv3.h"
 
 /* Copyright(c) 2006, ALICE Experiment at CERN, All rights reserved. *
  * See cxx source for full Copyright notice  */ 
 
 
 
-class AliHLTPHOSRawAnalyzerCrudeComponent: public AliHLTPHOSRawAnalyzerComponent
+//class AliHLTPHOSRawAnalyzerCrudeComponent: public AliHLTPHOSRawAnalyzerComponent
+class AliHLTPHOSRawAnalyzerCrudeComponent: public AliHLTPHOSRawAnalyzerComponentv3
 {
  public:
   AliHLTPHOSRawAnalyzerCrudeComponent();

diff --git a/HLT/PHOS/debug/AliHLTPHOSRcuFFTDataStruct.h b/HLT/PHOS/AliHLTPHOSRcuFFTDataStruct.h
similarity index 100%
rename from HLT/PHOS/debug/AliHLTPHOSRcuFFTDataStruct.h
rename to HLT/PHOS/AliHLTPHOSRcuFFTDataStruct.h

diff --git a/HLT/PHOS/OnlineDisplay/AliHLTPHOSOnlineDisplayEventTab.cxx b/HLT/PHOS/OnlineDisplay/AliHLTPHOSOnlineDisplayEventTab.cxx
index 84b32e01fdb99e998acf327d0dacf30e67ad2631..8e607a9f4b0a4dcfc8d541c26192bddb7309f812 100644 (file)
--- a/HLT/PHOS/OnlineDisplay/AliHLTPHOSOnlineDisplayEventTab.cxx
+++ b/HLT/PHOS/OnlineDisplay/AliHLTPHOSOnlineDisplayEventTab.cxx
@@ -1,4 +1,4 @@
-// $Id: AliHLTPHOSOnlineDisplayEventTab.cxx 31683 2009-03-24 21:17:03Z odjuvsla $
+// $Id$
 
 /**************************************************************************
  * Copyright(c) 2006, ALICE Experiment at CERN, All rights reserved.      *
@@ -192,7 +192,10 @@ AliHLTPHOSOnlineDisplayEventTab::ReadBlockData(AliHLTHOMERReader *homeReaderPtr)
 
   FindFourierBlocks(homeReaderPtr);
 
-  unsigned long blk = homeReaderPtr->FindBlockNdx("RENELLEC","SOHP", 0xFFFFFFFF );
+  // unsigned long blk = homeReaderPtr->FindBlockNdx("RENELLEC","SOHP", 0xFFFFFFFF );
+     unsigned long blk = homeReaderPtr->FindBlockNdx("TLENNAHC","SOHP", 0xFFFFFFFF );
+
+  cout << __FILE__ << ":" << __LINE__ << "blk"  << blk  << endl ;
 
   int cnt = 0;
 
@@ -230,9 +233,9 @@ AliHLTPHOSOnlineDisplayEventTab::ReadBlockData(AliHLTHOMERReader *homeReaderPtr)
          tmpX = currentChannel->fX;
          tmpGain =  currentChannel->fGain;
 
-//       cout << "Channel: x: " << moduleID*NXCOLUMNSMOD + tmpX + NXCOLUMNSRCU*cellEnergiesPtr->fRcuX 
-//            << " z: " <<     tmpZ + NZROWSRCU*cellEnergiesPtr->fRcuZ
-//            << " E: " <<  currentChannel->fEnergy << endl;
+         //      cout << "Channel: x: " << moduleID*NXCOLUMNSMOD + tmpX + NXCOLUMNSRCU*cellEnergiesPtr->fRcuX 
+         //           << " z: " <<     tmpZ + NZROWSRCU*cellEnergiesPtr->fRcuZ
+         //           << " E: " <<  currentChannel->fEnergy << endl;
 
          fgLegoPlotPtr[tmpGain]->Fill(moduleID*NXCOLUMNSMOD + tmpX +  NXCOLUMNSRCU*cellEnergiesPtr->fRcuX,  
                                    tmpZ + NZROWSRCU*cellEnergiesPtr->fRcuZ, currentChannel->fEnergy);

diff --git a/HLT/libAliHLTPHOS.pkg b/HLT/libAliHLTPHOS.pkg
index 60409d77abb46cfdbf13e68e1748e057cb1dd16d..685f92c0e0c3bbd598ac205327849cf3f9b7169e 100644 (file)
--- a/HLT/libAliHLTPHOS.pkg
+++ b/HLT/libAliHLTPHOS.pkg
@@ -50,7 +50,8 @@ CLASS_HDRS:=    AliHLTPHOSBase.h \
                  AliHLTPHOSMonitorTriggerComponent.h \
                  AliHLTPHOSESDEntriesMakerComponent.h \
                  AliHLTPHOSESDCaloClusterWriterComponent.h \
-                 AliHLTPHOSPhysicsHistogramProducer.h
+                 AliHLTPHOSPhysicsHistogramProducer.h \
+                 AliHLTPHOSFourier.h
 #                AliHLTPHOSESDCaloClusterMakerComponent.h 
 #                AliHLTPHOSTreeMaker.h \
 #                AliHLTPHOSTreeMakerComponent.h \