Merge branch 'feature-movesplit'

[u/mrichter/AliRoot.git] / PWGLF / RESONANCES / macros / lego_train / AddRsnPairsKStar.C

diff --git a/PWGLF/RESONANCES/macros/lego_train/AddRsnPairsKStar.C b/PWGLF/RESONANCES/macros/lego_train/AddRsnPairsKStar.C
index 8d0f49fb95ffca7ec775f08a18f61dd62784dea0..a397a520b49711fc3a45aad151d535ceb0105ef8 100644 (file)
--- a/PWGLF/RESONANCES/macros/lego_train/AddRsnPairsKStar.C
+++ b/PWGLF/RESONANCES/macros/lego_train/AddRsnPairsKStar.C
@@ -18,7 +18,8 @@ void AddRsnPairsKStar(AliAnalysisTaskSE *task,
    Double_t mass = part->Mass();
 
    Bool_t valid;
-   Int_t isRsnMini = AliAnalysisManager::GetGlobalInt("rsnUseMiniPackage",valid);
+   Int_t isRsnMini = AliRsnTrainManager::GetGlobalInt("IsRsnMini",valid);
+
    if (isRsnMini) {
       AddPairOutputMiniKStar(task,isMC,isMixing,pType1,listID1,pType2,listID2,pdg,mass,cutsPair,suffix);
    } else {
@@ -30,8 +31,10 @@ void AddRsnPairsKStar(AliAnalysisTaskSE *task,
 void AddPairOutputKStar(AliRsnLoopPair *pair)
 {
    Bool_t valid;
-   Int_t isFullOutput = AliAnalysisManager::GetGlobalInt("rsnOutputFull",valid);
-   Int_t isPP = AliAnalysisManager::GetGlobalInt("rsnIsPP",valid);
+
+   Int_t isFullOutput = AliRsnTrainManager::GetGlobalInt("RsnOutputFull",valid);
+   Int_t collisionType = AliRsnTrainManager::GetGlobalInt("IsCollisionType",valid);
+   Int_t useRapidity = AliRsnTrainManager::GetGlobalInt("RsnUseRapidity",valid);
 
    // axes
    AliRsnValuePair *axisIM = new AliRsnValuePair("IM", AliRsnValuePair::kInvMass);
@@ -44,7 +47,7 @@ void AddPairOutputKStar(AliRsnLoopPair *pair)
    axisEta    ->SetBins(400, -0.5, 0.5);
 
    AliRsnValueEvent *axisCentrality = 0;
-   if (!isPP) axisCentrality = new AliRsnValueEvent("MULTI",AliRsnValueEvent::kCentralityV0);
+   if (collisionType==1) axisCentrality = new AliRsnValueEvent("MULTI",AliRsnValueEvent::kCentralityV0);
 
    // output: 2D histogram of inv. mass vs. pt
    AliRsnListOutput *outPair = 0;
@@ -65,13 +68,13 @@ void AddPairOutputKStar(AliRsnLoopPair *pair)
 void AddPairOutputMiniKStar(AliAnalysisTaskSE *task,Bool_t isMC,Bool_t isMixing, AliPID::EParticleType pType1,Int_t listID1, AliPID::EParticleType pType2,Int_t listID2, Int_t pdgMother,Double_t massMother, AliRsnCutSet *cutsPair=0,TString suffix = "") {
 
    Bool_t valid;
-   Int_t isFullOutput = AliAnalysisManager::GetGlobalInt("rsnOutputFull",valid);
-   Int_t useMixing = AliAnalysisManager::GetGlobalInt("rsnUseMixing",valid);
-   Int_t isPP = AliAnalysisManager::GetGlobalInt("rsnIsPP",valid);
+   Int_t isFullOutput = AliRsnTrainManager::GetGlobalInt("RsnOutputFull",valid);
+   Int_t useMixing = AliRsnTrainManager::GetGlobalInt("IsMixing",valid);
+   Int_t collisionType = AliRsnTrainManager::GetGlobalInt("IsCollisionType",valid);
 
    AliRsnMiniAnalysisTask *taskRsnMini =  (AliRsnMiniAnalysisTask *)task;
 
-   if (isPP) taskRsnMini->UseMultiplicity("QUALITY");
+   if (collisionType==0) taskRsnMini->UseMultiplicity("QUALITY");
    else {
       taskRsnMini->UseCentrality("V0M");
       Int_t multID = taskRsnMini->CreateValue(AliRsnMiniValue::kMult, kFALSE);
@@ -94,9 +97,9 @@ void AddPairOutputMiniKStar(AliAnalysisTaskSE *task,Bool_t isMC,Bool_t isMixing,
    Int_t nIM   = 90; Double_t minIM   = 0.6, maxIM =  1.5;
    Int_t nRes   = 200; Double_t minRes   = -0.02, maxRes =  0.02;
    Int_t nEta   = 400; Double_t minEta   = -0.5, maxEta =  0.5;
-   Int_t nY   = 16; Double_t minY   = -0.8, maxY =  0.8;
+   Int_t nY   = 32; Double_t minY   = -0.8, maxY =  0.8;
    Int_t nPt   = 120; Double_t minPt   = 0.0, maxPt = 12.0;
-   Int_t nCent = 100; Double_t minCent = 0.0, maxCent = 100.0;
+   Int_t nCent = 20; Double_t minCent = 0.0, maxCent = 100.0;
    //
    // -- Create all needed outputs -----------------------------------------------------------------
    //
@@ -150,7 +153,7 @@ void AddPairOutputMiniKStar(AliAnalysisTaskSE *task,Bool_t isMC,Bool_t isMixing,
          if (useRapidity) out->AddAxis(yID, nY, minY, maxY);
          else  out->AddAxis(etaID, nEta, minEta, maxEta);
          // axis Z: centrality
-         if (!isPP) out->AddAxis(centID, nCent, minCent, maxCent);
+         if (collisionType==1) out->AddAxis(centID, nCent, minCent, maxCent);
       }
    }
 
@@ -175,7 +178,7 @@ void AddPairOutputMiniKStar(AliAnalysisTaskSE *task,Bool_t isMC,Bool_t isMixing,
          if (useRapidity) outMC->AddAxis(yID, nY, minY, maxY);
          else  outMC->AddAxis(etaID, nEta, minEta, maxEta);
          // axis Z: centrality
-         if (!isPP) outMC->AddAxis(centID, nCent, minCent, maxCent);
+         if (collisionType==1) outMC->AddAxis(centID, nCent, minCent, maxCent);
       }
    }
 
@@ -199,7 +202,7 @@ void AddPairOutputMiniKStar(AliAnalysisTaskSE *task,Bool_t isMC,Bool_t isMixing,
          if (useRapidity) outMC1->AddAxis(yID, nY, minY, maxY);
          else  outMC1->AddAxis(etaID, nEta, minEta, maxEta);
          // axis Z: centrality
-         if (!isPP) outMC1->AddAxis(centID, nCent, minCent, maxCent);
+         if (collisionType==1) outMC1->AddAxis(centID, nCent, minCent, maxCent);
       }
    }