From: gconesab Date: Thu, 3 Sep 2009 15:29:48 +0000 (+0000) Subject: Correct bug when comparing if data type was MC to get the vertex or not. X-Git-Url: http://git.uio.no/git/?a=commitdiff_plain;h=edd59991f4c860d933c7cf1b32713403517b9009;p=u%2Fmrichter%2FAliRoot.git 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 13aa3b14e54..fb1d020dbd9 100755 --- 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 193adf4888d..b953463cedc 100644 --- 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"){ #ifdef __PHOSUTIL__ Double_t vtx[3]={0,0,0}; -// if(!GetReader()->GetDataType()== AliCaloTrackReader::kMC) GetReader()->GetVertex(vtx); +// if(GetReader()->GetDataType() != AliCaloTrackReader::kMC) GetReader()->GetVertex(vtx); Double_t x = 0 ,z = 0 ; fPHOSGeo->ImpactOnEmc(vtx,p1->Theta(),p1->Phi(), mod,z,x) ; #endif diff --git a/PWG4/PartCorrDep/AliAnaParticleHadronCorrelation.cxx b/PWG4/PartCorrDep/AliAnaParticleHadronCorrelation.cxx index bd143bd3290..8f73a296844 100755 --- 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 922003adfc3..25add3afd07 100755 --- 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 d0a835fa84d..e6f3a5bbd32 100755 --- 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 1c51f8ee193..a3870d356ea 100755 --- 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 6cf32fd4463..7375fcb2e5a 100755 --- 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);