Correct bug when comparing if data type was MC to get the vertex or not.

diff --git a/PWG4/PartCorrDep/AliAnaElectron.cxx b/PWG4/PartCorrDep/AliAnaElectron.cxx
index 13aa3b14e5481c8569d56f3d263f0ad4933a5b69..fb1d020dbd9110c3da405d5f60f1b2affe8c3270 100755 (executable)
--- a/PWG4/PartCorrDep/AliAnaElectron.cxx
+++ b/PWG4/PartCorrDep/AliAnaElectron.cxx
@@ -923,7 +923,7 @@ Double_t AliAnaElectron::ComputeSignDca(AliAODTrack *tr, AliAODTrack *tr2 , floa
   Double_t massK = 0.493677;
 
   Double_t bfield = 5.; //kG
-  if(!GetReader()->GetDataType()== AliCaloTrackReader::kMC) bfield = GetReader()->GetBField();
+  if(GetReader()->GetDataType() != AliCaloTrackReader::kMC) bfield = GetReader()->GetBField();
 
   Double_t vertex[]  = {-999.,-999.,-999.} ; //vertex 
   Double_t vertex2[] = {-999.,-999.,-999.} ; //vertex of second input AOD if exist;
@@ -989,7 +989,7 @@ Bool_t AliAnaElectron::IsItPhotonic(AliAODPWG4Particle* const part) {
 
   Double_t massE = 0.000511;
   Double_t bfield = 5.; //kG
-  if(!GetReader()->GetDataType()== AliCaloTrackReader::kMC) bfield = GetReader()->GetBField();
+  if(GetReader()->GetDataType() != AliCaloTrackReader::kMC) bfield = GetReader()->GetBField();
 
   Int_t trackId = part->GetTrackLabel(0);
   AliAODTrack* track = (AliAODTrack*)GetAODCTS()->At(trackId);

diff --git a/PWG4/PartCorrDep/AliAnaNeutralMeson.cxx b/PWG4/PartCorrDep/AliAnaNeutralMeson.cxx
index 193adf4888d363a9332d5f6515bd48f927b3c8c7..b953463cedcfd536e3bac3f71cb75ae83803d3e7 100644 (file)
--- a/PWG4/PartCorrDep/AliAnaNeutralMeson.cxx
+++ b/PWG4/PartCorrDep/AliAnaNeutralMeson.cxx
@@ -681,7 +681,7 @@ Bool_t AliAnaNeutralMeson::IsPhotonSelected(AliAODPWG4Particle *p1, Int_t ipid,
  if(fCalorimeter == "PHOS"){\r
 #ifdef __PHOSUTIL__\r
           Double_t vtx[3]={0,0,0};   \r
-//        if(!GetReader()->GetDataType()== AliCaloTrackReader::kMC) GetReader()->GetVertex(vtx);\r
+//        if(GetReader()->GetDataType() != AliCaloTrackReader::kMC) GetReader()->GetVertex(vtx);\r
        Double_t x = 0 ,z = 0 ;\r
        fPHOSGeo->ImpactOnEmc(vtx,p1->Theta(),p1->Phi(), mod,z,x) ;\r
 #endif\r

diff --git a/PWG4/PartCorrDep/AliAnaParticleHadronCorrelation.cxx b/PWG4/PartCorrDep/AliAnaParticleHadronCorrelation.cxx
index bd143bd3290b7d78cd8c1403d37927fef1319660..8f73a2968442cbad616205d09b73d8032c91d033 100755 (executable)
--- a/PWG4/PartCorrDep/AliAnaParticleHadronCorrelation.cxx
+++ b/PWG4/PartCorrDep/AliAnaParticleHadronCorrelation.cxx
@@ -599,7 +599,7 @@ void  AliAnaParticleHadronCorrelation::MakeNeutralCorrelationFillAOD(AliAODPWG4P
   //Get vertex for photon momentum calculation
   Double_t vertex[]  = {0,0,0} ; //vertex 
   Double_t vertex2[] = {0,0,0} ; //vertex of second input aod
-  if(!GetReader()->GetDataType()== AliCaloTrackReader::kMC) 
+  if(GetReader()->GetDataType()!= AliCaloTrackReader::kMC) 
   {
         GetReader()->GetVertex(vertex);
         if(GetReader()->GetSecondInputAODTree()) GetReader()->GetSecondInputAODVertex(vertex2);

diff --git a/PWG4/PartCorrDep/AliAnaParticleIsolation.cxx b/PWG4/PartCorrDep/AliAnaParticleIsolation.cxx
index 922003adfc37bb05cb2dc22f8fd1851a9bb9b628..25add3afd07c16de62220dacb4656b2bedb9008f 100755 (executable)
--- a/PWG4/PartCorrDep/AliAnaParticleIsolation.cxx
+++ b/PWG4/PartCorrDep/AliAnaParticleIsolation.cxx
@@ -744,7 +744,7 @@ void  AliAnaParticleIsolation::MakeAnalysisFillHistograms()
   //Get vertex for photon momentum calculation
   Double_t vertex[]={0,0,0} ; //vertex ;
   Double_t vertex2[]={0,0,0} ; //vertex ;
-  if(!GetReader()->GetDataType()== AliCaloTrackReader::kMC) {
+  if(GetReader()->GetDataType() != AliCaloTrackReader::kMC) {
          GetReader()->GetVertex(vertex);
          if(GetReader()->GetSecondInputAODTree()) GetReader()->GetSecondInputAODVertex(vertex2);
   }    

diff --git a/PWG4/PartCorrDep/AliAnaParticleJetLeadingConeCorrelation.cxx b/PWG4/PartCorrDep/AliAnaParticleJetLeadingConeCorrelation.cxx
index d0a835fa84d51c9707638498333a4bc86ace8893..e6f3a5bbd327072ab91d51590c645b38ac13eb86 100755 (executable)
--- a/PWG4/PartCorrDep/AliAnaParticleJetLeadingConeCorrelation.cxx
+++ b/PWG4/PartCorrDep/AliAnaParticleJetLeadingConeCorrelation.cxx
@@ -958,7 +958,7 @@ void  AliAnaParticleJetLeadingConeCorrelation::GetLeadingPi0(AliAODPWG4ParticleC
        //Get vertex for photon momentum calculation
        Double_t vertex [] = {0,0,0} ; //vertex 
        Double_t vertex2[] = {0,0,0} ; //vertex of second input AOD 
-       if(!GetReader()->GetDataType()== AliCaloTrackReader::kMC) 
+       if(GetReader()->GetDataType() != AliCaloTrackReader::kMC) 
        {
                GetReader()->GetVertex(vertex);
                if(GetReader()->GetSecondInputAODTree()) GetReader()->GetSecondInputAODVertex(vertex2);
@@ -1508,7 +1508,7 @@ void AliAnaParticleJetLeadingConeCorrelation::MakeAODJet(AliAODPWG4ParticleCorre
        //Get vertex for photon momentum calculation
        Double_t vertex[]  = {0,0,0} ; //vertex 
        Double_t vertex2[] = {0,0,0} ; //vertex of second input aod
-       if(!GetReader()->GetDataType()== AliCaloTrackReader::kMC) 
+       if(GetReader()->GetDataType()!= AliCaloTrackReader::kMC) 
        {
                GetReader()->GetVertex(vertex);
                if(GetReader()->GetSecondInputAODTree()) GetReader()->GetSecondInputAODVertex(vertex2);
@@ -1626,7 +1626,7 @@ void AliAnaParticleJetLeadingConeCorrelation::MakeJetFromAOD(AliAODPWG4ParticleC
        //Get vertex for photon momentum calculation
        Double_t vertex[]  = {0,0,0} ; //vertex 
        Double_t vertex2[] = {0,0,0} ; //vertex of second input aod
-       if(!GetReader()->GetDataType()== AliCaloTrackReader::kMC) 
+       if(GetReader()->GetDataType()!= AliCaloTrackReader::kMC) 
        {
                GetReader()->GetVertex(vertex);
                if(GetReader()->GetSecondInputAODTree()) GetReader()->GetSecondInputAODVertex(vertex2);

diff --git a/PWG4/PartCorrDep/AliAnaPhoton.cxx b/PWG4/PartCorrDep/AliAnaPhoton.cxx
index 1c51f8ee193fbc6c9f984cb2e5e2138291838ccf..a3870d356eac999a4fd3d8a0367c2cf6a0b79b13 100755 (executable)
--- a/PWG4/PartCorrDep/AliAnaPhoton.cxx
+++ b/PWG4/PartCorrDep/AliAnaPhoton.cxx
@@ -430,12 +430,13 @@ void  AliAnaPhoton::MakeAnalysisFillAOD()
   //Get vertex for photon momentum calculation
   Double_t vertex[]  = {0,0,0} ; //vertex 
   Double_t vertex2[] = {0,0,0} ; //vertex from second input aod
-  if(!GetReader()->GetDataType()== AliCaloTrackReader::kMC) 
+  if(GetReader()->GetDataType()!= AliCaloTrackReader::kMC) 
   {
          GetReader()->GetVertex(vertex);
          if(GetReader()->GetSecondInputAODTree()) GetReader()->GetSecondInputAODVertex(vertex2);
   }
-       
+  //printf("Vertex 0: %f,%f,%f\n",vertex[0],vertex[1],vertex[2]);
+  //printf("Vertex 1: %f,%f,%f\n",vertex2[0],vertex2[1],vertex2[2]);
   //Select the Calorimeter of the photon
   if(fCalorimeter == "PHOS")
     pl = GetAODPHOS();

diff --git a/PWG4/PartCorrDep/AliAnaPi0EbE.cxx b/PWG4/PartCorrDep/AliAnaPi0EbE.cxx
index 6cf32fd44635610204b6795018da7dcdd53b80c1..7375fcb2e5aa5bb65347e1acd2ddb57d63557898 100755 (executable)
--- a/PWG4/PartCorrDep/AliAnaPi0EbE.cxx
+++ b/PWG4/PartCorrDep/AliAnaPi0EbE.cxx
@@ -451,7 +451,7 @@ void  AliAnaPi0EbE::MakeShowerShapeIdentification()
   //Get vertex for photon momentum calculation
   Double_t vertex[]  = {0,0,0} ; //vertex 
   Double_t vertex2[] = {0,0,0} ; //vertex from second aod input
-  if(!GetReader()->GetDataType()== AliCaloTrackReader::kMC) 
+  if(GetReader()->GetDataType() != AliCaloTrackReader::kMC) 
   {
          GetReader()->GetVertex(vertex);
          if(GetReader()->GetSecondInputAODTree()) GetReader()->GetSecondInputAODVertex(vertex2);