-> Changes to triggering scheme for p-Pb

-> Coverity fixes

diff --git a/PWGLF/STRANGENESS/LambdaK0/AliAnalysisTaskExtractPerformanceV0.cxx b/PWGLF/STRANGENESS/LambdaK0/AliAnalysisTaskExtractPerformanceV0.cxx
index 887f989b3b77b64559138e19f35c069341f8018f..bfc8a7ca3fb31ce1d8a296f6ab8c640e97c94e0f 100644 (file)
--- a/PWGLF/STRANGENESS/LambdaK0/AliAnalysisTaskExtractPerformanceV0.cxx
+++ b/PWGLF/STRANGENESS/LambdaK0/AliAnalysisTaskExtractPerformanceV0.cxx
@@ -98,7 +98,7 @@ ClassImp(AliAnalysisTaskExtractPerformanceV0)
 AliAnalysisTaskExtractPerformanceV0::AliAnalysisTaskExtractPerformanceV0() 
   : AliAnalysisTaskSE(), fListHistV0(0), fTree(0), fPIDResponse(0), fESDtrackCuts(0),
    fkIsNuclear   ( kFALSE ), 
-   fkLowEnergyPP ( kFALSE ),
+   fkSwitchINT7  ( kFALSE ),
    fkUseOnTheFly ( kFALSE ),
    fkTakeAllTracks ( kFALSE ),
 //------------------------------------------------
@@ -269,7 +269,7 @@ AliAnalysisTaskExtractPerformanceV0::AliAnalysisTaskExtractPerformanceV0()
 AliAnalysisTaskExtractPerformanceV0::AliAnalysisTaskExtractPerformanceV0(const char *name) 
   : AliAnalysisTaskSE(name), fListHistV0(0), fTree(0), fPIDResponse(0), fESDtrackCuts(0),
    fkIsNuclear   ( kFALSE ), 
-   fkLowEnergyPP ( kFALSE ),
+   fkSwitchINT7  ( kFALSE ),
    fkUseOnTheFly ( kFALSE ),
    fkTakeAllTracks ( kFALSE ),
 //------------------------------------------------
@@ -1292,12 +1292,9 @@ void AliAnalysisTaskExtractPerformanceV0::UserExec(Option_t *)
    Bool_t isSelected = 0;
    isSelected = (maskIsSelected & AliVEvent::kMB) == AliVEvent::kMB;
 
-   //pp at 2.76TeV: special case, ignore FastOnly
-   if ( (fkLowEnergyPP == kTRUE) && (maskIsSelected& AliVEvent::kFastOnly) ){
-      PostData(1, fListHistV0);
-      PostData(2, fTree);
-      return;
-   } 
+   //pA triggering: CINT7
+   if( fkSwitchINT7 ) isSelected = (maskIsSelected & AliVEvent::kINT7) == AliVEvent::kINT7;
+
    //Standard Min-Bias Selection
    if ( ! isSelected ) { 
       PostData(1, fListHistV0);

diff --git a/PWGLF/STRANGENESS/LambdaK0/AliAnalysisTaskExtractPerformanceV0.h b/PWGLF/STRANGENESS/LambdaK0/AliAnalysisTaskExtractPerformanceV0.h
index 4367b019aaf2d7fd2cb4c7e6ac44bd9ab749c033..9b5adc23698e33f2f762e9201a909db99873854e 100644 (file)
--- a/PWGLF/STRANGENESS/LambdaK0/AliAnalysisTaskExtractPerformanceV0.h
+++ b/PWGLF/STRANGENESS/LambdaK0/AliAnalysisTaskExtractPerformanceV0.h
@@ -55,7 +55,7 @@ class AliAnalysisTaskExtractPerformanceV0 : public AliAnalysisTaskSE {
   void CheckChargeV0(AliESDv0 *thisv0);
 
   void SetIsNuclear           (Bool_t lIsNuclear   = kTRUE ) { fkIsNuclear   = lIsNuclear;   }
-  void SetIsLowEnergyPP       (Bool_t lLowEnergyPP = kTRUE ) { fkLowEnergyPP = lLowEnergyPP; }
+  void SetINT7Trigger         (Bool_t lSwitchINT7  = kTRUE ) { fkSwitchINT7   = lSwitchINT7; }
   void SetUseOnTheFly         (Bool_t lUseOnTheFly = kTRUE ) { fkUseOnTheFly = lUseOnTheFly; }
   void SetTakeAllTracks       (Bool_t lTakeAllTracks = kTRUE ) { fkTakeAllTracks = lTakeAllTracks; }
   
@@ -72,7 +72,7 @@ class AliAnalysisTaskExtractPerformanceV0 : public AliAnalysisTaskSE {
   //Objects Controlling Task Behaviour 
   
   Bool_t fkIsNuclear;   //if true, replace multiplicity est. by centrality (default FALSE) 
-  Bool_t fkLowEnergyPP; //if true, skip FASTOnly (default FALSE)
+  Bool_t fkSwitchINT7 ; //if true, skip FASTOnly (default FALSE)
   Bool_t fkUseOnTheFly; //if true, will use On-the-fly V0s instead of Offline V0s (default FALSE)
   Bool_t fkTakeAllTracks; // if true, no TPC crossed rows and ratio cut
 

diff --git a/PWGLF/STRANGENESS/LambdaK0/AliAnalysisTaskExtractV0.cxx b/PWGLF/STRANGENESS/LambdaK0/AliAnalysisTaskExtractV0.cxx
index 200cc8984e810417ecced782aa39a082fd322027..47670bccfb63a6d660dd5937cb34fa62a48339d1 100644 (file)
--- a/PWGLF/STRANGENESS/LambdaK0/AliAnalysisTaskExtractV0.cxx
+++ b/PWGLF/STRANGENESS/LambdaK0/AliAnalysisTaskExtractV0.cxx
@@ -92,7 +92,7 @@ ClassImp(AliAnalysisTaskExtractV0)
 AliAnalysisTaskExtractV0::AliAnalysisTaskExtractV0() 
   : AliAnalysisTaskSE(), fListHistV0(0), fTree(0), fPIDResponse(0),fESDtrackCuts(0),
    fkIsNuclear     ( kFALSE ), 
-   fkLowEnergyPP   ( kFALSE ),
+   fkSwitchINT7    ( kFALSE ),
    fkUseOnTheFly   ( kFALSE ),
    fkTakeAllTracks ( kFALSE ),
 //------------------------------------------------
@@ -180,7 +180,7 @@ AliAnalysisTaskExtractV0::AliAnalysisTaskExtractV0()
 AliAnalysisTaskExtractV0::AliAnalysisTaskExtractV0(const char *name) 
   : AliAnalysisTaskSE(name), fListHistV0(0), fTree(0), fPIDResponse(0),fESDtrackCuts(0),
    fkIsNuclear     ( kFALSE ), 
-   fkLowEnergyPP   ( kFALSE ),
+   fkSwitchINT7    ( kFALSE ),
    fkUseOnTheFly   ( kFALSE ),
    fkTakeAllTracks ( kFALSE ),
      
@@ -598,12 +598,9 @@ void AliAnalysisTaskExtractV0::UserExec(Option_t *)
    Bool_t isSelected = 0;
    isSelected = (maskIsSelected & AliVEvent::kMB) == AliVEvent::kMB;
 
-   //pp at 2.76TeV: special case, ignore FastOnly
-   if ( (fkLowEnergyPP == kTRUE) && (maskIsSelected& AliVEvent::kFastOnly) ){
-      PostData(1, fListHistV0);
-      PostData(2, fTree);
-      return;
-   } 
+   //pA triggering: CINT7
+   if( fkSwitchINT7 ) isSelected = (maskIsSelected & AliVEvent::kINT7) == AliVEvent::kINT7;
+
    //Standard Min-Bias Selection
    if ( ! isSelected ) { 
       PostData(1, fListHistV0);

diff --git a/PWGLF/STRANGENESS/LambdaK0/AliAnalysisTaskExtractV0.h b/PWGLF/STRANGENESS/LambdaK0/AliAnalysisTaskExtractV0.h
index bafb8b415b623f59057f5d85fa5218be471a757e..41c3f4fbaa8506479792ab54e64fae693feb0f66 100644 (file)
--- a/PWGLF/STRANGENESS/LambdaK0/AliAnalysisTaskExtractV0.h
+++ b/PWGLF/STRANGENESS/LambdaK0/AliAnalysisTaskExtractV0.h
@@ -59,7 +59,7 @@ class AliAnalysisTaskExtractV0 : public AliAnalysisTaskSE {
   void CheckChargeV0(AliESDv0 *thisv0);
 
   void SetIsNuclear           (Bool_t lIsNuclear   = kTRUE ) { fkIsNuclear   = lIsNuclear;   }
-  void SetIsLowEnergyPP       (Bool_t lLowEnergyPP = kTRUE ) { fkLowEnergyPP = lLowEnergyPP; }
+  void SetINT7Trigger         (Bool_t lSwitchINT7  = kTRUE ) { fkSwitchINT7  = lSwitchINT7; }
   void SetUseOnTheFly         (Bool_t lUseOnTheFly = kTRUE ) { fkUseOnTheFly = lUseOnTheFly; }
   void SetTakeAllTracks       (Bool_t lTakeAllTracks = kTRUE ) { fkTakeAllTracks = lTakeAllTracks; }
 
@@ -76,7 +76,7 @@ class AliAnalysisTaskExtractV0 : public AliAnalysisTaskSE {
   //Objects Controlling Task Behaviour 
   
   Bool_t fkIsNuclear;   // if true, replace multiplicity est. by centrality (default FALSE) 
-  Bool_t fkLowEnergyPP; // if true, skip FASTOnly (default FALSE)
+  Bool_t fkSwitchINT7; // if true, skip FASTOnly (default FALSE)
   Bool_t fkUseOnTheFly; // if true, will use On-the-fly V0s instead of Offline V0s (default FALSE)
   Bool_t fkTakeAllTracks; // if true, no TPC crossed rows and ratio cut
 

diff --git a/PWGLF/STRANGENESS/LambdaK0/AliAnalysisTaskExtractV0AOD.cxx b/PWGLF/STRANGENESS/LambdaK0/AliAnalysisTaskExtractV0AOD.cxx
index ccbb188395ea20c4b073080e66cc9b1cdc98c3cc..db70b2b4dfcf199b56dd6e8d4eff21394f4e0bb5 100644 (file)
--- a/PWGLF/STRANGENESS/LambdaK0/AliAnalysisTaskExtractV0AOD.cxx
+++ b/PWGLF/STRANGENESS/LambdaK0/AliAnalysisTaskExtractV0AOD.cxx
@@ -96,6 +96,45 @@ AliAnalysisTaskExtractV0AOD::AliAnalysisTaskExtractV0AOD()
    fkLowEnergyPP ( kFALSE ),
    fkUseOnTheFly ( kFALSE ),
    fTriggerMask  ( "kMB"  ),
+//------------------------------------------------
+// Variables for tree 
+//------------------------------------------------
+
+        fTreeVariableChi2V0(0),
+        fTreeVariableDcaV0Daughters(0),
+        fTreeVariableDcaV0ToPrimVertex(0),
+        fTreeVariableDcaPosToPrimVertex(0),
+        fTreeVariableDcaNegToPrimVertex(0),
+        fTreeVariableV0CosineOfPointingAngle(0),
+        fTreeVariableV0Radius(0),
+        fTreeVariablePt(0),
+        fTreeVariableRapK0Short(0),
+        fTreeVariableRapLambda(0),
+        fTreeVariableInvMassK0s(0),
+        fTreeVariableInvMassLambda(0),
+        fTreeVariableInvMassAntiLambda(0),
+        fTreeVariableAlphaV0(0),
+        fTreeVariablePtArmV0(0),
+        fTreeVariableNegTotMomentum(0),
+        fTreeVariablePosTotMomentum(0),
+        fTreeVariableNegdEdxSig(0),
+        fTreeVariablePosdEdxSig(0),
+        fTreeVariableNegEta(0),
+        fTreeVariablePosEta(0),
+
+        fTreeVariableNSigmasPosProton(0),
+        fTreeVariableNSigmasPosPion(0),
+        fTreeVariableNSigmasNegProton(0),
+        fTreeVariableNSigmasNegPion(0),
+       
+        fTreeVariableDistOverTotMom(0),
+   fTreeVariableLeastNbrCrossedRows(0),
+        fTreeVariableLeastRatioCrossedRowsOverFindable(0),
+        fTreeVariableMultiplicity(0),
+
+   fTreeVariableRunNumber(0),
+   fTreeVariableEventNumber(0),
+
 
 //------------------------------------------------
 // HISTOGRAMS
@@ -129,6 +168,45 @@ AliAnalysisTaskExtractV0AOD::AliAnalysisTaskExtractV0AOD(const char *name)
    fkUseOnTheFly ( kFALSE ),
    fTriggerMask  ( "kMB"  ),
      
+//------------------------------------------------
+// Variables for tree 
+//------------------------------------------------
+
+        fTreeVariableChi2V0(0),
+        fTreeVariableDcaV0Daughters(0),
+        fTreeVariableDcaV0ToPrimVertex(0),
+        fTreeVariableDcaPosToPrimVertex(0),
+        fTreeVariableDcaNegToPrimVertex(0),
+        fTreeVariableV0CosineOfPointingAngle(0),
+        fTreeVariableV0Radius(0),
+        fTreeVariablePt(0),
+        fTreeVariableRapK0Short(0),
+        fTreeVariableRapLambda(0),
+        fTreeVariableInvMassK0s(0),
+        fTreeVariableInvMassLambda(0),
+        fTreeVariableInvMassAntiLambda(0),
+        fTreeVariableAlphaV0(0),
+        fTreeVariablePtArmV0(0),
+        fTreeVariableNegTotMomentum(0),
+        fTreeVariablePosTotMomentum(0),
+        fTreeVariableNegdEdxSig(0),
+        fTreeVariablePosdEdxSig(0),
+        fTreeVariableNegEta(0),
+        fTreeVariablePosEta(0),
+
+        fTreeVariableNSigmasPosProton(0),
+        fTreeVariableNSigmasPosPion(0),
+        fTreeVariableNSigmasNegProton(0),
+        fTreeVariableNSigmasNegPion(0),
+       
+        fTreeVariableDistOverTotMom(0),
+   fTreeVariableLeastNbrCrossedRows(0),
+        fTreeVariableLeastRatioCrossedRowsOverFindable(0),
+        fTreeVariableMultiplicity(0),
+
+   fTreeVariableRunNumber(0),
+   fTreeVariableEventNumber(0),
+
 //------------------------------------------------
 // HISTOGRAMS
 // --- Filled on an Event-by-event basis

diff --git a/PWGLF/STRANGENESS/LambdaK0/macros/AddTaskExtractPerformanceV0.C b/PWGLF/STRANGENESS/LambdaK0/macros/AddTaskExtractPerformanceV0.C
index 8bcfb7d6bac3f34a995f54b003cfaa104be85a0a..1a8651e20c299783f4ef316c3459ca4fde75f94a 100644 (file)
--- a/PWGLF/STRANGENESS/LambdaK0/macros/AddTaskExtractPerformanceV0.C
+++ b/PWGLF/STRANGENESS/LambdaK0/macros/AddTaskExtractPerformanceV0.C
@@ -1,7 +1,7 @@
 AliAnalysisTaskExtractPerformanceV0 *AddTaskExtractPerformanceV0( Bool_t lSwitchIsNuclear     = kFALSE, 
-                                                                  Bool_t lSwitchIsLowEnergyPP = kFALSE,
+                                                                  Bool_t lSwitchINT7          = kFALSE,
                                                                   Bool_t lSwitchUseOnTheFly   = kFALSE,
-                                                                  Bool_t lSwitchTakeAllTracks  = kFALSE,  
+                                                                  Bool_t lSwitchTakeAllTracks = kFALSE,  
                                                                   const TString lMasterJobSessionFlag = "")
 {
 // Creates, configures and attaches to the train a cascades check task.
@@ -26,7 +26,7 @@ AliAnalysisTaskExtractPerformanceV0 *AddTaskExtractPerformanceV0( Bool_t lSwitch
 
    //Configuration
    taskv0extractperformance -> SetIsNuclear     ( lSwitchIsNuclear     );
-   taskv0extractperformance -> SetIsLowEnergyPP ( lSwitchIsLowEnergyPP );
+   taskv0extractperformance -> SetINT7Trigger   ( lSwitchINT7          );
    taskv0extractperformance -> SetUseOnTheFly   ( lSwitchUseOnTheFly   );
    taskv0extractperformance -> SetTakeAllTracks ( lSwitchTakeAllTracks );
 

diff --git a/PWGLF/STRANGENESS/LambdaK0/macros/AddTaskExtractV0.C b/PWGLF/STRANGENESS/LambdaK0/macros/AddTaskExtractV0.C
index 763a978ec76076b51d88537003996ea114fea2ab..1af12c824afde6cd7d4373c20fcdc1a0bb9a34ce 100644 (file)
--- a/PWGLF/STRANGENESS/LambdaK0/macros/AddTaskExtractV0.C
+++ b/PWGLF/STRANGENESS/LambdaK0/macros/AddTaskExtractV0.C
@@ -1,6 +1,6 @@
-AliAnalysisTaskExtractV0 *AddTaskExtractV0( Bool_t lSwitchIsNuclear     = kFALSE, 
-                                            Bool_t lSwitchIsLowEnergyPP = kFALSE,
-                                            Bool_t lSwitchUseOnTheFly   = kFALSE,
+AliAnalysisTaskExtractV0 *AddTaskExtractV0( Bool_t lSwitchIsNuclear      = kFALSE, 
+                                            Bool_t lSwitchINT7           = kFALSE,
+                                            Bool_t lSwitchUseOnTheFly    = kFALSE,
                                             Bool_t lSwitchTakeAllTracks  = kFALSE, 
                                             const TString lMasterJobSessionFlag = "")
 {
@@ -26,7 +26,7 @@ AliAnalysisTaskExtractV0 *AddTaskExtractV0( Bool_t lSwitchIsNuclear     = kFALSE
 
    //Configuration
    taskv0extract -> SetIsNuclear     ( lSwitchIsNuclear     );
-   taskv0extract -> SetIsLowEnergyPP ( lSwitchIsLowEnergyPP );
+   taskv0extract -> SetINT7Trigger   ( lSwitchINT7          );
    taskv0extract -> SetUseOnTheFly   ( lSwitchUseOnTheFly   );
    taskv0extract -> SetTakeAllTracks ( lSwitchTakeAllTracks );