Changes to obey the coding rules.

diff --git a/CONTAINERS/CONTAINERSLinkDef.h b/CONTAINERS/CONTAINERSLinkDef.h
index f7c02387b0475178e4c0a51dcbe89f663ab1332d..cabc4dcef14ea274696f5eb864c62725e341c872 100644 (file)
--- a/CONTAINERS/CONTAINERSLinkDef.h
+++ b/CONTAINERS/CONTAINERSLinkDef.h
@@ -12,8 +12,8 @@
 #pragma link C++ class AliObjectArray-;
 #pragma link C++ class TArrayOfArray;
 
-#pragma link C++ class TArrayOfArray_vStack;
-#pragma link C++ class TArrayOfArray_vList;
+#pragma link C++ class TArrayOfArrayVStack;
+#pragma link C++ class TArrayOfArrayVList;
 
 
 #pragma link C++ class AliArraySubBranch;

diff --git a/CONTAINERS/TArrayOfArray.cxx b/CONTAINERS/TArrayOfArray.cxx
index 42303687936fcbeb89f0e9cc6a79c7615391b565..7ce4c73684a7d9aa66010998e45d61ab764b8fec 100644 (file)
--- a/CONTAINERS/TArrayOfArray.cxx
+++ b/CONTAINERS/TArrayOfArray.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.1  2000/11/01 16:01:26  kowal2
+Classes for handling the new hits structures
+
 */
 #include "TArrayOfArray.h"
 #include "iostream.h"
@@ -23,17 +26,17 @@ $Log$
 
 
 ClassImp(TArrayOfArray)
-ClassImp(TArrayOfArray_vStack)
-ClassImp(TArrayOfArray_vList)
+ClassImp(TArrayOfArrayVStack)
+ClassImp(TArrayOfArrayVList)
  
 
-TArrayOfArray_vStack::TArrayOfArray_vStack()
+TArrayOfArrayVStack::TArrayOfArrayVStack()
 { 
   fIndex = 0;
   fArray = 0;
 }     
   
-TArrayOfArray_vStack::TArrayOfArray_vStack(const char *classname)
+TArrayOfArrayVStack::TArrayOfArrayVStack(const char *classname)
 {
   fIndex = 0;
   fArray = 0;
@@ -41,13 +44,13 @@ TArrayOfArray_vStack::TArrayOfArray_vStack(const char *classname)
 } 
 
   
-TArrayOfArray_vStack::~TArrayOfArray_vStack()  
+TArrayOfArrayVStack::~TArrayOfArrayVStack()  
 {
   if (fIndex) delete fIndex;
   if (fArray) delete fArray;
 } 
 
-Bool_t TArrayOfArray_vStack::SetClass(const char * classname)
+Bool_t TArrayOfArrayVStack::SetClass(const char * classname)
 {
   //
   //set class
@@ -58,18 +61,18 @@ Bool_t TArrayOfArray_vStack::SetClass(const char * classname)
 }
 
 
-void  TArrayOfArray_vStack::Clear(Option_t *)
+void  TArrayOfArrayVStack::Clear(Option_t *)
 {
   //
   // clear contents
-  //if (fIndex) fIndex->Clear();
-  //if (fArray) fArray->Clear();
-  if (fIndex) fIndex->Resize(0);
-  if (fArray) fArray->Resize(0);
+  if (fIndex) fIndex->Clear();
+  if (fArray) fArray->Clear();
+  //if (fIndex) fIndex->Resize(0);
+  //if (fArray) fArray->Resize(0);
   
 }
 
-void * TArrayOfArray_vStack::At(UInt_t index0, UInt_t index1)
+void * TArrayOfArrayVStack::At(UInt_t index0, UInt_t index1)
 {
   //get pointer to the object
   if ( (fIndex!=0) && (index0+1<fIndex->GetSize()) 
@@ -79,7 +82,7 @@ void * TArrayOfArray_vStack::At(UInt_t index0, UInt_t index1)
   else 
     return 0;
 }
-void  TArrayOfArray_vStack::Dump(UInt_t index0, UInt_t index1)
+void  TArrayOfArrayVStack::Dump(UInt_t index0, UInt_t index1)
 {
   void * p = At(index0,index1);
   if ( (p) && fArray->GetClassInfo()) fArray->GetClassInfo()->ObjectDump(p); 
@@ -90,7 +93,7 @@ void  TArrayOfArray_vStack::Dump(UInt_t index0, UInt_t index1)
   
 }
 
-Int_t TArrayOfArray_vStack::Resize(Int_t index, UInt_t newsize)
+Int_t TArrayOfArrayVStack::Resize(Int_t index, UInt_t newsize)
 { 
   //expand array with index index to newsize
   if (index<0) index = fIndex->GetSize()-2;
@@ -105,7 +108,7 @@ Int_t TArrayOfArray_vStack::Resize(Int_t index, UInt_t newsize)
   return 0;
 }
 
-UInt_t TArrayOfArray_vStack::Push(UInt_t size)
+UInt_t TArrayOfArrayVStack::Push(UInt_t size)
 {
   //make new array with size  - return starting index
   if ( (fIndex==0) || (fArray==0)) return 0;
@@ -125,7 +128,7 @@ UInt_t TArrayOfArray_vStack::Push(UInt_t size)
   return index1-1;
 }
 
-Int_t TArrayOfArray_vStack::ArraySize(UInt_t index)
+Int_t TArrayOfArrayVStack::ArraySize(UInt_t index)
 {
   //size if subarray with index index
   if ( (fIndex) && fIndex->GetSize()>index+1) 

diff --git a/CONTAINERS/TArrayOfArray.h b/CONTAINERS/TArrayOfArray.h
index 9c895c496d8365cb5d5e4546429ee8154a32a01d..cc98a21a0d3f07db484af7a7177a155b104d1f73 100644 (file)
--- a/CONTAINERS/TArrayOfArray.h
+++ b/CONTAINERS/TArrayOfArray.h
@@ -22,11 +22,11 @@ public:
 };
 
 
-class TArrayOfArray_vStack: public TArrayOfArray{
+class TArrayOfArrayVStack: public TArrayOfArray{
 public:  
-  TArrayOfArray_vStack();   
-  TArrayOfArray_vStack(const char *classname);
-  ~TArrayOfArray_vStack(); 
+  TArrayOfArrayVStack();   
+  TArrayOfArrayVStack(const char *classname);
+  ~TArrayOfArrayVStack(); 
   Bool_t SetClass(const char * classname);
   virtual void Clear(Option_t * opt="");
   void * Unchecked1DArray(UInt_t index){return fIndex->Unchecked1DAt(index);}
@@ -45,18 +45,18 @@ public:
 private:
   AliObjectArray * fIndex;
   AliObjectArray * fArray;
-  ClassDef(TArrayOfArray_vStack,1) 
+  ClassDef(TArrayOfArrayVStack,1) 
 };
 
-class TArrayOfArray_vList: public TArrayOfArray{
+class TArrayOfArrayVList: public TArrayOfArray{
 protected:
   AliObjectArray  fIndex;
   AliObjectArray  fSecondaryIndexes;
   AliObjectArray  fArray;
-  ClassDef(TArrayOfArray_vList,1) 
+  ClassDef(TArrayOfArrayVList,1) 
 };
 
-inline void * TArrayOfArray_vStack::Unchecked1DAt(UInt_t index0, UInt_t index1)
+inline void * TArrayOfArrayVStack::Unchecked1DAt(UInt_t index0, UInt_t index1)
 {
   // unchecked return
   return fArray->Unchecked1DAt(((UInt_t*)fIndex->GetArray())[index0]+index1);

diff --git a/TPC/AliTPCTrackHits.cxx b/TPC/AliTPCTrackHits.cxx
index 0d0aeddd55d43e45486265b394a0c97597f885c1..82a94ddce5a7ddb92d8347439ab3c0b9307c218c 100644 (file)
--- a/TPC/AliTPCTrackHits.cxx
+++ b/TPC/AliTPCTrackHits.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.3  2000/11/02 10:22:50  kowal2
+Logs added
+
 */
 ///////////////////////////////////////////////////////////////////////////////
 //                                                                           //
@@ -279,7 +282,7 @@ AliTPCTrackHits::AliTPCTrackHits()
   fTempInfo =0;
   fTrackHitsInfo = new AliObjectArray("AliTrackHitsInfo"); 
   fTrackHitsParam = new AliObjectArray("AliTrackHitsParam");
-  fHitsPosAndQ = new TArrayOfArray_vStack("AliHitInfo");
+  fHitsPosAndQ = new TArrayOfArrayVStack("AliHitInfo");
   fCurrentHit = new AliTPCCurrentHit;
   fgCounter1++;
   fgCounter2++;
@@ -303,11 +306,10 @@ void AliTPCTrackHits::Clear()
 {
   //
   //clear object 
-  //  fTrackHitsInfo->Clear();
-  //fTrackHitsParam->Clear();
-  
-  fTrackHitsInfo->Resize(0);
-  fTrackHitsParam->Resize(0);
+  fTrackHitsInfo->Clear();
+  fTrackHitsParam->Clear();  
+  //fTrackHitsInfo->Resize(0);
+  //fTrackHitsParam->Resize(0);
   fHitsPosAndQ->Clear();
 
   if (fTempInfo){

diff --git a/TPC/AliTPCTrackHits.h b/TPC/AliTPCTrackHits.h
index 2ec33e47e13db7a15a44898221399fda6dcbaf7d..c1c44d7f4697b94808cd2930234b766df98790ef 100644 (file)
--- a/TPC/AliTPCTrackHits.h
+++ b/TPC/AliTPCTrackHits.h
@@ -90,7 +90,7 @@ public:
   void FlushHitStack2(Int_t index1, Int_t index2);   //
   AliObjectArray * fTrackHitsInfo;  //quick information about track
   AliObjectArray * fTrackHitsParam;  //hit information  
-  TArrayOfArray_vStack * fHitsPosAndQ;  //position information
+  TArrayOfArrayVStack * fHitsPosAndQ;  //position information
 
   Double_t fPrecision;  // required precision
   Double_t fStep;       //unit step size