Coding conventions
authormasera <masera@f7af4fe6-9843-0410-8265-dc069ae4e863>
Wed, 14 Dec 2011 16:13:16 +0000 (16:13 +0000)
committermasera <masera@f7af4fe6-9843-0410-8265-dc069ae4e863>
Wed, 14 Dec 2011 16:13:16 +0000 (16:13 +0000)
18 files changed:
ITS/AliITSAlignMille2Module.cxx
ITS/AliITSAlignMille2Module.h
ITS/AliITSCalibrationSPD.cxx
ITS/AliITSCalibrationSPD.h
ITS/AliITSChannelStatus.cxx
ITS/AliITSChannelStatus.h
ITS/AliITSCompressRawDataSDD.h
ITS/AliITSCorrMap1DSDD.cxx
ITS/AliITSCorrMap1DSDD.h
ITS/AliITSCorrMap2DSDD.cxx
ITS/AliITSCorrMap2DSDD.h
ITS/AliITSCorrMapSDD.cxx
ITS/AliITSCorrMapSDD.h
ITS/AliITSCorrectSDDPoints.cxx
ITS/AliITSCorrectSDDPoints.h
ITS/AliITSDDLRawData.h
ITS/AliITSv11GeometrySDD.cxx
ITS/AliITSv11GeometrySDD.h

index 4262db8..c9817f7 100644 (file)
@@ -1186,7 +1186,7 @@ void AliITSAlignMille2Module::CalcDerivCurLoc(Int_t sensVol,Int_t paridx,Double_
 \r
 \r
 //-------------------------------------------------------------\r
-void AliITSAlignMille2Module::GetGlobalParams(Double_t *t, Double_t *r)\r
+void AliITSAlignMille2Module::GetGlobalParams(Double_t *t, Double_t *r) const\r
 {\r
   // global parameters of the module\r
   AliAlignObjParams tempAlignObj;\r
index e679be6..2de4f06 100644 (file)
@@ -117,7 +117,7 @@ public:
   AliAlignObjParams *GetSensitiveVolumeMisalignment(UShort_t voluid, const AliAlignObjParams *a); \r
   AliAlignObjParams *GetSensitiveVolumeMisalignment(UShort_t voluid, const Double_t *deltalocal); \r
   //\r
-  void         GetGlobalParams(Double_t *t, Double_t *r);\r
+  void         GetGlobalParams(Double_t *t, Double_t *r) const;\r
   void         GetGlobalParams(const Double_t *loct, const Double_t *locr,Double_t *t, Double_t *r);\r
   void         GetLocalParams(const Double_t *loct, const Double_t *locr,Double_t *t, Double_t *r);\r
   //\r
index ac5ae29..917078c 100644 (file)
@@ -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<fNrBad*2; i++) {
            fBadChannels[i] = fBadChannelsV1[i];
@@ -264,14 +265,14 @@ void AliITSCalibrationSPD::Streamer(TBuffer &R__b) {
        }
       }
     }
-    R__b.CheckByteCount(R__s, R__c, AliITSCalibrationSPD::IsA());
+    ruub.CheckByteCount(ruus, ruuc, AliITSCalibrationSPD::IsA());
   }
   else {
-    R__c = R__b.WriteVersion(AliITSCalibrationSPD::IsA(), kTRUE);
-    AliITSCalibration::Streamer(R__b);
-    R__b << fNrBad;
-    fBadChannels.Streamer(R__b);
-    R__b.WriteArray(fBadChip, 5);
-    R__b.SetByteCount(R__c, kTRUE);
+    ruuc = ruub.WriteVersion(AliITSCalibrationSPD::IsA(), kTRUE);
+    AliITSCalibration::Streamer(ruub);
+    ruub << fNrBad;
+    fBadChannels.Streamer(ruub);
+    ruub.WriteArray(fBadChip, 5);
+    ruub.SetByteCount(ruuc, kTRUE);
   }
 }
index 3ce02f1..d30f9fc 100644 (file)
@@ -4,7 +4,7 @@
  * See cxx source for full Copyright notice                               */
 
 /* $Id$ */
-#include "TRandom.h"
+//#include "TRandom.h"
 #include "AliITSCalibration.h"
 #include "TArrayS.h"
 
index a151f5b..4cd2c3d 100644 (file)
@@ -34,6 +34,8 @@
 #include "AliITSsegmentationSPD.h"
 #include "AliITSsegmentationSDD.h"
 #include "AliITSsegmentationSSD.h"
+#include "AliITSDetTypeRec.h"
+#include "AliCDBManager.h"
 #include "AliCDBEntry.h"
 #include "TMath.h"
 #include "AliLog.h"
index 331f167..e0d40f7 100644 (file)
 
 #include <TObject.h>
 #include <TBits.h>
-#include "AliCDBManager.h"
-#include "AliITSDetTypeRec.h"
 
 class TString;
+class AliCDBManager;
+class AliITSDetTypeRec;
 
 class AliITSChannelStatus : public TObject {
 
index 11f4f94..7f629e7 100644 (file)
@@ -8,7 +8,6 @@
 
 #include<TObject.h>
 #include<TString.h>
-#include"AliRawReader.h"
 
 ///////////////////////////////////////////////////////////////////
 //                                                               //
@@ -18,6 +17,8 @@
 //                                                               //
 ///////////////////////////////////////////////////////////////////
 
+class AliRawReader;
+
 class AliITSCompressRawDataSDD : public TObject {
 
  public:
index 1def458..ad6025c 100644 (file)
@@ -26,6 +26,7 @@
 #include "AliITSCorrMapSDD.h"
 #include "AliITSCorrMap1DSDD.h"
 #include "AliLog.h"
+#include "AliITSsegmentationSDD.h"
 
 ClassImp(AliITSCorrMap1DSDD)
 //______________________________________________________________________
index 7896b2a..2340d94 100644 (file)
 //                                                               //
 ///////////////////////////////////////////////////////////////////
 
-#include "AliITSsegmentationSDD.h"
+
 #include<TNamed.h>
+
 class TH1F;
+class AliITSsegmentationSDD;
 
 class AliITSCorrMap1DSDD : public AliITSCorrMapSDD {
 
index b2c30e5..2cf02df 100644 (file)
@@ -27,6 +27,7 @@
 #include "AliITSCorrMapSDD.h"\r
 #include "AliITSCorrMap2DSDD.h"\r
 #include "AliLog.h"\r
+#include "AliITSsegmentationSDD.h"\r
 \r
 ClassImp(AliITSCorrMap2DSDD)\r
 //______________________________________________________________________\r
index 34d2f34..8b891d2 100644 (file)
 //                                                               //
 ///////////////////////////////////////////////////////////////////
 
-#include "AliITSsegmentationSDD.h"
 #include<TNamed.h>
 class TH1F;
 class TH2F;
+class AliITSsegmentationSDD;
 
 class AliITSCorrMap2DSDD : public AliITSCorrMapSDD {
 
index 9e20993..5825995 100644 (file)
@@ -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;
index f64259d..c1c968a 100644 (file)
 //                                                               //
 ///////////////////////////////////////////////////////////////////
 
-#include "AliITSsegmentationSDD.h"
 #include<TNamed.h>
+#include "AliLog.h"
 class TH1F;
 class TH2F;
+class AliITSsegmentationSDD;
 
 class AliITSCorrMapSDD : public TNamed {
 
index e0edc41..3ec3f9b 100644 (file)
 //                                                               //
 ///////////////////////////////////////////////////////////////////
 
+#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;
index 23a32c3..8dbd478 100644 (file)
 //                                                               //
 ///////////////////////////////////////////////////////////////////
 
-#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
index 5edfba7..b70b162 100644 (file)
@@ -12,6 +12,7 @@
 #define AliITSDDLRAWDATA_H
 
 class TTree;
+class TBranch;
 class AliITSDDLModuleMapSDD;
 class AliITSFOSignalsSPD;
 
index 61d01b2..334a502 100755 (executable)
@@ -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);
index a70a604..74a6765 100755 (executable)
@@ -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