Move reconstruction files to new subfolder,
authorjthaeder <jthaeder@f7af4fe6-9843-0410-8265-dc069ae4e863>
Sat, 2 Mar 2013 20:36:32 +0000 (20:36 +0000)
committerjthaeder <jthaeder@f7af4fe6-9843-0410-8265-dc069ae4e863>
Sat, 2 Mar 2013 20:36:32 +0000 (20:36 +0000)
 - obsolete classes removed
 - or moved to TPC/Attic
 - TPCrecLinkDef.h
   - documentation added
   - work package described

60 files changed:
TPC/AliTPCcluster.cxx [deleted file]
TPC/AliTPCcluster.h [deleted file]
TPC/AliTPCclusterer.cxx [deleted file]
TPC/AliTPCclusterer.h [deleted file]
TPC/Attic/AliTPCPid.cxx [moved from TPC/AliTPCPid.cxx with 100% similarity]
TPC/Attic/AliTPCPid.h [moved from TPC/AliTPCPid.h with 100% similarity]
TPC/Attic/AliTPCtrackPid.cxx [moved from TPC/AliTPCtrackPid.cxx with 100% similarity]
TPC/Attic/AliTPCtrackPid.h [moved from TPC/AliTPCtrackPid.h with 100% similarity]
TPC/CMakelibTPCrec.pkg
TPC/Rec/AliClusters.cxx [moved from TPC/AliClusters.cxx with 100% similarity]
TPC/Rec/AliClusters.h [moved from TPC/AliClusters.h with 100% similarity]
TPC/Rec/AliClustersArray.cxx [moved from TPC/AliClustersArray.cxx with 100% similarity]
TPC/Rec/AliClustersArray.h [moved from TPC/AliClustersArray.h with 100% similarity]
TPC/Rec/AliComplexCluster.cxx [moved from TPC/AliComplexCluster.cxx with 100% similarity]
TPC/Rec/AliComplexCluster.h [moved from TPC/AliComplexCluster.h with 100% similarity]
TPC/Rec/AliCosmicTracker.cxx [moved from TPC/AliCosmicTracker.cxx with 100% similarity]
TPC/Rec/AliCosmicTracker.h [moved from TPC/AliCosmicTracker.h with 100% similarity]
TPC/Rec/AliPadMax.cxx [moved from TPC/AliPadMax.cxx with 100% similarity]
TPC/Rec/AliPadMax.h [moved from TPC/AliPadMax.h with 100% similarity]
TPC/Rec/AliTPCClusterParam.cxx [moved from TPC/AliTPCClusterParam.cxx with 100% similarity]
TPC/Rec/AliTPCClusterParam.h [moved from TPC/AliTPCClusterParam.h with 100% similarity]
TPC/Rec/AliTPCClustersArray.cxx [moved from TPC/AliTPCClustersArray.cxx with 100% similarity]
TPC/Rec/AliTPCClustersArray.h [moved from TPC/AliTPCClustersArray.h with 100% similarity]
TPC/Rec/AliTPCClustersRow.cxx [moved from TPC/AliTPCClustersRow.cxx with 96% similarity]
TPC/Rec/AliTPCClustersRow.h [moved from TPC/AliTPCClustersRow.h with 100% similarity]
TPC/Rec/AliTPCCosmicTrackfit.cxx [moved from TPC/AliTPCCosmicTrackfit.cxx with 100% similarity]
TPC/Rec/AliTPCCosmicTrackfit.h [moved from TPC/AliTPCCosmicTrackfit.h with 100% similarity]
TPC/Rec/AliTPCCosmicUtils.cxx [moved from TPC/AliTPCCosmicUtils.cxx with 100% similarity]
TPC/Rec/AliTPCCosmicUtils.h [moved from TPC/AliTPCCosmicUtils.h with 100% similarity]
TPC/Rec/AliTPCQADataMakerRec.cxx [moved from TPC/AliTPCQADataMakerRec.cxx with 100% similarity]
TPC/Rec/AliTPCQADataMakerRec.h [moved from TPC/AliTPCQADataMakerRec.h with 100% similarity]
TPC/Rec/AliTPCRecoParam.cxx [moved from TPC/AliTPCRecoParam.cxx with 100% similarity]
TPC/Rec/AliTPCRecoParam.h [moved from TPC/AliTPCRecoParam.h with 100% similarity]
TPC/Rec/AliTPCReconstructor.cxx [moved from TPC/AliTPCReconstructor.cxx with 100% similarity]
TPC/Rec/AliTPCReconstructor.h [moved from TPC/AliTPCReconstructor.h with 100% similarity]
TPC/Rec/AliTPCTracklet.cxx [moved from TPC/AliTPCTracklet.cxx with 100% similarity]
TPC/Rec/AliTPCTracklet.h [moved from TPC/AliTPCTracklet.h with 100% similarity]
TPC/Rec/AliTPCclusterInfo.cxx [moved from TPC/AliTPCclusterInfo.cxx with 100% similarity]
TPC/Rec/AliTPCclusterInfo.h [moved from TPC/AliTPCclusterInfo.h with 100% similarity]
TPC/Rec/AliTPCclusterKr.cxx [moved from TPC/AliTPCclusterKr.cxx with 100% similarity]
TPC/Rec/AliTPCclusterKr.h [moved from TPC/AliTPCclusterKr.h with 100% similarity]
TPC/Rec/AliTPCclusterMI.cxx [moved from TPC/AliTPCclusterMI.cxx with 100% similarity]
TPC/Rec/AliTPCclusterMI.h [moved from TPC/AliTPCclusterMI.h with 100% similarity]
TPC/Rec/AliTPCclustererKr.cxx [moved from TPC/AliTPCclustererKr.cxx with 81% similarity]
TPC/Rec/AliTPCclustererKr.h [moved from TPC/AliTPCclustererKr.h with 96% similarity]
TPC/Rec/AliTPCclustererMI.cxx [moved from TPC/AliTPCclustererMI.cxx with 89% similarity]
TPC/Rec/AliTPCclustererMI.h [moved from TPC/AliTPCclustererMI.h with 98% similarity]
TPC/Rec/AliTPCpolyTrack.cxx [moved from TPC/AliTPCpolyTrack.cxx with 100% similarity]
TPC/Rec/AliTPCpolyTrack.h [moved from TPC/AliTPCpolyTrack.h with 100% similarity]
TPC/Rec/AliTPCseed.cxx [moved from TPC/AliTPCseed.cxx with 100% similarity]
TPC/Rec/AliTPCseed.h [moved from TPC/AliTPCseed.h with 100% similarity]
TPC/Rec/AliTPCtrack.cxx [moved from TPC/AliTPCtrack.cxx with 100% similarity]
TPC/Rec/AliTPCtrack.h [moved from TPC/AliTPCtrack.h with 100% similarity]
TPC/Rec/AliTPCtrackerMI.cxx [moved from TPC/AliTPCtrackerMI.cxx with 100% similarity]
TPC/Rec/AliTPCtrackerMI.h [moved from TPC/AliTPCtrackerMI.h with 100% similarity]
TPC/Rec/AliTPCtrackerSector.cxx [moved from TPC/AliTPCtrackerSector.cxx with 99% similarity]
TPC/Rec/AliTPCtrackerSector.h [moved from TPC/AliTPCtrackerSector.h with 100% similarity]
TPC/Rec/AliTPCvtpr.cxx [moved from TPC/AliTPCvtpr.cxx with 100% similarity]
TPC/Rec/AliTPCvtpr.h [moved from TPC/AliTPCvtpr.h with 100% similarity]
TPC/TPCrecLinkDef.h

diff --git a/TPC/AliTPCcluster.cxx b/TPC/AliTPCcluster.cxx
deleted file mode 100644 (file)
index 22232c0..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-/**************************************************************************
- * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
- *                                                                        *
- * Author: The ALICE Off-line Project.                                    *
- * Contributors are mentioned in the code where appropriate.              *
- *                                                                        *
- * Permission to use, copy, modify and distribute this software and its   *
- * documentation strictly for non-commercial purposes is hereby granted   *
- * without fee, provided that the above copyright notice appears in all   *
- * copies and that both the copyright notice and this permission notice   *
- * appear in the supporting documentation. The authors make no claims     *
- * about the suitability of this software for any purpose. It is          *
- * provided "as is" without express or implied warranty.                  *
- **************************************************************************/
-
-/* $Id$ */
-
-//-----------------------------------------------------------------
-//           Implementation of the TPC cluster class
-//
-// Origin: Iouri Belikov, CERN, Jouri.Belikov@cern.ch
-//-----------------------------------------------------------------
-
-#include "AliTPCcluster.h"
-
-ClassImp(AliTPCcluster)
-//
-AliTPCcluster::AliTPCcluster(Int_t *lab, Float_t *hit):
-  AliCluster(0,hit,0.,0.,lab),
-  fQ(0.)
-{
-  //
-  // constructor
-  //
-  fQ=hit[4];
-}
-//____________________________________________________________________________
-Double_t AliTPCcluster::SigmaY2(Double_t r, Double_t tgl, Double_t pt)
-{
-  //
-  // Parametrised error of the cluster reconstruction (pad direction)
-  //
-  // Sigma rphi
-  const Float_t kArphi=0.41818e-2;
-  const Float_t kBrphi=0.17460e-4;
-  const Float_t kCrphi=0.30993e-2;
-  const Float_t kDrphi=0.41061e-3;
-
-  pt=TMath::Abs(pt)*1000.;
-  Double_t x=r/pt;
-  tgl=TMath::Abs(tgl);
-  Double_t s=kArphi - kBrphi*r*tgl + kCrphi*x*x + kDrphi*x;
-  if (s<0.4e-3) s=0.4e-3;
-  s*=1.3; //Iouri Belikov
-
-  return s;
-}
-
-
-//____________________________________________________________________________
-Double_t AliTPCcluster::SigmaZ2(Double_t r, Double_t tgl)
-{
-  //
-  // Parametrised error of the cluster reconstruction (drift direction)
-  //
-  // Sigma z
-  const Float_t kAz=0.39614e-2;
-  const Float_t kBz=0.22443e-4;
-  const Float_t kCz=0.51504e-1;
-
-
-  tgl=TMath::Abs(tgl);
-  Double_t s=kAz - kBz*r*tgl + kCz*tgl*tgl;
-  if (s<0.4e-3) s=0.4e-3;
-  s*=1.3; //Iouri Belikov
-
-  return s;
-}
-
diff --git a/TPC/AliTPCcluster.h b/TPC/AliTPCcluster.h
deleted file mode 100644 (file)
index f3bfaaf..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-#ifndef ALITPCCLUSTER_H
-#define ALITPCCLUSTER_H
-/* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
- * See cxx source for full Copyright notice                               */
-
-/* $Id$ */
-
-//-------------------------------------------------------
-//                    TPC Cluster Class
-//
-//   Origin: Iouri Belikov, CERN, Jouri.Belikov@cern.ch 
-//-------------------------------------------------------
-
-#include "TMath.h"
-#include "AliCluster.h"
-
-//_____________________________________________________________________________
-class AliTPCcluster : public AliCluster {
-public:
-  AliTPCcluster():AliCluster(),fQ(0){}
-  AliTPCcluster(Int_t *lab, Float_t *hit);
-  void Use(Int_t = 0) {fQ=-fQ;}
-  void SetQ(Float_t q) {fQ=q;}
-
-  Int_t IsUsed() const {return (fQ<0) ? 1 : 0;}
-  Float_t GetQ() const {return TMath::Abs(fQ);}
-
-  static Double_t SigmaY2(Double_t r, Double_t tgl, Double_t pt);
-  static Double_t SigmaZ2(Double_t r, Double_t tgl);
-
-private:
-  Float_t   fQ ;       //Q of cluster (in ADC counts)
-  
-  ClassDef(AliTPCcluster,1)  // Time Projection Chamber clusters
-};
-
-#endif
-
-
diff --git a/TPC/AliTPCclusterer.cxx b/TPC/AliTPCclusterer.cxx
deleted file mode 100644 (file)
index f28077c..0000000
+++ /dev/null
@@ -1,266 +0,0 @@
-/**************************************************************************
- * Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
- *                                                                        *
- * Author: The ALICE Off-line Project.                                    *
- * Contributors are mentioned in the code where appropriate.              *
- *                                                                        *
- * Permission to use, copy, modify and distribute this software and its   *
- * documentation strictly for non-commercial purposes is hereby granted   *
- * without fee, provided that the above copyright notice appears in all   *
- * copies and that both the copyright notice and this permission notice   *
- * appear in the supporting documentation. The authors make no claims     *
- * about the suitability of this software for any purpose. It is          *
- * provided "as is" without express or implied warranty.                  *
- **************************************************************************/
-
-/* $Id$ */
-
-//-------------------------------------------------------
-//          Implementation of the TPC clusterer
-//
-//   Origin: Jouri Belikov, CERN, Jouri.Belikov@cern.ch 
-//-------------------------------------------------------
-
-#include "AliTPCclusterer.h"
-#include "AliTPCcluster.h"
-#include <TObjArray.h>
-#include <TFile.h>
-#include "AliDigits.h"
-#include "AliSimDigits.h"
-#include "AliTPCParam.h"
-#include "AliTPCClustersRow.h"
-#include <TTree.h>
-
-ClassImp(AliTPCclusterer)
-
-
-//____________________________________________________
-AliTPCclusterer::AliTPCclusterer(const AliTPCclusterer &param)
-                :TObject(),
-                 fPar(0)
-{
-  //
-  // dummy
-  //
-  fPar = param.fPar;
-}
-//-----------------------------------------------------
-AliTPCclusterer & AliTPCclusterer::operator =(const AliTPCclusterer & param)
-{
-  //
-  // assignment operator - dummy
-  //
-  if (this == &param) return (*this);
-
-  fPar = param.fPar;
-  return (*this);
-}
-//____________________________________________________
-void AliTPCclusterer::FindPeaks(Int_t k,Int_t max,
-AliBin *b,Int_t *idx,UInt_t *msk,Int_t& n) {
-  //find local maxima
-  if (n<31)
-  if (IsMaximum(k,max,b)) {
-    idx[n]=k; msk[n]=(2<<n);
-    n++;
-  }
-  b[k].SetMask(0);
-  if (b[k-max].GetMask()&1) FindPeaks(k-max,max,b,idx,msk,n);
-  if (b[k-1  ].GetMask()&1) FindPeaks(k-1  ,max,b,idx,msk,n);
-  if (b[k+max].GetMask()&1) FindPeaks(k+max,max,b,idx,msk,n);
-  if (b[k+1  ].GetMask()&1) FindPeaks(k+1  ,max,b,idx,msk,n);
-}
-
-void AliTPCclusterer::MarkPeak(Int_t k, Int_t max, AliBin *bins, UInt_t m) {
-  //mark this peak
-  UShort_t q=bins[k].GetQ();
-
-  bins[k].SetMask(bins[k].GetMask()|m); 
-
-  if (bins[k-max].GetQ() <= q)
-     if ((bins[k-max].GetMask()&m) == 0) MarkPeak(k-max,max,bins,m);
-  if (bins[k-1  ].GetQ() <= q)
-     if ((bins[k-1  ].GetMask()&m) == 0) MarkPeak(k-1  ,max,bins,m);
-  if (bins[k+max].GetQ() <= q)
-     if ((bins[k+max].GetMask()&m) == 0) MarkPeak(k+max,max,bins,m);
-  if (bins[k+1  ].GetQ() <= q)
-     if ((bins[k+1  ].GetMask()&m) == 0) MarkPeak(k+1  ,max,bins,m);
-}
-
-void AliTPCclusterer::MakeCluster(Int_t k,Int_t max,AliBin *bins,UInt_t m,
-AliTPCcluster &c) {
-  //make cluster using digits of this peak
-  Float_t q=(Float_t)bins[k].GetQ();
-  Int_t i=k/max, j=k-i*max;
-
-  c.SetQ(c.GetQ()+q);
-  c.SetY(c.GetY()+i*q); 
-  c.SetZ(c.GetZ()+j*q); 
-  c.SetSigmaY2(c.GetSigmaY2()+i*i*q);
-  c.SetSigmaZ2(c.GetSigmaZ2()+j*j*q);
-
-  bins[k].SetMask(0xFFFFFFFE);
-  
-  if (bins[k-max].GetMask() == m) MakeCluster(k-max,max,bins,m,c);
-  if (bins[k-1  ].GetMask() == m) MakeCluster(k-1  ,max,bins,m,c);
-  if (bins[k+max].GetMask() == m) MakeCluster(k+max,max,bins,m,c);
-  if (bins[k+1  ].GetMask() == m) MakeCluster(k+1  ,max,bins,m,c);
-}
-
-//_____________________________________________________________________________
-Int_t AliTPCclusterer::Digits2Clusters(TTree *dTree, TTree *cTree) {
-  //-----------------------------------------------------------------
-  // This is a simple cluster finder.
-  //-----------------------------------------------------------------
-  TBranch *branch=dTree->GetBranch("Segment");
-  if (!branch) {
-     Error("Digits2Cluster","Can't get the branch !");
-     return 1;
-  }
-  AliSimDigits digarr, *dummy=&digarr;
-  branch->SetAddress(&dummy);
-  
-  AliTPCClustersRow ddd,*clrow=&ddd;
-  clrow = new AliTPCClustersRow("AliTPCcluster");
-  cTree->Branch("Segment","AliTPCClustersRow",&clrow,32000,200);    
-
-  const Int_t kMAXZ=fPar->GetMaxTBin()+2;
-
-  Int_t nclusters=0;
-
-  Int_t nentries = (Int_t)dTree->GetEntries();
-  for (Int_t n=0; n<nentries; n++) {
-   
-    Int_t sec, row;
-    dTree->GetEvent(n);
-
-    if (!fPar->AdjustSectorRow(digarr.GetID(),sec,row)) {
-       Error("Digits2Clusters","!nvalid segment ID ! %d",digarr.GetID());
-       continue;
-    }
-
-    clrow->SetID(digarr.GetID());
-
-    cTree->GetBranch("Segment")->SetAddress(&clrow);
-
-    Float_t rx=fPar->GetPadRowRadii(sec,row);
-
-    Int_t npads, sign;
-    {
-       const Int_t kNIS=fPar->GetNInnerSector(), kNOS=fPar->GetNOuterSector();
-       if (sec < kNIS) {
-          npads = fPar->GetNPadsLow(row);
-          sign = (sec < kNIS/2) ? 1 : -1;
-       } else {
-          npads = fPar->GetNPadsUp(row);
-          sign = ((sec-kNIS) < kNOS/2) ? 1 : -1;
-       }
-    }
-
-    const Int_t kMAXBIN=kMAXZ*(npads+2);
-    AliBin *bins=new AliBin[kMAXBIN];
-    for (Int_t ii=0;ii<kMAXBIN;ii++) {
-       bins[ii].SetQ(0); bins[ii].SetMask(0xFFFFFFFE);
-    }
-
-    digarr.First();
-    do {
-       Short_t dig=digarr.CurrentDigit();
-       if (dig<=fPar->GetZeroSup()) continue;
-       Int_t j=digarr.CurrentRow()+1, i=digarr.CurrentColumn()+1;
-       bins[i*kMAXZ+j].SetQ(dig);
-       bins[i*kMAXZ+j].SetMask(1);
-    } while (digarr.Next());
-
-    Int_t ncl=0;
-    for (Int_t i=0; i<kMAXBIN; i++) {
-      if ((bins[i].GetMask()&1) == 0) continue;
-      Int_t idx[32]; UInt_t msk[32]; Int_t npeaks=0;
-      FindPeaks(i, kMAXZ, bins, idx, msk, npeaks);
-
-      if (npeaks>30) continue;
-
-      Int_t k,l;
-      for (k=0; k<npeaks-1; k++){//mark adjacent peaks
-        if (idx[k] < 0) continue; //this peak is already removed
-        for (l=k+1; l<npeaks; l++) {
-           if (idx[l] < 0) continue; //this peak is already removed
-           Int_t ki=idx[k]/kMAXZ, kj=idx[k] - ki*kMAXZ;
-           Int_t li=idx[l]/kMAXZ, lj=idx[l] - li*kMAXZ;
-           Int_t di=TMath::Abs(ki - li);
-           Int_t dj=TMath::Abs(kj - lj);
-           if (di>1 || dj>1) continue;
-           if (bins[idx[k]].GetQ() > bins[idx[l]].GetQ()) {
-              msk[l]=msk[k];
-              idx[l]*=-1;
-           } else {
-              msk[k]=msk[l];
-              idx[k]*=-1;
-              break;
-           } 
-        }
-      }
-
-      for (k=0; k<npeaks; k++) {
-        MarkPeak(TMath::Abs(idx[k]), kMAXZ, bins, msk[k]);
-      }
-        
-      for (k=0; k<npeaks; k++) {
-         if (idx[k] < 0) continue; //removed peak
-         AliTPCcluster c;
-         MakeCluster(idx[k], kMAXZ, bins, msk[k], c);
-         if (c.GetQ() < 5) continue; //noise cluster
-         c.SetY(c.GetY()/c.GetQ());
-         c.SetZ(c.GetZ()/c.GetQ());
-
-         Float_t s2 = c.GetSigmaY2()/c.GetQ() - c.GetY()*c.GetY();
-         Float_t w=fPar->GetPadPitchWidth(sec);
-         c.SetSigmaY2((s2 + 1./12.)*w*w);
-         if (s2 != 0.) {
-          c.SetSigmaY2(c.GetSigmaY2()*0.108);
-          if (sec<fPar->GetNInnerSector()) c.SetSigmaY2(c.GetSigmaY2()*2.07);
-         }
-
-         s2 = c.GetSigmaZ2()/c.GetQ() - c.GetZ()*c.GetZ();
-         w=fPar->GetZWidth();
-         c.SetSigmaZ2((s2 + 1./12.)*w*w);
-         if (s2 != 0.) {
-          c.SetSigmaZ2(c.GetSigmaZ2()*0.169);
-          if (sec<fPar->GetNInnerSector()) c.SetSigmaZ2(c.GetSigmaZ2()*1.77);
-         }
-
-         c.SetY((c.GetY() - 0.5 - 0.5*npads)*fPar->GetPadPitchWidth(sec));
-         c.SetZ(fPar->GetZWidth()*(c.GetZ()-1)); 
-         c.SetZ(c.GetZ() - 3.*fPar->GetZSigma()); // PASA delay 
-         c.SetZ(sign*(fPar->GetZLength(sec) - c.GetZ()));
-
-         if (rx<230./250.*TMath::Abs(c.GetZ())) continue;
-
-         Int_t ki=idx[k]/kMAXZ, kj=idx[k] - ki*kMAXZ;
-         c.SetLabel(digarr.GetTrackID(kj-1,ki-1,0),0);
-         c.SetLabel(digarr.GetTrackID(kj-1,ki-1,1),1);
-         c.SetLabel(digarr.GetTrackID(kj-1,ki-1,2),2);
-
-         c.SetQ(bins[idx[k]].GetQ());
-
-         if (ki==1 || ki==npads || kj==1 || kj==kMAXZ-2) {
-           c.SetSigmaY2(c.GetSigmaY2()*25.);
-           c.SetSigmaZ2(c.GetSigmaZ2()*4.);
-         }
-         clrow->InsertCluster(&c); ncl++;
-      }
-    }
-    cTree->Fill();
-
-    clrow->GetArray()->Clear();
-
-    nclusters+=ncl;
-
-    delete[] bins;  
-  }
-
-  Info("Digits2Cluster","Number of found clusters : %d",nclusters);
-
-  return 0;
-}
-
diff --git a/TPC/AliTPCclusterer.h b/TPC/AliTPCclusterer.h
deleted file mode 100644 (file)
index 06b8d21..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-#ifndef ALITPCCLUSTERER_H
-#define ALITPCCLUSTERER_H
-/* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
- * See cxx source for full Copyright notice                               */
-
-/* $Id$ */
-
-//-------------------------------------------------------
-//                  The TPC cluster finder
-//
-//   Origin: Iouri Belikov, CERN, Jouri.Belikov@cern.ch 
-//-------------------------------------------------------
-#include <TObject.h>
-
-class TTree;
-class AliTPCParam;
-class AliTPCcluster;
-
-class AliTPCclusterer : public TObject {
-public:
-  AliTPCclusterer():TObject(),fPar(0){};
-  AliTPCclusterer(const AliTPCParam *par):TObject(), fPar(par){};
-  AliTPCclusterer(const AliTPCclusterer &param); // copy constructor
-  AliTPCclusterer &operator = (const AliTPCclusterer & param);
-  Int_t Digits2Clusters(TTree *dig, TTree *clu);
-
-private:
-  class AliBin {
-  public:
-    UShort_t GetQ()    const   {return fQ;}
-    UInt_t   GetMask() const   {return fMask;}
-    void     SetQ(UShort_t q)  {fQ=q;}
-    void     SetMask(UInt_t m) {fMask=m;}
-  private:
-    UShort_t fQ;  //signal
-    UInt_t fMask; //peak mask
-  };
-
-private:
-  static Bool_t IsMaximum(Int_t k, Int_t max, const AliBin *bins); 
-  static void FindPeaks(Int_t k,Int_t m,AliBin*b,Int_t*idx,UInt_t*msk,Int_t&n);
-  static void MarkPeak(Int_t k, Int_t max, AliBin *bins, UInt_t m);
-  static void MakeCluster(Int_t k,Int_t max,AliBin *bins,UInt_t m,
-   AliTPCcluster &c);
-
-  const AliTPCParam *fPar;      //! pointer to the TPC parameters
-
-  ClassDef(AliTPCclusterer,1)  // the TPC cluster finder
-};
-
-
-inline Bool_t AliTPCclusterer::IsMaximum(Int_t k,Int_t max,const AliBin *bins){
-  //is this a local maximum ?
-  UShort_t q=bins[k].GetQ();
-  if (q==1023) return kFALSE;
-  if (bins[k-max].GetQ() > q) return kFALSE;
-  if (bins[k-1  ].GetQ() > q) return kFALSE; 
-  if (bins[k+max].GetQ() > q) return kFALSE; 
-  if (bins[k+1  ].GetQ() > q) return kFALSE; 
-  if (bins[k-max-1].GetQ() > q) return kFALSE;
-  if (bins[k+max-1].GetQ() > q) return kFALSE; 
-  if (bins[k+max+1].GetQ() > q) return kFALSE; 
-  if (bins[k-max+1].GetQ() > q) return kFALSE;
-  return kTRUE; 
-}
-
-//-----------------------------------------------------------------
-
-#endif
-
-
similarity index 100%
rename from TPC/AliTPCPid.cxx
rename to TPC/Attic/AliTPCPid.cxx
similarity index 100%
rename from TPC/AliTPCPid.h
rename to TPC/Attic/AliTPCPid.h
index 424e628..fb2bd92 100644 (file)
 #--------------------------------------------------------------------------------#
 
 set ( SRCS   
-    AliTPCcluster.cxx 
-    AliTPCclusterMI.cxx 
-    AliComplexCluster.cxx 
-    AliTPCclusterInfo.cxx 
-    AliClusters.cxx 
-    AliTPCClustersRow.cxx 
-    AliClustersArray.cxx 
-    AliTPCClustersArray.cxx 
-    AliTPCclusterer.cxx 
-    AliTPCclustererMI.cxx 
-    AliTPCtrack.cxx 
-    AliTPCpolyTrack.cxx 
-    AliTPCseed.cxx 
-    AliTPCtrackerMI.cxx 
-    AliTPCtrackerSector.cxx 
-    AliTPCPid.cxx 
-    AliTPCtrackPid.cxx 
-    AliTPCReconstructor.cxx 
-    AliTPCRecoParam.cxx 
-    AliTPCClusterParam.cxx 
-    AliTPCTracklet.cxx 
-    AliTPCQADataMakerRec.cxx 
-    AliPadMax.cxx 
-    AliTPCclustererKr.cxx 
-    AliTPCclusterKr.cxx 
-    AliTPCvtpr.cxx
-    AliTPCCosmicUtils.cxx   
-    AliTPCCosmicTrackfit.cxx
-    AliCosmicTracker.cxx
+    Rec/AliTPCclusterMI.cxx 
+    Rec/AliComplexCluster.cxx 
+    Rec/AliTPCclusterInfo.cxx 
+    Rec/AliClusters.cxx 
+    Rec/AliTPCClustersRow.cxx 
+    Rec/AliClustersArray.cxx 
+    Rec/AliTPCClustersArray.cxx 
+    Rec/AliTPCclustererMI.cxx 
+    Rec/AliTPCtrack.cxx 
+    Rec/AliTPCpolyTrack.cxx 
+    Rec/AliTPCseed.cxx 
+    Rec/AliTPCtrackerMI.cxx 
+    Rec/AliTPCtrackerSector.cxx 
+    Rec/AliTPCReconstructor.cxx 
+    Rec/AliTPCRecoParam.cxx 
+    Rec/AliTPCClusterParam.cxx 
+    Rec/AliTPCTracklet.cxx 
+    Rec/AliTPCQADataMakerRec.cxx 
+    Rec/AliPadMax.cxx 
+    Rec/AliTPCclustererKr.cxx 
+    Rec/AliTPCclusterKr.cxx 
+    Rec/AliTPCvtpr.cxx
+    Rec/AliTPCCosmicUtils.cxx   
+    Rec/AliTPCCosmicTrackfit.cxx
+    Rec/AliCosmicTracker.cxx
     )
 
 string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" )
 
 set ( DHDR  TPCrecLinkDef.h)
 
-set ( EINCLUDE  RAW STEER/STEER STEER/ESD STEER/STEERBase)
+set ( EINCLUDE  TPC/Base TPC/Rec RAW STEER/STEER STEER/ESD STEER/STEERBase)
 
-set ( EXPORT AliTPCClustersRow.h AliTPCclusterMI.h AliClusters.h AliTPCclusterInfo.h )
+set ( EXPORT Rec/AliTPCClustersRow.h Rec/AliTPCclusterMI.h Rec/AliClusters.h Rec/AliTPCclusterInfo.h )
similarity index 100%
rename from TPC/AliClusters.cxx
rename to TPC/Rec/AliClusters.cxx
similarity index 100%
rename from TPC/AliClusters.h
rename to TPC/Rec/AliClusters.h
similarity index 100%
rename from TPC/AliPadMax.cxx
rename to TPC/Rec/AliPadMax.cxx
similarity index 100%
rename from TPC/AliPadMax.h
rename to TPC/Rec/AliPadMax.h
similarity index 96%
rename from TPC/AliTPCClustersRow.cxx
rename to TPC/Rec/AliTPCClustersRow.cxx
index b997ba3..49f6239 100644 (file)
@@ -24,9 +24,9 @@
 //                                                                           //
 //                                                                          //
 ///////////////////////////////////////////////////////////////////////////////
-#include "AliTPCcluster.h"
 #include <TClass.h>
 #include "AliClusters.h"
+#include "AliTPCclusterMI.h"
 #include "AliTPCClustersRow.h"
 #include <TDirectory.h>
 #include <TClonesArray.h>
@@ -67,7 +67,7 @@ TObject *AliTPCClustersRow::InsertCluster(const TObject *c)
   }
   if(!fClusters) fClusters=new TClonesArray(fClass->GetName(),1000);
   TClonesArray &lclusters = *fClusters;
-  return new(lclusters[fNclusters++]) AliTPCcluster(*((AliTPCcluster*)c));
+  return new(lclusters[fNclusters++]) AliTPCclusterMI(*((AliTPCclusterMI*)c));
 }
 //__________________________________________________________________________
 
similarity index 81%
rename from TPC/AliTPCclustererKr.cxx
rename to TPC/Rec/AliTPCclustererKr.cxx
index 8c1eba1..9ab8eba 100644 (file)
@@ -126,7 +126,6 @@ If you want to change some criteria do the following:
 //\r
 // remove Altro warnings\r
 //\r
-AliLog::SetClassDebugLevel("AliTPCRawStream",-5);\r
 AliLog::SetClassDebugLevel("AliRawReaderDate",-5);\r
 AliLog::SetClassDebugLevel("AliTPCAltroMapping",-5);\r
 AliLog::SetModuleDebugLevel("RAW",-5);\r
@@ -225,7 +224,6 @@ delete stream;
 #include "AliTPCCalPad.h"\r
 #include "AliTPCAltroMapping.h"\r
 #include "AliTPCcalibDB.h"\r
-#include "AliTPCRawStream.h"\r
 #include "AliTPCRawStreamV3.h"\r
 #include "AliTPCRecoParam.h"\r
 #include "AliTPCReconstructor.h"\r
@@ -615,185 +613,6 @@ Int_t AliTPCclustererKr::FinderIO(AliRawReader* rawReader)
   return 0;\r
 }\r
 \r
-\r
-\r
-\r
-\r
-Int_t AliTPCclustererKr::FinderIOold(AliRawReader* rawReader)\r
-{\r
-  // Krypton cluster finder for the TPC raw data\r
-  //\r
-  // fParam must be defined before\r
-  if (!rawReader) return 1;\r
-\r
-  if(rawReader)fRawData=kTRUE; //set flag to data\r
-  \r
-  if (!fOutput) {\r
-    Error("Digits2Clusters", "output tree not initialised");\r
-    return 11;\r
-  }\r
-  \r
-  fParam->SetMaxTBin(fRecoParam->GetLastBin());//set number of timebins from reco -> param\r
-  //   used later for memory allocation\r
-\r
-  AliRawEventHeaderBase* eventHeader = (AliRawEventHeaderBase*)rawReader->GetEventHeader();\r
-  if (eventHeader){\r
-    fTimeStamp = eventHeader->Get("Timestamp");\r
-    fRun = rawReader->GetRunNumber();\r
-  }\r
-  \r
-  Bool_t isAltro=kFALSE;\r
-  \r
-  AliTPCROC * roc = AliTPCROC::Instance();\r
-  AliTPCCalPad * noiseTPC = AliTPCcalibDB::Instance()->GetPadNoise();\r
-  AliTPCAltroMapping** mapping =AliTPCcalibDB::Instance()->GetMapping();\r
-  //\r
-  AliTPCRawStream input(rawReader,(AliAltroMapping**)mapping);\r
-  \r
-  const Int_t kNIS = fParam->GetNInnerSector();//number of inner sectors\r
-  const Int_t kNOS = fParam->GetNOuterSector();//number of outer sectors\r
-  const Int_t kNS = kNIS + kNOS;//all sectors\r
-  \r
-  \r
-  //crate TPC view\r
-  AliTPCDigitsArray *digarr=new AliTPCDigitsArray(kFALSE);//data not sim\r
-  digarr->Setup(fParam);//as usually parameters\r
-  \r
-  //\r
-  // Loop over sectors\r
-  //\r
-  for(Int_t iSec = 0; iSec < kNS; iSec++) {\r
-    AliTPCCalROC * noiseROC;\r
-    if(noiseTPC==0x0){\r
-      noiseROC =new AliTPCCalROC(iSec);//noise=0\r
-    }\r
-    else{\r
-      noiseROC = noiseTPC->GetCalROC(iSec);  // noise per given sector\r
-    }\r
-    Int_t nRows = 0; //number of rows in sector\r
-    Int_t nDDLs = 0; //number of DDLs\r
-    Int_t indexDDL = 0; //DDL index\r
-    if (iSec < kNIS) {\r
-      nRows = fParam->GetNRowLow();\r
-      nDDLs = 2;\r
-      indexDDL = iSec * 2;\r
-    }else {\r
-      nRows = fParam->GetNRowUp();\r
-      nDDLs = 4;\r
-      indexDDL = (iSec-kNIS) * 4 + kNIS * 2;\r
-    }\r
-    \r
-    //\r
-    // Load the raw data for corresponding DDLs\r
-    //\r
-    rawReader->Reset();\r
-    rawReader->Select("TPC",indexDDL,indexDDL+nDDLs-1);\r
-    \r
-    if(input.Next()) {\r
-      isAltro=kTRUE;\r
-      // Allocate memory for rows in sector (pads(depends on row) x timebins)\r
-      for(Int_t iRow = 0; iRow < nRows; iRow++) {\r
-        digarr->CreateRow(iSec,iRow);\r
-      }//end loop over rows\r
-    }\r
-    rawReader->Reset();\r
-    rawReader->Select("TPC",indexDDL,indexDDL+nDDLs-1);\r
-    \r
-    //\r
-    // Begin loop over altro data\r
-    //\r
-    while (input.Next()) {\r
-      \r
-      //check sector consistency\r
-      if (input.GetSector() != iSec)\r
-        AliFatal(Form("Sector index mismatch ! Expected (%d), but got (%d) !",iSec,input.GetSector()));\r
-      \r
-      Int_t iRow = input.GetRow();\r
-      Int_t iPad = input.GetPad();\r
-      Int_t iTimeBin = input.GetTime();\r
-      \r
-      //\r
-      if(fDebugLevel==72){\r
-        fHistoRow->Fill(iRow);\r
-        fHistoPad->Fill(iPad);\r
-        fHistoTime->Fill(iTimeBin);\r
-        fHistoRowPad->Fill(iPad,iRow);\r
-      }else if(fDebugLevel>=0&&fDebugLevel<72){\r
-        if(iSec==fDebugLevel){\r
-          fHistoRow->Fill(iRow);\r
-          fHistoPad->Fill(iPad);\r
-          fHistoTime->Fill(iTimeBin);\r
-          fHistoRowPad->Fill(iPad,iRow);\r
-        }\r
-      }else if(fDebugLevel==73){\r
-        if(iSec<36){\r
-          fHistoRow->Fill(iRow);\r
-          fHistoPad->Fill(iPad);\r
-          fHistoTime->Fill(iTimeBin);\r
-          fHistoRowPad->Fill(iPad,iRow);\r
-        }\r
-      }else if(fDebugLevel==74){\r
-        if(iSec>=36){\r
-          fHistoRow->Fill(iRow);\r
-          fHistoPad->Fill(iPad);\r
-          fHistoTime->Fill(iTimeBin);\r
-          fHistoRowPad->Fill(iPad,iRow);\r
-        }\r
-      }\r
-      \r
-      //check row consistency\r
-      if (iRow < 0 ) continue;\r
-      if (iRow < 0 || iRow >= nRows){\r
-        AliError(Form("Pad-row index (%d) outside the range (%d -> %d) !",\r
-                      iRow, 0, nRows -1));\r
-        continue;\r
-      }\r
-      \r
-      //check pad consistency\r
-      if (iPad < 0 || iPad >= (Int_t)(roc->GetNPads(iSec,iRow))) {\r
-        AliError(Form("Pad index (%d) outside the range (%d -> %d) !",\r
-                      iPad, 0, roc->GetNPads(iSec,iRow) ));\r
-        continue;\r
-      }\r
-      \r
-      //check time consistency\r
-      if ( iTimeBin < fRecoParam->GetFirstBin() || iTimeBin >= fRecoParam->GetLastBin()){\r
-  //cout<<iTimeBin<<endl;\r
-        continue;\r
-        AliFatal(Form("Timebin index (%d) outside the range (%d -> %d) !",\r
-                      iTimeBin, 0, fRecoParam->GetLastBin() -1));\r
-      }\r
-      \r
-      //signal\r
-      Int_t signal = input.GetSignal();\r
-      if (signal <= fZeroSup ||\r
-          iTimeBin < fFirstBin ||\r
-          iTimeBin > fLastBin\r
-         ) {\r
-           digarr->GetRow(iSec,iRow)->SetDigitFast(0,iTimeBin,iPad);\r
-           continue;\r
-         }\r
-      if (!noiseROC) continue;\r
-      Double_t noiseOnPad = noiseROC->GetValue(iRow,iPad);//noise on given pad and row in sector\r
-      if (noiseOnPad > fMaxNoiseAbs){\r
-        digarr->GetRow(iSec,iRow)->SetDigitFast(0,iTimeBin,iPad);\r
-        continue; // consider noisy pad as dead\r
-      }\r
-      if(signal <= fMaxNoiseSigma * noiseOnPad){\r
-        digarr->GetRow(iSec,iRow)->SetDigitFast(0,iTimeBin,iPad);\r
-        continue;\r
-      }\r
-      digarr->GetRow(iSec,iRow)->SetDigitFast(signal,iTimeBin,iPad);\r
-    }//end of loop over altro data\r
-  }//end of loop over sectors\r
-  \r
-  SetDigArr(digarr);\r
-  if(isAltro) FindClusterKrIO();\r
-  delete digarr;\r
-  \r
-  return 0;\r
-}\r
-\r
 void AliTPCclustererKr::CleanSector(Int_t sector){\r
   //\r
   // clean isolated digits\r
similarity index 96%
rename from TPC/AliTPCclustererKr.h
rename to TPC/Rec/AliTPCclustererKr.h
index c3a84c5..4915801 100644 (file)
@@ -32,7 +32,6 @@ class AliTPCROC;
 class AliTPCCalPad;\r
 class AliTPCAltroMapping;\r
 class AliTPCcalibDB;\r
-class AliTPCRawStream;\r
 class AliTPCRecoParam;\r
 class AliTPCReconstructor;\r
 class AliRawReader;\r
@@ -50,7 +49,6 @@ public:
   //finders\r
   virtual Int_t FinderIO();//for MC\r
   virtual Int_t FinderIO(AliRawReader* rawReader);//for data\r
-  virtual Int_t FinderIOold(AliRawReader* rawReader);//for data\r
   virtual Int_t FindClusterKrIO();//main routine for finding clusters\r
   virtual void CleanSector(Int_t sector); // clean isolated digits\r
 \r
similarity index 89%
rename from TPC/AliTPCclustererMI.cxx
rename to TPC/Rec/AliTPCclustererMI.cxx
index db19186..add2b55 100644 (file)
@@ -72,7 +72,6 @@
 #include "AliTPCClustersArray.h"
 #include "AliTPCClustersRow.h"
 #include "AliTPCParam.h"
-#include "AliTPCRawStream.h"
 #include "AliTPCRawStreamV3.h"
 #include "AliTPCRecoParam.h"
 #include "AliTPCReconstructor.h"
@@ -1026,7 +1025,6 @@ void AliTPCclustererMI::Digits2Clusters(AliRawReader* rawReader)
     fAllNSigBins[iRow]=0;
   }
 
-  Int_t prevSector=-1;
   rawReader->Reset();
   Int_t digCounter=0;
   //
@@ -1140,7 +1138,6 @@ void AliTPCclustererMI::Digits2Clusters(AliRawReader* rawReader)
       memset(fAllBins[iRow],0,sizeof(Float_t)*maxBin);
       fAllNSigBins[iRow] = 0;
     }
-    prevSector=fSector;
     digCounter=0;
   }
   }
@@ -1165,191 +1162,6 @@ void AliTPCclustererMI::Digits2Clusters(AliRawReader* rawReader)
   }
 }
 
-
-
-
-
-void AliTPCclustererMI::Digits2ClustersOld
-(AliRawReader* rawReader)
-{
-//-----------------------------------------------------------------
-// This is a cluster finder for the TPC raw data.
-// The method assumes NO ordering of the altro channels.
-// The pedestal subtraction can be switched on and off
-// using an option of the TPC reconstructor
-//-----------------------------------------------------------------
-  fRecoParam = AliTPCReconstructor::GetRecoParam();
-  if (!fRecoParam){
-    AliFatal("Can not get the reconstruction parameters");
-  }
-  if(AliTPCReconstructor::StreamLevel()>5) {
-    AliInfo("Parameter Dumps");
-    fParam->Dump();
-    fRecoParam->Dump();
-  }
-  fRowDig = NULL;
-
-  AliTPCCalPad * gainTPC = AliTPCcalibDB::Instance()->GetPadGainFactor();
-  AliTPCAltroMapping** mapping =AliTPCcalibDB::Instance()->GetMapping();
-  //
-  AliTPCRawStream input(rawReader,(AliAltroMapping**)mapping);
-  fEventHeader = (AliRawEventHeaderBase*)rawReader->GetEventHeader();
-  if (fEventHeader){
-    fTimeStamp = fEventHeader->Get("Timestamp");  
-    fEventType = fEventHeader->Get("Type");  
-  }
-
-  // creaate one TClonesArray for all clusters
-  if(fBClonesArray && !fOutputClonesArray) fOutputClonesArray = new TClonesArray("AliTPCclusterMI",1000);
-  // reset counter
-  fNclusters  = 0;
-  
-  fMaxTime = fRecoParam->GetLastBin() + 6; // add 3 virtual time bins before and 3 after
-  const Int_t kNIS = fParam->GetNInnerSector();
-  const Int_t kNOS = fParam->GetNOuterSector();
-  const Int_t kNS = kNIS + kNOS;
-  fZWidth = fParam->GetZWidth();
-  Int_t zeroSup = fParam->GetZeroSup();
-  //
-  // Clean-up
-  //
-
-  AliTPCROC * roc = AliTPCROC::Instance();
-  Int_t nRowsMax = roc->GetNRows(roc->GetNSector()-1);
-  Int_t nPadsMax = roc->GetNPads(roc->GetNSector()-1,nRowsMax-1);
-  for (Int_t iRow = 0; iRow < nRowsMax; iRow++) {
-    //
-    Int_t maxBin = fMaxTime*(nPadsMax+6);  // add 3 virtual pads  before and 3 after
-    memset(fAllBins[iRow],0,sizeof(Float_t)*maxBin);
-    fAllNSigBins[iRow]=0;
-  }
-  //
-  // Loop over sectors
-  //
-  for(fSector = 0; fSector < kNS; fSector++) {
-
-    Int_t nRows = 0;
-    Int_t nDDLs = 0, indexDDL = 0;
-    if (fSector < kNIS) {
-      nRows = fParam->GetNRowLow();
-      fSign = (fSector < kNIS/2) ? 1 : -1;
-      nDDLs = 2;
-      indexDDL = fSector * 2;
-    }
-    else {
-      nRows = fParam->GetNRowUp();
-      fSign = ((fSector-kNIS) < kNOS/2) ? 1 : -1;
-      nDDLs = 4;
-      indexDDL = (fSector-kNIS) * 4 + kNIS * 2;
-    }
-
-    // load the raw data for corresponding DDLs
-    rawReader->Reset();
-    rawReader->Select("TPC",indexDDL,indexDDL+nDDLs-1);
-
-    // select only good sector 
-    if (!input.Next()) continue;
-    if(input.GetSector() != fSector) continue;
-
-    AliTPCCalROC * gainROC    = gainTPC->GetCalROC(fSector);  // pad gains per given sector
-    
-    for (Int_t iRow = 0; iRow < nRows; iRow++) {
-      Int_t maxPad;
-      if (fSector < kNIS)
-        maxPad = fParam->GetNPadsLow(iRow);
-      else
-        maxPad = fParam->GetNPadsUp(iRow);
-      
-      Int_t maxBin = fMaxTime*(maxPad+6);  // add 3 virtual pads  before and 3 after
-      memset(fAllBins[iRow],0,sizeof(Float_t)*maxBin);
-      fAllNSigBins[iRow] = 0;
-    }
-    
-    Int_t digCounter=0;
-    // Begin loop over altro data
-    Bool_t calcPedestal = fRecoParam->GetCalcPedestal();
-    Float_t gain =1;
-    Int_t lastPad=-1;
-
-    input.Reset();
-    while (input.Next()) {
-      if (input.GetSector() != fSector)
-        AliFatal(Form("Sector index mismatch ! Expected (%d), but got (%d) !",fSector,input.GetSector()));
-
-
-      Int_t iRow = input.GetRow();
-      if (iRow < 0){
-        continue;
-      }
-
-      if (iRow < 0 || iRow >= nRows){
-        AliError(Form("Pad-row index (%d) outside the range (%d -> %d) !",
-                     iRow, 0, nRows -1));
-        continue;
-      }
-      //pad
-      Int_t iPad = input.GetPad();
-      if (iPad < 0 || iPad >= nPadsMax) {
-        AliError(Form("Pad index (%d) outside the range (%d -> %d) !",
-                     iPad, 0, nPadsMax-1));
-        continue;
-      }
-      if (iPad!=lastPad){
-        gain    = gainROC->GetValue(iRow,iPad);
-        lastPad = iPad;
-      }
-      iPad+=3;
-      //time
-      Int_t iTimeBin = input.GetTime();
-      if ( iTimeBin < fRecoParam->GetFirstBin() || iTimeBin >= fRecoParam->GetLastBin()){
-        continue;
-        AliFatal(Form("Timebin index (%d) outside the range (%d -> %d) !",
-                     iTimeBin, 0, iTimeBin -1));
-      }
-      iTimeBin+=3;
-
-      //signal
-      Float_t signal = input.GetSignal();
-      if (!calcPedestal && signal <= zeroSup) continue;
-
-      if (!calcPedestal) {
-        Int_t bin = iPad*fMaxTime+iTimeBin;
-        if (gain>0){
-          fAllBins[iRow][bin] = signal/gain;
-        }else{
-          fAllBins[iRow][bin] =0;
-        }
-        fAllSigBins[iRow][fAllNSigBins[iRow]++] = bin;
-      }else{
-        fAllBins[iRow][iPad*fMaxTime+iTimeBin] = signal;
-      }
-      fAllBins[iRow][iPad*fMaxTime+0]+=1.;  // pad with signal
-
-      // Temporary
-      digCounter++;
-    } // End of the loop over altro data
-    //
-    //
-    //
-    //
-    // Now loop over rows and perform pedestal subtraction
-    if (digCounter==0) continue;
-    ProcessSectorData();
-  } // End of loop over sectors
-
-  if (rawReader->GetEventId() && fOutput ){
-    Info("Digits2Clusters", "File  %s Event\t%d\tNumber of found clusters : %d\n", fOutput->GetName(),*(rawReader->GetEventId()), fNclusters);
-  }
-  
-  if(rawReader->GetEventId()) {
-    Info("Digits2Clusters", "Event\t%d\tNumber of found clusters : %d\n",*(rawReader->GetEventId()), fNclusters);
-  }
-
-  if(fBClonesArray) {
-    //Info("Digits2Clusters", "Number of found clusters : %d\n",fOutputClonesArray->GetEntriesFast());
-  }
-}
-
 void AliTPCclustererMI::FindClusters(AliTPCCalROC * noiseROC)
 {
   
similarity index 98%
rename from TPC/AliTPCclustererMI.h
rename to TPC/Rec/AliTPCclustererMI.h
index 2419cf0..bd61f31 100644 (file)
@@ -36,7 +36,6 @@ public:
   AliTPCclustererMI(const AliTPCParam* par, const AliTPCRecoParam * recoParam = 0);
   virtual ~AliTPCclustererMI();
   virtual void Digits2Clusters();
-  virtual void Digits2ClustersOld(AliRawReader* rawReader);
   virtual void Digits2Clusters(AliRawReader* rawReader);
   virtual void SetInput(TTree * tree);  // set input tree with digits
   virtual void SetOutput(TTree * tree); // set output tree with 
similarity index 100%
rename from TPC/AliTPCseed.cxx
rename to TPC/Rec/AliTPCseed.cxx
similarity index 100%
rename from TPC/AliTPCseed.h
rename to TPC/Rec/AliTPCseed.h
similarity index 100%
rename from TPC/AliTPCtrack.cxx
rename to TPC/Rec/AliTPCtrack.cxx
similarity index 100%
rename from TPC/AliTPCtrack.h
rename to TPC/Rec/AliTPCtrack.h
similarity index 99%
rename from TPC/AliTPCtrackerSector.cxx
rename to TPC/Rec/AliTPCtrackerSector.cxx
index cf46889..8f37233 100644 (file)
@@ -30,7 +30,6 @@
 #include <TClonesArray.h>
 #include "AliLog.h"
 #include "AliComplexCluster.h"
-#include "AliTPCcluster.h"
 #include "AliTPCclusterMI.h"
 #include "AliTPCClustersRow.h"
 #include "AliTPCParam.h"
similarity index 100%
rename from TPC/AliTPCvtpr.cxx
rename to TPC/Rec/AliTPCvtpr.cxx
similarity index 100%
rename from TPC/AliTPCvtpr.h
rename to TPC/Rec/AliTPCvtpr.h
index 3a7a586..94ed5c2 100644 (file)
@@ -8,7 +8,6 @@
 #pragma link off all classes;
 #pragma link off all functions;
 
-#pragma link C++ class AliTPCcluster+;        // remove / obsolete
 #pragma link C++ class AliTPCclusterMI+;      // Derived from Cluster (shape in addition)
                                               // --- ask peter what can happen if renamed (add some pragma !??!)
 #pragma link C++ class AliTPCclusterInfo+;    // additional info attach to cluster (add digit map)
 #pragma link C++ class AliTPCClustersArray+;  // Container of clusters ?!?!
                                               // --- docu to be added / remove if not needed 
 
-#pragma link C++ class AliTPCclusterer+;      // --- remove / obsolete
 #pragma link C++ class AliTPCclustererMI+;    // The TPC clusterer -> rename -"MI"
 
 #pragma link C++ class AliTPCtrack+;          // Derived from AliTrack base class for TPC tracks
-
 #pragma link C++ class AliTPCpolyTrack+;      // Polynomial description of track (used in AliTPCtrackerMI::MakeSeeds2)
                                               //  working in global coordinate frame
                                               // --- docu to be added
 #pragma link C++ class AliTPCseed+;           // Derived from AliTPCtrack - the track seed
+
 #pragma link C++ class AliTPCtrackerRow+;     // Container for info (cluster) on padrow level, method FindNearest ...
 #pragma link C++ class AliTPCtrackerSector+;  // Container for info (cluster) on sector level (array rows)
 #pragma link C++ class AliTPCtrackerMI+;      // The TPC tracker -> rename -"MI"
 
-#pragma link C++ class AliTPCPid+;            // --- move to attic
-#pragma link C++ class AliTPCtrackPid+;       // --- move to attic
-
 #pragma link C++ class AliTPCReconstructor+;  // The TPC reconstructor steering TPC reconstruction
 #pragma link C++ class AliTPCRecoParam+;      // Config parameters for reconstruction
 #pragma link C++ class AliTPCClusterParam+;   // Cluster parametrization