From cfe3982273471617a9c6b4bb25892fb73e6ca201 Mon Sep 17 00:00:00 2001 From: masera Date: Wed, 14 Dec 2011 16:13:16 +0000 Subject: [PATCH] Coding conventions --- ITS/AliITSAlignMille2Module.cxx | 2 +- ITS/AliITSAlignMille2Module.h | 2 +- ITS/AliITSCalibrationSPD.cxx | 63 +++++++++++++++++---------------- ITS/AliITSCalibrationSPD.h | 2 +- ITS/AliITSChannelStatus.cxx | 2 ++ ITS/AliITSChannelStatus.h | 4 +-- ITS/AliITSCompressRawDataSDD.h | 3 +- ITS/AliITSCorrMap1DSDD.cxx | 1 + ITS/AliITSCorrMap1DSDD.h | 4 ++- ITS/AliITSCorrMap2DSDD.cxx | 1 + ITS/AliITSCorrMap2DSDD.h | 2 +- ITS/AliITSCorrMapSDD.cxx | 2 +- ITS/AliITSCorrMapSDD.h | 3 +- ITS/AliITSCorrectSDDPoints.cxx | 4 ++- ITS/AliITSCorrectSDDPoints.h | 13 ++++--- ITS/AliITSDDLRawData.h | 1 + ITS/AliITSv11GeometrySDD.cxx | 18 +++++----- ITS/AliITSv11GeometrySDD.h | 8 ++--- 18 files changed, 75 insertions(+), 60 deletions(-) diff --git a/ITS/AliITSAlignMille2Module.cxx b/ITS/AliITSAlignMille2Module.cxx index 4262db870a8..c9817f7d9e0 100644 --- a/ITS/AliITSAlignMille2Module.cxx +++ b/ITS/AliITSAlignMille2Module.cxx @@ -1186,7 +1186,7 @@ void AliITSAlignMille2Module::CalcDerivCurLoc(Int_t sensVol,Int_t paridx,Double_ //------------------------------------------------------------- -void AliITSAlignMille2Module::GetGlobalParams(Double_t *t, Double_t *r) +void AliITSAlignMille2Module::GetGlobalParams(Double_t *t, Double_t *r) const { // global parameters of the module AliAlignObjParams tempAlignObj; diff --git a/ITS/AliITSAlignMille2Module.h b/ITS/AliITSAlignMille2Module.h index e679be69a8d..2de4f068422 100644 --- a/ITS/AliITSAlignMille2Module.h +++ b/ITS/AliITSAlignMille2Module.h @@ -117,7 +117,7 @@ public: AliAlignObjParams *GetSensitiveVolumeMisalignment(UShort_t voluid, const AliAlignObjParams *a); AliAlignObjParams *GetSensitiveVolumeMisalignment(UShort_t voluid, const Double_t *deltalocal); // - void GetGlobalParams(Double_t *t, Double_t *r); + void GetGlobalParams(Double_t *t, Double_t *r) const; void GetGlobalParams(const Double_t *loct, const Double_t *locr,Double_t *t, Double_t *r); void GetLocalParams(const Double_t *loct, const Double_t *locr,Double_t *t, Double_t *r); // diff --git a/ITS/AliITSCalibrationSPD.cxx b/ITS/AliITSCalibrationSPD.cxx index ac5ae299c8b..917078ca97d 100644 --- a/ITS/AliITSCalibrationSPD.cxx +++ b/ITS/AliITSCalibrationSPD.cxx @@ -12,8 +12,9 @@ * about the suitability of this software for any purpose. It is * * provided "as is" without express or implied warranty. * **************************************************************************/ - +#include "TArrayI.h" #include "AliITSCalibrationSPD.h" + /////////////////////////////////////////////////////////////////////////// // Calibration class for set:ITS // Specific subdetector implementation for @@ -222,38 +223,38 @@ void AliITSCalibrationSPD::SetNrBad(UInt_t /*nr*/) { AliError("This method should not be used anymore. Use SetNrBadSingle instead!!!"); } //______________________________________________________________________ -void AliITSCalibrationSPD::Streamer(TBuffer &R__b) { +void AliITSCalibrationSPD::Streamer(TBuffer &ruub) { // Stream an object of class AliITSCalibrationSPD. - UInt_t R__s, R__c; - if (R__b.IsReading()) { - Version_t R__v = R__b.ReadVersion(&R__s, &R__c); if (R__v) { } - AliITSCalibration::Streamer(R__b); - if (R__v >= 8) { - R__b >> fNrBad; - fBadChannels.Streamer(R__b); - R__b.ReadStaticArray((bool*)fBadChip); + UInt_t ruus, ruuc; + if (ruub.IsReading()) { + Version_t ruuv = ruub.ReadVersion(&ruus, &ruuc); if (ruuv) { } + AliITSCalibration::Streamer(ruub); + if (ruuv >= 8) { + ruub >> fNrBad; + fBadChannels.Streamer(ruub); + ruub.ReadStaticArray((bool*)fBadChip); } else { Double_t dummy; - R__b >> dummy; - R__b >> dummy; - R__b >> dummy; - R__b >> dummy; - R__b >> dummy; - R__b >> dummy; - R__b >> dummy; - R__b >> fNrBad; - if (R__v == 7) { - fBadChannels.Streamer(R__b); - R__b.ReadStaticArray((bool*)fBadChip); + ruub >> dummy; + ruub >> dummy; + ruub >> dummy; + ruub >> dummy; + ruub >> dummy; + ruub >> dummy; + ruub >> dummy; + ruub >> fNrBad; + if (ruuv == 7) { + fBadChannels.Streamer(ruub); + ruub.ReadStaticArray((bool*)fBadChip); } else { - if (R__v == 6) { - fBadChannels.Streamer(R__b); + if (ruuv == 6) { + fBadChannels.Streamer(ruub); } else { TArrayI fBadChannelsV1; - fBadChannelsV1.Streamer(R__b); + fBadChannelsV1.Streamer(ruub); fBadChannels.Set(fNrBad*2); for (UInt_t i=0; i #include -#include "AliCDBManager.h" -#include "AliITSDetTypeRec.h" class TString; +class AliCDBManager; +class AliITSDetTypeRec; class AliITSChannelStatus : public TObject { diff --git a/ITS/AliITSCompressRawDataSDD.h b/ITS/AliITSCompressRawDataSDD.h index 11f4f94f793..7f629e79f00 100644 --- a/ITS/AliITSCompressRawDataSDD.h +++ b/ITS/AliITSCompressRawDataSDD.h @@ -8,7 +8,6 @@ #include #include -#include"AliRawReader.h" /////////////////////////////////////////////////////////////////// // // @@ -18,6 +17,8 @@ // // /////////////////////////////////////////////////////////////////// +class AliRawReader; + class AliITSCompressRawDataSDD : public TObject { public: diff --git a/ITS/AliITSCorrMap1DSDD.cxx b/ITS/AliITSCorrMap1DSDD.cxx index 1def4580e98..ad6025c4d81 100644 --- a/ITS/AliITSCorrMap1DSDD.cxx +++ b/ITS/AliITSCorrMap1DSDD.cxx @@ -26,6 +26,7 @@ #include "AliITSCorrMapSDD.h" #include "AliITSCorrMap1DSDD.h" #include "AliLog.h" +#include "AliITSsegmentationSDD.h" ClassImp(AliITSCorrMap1DSDD) //______________________________________________________________________ diff --git a/ITS/AliITSCorrMap1DSDD.h b/ITS/AliITSCorrMap1DSDD.h index 7896b2a1f8a..2340d946ac0 100644 --- a/ITS/AliITSCorrMap1DSDD.h +++ b/ITS/AliITSCorrMap1DSDD.h @@ -13,9 +13,11 @@ // // /////////////////////////////////////////////////////////////////// -#include "AliITSsegmentationSDD.h" + #include + class TH1F; +class AliITSsegmentationSDD; class AliITSCorrMap1DSDD : public AliITSCorrMapSDD { diff --git a/ITS/AliITSCorrMap2DSDD.cxx b/ITS/AliITSCorrMap2DSDD.cxx index b2c30e52a61..2cf02df2ce8 100644 --- a/ITS/AliITSCorrMap2DSDD.cxx +++ b/ITS/AliITSCorrMap2DSDD.cxx @@ -27,6 +27,7 @@ #include "AliITSCorrMapSDD.h" #include "AliITSCorrMap2DSDD.h" #include "AliLog.h" +#include "AliITSsegmentationSDD.h" ClassImp(AliITSCorrMap2DSDD) //______________________________________________________________________ diff --git a/ITS/AliITSCorrMap2DSDD.h b/ITS/AliITSCorrMap2DSDD.h index 34d2f34f538..8b891d2c043 100644 --- a/ITS/AliITSCorrMap2DSDD.h +++ b/ITS/AliITSCorrMap2DSDD.h @@ -13,10 +13,10 @@ // // /////////////////////////////////////////////////////////////////// -#include "AliITSsegmentationSDD.h" #include class TH1F; class TH2F; +class AliITSsegmentationSDD; class AliITSCorrMap2DSDD : public AliITSCorrMapSDD { diff --git a/ITS/AliITSCorrMapSDD.cxx b/ITS/AliITSCorrMapSDD.cxx index 9e209932851..58259956853 100644 --- a/ITS/AliITSCorrMapSDD.cxx +++ b/ITS/AliITSCorrMapSDD.cxx @@ -25,7 +25,7 @@ #include "TH1F.h" #include "TH2F.h" #include "AliITSCorrMapSDD.h" -#include "AliLog.h" +#include "AliITSsegmentationSDD.h" const Int_t AliITSCorrMapSDD::fgkNAnodePtsDefault = 1; const Int_t AliITSCorrMapSDD::fgkNDriftPtsDefault = 72; diff --git a/ITS/AliITSCorrMapSDD.h b/ITS/AliITSCorrMapSDD.h index f64259d2314..c1c968a68f9 100644 --- a/ITS/AliITSCorrMapSDD.h +++ b/ITS/AliITSCorrMapSDD.h @@ -13,10 +13,11 @@ // // /////////////////////////////////////////////////////////////////// -#include "AliITSsegmentationSDD.h" #include +#include "AliLog.h" class TH1F; class TH2F; +class AliITSsegmentationSDD; class AliITSCorrMapSDD : public TNamed { diff --git a/ITS/AliITSCorrectSDDPoints.cxx b/ITS/AliITSCorrectSDDPoints.cxx index e0edc418e63..3ec3f9bd57a 100644 --- a/ITS/AliITSCorrectSDDPoints.cxx +++ b/ITS/AliITSCorrectSDDPoints.cxx @@ -22,12 +22,14 @@ // // /////////////////////////////////////////////////////////////////// +#include "TObjArray.h" #include "TString.h" #include "TFile.h" #include "AliLog.h" #include "AliCDBEntry.h" #include "AliITSCorrMapSDD.h" #include "AliITSCorrectSDDPoints.h" +#include "AliITSsegmentationSDD.h" ClassImp(AliITSCorrectSDDPoints) @@ -79,7 +81,7 @@ AliITSCorrectSDDPoints::~AliITSCorrectSDDPoints(){ } //______________________________________________________________________ -void AliITSCorrectSDDPoints::SetCorrectionMaps(TObjArray *arr) +void AliITSCorrectSDDPoints::SetCorrectionMaps(const TObjArray *arr) { // replace the maps delete fArrayOfMaps; diff --git a/ITS/AliITSCorrectSDDPoints.h b/ITS/AliITSCorrectSDDPoints.h index 23a32c3e1bc..8dbd4786bec 100644 --- a/ITS/AliITSCorrectSDDPoints.h +++ b/ITS/AliITSCorrectSDDPoints.h @@ -13,15 +13,18 @@ // // /////////////////////////////////////////////////////////////////// -#include "AliITSsegmentationSDD.h" -#include "TObjArray.h" +//#include "AliITSsegmentationSDD.h" +//#include "TObjArray.h" + +class AliITSsegmentationSDD; +class TObjArray; class AliITSCorrectSDDPoints : public TObject { public: AliITSCorrectSDDPoints(); AliITSCorrectSDDPoints(TObjArray* maps); AliITSCorrectSDDPoints(TString filname); - void SetCorrectionMaps(TObjArray *arr); + void SetCorrectionMaps(const TObjArray *arr); ~AliITSCorrectSDDPoints(); Float_t GetCorrection(Int_t modId, Float_t zloc, Float_t xloc) const; Float_t GetCorrectedXloc(Int_t modId, Float_t zloc, Float_t xloc) const{ @@ -31,9 +34,9 @@ class AliITSCorrectSDDPoints : public TObject { private: AliITSCorrectSDDPoints(const AliITSCorrectSDDPoints& csdd); AliITSCorrectSDDPoints& operator=(const AliITSCorrectSDDPoints& csdd); - protected: + TObjArray* fArrayOfMaps; // 520 AliITSCorrMapSDD objects AliITSsegmentationSDD* fSegmentationSDD; // SDD segmentation - ClassDef(AliITSCorrectSDDPoints,0); + ClassDef(AliITSCorrectSDDPoints,0) }; #endif diff --git a/ITS/AliITSDDLRawData.h b/ITS/AliITSDDLRawData.h index 5edfba73f4f..b70b1620628 100644 --- a/ITS/AliITSDDLRawData.h +++ b/ITS/AliITSDDLRawData.h @@ -12,6 +12,7 @@ #define AliITSDDLRAWDATA_H class TTree; +class TBranch; class AliITSDDLModuleMapSDD; class AliITSFOSignalsSPD; diff --git a/ITS/AliITSv11GeometrySDD.cxx b/ITS/AliITSv11GeometrySDD.cxx index 61d01b24677..334a5025a7f 100755 --- a/ITS/AliITSv11GeometrySDD.cxx +++ b/ITS/AliITSv11GeometrySDD.cxx @@ -51,8 +51,8 @@ #include "AliITSv11GeomCableFlat.h" #include "AliITSv11GeomCableRound.h" -const char* AliITSv11GeometrySDD::fgSDDsensitiveVolName3 = "ITSsddSensitivL3"; -const char* AliITSv11GeometrySDD::fgSDDsensitiveVolName4 = "ITSsddSensitivL4"; +const char* AliITSv11GeometrySDD::fgkSDDsensitiveVolName3 = "ITSsddSensitivL3"; +const char* AliITSv11GeometrySDD::fgkSDDsensitiveVolName4 = "ITSsddSensitivL4"; const Double_t AliITSv11GeometrySDD::fgkSegmentLength = 37.21*2*fgkmm; const Double_t AliITSv11GeometrySDD::fgkLadderWidth = 50.0*fgkmm; const Double_t AliITSv11GeometrySDD::fgkLadderHeight = 30.0*fgkmm; @@ -3702,23 +3702,23 @@ TGeoVolumeAssembly* AliITSv11GeometrySDD::CreateCarlosCard(Int_t iLay) { Double_t screw1z = ( aaa*sin(TMath::DegToRad()*fgkCarlosSuppAngle) + bbb*cos(TMath::DegToRad()*fgkCarlosSuppAngle) )-0.07; - TGeoRotation *CarlosSuppRot = (TGeoRotation *)fCommonTr[0]; + TGeoRotation *carlosSuppRot = (TGeoRotation *)fCommonTr[0]; TGeoCombiTrans* lScrewTr1 = new TGeoCombiTrans((fgkCarlosSuppX1+ fgkCarlosSuppX2+fgkCarlosSuppX3)/2, - screw1y,screw1z, CarlosSuppRot); + screw1y,screw1z, carlosSuppRot); TGeoCombiTrans* lScrewTr2 = new TGeoCombiTrans((fgkCarlosSuppX1+ fgkCarlosSuppX2+fgkCarlosSuppX3)/2, - screw1z,screw1y, CarlosSuppRot); + screw1z,screw1y, carlosSuppRot); TGeoCombiTrans *lScrewTr3 = new TGeoCombiTrans(-(fgkCarlosSuppX1+ fgkCarlosSuppX2+fgkCarlosSuppX3)/2, - screw1y,screw1z, CarlosSuppRot); + screw1y,screw1z, carlosSuppRot); TGeoCombiTrans *lScrewTr4 = new TGeoCombiTrans(-(fgkCarlosSuppX1+ fgkCarlosSuppX2+fgkCarlosSuppX3)/2, - screw1z,screw1y, CarlosSuppRot); + screw1z,screw1y, carlosSuppRot); assemblySupCarlos->AddNode(fCommonVol[0], 1, lScrewTr1); assemblySupCarlos->AddNode(fCommonVol[0], 2, lScrewTr2); @@ -5084,7 +5084,7 @@ void AliITSv11GeometrySDD::CreateSDDsensor() { wafer3->SetLineColor(fColorSilicon); TGeoBBox *sensBox3 = new TGeoBBox("ITSsddSensorSensBox3", fgkWaferWidthSens/2, fgkWaferThickSens/2, fgkWaferLengthSens/2); - TGeoVolume *sensVol3 = new TGeoVolume(fgSDDsensitiveVolName3,sensBox3, siliconSDDsens); + TGeoVolume *sensVol3 = new TGeoVolume(fgkSDDsensitiveVolName3,sensBox3, siliconSDDsens); sensVol3->SetLineColor(fColorSilicon+5); wafer3->AddNode(sensVol3, 1, 0); fSDDsensor3->AddNode(wafer3, 1, 0); @@ -5093,7 +5093,7 @@ void AliITSv11GeometrySDD::CreateSDDsensor() { wafer4->SetLineColor(fColorSilicon); TGeoBBox *sensBox4 = new TGeoBBox("ITSsddSensorSensBox4", fgkWaferWidthSens/2, fgkWaferThickSens/2, fgkWaferLengthSens/2); - TGeoVolume *sensVol4 = new TGeoVolume(fgSDDsensitiveVolName4,sensBox4, siliconSDDsens); + TGeoVolume *sensVol4 = new TGeoVolume(fgkSDDsensitiveVolName4,sensBox4, siliconSDDsens); sensVol4->SetLineColor(fColorSilicon+5); wafer4->AddNode(sensVol4, 1, 0); fSDDsensor4->AddNode(wafer4, 1, 0); diff --git a/ITS/AliITSv11GeometrySDD.h b/ITS/AliITSv11GeometrySDD.h index a70a60435a2..74a6765f278 100755 --- a/ITS/AliITSv11GeometrySDD.h +++ b/ITS/AliITSv11GeometrySDD.h @@ -68,8 +68,8 @@ class AliITSv11GeometrySDD : public AliITSv11Geometry { virtual void SetParameters(); TGeoVolume* GetMotherVolume() const { return fMotherVol;}; - const char* GetSenstiveVolumeName3() const {return fgSDDsensitiveVolName3;}; - const char* GetSenstiveVolumeName4() const {return fgSDDsensitiveVolName4;}; + const char* GetSenstiveVolumeName3() const {return fgkSDDsensitiveVolName3;}; + const char* GetSenstiveVolumeName4() const {return fgkSDDsensitiveVolName4;}; Int_t GetLay3NLadders() const; Int_t GetLay4NLadders() const; @@ -175,8 +175,8 @@ class AliITSv11GeometrySDD : public AliITSv11Geometry { //-------------------------------------- parameters for the SDD geometry - static const char* fgSDDsensitiveVolName3; // sens. vol. name for lay. 3 - static const char* fgSDDsensitiveVolName4; // sens. vol. name for lay. 4 + static const char* fgkSDDsensitiveVolName3; // sens. vol. name for lay. 3 + static const char* fgkSDDsensitiveVolName4; // sens. vol. name for lay. 4 static const Int_t fgkLay3Nladd; // 14 static const Int_t fgkLay3Ndet; // 6 -- 2.39.3