Coding convention: RN17 rule violation -> suppression

[u/mrichter/AliRoot.git] / ITS / AliITSNeuralPoint.cxx

diff --git a/ITS/AliITSNeuralPoint.cxx b/ITS/AliITSNeuralPoint.cxx
index 31762f9654638881804ae886b399f786d7c178b0..960a8405cb0807894f06d1320247cf473904e6b7 100644 (file)
--- a/ITS/AliITSNeuralPoint.cxx
+++ b/ITS/AliITSNeuralPoint.cxx
@@ -11,7 +11,7 @@
 #include <TString.h>
 
 #include "AliITSRecPoint.h"
-#include "AliITSclusterV2.h"
+#include "AliITSRecPoint.h"
 #include "AliITSgeom.h"
 #include "AliITSgeomMatrix.h"
 
@@ -22,39 +22,71 @@ ClassImp(AliITSNeuralPoint)
 //
 //------------------------------------------------------------------------------------------------------
 //
-AliITSNeuralPoint::AliITSNeuralPoint()
-{
+AliITSNeuralPoint::AliITSNeuralPoint():
+fX(0),
+fY(0),
+fZ(0),
+fConfX(0),
+fConfY(0),
+fEX(0),
+fEY(0),
+fEZ(0),
+fCharge(0),
+fModule(0),
+fIndex(0),
+fLayer(0),
+fUser(0),
+fZSort(0){
        // Default constructor.
        // Defines the point as a noise point in the origin.
        
-       fX = fY = fZ = 0.;
-       fEX = fEY = fEZ = 0.;
-       fLayer = 0;
        fLabel[0] = fLabel[1] = fLabel[2] = -1;
-       fModule = 0;
-       fIndex = 0;
-       fUser = 0;
+
 }
 //
 //------------------------------------------------------------------------------------------------------
 //
 AliITSNeuralPoint::AliITSNeuralPoint(AliITSNeuralPoint *p) :
-fX(p->fX), fY(p->fY), fZ(p->fZ), fEX(p->fEX), fEY(p->fEY), fEZ(p->fEZ)
+fX(p->fX), 
+fY(p->fY), 
+fZ(p->fZ),
+fConfX(p->fConfX),
+fConfY(p->fConfY), 
+fEX(p->fEX), 
+fEY(p->fEY), 
+fEZ(p->fEZ),
+fCharge(p->fCharge),
+fModule(p->fModule),
+fIndex(p->fIndex),
+fLayer(p->fLayer),
+fUser(p->fUser),
+fZSort(p->fZSort)
 {
        // Modified copy constructor.
        // Accepts a pointer to a like object and copies its datamembers.
        
-       fLayer = p->fLayer;
+
        for (Int_t i = 0; i < 3; i++) fLabel[i] = p->fLabel[i];
-       fModule = p->fModule;
-       fIndex = p->fIndex;
-       fUser = p->fUser;
-       fCharge = p->fCharge;
+
 }
 //
 //------------------------------------------------------------------------------------------------------
 //
-AliITSNeuralPoint::AliITSNeuralPoint(AliITSRecPoint *rp, AliITSgeomMatrix *gm)
+AliITSNeuralPoint::AliITSNeuralPoint(AliITSRecPoint *rp, AliITSgeomMatrix *gm):
+fX(0),
+fY(0),
+fZ(0),
+fConfX(0),
+fConfY(0),
+fEX(0),
+fEY(0),
+fEZ(0),
+fCharge(0),
+fModule(0),
+fIndex(0),
+fLayer(0),
+fUser(0),
+fZSort(0)
 {
        // Conversion constructor.
        // Accepts a AliITSRecPoint and a AliITSgeomMatrix,
@@ -71,25 +103,25 @@ AliITSNeuralPoint::AliITSNeuralPoint(AliITSRecPoint *rp, AliITSgeomMatrix *gm)
        }
        
        // local to global conversions of coords
-       locPos[0] = rp->fX;
+       locPos[0] = rp->GetDetLocalX();
        locPos[1] = 0.0;
-       locPos[2] = rp->fZ;
+       locPos[2] = rp->GetDetLocalZ();
        gm->LtoGPosition(locPos, globPos);
        fX = globPos[0];
        fY = globPos[1];
        fZ = globPos[2];
 
        // local to global conversions of sigmas
-       locErr[0][0] = rp->fSigmaX2;
-       locErr[2][2] = rp->fSigmaZ2;
+       locErr[0][0] = rp->GetSigmaDetLocX2();
+       locErr[2][2] = rp->GetSigmaZ2();
        gm->LtoGPositionError(locErr, globErr);
-       for (i = 0; i < 3; i++) fLabel[i] = rp->fTracks[i];
+       for (i = 0; i < 3; i++) fLabel[i] = rp->GetLabel(i);
        fEX = TMath::Sqrt(globErr[0][0]);
        fEY = TMath::Sqrt(globErr[1][1]);
        fEZ = TMath::Sqrt(globErr[2][2]);
 
        // copy of other data-members
-       fCharge = rp->fQ;
+       fCharge = rp->GetQ();
        fLayer = 0;
        fIndex = 0;
        fModule = 0;
@@ -98,12 +130,25 @@ AliITSNeuralPoint::AliITSNeuralPoint(AliITSRecPoint *rp, AliITSgeomMatrix *gm)
 //
 //-------------------------------------------------------------------------------------------------
 //
-AliITSNeuralPoint::AliITSNeuralPoint
-(AliITSclusterV2 *rp, AliITSgeom *geom, Short_t module, Short_t index)
+AliITSNeuralPoint::AliITSNeuralPoint(AliITSRecPoint *rp, AliITSgeom *geom, Short_t module, Short_t index):
+fX(0),
+fY(0),
+fZ(0),
+fConfX(0),
+fConfY(0),
+fEX(0),
+fEY(0),
+fEZ(0),
+fCharge(0),
+fModule(0),
+fIndex(0),
+fLayer(0),
+fUser(0),
+fZSort(0)
 {
        // Conversion constructor.
-       // Accepts a AliITSclusterV2 and an AliITSgeom,
-       // and converts the local coord of the AliITSclusterV2 object into global
+       // Accepts a AliITSRecPoint and an AliITSgeom,
+       // and converts the local coord of the AliITSRecPoint object into global
        
        Int_t mod = (Int_t)module, lay, lad, det;
        fModule = module;