From 5d18d34b768a451e182ab341f2bbdf08c6f88117 Mon Sep 17 00:00:00 2001 From: vkucera Date: Fri, 31 Oct 2014 14:20:50 +0100 Subject: [PATCH] Cosmetics. --- PWGJE/EMCALJetTasks/AliEmcalJet.cxx | 162 ++++++++++++++-------------- PWGJE/EMCALJetTasks/AliEmcalJet.h | 40 +++---- 2 files changed, 101 insertions(+), 101 deletions(-) diff --git a/PWGJE/EMCALJetTasks/AliEmcalJet.cxx b/PWGJE/EMCALJetTasks/AliEmcalJet.cxx index 77e4a94002f..7e3baeb9e3c 100644 --- a/PWGJE/EMCALJetTasks/AliEmcalJet.cxx +++ b/PWGJE/EMCALJetTasks/AliEmcalJet.cxx @@ -11,24 +11,24 @@ ClassImp(AliEmcalJet) //__________________________________________________________________________________________________ -AliEmcalJet::AliEmcalJet() : - AliVParticle(), - fPt(0), - fEta(0), - fPhi(0), - fM(0), +AliEmcalJet::AliEmcalJet() : + AliVParticle(), + fPt(0), + fEta(0), + fPhi(0), + fM(0), fNEF(0), - fArea(0), - fAreaEta(0), - fAreaPhi(0), - fAreaEmc(-1), - fAxisInEmcal(0), + fArea(0), + fAreaEta(0), + fAreaPhi(0), + fAreaEmc(-1), + fAxisInEmcal(0), fFlavourTagging(0), - fMaxCPt(0), - fMaxNPt(0), + fMaxCPt(0), + fMaxNPt(0), fMCPt(0), - fNn(0), - fNch(0), + fNn(0), + fNch(0), fPtEmc(0), fNEmc(0), fClusterIDs(), @@ -76,33 +76,33 @@ AliEmcalJet::AliEmcalJet() : { // Constructor. fClosestJets[0] = 0; - fClosestJets[1] = 0; - fClosestJetsDist[0] = 999; - fClosestJetsDist[1] = 999; + fClosestJets[1] = 0; + fClosestJetsDist[0] = 999; + fClosestJetsDist[1] = 999; } //__________________________________________________________________________________________________ -AliEmcalJet::AliEmcalJet(Double_t px, Double_t py, Double_t pz) : - AliVParticle(), - fPt(TMath::Sqrt(px*px+py*py)), +AliEmcalJet::AliEmcalJet(Double_t px, Double_t py, Double_t pz) : + AliVParticle(), + fPt(TMath::Sqrt(px*px+py*py)), fEta(TMath::ASinH(pz/fPt)), - fPhi(0), - fM(0), - fNEF(0), - fArea(0), - fAreaEta(0), - fAreaPhi(0), - fAreaEmc(-1), + fPhi(0), + fM(0), + fNEF(0), + fArea(0), + fAreaEta(0), + fAreaPhi(0), + fAreaEmc(-1), fAxisInEmcal(0), fFlavourTagging(0), - fMaxCPt(0), - fMaxNPt(0), + fMaxCPt(0), + fMaxNPt(0), fMCPt(0), fNn(0), fNch(0), fPtEmc(0), fNEmc(0), - fClusterIDs(), + fClusterIDs(), fTrackIDs(), fMatched(2), fMatchingType(0), @@ -144,7 +144,7 @@ AliEmcalJet::AliEmcalJet(Double_t px, Double_t py, Double_t pz) : fJetShapeLeSubSecondDer(0), fJetShapeLeSubFirstSub(0), fJetShapeLeSubSecondSub(0) -{ +{ // Constructor. if (fPt != 0) { @@ -153,34 +153,34 @@ AliEmcalJet::AliEmcalJet(Double_t px, Double_t py, Double_t pz) : fPhi += 2. * TMath::Pi(); } - fClosestJets[0] = 0; + fClosestJets[0] = 0; fClosestJets[1] = 0; - fClosestJetsDist[0] = 999; + fClosestJetsDist[0] = 999; fClosestJetsDist[1] = 999; } //_________________________________________________________________________________________________ AliEmcalJet::AliEmcalJet(Double_t pt, Double_t eta, Double_t phi, Double_t m) : - AliVParticle(), - fPt(pt), - fEta(eta), - fPhi(phi), - fM(m), - fNEF(0), - fArea(0), - fAreaEta(0), - fAreaPhi(0), - fAreaEmc(-1), + AliVParticle(), + fPt(pt), + fEta(eta), + fPhi(phi), + fM(m), + fNEF(0), + fArea(0), + fAreaEta(0), + fAreaPhi(0), + fAreaEmc(-1), fAxisInEmcal(0), fFlavourTagging(0), - fMaxCPt(0), + fMaxCPt(0), fMaxNPt(0), fMCPt(0), fNn(0), - fNch(0), + fNch(0), fPtEmc(0), fNEmc(0), - fClusterIDs(), + fClusterIDs(), fTrackIDs(), fMatched(2), fMatchingType(0), @@ -229,34 +229,34 @@ AliEmcalJet::AliEmcalJet(Double_t pt, Double_t eta, Double_t phi, Double_t m) : if (fPhi<0.) fPhi += TMath::TwoPi(); - fClosestJets[0] = 0; + fClosestJets[0] = 0; fClosestJets[1] = 0; - fClosestJetsDist[0] = 999; + fClosestJetsDist[0] = 999; fClosestJetsDist[1] = 999; } //_________________________________________________________________________________________________ AliEmcalJet::AliEmcalJet(const AliEmcalJet &jet) : AliVParticle(jet), - fPt(jet.fPt), - fEta(jet.fEta), - fPhi(jet.fPhi), - fM(jet.fM), - fNEF(jet.fNEF), - fArea(jet.fArea), - fAreaEta(jet.fAreaEta), - fAreaPhi(jet.fAreaPhi), - fAreaEmc(jet.fAreaEmc), + fPt(jet.fPt), + fEta(jet.fEta), + fPhi(jet.fPhi), + fM(jet.fM), + fNEF(jet.fNEF), + fArea(jet.fArea), + fAreaEta(jet.fAreaEta), + fAreaPhi(jet.fAreaPhi), + fAreaEmc(jet.fAreaEmc), fAxisInEmcal(jet.fAxisInEmcal), fFlavourTagging(jet.fFlavourTagging), - fMaxCPt(jet.fMaxCPt), - fMaxNPt(jet.fMaxNPt), + fMaxCPt(jet.fMaxCPt), + fMaxNPt(jet.fMaxNPt), fMCPt(jet.fMCPt), fNn(jet.fNn), fNch(jet.fNch), fPtEmc(jet.fPtEmc), fNEmc(jet.fNEmc), - fClusterIDs(jet.fClusterIDs), + fClusterIDs(jet.fClusterIDs), fTrackIDs(jet.fTrackIDs), fMatched(jet.fMatched), fMatchingType(jet.fMatchingType), @@ -300,10 +300,10 @@ AliEmcalJet::AliEmcalJet(const AliEmcalJet &jet) : fJetShapeLeSubSecondSub(jet.fJetShapeLeSubSecondSub) { // Copy constructor. - fClosestJets[0] = jet.fClosestJets[0]; - fClosestJets[1] = jet.fClosestJets[1]; - fClosestJetsDist[0] = jet.fClosestJetsDist[0]; - fClosestJetsDist[1] = jet.fClosestJetsDist[1]; + fClosestJets[0] = jet.fClosestJets[0]; + fClosestJets[1] = jet.fClosestJets[1]; + fClosestJetsDist[0] = jet.fClosestJetsDist[0]; + fClosestJetsDist[1] = jet.fClosestJetsDist[1]; } //_________________________________________________________________________________________________ @@ -316,15 +316,15 @@ AliEmcalJet &AliEmcalJet::operator=(const AliEmcalJet &jet) fPt = jet.fPt; fEta = jet.fEta; fPhi = jet.fPhi; - fM = jet.fM; + fM = jet.fM; fNEF = jet.fNEF; - fArea = jet.fArea; - fAreaEta = jet.fAreaEta; - fAreaPhi = jet.fAreaPhi; - fAreaEmc = jet.fAreaEmc; - fAxisInEmcal = jet.fAxisInEmcal; + fArea = jet.fArea; + fAreaEta = jet.fAreaEta; + fAreaPhi = jet.fAreaPhi; + fAreaEmc = jet.fAreaEmc; + fAxisInEmcal = jet.fAxisInEmcal; fFlavourTagging = jet.fFlavourTagging; - fMaxCPt = jet.fMaxCPt; + fMaxCPt = jet.fMaxCPt; fMaxNPt = jet.fMaxNPt; fMCPt = jet.fMCPt; fNn = jet.fNn; @@ -333,10 +333,10 @@ AliEmcalJet &AliEmcalJet::operator=(const AliEmcalJet &jet) fNEmc = jet.fNEmc; fClusterIDs = jet.fClusterIDs; fTrackIDs = jet.fTrackIDs; - fClosestJets[0] = jet.fClosestJets[0]; - fClosestJets[1] = jet.fClosestJets[1]; - fClosestJetsDist[0] = jet.fClosestJetsDist[0]; - fClosestJetsDist[1] = jet.fClosestJetsDist[1]; + fClosestJets[0] = jet.fClosestJets[0]; + fClosestJets[1] = jet.fClosestJets[1]; + fClosestJetsDist[0] = jet.fClosestJetsDist[0]; + fClosestJetsDist[1] = jet.fClosestJetsDist[1]; fMatched = jet.fMatched; fTaggedJet = jet.fTaggedJet; fTagStatus = jet.fTagStatus; @@ -506,7 +506,7 @@ AliVParticle* AliEmcalJet::GetLeadingTrack(TClonesArray *tracks) const i,tracks->GetName(),TrackAt(i),tracks->GetEntriesFast())); continue; } - if (!maxTrack || track->Pt() > maxTrack->Pt()) + if (!maxTrack || track->Pt() > maxTrack->Pt()) maxTrack = track; } @@ -524,7 +524,7 @@ AliVCluster* AliEmcalJet::GetLeadingCluster(TClonesArray *clusters) const i,clusters->GetName(),ClusterAt(i),clusters->GetEntriesFast())); continue; } - if (!maxCluster || cluster->E() > maxCluster->E()) + if (!maxCluster || cluster->E() > maxCluster->E()) maxCluster = cluster; } @@ -535,9 +535,9 @@ AliVCluster* AliEmcalJet::GetLeadingCluster(TClonesArray *clusters) const void AliEmcalJet::ResetMatching() { fClosestJets[0] = 0; - fClosestJets[1] = 0; - fClosestJetsDist[0] = 999; - fClosestJetsDist[1] = 999; + fClosestJets[1] = 0; + fClosestJetsDist[0] = 999; + fClosestJetsDist[1] = 999; fMatched = 2; } diff --git a/PWGJE/EMCALJetTasks/AliEmcalJet.h b/PWGJE/EMCALJetTasks/AliEmcalJet.h index f6504e478ea..d5213c34ca5 100644 --- a/PWGJE/EMCALJetTasks/AliEmcalJet.h +++ b/PWGJE/EMCALJetTasks/AliEmcalJet.h @@ -26,12 +26,12 @@ class AliEmcalJet : public AliVParticle kBckgrd2 = 1<<5, kBckgrd3 = 1<<6 //..... - }; - + }; + AliEmcalJet(); AliEmcalJet(Double_t px, Double_t py, Double_t pz); AliEmcalJet(Double_t pt, Double_t eta, Double_t phi, Double_t m); - AliEmcalJet(const AliEmcalJet &jet); + AliEmcalJet(const AliEmcalJet &jet); AliEmcalJet& operator=(const AliEmcalJet &jet); Double_t Px() const { return fPt*TMath::Cos(fPhi); } @@ -92,14 +92,14 @@ class AliEmcalJet : public AliVParticle Double_t PtSub(Double_t rho) const { return fPt - fArea*rho; } Double_t PtSubVect(Double_t rho) const; Short_t TrackAt(Int_t idx) const { return fTrackIDs.At(idx); } - AliVParticle *TrackAt(Int_t idx, TClonesArray *ta) const { if (!ta) return 0; return dynamic_cast(ta->At(TrackAt(idx))); } + AliVParticle *TrackAt(Int_t idx, TClonesArray *ta) const { if (!ta) return 0; return dynamic_cast(ta->At(TrackAt(idx))); } AliVParticle *GetLeadingTrack(TClonesArray *tracks) const; - Int_t GetFlavour() const { return fFlavourTagging; } - + Int_t GetFlavour() const { return fFlavourTagging; } + void AddClusterAt(Int_t clus, Int_t idx){ fClusterIDs.AddAt(clus, idx); } void AddFlavourTag(Int_t tag) { fFlavourTagging |= tag; } void AddTrackAt(Int_t track, Int_t idx) { fTrackIDs.AddAt(track, idx); } - void Clear(Option_t */*option*/="") { fClusterIDs.Set(0); fTrackIDs.Set(0); fClosestJets[0] = 0; fClosestJets[1] = 0; + 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 @@ -110,7 +110,7 @@ class AliEmcalJet : public AliVParticle 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; } + void SetAreaPhi(Double_t a) { fAreaPhi = a; } void SetAreaEmc(Double_t a) { fAreaEmc = a; } void SetAxisInEmcal(Bool_t b) { fAxisInEmcal = b; } void SetFlavour(Int_t flavour) { fFlavourTagging = flavour; } @@ -126,7 +126,7 @@ class AliEmcalJet : public AliVParticle std::vector SortConstituentsPt(TClonesArray *tracks) const; void SetNEmc(Int_t n) { fNEmc = n; } void SetPtEmc(Double_t pt) { fPtEmc = pt; } - void SetPtSub(Double_t ps) { fPtSub = ps; } + void SetPtSub(Double_t ps) { fPtSub = ps; } void SetPtSubVect(Double_t ps) { fPtVectSub = ps; } Bool_t TestFlavourTag(Int_t tag) const { return (Bool_t)((tag & fFlavourTagging) !=0); } @@ -163,7 +163,7 @@ class AliEmcalJet : public AliVParticle 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 ; } @@ -199,7 +199,7 @@ class AliEmcalJet : public AliVParticle 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 ; } @@ -240,9 +240,9 @@ class AliEmcalJet : public AliVParticle 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 fPt; //[0,0,12] pt Double32_t fEta; //[-1,1,12] eta Double32_t fPhi; //[0,6.3,12] phi Double32_t fM; //[0,0,8] mass @@ -260,23 +260,23 @@ class AliEmcalJet : public AliVParticle Int_t fNch; // number of charged constituents Double32_t fPtEmc; //[0,0,12] pt in EMCAL acceptance Int_t fNEmc; // number of constituents in EMCAL acceptance - TArrayI fClusterIDs; // array containing ids of cluster constituents - TArrayI fTrackIDs; // array containing ids of track constituents + TArrayI fClusterIDs; // array containing ids of cluster constituents + TArrayI fTrackIDs; // array containing ids of track constituents AliEmcalJet *fClosestJets[2]; //! if this is MC it contains the two closest detector level jets in order of distance and viceversa Double32_t fClosestJetsDist[2]; //! distance to closest jets (see above) UShort_t fMatched; //! 0,1 if it is matched with one of the closest jets; 2 if it is not matched UShort_t fMatchingType; //! matching type AliEmcalJet *fTaggedJet; //! jet tagged to this jet Int_t fTagStatus; //! status of tagging -1: NA 0: not tagged 1: tagged - Double_t fPtSub; //! background subtracted pt (not stored set from outside) - Double_t fPtVectSub; //! background vector subtracted pt (not stored set from outside) + Double_t fPtSub; //! background subtracted pt (not stored set from outside) + 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 + 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 @@ -292,7 +292,7 @@ class AliEmcalJet : public AliVParticle 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 @@ -311,7 +311,7 @@ class AliEmcalJet : public AliVParticle 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 + Double_t fJetShapeLeSubSecondSub; //! result from shape derivatives for jet LeSub: 2nd order subtracted private: struct sort_descend -- 2.39.3