The operator[] is replaced by At() or AddAt() in case of TObjArray.

[u/mrichter/AliRoot.git] / MUON / AliMUONSegmentationV01.cxx

diff --git a/MUON/AliMUONSegmentationV01.cxx b/MUON/AliMUONSegmentationV01.cxx
index 201a2f714312fce506493e4e0f1835abd6da5580..c22dce0fba10ee62a57c66fa11be1d58606534ff 100644 (file)
--- a/MUON/AliMUONSegmentationV01.cxx
+++ b/MUON/AliMUONSegmentationV01.cxx
@@ -15,6 +15,30 @@
 
 /*
 $Log$
+Revision 1.20  2001/07/20 10:03:14  morsch
+Changes needed to work with Root 3.01 (substitute lhs [] operator). (Jiri Chudoba)
+
+Revision 1.19  2001/05/16 14:57:17  alibrary
+New files for folders and Stack
+
+Revision 1.18  2001/04/11 12:33:56  morsch
+Bug in GetPadC in case of staggered planes corrected. (Thanks to J.P. Cussonneau)
+
+Revision 1.17  2001/01/30 12:17:04  morsch
+Remove obolete print-statement.
+
+Revision 1.16  2001/01/30 09:23:14  hristov
+Streamers removed (R.Brun)
+
+Revision 1.15  2001/01/26 21:25:48  morsch
+Empty default constructors and.
+
+Revision 1.14  2000/12/21 22:12:41  morsch
+Clean-up of coding rule violations,
+
+Revision 1.13  2000/12/07 10:41:51  hristov
+fCorr replaced by fCorrA
+
 Revision 1.12  2000/12/06 11:55:41  morsch
 Introduce  SetOffsetY(Float_t off) method as simplified simulation of pad staggering.
 fOffset is the staggering offset in y.
@@ -91,23 +115,49 @@ AliMUONSegmentationV01::AliMUONSegmentationV01(const AliMUONSegmentationV01& seg
 {
 // Dummy copy constructor
 }
+
 AliMUONSegmentationV01::AliMUONSegmentationV01() 
 {
 // Default constructor
-    fNsec=4;
+    fRSec = 0;
+    fNDiv = 0;      
+    fDpxD = 0;
+    fCorrA = 0;
+}
+
+AliMUONSegmentationV01::AliMUONSegmentationV01(Int_t nsec) 
+{
+//  Non default constructor
+
+    fNsec = nsec;
     fRSec = new TArrayF(fNsec);
     fNDiv = new TArrayI(fNsec);      
     fDpxD = new TArrayF(fNsec);      
+
+
     (*fRSec)[0]=(*fRSec)[1]=(*fRSec)[2]=(*fRSec)[3]=0;     
     (*fNDiv)[0]=(*fNDiv)[1]=(*fNDiv)[2]=(*fNDiv)[3]=0;     
     (*fDpxD)[0]=(*fDpxD)[1]=(*fDpxD)[2]=(*fDpxD)[3]=0;     
     fCorrA = new TObjArray(3);
-    (*fCorrA)[0]=0;
-    (*fCorrA)[1]=0;
-    (*fCorrA)[2]=0;
+    fCorrA->AddAt(0,0);
+    fCorrA->AddAt(0,1);
+    fCorrA->AddAt(0,2);
     fOffsetY=0;
 } 
 
+AliMUONSegmentationV01::~AliMUONSegmentationV01() 
+{
+// Destructor
+    if (fRSec) delete fRSec;
+    if (fNDiv) delete fNDiv;
+    if (fDpxD) delete fDpxD;
+    if (fCorrA) {
+       fCorrA->Delete();
+       delete fCorrA;
+    }
+} 
+
+
 Float_t AliMUONSegmentationV01::Dpx(Int_t isec) const
 {
 //
@@ -156,7 +206,9 @@ void AliMUONSegmentationV01::Init(Int_t chamber)
 //  This version approximates concentric segmentation zones
 //
     Int_t isec;
-    printf("\n Initialise Segmentation V01\n");
+    //printf("\n Initialise Segmentation V01\n");
+
+
     fNpy=Int_t((*fRSec)[fNsec-1]/fDpy)+1;
 
     (*fDpxD)[fNsec-1]=fDpx;
@@ -267,10 +319,11 @@ GetPadC(Int_t ix, Int_t iy, Float_t &x, Float_t &y)
 {
 //  Returns real coordinates (x,y) for given pad coordinates (ix,iy)
 //
-    y = (iy>0) ? 
-      Float_t(iy*fDpy)-fDpy/2.+fOffsetY 
-      : 
-      Float_t(iy*fDpy)+fDpy/2.-fOffsetY;
+    y = (iy>0) ?
+      Float_t(iy*fDpy)-fDpy/2.+fOffsetY
+      :
+      Float_t(iy*fDpy)+fDpy/2.+fOffsetY; 
+
 //
 //  Find sector isec
     Int_t isec=AliMUONSegmentationV01::Sector(ix,iy);
@@ -368,10 +421,11 @@ void AliMUONSegmentationV01::NextPad()
 }
 
 Int_t AliMUONSegmentationV01::MorePads()
+
+{
 // Stopping condition for the iterator over pads
 //
 // Are there more pads in the integration region
-{
     return  (fIx != -1  || fIy != -1);
 /*
     if ((fX >= fXmax  && fIy >= fIymax) || fY==0) {
@@ -612,12 +666,15 @@ void AliMUONSegmentationV01::Draw(const char* opt) const
 }
 void AliMUONSegmentationV01::SetCorrFunc(Int_t isec, TF1* func)
 {
-    (*fCorrA)[isec]=func;
+// Set the correction function
+    fCorrA->AddAt(func,isec);
 }
 
 TF1* AliMUONSegmentationV01::CorrFunc(Int_t isec) const
 { 
-    return (TF1*) (*fCorrA)[isec];
+// Get correction function
+  //PH    return (TF1*) (*fCorrA)[isec];
+    return (TF1*) fCorrA->At(isec);
 }
 
 AliMUONSegmentationV01& AliMUONSegmentationV01::operator 
@@ -626,3 +683,4 @@ AliMUONSegmentationV01& AliMUONSegmentationV01::operator
 // Dummy assignment operator
     return *this;
 }
+