From 53f1300c848afc2b1b50283c77d6fc394adc9b95 Mon Sep 17 00:00:00 2001 From: loizides Date: Thu, 25 Nov 2004 08:25:36 +0000 Subject: [PATCH] Bugfixes again for HLT. --- JETAN/AliJetParticlesReaderESD.cxx | 18 ++-- JETAN/AliJetParticlesReaderHLT.cxx | 102 ++++++----------------- JETAN/AliJetParticlesReaderKineGoodTPC.h | 2 +- JETAN/libJETAN.pkg | 2 +- 4 files changed, 37 insertions(+), 87 deletions(-) diff --git a/JETAN/AliJetParticlesReaderESD.cxx b/JETAN/AliJetParticlesReaderESD.cxx index bdee884402a..735e174364a 100644 --- a/JETAN/AliJetParticlesReaderESD.cxx +++ b/JETAN/AliJetParticlesReaderESD.cxx @@ -83,12 +83,14 @@ Int_t AliJetParticlesReaderESD::ReadESD(AliESD* esd) return kFALSE; } - //TDatabasePDG* pdgdb = TDatabasePDG::Instance(); - //if (pdgdb == 0) - //{ - // Error("ReadESD","Can not get PDG Database Instance."); - // return kFALSE; - // } + /* + TDatabasePDG* pdgdb = TDatabasePDG::Instance(); + if (pdgdb == 0) + { + Error("ReadESD","Can not get PDG Database Instance."); + return kFALSE; + } + */ Float_t mf = esd->GetMagneticField(); if (mf <= 0.0) @@ -155,9 +157,7 @@ Int_t AliJetParticlesReaderESD::ReadESD(AliESD* esd) kesdtrack->GetConstrainedXYZ(xyz); } else { if(!kesdtrack->GetPxPyPzAt(0,mom)) continue; - xyz[0]=0;xyz[1]=0;xyz[2]=0; - //kesdtrack->GetPxPyPz(mom); - //kesdtrack->GetXYZ(xyz); + kesdtrack->GetXYZAt(0, xyz); } const Float_t kmass=kesdtrack->GetMass(); const Float_t kp2=mom[0]*mom[0]+mom[1]*mom[1]+mom[2]*mom[2]; diff --git a/JETAN/AliJetParticlesReaderHLT.cxx b/JETAN/AliJetParticlesReaderHLT.cxx index 2c169bae301..d34250e2d37 100644 --- a/JETAN/AliJetParticlesReaderHLT.cxx +++ b/JETAN/AliJetParticlesReaderHLT.cxx @@ -18,6 +18,7 @@ #include #include #include +#include #include #include #include @@ -111,14 +112,11 @@ Int_t AliJetParticlesReaderHLT::ReadESD(AliESD* esd) fEventParticles->SetVertex(vertexpos[0],vertexpos[1],vertexpos[2]); //cout << vertexpos[0] << " " << vertexpos[1] << " " << vertexpos[2] << endl; - - AliL3Track l3; AliL3Vertex v; - v.SetX(vertexpos[0]); - v.SetY(vertexpos[1]); - v.SetZ(vertexpos[2]); - - Double_t xc=0.,yc=0.,zc=0.; + //v.SetX(vertexpos[0]); + //v.SetY(vertexpos[1]); + //v.SetZ(vertexpos[2]); + for (Int_t i = 0;iGetPx(); Float_t py=kesdtrack->GetPy(); Float_t pz=kesdtrack->GetPz(); + //cout << px << " " << py << " " << pz << " " << TMath::Sqrt(px*px+py*py) << endl; if(0&&fTrackerType){ +#if 0 + try { + Double_t mom[3]; + AliL3ITStrack l3(*kesdtrack,vertexpos[2]); + if(!l3.GetPxPyPzAt(0,mom)) continue; + px=mom[0]; + py=mom[1]; + pz=mom[2]; + } catch (const Char_t *msg) { + //Warning("Clusters2Tracks",msg); + continue; + } +#else + AliL3Track l3; //if(!kesdtrack->ComesFromMainVertex()) continue; - cout << kesdtrack->GetPx() << " " << kesdtrack->GetPy() << " " << kesdtrack->GetPt() << endl; + //cout << "Pos: " << kesdtrack->GetFirstPointX() << " " << kesdtrack->GetFirstPointY() << " " << kesdtrack->GetFirstPointZ() << endl; l3.SetFirstPoint(kesdtrack->GetFirstPointX(),kesdtrack->GetFirstPointY(),kesdtrack->GetFirstPointZ()); l3.SetLastPoint(kesdtrack->GetLastPointX(),kesdtrack->GetLastPointY(),kesdtrack->GetLastPointZ()); l3.SetCharge(kesdtrack->GetCharge()); @@ -155,18 +168,19 @@ Int_t AliJetParticlesReaderHLT::ReadESD(AliESD* esd) l3.SetTgl(kesdtrack->GetTgl()); l3.SetPsi(kesdtrack->GetPsi()); l3.CalculateHelix(); + Double_t xc=0.,yc=0.,zc=0.; l3.GetClosestPoint(&v,xc,yc,zc); if(TMath::Abs(zc)>10.) continue; - l3.SetFirstPoint(vertexpos[0],vertexpos[1],vertexpos[2]); - //l3.CalculateHelix(); + l3.SetFirstPoint(xc,yc,zc); + //cout << "Pos: " << xc << " " << yc << " " << zc << endl; l3.UpdateToFirstPoint(); px=l3.GetPx(); py=l3.GetPy(); pz=l3.GetPz(); +#endif } - const Float_t kpt=TMath::Sqrt(px*px+py*py); - //cout << px << " " << py << " " << " " << kpt << endl; + //cout << px << " " << py << " " << pz << " " << kpt << endl; const Float_t kp=TMath::Sqrt(pz*pz+kpt*kpt); const Float_t keta=0.5*TMath::Log((kp+pz+1e-30)/(kp-pz+1e-30)); @@ -178,67 +192,3 @@ Int_t AliJetParticlesReaderHLT::ReadESD(AliESD* esd) return kTRUE; } - -#if 0 - SetChi2(0.); - if(t.GetNHits()==1) - SetNumberOfClusters(0); - else - SetNumberOfClusters(t.GetNHits()); - SetLabel(t.GetMCid()); - SetMass(0.13957); - - fdEdx=0; - fAlpha = fmod((t.GetSector()+0.5)*(2*TMath::Pi()/18),2*TMath::Pi()); - if (fAlpha < -TMath::Pi()) fAlpha += 2*TMath::Pi(); - else if (fAlpha >= TMath::Pi()) fAlpha -= 2*TMath::Pi(); - - //First the emiision angle - Double_t psi = t.GetPsi()-(t.GetSector()+0.5)*(2*TMath::Pi()/18); - - //Then local x,y coordinates - Double_t radius = t.GetPt()*GetConvConst(); - Double_t xhit = 82.97; //Position at first TPC padrow - Double_t trackphi0 = psi + (-t.GetCharge())*TMath::Pi()/2; - Double_t x0 = t.GetFirstPointX()*TMath::Cos(fAlpha) + t.GetFirstPointY()*TMath::Sin(fAlpha); - Double_t y0 = t.GetFirstPointY()*TMath::Cos(fAlpha) - t.GetFirstPointX()*TMath::Sin(fAlpha); - Double_t centerx = radius * cos(trackphi0) + x0; - Double_t centery = radius * sin(trackphi0) + y0; - Double_t aa = (xhit - centerx)*(xhit - centerx); - Double_t r2 = radius*radius; - if(aa > r2) throw "AliITStrackV2: conversion failed !\n"; - Double_t aa2 = sqrt(r2 - aa); - Double_t y1 = centery + aa2; - Double_t y2 = centery - aa2; - Double_t yhit = y1; - if(fabs(y2) < fabs(y1)) yhit = y2; - - //Local z coordinate - Double_t angle1 = atan2((yhit - centery),(xhit - centerx)); - if(angle1 < 0) angle1 += 2.*TMath::Pi(); - Double_t angle2 = atan2((x0-centery),(y0-centerx)); - if(angle2 < 0) angle2 += 2.*TMath::Pi(); - Double_t diffangle = angle1 - angle2; - diffangle = fmod(diffangle,2.*TMath::Pi()); - if(((-t.GetCharge())*diffangle) < 0) diffangle = diffangle - (-t.GetCharge())*2.*TMath::Pi(); - Double_t stot = fabs(diffangle)*radius; - Double_t zhit; - if(t.GetNHits()==1) - zhit = zvertex + stot*t.GetTgl(); - else - zhit = t.GetFirstPointZ() + stot*t.GetTgl(); - - //Local sine of track azimuthal angle - if((-t.GetCharge())<0) - radius = -radius; - Double_t sinbeta = -1.*(centerx - xhit)/radius; - - //Filling of the track paramaters - fX=xhit; - fP0=yhit; - fP1=zhit; - fP2=sinbeta; - fP3=t.GetTgl(); - fP4=1./radius; -#endif - diff --git a/JETAN/AliJetParticlesReaderKineGoodTPC.h b/JETAN/AliJetParticlesReaderKineGoodTPC.h index 2a0d0876fab..13833bb4c9c 100644 --- a/JETAN/AliJetParticlesReaderKineGoodTPC.h +++ b/JETAN/AliJetParticlesReaderKineGoodTPC.h @@ -8,7 +8,7 @@ // // class AliJetParticlesReaderKineGoodTPC // -// Reader for Good TPC tracks (generated by macron in TPC) +// Reader for Good TPC tracks (generated by macro in TPC) // // loizides@ikf.uni-frankfurt.de // diff --git a/JETAN/libJETAN.pkg b/JETAN/libJETAN.pkg index b23f91033b3..77a429354c8 100644 --- a/JETAN/libJETAN.pkg +++ b/JETAN/libJETAN.pkg @@ -9,4 +9,4 @@ HDRS:= $(SRCS:.cxx=.h) DHDR= JetAnalysisLinkDef.h -EINCLUDE:= STEER ANALYSIS PYTHIA6 HLT/src +EINCLUDE:= STEER ANALYSIS PYTHIA6 HLT/src HLT/ITS -- 2.31.1