removal of obsolete classes - cleanup of AliITSClusterFinder.cxx

[u/mrichter/AliRoot.git] / STEER / AliAlignmentTracks.cxx

diff --git a/STEER/AliAlignmentTracks.cxx b/STEER/AliAlignmentTracks.cxx
index 33b1d2d42ecb382977d0abce3371b9bddc3d89ac..1836a314b719d66587634fe90f1d17c06eaf1e6a 100644 (file)
--- a/STEER/AliAlignmentTracks.cxx
+++ b/STEER/AliAlignmentTracks.cxx
@@ -153,6 +153,9 @@ void AliAlignmentTracks::ProcessESD()
 
   AliESD *esd = 0;
   fESDChain->SetBranchAddress("ESD",&esd);
+  AliESDfriend *esdf = 0; 
+  fESDChain->SetBranchStatus("ESDfriend*",1);
+  fESDChain->SetBranchAddress("ESDfriend.",&esdf);
 
   // Open the output file
   if (fPointsFilename.Data() == "") {
@@ -172,6 +175,9 @@ void AliAlignmentTracks::ProcessESD()
   Int_t ievent = 0;
   while (fESDChain->GetEntry(ievent++)) {
     if (!esd) break;
+
+    esd->SetESDfriend(esdf); //Attach the friend to the ESD
+
     Int_t ntracks = esd->GetNumberOfTracks();
     for (Int_t itrack=0; itrack < ntracks; itrack++) {
       AliESDtrack * track = esd->GetTrack(itrack);
@@ -216,7 +222,7 @@ void AliAlignmentTracks::BuildIndex()
   // to initialize the volume paths
   AliAlignObjAngles alobj;
 
-  TFile *fPointsFile = TFile::Open(fPointsFilename);
+  fPointsFile = TFile::Open(fPointsFilename);
   if (!fPointsFile || !fPointsFile->IsOpen()) {
     AliWarning(Form("Can't open %s !",fPointsFilename.Data()));
     return;
@@ -231,7 +237,7 @@ void AliAlignmentTracks::BuildIndex()
   }
   fPointsTree->SetBranchAddress("SP", &array);
 
-  Int_t nArrays = fPointsTree->GetEntries();
+  Int_t nArrays = (Int_t)fPointsTree->GetEntries();
   for (Int_t iArray = 0; iArray < nArrays; iArray++)
     {
       fPointsTree->GetEvent(iArray);
@@ -239,8 +245,8 @@ void AliAlignmentTracks::BuildIndex()
       for (Int_t ipoint = 0; ipoint < array->GetNPoints(); ipoint++) {
        UShort_t volId = array->GetVolumeID()[ipoint];
        // check if the volId is valid
-       if (!AliAlignObj::GetVolPath(volId)) {
-         AliError(Form("The volume id %d has no default volume path !",
+       if (!AliAlignObj::SymName(volId)) {
+         AliError(Form("The volume id %d has no default volume name !",
                        volId));
          continue;
        }
@@ -345,7 +351,7 @@ void AliAlignmentTracks::InitAlignObjs()
     fAlignObjs[iLayer] = new AliAlignObj*[AliAlignObj::LayerSize(iLayer + AliAlignObj::kFirstLayer)];
     for (Int_t iModule = 0; iModule < AliAlignObj::LayerSize(iLayer + AliAlignObj::kFirstLayer); iModule++) {
       UShort_t volid = AliAlignObj::LayerToVolUID(iLayer+ AliAlignObj::kFirstLayer,iModule);
-      fAlignObjs[iLayer][iModule] = new AliAlignObjAngles("",volid,0,0,0,0,0,0);
+      fAlignObjs[iLayer][iModule] = new AliAlignObjAngles(AliAlignObj::SymName(volid),volid,0,0,0,0,0,0,kTRUE);
     }
   }
 }
@@ -555,7 +561,7 @@ Int_t AliAlignmentTracks::LoadPoints(const TArrayI *volids, AliTrackPointArray**
   for (Int_t i = 0; i < nArrays; i++) points[i] = 0x0;
 
   // Init the array used to flag already loaded tree entries
-  Bool_t *indexUsed = new Bool_t[fPointsTree->GetEntries()];
+  Bool_t *indexUsed = new Bool_t[(UInt_t)fPointsTree->GetEntries()];
   for (Int_t i = 0; i < fPointsTree->GetEntries(); i++)
     indexUsed[i] = kFALSE;