https://savannah.cern.ch/bugs/index.php?97149

	Pietro Antonioli

diff --git a/STEER/AOD/AliAODpidUtil.cxx b/STEER/AOD/AliAODpidUtil.cxx
index d3c1d4035a153fbb388f1f5f0b667eab3d57acf3..03885f2cf54c5e81f256f3c542cdbef7524db97a 100644 (file)
--- a/STEER/AOD/AliAODpidUtil.cxx
+++ b/STEER/AOD/AliAODpidUtil.cxx
@@ -38,37 +38,6 @@
 
 ClassImp(AliAODpidUtil)
 
-  Int_t AliAODpidUtil::MakePID(const AliAODTrack *track,Double_t *p) const {
-  //
-  //  Calculate probabilities for all detectors, except if TPConly==kTRUE
-  //  and combine PID
-  //  
-  //   Option TPConly==kTRUE is used during reconstruction, 
-  //  because ITS tracking uses TPC pid
-  //  HMPID and TRD pid are done in detector reconstructors
-  //
-
-  /*
-    Float_t TimeZeroTOF = 0;
-    if (subtractT0) 
-    TimeZeroTOF = event->GetT0();
-  */
-  Int_t ns=AliPID::kSPECIES;
-  Double_t tpcPid[AliPID::kSPECIES];
-  MakeTPCPID(track,tpcPid);
-  Double_t itsPid[AliPID::kSPECIES];
-  Double_t tofPid[AliPID::kSPECIES];
-  Double_t trdPid[AliPID::kSPECIES];
-  MakeITSPID(track,itsPid);
-  MakeTOFPID(track,tofPid);
-  //MakeHMPIDPID(track);
-  MakeTRDPID(track,trdPid);
-  for (Int_t j=0; j<ns; j++) {
-    p[j]=tpcPid[j]*itsPid[j]*tofPid[j]*trdPid[j];
-  }
-
-  return 0;
-}
 //_________________________________________________________________________
 Float_t AliAODpidUtil::GetTPCsignalTunedOnData(const AliVTrack *t) const {
     AliAODTrack *track = (AliAODTrack *) t;
@@ -135,169 +104,6 @@ Float_t AliAODpidUtil::GetTPCsignalTunedOnData(const AliVTrack *t) const {
     track->SetTPCsignalTunedOnData(dedx);
     return dedx;
 }
-//_________________________________________________________________________
-void AliAODpidUtil::MakeTPCPID(const AliAODTrack *track,Double_t *p) const
-{
-  //
-  //  TPC pid using bethe-bloch and gaussian response
-  //
-
-  if ((track->GetStatus()&AliESDtrack::kTPCin )==0) return;
-
-  AliAODPid *pidObj = track->GetDetPid();
-  Double_t mom      = track->P();
-  Double_t dedx     = 0.;  
-  UShort_t nTPCClus = 0;
-  if (pidObj) {
-      nTPCClus = pidObj->GetTPCsignalN();
-      dedx     = pidObj->GetTPCsignal();
-      mom      = pidObj->GetTPCmomentum();
-  }
-  
-  Bool_t mismatch=kTRUE;
-
-  for (Int_t j=0; j<AliPID::kSPECIES; j++) {
-    AliPID::EParticleType type=AliPID::EParticleType(j);
-    Double_t bethe=fTPCResponse.GetExpectedSignal(mom,type); 
-    Double_t sigma=fTPCResponse.GetExpectedSigma(mom,nTPCClus,type);
-    if (TMath::Abs(dedx-bethe) > fRange*sigma) {
-      p[j]=TMath::Exp(-0.5*fRange*fRange)/sigma;
-    } else {
-      p[j]=TMath::Exp(-0.5*(dedx-bethe)*(dedx-bethe)/(sigma*sigma))/sigma;
-      mismatch=kFALSE;
-    }
-
-  }
-
-  if (mismatch)
-    for (Int_t j=0; j<AliPID::kSPECIES; j++) p[j]=1./AliPID::kSPECIES;
-
-
-  return;
-}
-//_________________________________________________________________________
-void AliAODpidUtil::MakeITSPID(const AliAODTrack *track,Double_t *p) const
-{
-  //
-  // ITS PID
-  //  1) Truncated mean method
-  //
-
-
-  if ((track->GetStatus()&AliESDtrack::kITSin)==0) return;
-  UChar_t clumap=track->GetITSClusterMap();
-  Int_t nPointsForPid=0;
-  for(Int_t i=2; i<6; i++){
-   if(clumap&(1<<i)) ++nPointsForPid;
-  }
-  if(nPointsForPid<3) { // track not to be used for combined PID purposes
-    for (Int_t j=0; j<AliPID::kSPECIES; j++) 
-      p[j] = 1./AliPID::kSPECIES;
-    return;
-  }
-  Double_t mom=track->P();  
-  AliAODPid *pidObj = track->GetDetPid();
-
-  Double_t dedx = 0.;
-  if (pidObj) {
-      dedx = pidObj->GetITSsignal();
-  }
-  
-  Bool_t mismatch = kTRUE;
-  Bool_t isSA = kTRUE;
-  if(track->GetStatus() & AliESDtrack::kTPCin){
-    isSA = kFALSE;
-    if (pidObj)
-      mom = pidObj->GetTPCmomentum();
-  }
-  for (Int_t j=0; j<AliPID::kSPECIES; j++) {
-    Double_t mass = AliPID::ParticleMass(j);//GeV/c^2
-    Double_t bethe = fITSResponse.Bethe(mom,mass);
-    Double_t sigma = fITSResponse.GetResolution(bethe,nPointsForPid,isSA);
-    if (TMath::Abs(dedx-bethe) > fRange*sigma) {
-      p[j]=TMath::Exp(-0.5*fRange*fRange)/sigma;
-    } else {
-      p[j]=TMath::Exp(-0.5*(dedx-bethe)*(dedx-bethe)/(sigma*sigma))/sigma;
-      mismatch=kFALSE;
-    }
-
-    // Check for particles heavier than (AliPID::kSPECIES - 1)
-
-  }
-
-  if (mismatch)
-    for (Int_t j=0; j<AliPID::kSPECIES; j++) p[j]=1./AliPID::kSPECIES;
-
-  return;
-
-}
-//_________________________________________________________________________
-void AliAODpidUtil::MakeTOFPID(const AliAODTrack *track, Double_t *p) const
-{
-  //
-  //   TOF PID using gaussian response
-  //
-  if ((track->GetStatus()&AliESDtrack::kTOFout )==0)    return;
-  if ((track->GetStatus()&AliESDtrack::kTIME )==0)     return;
-  if ((track->GetStatus()&AliESDtrack::kTOFpid )==0)   return;
-
-  Double_t time[AliPID::kSPECIES];
-  Double_t sigma[AliPID::kSPECIES];
-  AliAODPid *pidObj = track->GetDetPid();
-  pidObj->GetIntegratedTimes(time);
-
-  for (Int_t iPart = 0; iPart < AliPID::kSPECIES; iPart++) {
-    sigma[iPart] = fTOFResponse.GetExpectedSigma(track->P(),time[iPart],AliPID::ParticleMass(iPart));
-  }
-
-  AliDebugGeneral("AliESDpid::MakeTOFPID",2,
-                 Form("Expected TOF signals [ps]: %f %f %f %f %f",
-                      time[AliPID::kElectron],
-                      time[AliPID::kMuon],
-                      time[AliPID::kPion],
-                      time[AliPID::kKaon],
-                      time[AliPID::kProton]));
-
-  AliDebugGeneral("AliESDpid::MakeTOFPID",2,
-                 Form("Expected TOF std deviations [ps]: %f %f %f %f %f",
-                      sigma[AliPID::kElectron],
-                      sigma[AliPID::kMuon],
-                      sigma[AliPID::kPion],
-                      sigma[AliPID::kKaon],
-                      sigma[AliPID::kProton]
-                      ));
-
-  Double_t tof = pidObj->GetTOFsignal();
-
-  Bool_t mismatch = kTRUE;
-  for (Int_t j=0; j<AliPID::kSPECIES; j++) {
-    Double_t sig = sigma[j];
-    if (TMath::Abs(tof-time[j]) > fRange*sig) {
-      p[j] = TMath::Exp(-0.5*fRange*fRange)/sig;
-    } else
-      p[j] = TMath::Exp(-0.5*(tof-time[j])*(tof-time[j])/(sig*sig))/sig;
-
-    // Check the mismatching
-    Double_t mass = AliPID::ParticleMass(j);
-    Double_t pm = fTOFResponse.GetMismatchProbability(track->P(),mass);
-    if (p[j]>pm) mismatch = kFALSE;
-
-    // Check for particles heavier than (AliPID::kSPECIES - 1)
-
-  }
-
-  if (mismatch)
-    for (Int_t j=0; j<AliPID::kSPECIES; j++) p[j]=1./AliPID::kSPECIES;
-
-  return;
-}
-//_________________________________________________________________________
-void AliAODpidUtil::MakeTRDPID(const AliAODTrack *track,Double_t *p) const
-{
-  ComputeTRDProbability(track, AliPID::kSPECIES, p); 
-  return;
-}
-
 //_________________________________________________________________________
 Float_t AliAODpidUtil::NumberOfSigmasTOF(const AliVParticle *vtrack, AliPID::EParticleType type) const
 {

diff --git a/STEER/AOD/AliAODpidUtil.h b/STEER/AOD/AliAODpidUtil.h
index c962d9bfb1a474c2def651d3f74fb4ad62279e26..748abb55808cac45faefd3c132f6c3501e753894 100644 (file)
--- a/STEER/AOD/AliAODpidUtil.h
+++ b/STEER/AOD/AliAODpidUtil.h
@@ -32,15 +32,8 @@ public:
   AliAODpidUtil(Bool_t isMC = kFALSE): AliPIDResponse(isMC) {;}
   virtual ~AliAODpidUtil() {;}
 
-  Int_t MakePID(const AliAODTrack *track,Double_t *p) const;
-  void MakeTPCPID(const AliAODTrack *track,Double_t *p) const;
-  void MakeITSPID(const AliAODTrack *track,Double_t *p) const;
-  void MakeTOFPID(const AliAODTrack *track,Double_t *p) const;
-  //  void MakeHMPIDPID(AliESDtrack *track);
-  void MakeTRDPID(const AliAODTrack *track,Double_t *p) const;
 
   virtual Float_t NumberOfSigmasTOF(const AliVParticle *vtrack, AliPID::EParticleType type) const;
-  
   Float_t GetTPCsignalTunedOnData(const AliVTrack *t) const;
 
 private: