Merge branch 'feature-movesplit'

[u/mrichter/AliRoot.git] / PWGCF / Correlations / JCORRAN / AliJJetCORRAnalysis.cxx

diff --git a/PWGCF/Correlations/JCORRAN/AliJJetCORRAnalysis.cxx b/PWGCF/Correlations/JCORRAN/AliJJetCORRAnalysis.cxx
index 0526b6bf4784630e6a351c34cf483f32a99215b6..d2bb4a128e20efc775f3de6af8d52cf7636e1ca2 100644 (file)
--- a/PWGCF/Correlations/JCORRAN/AliJJetCORRAnalysis.cxx
+++ b/PWGCF/Correlations/JCORRAN/AliJJetCORRAnalysis.cxx
@@ -53,6 +53,7 @@ AliJJetCORRAnalysis::AliJJetCORRAnalysis():
     cBin(-1),
        fcent(-999),
     zBin(-1),
+       zVert(-999),
     fevt(0),
        fTargetJetIndex(0),
     fDebugMode(0)
@@ -79,6 +80,7 @@ AliJJetCORRAnalysis::AliJJetCORRAnalysis( AliJCard * card ):
     cBin(-1),
        fcent(-999),
     zBin(-1),
+       zVert(-999),
     fevt(0),
        fTargetJetIndex(0),
     fDebugMode(0)
@@ -105,6 +107,7 @@ AliJJetCORRAnalysis::AliJJetCORRAnalysis( const AliJJetCORRAnalysis & obj ):
     cBin(-1),
        fcent(-999),
     zBin(-1),
+       zVert(-999),
     fevt(0),
        fTargetJetIndex(0),
     fDebugMode(0)
@@ -120,6 +123,18 @@ AliJJetCORRAnalysis& AliJJetCORRAnalysis::operator=(const AliJJetCORRAnalysis &
     return *this;
 }
 
+AliJJetCORRAnalysis::~AliJJetCORRAnalysis(){
+  // destructor
+       delete fInputList;
+       delete ftriggList;
+       delete fassocList;
+       delete fHistos;
+       delete fcorrelations;
+       delete fassocPool;
+       delete fEfficiency;
+       
+}
+
 void AliJJetCORRAnalysis::UserCreateOutputObjects(){
     // comment needed
     fJetPtBins = fCard->GetVector("Jet:PtBins");
@@ -156,7 +171,7 @@ void AliJJetCORRAnalysis::ClearBeforeEvent(){
 }
 
 void AliJJetCORRAnalysis::UserExec(){
-
+       fevt++;
        TObjArray *jets = (TObjArray*) fJetListOfList[fTargetJetIndex]; // only for one jet finder
        if(!jets)       return;
        ftriggList->Clear();
@@ -185,8 +200,11 @@ void AliJJetCORRAnalysis::UserExec(){
                        }
                }
        }
-       if(fDebugMode>0) cout << "jetfinder " << ", noTrigg ="<< noTrigg <<", noAssoc = "<< noAssoc << endl; 
-       PlayCorrelation(ftriggList, fassocList);
+    // correlation loop
+    if(fDebugMode) cout << "Start of Correlation Loop noTrigg = "<< ftriggList->GetEntriesFast()<<"\t noAssoc="<<fassocList->GetEntriesFast()<<endl;
+    if(fassocList->GetEntriesFast()>0 ) fassocPool->AcceptList(fassocList, fcent, zVert, fInputList->GetEntriesFast(), fevt);
+    PlayCorrelation(ftriggList, fassocList);
+    fassocPool->Mix(ftriggList, kAzimuthFill, fcent, zVert, fInputList->GetEntriesFast(), fevt);
 }
 void AliJJetCORRAnalysis::Terminate() const{
        // comment needed