Add 2 DeltaMass THnSparse

[u/mrichter/AliRoot.git] / PWGJE / EMCALJetTasks / AliAnalysisTaskRho.cxx

diff --git a/PWGJE/EMCALJetTasks/AliAnalysisTaskRho.cxx b/PWGJE/EMCALJetTasks/AliAnalysisTaskRho.cxx
index c7a9ca43478166a399f2ddb5b847d825b443bb91..27320a8110d71f905f43565d130d770d17483e19 100644 (file)
--- a/PWGJE/EMCALJetTasks/AliAnalysisTaskRho.cxx
+++ b/PWGJE/EMCALJetTasks/AliAnalysisTaskRho.cxx
@@ -2,7 +2,7 @@
 //
 // Calculation of rho from a collection of jets.
 // If scale function is given the scaled rho will be exported
-// with the name as "fRhoName".apppend("_Scaled").
+// with the name as "fOutRhoName".Apppend("_Scaled").
 //
 // Authors: R.Reed, S.Aiola
 
@@ -21,7 +21,6 @@ ClassImp(AliAnalysisTaskRho)
 //________________________________________________________________________
 AliAnalysisTaskRho::AliAnalysisTaskRho() : 
   AliAnalysisTaskRhoBase("AliAnalysisTaskRho"),
-  fHistOccCorrvsCent(0),
   fNExclLeadJets(0)
 {
   // Constructor.
@@ -30,32 +29,20 @@ AliAnalysisTaskRho::AliAnalysisTaskRho() :
 //________________________________________________________________________
 AliAnalysisTaskRho::AliAnalysisTaskRho(const char *name, Bool_t histo) :
   AliAnalysisTaskRhoBase(name, histo),
-  fHistOccCorrvsCent(0),
   fNExclLeadJets(0)
 {
   // Constructor.
 }
 
-//________________________________________________________________________
-void AliAnalysisTaskRho::UserCreateOutputObjects()
-{
-  if (!fCreateHisto)
-    return;
-
-  AliAnalysisTaskRhoBase::UserCreateOutputObjects();
-  
-  fHistOccCorrvsCent = new TH2F("OccCorrvsCent", "OccCorrvsCent", 101, -1, 100, 2000, 0 , 2);
-  fOutput->Add(fHistOccCorrvsCent);
-}
 
 //________________________________________________________________________
 Bool_t AliAnalysisTaskRho::Run() 
 {
   // Run the analysis.
 
-  fRho->SetVal(0);
-  if (fRhoScaled)
-    fRhoScaled->SetVal(0);
+  fOutRho->SetVal(0);
+  if (fOutRhoScaled)
+    fOutRhoScaled->SetVal(0);
 
   if (!fJets)
     return kFALSE;
@@ -94,8 +81,6 @@ Bool_t AliAnalysisTaskRho::Run()
 
   static Double_t rhovec[999];
   Int_t NjetAcc = 0;
-  Double_t TotaljetArea=0;
-  Double_t TotaljetAreaPhys=0;
 
   // push all jets within selected acceptance into stack
   for (Int_t iJets = 0; iJets < Njets; ++iJets) {
@@ -110,42 +95,22 @@ Bool_t AliAnalysisTaskRho::Run()
       continue;
     } 
 
-    //cout << "jetpt: " << jet->Pt() << " jetArea: " << jet->Area() <<endl;
-
     if (!AcceptJet(jet))
       continue;
 
-
-    if(jet->Pt()>0.01) rhovec[NjetAcc] = jet->Pt() / jet->Area();
-    //cout << "ACCEPTED: jetpt: " << jet->Pt() << " jetArea: " << jet->Area() << " jetRho: " << rhovec[NjetAcc] <<endl;
-    if(jet->Pt()>0.01) TotaljetAreaPhys+=jet->Area();
-    TotaljetArea+=jet->Area();
+    rhovec[NjetAcc] = jet->Pt() / jet->Area();
     ++NjetAcc;
   }
 
-  const Double_t TpcMaxPhi = TMath::Pi()*2.;
-
-  const Double_t TpcArea = TpcMaxPhi * 2.*(0.7);
-  Double_t OccCorr=0.0;
-  //cout << "Area Physical: " << TotaljetAreaPhys << " total: " << TotaljetArea <<endl;
-  //if(TotaljetArea>0) OccCorr=TotaljetAreaPhys/TotaljetArea;
-  if(TpcArea>0) OccCorr=TotaljetAreaPhys/TpcArea;
- 
-  fHistOccCorrvsCent->Fill(fCent, OccCorr);
-
-  //cout << "Accepted " << NjetAcc << " of " << Njets <<endl;
-  //if (fOccCorr)fOccCorr->SetVal(OccCorr);
 
   if (NjetAcc > 0) {
     //find median value
     Double_t rho = TMath::Median(NjetAcc, rhovec);
-    fRho->SetVal(rho);
+    fOutRho->SetVal(rho);
 
-    if (fRhoScaled) {
-      //Double_t rhoScaled = rho * GetScaleFactor(fCent);
-      Double_t rhoScaled = rho * OccCorr;
-      //cout << "OCC_CORR " << OccCorr <<endl;
-      fRhoScaled->SetVal(rhoScaled);
+    if (fOutRhoScaled) {
+      Double_t rhoScaled = rho * GetScaleFactor(fCent);
+      fOutRhoScaled->SetVal(rhoScaled);
     }
   }