From 292c304e1cb392352116a4033a427793a5e0b7da Mon Sep 17 00:00:00 2001 From: masera Date: Mon, 21 Mar 2011 22:33:50 +0000 Subject: [PATCH] Coding conventions (O. Borysov) --- ITS/AliITSChannelDaSSD.h | 1 - ITS/AliITSHandleDaSSD.cxx | 15 ++++++++------- ITS/AliITSHandleDaSSD.h | 16 ++++++++-------- ITS/ITSSSDPEDda.cxx | 5 ++++- 4 files changed, 20 insertions(+), 17 deletions(-) diff --git a/ITS/AliITSChannelDaSSD.h b/ITS/AliITSChannelDaSSD.h index 3408ab0ecb6..f00866b7e8a 100644 --- a/ITS/AliITSChannelDaSSD.h +++ b/ITS/AliITSChannelDaSSD.h @@ -13,7 +13,6 @@ /// /////////////////////////////////////////////////////////////////////////////// -#include "TMath.h" #include "TObject.h" diff --git a/ITS/AliITSHandleDaSSD.cxx b/ITS/AliITSHandleDaSSD.cxx index a17b9681c55..fc01e7b1cab 100644 --- a/ITS/AliITSHandleDaSSD.cxx +++ b/ITS/AliITSHandleDaSSD.cxx @@ -33,6 +33,7 @@ #include "event.h" #include "TFile.h" #include "TString.h" +#include "TMath.h" #include "AliLog.h" #include "AliITSNoiseSSDv2.h" #include "AliITSPedestalSSDv2.h" @@ -642,9 +643,9 @@ Bool_t AliITSHandleDaSSD::RelocateModules() //______________________________________________________________________________ -Bool_t AliITSHandleDaSSD::AddFeromCm(AliITSModuleDaSSD *const module) -// Restore the original signal value adding CM calculated and subtracted in ferom +Bool_t AliITSHandleDaSSD::AddFeromCm(const AliITSModuleDaSSD *const module) { +// Restore the original signal value adding CM calculated and subtracted in ferom AliITSChannelDaSSD *strip; Short_t *signal, *cmferom; @@ -676,7 +677,7 @@ Bool_t AliITSHandleDaSSD::AddFeromCm(AliITSModuleDaSSD *const module) //______________________________________________________________________________ -Bool_t AliITSHandleDaSSD::CalculatePedestal(AliITSModuleDaSSD *const module) +Bool_t AliITSHandleDaSSD::CalculatePedestal(const AliITSModuleDaSSD *const module) { // Calculates Pedestal AliITSChannelDaSSD *strip; @@ -725,7 +726,7 @@ Bool_t AliITSHandleDaSSD::CalculatePedestal(AliITSModuleDaSSD *const module) //______________________________________________________________________________ -Bool_t AliITSHandleDaSSD::CalculateNoise(AliITSModuleDaSSD *const module) +Bool_t AliITSHandleDaSSD::CalculateNoise(const AliITSModuleDaSSD *const module) { // Calculates Noise AliITSChannelDaSSD *strip; @@ -1224,8 +1225,8 @@ Bool_t AliITSHandleDaSSD::AdDataPresent(const Int_t ddl, const Int_t ad) const //___________________________________________________________________________________________ Bool_t AliITSHandleDaSSD::SaveEqSlotCalibrationData(const Int_t ddl, const Int_t ad, const Char_t *fname) const -// Saves calibration files for selected equipment (DDL) { +// Saves calibration files for selected equipment (DDL) fstream feefile; Int_t zsml, offsetml; ULong_t zsth, offset, zsoffset; @@ -1378,7 +1379,7 @@ ULong_t AliITSHandleDaSSD::OffsetValue(const UChar_t ddl, const UChar_t ad, cons //______________________________________________________________________________ -ULong_t AliITSHandleDaSSD::ZsThreshold(AliITSChannelDaSSD *strip) const +ULong_t AliITSHandleDaSSD::ZsThreshold(const AliITSChannelDaSSD *strip) const { // Calculate the value of zero suppression threshold to be upload to FEROM ULong_t zs; @@ -1490,7 +1491,7 @@ Int_t AliITSHandleDaSSD::CheckOffChips() const //______________________________________________________________________________ -Bool_t AliITSHandleDaSSD::CalculatePedNoiseW(AliITSModuleDaSSD *const module) +Bool_t AliITSHandleDaSSD::CalculatePedNoiseW(const AliITSModuleDaSSD *const module) { // Calculates Pedestal and Noise using Welford algorithm AliITSChannelDaSSD *strip; diff --git a/ITS/AliITSHandleDaSSD.h b/ITS/AliITSHandleDaSSD.h index e03675c4e5d..ff66c79b823 100644 --- a/ITS/AliITSHandleDaSSD.h +++ b/ITS/AliITSHandleDaSSD.h @@ -10,8 +10,6 @@ #include "TObject.h" #include "TArrayS.h" #include "AliITSModuleDaSSD.h" -#include "AliITSBadChannelsSSDv2.h" -#include "AliITSNoiseSSDv2.h" /////////////////////////////////////////////////////////////////////////////// /// @@ -23,6 +21,9 @@ using namespace std; +class AliITSBadChannelsSSDv2; +class AliITSNoiseSSDv2; + class AliITSHandleDaSSD : public TObject { public : AliITSHandleDaSSD(); @@ -80,14 +81,14 @@ class AliITSHandleDaSSD : public TObject { Int_t ReadCalibrationDataFile (char* fileName, const Long_t eventsnumber); virtual Int_t ReadModuleRawData (const Int_t modulesnumber); - virtual Bool_t CalculatePedestal(AliITSModuleDaSSD *const module); - virtual Bool_t CalculateNoise(AliITSModuleDaSSD *const module); + virtual Bool_t CalculatePedestal(const AliITSModuleDaSSD *const module); + virtual Bool_t CalculateNoise(const AliITSModuleDaSSD *const module); virtual Bool_t CalculateNoiseCM(AliITSModuleDaSSD *const module); virtual Bool_t CalculateCM(AliITSModuleDaSSD *const module); - virtual Bool_t CalculatePedNoiseW(AliITSModuleDaSSD *const module); + virtual Bool_t CalculatePedNoiseW(const AliITSModuleDaSSD *const module); virtual Bool_t CalculateCMW(AliITSModuleDaSSD *const module); virtual Bool_t CalculateNoiseCMW(AliITSModuleDaSSD *const module); - virtual Bool_t AddFeromCm(AliITSModuleDaSSD *const module); + virtual Bool_t AddFeromCm(const AliITSModuleDaSSD *const module); virtual Bool_t ProcessRawData(const Int_t nmread = fgkNumberOfSSDModulesPerDdl, const Bool_t usewelford = kTRUE); virtual Bool_t RelocateModules(); virtual Bool_t AllocateSimulatedModules(const Int_t copymodind = 0); @@ -101,7 +102,7 @@ class AliITSHandleDaSSD : public TObject { ULong_t OffsetValue(const AliITSChannelDaSSD *strip, const UChar_t ddl = 0, const UChar_t ad = 0, const UChar_t adc = 0, const Int_t strn = -1) const; ULong_t OffsetValue(const UChar_t ddl, const UChar_t ad, const UChar_t adc, const Int_t strn) const; - ULong_t ZsThreshold(AliITSChannelDaSSD *strip) const; + ULong_t ZsThreshold(const AliITSChannelDaSSD *strip) const; ULong_t ZsThreshold(const UChar_t ddl, const UChar_t ad, const UChar_t adc, const Int_t strn) const; virtual void Reset(); @@ -169,4 +170,3 @@ class AliITSHandleDaSSD : public TObject { }; #endif - diff --git a/ITS/ITSSSDPEDda.cxx b/ITS/ITSSSDPEDda.cxx index 190cb42691d..b0cbaa40c05 100644 --- a/ITS/ITSSSDPEDda.cxx +++ b/ITS/ITSSSDPEDda.cxx @@ -28,7 +28,8 @@ using namespace std; -struct ConfigStruct { +class ConfigStruct { +public: Int_t fNModuleProcess; string fSsdDdlMap; string fBadChannels; @@ -43,6 +44,7 @@ Bool_t ReadDAConfigurationFile(const Char_t *configfname, AliITSHandleDaSSD *con int main( int argc, char** argv ) { +// Implements SSD DA executable. const Char_t *configfname = "ssddaconfig.txt"; const Char_t *bcfname = "badchannels.root"; const Char_t *ddlmfname = "ssdddlmap.txt"; @@ -141,6 +143,7 @@ int main( int argc, char** argv ) //__________________________________________________________________________________________ Int_t SaveEquipmentCalibrationData(const AliITSHandleDaSSD *ssddaldc, const Char_t *fprefix) { +// Saves the files with Offset correction and ZS threshold. TString feefilename; Int_t count = 0, status; for (Int_t ddli = 0; ddli < 16; ddli++) { -- 2.43.0