Remove dependency on f2c

[u/mrichter/AliRoot.git] / TRD / AliTRDtrackingChamber.cxx

diff --git a/TRD/AliTRDtrackingChamber.cxx b/TRD/AliTRDtrackingChamber.cxx
index 5d3d1aeed420db04d4792de56925b05144d9a98e..62629f22a4329eafaf634d14cabf45dcd30a28c3 100644 (file)
--- a/TRD/AliTRDtrackingChamber.cxx
+++ b/TRD/AliTRDtrackingChamber.cxx
@@ -65,11 +65,11 @@ Bool_t AliTRDtrackingChamber::Build(AliTRDgeometry *geo)
 // Calculates radial position of the chamber based on \r
 // radial positions of the time bins (calibration/alignment aware)\r
 //\r
-       Int_t stack = geo->GetChamber(fDetector);\r
-       Int_t plane = geo->GetPlane(fDetector);\r
-       AliTRDpadPlane *pp = geo->GetPadPlane(plane, stack);\r
+       Int_t stack = geo->GetStack(fDetector);\r
+       Int_t layer = geo->GetLayer(fDetector);\r
+       AliTRDpadPlane *pp = geo->GetPadPlane(layer, stack);\r
        Double_t zl = pp->GetRow0ROC() - pp->GetRowEndROC();\r
-       Double_t z0 = geo->GetRow0(plane, stack, 0) - zl;\r
+       Double_t z0 = geo->GetRow0(layer, stack, 0) - zl;\r
        Int_t nrows = pp->GetNrows();\r
        \r
        Int_t index[50], jtb = 0;\r
@@ -168,10 +168,10 @@ AliTRDchamberTimeBin *AliTRDtrackingChamber::GetSeedingLayer(AliTRDgeometry *geo
        const Int_t kMaxPads = 2304;\r
                \r
        // Get the geometrical data of the chamber\r
-       Int_t plane = geo->GetPlane(fDetector);\r
-       Int_t stack = geo->GetChamber(fDetector);\r
+       Int_t layer = geo->GetLayer(fDetector);\r
+       Int_t stack = geo->GetStack(fDetector);\r
        Int_t sector= geo->GetSector(fDetector);\r
-       AliTRDpadPlane *pp = geo->GetPadPlane(plane, stack);\r
+       AliTRDpadPlane *pp = geo->GetPadPlane(layer, stack);\r
        Int_t nCols = pp->GetNcols();\r
        Float_t ymin = TMath::Min(pp->GetCol0(), pp->GetColEnd());\r
        Float_t ymax = TMath::Max(pp->GetCol0(), pp->GetColEnd());\r
@@ -293,7 +293,7 @@ AliTRDchamberTimeBin *AliTRDtrackingChamber::GetSeedingLayer(AliTRDgeometry *geo
        \r
        Float_t pos[3], sig[2];\r
        Short_t signal[7]; memset(&signal[0], 0, 7*sizeof(Short_t));\r
-       AliTRDchamberTimeBin *fakeLayer = new AliTRDchamberTimeBin(plane, stack, sector, z0, zl);\r
+       AliTRDchamberTimeBin *fakeLayer = new AliTRDchamberTimeBin(layer, stack, sector, z0, zl);\r
        AliTRDcluster *cluster = 0x0;\r
        if(nCandidates){\r
                UInt_t fakeIndex = 0;\r
@@ -335,7 +335,7 @@ AliTRDchamberTimeBin *AliTRDtrackingChamber::GetSeedingLayer(AliTRDgeometry *geo
                //              hist(i,j) = histogram[i][j];\r
                TTreeSRedirector &cstreamer = *AliTRDtrackerV1::DebugStreamer();\r
                cstreamer << "GetSeedingLayer"\r
-               << "plane="      << plane\r
+               << "layer="      << layer\r
                << "ymin="       << ymin\r
                << "ymax="       << ymax\r
                << "zmin="       << zmin\r