From 76ffc0ce4b15a31d8b5f88e09c95e4786cfd81f9 Mon Sep 17 00:00:00 2001 From: phille Date: Wed, 5 May 2010 02:36:54 +0000 Subject: [PATCH] Usage of new constant classes --- HLT/CALO/AliHLTCaloChannelRawDataStruct.h | 4 +- HLT/CALO/AliHLTCaloConstants.cxx | 11 ++++ HLT/CALO/AliHLTCaloConstantsHandler.cxx | 15 +++-- HLT/CALO/AliHLTCaloDigitContainerDataStruct.h | 4 +- HLT/CALO/AliHLTCaloFourier.cxx | 13 ++++- HLT/CALO/AliHLTCaloFourier.h | 6 +- HLT/CALO/AliHLTCaloMapper.cxx | 57 ++++--------------- HLT/CALO/AliHLTCaloProcessor.h | 7 ++- HLT/CALO/AliHLTCaloRawAnalyzerComponentv3.cxx | 5 +- HLT/CALO/AliHLTCaloRcuFFTDataStruct.h | 21 ++++--- HLT/EMCAL/AliHLTEMCALMapper.cxx | 17 +----- 11 files changed, 77 insertions(+), 83 deletions(-) diff --git a/HLT/CALO/AliHLTCaloChannelRawDataStruct.h b/HLT/CALO/AliHLTCaloChannelRawDataStruct.h index 96758bc322f..c8768bb868a 100644 --- a/HLT/CALO/AliHLTCaloChannelRawDataStruct.h +++ b/HLT/CALO/AliHLTCaloChannelRawDataStruct.h @@ -22,11 +22,11 @@ #include "AliHLTCaloChannelDataStruct.h" #include "AliHLTCaloCoordinate.h" #include "Rtypes.h" -#include "AliHLTCaloConstant.h" + ///comment -using namespace CaloHLTConst; +// using namespace CaloHLTConst; struct AliHLTCaloChannelRawDataStruct : public AliHLTCaloChannelDataStruct { diff --git a/HLT/CALO/AliHLTCaloConstants.cxx b/HLT/CALO/AliHLTCaloConstants.cxx index 9b23bf6c048..67b70190ea9 100644 --- a/HLT/CALO/AliHLTCaloConstants.cxx +++ b/HLT/CALO/AliHLTCaloConstants.cxx @@ -24,6 +24,17 @@ #include "AliHLTCaloConstants.h" + +//const Int_t AliHLTCaloConstants::fgkALTROMAXSAMPLES = 1008; /** #include "AliHLTCaloRcuFFTDataStruct.h" diff --git a/HLT/CALO/AliHLTCaloMapper.cxx b/HLT/CALO/AliHLTCaloMapper.cxx index 897a18ac0f5..05fa05569a8 100644 --- a/HLT/CALO/AliHLTCaloMapper.cxx +++ b/HLT/CALO/AliHLTCaloMapper.cxx @@ -31,7 +31,17 @@ #include #include "AliHLTCaloCoordinate.h" #include "AliHLTCaloConstantsHandler.h" -#include "AliHLTCaloConstants.h" + +//#include "AliHLTCaloConstants.h" + + +//typedef AliHLTCaloConstantsHandler::fCaloConstants->GetCELLSTEP() CELLSTEP; + +//#define fCaloConstants->GetCELLSTEP() CELLSTEP + + + +//typedef CELLSTEP fCaloConstants->GetCELLSTEP(); ClassImp(AliHLTCaloMapper); @@ -98,50 +108,6 @@ AliHLTCaloMapper::GetChannelID(const AliHLTUInt32_t spec, const Int_t hadd) } - -// UShort_t -// AliHLTCaloMapper::GetChannelID(Int_t specification, Int_t hwAddress) -// { - -// Short_t index = 0; - -// if(specification == 0x00001) index = 0; -// else if(specification == 0x00002) index = 1; -// else if(specification == 0x00004) index = 2; -// else if(specification == 0x00008) index = 3; - -// else if(specification == 0x00010) index = 4; -// else if(specification == 0x00020) index = 5; -// else if(specification == 0x00040) index = 6; -// else if(specification == 0x00080) index = 7; - -// else if(specification == 0x00100) index = 8; -// else if(specification == 0x00200) index = 9; -// else if(specification == 0x00400) index = 10; -// else if(specification == 0x00800) index = 11; - -// else if(specification == 0x01000) index = 12; -// else if(specification == 0x02000) index = 13; -// else if(specification == 0x04000) index = 14; -// else if(specification == 0x08000) index = 15; - -// else if(specification == 0x10000) index = 16; -// else if(specification == 0x20000) index = 17; -// else if(specification == 0x40000) index = 18; -// else if(specification == 0x80000) index = 19; - -// else HLTError("Specification 0x%X not consistent with single DDL in PHOS", specification); -// // HLTError("Channel ID: 0x%X Coordinates: x = %d, z = %d, gain = %d", ((fHw2geomapPtr[hwAddress].fXCol + fSpecificationMapPtr[index].fRcuXOffset) |((fHw2geomapPtr[hwAddress].fZRow + fSpecificationMapPtr[index].fRcuZOffset) << 6) | (fHw2geomapPtr[hwAddress].fGain << 12) | fSpecificationMapPtr[index].fModId << 13), -// // fHw2geomapPtr[hwAddress].fXCol, -// // fHw2geomapPtr[hwAddress].fZRow, -// // fHw2geomapPtr[hwAddress].fGain); -// return ((fHw2geomapPtr[hwAddress].fXCol + fSpecificationMapPtr[index].fRcuXOffset) | -// ((fHw2geomapPtr[hwAddress].fZRow + fSpecificationMapPtr[index].fRcuZOffset) << 6) | -// (fHw2geomapPtr[hwAddress].fGain << 12) | -// fSpecificationMapPtr[index].fModId << 13); -// } - - void AliHLTCaloMapper::GetChannelCoord(const UShort_t channelId, UShort_t* channelCoord) { @@ -167,6 +133,7 @@ void AliHLTCaloMapper::GetLocalCoord(const int channelId, Float_t* localCoord) const { localCoord[0] = (static_cast(channelId&0x3f) - fCaloConstants->GetNXCOLUMNSMOD()/2)* fCaloConstants->GetCELLSTEP(); + // localCoord[0] = (static_cast(channelId&0x3f) - fCaloConstants->GetNXCOLUMNSMOD()/2)*CELLSTEP; localCoord[1] = (static_cast((channelId >> 6)&0x3f) - fCaloConstants->GetNZROWSMOD()/2) * fCaloConstants->GetCELLSTEP(); // printf("Local coordinates: x = %f, z = %f\n", channelCoord[0], channelCoord[1]); } diff --git a/HLT/CALO/AliHLTCaloProcessor.h b/HLT/CALO/AliHLTCaloProcessor.h index 4c3ff094ed3..95fec45e92e 100644 --- a/HLT/CALO/AliHLTCaloProcessor.h +++ b/HLT/CALO/AliHLTCaloProcessor.h @@ -8,11 +8,12 @@ #include "AliHLTProcessor.h" //#include "AliHLTCaloBase.h" -#include "AliHLTCaloDefinitions.h" +// #include "AliHLTCaloDefinitions.h" #include "AliHLTDataTypes.h" -#include "AliHLTCaloConstant.h" -using namespace CaloHLTConst; +// #include "AliHLTCaloConstant.h" + +// using namespace CaloHLTConst; //class AliHLTCaloProcessor:public AliHLTProcessor, public AliHLTCaloBase class AliHLTCaloProcessor:public AliHLTProcessor diff --git a/HLT/CALO/AliHLTCaloRawAnalyzerComponentv3.cxx b/HLT/CALO/AliHLTCaloRawAnalyzerComponentv3.cxx index 6a972cc9e75..2b38dfaa4f8 100644 --- a/HLT/CALO/AliHLTCaloRawAnalyzerComponentv3.cxx +++ b/HLT/CALO/AliHLTCaloRawAnalyzerComponentv3.cxx @@ -29,7 +29,10 @@ #include "AliAltroRawStreamV3.h" #include "AliCaloRawStreamV3.h" #include "AliHLTCaloConstantsHandler.h" -#include "AliHLTCaloConstants.h" + + +//#include "AliHLTCaloConstants.h" + #include "AliHLTCaloRcuProcessor.h" #include "AliHLTCaloCrazynessDefinitions.h" #include "AliHLTCaloChannelRawDataStruct.h" diff --git a/HLT/CALO/AliHLTCaloRcuFFTDataStruct.h b/HLT/CALO/AliHLTCaloRcuFFTDataStruct.h index 9f9c07e8ffd..84034a2774a 100644 --- a/HLT/CALO/AliHLTCaloRcuFFTDataStruct.h +++ b/HLT/CALO/AliHLTCaloRcuFFTDataStruct.h @@ -3,19 +3,26 @@ #ifndef ALIHLTCALORCUFFTDATASTRUCT_H #define ALIHLTCALORCUFFTDATASTRUCT_H - - #include "Rtypes.h" -#include "AliHLTCaloConstant.h" -using namespace CaloHLTConst; +//#include "AliHLTCaloConstant.h" +#include "AliHLTCaloConstants.h" + +// using namespace CaloHLTConst; struct AliHLTCaloRcuFFTDataStruct { int fDataLength; - Double_t fGlobalAccumulatedPSD[NGAINS][ALTROMAXSAMPLES]; - Double_t fGlobalLastPSD[NGAINS][ALTROMAXSAMPLES]; - // Double_t fDummy[64][64][NGAINS]; + + // Double_t fGlobalAccumulatedPSD[NGAINS][ALTROMAXSAMPLES]; + // Double_t fGlobalLastPSD[NGAINS][ALTROMAXSAMPLES]; + + + Double_t fGlobalAccumulatedPSD[fgkNGAINS][fgkALTROMAXSAMPLES]; + Double_t fGlobalLastPSD[fgkNGAINS][fgkALTROMAXSAMPLES]; + + // Double_t fGlobalAccumulatedPSD[AliHLTCaloConstants::fgkNGAINS][AliHLTCaloConstants::fgkALTROMAXSAMPLES]; + // Double_t fGlobalLastPSD[AliHLTCaloConstants::fgkNGAINS][AliHLTCaloConstants::fgkALTROMAXSAMPLES]; }; diff --git a/HLT/EMCAL/AliHLTEMCALMapper.cxx b/HLT/EMCAL/AliHLTEMCALMapper.cxx index 01926e59318..fd2ae4ddc50 100644 --- a/HLT/EMCAL/AliHLTEMCALMapper.cxx +++ b/HLT/EMCAL/AliHLTEMCALMapper.cxx @@ -18,6 +18,7 @@ #include "AliHLTEMCALMapper.h" #include "AliHLTEMCALConstant.h" + #include "assert.h" using namespace EmcalHLTConst; @@ -30,7 +31,7 @@ AliHLTEMCALMapper::AliHLTEMCALMapper(const unsigned long specification ) : AliHL fCellSize = 6; InitAltroMapping(specification); InitDDLSpecificationMapping(); - fIsInitializedMapping = true; //CRAP PTH, must check is the initilization actually went ok + fIsInitializedMapping = true; //CRAP PTH, must check if the initilization actually went ok } @@ -40,10 +41,6 @@ AliHLTEMCALMapper::~AliHLTEMCALMapper() } - -// channelCoord[0] = (static_cast(channelId&0x3f) - NXCOLUMNSMOD/2)* fCellStep; -// channelCoord[1] = (static_cast((channelId >> 6)&0x3f) - NZROWSMOD/2) * fCellStep; - void AliHLTEMCALMapper::GetLocalCoord(const int channelId, Float_t* localCoord) const { @@ -66,16 +63,9 @@ AliHLTEMCALMapper::InitAltroMapping(const unsigned long specification ) if(base !=0) { - // int tmpddlindex = GetDDLFromSpec( specification )%2; - sprintf(fFilepath, "%s/EMCAL/mapping/%s", base, DDL2RcuMapFileName( GetDDLFromSpec( specification ) ) ); sprintf(fFilepath, "%s/EMCAL/mapping/%s", base, DDL2RcuMapFileName( GetDDLFromSpec( specification ) ) ); - // assert("DDL spec is %d", GetDDLFromSpec( specification ) ); - - ////cout << __FILE__ <<":"<< __LINE__ <<"DDL spec is " << GetDDLFromSpec( specification ) << endl; - //cout << __FILE__ <<":"<< __LINE__ <<"mapping filename is " << fFilepath << endl; - // sprintf(fFilepath,"%s/PHOS/mapping/RCU0.data", base); FILE *fp = fopen(fFilepath, "r"); if(fp != 0) { @@ -93,8 +83,6 @@ AliHLTEMCALMapper::InitAltroMapping(const unsigned long specification ) { res = fscanf(fp, "%d %d %d %d\n", &tmpHwaddr, &tmpXCol, &tmpZRow, &tmpGain); - // //cout << __FILE__ << __LINE__ << " tmpHwaddr = " << tmpHwaddr << ", tmpXCol = " << (int)tmpXCol << ", tmpZRow = "<< (int)tmpZRow << ", tmpGain= "<< (int)tmpGain << endl; - if(tmpGain < 2) { fHw2geomapPtr[tmpHwaddr].fXCol = (char)tmpXCol; @@ -107,7 +95,6 @@ AliHLTEMCALMapper::InitAltroMapping(const unsigned long specification ) } else { - //cout << __FUNCTION__ << ":"<<__FILE__<<":"<< __LINE__ << "ERROR, could not open mapping file %s" << fFilepath << endl; fIsInitializedMapping = false; } } -- 2.43.0