From 6f67f5b3f42068baf2e87eb70c33b5dd86cd491b Mon Sep 17 00:00:00 2001 From: masera Date: Tue, 20 Dec 2011 15:26:27 +0000 Subject: [PATCH] Coding conventions --- ITS/AliITSCalibrationSSD.h | 2 -- ITS/AliITSPedestalSSD.h | 2 +- ITS/AliITSPreprocessorSSD.cxx | 21 +++++++++++---------- ITS/AliITSsegmentationSSD.cxx | 16 ++++++++-------- ITS/AliITSsegmentationSSD.h | 5 ++++- ITS/AliITSsimulationSSD.cxx | 12 ++++++------ 6 files changed, 30 insertions(+), 28 deletions(-) diff --git a/ITS/AliITSCalibrationSSD.h b/ITS/AliITSCalibrationSSD.h index 1468adcade9..78ca7873d00 100644 --- a/ITS/AliITSCalibrationSSD.h +++ b/ITS/AliITSCalibrationSSD.h @@ -7,8 +7,6 @@ #include "AliITSPedestalSSDv2.h" #include "AliITSGainSSDv2.h" #include "AliITSBadChannelsSSDv2.h" -#include "TArrayF.h" -#include "TArrayI.h" /* $Id$ */ ////////////////////////////////////////////// diff --git a/ITS/AliITSPedestalSSD.h b/ITS/AliITSPedestalSSD.h index 4e2d1db6a8b..c77d5034bf4 100644 --- a/ITS/AliITSPedestalSSD.h +++ b/ITS/AliITSPedestalSSD.h @@ -1,7 +1,7 @@ #ifndef ALIITSPEDESTALSSD_H #define ALIITSPEDESTALSSD_H -#include "TObjArray.h" +#include "TObject.h" #include "TArrayF.h" ////////////////////////////////////////////// diff --git a/ITS/AliITSPreprocessorSSD.cxx b/ITS/AliITSPreprocessorSSD.cxx index cf6c0ac8210..1e5be965633 100644 --- a/ITS/AliITSPreprocessorSSD.cxx +++ b/ITS/AliITSPreprocessorSSD.cxx @@ -1,3 +1,11 @@ +// +// Author: Enrico Fragiacomo +// Date: 13/10/2006 +// +// SHUTTLE preprocessing class for SSD calibration files + +/* $Id$ */ + #include "AliITSPreprocessorSSD.h" #include "AliCDBMetaData.h" @@ -14,14 +22,6 @@ #include -// -// Author: Enrico Fragiacomo -// Date: 13/10/2006 -// -// SHUTTLE preprocessing class for SSD calibration files - -/* $Id$ */ - const Int_t AliITSPreprocessorSSD::fgkNumberOfSSD = 1698; ClassImp(AliITSPreprocessorSSD) @@ -38,11 +38,12 @@ AliITSPreprocessorSSD::AliITSPreprocessorSSD(AliShuttleInterface* shuttle) : } -///______________________________________________________________________________________________ +//______________________________________________________________________________________________ void AliITSPreprocessorSSD::Initialize(Int_t run, UInt_t startTime, UInt_t endTime) { - + // initialize + AliPreprocessor::Initialize(run, startTime, endTime); Log(Form("\n\tRun %d \n\tStartTime %s \n\tEndTime %s", run, diff --git a/ITS/AliITSsegmentationSSD.cxx b/ITS/AliITSsegmentationSSD.cxx index b4868a3fcf7..85aea1ad86f 100644 --- a/ITS/AliITSsegmentationSSD.cxx +++ b/ITS/AliITSsegmentationSSD.cxx @@ -159,20 +159,20 @@ void AliITSsegmentationSSD::GetPadTxz(Float_t &x,Float_t &z) const{ z = (x1 - tanN*(z1 - fDz))/fPitch; */ - Float_t P=0; - Float_t N=0; + Float_t tP=0; + Float_t tN=0; if(fLayer==5) { - P = 105.26*x - 0.7895*z + 382.000; //- 0.79*z + 381.89; - N = P + 3.684*z - 4; + tP = 105.26*x - 0.7895*z + 382.000; //- 0.79*z + 381.89; + tN = tP + 3.684*z - 4; } else if(fLayer==6) { - P = -105.26*x - 0.7895*z + 385.000; //- 0.79*z + 384.66; - N = P + 3.684*z + 4; + tP = -105.26*x - 0.7895*z + 385.000; //- 0.79*z + 384.66; + tN = tP + 3.684*z + 4; } else AliError("Layer can be 5 or 6"); - x=P; - z=N; + x=tP; + z=tN; } //---------------------------------------------------------------------- diff --git a/ITS/AliITSsegmentationSSD.h b/ITS/AliITSsegmentationSSD.h index 6c38737ca78..38b3a50d0e6 100644 --- a/ITS/AliITSsegmentationSSD.h +++ b/ITS/AliITSsegmentationSSD.h @@ -3,7 +3,10 @@ #include "AliITSsegmentation.h" -// segmentation for SSD +////////////////////////////////////////////////////// +// Segmentation class for SSD // +// // +////////////////////////////////////////////////////// /* $Id$ */ diff --git a/ITS/AliITSsimulationSSD.cxx b/ITS/AliITSsimulationSSD.cxx index 13eed8b6c93..2424a030861 100644 --- a/ITS/AliITSsimulationSSD.cxx +++ b/ITS/AliITSsimulationSSD.cxx @@ -333,11 +333,11 @@ void AliITSsimulationSSD::HitToDigit(Int_t module, Double_t x0, Double_t y0, Double_t inf[2], sup[2], par0[2]; // Set up corrections for Lorentz drift (ExB) - Double_t TanLorAngP = fTanLorAngP; - Double_t TanLorAngN = fTanLorAngN; + Double_t tanLorAngP = fTanLorAngP; + Double_t tanLorAngN = fTanLorAngN; if(seg->GetLayer()==6) { - TanLorAngP = -1.*fTanLorAngP; - TanLorAngN = -1.*fTanLorAngN; + tanLorAngP = -1.*fTanLorAngP; + tanLorAngN = -1.*fTanLorAngN; } // Steps in the module are determined "manually" (i.e. No Geant) @@ -382,7 +382,7 @@ void AliITSsimulationSSD::HitToDigit(Int_t module, Double_t x0, Double_t y0, // correction for the Lorentz's angle if(fLorentz) { - Float_t deltaxp = (y+(seg->Dy()*1.0E-4)/2)*TanLorAngP; + Float_t deltaxp = (y+(seg->Dy()*1.0E-4)/2)*tanLorAngP; xp+=deltaxp; } @@ -432,7 +432,7 @@ void AliITSsimulationSSD::HitToDigit(Int_t module, Double_t x0, Double_t y0, // correction for the Lorentz's angle if(fLorentz) { - Float_t deltaxn = ((seg->Dy()*1.0E-4)/2-y)*TanLorAngN; + Float_t deltaxn = ((seg->Dy()*1.0E-4)/2-y)*tanLorAngN; xp+=deltaxn; } -- 2.43.0