From 818d8482650d3010d9cde96ea82cf568bfe38882 Mon Sep 17 00:00:00 2001 From: shahoian Date: Wed, 4 Aug 2010 13:44:30 +0000 Subject: [PATCH] Fixed storing size of singles -> track reference --- STEER/AliMultiplicity.cxx | 2 +- STEER/AliMultiplicity.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/STEER/AliMultiplicity.cxx b/STEER/AliMultiplicity.cxx index 43c366b0d11..e9cd705dc38 100644 --- a/STEER/AliMultiplicity.cxx +++ b/STEER/AliMultiplicity.cxx @@ -347,7 +347,6 @@ void AliMultiplicity::SetTrackletData(Int_t id, const Float_t* tlet, UInt_t trSP fLabels[id] = Int_t(tlet[4]); fLabelsL2[id] = Int_t(tlet[5]); fUsedClusT[id] = (((ULong64_t)trSPD2)<<32) + trSPD1; - // printf("(%d %d)(%d %d)\n",trSPD1&0xffff,trSPD1>>16, trSPD2&0xffff, trSPD2>>16); // } @@ -382,6 +381,7 @@ Bool_t AliMultiplicity::GetTrackletTrackIDs(Int_t i, Int_t mode, Int_t &spd1, In // // note: stored value: [(idSAPureSPD2+1)<<16+(idTPCITS/SA_SPD2+1)]<<32 + [(idSAPureSPD1+1)<<16+(idTPCITS/SA_SPD1+1)] if (!fUsedClusT || mode<0 || mode>1 || i<0 || i>fNtracks) {spd1 = spd2 = -1; return kFALSE;} + // spd1 = (fUsedClusT[i]&0xffffffffLL); spd2 = (fUsedClusT[i]>>32); if (mode) { diff --git a/STEER/AliMultiplicity.h b/STEER/AliMultiplicity.h index 8c99c3fea60..9e0466bb2be 100644 --- a/STEER/AliMultiplicity.h +++ b/STEER/AliMultiplicity.h @@ -114,7 +114,7 @@ class AliMultiplicity : public TObject { Int_t *fLabels; //[fNtracks] array with labels of cluster in L1 used for tracklet Int_t *fLabelsL2; //[fNtracks] array with labels of cluster in L2 used for tracklet UInt_t* fUsedClusS; //[fNtracks] id+1 of the tracks using cluster, coded as (TPC/ITS+ITS_SA)+(ITS_SA_PURE<<16) - ULong64_t* fUsedClusT; //[fNtracks] id+1 of the tracks using clusters, coded as (TPC/ITS+ITS_SA)+(ITS_SA_PURE<<16) for SPD1 and SPD2 in low and high parts + ULong64_t* fUsedClusT; //[fNsingle] id+1 of the tracks using clusters, coded as (TPC/ITS+ITS_SA)+(ITS_SA_PURE<<16) for SPD1 and SPD2 in low and high parts Double32_t *fTh; //[fNtracks] array with theta values Double32_t *fPhi; //[fNtracks] array with phi values Double32_t *fDeltTh; //[fNtracks] array with delta theta values @@ -127,7 +127,7 @@ class AliMultiplicity : public TObject { TBits fFastOrFiredChips; // Map of FastOr fired chips TBits fClusterFiredChips; // Map of fired chips (= at least one cluster) - ClassDef(AliMultiplicity,15); + ClassDef(AliMultiplicity,16); }; inline Int_t AliMultiplicity::GetLabel(Int_t i, Int_t layer) const -- 2.39.3