Merge branch 'master' into TPCdev

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

diff --git a/ITS/AliITSv11GeomCable.cxx b/ITS/AliITSv11GeomCable.cxx
index fbbded178905a3f7abd578db2cddfc4628fb216c..4a780558a6350da49fb32e6f052e04aa28b3f4bd 100644 (file)
--- a/ITS/AliITSv11GeomCable.cxx
+++ b/ITS/AliITSv11GeomCable.cxx
@@ -22,6 +22,7 @@
 
 // Root Geometry includes
 #include <TGeoManager.h>
+#include <TGeoMatrix.h>
 #include <TGeoVolume.h>
 #include <TGeoNode.h>
 
@@ -38,40 +39,32 @@
 
 ClassImp(AliITSv11GeomCable)
 
+
 //________________________________________________________________________
-AliITSv11GeomCable::AliITSv11GeomCable(const char* name) { 
+AliITSv11GeomCable::AliITSv11GeomCable(): TNamed(),
+  fDebug(0),
+  fPointArray(),
+  fVolumeArray(),
+  fCurrentVol(0),
+  fInitialNode(0)
+{ 
   // constructor
-  fDebug = 0;
-  fInitialNode = 0;
-  fPointArray.SetOwner(); 
-  SetName(name);
+  fPointArray.SetOwner();
+  for(Int_t i=0;i<fgkCableMaxNodeLevel;i++)fNodeInd[i]=0;
 }
 
-
 //________________________________________________________________________
-AliITSv11GeomCable::AliITSv11GeomCable(const AliITSv11GeomCable &s) :
-  TNamed(s.GetName(),s.GetTitle()),fDebug(s.fDebug),fPointArray(s.fPointArray),
-  fVolumeArray(s.fVolumeArray),fInitialNode(s.fInitialNode)
-{
-  //     Copy Constructor 
-  printf("Copy Constructor of AliITSv11GeomCable ???\n");  
+AliITSv11GeomCable::AliITSv11GeomCable(const char* name): TNamed(name,""),
+  fDebug(0),
+  fPointArray(),
+  fVolumeArray(),
+  fCurrentVol(0),
+  fInitialNode(0) { 
+  // constructor
+  fPointArray.SetOwner(); 
+  for(Int_t i=0;i<fgkCableMaxNodeLevel;i++)fNodeInd[i]=0;
 }
 
-//________________________________________________________________________
-AliITSv11GeomCable& AliITSv11GeomCable::operator=(const AliITSv11GeomCable &s) {
-  //     Assignment operator
-  // Not fully inplemented yet !!!
-  printf("Assignment operator of AliITSv11GeomCable not fully inplemented yet !!!\n");  
-
-  if(&s == this) return *this;
-  SetName(s.GetName());
-  SetTitle(s.GetTitle());
-  fDebug = s.fDebug;
-//   fPointArray = s.fPointArray;
-//   fVolumeArray = s.fVolumeArray;
-  fInitialNode = s.fInitialNode;
-  return *this;
-}
 
 //________________________________________________________________________
 AliITSv11GeomCable::~AliITSv11GeomCable() {
@@ -171,7 +164,7 @@ void AliITSv11GeomCable::ResetInitialNode() {
 }
 
 //________________________________________________________________________
-bool AliITSv11GeomCable::CheckDaughter(TGeoNode* node, Int_t i)
+bool AliITSv11GeomCable::CheckDaughter(const TGeoNode* node, Int_t i)
 {
 // Search where is the current volume in the tree of nodes
 // stop each time it find the pointer of the current volume