From 5f12e575e3db7c7a87b91c23a3482e398b84b1aa Mon Sep 17 00:00:00 2001 From: mkrzewic Date: Mon, 29 Sep 2014 13:20:32 +0200 Subject: [PATCH] fix some compilation issues due to last merge --- PWGJE/EMCALJetTasks/AliEmcalJet.h | 146 +++++++++++++++++++++++++++++- STEER/ESD/AliESDEvent.h | 4 +- 2 files changed, 145 insertions(+), 5 deletions(-) diff --git a/PWGJE/EMCALJetTasks/AliEmcalJet.h b/PWGJE/EMCALJetTasks/AliEmcalJet.h index 2a9672c48be..e0eddc8dca1 100644 --- a/PWGJE/EMCALJetTasks/AliEmcalJet.h +++ b/PWGJE/EMCALJetTasks/AliEmcalJet.h @@ -19,7 +19,12 @@ class AliEmcalJet : public AliVParticle public: enum EFlavourTag{ kDStar = 1<<0, - kD0 = 1<<1 + kD0 = 1<<1, + kSig1 = 1<<2, + kSig2 = 1<<3, + kBckgrd1 = 1<<4, + kBckgrd2 = 1<<5, + kBckgrd3 = 1<<6 //..... }; @@ -47,7 +52,7 @@ class AliEmcalJet : public AliVParticle Double_t Eta() const { return fEta; } Double_t Y() const { return 0.5*TMath::Log((E()+Pz())/(E()-Pz())); } Short_t Charge() const { return 0; } - Int_t GetLabel() const { return -1; } + Int_t GetLabel() const { return fLabel; } Int_t PdgCode() const { return 0; } const Double_t *PID() const { return 0; } void GetMom(TLorentzVector &vec) const; @@ -97,6 +102,12 @@ class AliEmcalJet : public AliVParticle void Clear(Option_t */*option*/="") { fClusterIDs.Set(0); fTrackIDs.Set(0); fClosestJets[0] = 0; fClosestJets[1] = 0; fClosestJetsDist[0] = 0; fClosestJetsDist[1] = 0; fMatched = 0; fPtSub = 0; } Double_t DeltaR(const AliVParticle* part) const; + Double_t GetZ ( const Double_t trkPx, const Double_t trkPy, const Double_t trkPz ) const; // Get Z of constituent trk + Double_t GetZ ( const AliVParticle* trk ) const; // Get Z of constituent trk + Double_t GetXi ( const AliVParticle* trk ) const { return TMath::Log ( 1/GetZ (trk) ); } // Get Xi of constituent trk + Double_t GetXi ( const Double_t trkPx, const Double_t trkPy, const Double_t trkPz ) const { return TMath::Log ( 1/GetZ (trkPx, trkPy, trkPz ) ); } // Get Xi of constituent trk + + void SetLabel(Int_t l) { fLabel = l; } void SetArea(Double_t a) { fArea = a; } void SetAreaEta(Double_t a) { fAreaEta = a; } void SetAreaPhi(Double_t a) { fAreaPhi = a; } @@ -142,6 +153,94 @@ class AliEmcalJet : public AliVParticle AliEmcalJet* GetTaggedJet() const { return fTaggedJet ; } Int_t GetTagStatus() const { return fTagStatus ; } + //jet shape derivatives + //jet mass + void SetFirstDerivative(Double_t d) { fJetShapeMassFirstDer = d ; } + void SetSecondDerivative(Double_t d) { fJetShapeMassSecondDer = d ; } + void SetFirstOrderSubtracted(Double_t d) { fJetShapeMassFirstSub = d ; } + void SetSecondOrderSubtracted(Double_t d) { fJetShapeMassSecondSub = d ; } + Double_t GetFirstDerivative() const { return fJetShapeMassFirstDer ; } + Double_t GetSecondDerivative() const { return fJetShapeMassSecondDer ; } + Double_t GetFirstOrderSubtracted() const { return fJetShapeMassFirstSub ; } + Double_t GetSecondOrderSubtracted() const { return fJetShapeMassSecondSub ; } + + //jet structure function + TArrayF GetGRNumerator() const { return fGRNumerator ; } + TArrayF GetGRDenominator() const { return fGRDenominator ; } + TArrayF GetGRNumeratorSub() const { return fGRNumeratorSub ; } + TArrayF GetGRDenominatorSub() const { return fGRDenominatorSub ; } + void AddGRNumAt(Float_t num, Int_t idx) { fGRNumerator.AddAt(num, idx) ; } + void AddGRDenAt(Float_t den, Int_t idx) { fGRDenominator.AddAt(den, idx) ; } + void SetGRNumSize(UInt_t s) { fGRNumerator.Set(s) ; } + void SetGRDenSize(UInt_t s) { fGRDenominator.Set(s) ; } + + void AddGRNumSubAt(Float_t num, Int_t idx) { fGRNumeratorSub.AddAt(num, idx) ; } + void AddGRDenSubAt(Float_t den, Int_t idx) { fGRDenominatorSub.AddAt(den, idx) ; } + void SetGRNumSubSize(UInt_t s) { fGRNumeratorSub.Set(s) ; } + void SetGRDenSubSize(UInt_t s) { fGRDenominatorSub.Set(s) ; } + void PrintGR(); + + //Angularity + void SetFirstDerivativeAngularity(Double_t d) { fJetShapeAngularityFirstDer = d ; } + void SetSecondDerivativeAngularity(Double_t d) { fJetShapeAngularitySecondDer = d ; } + void SetFirstOrderSubtractedAngularity(Double_t d) { fJetShapeAngularityFirstSub = d ; } + void SetSecondOrderSubtractedAngularity(Double_t d) { fJetShapeAngularitySecondSub = d ; } + Double_t GetFirstDerivativeAngularity() const { return fJetShapeAngularityFirstDer ; } + Double_t GetSecondDerivativeAngularity() const { return fJetShapeAngularitySecondDer ; } + Double_t GetFirstOrderSubtractedAngularity() const { return fJetShapeAngularityFirstSub ; } + Double_t GetSecondOrderSubtractedAngularity() const { return fJetShapeAngularitySecondSub ; } + + //pTD + void SetFirstDerivativepTD(Double_t d) { fJetShapepTDFirstDer = d ; } + void SetSecondDerivativepTD(Double_t d) { fJetShapepTDSecondDer = d ; } + void SetFirstOrderSubtractedpTD(Double_t d) { fJetShapepTDFirstSub = d ; } + void SetSecondOrderSubtractedpTD(Double_t d) { fJetShapepTDSecondSub = d ; } + Double_t GetFirstDerivativepTD() const { return fJetShapepTDFirstDer ; } + Double_t GetSecondDerivativepTD() const { return fJetShapepTDSecondDer ; } + Double_t GetFirstOrderSubtractedpTD() const { return fJetShapepTDFirstSub ; } + Double_t GetSecondOrderSubtractedpTD() const { return fJetShapepTDSecondSub ; } + + //Circularity + void SetFirstDerivativeCircularity(Double_t d) { fJetShapeCircularityFirstDer = d ; } + void SetSecondDerivativeCircularity(Double_t d) { fJetShapeCircularitySecondDer = d ; } + void SetFirstOrderSubtractedCircularity(Double_t d) { fJetShapeCircularityFirstSub = d ; } + void SetSecondOrderSubtractedCircularity(Double_t d) { fJetShapeCircularitySecondSub = d ; } + Double_t GetFirstDerivativeCircularity() const { return fJetShapeCircularityFirstDer ; } + Double_t GetSecondDerivativeCircularity() const { return fJetShapeCircularitySecondDer ; } + Double_t GetFirstOrderSubtractedCircularity() const { return fJetShapeCircularityFirstSub ; } + Double_t GetSecondOrderSubtractedCircularity() const { return fJetShapeCircularitySecondSub ; } + + //Sigma2 + void SetFirstDerivativeSigma2(Double_t d) { fJetShapeSigma2FirstDer = d ; } + void SetSecondDerivativeSigma2(Double_t d) { fJetShapeSigma2SecondDer = d ; } + void SetFirstOrderSubtractedSigma2(Double_t d) { fJetShapeSigma2FirstSub = d ; } + void SetSecondOrderSubtractedSigma2(Double_t d) { fJetShapeSigma2SecondSub = d ; } + Double_t GetFirstDerivativeSigma2() const { return fJetShapeSigma2FirstDer ; } + Double_t GetSecondDerivativeSigma2() const { return fJetShapeSigma2SecondDer ; } + Double_t GetFirstOrderSubtractedSigma2() const { return fJetShapeSigma2FirstSub ; } + Double_t GetSecondOrderSubtractedSigma2() const { return fJetShapeSigma2SecondSub ; } + + + //number of contituents + void SetFirstDerivativeConstituent(Double_t d) { fJetShapeConstituentFirstDer = d ; } + void SetSecondDerivativeConstituent(Double_t d) { fJetShapeConstituentSecondDer = d ; } + void SetFirstOrderSubtractedConstituent(Double_t d) { fJetShapeConstituentFirstSub = d ; } + void SetSecondOrderSubtractedConstituent(Double_t d) { fJetShapeConstituentSecondSub = d ; } + Double_t GetFirstDerivativeConstituent() const { return fJetShapeConstituentFirstDer ; } + Double_t GetSecondDerivativeConstituent() const { return fJetShapeConstituentSecondDer ; } + Double_t GetFirstOrderSubtractedConstituent() const { return fJetShapeConstituentFirstSub ; } + Double_t GetSecondOrderSubtractedConstituent() const { return fJetShapeConstituentSecondSub ; } + + //leading minus subleading constituent + void SetFirstDerivativeLeSub(Double_t d) { fJetShapeLeSubFirstDer = d ; } + void SetSecondDerivativeLeSub(Double_t d) { fJetShapeLeSubSecondDer = d ; } + void SetFirstOrderSubtractedLeSub(Double_t d) { fJetShapeLeSubFirstSub = d ; } + void SetSecondOrderSubtractedLeSub(Double_t d) { fJetShapeLeSubSecondSub = d ; } + Double_t GetFirstDerivativeLeSub() const { return fJetShapeLeSubFirstDer ; } + Double_t GetSecondDerivativeLeSub() const { return fJetShapeLeSubSecondDer ; } + Double_t GetFirstOrderSubtractedLeSub() const { return fJetShapeLeSubFirstSub ; } + Double_t GetSecondOrderSubtractedLeSub() const { return fJetShapeLeSubSecondSub ; } + protected: Double32_t fPt; //[0,0,12] pt Double32_t fEta; //[-1,1,12] eta @@ -173,6 +272,47 @@ class AliEmcalJet : public AliVParticle Double_t fPtVectSub; //! background vector subtracted pt (not stored set from outside) UInt_t fTriggers; //! triggers that the jet might have fired (AliVEvent::EOfflineTriggerTypes) + Double_t fJetShapeMassFirstDer; //! result from shape derivatives for jet mass: 1st derivative + Double_t fJetShapeMassSecondDer; //! result from shape derivatives for jet mass: 2nd derivative + Double_t fJetShapeMassFirstSub; //! result from shape derivatives for jet mass: 1st order subtracted + Double_t fJetShapeMassSecondSub; //! result from shape derivatives for jet mass: 2nd order subtracted + Int_t fLabel; // label to inclusive jet for constituent subtracted jet + + TArrayF fGRNumerator; //! array with angular structure function numerator + TArrayF fGRDenominator; //! array with angular structure function denominator + TArrayF fGRNumeratorSub; //! array with angular structure function numerator + TArrayF fGRDenominatorSub; //! array with angular structure function denominator + + Double_t fJetShapeAngularityFirstDer; //! result from shape derivatives for jet Angularity: 1st derivative + Double_t fJetShapeAngularitySecondDer; //! result from shape derivatives for jet Angularity: 2nd derivative + Double_t fJetShapeAngularityFirstSub; //! result from shape derivatives for jet Angularity: 1st order subtracted + Double_t fJetShapeAngularitySecondSub; //! result from shape derivatives for jet Angularity: 2nd order subtracted + + Double_t fJetShapepTDFirstDer; //! result from shape derivatives for jet pTD: 1st derivative + Double_t fJetShapepTDSecondDer; //! result from shape derivatives for jet pTD: 2nd derivative + Double_t fJetShapepTDFirstSub; //! result from shape derivatives for jet pTD: 1st order subtracted + Double_t fJetShapepTDSecondSub; //! result from shape derivatives for jet pTD: 2nd order subtracted + + Double_t fJetShapeCircularityFirstDer; //! result from shape derivatives for jet circularity: 1st derivative + Double_t fJetShapeCircularitySecondDer; //! result from shape derivatives for jet circularity: 2nd derivative + Double_t fJetShapeCircularityFirstSub; //! result from shape derivatives for jet circularity: 1st order subtracted + Double_t fJetShapeCircularitySecondSub; //! result from shape derivatives for jetcircularity: 2nd order subtracted + + Double_t fJetShapeSigma2FirstDer; //! result from shape derivatives for jet sigma2: 1st derivative + Double_t fJetShapeSigma2SecondDer; //! result from shape derivatives for jet sigma2: 2nd derivative + Double_t fJetShapeSigma2FirstSub; //! result from shape derivatives for jet sigma2: 1st order subtracted + Double_t fJetShapeSigma2SecondSub; //! result from shape derivatives for jetsigma2: 2nd order subtracted + + Double_t fJetShapeConstituentFirstDer; //! result from shape derivatives for jet const: 1st derivative + Double_t fJetShapeConstituentSecondDer; //! result from shape derivatives for jet const: 2nd derivative + Double_t fJetShapeConstituentFirstSub; //! result from shape derivatives for jet const: 1st order subtracted + Double_t fJetShapeConstituentSecondSub; //! result from shape derivatives for jet const: 2nd order subtracted + + Double_t fJetShapeLeSubFirstDer; //! result from shape derivatives for jet LeSub: 1st derivative + Double_t fJetShapeLeSubSecondDer; //! result from shape derivatives for jet LeSub: 2nd derivative + Double_t fJetShapeLeSubFirstSub; //! result from shape derivatives for jet LeSub: 1st order subtracted + Double_t fJetShapeLeSubSecondSub; //! result from shape derivatives for jet LeSub: 2nd order subtracted + private: struct sort_descend { // sort in decreasing order @@ -180,6 +320,6 @@ class AliEmcalJet : public AliVParticle bool operator () (const std::pair& p1, const std::pair& p2) { return p1.first > p2.first ; } }; - ClassDef(AliEmcalJet,13) // Emcal jet class in cylindrical coordinates + ClassDef(AliEmcalJet,16) // Emcal jet class in cylindrical coordinates }; #endif diff --git a/STEER/ESD/AliESDEvent.h b/STEER/ESD/AliESDEvent.h index dc8e5e742fc..ce5b4fc524c 100644 --- a/STEER/ESD/AliESDEvent.h +++ b/STEER/ESD/AliESDEvent.h @@ -47,10 +47,10 @@ #include "AliESDTOFCluster.h" #include "AliESDTOFHit.h" #include "AliESDTOFMatch.h" -#include "AliESDv0.h" -#include "AliESDkink.h" #include "AliESDfriend.h" +class AliESDv0; +class AliESDkink; class AliESDHLTtrack; class AliESDVertex; class AliESDPmdTrack; -- 2.43.0