cosmetics
authormverweij <marta.verweij@cern.ch>
Mon, 15 Sep 2014 13:48:31 +0000 (15:48 +0200)
committermverweij <marta.verweij@cern.ch>
Mon, 15 Sep 2014 13:48:31 +0000 (15:48 +0200)
PWGJE/EMCALJetTasks/AliEmcalJet.h
PWGJE/EMCALJetTasks/AliEmcalJetTask.cxx
PWGJE/EMCALJetTasks/AliEmcalJetTask.h
PWGJE/EMCALJetTasks/AliFJWrapper.h
PWGJE/EMCALJetTasks/AliJetShape.h

index c6b2fb6..e0eddc8 100644 (file)
@@ -211,14 +211,14 @@ class AliEmcalJet : public AliVParticle
   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            ; }
+  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
@@ -298,10 +298,10 @@ class AliEmcalJet : public AliVParticle
   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          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
@@ -320,6 +320,6 @@ class AliEmcalJet : public AliVParticle
         bool operator () (const std::pair<Double_t, Int_t>& p1, const std::pair<Double_t, Int_t>& p2)  { return p1.first > p2.first ; }
         };
 
-  ClassDef(AliEmcalJet,15) // Emcal jet class in cylindrical coordinates
+  ClassDef(AliEmcalJet,16) // Emcal jet class in cylindrical coordinates
 };
 #endif
index ddf2de0..9efd53c 100644 (file)
@@ -623,29 +623,27 @@ void AliEmcalJetTask::FindJets()
          AliEmcalJet(jets_sub[ijet].perp(), jets_sub[ijet].eta(), jets_sub[ijet].phi(), jets_sub[ijet].m());
        jet_sub->SetLabel(ijet);
         // Fill constituent info
-       std::vector<fastjet::PseudoJet> constituents_sub(fjw.GetJetConstituents(ijet));
-       jet_sub->SetNumberOfTracks(constituents_sub.size());
-       jet_sub->SetNumberOfClusters(constituents_sub.size());
-       Int_t nt            = 0;
-       Int_t nc            = 0;
-       Double_t neutralE   = 0;
-       Double_t maxCh      = 0;
-       Double_t maxNe      = 0;
-       Int_t gall          = 0;
-       Int_t gemc       =0;
-       Int_t cemc          = 0;
-       Int_t ncharged      = 0;
-       Int_t nneutral      = 0;
-       Double_t mcpt       = 0;
-       Double_t emcpt      = 0;
-
-       FillJetConstituents(constituents_sub,jet_sub,vertex,jetCount,nt,nc,maxCh,maxNe,ncharged,nneutral,neutralE,mcpt,cemc,emcpt,gall,gemc);
-      jet_sub->SetNumberOfTracks(nt);
-      jet_sub->SetNumberOfClusters(nc);
-      jet_sub->SortConstituents();
-       
-
-
+       std::vector<fastjet::PseudoJet> constituents_sub(fjw.GetJetConstituents(ijet));
+       jet_sub->SetNumberOfTracks(constituents_sub.size());
+       jet_sub->SetNumberOfClusters(constituents_sub.size());
+       Int_t nt            = 0;
+       Int_t nc            = 0;
+       Double_t neutralE   = 0;
+       Double_t maxCh      = 0;
+       Double_t maxNe      = 0;
+       Int_t gall          = 0;
+       Int_t gemc          = 0;
+       Int_t cemc          = 0;
+       Int_t ncharged      = 0;
+       Int_t nneutral      = 0;
+       Double_t mcpt       = 0;
+       Double_t emcpt      = 0;
+
+       FillJetConstituents(constituents_sub,jet_sub,vertex,jetCount,nt,nc,maxCh,maxNe,ncharged,nneutral,neutralE,mcpt,cemc,emcpt,gall,gemc);
+       jet_sub->SetNumberOfTracks(nt);
+       jet_sub->SetNumberOfClusters(nc);
+       jet_sub->SortConstituents();
+       
        fastjet::PseudoJet area(fjw.GetJetAreaVector(ijet));
        jet_sub->SetArea(area.perp());
        jet_sub->SetAreaEta(area.eta());
@@ -655,11 +653,6 @@ void AliEmcalJetTask::FindJets()
       }
     }
 #endif
-
-
-
-
-
   } //constituent subtraction
 }
 
@@ -883,12 +876,6 @@ void  AliEmcalJetTask::FillJetConstituents(std::vector<fastjet::PseudoJet>& cons
         AliError(Form("%s: No logical way to end up here.", GetName()));
         continue;
       } 
-
-
-
-
     }
-
-     
 }
 //______________________________________________________________________________________
index 0b9e062..df48c0c 100644 (file)
@@ -40,7 +40,6 @@ class AliEmcalJetTask : public AliAnalysisTaskSE {
   void                   UserCreateOutputObjects();
   void                   UserExec(Option_t *option);
   void                   Terminate(Option_t *option);
-  void                    FillJetConstituents(std::vector<fastjet::PseudoJet>& constituents,AliEmcalJet *jet,Double_t vertex[3],Int_t jetCount,Int_t& nt,Int_t& nc,Double_t& maxCh,Double_t& maxNe,Int_t& ncharged,Int_t& nneutral,Double_t& neutralE,Double_t& mcpt,Int_t& cemc,Double_t& emcpt,Int_t& gall,Int_t& gemc); 
  
   Bool_t                 IsLocked()                       { if(fLocked) {AliFatal("Jet finder task is locked! Changing properties is not allowed."); return kTRUE;} else return kFALSE;};
   void                   SetLocked()                      { fLocked = kTRUE;}
@@ -138,6 +137,7 @@ class AliEmcalJetTask : public AliAnalysisTaskSE {
   void                   FindJets();
   Bool_t                 DoInit();
   Bool_t                 GetSortedArray(Int_t indexes[], std::vector<fastjet::PseudoJet> array) const;
+  void                   FillJetConstituents(std::vector<fastjet::PseudoJet>& constituents,AliEmcalJet *jet,Double_t vertex[3],Int_t jetCount,Int_t& nt,Int_t& nc,Double_t& maxCh,Double_t& maxNe,Int_t& ncharged,Int_t& nneutral,Double_t& neutralE,Double_t& mcpt,Int_t& cemc,Double_t& emcpt,Int_t& gall,Int_t& gemc); 
 
   TString                fTracksName;             // name of track collection
   TString                fCaloName;               // name of calo cluster collection
index 45a2b81..1d4fd71 100644 (file)
@@ -41,7 +41,7 @@ class AliFJWrapper
   const std::vector<fastjet::contrib::GenericSubtractorInfo> GetGenSubtractorInfoJetAngularity()  const {return fGenSubtractorInfoJetAngularity  ; } 
   const std::vector<fastjet::contrib::GenericSubtractorInfo> GetGenSubtractorInfoJetpTD()         const {return fGenSubtractorInfoJetpTD         ; }
   const std::vector<fastjet::contrib::GenericSubtractorInfo> GetGenSubtractorInfoJetCircularity() const {return fGenSubtractorInfoJetCircularity ; }
-  const std::vector<fastjet::contrib::GenericSubtractorInfo> GetGenSubtractorInfoJetSigma2() const {return fGenSubtractorInfoJetSigma2; }
+  const std::vector<fastjet::contrib::GenericSubtractorInfo> GetGenSubtractorInfoJetSigma2()      const {return fGenSubtractorInfoJetSigma2      ; }
   const std::vector<fastjet::contrib::GenericSubtractorInfo> GetGenSubtractorInfoJetConstituent() const {return fGenSubtractorInfoJetConstituent ; } 
   const std::vector<fastjet::contrib::GenericSubtractorInfo> GetGenSubtractorInfoJetLeSub()       const {return fGenSubtractorInfoJetLeSub       ; }
   const std::vector<fastjet::PseudoJet>                      GetConstituentSubtrJets()            const {return fConstituentSubtrJets            ; }
@@ -124,7 +124,7 @@ class AliFJWrapper
   std::vector<fastjet::contrib::GenericSubtractorInfo> fGenSubtractorInfoJetAngularity;  //!  
   std::vector<fastjet::contrib::GenericSubtractorInfo> fGenSubtractorInfoJetpTD;         //!
   std::vector<fastjet::contrib::GenericSubtractorInfo> fGenSubtractorInfoJetCircularity; //!
-  std::vector<fastjet::contrib::GenericSubtractorInfo> fGenSubtractorInfoJetSigma2; //!
+  std::vector<fastjet::contrib::GenericSubtractorInfo> fGenSubtractorInfoJetSigma2;      //!
   std::vector<fastjet::contrib::GenericSubtractorInfo> fGenSubtractorInfoJetConstituent; //!
   std::vector<fastjet::contrib::GenericSubtractorInfo> fGenSubtractorInfoJetLeSub;       //!
 #endif
@@ -713,7 +713,7 @@ Int_t AliFJWrapper::DoGenericSubtractionJetSigma2() {
     fGenSubtractorInfoJetSigma2.push_back(infoSigma);
   }
 #endif
- return 0;
+  return 0;
 }
 //_________________________________________________________________________________________________
 Int_t AliFJWrapper::DoGenericSubtractionJetConstituent() {
index 970b608..7aea663 100644 (file)
@@ -19,6 +19,7 @@
 using namespace std;
 
 #ifdef FASTJET_VERSION
+//________________________________________________________________________
 class AliJetShapeMass : public fastjet::FunctionOfPseudoJet<Double32_t>
 {
  public:
@@ -26,6 +27,7 @@ class AliJetShapeMass : public fastjet::FunctionOfPseudoJet<Double32_t>
   Double32_t result(const fastjet::PseudoJet &jet) const{ return jet.m();}
 };
 
+//________________________________________________________________________
 class AliJetShapeGRNum : public fastjet::FunctionOfPseudoJet<Double32_t>
 {
  public:
@@ -68,6 +70,7 @@ class AliJetShapeGRNum : public fastjet::FunctionOfPseudoJet<Double32_t>
   Double_t fDRStep;
 };
 
+//________________________________________________________________________
 class AliJetShapeGRDen : public fastjet::FunctionOfPseudoJet<Double32_t>
 {
  public:
@@ -109,6 +112,7 @@ class AliJetShapeGRDen : public fastjet::FunctionOfPseudoJet<Double32_t>
   Double_t fDRStep;
 };
 
+//________________________________________________________________________
 class AliJetShapeAngularity : public fastjet::FunctionOfPseudoJet<Double32_t>{
 public:
   virtual std::string description() const{return "Angularity:radial moment";}
@@ -131,7 +135,7 @@ public:
   }
 };
 
-
+//________________________________________________________________________
 class AliJetShapepTD : public fastjet::FunctionOfPseudoJet<Double32_t>{
  public:
   virtual std::string description() const{return "pTD";}
@@ -162,6 +166,7 @@ class AliJetShapeConstituent : public fastjet::FunctionOfPseudoJet<Double32_t>{
   }
 };
 
+//________________________________________________________________________
 class AliJetShapeCircularity : public fastjet::FunctionOfPseudoJet<Double32_t>{
  public:
   virtual std::string description() const{return "circularity denominator";}
@@ -229,6 +234,7 @@ class AliJetShapeCircularity : public fastjet::FunctionOfPseudoJet<Double32_t>{
   }
 };
 
+//________________________________________________________________________
 class AliJetShapeSigma2 : public fastjet::FunctionOfPseudoJet<Double32_t>{
  public:
   virtual std::string description() const{return "cms sigma2";}
@@ -240,8 +246,7 @@ class AliJetShapeSigma2 : public fastjet::FunctionOfPseudoJet<Double32_t>{
     Double_t mxy    = 0.;
     int  nc     = 0;
     Double_t sump2  = 0.;
-           
-       
+
     std::vector<fastjet::PseudoJet> constits = jet.constituents();
     for(UInt_t ic = 0; ic < constits.size(); ++ic) {
       Double_t ppt=constits[ic].perp();
@@ -280,12 +285,10 @@ class AliJetShapeSigma2 : public fastjet::FunctionOfPseudoJet<Double32_t>{
     if(jev==0) sigma2=TMath::Sqrt(TMath::Abs(eval[1])/sump2);
     
     return sigma2;
-    
   }
 };
 
-
-
+//________________________________________________________________________
 class AliJetShapeLeSub : public fastjet::FunctionOfPseudoJet<Double32_t>{
  public:
   virtual std::string description() const{return "leading mins subleading";}