Fixing problems during merging

[u/mrichter/AliRoot.git] / TPC / AliTPCCalPadRegion.cxx

diff --git a/TPC/AliTPCCalPadRegion.cxx b/TPC/AliTPCCalPadRegion.cxx
index 4b6b22d178c46652597033f806067a2729e85c96..3af7ec5d1e75b54d33be7effc531ce4d584132e0 100644 (file)
--- a/TPC/AliTPCCalPadRegion.cxx
+++ b/TPC/AliTPCCalPadRegion.cxx
@@ -88,12 +88,29 @@ void       AliTPCCalPadRegion::SetObject(TObject* obj, UInt_t segment, UInt_t pa
   //
   // Set the object for given segment
   //
+  if (!fObjects) {
+    fObjects = new TObjArray(fgkNSegments * fgkNPadTypes);
+    fObjects->SetOwner(kTRUE);
+  }
+  if (fObjects->GetEntriesFast()<fgkNSegments * fgkNPadTypes){
+    fObjects->Expand(fgkNSegments * fgkNPadTypes);
+  }
   if (BoundsOk("SetObject", segment, padType)){ 
     if (segment+fgkNSegments*padType>static_cast<UInt_t>(fObjects->GetEntriesFast())) fObjects->Expand(fgkNSegments * fgkNPadTypes);
     fObjects->AddAt(obj, segment+fgkNSegments*padType); 
   }
 }
 
+TObject*   AliTPCCalPadRegion::GetObject(UInt_t segment, UInt_t padType){  
+  //
+  //
+  //
+  if (fObjects->GetEntriesFast()<fgkNSegments * fgkNPadTypes){
+    fObjects->Expand(fgkNSegments * fgkNPadTypes);
+  }
+  return fObjects->At(segment+fgkNSegments*padType); 
+}
+
 
 
 void AliTPCCalPadRegion::GetPadRegionCenterLocal(UInt_t padType, Double_t* xy) {