fix for AddTaskChaoticity function calls

diff --git a/PWGCF/FEMTOSCOPY/Chaoticity/AliChaoticity.cxx b/PWGCF/FEMTOSCOPY/Chaoticity/AliChaoticity.cxx
index 675ee959e8e9649e0ebcb2c17f2358ad9d7fe7b8..9ea78fb494947f90a88377ab18ae7be9f0d9d4d8 100644 (file)
--- a/PWGCF/FEMTOSCOPY/Chaoticity/AliChaoticity.cxx
+++ b/PWGCF/FEMTOSCOPY/Chaoticity/AliChaoticity.cxx
@@ -816,6 +816,7 @@ void AliChaoticity::ParInit()
       SetMomResCorrections(fLEGO);// Read Momentum resolution file
     }
   }
+
 }
 //________________________________________________________________________
 void AliChaoticity::UserCreateOutputObjects()
@@ -1401,6 +1402,7 @@ void AliChaoticity::Exec(Option_t *)
        
       }// aodTrack2
       
+      //cout<<nSigmaTPC[2]<<endl;
       ///////////////////
       ((TH3F*)fOutputList->FindObject("fTPCResponse"))->Fill(centralityPercentile, fTempStruct[myTracks].fMom, signalTPC);
       if(fTempStruct[myTracks].fTOFhit) {
@@ -3249,8 +3251,7 @@ void AliChaoticity::GetQosl(Float_t track1[], Float_t track2[], Float_t& qout, F
   qlong = (p0*vz - pz*v0)/mt;
 }
 //________________________________________________________________________
-void AliChaoticity::SetWeightArrays(Bool_t legoCase, TH3F *histos[kKbinsT][kCentBins]){
- 
+void AliChaoticity::SetWeightArrays(Bool_t legoCase, TH3F ***histos){
   if(legoCase){
     for(Int_t mb=0; mb<fMbins; mb++){
       for(Int_t edB=0; edB<kEDbins; edB++){
@@ -3556,6 +3557,7 @@ void AliChaoticity::SetFSICorrelations(Bool_t legoCase, TH2D *temp2D[2], TH3D *t
   // read in 2-particle and 3-particle FSI correlations = K2 & K3
   // 2-particle input histo from file is binned in qinv.  3-particle in qinv of each pair
   if(legoCase){
+    cout<<"LEGO call to SetFSICorrelations"<<endl;
     fFSI2SS = (TH2D*)temp2D[0]->Clone();
     fFSI2OS = (TH2D*)temp2D[1]->Clone();
     fFSIOmega0SS = (TH3D*)temp3D[0]->Clone();
@@ -3566,6 +3568,7 @@ void AliChaoticity::SetFSICorrelations(Bool_t legoCase, TH2D *temp2D[2], TH3D *t
     fFSIOmega0SS->SetDirectory(0);
     fFSIOmega0OS->SetDirectory(0);
   }else {
+    cout<<"non LEGO call to SetFSICorrelations"<<endl;
     TFile *fsifile = new TFile("KFile.root","READ");
     if(!fsifile->IsOpen()) {
       cout<<"No FSI file found"<<endl;

diff --git a/PWGCF/FEMTOSCOPY/Chaoticity/AliChaoticity.h b/PWGCF/FEMTOSCOPY/Chaoticity/AliChaoticity.h
index ca85dbf1a61a6845b38e22aba91ffef70e753403..4c24d49cbff18169a75960ed8995c10a135d35d7 100644 (file)
--- a/PWGCF/FEMTOSCOPY/Chaoticity/AliChaoticity.h
+++ b/PWGCF/FEMTOSCOPY/Chaoticity/AliChaoticity.h
@@ -41,13 +41,12 @@ class AliChaoticity : public AliAnalysisTaskSE {
   AliChaoticity(const AliChaoticity &obj); 
   AliChaoticity &operator=(const AliChaoticity &obj);
   
- private:
 
   virtual void   UserCreateOutputObjects();
   virtual void   Exec(Option_t *option);
   virtual void   Terminate(Option_t *);
-  
- enum {
+
+ enum ChaoticityConstants {
     kPairLimit = 15000,//15000
     kNormPairLimit = 45000,
     kMultLimitPbPb = 2000,//2000
@@ -68,6 +67,15 @@ class AliChaoticity : public AliAnalysisTaskSE {
     kMCfixedLambdabin = 5// 5 normally, (Lambdabin=5 (lambda=0.4)), 8 for systematic variation
  };
 
+  Int_t GetNumKtbins() const {return kKbinsT;}
+  Int_t GetNumRValues() const {return kRVALUES;}
+  Int_t GetNumCentBins() const {return kCentBins;}
+  void SetWeightArrays(Bool_t legoCase=kTRUE, TH3F ***histos=0x0);
+  void SetMomResCorrections(Bool_t legoCase=kTRUE, TH2D *temp2D=0x0, TH3D *temp3D[5]=0x0);
+  void SetFSICorrelations(Bool_t legoCase=kTRUE, TH2D *temp2D[2]=0x0, TH3D *temp3D[5]=0x0);
+
+ private:
+
   void ParInit();
   Bool_t AcceptPair(AliChaoticityTrackStruct, AliChaoticityTrackStruct);
   Float_t GamovFactor(Int_t, Int_t, Float_t);
@@ -81,23 +89,16 @@ class AliChaoticity : public AliAnalysisTaskSE {
   void ArrangeQs(Short_t, Short_t, Short_t, Short_t, Int_t, Int_t, Int_t, Float_t, Float_t, Float_t, Short_t, Short_t, Float_t&, Float_t&, Float_t&);
   Float_t GetQinv(Short_t, Float_t[], Float_t[]);
   void GetQosl(Float_t[], Float_t[], Float_t&, Float_t&, Float_t&);
-  void SetWeightArrays(Bool_t legoCase=kTRUE, TH3F *histos[kKbinsT][kCentBins]=0x0);
-  void SetMomResCorrections(Bool_t legoCase=kTRUE, TH2D *temp2D=0x0, TH3D *temp3D[5]=0x0);
-  void SetFSICorrelations(Bool_t legoCase=kTRUE, TH2D *temp2D[2]=0x0, TH3D *temp3D[2]=0x0);
   void GetWeight(Float_t[], Float_t[], Float_t&, Float_t&);
   Float_t FSICorrelation2(Int_t, Int_t, Int_t, Float_t);
   Float_t MCWeight(Int_t, Int_t, Int_t, Int_t, Float_t);
   Float_t MCWeight3D(Bool_t, Int_t, Int_t, Int_t, Float_t, Float_t, Float_t);
   Double_t FSICorrelationOmega0(Bool_t, Double_t, Double_t, Double_t);
   //
-  Int_t GetNumKtbins() const {return kKbinsT;}
-  Int_t GetNumRValues() const {return kRVALUES;}
-  Int_t GetNumCentBins() const {return kCentBins;}
-
+  
   
   const char* fname;// name of class
   AliAODEvent            *fAOD; //!    // AOD object
-  //AliESDEvent            *fESD; //!    // ESD object
   TList                  *fOutputList; //! Compact Output list
   AliPIDResponse         *fPIDResponse; //! PID response object; equivalent to AliAODpidUtil