Coding convention & removal of some obsolete code

diff --git a/HLT/PHOS/AliHLTPHOSRawAnalyzerComponent.cxx b/HLT/PHOS/AliHLTPHOSRawAnalyzerComponent.cxx
index 9e5680591b6a2d4c49c3e7aaabce2205be25651e..8e9a7dc096526995cbef1951b220e5252e30a9b0 100644 (file)
--- a/HLT/PHOS/AliHLTPHOSRawAnalyzerComponent.cxx
+++ b/HLT/PHOS/AliHLTPHOSRawAnalyzerComponent.cxx
@@ -24,12 +24,14 @@
 #include "AliCaloRawStream.h"
 #include <cstdlib>
 #include "AliHLTPHOSRcuCellEnergyDataStruct.h"
+//#include "AliHLTPHOSDataHeaderStruct.h"
 
 
 const AliHLTComponentDataType AliHLTPHOSRawAnalyzerComponent::inputDataTypes[]={kAliHLTVoidDataType,{0,"",""}}; //'zero' terminated array
 int   AliHLTPHOSRawAnalyzerComponent::fEventCount = 0; 
 
-AliHLTPHOSRawAnalyzerComponent::AliHLTPHOSRawAnalyzerComponent():AliHLTProcessor(), fEquippmentID(0), fRcuX(0), fRcuZ(0),fRcuRowOffeset(0), fRcuColOffeset(0),  fModuleID(0), fPHOSRawStream(), fRawMemoryReader(0), outPtr(0)
+AliHLTPHOSRawAnalyzerComponent::AliHLTPHOSRawAnalyzerComponent():AliHLTProcessor(), fEquippmentID(0), fRcuX(0), 
+fRcuZ(0),fRcuRowOffeset(0), fRcuColOffeset(0),  fModuleID(0), fPHOSRawStream(), fRawMemoryReader(0), fOutPtr(0)
 {
 
 } 
@@ -49,7 +51,8 @@ AliHLTPHOSRawAnalyzerComponent::~AliHLTPHOSRawAnalyzerComponent()
 
 
 
-AliHLTPHOSRawAnalyzerComponent::AliHLTPHOSRawAnalyzerComponent(const AliHLTPHOSRawAnalyzerComponent & ) : AliHLTProcessor(), fEquippmentID(0), fRcuX(0), fRcuZ(0),fRcuRowOffeset(0), fRcuColOffeset(0),  fModuleID(0), fPHOSRawStream(), fRawMemoryReader(0), outPtr(0)
+AliHLTPHOSRawAnalyzerComponent::AliHLTPHOSRawAnalyzerComponent(const AliHLTPHOSRawAnalyzerComponent & ) : AliHLTProcessor(), 
+fEquippmentID(0), fRcuX(0), fRcuZ(0),fRcuRowOffeset(0), fRcuColOffeset(0),  fModuleID(0), fPHOSRawStream(), fRawMemoryReader(0), fOutPtr(0)
 {
 }
 
@@ -123,9 +126,6 @@ int AliHLTPHOSRawAnalyzerComponent::DoEvent( const AliHLTComponentEventData& evt
   UInt_t mysize           = 0;
   UInt_t tSize            = 0;
   Int_t tmpChannelCnt     = 0;
-
-
-  //  cout << "analyzing event: " << fEventCount << endl; 
   AliHLTUInt8_t* outBPtr;
   outBPtr = outputPtr;
   const AliHLTComponentBlockData* iter = NULL; 
@@ -135,7 +135,6 @@ int AliHLTPHOSRawAnalyzerComponent::DoEvent( const AliHLTComponentEventData& evt
     {
       cout << "analyzing event: " << fEventCount << endl;
     }
-    // Reset();
 
   for( ndx = 0; ndx < evtData.fBlockCnt; ndx++ )
     {
@@ -151,35 +150,31 @@ int AliHLTPHOSRawAnalyzerComponent::DoEvent( const AliHLTComponentEventData& evt
 
       fRawMemoryReader->SetMemory( reinterpret_cast<UChar_t*>( iter->fPtr ), iter->fSize );
       analyzerPtr->SetData(fTmpChannelData);
-      outPtr =  (AliHLTPHOSRcuCellEnergyDataStruct*)outBPtr;
+      fOutPtr =  (AliHLTPHOSRcuCellEnergyDataStruct*)outBPtr;
       mysize += sizeof(AliHLTPHOSRcuCellEnergyDataStruct);
-      outPtr->fRcuX = fRcuX;
-      outPtr->fRcuZ = fRcuZ;
-      outPtr->fModuleID = fModuleID;
+      fOutPtr->fRcuX = fRcuX;
+      fOutPtr->fRcuZ = fRcuZ;
+      fOutPtr->fModuleID = fModuleID;
       tmpChannelCnt = 0;
  
+      if(fEventCount%100 ==0)
+       {
+         cout <<"Analyzing event: " << fEventCount << endl; 
+       }
+ 
       while(fPHOSRawStream->Next())
        {
          if (fPHOSRawStream->IsNewHWAddress())
            {
-             //              cout << "samplCount =" <<  sampleCnt <<endl; 
-             //              sampleCnt = 0;
-
-
              if(processedChannels > 0)
                {
                  analyzerPtr->SetData(fTmpChannelData);
-
-                 //              DumpChannelData(fTmpChannelData);
-
                  analyzerPtr->Evaluate(0, sampleCnt);
-                 outPtr->fCellEnergies[tmpRow][tmpCol][tmpGain] =  analyzerPtr->GetEnergy();
-
-
+                 fOutPtr->fCellEnergies[tmpRow][tmpCol][tmpGain] =  analyzerPtr->GetEnergy();
                  sampleCnt = 0;
-                 outPtr->fValidData[tmpChannelCnt].fGain = tmpGain;
-                 outPtr->fValidData[tmpChannelCnt].fRow  = tmpRow;
-                 outPtr->fValidData[tmpChannelCnt].fCol  = tmpCol; 
+                 fOutPtr->fValidData[tmpChannelCnt].fGain = tmpGain;
+                 fOutPtr->fValidData[tmpChannelCnt].fRow  = tmpRow;
+                 fOutPtr->fValidData[tmpChannelCnt].fCol  = tmpCol; 
                  tmpChannelCnt ++;
                  ResetDataPtr();
                  sampleCnt = 0;
@@ -196,10 +191,8 @@ int AliHLTPHOSRawAnalyzerComponent::DoEvent( const AliHLTComponentEventData& evt
          sampleCnt ++;
 
        }
-      
-
-
-      outPtr->fCnt =  tmpChannelCnt;
+   
+      fOutPtr->fCnt =  tmpChannelCnt;
       AliHLTComponentBlockData bd;
       FillBlockData( bd );
       bd.fOffset = offset;
@@ -217,10 +210,6 @@ int AliHLTPHOSRawAnalyzerComponent::DoEvent( const AliHLTComponentEventData& evt
                   , tSize, size );
          return EMSGSIZE;
        }
-
-      //      DumpData();
-
-      
     }
 
   fEventCount++; 

diff --git a/HLT/PHOS/AliHLTPHOSRawAnalyzerComponent.h b/HLT/PHOS/AliHLTPHOSRawAnalyzerComponent.h
index 0d3012bedf4842700840b7f92a15926bdb29028c..274e5e9fcf445f97ef9e4868648949a1072d9418 100644 (file)
--- a/HLT/PHOS/AliHLTPHOSRawAnalyzerComponent.h
+++ b/HLT/PHOS/AliHLTPHOSRawAnalyzerComponent.h
@@ -57,7 +57,7 @@ class AliHLTPHOSRawAnalyzerComponent: public AliHLTProcessor
   Double_t fMaxValues[5][64][56][2];
   AliCaloRawStream *fPHOSRawStream;
   AliRawReaderMemory *fRawMemoryReader;
-  AliHLTPHOSRcuCellEnergyDataStruct* outPtr;
+  AliHLTPHOSRcuCellEnergyDataStruct* fOutPtr;
   static const AliHLTComponentDataType inputDataTypes[];
 };
 #endif