From af6a2273133f300000e13e69a9846443f43d8a08 Mon Sep 17 00:00:00 2001 From: phille Date: Thu, 29 Nov 2007 00:24:39 +0000 Subject: [PATCH] Coding conventions --- HLT/PHOS/AliHLTPHOSBase.cxx | 3 ++ HLT/PHOS/AliHLTPHOSBase.h | 15 ++++-- HLT/PHOS/AliHLTPHOSBaselineAnalyzer.h | 12 ++--- HLT/PHOS/AliHLTPHOSDigitMakerComponent.cxx | 3 +- HLT/PHOS/AliHLTPHOSDigitMakerComponent.h | 2 +- HLT/PHOS/AliHLTPHOSMapper.cxx | 47 +++++++------------ HLT/PHOS/AliHLTPHOSMapper.h | 34 +++----------- HLT/PHOS/AliHLTPHOSRawAnalyzerComponent.cxx | 8 ++-- .../AliHLTPHOSRcuHistogramProducerComponent.h | 12 +++-- 9 files changed, 58 insertions(+), 78 deletions(-) diff --git a/HLT/PHOS/AliHLTPHOSBase.cxx b/HLT/PHOS/AliHLTPHOSBase.cxx index 1d6cdf4cc85..b1398efedbf 100644 --- a/HLT/PHOS/AliHLTPHOSBase.cxx +++ b/HLT/PHOS/AliHLTPHOSBase.cxx @@ -37,6 +37,9 @@ AliHLTPHOSBase::~AliHLTPHOSBase() bool AliHLTPHOSBase::CheckFile(const char *fileName, const char *opt) const { + //returns true if the file specified by "fileName exists and has acceees rights specified by "opt", + //returns false if it doesnt exist, or it exists, but doesnt have the access right specified by "opt" + FILE *fp = fopen(fileName, opt); if(fp == 0) diff --git a/HLT/PHOS/AliHLTPHOSBase.h b/HLT/PHOS/AliHLTPHOSBase.h index 60e6a277436..48d24206e61 100644 --- a/HLT/PHOS/AliHLTPHOSBase.h +++ b/HLT/PHOS/AliHLTPHOSBase.h @@ -30,6 +30,13 @@ using namespace PhosHLTConst; using namespace std; +// +// Base class for all PHOS HLT classes. +// The class contains some utility functions +// and also loads data about the HLT configuration +// and the altro/FEE configuration +// + class AliHLTPHOSBase : public AliHLTPHOSConfig, public AliHLTPHOSAltroConfig { @@ -55,7 +62,7 @@ class AliHLTPHOSBase : public AliHLTPHOSConfig, public AliHLTPHOSAltroConfig } template - void ResetArray(T *array, int N) + void ResetArray(T *array, int N) const { for(int i= 0; i< N; i++) { @@ -64,7 +71,7 @@ class AliHLTPHOSBase : public AliHLTPHOSConfig, public AliHLTPHOSAltroConfig } template - T MaxValue(T *array, int N) + T MaxValue(T *array, int N) const { T tmpMax = 0; @@ -81,8 +88,8 @@ class AliHLTPHOSBase : public AliHLTPHOSConfig, public AliHLTPHOSAltroConfig protected: - AliHLTPHOSConfig *fConfigPtr; - AliHLTPHOSConfig *fAltroConfigPtr; + AliHLTPHOSConfig *fConfigPtr; // object holding HLT configuration data + AliHLTPHOSConfig *fAltroConfigPtr; // object holding Altro configuration data private: AliHLTPHOSBase(const AliHLTPHOSBase & ); diff --git a/HLT/PHOS/AliHLTPHOSBaselineAnalyzer.h b/HLT/PHOS/AliHLTPHOSBaselineAnalyzer.h index fd2249d3139..2f0c1a0a49a 100644 --- a/HLT/PHOS/AliHLTPHOSBaselineAnalyzer.h +++ b/HLT/PHOS/AliHLTPHOSBaselineAnalyzer.h @@ -137,22 +137,22 @@ public: private: /** At which time index to start the measuring of the baseline */ - Int_t fSampleStart; + Int_t fSampleStart; // Shutting up rule checker /** Not used anymore */ - Int_t fMaxCrazyDifference; + Int_t fMaxCrazyDifference; // Shutting up rule checker /** Maximum signal level, used to not count channels with signals for baseline measurement */ - Int_t fMaxSignal; + Int_t fMaxSignal; // Shutting up rule checker /** Count of channels, not used anymore */ - Int_t fChannelCount; + Int_t fChannelCount; // Shutting up rule checker /** Array containing the baselines of all channels */ - Float_t fBaselines[N_XCOLUMNS_MOD][N_ZROWS_MOD][N_GAINS]; + Float_t fBaselines[N_XCOLUMNS_MOD][N_ZROWS_MOD][N_GAINS]; // Shutting up rule checker /** Array containing the accumulated baselines for all channels */ - Float_t fAccumulatedBaselines[N_XCOLUMNS_MOD][N_ZROWS_MOD][N_GAINS][2]; + Float_t fAccumulatedBaselines[N_XCOLUMNS_MOD][N_ZROWS_MOD][N_GAINS][2]; // Shutting up rule checker /** Pointer to a tree containing TClonesArray of AliHLTPHOSBaseline objects */ TTree *fTreePtr; //! transient diff --git a/HLT/PHOS/AliHLTPHOSDigitMakerComponent.cxx b/HLT/PHOS/AliHLTPHOSDigitMakerComponent.cxx index d787fe08172..572907337c8 100644 --- a/HLT/PHOS/AliHLTPHOSDigitMakerComponent.cxx +++ b/HLT/PHOS/AliHLTPHOSDigitMakerComponent.cxx @@ -75,12 +75,11 @@ AliHLTPHOSDigitMakerComponent::GetComponentID() return "PhosDigitMaker"; } -void +void AliHLTPHOSDigitMakerComponent::GetInputDataTypes(vector& list) { //see header file for documentation - const AliHLTComponentDataType* pType=fgkInputDataTypes; while (pType->fID!=0) { list.push_back(*pType); diff --git a/HLT/PHOS/AliHLTPHOSDigitMakerComponent.h b/HLT/PHOS/AliHLTPHOSDigitMakerComponent.h index 13881abfb6a..d100c5f638a 100644 --- a/HLT/PHOS/AliHLTPHOSDigitMakerComponent.h +++ b/HLT/PHOS/AliHLTPHOSDigitMakerComponent.h @@ -96,7 +96,7 @@ private: AliHLTPHOSDigitContainerDataStruct *fDigitContainerPtr; //! transient /** Event count */ - UInt_t fEvtCnt; + // UInt_t fEvtCnt; static const AliHLTComponentDataType fgkInputDataTypes[]; //HLT input data type diff --git a/HLT/PHOS/AliHLTPHOSMapper.cxx b/HLT/PHOS/AliHLTPHOSMapper.cxx index b4ef3c1e460..37e81e747f3 100644 --- a/HLT/PHOS/AliHLTPHOSMapper.cxx +++ b/HLT/PHOS/AliHLTPHOSMapper.cxx @@ -16,10 +16,16 @@ * provided "as is" without express or implied warranty. * **************************************************************************/ +// +// Mapping class fro mapping +// from hardware address to geometrical address +// +// + #include "AliHLTPHOSMapper.h" -AliHLTPHOSMapper::AliHLTPHOSMapper() : AliHLTPHOSBase(), hw2geomapPtr(0) +AliHLTPHOSMapper::AliHLTPHOSMapper() : AliHLTPHOSBase(), fHw2geomapPtr(0) { // printf("\nCreating new mapper\n"); InitAltroMapping(); @@ -34,6 +40,8 @@ AliHLTPHOSMapper::~AliHLTPHOSMapper() void AliHLTPHOSMapper::InitAltroMapping() { + // Loads mapping between Altro addresses and geometrical addresses from file + char filename[256]; char *base = getenv("ALICE_ROOT"); int nChannels = 0; @@ -46,7 +54,7 @@ AliHLTPHOSMapper::InitAltroMapping() if(base !=0) { sprintf(filename,"%s/PHOS/mapping/RCU0.data", base); - // printf("AliHLTPHOSMapper::InitAltroMapping()") + FILE *fp = fopen(filename, "r"); if(fp != 0) { @@ -55,44 +63,23 @@ AliHLTPHOSMapper::InitAltroMapping() fscanf(fp, "%d", &maxaddr); printf("nChannels = %d", nChannels); printf("maxaddr = %d", maxaddr); - hw2geomapPtr = new altromap[maxaddr +1]; + fHw2geomapPtr = new fAltromap[maxaddr +1]; for(int i=0; i< maxaddr + 1 ; i ++) { - hw2geomapPtr[i].xCol = 0; - hw2geomapPtr[i].zRow = 0; - hw2geomapPtr[i].gain = 0; + fHw2geomapPtr[i].fXCol = 0; + fHw2geomapPtr[i].fZRow = 0; + fHw2geomapPtr[i].fGain = 0; } - - // printf("\n"); - for(int i=0; i -#include -#include -//#include "AliHLTPHOSCommonDefs.h" -//#include "AliHLTPHOSConstants.h" #include "AliHLTPHOSBase.h" - -// PhosHLTConst -using namespace std; -using namespace PhosHLTConst; + +//using namespace PhosHLTConst; class AliHLTPHOSMapper : public AliHLTPHOSBase { @@ -40,23 +30,13 @@ class AliHLTPHOSMapper : public AliHLTPHOSBase virtual ~AliHLTPHOSMapper(); void InitAltroMapping(); - struct altromap{ - // int mod; - int zRow; - int xCol; - int gain; - // int rcu; - // int branch; - // int card; - // int chip; - // int chan; - // int csp; - // int num; - // int hid; + struct fAltromap{ + int fZRow; // Coordinate in Z direction (beam direction) relatve too one RCU + int fXCol; // Coordinate in X direction (perpendicular too beam direction an parallell to ground) relatve too one RCU + int fGain; // Gain (high gain = 1, low gain = 0) }; - -altromap *hw2geomapPtr; + fAltromap *fHw2geomapPtr; //pointer to structure holding information about geometrical address }; diff --git a/HLT/PHOS/AliHLTPHOSRawAnalyzerComponent.cxx b/HLT/PHOS/AliHLTPHOSRawAnalyzerComponent.cxx index 874c3894e76..b0164d0e29a 100644 --- a/HLT/PHOS/AliHLTPHOSRawAnalyzerComponent.cxx +++ b/HLT/PHOS/AliHLTPHOSRawAnalyzerComponent.cxx @@ -19,14 +19,12 @@ #include "AliHLTPHOSRawAnalyzer.h" #include "AliHLTPHOSRawAnalyzerComponent.h" #include "AliHLTPHOSRcuCellEnergyDataStruct.h" -//#include "AliHLTPHOSRcuChannelDataStruct.h" #include "AliHLTPHOSMapper.h" #include "AliHLTPHOSSanityInspector.h" #include "AliHLTPHOSBaseline.h" #include "TFile.h" #include "TTree.h" #include "TClonesArray.h" - #include "AliAltroDecoder.h" // decoder for altro payload #include "AliAltroData.h" // container for altro payload #include "AliAltroBunch.h" // container for altro bunches @@ -165,9 +163,9 @@ AliHLTPHOSRawAnalyzerComponent::DoEvent( const AliHLTComponentEventData& evtData fAnalyzerPtr->SetData(fAltroDataPtr->GetData()); fAnalyzerPtr->Evaluate(0, fAltroDataPtr->GetDataSize() -2); - fOutPtr->fValidData[tmpChannelCnt].fZ = fMapperPtr->hw2geomapPtr[fAltroDataPtr->GetHadd()].zRow; - fOutPtr->fValidData[tmpChannelCnt].fX = fMapperPtr->hw2geomapPtr[fAltroDataPtr->GetHadd()].xCol; - fOutPtr->fValidData[tmpChannelCnt].fGain = fMapperPtr->hw2geomapPtr[fAltroDataPtr->GetHadd()].gain; + fOutPtr->fValidData[tmpChannelCnt].fZ = fMapperPtr->fHw2geomapPtr[fAltroDataPtr->GetHadd()].fZRow; + fOutPtr->fValidData[tmpChannelCnt].fX = fMapperPtr->fHw2geomapPtr[fAltroDataPtr->GetHadd()].fXCol; + fOutPtr->fValidData[tmpChannelCnt].fGain = fMapperPtr->fHw2geomapPtr[fAltroDataPtr->GetHadd()].fGain; if(fUseBaselineSubtraction) { diff --git a/HLT/PHOS/AliHLTPHOSRcuHistogramProducerComponent.h b/HLT/PHOS/AliHLTPHOSRcuHistogramProducerComponent.h index 85044e33ead..f324b63f96f 100644 --- a/HLT/PHOS/AliHLTPHOSRcuHistogramProducerComponent.h +++ b/HLT/PHOS/AliHLTPHOSRcuHistogramProducerComponent.h @@ -7,6 +7,13 @@ #include "AliHLTPHOSRcuProcessor.h" +// +// Class tp produce calibration data +// too be sendt to the HLT file exhange server +// and to the PHOS HLT monitoring GUI +// + + class AliHLTPHOSRcuHistogramProducer; class AliHLTPHOSRcuCellAccumulatedEnergyDataStruct; class AliHLTPHOSSharedMemoryInterface; @@ -31,12 +38,11 @@ class AliHLTPHOSRcuHistogramProducerComponent:public AliHLTPHOSRcuProcessor using AliHLTPHOSRcuProcessor::DoEvent; private: + int fHistoWriteFrequency; AliHLTPHOSRcuHistogramProducer* fRcuHistoProducerPtr; /**