Skip to content

Commit

Permalink
Added AliAODTracklets fired SPD (chips+FO) info, similar to AliMultup…
Browse files Browse the repository at this point in the history 
…licity
  • Loading branch information
@shahor02
shahor02 committed Mar 9, 2015
1 parent 474a4c8 commit 3d90bc3
Show file tree
Hide file tree
Showing 5 changed files with 67 additions and 17 deletions.
4 changes: 4 additions & 0 deletions ANALYSIS/ESDfilter/AliAnalysisTaskESDfilter.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1631,6 +1631,10 @@ void AliAnalysisTaskESDfilter::ConvertTracklets(const AliESDEvent& esd)
SPDTracklets.SetTracklet(n, mult->GetTheta(n), mult->GetPhi(n), mult->GetDeltaPhi(n), mult->GetLabel(n, 0),mult->GetLabel(n, 1));
}
}
SPDTracklets.SetFiredChipMap(mult->GetFiredChipMap());
SPDTracklets.SetFastOrFiredChipMap(mult->GetFastOrFiredChipMap());
SPDTracklets.SetFiredChips(0,mult->GetNumberOfFiredChips(0));
SPDTracklets.SetFiredChips(1,mult->GetNumberOfFiredChips(1));
} else {
//Printf("ERROR: AliMultiplicity could not be retrieved from ESD");
}
Expand Down
19 changes: 16 additions & 3 deletions STEER/AOD/AliAODTracklets.cxx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,20 @@

ClassImp(AliAODTracklets)

AliAODTracklets::AliAODTracklets() : AliVMultiplicity(), fNTracks(0), fTheta(0), fPhi(0), fDeltaPhi(0), fLabels(0), fLabelsL2(0)
AliAODTracklets::AliAODTracklets()
: AliVMultiplicity(), fNTracks(0), fTheta(0), fPhi(0), fDeltaPhi(0), fLabels(0), fLabelsL2(0)
,fFastOrFiredChips(),fClusterFiredChips()
{
fFiredChips[0] = fFiredChips[1] = 0;
// default constructor
}

AliAODTracklets::AliAODTracklets(const char* name, const char* title) : AliVMultiplicity(name, title), fNTracks(0), fTheta(0), fPhi(0), fDeltaPhi(0), fLabels(0), fLabelsL2(0)
AliAODTracklets::AliAODTracklets(const char* name, const char* title)
: AliVMultiplicity(name, title), fNTracks(0), fTheta(0), fPhi(0), fDeltaPhi(0), fLabels(0), fLabelsL2(0)
, fFastOrFiredChips(),fClusterFiredChips()
{
// Named constructor
fFiredChips[0] = fFiredChips[1] = 0;
}

AliAODTracklets::AliAODTracklets(const AliAODTracklets& tracklet) :
Expand All @@ -43,7 +49,8 @@ AliAODTracklets::AliAODTracklets(const AliAODTracklets& tracklet) :
fPhi(0),
fDeltaPhi(0),
fLabels(0),
fLabelsL2(0)
fLabelsL2(0),
fFastOrFiredChips(tracklet.fFastOrFiredChips),fClusterFiredChips(tracklet.fClusterFiredChips)
{
// Copy constructor
fTheta = new Double32_t[fNTracks];
Expand All @@ -58,6 +65,8 @@ AliAODTracklets::AliAODTracklets(const AliAODTracklets& tracklet) :
fLabels[i] = tracklet.fLabels[i];
fLabelsL2[i] = tracklet.fLabelsL2[i];
}
fFiredChips[0] = tracklet.fFiredChips[0];
fFiredChips[1] = tracklet.fFiredChips[1];
}

AliAODTracklets& AliAODTracklets::operator=(const AliAODTracklets& tracklet)
Expand All @@ -76,6 +85,10 @@ AliAODTracklets& AliAODTracklets::operator=(const AliAODTracklets& tracklet)
fLabels[i] = tracklet.fLabels[i];
fLabelsL2[i] = tracklet.fLabelsL2[i];
}
fFiredChips[0] = tracklet.fFiredChips[0];
fFiredChips[1] = tracklet.fFiredChips[1];
fFastOrFiredChips = tracklet.fFastOrFiredChips;
fClusterFiredChips = tracklet.fClusterFiredChips;
return *this;
}

Expand Down
22 changes: 21 additions & 1 deletion STEER/AOD/AliAODTracklets.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
#define ALIAODTRACKLETS_H

#include "AliVMultiplicity.h"
#include <TBits.h>

class AliAODTracklets : public AliVMultiplicity
{
Expand Down Expand Up @@ -43,6 +44,21 @@ class AliAODTracklets : public AliVMultiplicity
virtual Double_t* GetDeltPhi() const {return (Double_t*)fDeltaPhi;}
virtual Int_t* GetLabels() const {return (Int_t*)fLabels;}
virtual Int_t* GetLabels2() const {return (Int_t*)fLabelsL2;}
//
virtual Short_t GetNumberOfFiredChips(Int_t layer) const {return fFiredChips[layer];}
virtual void SetFiredChips(Int_t layer, Short_t firedChips) {fFiredChips[layer] = firedChips;}
//
virtual void SetFastOrFiredChips(UInt_t chipKey) {fFastOrFiredChips.SetBitNumber(chipKey);}
virtual const TBits& GetFastOrFiredChips() const {return fFastOrFiredChips;}
virtual void SetFastOrFiredChipMap(const TBits& fochips) {fFastOrFiredChips = fochips;}
virtual Bool_t TestFastOrFiredChips(UInt_t chipKey) const {return fFastOrFiredChips.TestBitNumber(chipKey);}
//
virtual void SetFiredChipMap(const TBits & firedChips) {fClusterFiredChips = firedChips;}
virtual void SetFiredChipMap(UInt_t chipKey) {fClusterFiredChips.SetBitNumber(chipKey);}
virtual const TBits& GetFiredChipMap() const {return fClusterFiredChips;}
virtual Bool_t TestFiredChipMap(UInt_t chipKey) const {return fClusterFiredChips.TestBitNumber(chipKey);}

//
virtual void Print(Option_t *opt="") const;

protected:
Expand All @@ -53,8 +69,12 @@ class AliAODTracklets : public AliVMultiplicity
Int_t *fLabels; //[fNTracks] array with labels of cluster in L1 used for the tracklet
Int_t *fLabelsL2; //[fNTracks] array with labels of cluster in L2 used for the tracklet

Short_t fFiredChips[2]; // Number of fired chips in the two SPD layers
UInt_t fITSClusters[6]; // Number of ITS cluster per layer
TBits fFastOrFiredChips; // Map of FastOr fired chips
TBits fClusterFiredChips; // Map of fired chips (= at least one cluster)

ClassDef(AliAODTracklets, 4);
ClassDef(AliAODTracklets, 5);
};


Expand Down
25 changes: 13 additions & 12 deletions STEER/ESD/AliMultiplicity.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,21 +111,22 @@ class AliMultiplicity : public AliVMultiplicity {
Error("GetPhisingle","Invalid cluster number %d",i); return -9999.;
}

Short_t GetNumberOfFiredChips(Int_t layer) const { return fFiredChips[layer]; }
void SetFiredChips(Int_t layer, Short_t firedChips) { fFiredChips[layer] = firedChips; }

UInt_t GetNumberOfITSClusters(Int_t layer) const { return layer<6 ? fITSClusters[layer] : 0; }
UInt_t GetNumberOfITSClusters(Int_t layMin, Int_t layMax) const ;
void SetITSClusters(Int_t layer, UInt_t clusters) { fITSClusters[layer] = clusters; }

void SetFastOrFiredChips(UInt_t chipKey){fFastOrFiredChips.SetBitNumber(chipKey);}
const TBits & GetFastOrFiredChips() const {return fFastOrFiredChips;}
Bool_t TestFastOrFiredChips(UInt_t chipKey) const {return fFastOrFiredChips.TestBitNumber(chipKey);}

void SetFiredChipMap(TBits & firedChips){fClusterFiredChips = firedChips;}
void SetFiredChipMap(UInt_t chipKey){fClusterFiredChips.SetBitNumber(chipKey);}
const TBits & GetFiredChipMap() const {return fClusterFiredChips;}
Bool_t TestFiredChipMap(UInt_t chipKey) const {return fClusterFiredChips.TestBitNumber(chipKey);}
//
virtual Short_t GetNumberOfFiredChips(Int_t layer) const { return fFiredChips[layer]; }
virtual void SetFiredChips(Int_t layer, Short_t firedChips) { fFiredChips[layer] = firedChips; }
//
virtual void SetFastOrFiredChips(UInt_t chipKey){fFastOrFiredChips.SetBitNumber(chipKey);}
virtual void SetFastOrFiredChipMap(const TBits& fochips) {fFastOrFiredChips = fochips;}
virtual const TBits & GetFastOrFiredChips() const {return fFastOrFiredChips;}
virtual Bool_t TestFastOrFiredChips(UInt_t chipKey) const {return fFastOrFiredChips.TestBitNumber(chipKey);}

virtual void SetFiredChipMap(const TBits & firedChips) {fClusterFiredChips = firedChips;}
virtual void SetFiredChipMap(UInt_t chipKey){fClusterFiredChips.SetBitNumber(chipKey);}
virtual const TBits & GetFiredChipMap() const {return fClusterFiredChips;}
virtual Bool_t TestFiredChipMap(UInt_t chipKey) const {return fClusterFiredChips.TestBitNumber(chipKey);}

Bool_t GetTrackletTrackIDs(Int_t i, Int_t mode, Int_t &spd1, Int_t &spd2) const;
Int_t GetTrackletTrackIDsLay(Int_t lr,Int_t i, Int_t mode, UInt_t* refs, UInt_t maxRef) const;
Expand Down
14 changes: 13 additions & 1 deletion STEER/STEERBase/AliVMultiplicity.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#include <TNamed.h>
#include <TMath.h>

class TBits;

//////////////////////////////////////////////////////////
// //
Expand Down Expand Up @@ -53,6 +53,18 @@ class AliVMultiplicity : public TNamed {
virtual Int_t* GetLabels() const = 0;
virtual Int_t* GetLabels2() const = 0;
//
virtual Short_t GetNumberOfFiredChips(Int_t) const = 0;
virtual void SetFiredChips(Int_t, Short_t) = 0;
virtual void SetFastOrFiredChips(UInt_t ) = 0;
virtual void SetFastOrFiredChipMap(const TBits&) = 0;
virtual const TBits& GetFastOrFiredChips() const = 0;
virtual const TBits& GetFastOrFiredChipMap() const {return GetFastOrFiredChips();}
virtual Bool_t TestFastOrFiredChips(UInt_t) const = 0;
virtual void SetFiredChipMap(const TBits &) = 0;
virtual void SetFiredChipMap(UInt_t) = 0;
virtual const TBits& GetFiredChipMap() const = 0;
virtual Bool_t TestFiredChipMap(UInt_t chipKey) const = 0;
//
virtual void Print(Option_t *opt="") const = 0;
//
ClassDef(AliVMultiplicity,1);
Expand Down

0 comments on commit 3d90bc3

Please sign in to comment.