From 4f4b7ba49cd92136f8c935f5c3c7b21ca6b4b86a Mon Sep 17 00:00:00 2001 From: slindal Date: Fri, 15 Jan 2010 15:27:02 +0000 Subject: [PATCH] Reimplemented the AliHLTCaloConstants class Made necessary changes in EMCAL and PHOS to facilitate change. PHOS is still reliant on old constant namespace, now defined in AliHLTPHOSConstant.h --- HLT/CALO/AliHLTCaloChannelDataStruct.h | 7 - HLT/CALO/AliHLTCaloClusterizer.cxx | 18 +- HLT/CALO/AliHLTCaloClusterizer.h | 10 +- HLT/CALO/AliHLTCaloConstants.cxx | 48 +---- HLT/CALO/AliHLTCaloConstants.h | 151 ++++++------- HLT/CALO/AliHLTCaloConstantsHandler.cxx | 10 +- HLT/CALO/AliHLTCaloConstantsHandler.h | 18 +- HLT/CALO/AliHLTCaloDecoderWrapper.cxx | 2 + HLT/CALO/AliHLTCaloDecoderWrapper.h | 2 + HLT/CALO/AliHLTCaloDigitMaker.cxx | 22 +- HLT/CALO/AliHLTCaloDigitMaker.h | 6 +- HLT/CALO/AliHLTCaloFourier.cxx | 2 + HLT/CALO/AliHLTCaloFourier.h | 5 +- HLT/CALO/AliHLTCaloMapper.cxx | 9 +- HLT/CALO/AliHLTCaloMapper.h | 13 +- HLT/CALO/AliHLTCaloRawAnalyzerChiSquareFit.h | 2 +- HLT/CALO/AliHLTCaloRawAnalyzerComponentv3.cxx | 13 +- HLT/CALO/AliHLTCaloRawAnalyzerComponentv3.h | 16 +- HLT/CALO/AliHLTCaloRawAnalyzerCrude.cxx | 1 + HLT/CALO/AliHLTCaloRawAnalyzerCrude.h | 5 + .../AliHLTCaloRawAnalyzerCrudeComponent.cxx | 2 +- .../AliHLTCaloRawAnalyzerCrudeComponent.h | 2 + HLT/CALO/AliHLTCaloRawAnalyzerPeakFinder.cxx | 5 +- HLT/CALO/AliHLTCaloRawAnalyzerPeakFinder.h | 6 +- ...iHLTCaloRawAnalyzerPeakFinderComponent.cxx | 6 +- ...AliHLTCaloRawAnalyzerPeakFinderComponent.h | 2 + HLT/CALO/AliHLTCaloRcuProcessor.cxx | 3 + HLT/CALO/AliHLTCaloRcuProcessor.h | 1 + HLT/CALO/AliHLTCaloSanityInspector.cxx | 2 +- HLT/CALO/AliHLTCaloSanityInspector.h | 2 +- .../AliHLTCaloSharedMemoryInterfacev2.cxx | 23 +- HLT/CALO/AliHLTCaloSharedMemoryInterfacev2.h | 9 +- HLT/EMCAL/AliHLTEMCALConstant.h | 57 +++++ HLT/EMCAL/AliHLTEMCALConstants.cxx | 80 +++++++ HLT/EMCAL/AliHLTEMCALConstants.h | 152 ++++++++++--- HLT/EMCAL/AliHLTEMCALMapper.cxx | 2 +- ...TEMCALRcuCellAccumulatedEnergyDataStruct.h | 2 +- .../AliHLTEMCALSharedMemoryInterface.cxx | 2 +- HLT/PHOS/AliHLTPHOSAgent.cxx | 2 +- HLT/PHOS/AliHLTPHOSCalibrationComponent.cxx | 2 +- HLT/PHOS/AliHLTPHOSChannelRawDataStruct.h | 2 +- HLT/PHOS/AliHLTPHOSConstant.h | 89 ++++++++ HLT/PHOS/AliHLTPHOSConstants.cxx | 82 +++++++ HLT/PHOS/AliHLTPHOSConstants.h | 202 +++++++++++------- HLT/PHOS/AliHLTPHOSDigitContainerDataStruct.h | 2 +- HLT/PHOS/AliHLTPHOSDigitMaker.cxx | 2 +- HLT/PHOS/AliHLTPHOSDigitMaker.h | 2 +- HLT/PHOS/AliHLTPHOSEmcCalibData.h | 2 +- HLT/PHOS/AliHLTPHOSFourier.h | 2 +- HLT/PHOS/AliHLTPHOSHistoProdCellEnergy.h | 2 +- HLT/PHOS/AliHLTPHOSHistoProdInvMass.h | 2 +- HLT/PHOS/AliHLTPHOSHistoProdMatchedTracks.h | 2 +- HLT/PHOS/AliHLTPHOSMapper.cxx | 2 +- HLT/PHOS/AliHLTPHOSPhysicsAnalyzer.h | 2 +- HLT/PHOS/AliHLTPHOSPhysicsHistogramProducer.h | 2 +- HLT/PHOS/AliHLTPHOSProcessor.h | 2 +- HLT/PHOS/AliHLTPHOSRawAnalyzerComponentv3.cxx | 4 + ...iHLTPHOSRawAnalyzerPeakFinderComponent.cxx | 2 + ...LTPHOSRcuCellAccumulatedEnergyDataStruct.h | 4 +- HLT/PHOS/AliHLTPHOSRcuDAComponent.cxx | 15 +- HLT/PHOS/AliHLTPHOSRcuDAComponent.h | 4 +- HLT/PHOS/AliHLTPHOSRcuFFTDataStruct.h | 2 +- .../AliHLTPHOSSharedMemoryInterfacev2.cxx | 2 +- HLT/libAliHLTCalo.pkg | 3 +- HLT/libAliHLTEMCAL.pkg | 8 +- HLT/libAliHLTPHOS.pkg | 9 +- 66 files changed, 789 insertions(+), 385 deletions(-) create mode 100644 HLT/EMCAL/AliHLTEMCALConstant.h create mode 100644 HLT/EMCAL/AliHLTEMCALConstants.cxx create mode 100644 HLT/PHOS/AliHLTPHOSConstant.h create mode 100644 HLT/PHOS/AliHLTPHOSConstants.cxx diff --git a/HLT/CALO/AliHLTCaloChannelDataStruct.h b/HLT/CALO/AliHLTCaloChannelDataStruct.h index 7c52f74a27c..0a50d5443e9 100644 --- a/HLT/CALO/AliHLTCaloChannelDataStruct.h +++ b/HLT/CALO/AliHLTCaloChannelDataStruct.h @@ -4,8 +4,6 @@ #ifndef ALIHLTCALOCHANNELDATASTRUCT_H #define ALIHLTCALOCHANNELDATASTRUCT_H - - /************************************************************************** * Copyright(c) 2007, ALICE Experiment at CERN, All rights reserved. * * * @@ -20,14 +18,9 @@ * about the suitability of this software for any purpose. It is * * provided "as is" without express or implied warranty. * **************************************************************************/ -//#include "AliHLTPHOSCommonDefs.h" - #include "Rtypes.h" -//#include "AliHLTPHOSConstants.h" -//using namespace PhosHLTConst; - struct AliHLTCaloChannelDataStruct { Float_t fEnergy; diff --git a/HLT/CALO/AliHLTCaloClusterizer.cxx b/HLT/CALO/AliHLTCaloClusterizer.cxx index d9119649506..01c5e583da2 100644 --- a/HLT/CALO/AliHLTCaloClusterizer.cxx +++ b/HLT/CALO/AliHLTCaloClusterizer.cxx @@ -29,7 +29,6 @@ // visit http://web.ift.uib.no/~kjeks/doc/alice-hlt #include "AliHLTCaloClusterizer.h" -//#include "AliHLTCaloBase.h" #include "AliHLTLogging.h" #include "TMath.h" #include "AliHLTCaloRecPointContainerStruct.h" @@ -37,22 +36,21 @@ #include "AliHLTCaloDigitDataStruct.h" #include "AliHLTCaloDigitContainerDataStruct.h" #include "TClonesArray.h" -#include "AliHLTCaloConstants.h" - - +#include "AliHLTCaloConstantsHandler.h" //#ifndef HAVENOT__PHOSRECOPARAMEMC // set from configure if EMC functionality not available in AliPHOSRecoParam //#include "AliPHOSRecoParam.h" //#else //#include "AliPHOSRecoParamEmc.h" //ff#endif #include +using namespace std; -using namespace std; ClassImp(AliHLTCaloClusterizer); AliHLTCaloClusterizer::AliHLTCaloClusterizer(TString det): + AliHLTCaloConstantsHandler(det), fRecPointDataPtr(0), fDigitDataPtr(0), fEmcClusteringThreshold(0), @@ -60,8 +58,7 @@ AliHLTCaloClusterizer::AliHLTCaloClusterizer(TString det): fEmcTimeGate(0), fDigitsInCluster(0), fDigitContainerPtr(0), - fMaxDigitIndexDiff(0), - fCaloConstants(NULL) + fMaxDigitIndexDiff(0) { //See header file for documentation fEmcClusteringThreshold = 0.2; @@ -70,10 +67,12 @@ AliHLTCaloClusterizer::AliHLTCaloClusterizer(TString det): fMaxDigitIndexDiff = 2*fCaloConstants->GetNZROWSMOD(); - fCaloConstants = new AliHLTCaloConstants(det); }//end + +//BALLE how do you set the right detector? AliHLTCaloClusterizer::AliHLTCaloClusterizer(const AliHLTCaloClusterizer &) : + AliHLTCaloConstantsHandler("BALLE"), fRecPointDataPtr(0), fDigitDataPtr(0), fEmcClusteringThreshold(0), @@ -81,8 +80,7 @@ AliHLTCaloClusterizer::AliHLTCaloClusterizer(const AliHLTCaloClusterizer &) : fEmcTimeGate(0), fDigitsInCluster(0), fDigitContainerPtr(0), - fMaxDigitIndexDiff(0), - fCaloConstants(NULL) + fMaxDigitIndexDiff(0) { // dummy copy constructor }//end diff --git a/HLT/CALO/AliHLTCaloClusterizer.h b/HLT/CALO/AliHLTCaloClusterizer.h index 0ca5d8feb47..eab1cb10046 100644 --- a/HLT/CALO/AliHLTCaloClusterizer.h +++ b/HLT/CALO/AliHLTCaloClusterizer.h @@ -43,7 +43,7 @@ #include "AliHLTCaloDigitContainerDataStruct.h" #include "AliHLTCaloDigitDataStruct.h" #include "TString.h" -#include "AliHLTCaloConstants.h" +#include "AliHLTCaloConstantsHandler.h" //#include "AliPHOSGeometry.h" @@ -60,11 +60,9 @@ class TClonesArray; * * @ingroup alihlt_calo */ -//class AliHLTCaloClusterizer : public AliHLTCaloBase - -class AliHLTCaloClusterizer +class AliHLTCaloClusterizer : public AliHLTCaloConstantsHandler { public: @@ -163,9 +161,6 @@ protected: /** Maximum difference in index to be a neighbour */ Int_t fMaxDigitIndexDiff; //COMMENT - /** Instance of calorimeter constants */ - AliHLTCaloConstants* fCaloConstants; - private: AliHLTCaloClusterizer(); @@ -176,7 +171,6 @@ private: // return *this; // } - ClassDef(AliHLTCaloClusterizer, 0); diff --git a/HLT/CALO/AliHLTCaloConstants.cxx b/HLT/CALO/AliHLTCaloConstants.cxx index cb9964bf2de..9b23bf6c048 100644 --- a/HLT/CALO/AliHLTCaloConstants.cxx +++ b/HLT/CALO/AliHLTCaloConstants.cxx @@ -21,52 +21,12 @@ /// @date 2009-11-12 /// @brief Class containing constants for EMCAL and PHOS /// loaded libraries + #include "AliHLTCaloConstants.h" -#include "TString.h" -AliHLTCaloConstants::AliHLTCaloConstants(TString det) : - fkMAXHOSTS(20), - fkDEFAULTEVENTPORT(42001), - fkMAXBINVALUE(1023), - fkHIGHGAIN(0), - fkLOWGAIN(1), - fkALTROMAXSAMPLES(1008), - fkALTROMAXPRESAMPLES(15), - fkNZROWSRCU(56), - fkNXCOLUMNSRCU(16), - fkNZROWSMOD((det == "EMCAL") ? 48 : 56), - fkNXCOLUMNSMOD((det == "EMCAL") ? 24 : 64 ), - fkNGAINS(2), - fkNDATATYPES(10), - fkPFMAXPATHLENGTH(256), - fkPFDEFAULTNSAMPLES(70), - fkPFDEFAULTSTARTINDEX(0), - fkDEFAULTTAU((det == "EMCAL") ? 0.2 : 2), - fkDEFAULTFS(10), - fkMODULE0(0), - fkMODULE1(1), - fkMODULE2(2), - fkMODULE3(3), - fkMODULE4(4), - fkCSPSPERFEE(32), - fkRCU0(0), - fkRCU1(1), - fkRCU2(2), - fkRCU3(3), - fkZ0(0), - fkZ1(1), - fkX0(0), - fkX1(1), - fkNMODULES((det == "EMCAL") ? 13 : 5), - fkNRCUS(4), - fkNRCUSPERMODULE((det == "EMCAL") ? 2 : 4 ), - fkNRCUSPERTOTAL(fkNMODULES*fkNRCUSPERMODULE), - fkNFEECS((det == "EMCAL") ? 9 : 14), - fkNALTROS(4), - fkNALTROCHANNELS(16), - fkNBRANCHES(2), - fkCELLSTEP((det == "EMCAL") ? -9999999.9 : 2.2 ), ///XXX right value? - fkNRCUSPERSECTOR(4) +ClassImp(AliHLTCaloConstants); + +AliHLTCaloConstants::AliHLTCaloConstants() { //Default constructor } diff --git a/HLT/CALO/AliHLTCaloConstants.h b/HLT/CALO/AliHLTCaloConstants.h index f803591507d..8ad330d4261 100644 --- a/HLT/CALO/AliHLTCaloConstants.h +++ b/HLT/CALO/AliHLTCaloConstants.h @@ -12,109 +12,78 @@ /// loaded libraries #include "Rtypes.h" +#include "TString.h" #ifndef ALIHLTCALOCONSTANTS_H #define ALIHLTCALOCONSTANTS_H -class TString; + class AliHLTCaloConstants { + public: - - AliHLTCaloConstants(TString det); + + AliHLTCaloConstants(); virtual ~AliHLTCaloConstants(); - Int_t GetMAXHOSTS() const {return fkMAXHOSTS; } - Int_t GetDEFAULTEVENTPORT() const { return fkDEFAULTEVENTPORT; } - Int_t GetMAXBINVALUE() const { return fkMAXBINVALUE; } - Int_t GetHIGHGAIN() const { return fkHIGHGAIN; } - Int_t GetLOWGAIN() const { return fkLOWGAIN; } - Int_t GetALTROMAXSAMPLES() const { return fkALTROMAXSAMPLES; } - Int_t GetALTROMAXPRESAMPLES() const { return fkALTROMAXPRESAMPLES; } - Int_t GetNZROWSRCU() const { return fkNZROWSRCU; } - Int_t GetNXCOLUMNSRCU() const { return fkNXCOLUMNSRCU; } - Int_t GetNZROWSMOD() const { return fkNZROWSMOD; } - Int_t GetNXCOLUMNSMOD() const { return fkNXCOLUMNSMOD; } - Int_t GetNGAINS() const{ return fkNGAINS; } - Int_t GetNDATATYPES() const { return fkNDATATYPES; } - Int_t GetPFMAXPATHLENGTH() const { return fkPFMAXPATHLENGTH; } - Int_t GetPFDEFAULTNSAMPLES() const { return fkPFDEFAULTNSAMPLES; } - Int_t GetPFDEFAULTSTARTINDEX() const { return fkPFDEFAULTSTARTINDEX; } - Double_t GetDEFAULTTAU() const { return fkDEFAULTTAU; } - Int_t GetDEFAULTFS() const { return fkDEFAULTFS; } - Int_t GetMODULE0() const { return fkMODULE0; } - Int_t GetMODULE1() const { return fkMODULE1; } - Int_t GetMODULE2() const { return fkMODULE2; } - Int_t GetMODULE3() const { return fkMODULE3; } - Int_t GetMODULE4() const { return fkMODULE4; } - Int_t GetCSPSPERFEE() const { return fkCSPSPERFEE; } - Int_t GetRCU0() const { return fkRCU0; } - Int_t GetRCU1() const { return fkRCU1; } - Int_t GetRCU2() const { return fkRCU2; } - Int_t GetRCU3() const { return fkRCU3; } - Int_t GetZ0() const { return fkZ0; } - Int_t GetZ1() const { return fkZ1; } - Int_t GetX0() const { return fkX0; } - Int_t GetX1() const { return fkX1; } - Int_t GetNMODULES() const { return fkNMODULES; } - Int_t GetNRCUS() const { return fkNRCUS; } - Int_t GetNRCUSPERMODULE() const { return fkNRCUSPERMODULE; } - Int_t GetNRCUSPERTOTAL() const { return fkNRCUSPERTOTAL; } - Int_t GetNFEECS() const { return fkNFEECS; } - Int_t GetNALTROS() const { return fkNALTROS; } - Int_t GetNALTROCHANNELS() const { return fkNALTROCHANNELS; } - Int_t GetNBRANCHES() const { return fkNBRANCHES; } - Float_t GetCELLSTEP() const {return fkCELLSTEP; } - Int_t GetNRCUSPERSECTOR() const {return fkNRCUSPERSECTOR; } - + virtual Int_t GetMAXHOSTS() const = 0; + virtual Int_t GetDEFAULTEVENTPORT() const = 0; + virtual Int_t GetMAXBINVALUE() const = 0; + virtual Int_t GetHIGHGAIN() const = 0; + virtual Int_t GetLOWGAIN() const = 0; + + virtual Int_t GetALTROMAXSAMPLES() const = 0; + virtual Int_t GetALTROMAXPRESAMPLES() const = 0; + + virtual Int_t GetNZROWSRCU() const = 0; + virtual Int_t GetNXCOLUMNSRCU() const = 0; + virtual Int_t GetNZROWSMOD() const = 0; + virtual Int_t GetNXCOLUMNSMOD() const = 0; + virtual Int_t GetNGAINS() const = 0; + virtual Int_t GetNDATATYPES() const = 0; + + virtual Int_t GetPFMAXPATHLENGTH() const = 0; + + virtual Int_t GetPFDEFAULTNSAMPLES() const = 0; + virtual Int_t GetPFDEFAULTSTARTINDEX() const = 0; + + virtual Double_t GetDEFAULTTAU() const = 0; + virtual Int_t GetDEFAULTFS() const = 0; + + virtual Int_t GetMODULE0() const = 0; + virtual Int_t GetMODULE1() const = 0; + virtual Int_t GetMODULE2() const = 0; + virtual Int_t GetMODULE3() const = 0; + virtual Int_t GetMODULE4() const = 0; + + virtual Int_t GetCSPSPERFEE() const = 0; + virtual Int_t GetRCU0() const = 0; + virtual Int_t GetRCU1() const = 0; + virtual Int_t GetRCU2() const = 0; + virtual Int_t GetRCU3() const = 0; + + virtual Int_t GetZ0() const = 0; + virtual Int_t GetZ1() const = 0; + virtual Int_t GetX0() const = 0; + virtual Int_t GetX1() const = 0; + + virtual Int_t GetNMODULES() const = 0; + virtual Int_t GetNRCUS() const = 0; + + virtual Int_t GetNRCUSPERMODULE() const = 0; + virtual Int_t GetNRCUSPERTOTAL() const = 0; + virtual Int_t GetNFEECS() const = 0; + virtual Int_t GetNALTROS() const = 0; + virtual Int_t GetNALTROCHANNELS() const = 0; + virtual Int_t GetNBRANCHES() const = 0; + + virtual Float_t GetCELLSTEP() const = 0; + virtual Int_t GetNRCUSPERSECTOR() const = 0; + private: - - AliHLTCaloConstants(); - - const Int_t fkMAXHOSTS; // soon to be obsolete - const Int_t fkDEFAULTEVENTPORT; // soon to be obsolete - const Int_t fkMAXBINVALUE; // 1023; - const Int_t fkHIGHGAIN; // 1; - const Int_t fkLOWGAIN; // 0; - const Int_t fkALTROMAXSAMPLES; // 1008; /** * +//* Primary Authors: Svein Lindal //* for The ALICE HLT Project. * //* * //* Permission to use, copy, modify and distribute this software and its * @@ -29,13 +29,15 @@ #include "AliHLTCaloConstants.h" #include "AliHLTMisc.h" +ClassImp(AliHLTCaloConstantsHandler); + AliHLTCaloConstantsHandler::AliHLTCaloConstantsHandler(TString det): - fCaloConstants(NULL) + fCaloConstants(NULL) { if (det.CompareTo("PHOS") == 0) { - fCaloConstants = AliHLTMisc::LoadInstance( (AliHLTCaloConstants*) NULL, "AliHLTPHOSConstants", "PHOS"); + fCaloConstants = AliHLTMisc::LoadInstance( (AliHLTCaloConstants*) NULL, "AliHLTPHOSConstants", "libAliHLTPHOS.so"); } else { - fCaloConstants = AliHLTMisc::LoadInstance( (AliHLTCaloConstants*) NULL, "AliHLTEMCALConstants", "EMCAL"); + fCaloConstants = AliHLTMisc::LoadInstance( (AliHLTCaloConstants*) NULL, "AliHLTEMCALConstants", "libAliHLTEMCAL.so"); } } diff --git a/HLT/CALO/AliHLTCaloConstantsHandler.h b/HLT/CALO/AliHLTCaloConstantsHandler.h index 2777e5c58aa..38874751df2 100644 --- a/HLT/CALO/AliHLTCaloConstantsHandler.h +++ b/HLT/CALO/AliHLTCaloConstantsHandler.h @@ -17,8 +17,8 @@ #ifndef ALIHLTCALOCONSTANTSHANDLER_H #define ALIHLTCALOCONSTANTSHANDLER_H -class AliHLTCaloConstants; -class TString; +#include "AliHLTCaloConstants.h" +#include "TString.h" class AliHLTCaloConstantsHandler { @@ -26,21 +26,23 @@ public: AliHLTCaloConstantsHandler(TString det); virtual ~AliHLTCaloConstantsHandler(); + protected: AliHLTCaloConstants* fCaloConstants; private: + + /** Keep the standard constructor private, since we must alway initialize by specific calorimeter**/ AliHLTCaloConstantsHandler(); - + /** Keep the copy constructor private since it should not be used */ AliHLTCaloConstantsHandler(const AliHLTCaloConstantsHandler & ); - + /** Keep the assignement operator private since it should not be used */ - AliHLTCaloConstantsHandler & operator = (const AliHLTCaloConstantsHandler &); - - - void Initialize(TString det); + AliHLTCaloConstantsHandler & operator = (const AliHLTCaloConstantsHandler &); + + ClassDef(AliHLTCaloConstantsHandler, 1); }; diff --git a/HLT/CALO/AliHLTCaloDecoderWrapper.cxx b/HLT/CALO/AliHLTCaloDecoderWrapper.cxx index e1248e727ec..f178a38f1ef 100644 --- a/HLT/CALO/AliHLTCaloDecoderWrapper.cxx +++ b/HLT/CALO/AliHLTCaloDecoderWrapper.cxx @@ -27,6 +27,8 @@ #include "AliHLTDataTypes.h" +ClassImp(AliHLTCaloDecoderWrapper); + AliHLTCaloDecoderWrapper::AliHLTCaloDecoderWrapper() : fAltroRawStream(0), // fCaloRawStream(0), fReaderMemory(0) diff --git a/HLT/CALO/AliHLTCaloDecoderWrapper.h b/HLT/CALO/AliHLTCaloDecoderWrapper.h index 62d7d0d6f3e..d78da4d3be7 100644 --- a/HLT/CALO/AliHLTCaloDecoderWrapper.h +++ b/HLT/CALO/AliHLTCaloDecoderWrapper.h @@ -52,6 +52,8 @@ class AliHLTCaloDecoderWrapper AliAltroRawStreamV3 *fAltroRawStream; // AliCaloRawStreamV3 *fCaloRawStream; AliRawReaderMemory *fReaderMemory; + + ClassDef(AliHLTCaloDecoderWrapper, 1); }; #endif diff --git a/HLT/CALO/AliHLTCaloDigitMaker.cxx b/HLT/CALO/AliHLTCaloDigitMaker.cxx index 773e94c17c1..558152d18ed 100644 --- a/HLT/CALO/AliHLTCaloDigitMaker.cxx +++ b/HLT/CALO/AliHLTCaloDigitMaker.cxx @@ -31,10 +31,8 @@ // visit http://web.ift.uib.no/~kjeks/doc/alice-hlt #include "AliHLTCaloDigitMaker.h" - -#include "AliHLTCaloConstants.h" +#include "AliHLTCaloConstantsHandler.h" #include "AliHLTCaloMapper.h" - #include "AliHLTCaloChannelDataStruct.h" #include "AliHLTCaloChannelDataHeaderStruct.h" #include "AliHLTCaloDigitDataStruct.h" @@ -48,6 +46,7 @@ ClassImp(AliHLTCaloDigitMaker); //using namespace CaloHLTConst; AliHLTCaloDigitMaker::AliHLTCaloDigitMaker(TString det) : + AliHLTCaloConstantsHandler(det), fShmPtr(0), fDigitStructPtr(0), fDigitCount(0), @@ -56,20 +55,19 @@ AliHLTCaloDigitMaker::AliHLTCaloDigitMaker(TString det) : fHighGainFactors(0), fLowGainFactors(0), fBadChannelMask(0), - fChannelBook(0), - fCaloConstants(NULL) + fChannelBook(0) { // See header file for documentation - fShmPtr = new AliHLTCaloSharedMemoryInterfacev2(); + fShmPtr = new AliHLTCaloSharedMemoryInterfacev2(det); fHighGainFactors = new Float_t*[fCaloConstants->GetNXCOLUMNSMOD()]; fLowGainFactors = new Float_t*[fCaloConstants->GetNXCOLUMNSMOD()]; - + fBadChannelMask = new Float_t**[fCaloConstants->GetNXCOLUMNSMOD()]; - + fChannelBook= new AliHLTCaloDigitDataStruct**[fCaloConstants->GetNXCOLUMNSMOD()]; - + for(int x = 0; x < fCaloConstants->GetNXCOLUMNSMOD(); x++) { fHighGainFactors[x] = new Float_t[fCaloConstants->GetNZROWSMOD()]; @@ -96,11 +94,11 @@ AliHLTCaloDigitMaker::AliHLTCaloDigitMaker(TString det) : //Must be set in child instance //fMapperPtr = new AliHLTCaloMapper(det); - fCaloConstants = new AliHLTCaloConstants(det); } AliHLTCaloDigitMaker::AliHLTCaloDigitMaker(const AliHLTCaloDigitMaker &) : + AliHLTCaloConstantsHandler(""), fShmPtr(0), fDigitStructPtr(0), fDigitCount(0), @@ -109,11 +107,9 @@ AliHLTCaloDigitMaker::AliHLTCaloDigitMaker(const AliHLTCaloDigitMaker &) : fHighGainFactors(0), fLowGainFactors(0), fBadChannelMask(0), - fChannelBook(0), - fCaloConstants(NULL) + fChannelBook(0) { // Dummy copy constructor - } AliHLTCaloDigitMaker::~AliHLTCaloDigitMaker() diff --git a/HLT/CALO/AliHLTCaloDigitMaker.h b/HLT/CALO/AliHLTCaloDigitMaker.h index ec840297a18..cc1c11d705a 100644 --- a/HLT/CALO/AliHLTCaloDigitMaker.h +++ b/HLT/CALO/AliHLTCaloDigitMaker.h @@ -35,7 +35,7 @@ // visit http://web.ift.uib.no/~kjeks/doc/alice-hlt //#include "AliHLTCaloBase.h" -#include "AliHLTCaloConstants.h" +#include "AliHLTCaloConstantsHandler.h" #include "AliHLTCaloDigitDataStruct.h" #include "AliHLTCaloChannelDataStruct.h" #include "AliHLTDataTypes.h" @@ -59,7 +59,7 @@ class TString; -class AliHLTCaloDigitMaker +class AliHLTCaloDigitMaker : AliHLTCaloConstantsHandler { public: @@ -183,8 +183,6 @@ private: /** Channel book keeping variable */ AliHLTCaloDigitDataStruct ***fChannelBook; //! transient - /** Constants class */ - AliHLTCaloConstants* fCaloConstants; AliHLTCaloDigitMaker(const AliHLTCaloDigitMaker &); // AliHLTCaloDigitMaker & operator = (const AliHLTCaloDigitMaker &); diff --git a/HLT/CALO/AliHLTCaloFourier.cxx b/HLT/CALO/AliHLTCaloFourier.cxx index 8abfea9d94d..82ce3bf4537 100644 --- a/HLT/CALO/AliHLTCaloFourier.cxx +++ b/HLT/CALO/AliHLTCaloFourier.cxx @@ -21,6 +21,8 @@ //#include "AliHLTCaloRcuFFTDataStruct.h" +ClassImp(AliHLTCaloFourier); + AliHLTCaloFourier::AliHLTCaloFourier() : fFFT_own(0), fFFTInputArray(0), fFFTOutputArray(0), diff --git a/HLT/CALO/AliHLTCaloFourier.h b/HLT/CALO/AliHLTCaloFourier.h index 7fec00301c6..fd7cc282ac8 100644 --- a/HLT/CALO/AliHLTCaloFourier.h +++ b/HLT/CALO/AliHLTCaloFourier.h @@ -25,7 +25,7 @@ #include "Rtypes.h" #include "TVirtualFFT.h" #include "TMath.h" -#include "AliHLTCaloConstants.h" +#include "AliHLTCaloConstant.h" #include #include "AliHLTCaloRcuFFTDataStruct.h" @@ -111,6 +111,9 @@ private: AliHLTCaloFourier(const AliHLTCaloFourier&); AliHLTCaloFourier & operator=(const AliHLTCaloFourier&){return *this;}; + + + ClassDef(AliHLTCaloFourier, 1); }; #endif diff --git a/HLT/CALO/AliHLTCaloMapper.cxx b/HLT/CALO/AliHLTCaloMapper.cxx index 20fa39ec541..6e0c5bc18d5 100644 --- a/HLT/CALO/AliHLTCaloMapper.cxx +++ b/HLT/CALO/AliHLTCaloMapper.cxx @@ -30,22 +30,21 @@ #include "unistd.h" #include #include "AliHLTCaloCoordinate.h" +#include "AliHLTCaloConstantsHandler.h" #include "AliHLTCaloConstants.h" -//ClassImp(AliHLTCaloMapper) +ClassImp(AliHLTCaloMapper); AliHLTCaloMapper::AliHLTCaloMapper( const unsigned long specification , TString det) : AliHLTLogging(), + AliHLTCaloConstantsHandler(det), fHw2geomapPtr(0), fCellSize(0), fSpecification(specification), fIsInitializedMapping(false), - fSpecificationMapPtr(0), - fCaloConstants(NULL) + fSpecificationMapPtr(0) { //see header file for class documentation - - fCaloConstants = new AliHLTCaloConstants(det); } diff --git a/HLT/CALO/AliHLTCaloMapper.h b/HLT/CALO/AliHLTCaloMapper.h index 06073616489..0032b0c9991 100644 --- a/HLT/CALO/AliHLTCaloMapper.h +++ b/HLT/CALO/AliHLTCaloMapper.h @@ -27,15 +27,14 @@ #include "AliHLTCaloConstants.h" #include "Rtypes.h" #include "AliHLTLogging.h" -#include "AliHLTCaloConstants.h" +#include "AliHLTCaloConstantsHandler.h" class AliHLTCaloCoordinate; -class AliHLTCaloConstants; -class AliHLTCaloMapper : public AliHLTLogging +class AliHLTCaloMapper : public AliHLTCaloConstantsHandler, public AliHLTLogging { public: - + AliHLTCaloMapper(const unsigned long specification, TString det); virtual ~AliHLTCaloMapper(); virtual void InitAltroMapping( const unsigned long specification ) = 0; @@ -72,13 +71,15 @@ protected: int fSpecification; bool fIsInitializedMapping; fDDLSpecificationMap* fSpecificationMapPtr; - AliHLTCaloConstants* fCaloConstants; - + private: AliHLTCaloMapper(); AliHLTCaloMapper(const AliHLTCaloMapper & ); AliHLTCaloMapper & operator = (const AliHLTCaloMapper &); + + ClassDef(AliHLTCaloMapper, 1); + }; #endif diff --git a/HLT/CALO/AliHLTCaloRawAnalyzerChiSquareFit.h b/HLT/CALO/AliHLTCaloRawAnalyzerChiSquareFit.h index 6a3248e1bd7..4f25eb3d1ce 100644 --- a/HLT/CALO/AliHLTCaloRawAnalyzerChiSquareFit.h +++ b/HLT/CALO/AliHLTCaloRawAnalyzerChiSquareFit.h @@ -47,7 +47,7 @@ class AliHLTCaloRawAnalyzerChiSquareFit : public AliHLTCaloRawAnalyzer private: - // ClassDef(AliHLTCaloRawAnalyzerChiSquareFit, 2) + ClassDef(AliHLTCaloRawAnalyzerChiSquareFit, 2) }; diff --git a/HLT/CALO/AliHLTCaloRawAnalyzerComponentv3.cxx b/HLT/CALO/AliHLTCaloRawAnalyzerComponentv3.cxx index eadf6041558..d57cae94c5a 100644 --- a/HLT/CALO/AliHLTCaloRawAnalyzerComponentv3.cxx +++ b/HLT/CALO/AliHLTCaloRawAnalyzerComponentv3.cxx @@ -24,10 +24,14 @@ #include "AliRawReaderMemory.h" #include "AliAltroRawStreamV3.h" #include "AliCaloRawStreamV3.h" +#include "AliHLTCaloConstantsHandler.h" #include "AliHLTCaloConstants.h" #include "AliHLTCaloRcuProcessor.h" +ClassImp(AliHLTCaloRawAnalyzerComponentv3); + AliHLTCaloRawAnalyzerComponentv3::AliHLTCaloRawAnalyzerComponentv3(TString det): + AliHLTCaloConstantsHandler(det), AliHLTCaloRcuProcessor(), fCaloEventCount(0), fAnalyzerPtr(0), @@ -41,19 +45,16 @@ AliHLTCaloRawAnalyzerComponentv3::AliHLTCaloRawAnalyzerComponentv3(TString det): fBunchSizeCut(0), fMinPeakPosition(0), fMaxPeakPosition(100), - fCaloConstants(NULL), fRawDataWriter(0) { //comment // fMapperPtr = new AliHLTCaloMapper(); - - fCaloConstants = new AliHLTCaloConstants(det); - + fRawReaderMemoryPtr = new AliRawReaderMemory(); - + fAltroRawStreamPtr = new AliAltroRawStreamV3(fRawReaderMemoryPtr); - + fSanityInspectorPtr = new AliHLTCaloSanityInspector(); if( fkDoPushRawData == true ) diff --git a/HLT/CALO/AliHLTCaloRawAnalyzerComponentv3.h b/HLT/CALO/AliHLTCaloRawAnalyzerComponentv3.h index 0854f4437c1..5d20ca086b1 100644 --- a/HLT/CALO/AliHLTCaloRawAnalyzerComponentv3.h +++ b/HLT/CALO/AliHLTCaloRawAnalyzerComponentv3.h @@ -97,15 +97,13 @@ class AliAltroRawStreamV3; #include "AliHLTProcessor.h" #include "AliHLTCaloDefinitions.h" -#include "AliHLTCaloConstants.h" +#include "AliHLTCaloConstantsHandler.h" #include "AliHLTCaloRcuProcessor.h" -class AliHLTCaloConstants; class AliHLTCaloMapper; -//class AliHLTCaloRawAnalyzerComponentv3 : public AliHLTCaloRcuProcessor -class AliHLTCaloRawAnalyzerComponentv3 : public AliHLTCaloRcuProcessor +class AliHLTCaloRawAnalyzerComponentv3 : public AliHLTCaloConstantsHandler, public AliHLTCaloRcuProcessor { public: @@ -165,7 +163,8 @@ class AliHLTCaloRawAnalyzerComponentv3 : public AliHLTCaloRcuProcessor /** Pointer to an analyzer object used for raw data anlysis */ AliHLTCaloRawAnalyzer *fAnalyzerPtr; //COMMENT - AliHLTCaloMapper *fMapperPtr; + //** Pointer to a mapper opbject */ + AliHLTCaloMapper *fMapperPtr; //COMMENT private: @@ -212,11 +211,6 @@ class AliHLTCaloRawAnalyzerComponentv3 : public AliHLTCaloRcuProcessor // AliHLTCaloMapper *fMapperPtr; - /** Constants class instance */ - AliHLTCaloConstants *fCaloConstants; - - - class RawDataWriter { public: @@ -251,6 +245,8 @@ class AliHLTCaloRawAnalyzerComponentv3 : public AliHLTCaloRcuProcessor RawDataWriter *fRawDataWriter; + ClassDef(AliHLTCaloRawAnalyzerComponentv3, 1) + }; #endif diff --git a/HLT/CALO/AliHLTCaloRawAnalyzerCrude.cxx b/HLT/CALO/AliHLTCaloRawAnalyzerCrude.cxx index 43cca723074..8cd66c7146e 100644 --- a/HLT/CALO/AliHLTCaloRawAnalyzerCrude.cxx +++ b/HLT/CALO/AliHLTCaloRawAnalyzerCrude.cxx @@ -21,6 +21,7 @@ using namespace std; +ClassImp(AliHLTCaloRawAnalyzerCrude); AliHLTCaloRawAnalyzerCrude::AliHLTCaloRawAnalyzerCrude():AliHLTCaloRawAnalyzer() { diff --git a/HLT/CALO/AliHLTCaloRawAnalyzerCrude.h b/HLT/CALO/AliHLTCaloRawAnalyzerCrude.h index dd63a3ba734..d201ba34075 100644 --- a/HLT/CALO/AliHLTCaloRawAnalyzerCrude.h +++ b/HLT/CALO/AliHLTCaloRawAnalyzerCrude.h @@ -12,11 +12,16 @@ class AliHLTCaloRawAnalyzerCrude : public AliHLTCaloRawAnalyzer { + public: AliHLTCaloRawAnalyzerCrude(); virtual ~AliHLTCaloRawAnalyzerCrude(); virtual void Evaluate(int start = 0, int lenght = 100); + private: + + ClassDef(AliHLTCaloRawAnalyzerCrude, 1); + }; #endif diff --git a/HLT/CALO/AliHLTCaloRawAnalyzerCrudeComponent.cxx b/HLT/CALO/AliHLTCaloRawAnalyzerCrudeComponent.cxx index 834d77044d4..643fd56f982 100644 --- a/HLT/CALO/AliHLTCaloRawAnalyzerCrudeComponent.cxx +++ b/HLT/CALO/AliHLTCaloRawAnalyzerCrudeComponent.cxx @@ -20,7 +20,7 @@ #include "AliHLTCaloRawAnalyzerCrudeComponent.h" #include "AliHLTCaloRawAnalyzerCrude.h" -//AliHLTCaloRawAnalyzerCrudeComponent gAliHLTCaloRawAnalyzerCrudeComponent; +ClassImp(AliHLTCaloRawAnalyzerCrudeComponent); //___________________________________________________________________________ AliHLTCaloRawAnalyzerCrudeComponent::AliHLTCaloRawAnalyzerCrudeComponent(TString det) : diff --git a/HLT/CALO/AliHLTCaloRawAnalyzerCrudeComponent.h b/HLT/CALO/AliHLTCaloRawAnalyzerCrudeComponent.h index 86ac04c6541..3168e02293c 100644 --- a/HLT/CALO/AliHLTCaloRawAnalyzerCrudeComponent.h +++ b/HLT/CALO/AliHLTCaloRawAnalyzerCrudeComponent.h @@ -28,6 +28,8 @@ class AliHLTCaloRawAnalyzerCrudeComponent: public AliHLTCaloRawAnalyzerComponent private: AliHLTCaloRawAnalyzerCrudeComponent(); + + ClassDef(AliHLTCaloRawAnalyzerCrudeComponent, 1); }; #endif diff --git a/HLT/CALO/AliHLTCaloRawAnalyzerPeakFinder.cxx b/HLT/CALO/AliHLTCaloRawAnalyzerPeakFinder.cxx index aee970cfee1..2d2288062af 100644 --- a/HLT/CALO/AliHLTCaloRawAnalyzerPeakFinder.cxx +++ b/HLT/CALO/AliHLTCaloRawAnalyzerPeakFinder.cxx @@ -29,16 +29,17 @@ using std::cout; using std::endl; -//ClassImp(AliHLTCaloRawAnalyzerPeakFinder) +ClassImp(AliHLTCaloRawAnalyzerPeakFinder) /** - * The AliHLTCaloPeakfinder class is the class for extracting the basic signal parameters + * The AliHLTCaloRawAnalyzerPeakfinder class is the class for extracting the basic signal parameters * "timing" and "energy" from the Calorimeter's raw data. Physical data will for a given readout channel be * a sequense of ADC digitized 10 bit integer values, however for performance reasons all values used in * calculation is of type double. **/ + AliHLTCaloRawAnalyzerPeakFinder::AliHLTCaloRawAnalyzerPeakFinder():AliHLTCaloRawAnalyzer(), fTVectorPtr(0), fAVectorPtr(0), diff --git a/HLT/CALO/AliHLTCaloRawAnalyzerPeakFinder.h b/HLT/CALO/AliHLTCaloRawAnalyzerPeakFinder.h index 0f32a27ac7a..1d4d5b37d9c 100644 --- a/HLT/CALO/AliHLTCaloRawAnalyzerPeakFinder.h +++ b/HLT/CALO/AliHLTCaloRawAnalyzerPeakFinder.h @@ -79,8 +79,8 @@ class AliHLTCaloRawAnalyzerPeakFinder : public AliHLTCaloRawAnalyzer // AliHLTCaloUtilities *fUtilitiesPtr; - // ClassDef(AliHLTCaloRawAnalyzerPeakFinder, 2) - - }; + ClassDef(AliHLTCaloRawAnalyzerPeakFinder, 2) + +}; #endif diff --git a/HLT/CALO/AliHLTCaloRawAnalyzerPeakFinderComponent.cxx b/HLT/CALO/AliHLTCaloRawAnalyzerPeakFinderComponent.cxx index be83de4c85a..35cc7e17144 100644 --- a/HLT/CALO/AliHLTCaloRawAnalyzerPeakFinderComponent.cxx +++ b/HLT/CALO/AliHLTCaloRawAnalyzerPeakFinderComponent.cxx @@ -17,12 +17,8 @@ #include "AliHLTCaloRawAnalyzerPeakFinderComponent.h" #include "AliHLTCaloRawAnalyzerPeakFinder.h" -//#include -//#include "AliHLTCaloCommonDefs.h" - - -//AliHLTCaloRawAnalyzerPeakFinderComponent gAliHLTCaloRawAnalyzerPeakFinderComponent; +ClassImp(AliHLTCaloRawAnalyzerPeakFinderComponent); //___________________________________________________________________________________________________________ AliHLTCaloRawAnalyzerPeakFinderComponent::AliHLTCaloRawAnalyzerPeakFinderComponent(TString det) : diff --git a/HLT/CALO/AliHLTCaloRawAnalyzerPeakFinderComponent.h b/HLT/CALO/AliHLTCaloRawAnalyzerPeakFinderComponent.h index 69657541c9a..6d573945faa 100644 --- a/HLT/CALO/AliHLTCaloRawAnalyzerPeakFinderComponent.h +++ b/HLT/CALO/AliHLTCaloRawAnalyzerPeakFinderComponent.h @@ -41,6 +41,8 @@ class AliHLTCaloRawAnalyzerPeakFinderComponent: public AliHLTCaloRawAnalyzerComp private: AliHLTCaloRawAnalyzerPeakFinderComponent(); + + ClassDef(AliHLTCaloRawAnalyzerPeakFinderComponent, 1); }; diff --git a/HLT/CALO/AliHLTCaloRcuProcessor.cxx b/HLT/CALO/AliHLTCaloRcuProcessor.cxx index eda706c2cfa..5b082aba77d 100644 --- a/HLT/CALO/AliHLTCaloRcuProcessor.cxx +++ b/HLT/CALO/AliHLTCaloRcuProcessor.cxx @@ -19,6 +19,9 @@ **************************************************************************/ #include "AliHLTCaloRcuProcessor.h" + +ClassImp(AliHLTCaloRcuProcessor); + AliHLTCaloRcuProcessor::AliHLTCaloRcuProcessor():AliHLTCaloProcessor() { diff --git a/HLT/CALO/AliHLTCaloRcuProcessor.h b/HLT/CALO/AliHLTCaloRcuProcessor.h index e94291dbece..e265b33b2fd 100644 --- a/HLT/CALO/AliHLTCaloRcuProcessor.h +++ b/HLT/CALO/AliHLTCaloRcuProcessor.h @@ -22,6 +22,7 @@ private: AliHLTCaloRcuProcessor (const AliHLTCaloRcuProcessor & ); AliHLTCaloRcuProcessor & operator = (const AliHLTCaloRcuProcessor &); + ClassDef(AliHLTCaloRcuProcessor, 1); }; #endif diff --git a/HLT/CALO/AliHLTCaloSanityInspector.cxx b/HLT/CALO/AliHLTCaloSanityInspector.cxx index be228346449..99e09f603d2 100644 --- a/HLT/CALO/AliHLTCaloSanityInspector.cxx +++ b/HLT/CALO/AliHLTCaloSanityInspector.cxx @@ -31,7 +31,7 @@ #include "AliHLTCaloSanityInspector.h" #include "Rtypes.h" -//ClassImp(AliHLTCaloSanityInspector); +ClassImp(AliHLTCaloSanityInspector); AliHLTCaloSanityInspector::AliHLTCaloSanityInspector() : diff --git a/HLT/CALO/AliHLTCaloSanityInspector.h b/HLT/CALO/AliHLTCaloSanityInspector.h index 2a19baaa486..955846f7701 100644 --- a/HLT/CALO/AliHLTCaloSanityInspector.h +++ b/HLT/CALO/AliHLTCaloSanityInspector.h @@ -95,7 +95,7 @@ private: /** The max difference between 2 samples */ Int_t fMaxDifference; //COMMENT - // ClassDef(AliHLTCaloySanityInspector, 1); + ClassDef(AliHLTCaloSanityInspector, 1); }; #endif diff --git a/HLT/CALO/AliHLTCaloSharedMemoryInterfacev2.cxx b/HLT/CALO/AliHLTCaloSharedMemoryInterfacev2.cxx index 5fa0537d598..1ff7d1294c0 100644 --- a/HLT/CALO/AliHLTCaloSharedMemoryInterfacev2.cxx +++ b/HLT/CALO/AliHLTCaloSharedMemoryInterfacev2.cxx @@ -26,16 +26,19 @@ #include "AliHLTCaloMapper.h" #include "AliHLTCaloConstants.h" +ClassImp(AliHLTCaloSharedMemoryInterfacev2); -AliHLTCaloSharedMemoryInterfacev2::AliHLTCaloSharedMemoryInterfacev2(): fCurrentChannel(0), - fChannelDataPtr(0), - fIsSetMemory(false), - fHasRawData(false), - fMaxCnt(0), - fCurrentCnt(0), - fRawDataPtr(0), - fRawData() - // fSpecification(0) +AliHLTCaloSharedMemoryInterfacev2::AliHLTCaloSharedMemoryInterfacev2(TString det): + AliHLTCaloConstantsHandler(det), + fCurrentChannel(0), + fChannelDataPtr(0), + fIsSetMemory(false), + fHasRawData(false), + fMaxCnt(0), + fCurrentCnt(0), + fRawDataPtr(0), + fRawData() + // fSpecification(0) { // GetSpecFromDDLIndex // AliHLTCaloMapper *fMapperPtr[32]; @@ -267,7 +270,7 @@ AliHLTCaloSharedMemoryInterfacev2::Reset() void AliHLTCaloSharedMemoryInterfacev2::Reset(AliHLTCaloChannelRawDataStruct &str) { - for(int i=0; i< ALTROMAXSAMPLES; i++ ) + for(int i=0; i< fCaloConstants->GetALTROMAXSAMPLES(); i++ ) { str.fDataPtr[i] = 0; } diff --git a/HLT/CALO/AliHLTCaloSharedMemoryInterfacev2.h b/HLT/CALO/AliHLTCaloSharedMemoryInterfacev2.h index 6ea32de6adb..93d54fca1cc 100644 --- a/HLT/CALO/AliHLTCaloSharedMemoryInterfacev2.h +++ b/HLT/CALO/AliHLTCaloSharedMemoryInterfacev2.h @@ -28,7 +28,7 @@ #include "AliHLTCaloChannelRawDataStruct.h" #include "AliHLTDataTypes.h" - +#include "AliHLTCaloConstantsHandler.h" class AliHLTCaloChannelDataHeaderStruct; @@ -38,10 +38,10 @@ class AliHLTCaloMapper; //class AliHLTCaloChannelRawDataStruct; -class AliHLTCaloSharedMemoryInterfacev2 +class AliHLTCaloSharedMemoryInterfacev2 : public AliHLTCaloConstantsHandler { public: - AliHLTCaloSharedMemoryInterfacev2(); + AliHLTCaloSharedMemoryInterfacev2(TString det); virtual ~AliHLTCaloSharedMemoryInterfacev2(); AliHLTCaloChannelDataStruct* NextChannel(); void NextRawChannel(); @@ -56,6 +56,7 @@ protected: AliHLTCaloMapper *fMapperPtr[32]; private: + AliHLTCaloSharedMemoryInterfacev2(); AliHLTCaloSharedMemoryInterfacev2(const AliHLTCaloSharedMemoryInterfacev2 & ); AliHLTCaloSharedMemoryInterfacev2 & operator = (const AliHLTCaloSharedMemoryInterfacev2 &); void Reset(AliHLTCaloChannelRawDataStruct &str); @@ -68,6 +69,8 @@ protected: UShort_t *fRawDataPtr; AliHLTCaloChannelRawDataStruct fRawData; // unsigned long fSpecification; + + ClassDef(AliHLTCaloSharedMemoryInterfacev2, 1); }; #endif diff --git a/HLT/EMCAL/AliHLTEMCALConstant.h b/HLT/EMCAL/AliHLTEMCALConstant.h new file mode 100644 index 00000000000..70d33229c54 --- /dev/null +++ b/HLT/EMCAL/AliHLTEMCALConstant.h @@ -0,0 +1,57 @@ +//-*- Mode: C++ -*- +// $Id: AliHLTPHOSConstants.h 34622 2009-09-04 13:22:01Z odjuvsla $ + +/************************************************************************** + * This file is property of and copyright by the Experimental Nuclear * + * Physics Group, Dep. of Physics * + * University of Oslo, Norway, 2006 * + * * + * Author: Per Thomas Hille perthi@fys.uio.no for the ALICE DCS 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. * + **************************************************************************/ + + +#ifndef ALIHLTEMCALCONSTANT_H +#define ALIHLTEMCALCONSTANT_H + +namespace EmcalHLTConst +{ + // const int NZROWSRCU = 56; /** * +//* for The ALICE HLT Project. * +//* * +//* 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. * +//************************************************************************** + +/// @file AliHLTEMCALConstants.cxx +/// @author Svein Lindal +/// @date 2009-11-12 +/// @brief Class containing constants for EMCAL and EMCAL +/// loaded libraries +#include "AliHLTEMCALConstants.h" + +ClassImp(AliHLTEMCALConstants); + +AliHLTEMCALConstants::AliHLTEMCALConstants() : + AliHLTCaloConstants(), + fkMAXHOSTS(20), + fkDEFAULTEVENTPORT(42001), + fkMAXBINVALUE(1023), + fkHIGHGAIN(1), + fkLOWGAIN(0), + fkALTROMAXSAMPLES(1008), + fkALTROMAXPRESAMPLES(15), + fkNZROWSRCU(56), + fkNXCOLUMNSRCU(16), + fkNZROWSMOD(48), + fkNXCOLUMNSMOD(24), + fkNGAINS(2), + fkNDATATYPES(10), + fkPFMAXPATHLENGTH(256), + fkPFDEFAULTNSAMPLES(70), + fkPFDEFAULTSTARTINDEX(0), + fkDEFAULTTAU(0.2), + fkDEFAULTFS(10), + fkMODULE0(0), + fkMODULE1(1), + fkMODULE2(2), + fkMODULE3(3), + fkMODULE4(4), + fkCSPSPERFEE(32), + fkRCU0(0), + fkRCU1(1), + fkRCU2(2), + fkRCU3(3), + fkZ0(0), + fkZ1(1), + fkX0(0), + fkX1(1), + fkNMODULES(13), + fkNRCUS(4), + fkNRCUSPERMODULE(2), + fkNRCUSPERTOTAL(fkNMODULES*fkNRCUSPERMODULE), + fkNFEECS(9), + fkNALTROS(4), + fkNALTROCHANNELS(16), + fkNBRANCHES(2), + fkCELLSTEP(-999999999.9), + fkNRCUSPERSECTOR(4) +{ + //Default constructor +} + +AliHLTEMCALConstants::~AliHLTEMCALConstants() +{ + //Default destructor +} + diff --git a/HLT/EMCAL/AliHLTEMCALConstants.h b/HLT/EMCAL/AliHLTEMCALConstants.h index 19c52555179..553edb985d7 100644 --- a/HLT/EMCAL/AliHLTEMCALConstants.h +++ b/HLT/EMCAL/AliHLTEMCALConstants.h @@ -1,14 +1,14 @@ //-*- Mode: C++ -*- -// $Id: AliHLTPHOSConstants.h 34622 2009-09-04 13:22:01Z odjuvsla $ +// $Id: AliHLTEMCALConstants.h 35357 2009-10-08 13:24:38Z phille $ /************************************************************************** * This file is property of and copyright by the Experimental Nuclear * * Physics Group, Dep. of Physics * * University of Oslo, Norway, 2006 * * * - * Author: Per Thomas Hille perthi@fys.uio.no for the ALICE DCS Project. * + * Author: Svein Lindal slindal@fys.uio.no for the ALICE DCS Project. * * Contributors are mentioned in the code where appropriate. * - * Please report bugs to perthi@fys.uio.no * + * Please report bugs to slindal@fys.uio.no * * * * Permission to use, copy, modify and distribute this software and its * * documentation strictly for non-commercial purposes is hereby granted * @@ -19,39 +19,135 @@ * provided "as is" without express or implied warranty. * **************************************************************************/ - #ifndef ALIHLTEMCALCONSTANTS_H #define ALIHLTEMCALCONSTANTS_H -namespace EmcalHLTConst +#include "Rtypes.h" +#include "AliHLTCaloConstants.h" + + +class AliHLTEMCALConstants : public AliHLTCaloConstants { - // const int NZROWSRCU = 56; /** * +//* for The ALICE HLT Project. * +//* * +//* 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. * +//************************************************************************** + +/// @file AliHLTPHOSConstants.cxx +/// @author Svein Lindal +/// @date 2009-11-12 +/// @brief Class containing constants for PHOS +/// loaded libraries + +#include "AliHLTPHOSConstants.h" +#include "AliHLTCaloConstants.h" + +ClassImp(AliHLTPHOSConstants); + +AliHLTPHOSConstants::AliHLTPHOSConstants() : + AliHLTCaloConstants(), + fkMAXHOSTS(20), + fkDEFAULTEVENTPORT(42001), + fkMAXBINVALUE(1023), + fkHIGHGAIN(0), + fkLOWGAIN(1), + fkALTROMAXSAMPLES(1008), + fkALTROMAXPRESAMPLES(15), + fkNZROWSRCU(56), + fkNXCOLUMNSRCU(16), + fkNZROWSMOD(56), + fkNXCOLUMNSMOD(64), + fkNGAINS(2), + fkNDATATYPES(10), + fkPFMAXPATHLENGTH(256), + fkPFDEFAULTNSAMPLES(70), + fkPFDEFAULTSTARTINDEX(0), + fkDEFAULTTAU(2.), + fkDEFAULTFS(10), + fkMODULE0(0), + fkMODULE1(1), + fkMODULE2(2), + fkMODULE3(3), + fkMODULE4(4), + fkCSPSPERFEE(32), + fkRCU0(0), + fkRCU1(1), + fkRCU2(2), + fkRCU3(3), + fkZ0(0), + fkZ1(1), + fkX0(0), + fkX1(1), + fkNMODULES(5), + fkNRCUS(4), + fkNRCUSPERMODULE(4), + fkNRCUSPERTOTAL(fkNMODULES*fkNRCUSPERMODULE), + fkNFEECS(14), + fkNALTROS(4), + fkNALTROCHANNELS(16), + fkNBRANCHES(2), + fkCELLSTEP(-99999.9), + fkNRCUSPERSECTOR(-9999) +{ + //Default constructor +} + +AliHLTPHOSConstants::~AliHLTPHOSConstants() +{ + //Default destructor +} + diff --git a/HLT/PHOS/AliHLTPHOSConstants.h b/HLT/PHOS/AliHLTPHOSConstants.h index f6ddf9d26b9..3b3f7d3c146 100644 --- a/HLT/PHOS/AliHLTPHOSConstants.h +++ b/HLT/PHOS/AliHLTPHOSConstants.h @@ -1,89 +1,143 @@ //-*- Mode: C++ -*- // $Id$ -/************************************************************************** - * This file is property of and copyright by the Experimental Nuclear * - * Physics Group, Dep. of Physics * - * University of Oslo, Norway, 2006 * - * * - * Author: Per Thomas Hille perthi@fys.uio.no for the ALICE DCS 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. * - **************************************************************************/ +//* This file is property of and copyright by the ALICE HLT Project * +//* ALICE Experiment at CERN, All rights reserved. * +//* See cxx source for full Copyright notice */ + +/// @file AliHLTPHOSConstants.h +/// @author Svein Lindal +/// @date +/// @brief Class containing constants for PHOS libraries. #ifndef ALIHLTPHOSCONSTANTS_H #define ALIHLTPHOSCONSTANTS_H -namespace PhosHLTConst -{ - const int MAXHOSTS = 20; - const int DEFAULTEVENTPORT = 42001; - const int MAXBINVALUE = 1023; - const int HIGHGAIN = 0; - const int LOWGAIN = 1; - - const int ALTROMAXSAMPLES = 1008; /** #include "AliHLTPHOSRcuFFTDataStruct.h" diff --git a/HLT/PHOS/AliHLTPHOSHistoProdCellEnergy.h b/HLT/PHOS/AliHLTPHOSHistoProdCellEnergy.h index 0004df0a3fe..822da30026b 100644 --- a/HLT/PHOS/AliHLTPHOSHistoProdCellEnergy.h +++ b/HLT/PHOS/AliHLTPHOSHistoProdCellEnergy.h @@ -32,7 +32,7 @@ //#include "AliHLTPHOSBase.h" #include "Rtypes.h" -#include "AliHLTPHOSConstants.h" +#include "AliHLTPHOSConstant.h" class TObjArray; class TH1F; diff --git a/HLT/PHOS/AliHLTPHOSHistoProdInvMass.h b/HLT/PHOS/AliHLTPHOSHistoProdInvMass.h index 4d7b8370882..a476f951fed 100644 --- a/HLT/PHOS/AliHLTPHOSHistoProdInvMass.h +++ b/HLT/PHOS/AliHLTPHOSHistoProdInvMass.h @@ -32,7 +32,7 @@ //#include "AliHLTPHOSBase.h" #include "Rtypes.h" -#include "AliHLTPHOSConstants.h" +#include "AliHLTPHOSConstant.h" class TObjArray; class TH1F; diff --git a/HLT/PHOS/AliHLTPHOSHistoProdMatchedTracks.h b/HLT/PHOS/AliHLTPHOSHistoProdMatchedTracks.h index 935f1f134da..ca83c76fcb7 100644 --- a/HLT/PHOS/AliHLTPHOSHistoProdMatchedTracks.h +++ b/HLT/PHOS/AliHLTPHOSHistoProdMatchedTracks.h @@ -34,7 +34,7 @@ #include "Rtypes.h" // #include "TClonesArray.h" -#include "AliHLTPHOSConstants.h" +#include "AliHLTPHOSConstant.h" using namespace PhosHLTConst; diff --git a/HLT/PHOS/AliHLTPHOSMapper.cxx b/HLT/PHOS/AliHLTPHOSMapper.cxx index ca7a402e831..7fef002484b 100644 --- a/HLT/PHOS/AliHLTPHOSMapper.cxx +++ b/HLT/PHOS/AliHLTPHOSMapper.cxx @@ -26,7 +26,7 @@ #include "AliPHOSEMCAGeometry.h" #include "AliHLTPHOSMapper.h" -#include "AliHLTPHOSConstants.h" +#include "AliHLTPHOSConstant.h" #include "AliHLTLogging.h" #include "Rtypes.h" #include "unistd.h" diff --git a/HLT/PHOS/AliHLTPHOSPhysicsAnalyzer.h b/HLT/PHOS/AliHLTPHOSPhysicsAnalyzer.h index 14c3461b5a5..680bf703de7 100644 --- a/HLT/PHOS/AliHLTPHOSPhysicsAnalyzer.h +++ b/HLT/PHOS/AliHLTPHOSPhysicsAnalyzer.h @@ -36,7 +36,7 @@ // visit http://web.ift.uib.no/~kjeks/doc/alice-hlt #include "Rtypes.h" -#include "AliHLTPHOSConstants.h" +#include "AliHLTPHOSConstant.h" using namespace PhosHLTConst; diff --git a/HLT/PHOS/AliHLTPHOSPhysicsHistogramProducer.h b/HLT/PHOS/AliHLTPHOSPhysicsHistogramProducer.h index 5c4a867d36e..fd887937617 100644 --- a/HLT/PHOS/AliHLTPHOSPhysicsHistogramProducer.h +++ b/HLT/PHOS/AliHLTPHOSPhysicsHistogramProducer.h @@ -33,7 +33,7 @@ #include "Rtypes.h" #include "TClonesArray.h" -#include "AliHLTPHOSConstants.h" +#include "AliHLTPHOSConstant.h" using namespace PhosHLTConst; diff --git a/HLT/PHOS/AliHLTPHOSProcessor.h b/HLT/PHOS/AliHLTPHOSProcessor.h index df3e6895b83..e5792d6396d 100644 --- a/HLT/PHOS/AliHLTPHOSProcessor.h +++ b/HLT/PHOS/AliHLTPHOSProcessor.h @@ -10,7 +10,7 @@ //#include "AliHLTPHOSBase.h" #include "AliHLTPHOSDefinitions.h" #include "AliHLTDataTypes.h" -#include "AliHLTPHOSConstants.h" +#include "AliHLTPHOSConstant.h" using namespace PhosHLTConst; diff --git a/HLT/PHOS/AliHLTPHOSRawAnalyzerComponentv3.cxx b/HLT/PHOS/AliHLTPHOSRawAnalyzerComponentv3.cxx index a33455f0f9b..e9a4671953d 100644 --- a/HLT/PHOS/AliHLTPHOSRawAnalyzerComponentv3.cxx +++ b/HLT/PHOS/AliHLTPHOSRawAnalyzerComponentv3.cxx @@ -25,9 +25,13 @@ #include "AliCaloRawStreamV3.h" #include "AliRawReaderMemory.h" +#include "AliHLTPHOSConstant.h" #include "AliHLTPHOSUtilities.h" + +using namespace PhosHLTConst; + AliHLTPHOSRawAnalyzerComponentv3::AliHLTPHOSRawAnalyzerComponentv3(): AliHLTPHOSRcuProcessor(), fAnalyzerPtr(0), diff --git a/HLT/PHOS/AliHLTPHOSRawAnalyzerPeakFinderComponent.cxx b/HLT/PHOS/AliHLTPHOSRawAnalyzerPeakFinderComponent.cxx index 03084d3144d..86964490309 100644 --- a/HLT/PHOS/AliHLTPHOSRawAnalyzerPeakFinderComponent.cxx +++ b/HLT/PHOS/AliHLTPHOSRawAnalyzerPeakFinderComponent.cxx @@ -19,7 +19,9 @@ #include "AliHLTPHOSRawAnalyzerPeakFinder.h" //#include //#include "AliHLTPHOSCommonDefs.h" +#include "AliHLTPHOSConstant.h" +using namespace PhosHLTConst; AliHLTPHOSRawAnalyzerPeakFinderComponent gAliHLTPHOSRawAnalyzerPeakFinderComponent; diff --git a/HLT/PHOS/AliHLTPHOSRcuCellAccumulatedEnergyDataStruct.h b/HLT/PHOS/AliHLTPHOSRcuCellAccumulatedEnergyDataStruct.h index 16c3d98495c..f8ea04035bc 100644 --- a/HLT/PHOS/AliHLTPHOSRcuCellAccumulatedEnergyDataStruct.h +++ b/HLT/PHOS/AliHLTPHOSRcuCellAccumulatedEnergyDataStruct.h @@ -1,5 +1,5 @@ //-*- Mode: C++ -*- -// $Id$ +// $Id: AliHLTPHOSRcuCellAccumulatedEnergyDataStruct.h 31490 2009-03-15 16:27:11Z odjuvsla $ #ifndef ALIHLTPHOSRCUCELLACCUMULATEDENERGYDATASTRUCT_H #define ALIHLTPHOSRCUCELLACCUMULATEDENERGYDATASTRUCT_H @@ -21,7 +21,7 @@ //#include "AliHLTPHOSCommonDefs.h" -#include "AliHLTPHOSConstants.h" +#include "AliHLTPHOSConstant.h" using namespace PhosHLTConst; diff --git a/HLT/PHOS/AliHLTPHOSRcuDAComponent.cxx b/HLT/PHOS/AliHLTPHOSRcuDAComponent.cxx index 4d66208a36c..777af0d23bd 100644 --- a/HLT/PHOS/AliHLTPHOSRcuDAComponent.cxx +++ b/HLT/PHOS/AliHLTPHOSRcuDAComponent.cxx @@ -20,7 +20,7 @@ #include "AliHLTPHOSSharedMemoryInterfacev2.h" #include "AliHLTPHOSRcuDAComponent.h" #include "AliHLTPHOSDefinitions.h" -#include "AliHLTPHOSConstants.h" +#include "AliHLTPHOSConstant.h" //#include "AliHLTPHOSRcuCellEnergyDataStruct.h" #include "TObjArray.h" #include "AliHLTPHOSUtilities.h" @@ -44,12 +44,13 @@ using namespace PhosHLTConst; AliHLTPHOSRcuDAComponent gAliHLTPHOSRcuDAComponent; -AliHLTPHOSRcuDAComponent::AliHLTPHOSRcuDAComponent() : //AliHLTPHOSRcuProperties(), - AliHLTCalibrationProcessor(), - fPhosEventCount(0), - fPHOSDAPtr(0), - fShmPtr(0) - // fTest(-2) +AliHLTPHOSRcuDAComponent::AliHLTPHOSRcuDAComponent() : + //AliHLTPHOSRcuProperties(), + AliHLTCalibrationProcessor(), + fPhosEventCount(0), + fPHOSDAPtr(0), + fShmPtr(0) + // fTest(-2) { fShmPtr = new AliHLTPHOSSharedMemoryInterfacev2(); } diff --git a/HLT/PHOS/AliHLTPHOSRcuDAComponent.h b/HLT/PHOS/AliHLTPHOSRcuDAComponent.h index 876ad414e49..d896f15add9 100644 --- a/HLT/PHOS/AliHLTPHOSRcuDAComponent.h +++ b/HLT/PHOS/AliHLTPHOSRcuDAComponent.h @@ -36,7 +36,7 @@ // visit http://web.ift.uib.no/~kjeks/doc/alice-hlt #include "AliHLTCalibrationProcessor.h" -#include "AliHLTPHOSConstants.h" +#include "AliHLTPHOSConstant.h" //#include "AliHLTPHOSRcuProperties.h" using namespace PhosHLTConst; @@ -47,9 +47,9 @@ class TObjArray; //class AliHLTPHOSRcuDAComponent: public AliHLTCalibrationProcessor, public AliHLTPHOSRcuProcessor //class AliHLTPHOSRcuDAComponent: public AliHLTPHOSRcuProperties, public AliHLTCalibrationProcessor -class AliHLTPHOSRcuDAComponent: public AliHLTCalibrationProcessor +class AliHLTPHOSRcuDAComponent: public AliHLTCalibrationProcessor { public: /** constructor */ diff --git a/HLT/PHOS/AliHLTPHOSRcuFFTDataStruct.h b/HLT/PHOS/AliHLTPHOSRcuFFTDataStruct.h index 3e314f4f450..3d03525895a 100644 --- a/HLT/PHOS/AliHLTPHOSRcuFFTDataStruct.h +++ b/HLT/PHOS/AliHLTPHOSRcuFFTDataStruct.h @@ -6,7 +6,7 @@ #include "Rtypes.h" -#include "AliHLTPHOSConstants.h" +#include "AliHLTPHOSConstant.h" using namespace PhosHLTConst; diff --git a/HLT/PHOS/AliHLTPHOSSharedMemoryInterfacev2.cxx b/HLT/PHOS/AliHLTPHOSSharedMemoryInterfacev2.cxx index 58e62f3d0a0..e8f04ba43ab 100644 --- a/HLT/PHOS/AliHLTPHOSSharedMemoryInterfacev2.cxx +++ b/HLT/PHOS/AliHLTPHOSSharedMemoryInterfacev2.cxx @@ -24,7 +24,7 @@ #include "AliHLTPHOSChannelDataStruct.h" #include "AliHLTLogging.h" #include "AliHLTPHOSMapper.h" -#include "AliHLTPHOSConstants.h" +#include "AliHLTPHOSConstant.h" AliHLTPHOSSharedMemoryInterfacev2::AliHLTPHOSSharedMemoryInterfacev2(): diff --git a/HLT/libAliHLTCalo.pkg b/HLT/libAliHLTCalo.pkg index 2f270be5641..6c3bde3bb98 100644 --- a/HLT/libAliHLTCalo.pkg +++ b/HLT/libAliHLTCalo.pkg @@ -21,11 +21,12 @@ AliHLTCaloDefinitions.h \ AliHLTCaloSanityInspector.h \ AliHLTCaloSharedMemoryInterfacev2.h \ AliHLTCaloFourier.h \ -AliHLTCaloConstants.h \ +AliHLTCaloConstantsHandler.h \ AliHLTCaloClusterizer.h \ AliHLTCaloDigitMaker.h \ AliHLTCaloClusterAnalyser.h \ AliHLTCaloRcuProcessor.h \ +AliHLTCaloConstants.h \ AliHLTCaloProcessor.h ## all source files of this module diff --git a/HLT/libAliHLTEMCAL.pkg b/HLT/libAliHLTEMCAL.pkg index 1411b7508e2..9feac43179b 100644 --- a/HLT/libAliHLTEMCAL.pkg +++ b/HLT/libAliHLTEMCAL.pkg @@ -8,8 +8,8 @@ CLASS_HDRS:= \ AliHLTEMCALRawAnalyzerComponent.h \ AliHLTEMCALMapper.h \ AliHLTEMCALRawAnalyzerCrudeComponent.h \ - AliHLTEMCALSharedMemoryInterface.h - + AliHLTEMCALSharedMemoryInterface.h \ + AliHLTEMCALConstants.h # library sources MODULE_SRCS= \ $(CLASS_HDRS:.h=.cxx) @@ -19,7 +19,9 @@ MODULE_SRCS= \ # the CLASS_HDRS variable. So we just use the content of this. You # can simply add more header files which don't contain classes with # ROOT dictionary support -MODULE_HDRS:= $(CLASS_HDRS) +MODULE_HDRS:= $(CLASS_HDRS) \ + AliHLTEMCALConstant.h + # The LinkDef file required by the ROOT dictionary generation can be # generated automatically. For the all header files specified in diff --git a/HLT/libAliHLTPHOS.pkg b/HLT/libAliHLTPHOS.pkg index d7a65f81ffa..77a7c91be58 100644 --- a/HLT/libAliHLTPHOS.pkg +++ b/HLT/libAliHLTPHOS.pkg @@ -40,13 +40,14 @@ CLASS_HDRS:= AliHLTPHOSClusterizer.h \ AliHLTPHOSESDEntriesMakerComponent.h \ AliHLTPHOSESDCaloClusterWriterComponent.h \ AliHLTPHOSFourier.h \ - AliHLTPHOSDigitReader.h + AliHLTPHOSDigitReader.h \ + AliHLTPHOSConstants.h MODULE_SRCS:= $(CLASS_HDRS:.h=.cxx) MODULE_HDRS:= $(CLASS_HDRS) \ AliHLTPHOSCommonDefs.h \ - AliHLTPHOSConstants.h \ + AliHLTPHOSConstant.h \ AliHLTPHOSRcuCellAccumulatedEnergyDataStruct.h \ AliHLTPHOSRecPointDataStruct.h \ AliHLTPHOSRecPointContainerStruct.h \ @@ -60,10 +61,10 @@ MODULE_HDRS:= $(CLASS_HDRS) \ ##Left empty for auto generation: MODULE_DHDR:= -EINCLUDE := HLT/BASE HLT/BASE/util HLT/PHOS STEER RAW PHOS +EINCLUDE := HLT/BASE HLT/BASE/util HLT/CALO HLT/PHOS STEER RAW PHOS LIBRARY_DEP := -lHLTbase -lPHOSbase -lPHOSshuttle -lESD \ - -lSTEER -lRAWDatarec + -lSTEER -lRAWDatarec ############################################################################### # -- 2.43.0