Slight changes to TPCTOF task and added it to be compiled with AliROOT

diff --git a/PWGLF/CMakelibPWGLFspectra.pkg b/PWGLF/CMakelibPWGLFspectra.pkg
index 2527a43cd4b9354f6ab050c96ca7b628a1bb3d34..9716c9eb30bd1e7678fa60f80a1f1d43a632131d 100644 (file)
--- a/PWGLF/CMakelibPWGLFspectra.pkg
+++ b/PWGLF/CMakelibPWGLFspectra.pkg
@@ -41,6 +41,7 @@ set ( SRCS SPECTRA/ChargedHadrons/dNdPt/AlidNdPtAcceptanceCuts.cxx
        SPECTRA/ChargedHadrons/dNdPt/AlidNdPtTrackDumpTask.cxx
        SPECTRA/ChargedHadrons/dNdPt/AliPtResolAnalysis.cxx
        SPECTRA/ChargedHadrons/dNdPt/AliPtResolAnalysisPbPb.cxx
+       SPECTRA/PiKaPr/TPCTOF/AliAnalysisCombinedHadronSpectra.cxx
  )
 
 string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" )
@@ -49,4 +50,4 @@ set ( DHDR PWGLFspectraLinkDef.h)
 
 set ( EXPORT )
 
-set ( EINCLUDE  PWGLF/SPECTRA/ChargedHadrons/dNdPt TPC PWGUD/base STEER/STEER STEER/ESD STEER/STEERBase)
+set ( EINCLUDE  PWGLF/SPECTRA/PiKaPr/TPCTOF PWGLF/SPECTRA/ChargedHadrons/dNdPt TPC PWGUD/base STEER/STEER STEER/ESD STEER/STEERBase)

diff --git a/PWGLF/PWGLFspectraLinkDef.h b/PWGLF/PWGLFspectraLinkDef.h
index d3cb24fea0b1e2740022b0a013ef75b9b6a63243..12b4d439c9ec7f0dd461aa5cd976dd5343055bab 100644 (file)
--- a/PWGLF/PWGLFspectraLinkDef.h
+++ b/PWGLF/PWGLFspectraLinkDef.h
@@ -15,5 +15,6 @@
 #pragma link C++ class AlidNdPtTrackDumpTask+;
 #pragma link C++ class AliPtResolAnalysis+;
 #pragma link C++ class AliPtResolAnalysisPbPb+;
+#pragma link C++ class AliAnalysisCombinedHadronSpectra+;
 
 #endif

diff --git a/PWGLF/SPECTRA/PiKaPr/TPCTOF/AliAnalysisCombinedHadronSpectra.cxx b/PWGLF/SPECTRA/PiKaPr/TPCTOF/AliAnalysisCombinedHadronSpectra.cxx
index 118974a5254d3d726dd44f210cf1a33a8031f07c..0f66bdabff7e12ed4ff1de5322aa8936d242ed05 100644 (file)
--- a/PWGLF/SPECTRA/PiKaPr/TPCTOF/AliAnalysisCombinedHadronSpectra.cxx
+++ b/PWGLF/SPECTRA/PiKaPr/TPCTOF/AliAnalysisCombinedHadronSpectra.cxx
@@ -455,8 +455,7 @@ void AliAnalysisCombinedHadronSpectra::UserExec(Option_t *)
       Double_t rap = trackMC->Y();
       Double_t pT  = trackMC->Pt();
       Int_t sign = pdg < 0 ? -1 : 1; // only works for charged pi,K,p !!
-      Double_t transMass = TMath::Sqrt(trackMC->Pt()*trackMC->Pt() + trackMC->GetMass()*trackMC->GetMass()) 
-       - trackMC->GetMass();
+//      Double_t transMass = TMath::Sqrt(trackMC->Pt()*trackMC->Pt() + trackMC->GetMass()*trackMC->GetMass()) - trackMC->GetMass();
       //
       Int_t iPart = -1;
       if (TMath::Abs(pdg) == 211)  iPart = 0; // select Pi+/Pi- only
@@ -564,14 +563,10 @@ void AliAnalysisCombinedHadronSpectra::UserExec(Option_t *)
     Double_t rapProton = 0.5*TMath::Log((energyProton + pvec[2])/(energyProton - pvec[2]));
     Double_t rapDeuteron = 0.5*TMath::Log((energyDeuteron + pvec[2])/(energyDeuteron - pvec[2]));
     //
-    Double_t transMassPion = TMath::Sqrt(track->Pt()*track->Pt() + AliPID::ParticleMass(AliPID::kPion)*AliPID::ParticleMass(AliPID::kPion)) 
-      -  AliPID::ParticleMass(AliPID::kPion);
-    Double_t transMassKaon = TMath::Sqrt(track->Pt()*track->Pt() + AliPID::ParticleMass(AliPID::kKaon)*AliPID::ParticleMass(AliPID::kKaon)) 
-      -  AliPID::ParticleMass(AliPID::kKaon);
-    Double_t transMassProton = TMath::Sqrt(track->Pt()*track->Pt() + AliPID::ParticleMass(AliPID::kProton)*AliPID::ParticleMass(AliPID::kProton)) 
-      -  AliPID::ParticleMass(AliPID::kProton);
-    Double_t transMassDeuteron = TMath::Sqrt(track->Pt()*track->Pt() + 4*AliPID::ParticleMass(AliPID::kProton)*AliPID::ParticleMass(AliPID::kProton))
-      -  2*AliPID::ParticleMass(AliPID::kProton);
+//    Double_t transMassPion = TMath::Sqrt(track->Pt()*track->Pt() + AliPID::ParticleMass(AliPID::kPion)*AliPID::ParticleMass(AliPID::kPion))      -  AliPID::ParticleMass(AliPID::kPion);
+//    Double_t transMassKaon = TMath::Sqrt(track->Pt()*track->Pt() + AliPID::ParticleMass(AliPID::kKaon)*AliPID::ParticleMass(AliPID::kKaon))     -  AliPID::ParticleMass(AliPID::kKaon);
+ //   Double_t transMassProton = TMath::Sqrt(track->Pt()*track->Pt() + AliPID::ParticleMass(AliPID::kProton)*AliPID::ParticleMass(AliPID::kProton))    -  AliPID::ParticleMass(AliPID::kProton);
+//    Double_t transMassDeuteron = TMath::Sqrt(track->Pt()*track->Pt() + 4*AliPID::ParticleMass(AliPID::kProton)*AliPID::ParticleMass(AliPID::kProton))    -  2*AliPID::ParticleMass(AliPID::kProton);
     //
     // 3. make the PID
     //
@@ -593,7 +588,7 @@ void AliAnalysisCombinedHadronSpectra::UserExec(Option_t *)
     // (8..) dca_xy
     // (9.) CODE -- only MC 0-generated, 1-true rec. primaries, 2-misident, 3-second weak, 4-second material
     //
-    Double_t transMass[4] = {transMassPion,transMassKaon,transMassProton,transMassDeuteron};
+//    Double_t transMass[4] = {transMassPion,transMassKaon,transMassProton,transMassDeuteron};
     Double_t rap[4] = {rapPion,rapKaon,rapProton,rapDeuteron};
     Double_t pullsTPC[4] = {fESDpid->NumberOfSigmasTPC(track,AliPID::kPion),
                            fESDpid->NumberOfSigmasTPC(track,AliPID::kKaon),
@@ -616,10 +611,10 @@ void AliAnalysisCombinedHadronSpectra::UserExec(Option_t *)
        }
 
     //
-    Double_t tpcQA[4] = {fESDpid->NumberOfSigmasTPC(track,AliPID::kElectron),
-                        fESDpid->NumberOfSigmasTPC(track,AliPID::kPion),
-                        fESDpid->NumberOfSigmasTPC(track,AliPID::kKaon),
-                        fESDpid->NumberOfSigmasTPC(track,AliPID::kProton)};
+//    Double_t tpcQA[4] = {fESDpid->NumberOfSigmasTPC(track,AliPID::kElectron),
+//                      fESDpid->NumberOfSigmasTPC(track,AliPID::kPion),
+//                      fESDpid->NumberOfSigmasTPC(track,AliPID::kKaon),
+//                      fESDpid->NumberOfSigmasTPC(track,AliPID::kProton)};
 
     Double_t tofQA[4] = {0.,0.,0.,0.}; 
     if (!fUseTPConlyTracks) {