Naming conventions and removal of obsolete files

diff --git a/HLT/PHOS/AliHLTPHOSCellCompressedRawData.cxx b/HLT/PHOS/AliHLTPHOSCellCompressedRawData.cxx
deleted file mode 100644 (file)
index 6cacf19..0000000
--- a/HLT/PHOS/AliHLTPHOSCellCompressedRawData.cxx
+++ /dev/null
@@ -1,29 +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 "AliHLTPHOSCellCompressedRawData.h"
-
-AliHLTPHOSCellCompressedRawData::AliHLTPHOSCellCompressedRawData()
-{
-
-}
-
-AliHLTPHOSCellCompressedRawData::~AliHLTPHOSCellCompressedRawData()
-{
-
-}
-

diff --git a/HLT/PHOS/AliHLTPHOSCellCompressedRawData.h b/HLT/PHOS/AliHLTPHOSCellCompressedRawDataStruct.h
similarity index 96%
rename from HLT/PHOS/AliHLTPHOSCellCompressedRawData.h
rename to HLT/PHOS/AliHLTPHOSCellCompressedRawDataStruct.h
index f9cb239ec6c6945dbb49bd689c18d902b42fe334..98d23834cddafe824f32881ac5e1c245bd85b0d0 100644 (file)
--- a/HLT/PHOS/AliHLTPHOSCellCompressedRawData.h
+++ b/HLT/PHOS/AliHLTPHOSCellCompressedRawDataStruct.h
@@ -25,7 +25,6 @@ struct  AliHLTPHOSCellCompressedRawData
   virtual ~AliHLTPHOSCellCompressedRawData();
   
   AliHLTUInt16_t fSize;                    // Total size of data from this channel
-  AliHLTUInt16_t fGeoAddress;              // Geometrical global address
   AliHLTUInt16_t fDataQuality;             // Quality
   AliHLTUInt8_t  fAlgorithm;               // The algorithm used to calculate energy and TOF
   AliHLTUInt8_t  fIsAttachedRawData;       // wether or not to attach the raw data

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

diff --git a/HLT/PHOS/AliHLTPHOSRcuTreeMaker.h b/HLT/PHOS/AliHLTPHOSRcuTreeMaker.h
deleted file mode 100644 (file)
index fa76e72..0000000
--- a/HLT/PHOS/AliHLTPHOSRcuTreeMaker.h
+++ /dev/null
@@ -1,56 +0,0 @@
- 
- /**************************************************************************
- * This file is property of and copyright by the ALICE HLT Project        * 
- * All rights reserved.                                                   *
- *                                                                        *
- * Primary Authors: Oystein Djuvsland                                     *
- *                                                                        *
- * 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.                  *
- **************************************************************************/
-
-
-#ifndef ALIHLTPHOSRCUTREEMAKER_H
-#define ALIHLTPHOSRCUTREEMAKER_H
-
-#include "AliHLTPHOSBase.h"
-#include "TTree.h"
-class AliHLTPHOSRcuDigitContainerDataStruct;
-
-class TClonesArray;
-//class TTree;
-
-
-
-class AliHLTPHOSRcuTreeMaker : public AliHLTPHOSBase
-{
-public:
-
-  AliHLTPHOSRcuTreeMaker();
-  ~AliHLTPHOSRcuTreeMaker();
-
-  Int_t MakeDigitArray(AliHLTPHOSRcuDigitContainerDataStruct* digitContainer, Int_t nDigits);
-  void FUCK();
-  void FillDigitTree();
-  
-  void ResetDigitTree() { fDigitTreePtr->Reset(); }
-  
-  void SetDigitTree(TTree* tree);
-  
-  TTree* GetDigitTree() { return fDigitTreePtr; }
-  
-private:
-  TClonesArray *fDigitArrayPtr;
-  TTree* fDigitTreePtr;
- 
-  ClassDef(AliHLTPHOSRcuTreeMaker, 1);
-
-};
-
-
-#endif

diff --git a/HLT/PHOS/AliHLTPHOSRcuTreeMakerComponent.cxx b/HLT/PHOS/AliHLTPHOSRcuTreeMakerComponent.cxx
deleted file mode 100644 (file)
index abda344..0000000
--- a/HLT/PHOS/AliHLTPHOSRcuTreeMakerComponent.cxx
+++ /dev/null
@@ -1,293 +0,0 @@
-/**************************************************************************
- * This file is property of and copyright by the ALICE HLT Project        * 
- * All rights reserved.                                                   *
- *                                                                        *
- * Primary Authors: Oystein Djuvsland                                     *
- *                                                                        *
- * 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 "AliHLTPHOSRcuTreeMakerComponent.h"
-
-#include "AliHLTPHOSRcuDigitContainerDataStruct.h"
-
-#include "AliHLTPHOSRcuTreeMaker.h"
-#include "AliHLTPHOSRcuProcessor.h"
-#include "AliHLTPHOSDigitDataStruct.h"
-#include "TTree.h"
-#include "TClonesArray.h"
-#include "TObject.h"
-#include <fstream>
-#include "TFile.h"
-#include <sys/stat.h>
-#include <sys/types.h>
-
-const AliHLTComponentDataType AliHLTPHOSRcuTreeMakerComponent::fgkInputDataTypes[]={kAliHLTVoidDataType,{0,"",""}};
-
-AliHLTPHOSRcuTreeMakerComponent gAliHLTPHOSRcuTreeMakerComponent;
-
-AliHLTPHOSRcuTreeMakerComponent::AliHLTPHOSRcuTreeMakerComponent() :
-  AliHLTPHOSRcuProcessor(),
-  fDigitTreePtr(0),
-  fTreeMakerPtr(0), 
-  //  fEventCount(0),
-  fWriteInterval(1000)
-{
-  //comment
-}
-
-AliHLTPHOSRcuTreeMakerComponent::~AliHLTPHOSRcuTreeMakerComponent()
-{
-  //comment
-}
-
-int 
-AliHLTPHOSRcuTreeMakerComponent::Deinit()
-{
-  //comment
-  //  cout << "Printing file...";
-
-  /*
-  char filename [50];
-  sprintf(filename, "%s/run%d_digitTree_rcuX_%d_rcuZ_%d_%d.root", fDirectory, fRunNb,(fEventCount/fWriteInterval));
-  TFile *outfile = new TFile(filename,"recreate");
-  fDigitTreePtr->Write();
-  delete outfile;
-  outfile = 0;
-  cout << "Done!\n";
-  */
-  
-  Write();
-
-
-  if(fDigitTreePtr) 
-    {
-      delete fDigitTreePtr;
-      fDigitTreePtr = 0;
-    }
-  return 0;
-}
-
-
-
-const char*
-AliHLTPHOSRcuTreeMakerComponent::GetComponentID()
-{
-  //comment
-  return "PhosRcuTreeMaker";
-}
-
-void
-AliHLTPHOSRcuTreeMakerComponent::GetInputDataTypes(vector<AliHLTComponentDataType>& list)
-{ 
-  //comment
- //Get datatypes for input
-  const AliHLTComponentDataType* pType=fgkInputDataTypes;
-  while (pType->fID!=0) {
-    list.push_back(*pType); 
-    pType++;
-  }
-}
-
-AliHLTComponentDataType 
-AliHLTPHOSRcuTreeMakerComponent::GetOutputDataType()
-{
-  //comment
-  return AliHLTPHOSDefinitions::fgkAliHLTRootTreeDataType;
-}
-
-void 
-AliHLTPHOSRcuTreeMakerComponent::GetOutputDataSize(unsigned long& constBase, double& inputMultiplier)
-{
-  //comment
-  constBase = 30;
-  inputMultiplier = 1;
-}
-
-int 
-AliHLTPHOSRcuTreeMakerComponent::DoEvent(const AliHLTComponentEventData& evtData, const AliHLTComponentBlockData* blocks,
-                                       AliHLTComponentTriggerData& /*trigData*/, AliHLTUInt8_t* /*outputPtr*/, AliHLTUInt32_t& /*size*/,  //TODO: I think size should be set to zero when returning from this method if not data was written to the output buffer.
-                                       std::vector<AliHLTComponentBlockData>& /*outputBlocks*/)
-
-{
-
-  cout << "AliHLTPHOSRcuTreeMakerComponent::DoEvent TP0 " << endl;
-  //Do event
-
-  Bool_t digitEvent;
-  Int_t nDigits = 0;
-  Int_t totalDigits = 0;
-
-  const AliHLTComponentBlockData* iter = 0;
-  unsigned long ndx;
- cout << "AliHLTPHOSRcuTreeMakerComponent::DoEvent TP0.1 " << endl;
-  for ( ndx = 0; ndx < evtData.fBlockCnt; ndx++ )
-    {
-      iter = blocks + ndx;
-      cout << "AliHLTPHOSRcuTreeMakerComponent::DoEvent TP0.2 " << endl;
-      if ( iter->fDataType == AliHLTPHOSDefinitions::fgkAliHLTDigitDataType )
-
-        {
-          cout << "AliHLTPHOSRcuTreeMakerComponent::DoEvent TP0.2 " << endl;
-          digitEvent = true;
-          cout << "AliHLTPHOSRcuTreeMakerComponent::DoEvent TP0.3 " << endl;
-
-          //      fTreeMakerPtr = new AliHLTPHOSRcuTreeMaker();
-
-          if( iter->fPtr == 0)
-            {
-              cout << "AliHLTPHOSRcuTreeMakerComponent::DoEvent TP0.3.1 " << endl;
-              cout << "ERROR" << endl;
-              cout << "AliHLTPHOSRcuTreeMakerComponent::DoEvent TP0.3.2 " << endl;
-            }
-          else
-            {
-             cout << "AliHLTPHOSRcuTreeMakerComponent::DoEvent TP0.3.3 " << endl;
-             
-             //              fTreeMakerPtr = new AliHLTPHOSRcuTreeMaker();
-             
-             if(fTreeMakerPtr == 0 )
-               {
-                 //      cout << "FUCK" << endl;
-               }  
-             else
-               {
-                 cout << "AliHLTPHOSRcuTreeMakerComponent::DoEvent TP0.3.4, -1 " << endl;
-                 //          nDigits  = fTreeMakerPtr->MakeDigitArray ( reinterpret_cast<AliHLTPHOSRcuDigitContainerDataStruct*> ( iter->fPtr ), totalDigits );
-                 //
-
-                 nDigits  = fTreeMakerPtr->MakeDigitArray ( reinterpret_cast<AliHLTPHOSRcuDigitContainerDataStruct*> ( iter->fPtr ), totalDigits );
-
-                 //      AliHLTPHOSRcuDigitContainerDataStruct *tmp = new  AliHLTPHOSRcuDigitContainerDataStruct();
-                 
-                 //      nDigits  = fTreeMakerPtr->MakeDigitArray(tmp, totalDigits );
-
-                 //  nDigits  = fTreeMakerPtr->MakeDigitArray ( (AliHLTPHOSRcuDigitContainerDataStruct*) ( iter->fPtr ), totalDigits );
-
-                 fTreeMakerPtr->FUCK();
-                 cout << "AliHLTPHOSRcuTreeMakerComponent::DoEvent TP0.3.4 " << endl;
-            
-               }
-            }
-
-          cout << "AliHLTPHOSRcuTreeMakerComponent::DoEvent TP0.4 " << endl;
-          totalDigits += nDigits;
-          //cout << totalDigits << endl;
-          cout << "AliHLTPHOSRcuTreeMakerComponent::DoEvent TP0.5 " << endl;
-          continue;
-        }
-     
-      if ( iter->fDataType == AliHLTPHOSDefinitions::fgkAliHLTClusterDataType )
-        {
-         cout << "AliHLTPHOSRcuTreeMakerComponent::DoEvent TP0.6 " << endl;
-       //
-        }
-    }
-
-  //  fEventCount++;
-  cout << "AliHLTPHOSRcuTreeMakerComponent::DoEvent TP1 " << endl;
-  fPhosEventCount++;
-
-  fTreeMakerPtr->FillDigitTree();
-  cout << "AliHLTPHOSRcuTreeMakerComponent::DoEvent TP2 " << endl;  
-  //  if(fEventCount%fWriteInterval == 0)
-  if(fPhosEventCount%fWriteInterval == 0)
-    {
-      cout << "AliHLTPHOSRcuTreeMakerComponent::DoEvent TP3 " << endl;
-      Write();
-      cout << "AliHLTPHOSRcuTreeMakerComponent::DoEvent TP4 " << endl;
-      ResetTrees();
-      cout << "AliHLTPHOSRcuTreeMakerComponent::DoEvent TP5 " << endl;
-    }
-  cout << "AliHLTPHOSRcuTreeMakerComponent::DoEvent TP6 " << endl;
-return 0;
-
-}
-
-int
-AliHLTPHOSRcuTreeMakerComponent::DoInit ( int argc, const char** argv )
-{
-  //comment
-  fTreeMakerPtr = new AliHLTPHOSRcuTreeMaker();
-  fDigitTreePtr = new TTree ( "digitTree", "Digits tree" );
-  fDirectory = new char[50];
-
-  for ( int i = 0; i < argc; i++ )
-    {
-      if ( !strcmp ( "-path", argv[i] ) )
-        {
-          strcpy ( fDirectory, argv[i+1] );
-        }
-      if ( !strcmp ( "-writeinterval", argv[i] ) )
-       {
-         fWriteInterval = atoi(argv[i+1]);
-       }
-    }
-
-  fTreeMakerPtr->SetDigitTree(fDigitTreePtr);
-    
-  //  fstream runNbFile;
-  //Int_t newRunNb;
-  //  runNbFile.open("/opt/HLT-public/rundir/runNumber.txt");
-  //  runNbFile >> fRunNb;
-  //  runNbFile.close();
-  /*  newRunNb = fRunNb + 1;
-  runNbFile.open("/opt/HLT-public/rundir/runNumber.txt");
-  runNbFile << newRunNb;
-  runNbFile.close();*/
-  
-  cout << endl << "Run number is: " << fRunNumber  << "  -- Check that this is correct!!!\n" << endl;
-
-  return 0;
-  
-}
-
-
-AliHLTComponent*
-AliHLTPHOSRcuTreeMakerComponent::Spawn()
-{
-  //comment
-  return new AliHLTPHOSRcuTreeMakerComponent();
-}
-
-void
-AliHLTPHOSRcuTreeMakerComponent::Write()
-{
-  //comment
-  cout << "Writing file...";
-
-  char filename [256];
-  //  sprintf(filename, "%s/run%d_%d_digitTree_mod%d_rcuX%d_rcuZ%d_.root", fDirectory, fRunNb,(fEventCount/fWriteInterval - 1), fModuleID, fRcuX, fRcuZ);
-  sprintf(filename, "%s/run%d_%d_digitTree_mod%d_rcuX%d_rcuZ%d_.root", fDirectory, fRunNumber,(fPhosEventCount/fWriteInterval - 1), fModuleID, fRcuX, fRcuZ);
-  TFile *outfile = new TFile(filename,"recreate");
-  fDigitTreePtr->Write();
-  delete outfile;
-  outfile = 0;
-  cout << "Done!\n";
-
-}
-
-void
-AliHLTPHOSRcuTreeMakerComponent::ResetTrees()
-{
-  //comment
-  delete fDigitTreePtr;
-  fDigitTreePtr = new TTree("digitTree", "Digits tree");
-  fTreeMakerPtr->SetDigitTree(fDigitTreePtr);
-}
-  
-
-  
-  
-  
-
-
-

diff --git a/HLT/PHOS/AliHLTPHOSRcuTreeMakerComponent.h b/HLT/PHOS/AliHLTPHOSRcuTreeMakerComponent.h
deleted file mode 100644 (file)
index 639ef55..0000000
--- a/HLT/PHOS/AliHLTPHOSRcuTreeMakerComponent.h
+++ /dev/null
@@ -1,79 +0,0 @@
-
- /**************************************************************************
- * This file is property of and copyright by the ALICE HLT Project        * 
- * All rights reserved.                                                   *
- *                                                                        *
- * Primary Authors: Oystein Djuvsland                                     *
- *                                                                        *
- * 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.                  *
- **************************************************************************/
-
-
-
-#ifndef ALIHLTPHOSRCUTREEMAKERCOMPONENT_H
-#define ALIHLTPHOSRCUTREEMAKERCOMPONENT_H
-
-# include "AliHLTPHOSRcuProcessor.h"
-
-class AliHLTPHOSRcuTreeMaker;
-class TTree;
-
-class AliHLTPHOSRcuTreeMakerComponent : public AliHLTPHOSRcuProcessor
-{
- public:
-  
-  AliHLTPHOSRcuTreeMakerComponent();
-  virtual ~AliHLTPHOSRcuTreeMakerComponent();
-    
-  const char* GetComponentID();
-  
-  void  GetInputDataTypes(std::vector<AliHLTComponentDataType>& list);
-  
-  AliHLTComponentDataType GetOutputDataType();
-  
-  void GetOutputDataSize(unsigned long& constBase, double& inputmultiplier);
-/*
-  int DoEvent(const AliHLTComponentEventData&,
-             AliHLTComponentTriggerData&);
-  */
-  
-  int DoEvent(const AliHLTComponentEventData& evtData, const AliHLTComponentBlockData* blocks,
-             AliHLTComponentTriggerData& trigData, AliHLTUInt8_t* outputPtr, AliHLTUInt32_t& size,
-       std::vector<AliHLTComponentBlockData>& outputBlocks);
-  
-  AliHLTComponent* Spawn();
-
-
-  void FUCK();
-  void Write(); 
-  void ResetTrees();
-   
- protected:
-
-  using AliHLTPHOSRcuProcessor::DoEvent;
-
-  int DoInit(int argc, const char** argv);
-
-  virtual int Deinit(); ////////// PTH WARNING you should Define a class AliHLTPHOSModuleProcessor
-  
- private:  
-  AliHLTPHOSRcuTreeMaker *fTreeMakerPtr;  //comment
-  TTree *fDigitTreePtr; //comment
-
-
-  //  UInt_t fEventCount; //comment
-  UInt_t fWriteInterval; //comment
-  //  UInt_t fRunNb; //comment
-  char *fDirectory; //comment
- 
-  static const AliHLTComponentDataType fgkInputDataTypes[];     //HLT input data type
-  
-};
-#endif
-