Merge branch 'AliceO2Group:master' into master

Author: DonggukKim0

Common/Core/TableHelper.h

@@ -20,6 +20,7 @@
 
 #include <string>
 
+#include "Framework/Configurable.h"
 #include "Framework/InitContext.h"
 #include "Framework/RunningWorkflowInfo.h"
 
@@ -95,4 +96,15 @@ bool getTaskOptionValue(o2::framework::InitContext& initContext, const std::stri
   return false;
 }
 
+/// Function to check for a specific configurable from another task in the current workflow and fetch its value. Useful for tasks that need to know the value of a configurable in another task.
+/// @param initContext initContext of the init function
+/// @param taskName name of the task to check for
+/// @param value Task configurable to inherit from (name and values are used)
+/// @param verbose if true, print debug messages
+template <typename ValueType>
+bool getTaskOptionValue(o2::framework::InitContext& initContext, const std::string& taskName, ValueType& configurable, const bool verbose = true)
+{
+  return getTaskOptionValue(initContext, taskName, configurable.name, configurable.value, verbose);
+}
+
 #endif // COMMON_CORE_TABLEHELPER_H_

DPG/Tasks/TPC/tpcSkimsTableCreator.cxx

@@ -79,6 +79,34 @@ DECLARE_SOA_TABLE(SkimmedTPCV0Tree, "AOD", "TPCSKIMV0TREE",
                   tpcskims::TrackOcc,
                   tpcskims::Ft0Occ,
                   tpcskims::HadronicRate);
+DECLARE_SOA_TABLE(SkimmedTPCV0TreeWithdEdxTrkQA, "AOD", "TPCSKIMV0WdE",
+                  o2::aod::track::TPCSignal,
+                  tpcskims::InvDeDxExpTPC,
+                  o2::aod::track::TPCInnerParam,
+                  o2::aod::track::Tgl,
+                  o2::aod::track::Signed1Pt,
+                  o2::aod::track::Eta,
+                  o2::aod::track::Phi,
+                  o2::aod::track::Y,
+                  tpcskims::Mass,
+                  tpcskims::BetaGamma,
+                  tpcskims::NormMultTPC,
+                  tpcskims::NormNClustersTPC,
+                  tpcskims::NormNClustersTPCPID,
+                  tpcskims::PidIndex,
+                  tpcskims::NSigTPC,
+                  tpcskims::NSigTOF,
+                  tpcskims::AlphaV0,
+                  tpcskims::QtV0,
+                  tpcskims::CosPAV0,
+                  tpcskims::PtV0,
+                  tpcskims::RadiusV0,
+                  tpcskims::GammaPsiPair,
+                  tpcskims::RunNumber,
+                  tpcskims::TrackOcc,
+                  tpcskims::Ft0Occ,
+                  tpcskims::HadronicRate,
+                  o2::aod::trackqa::TPCdEdxNorm);
 DECLARE_SOA_TABLE(SkimmedTPCV0TreeWithTrkQA, "AOD", "TPCSKIMV0WQA",
                   o2::aod::track::TPCSignal,
                   tpcskims::InvDeDxExpTPC,
@@ -117,7 +145,8 @@ DECLARE_SOA_TABLE(SkimmedTPCV0TreeWithTrkQA, "AOD", "TPCSKIMV0WQA",
                   o2::aod::trackqa::TPCdEdxTot0R,
                   o2::aod::trackqa::TPCdEdxTot1R,
                   o2::aod::trackqa::TPCdEdxTot2R,
-                  o2::aod::trackqa::TPCdEdxTot3R);
+                  o2::aod::trackqa::TPCdEdxTot3R,
+                  o2::aod::trackqa::TPCdEdxNorm);
 
 DECLARE_SOA_TABLE(SkimmedTPCTOFTree, "AOD", "TPCTOFSKIMTREE",
                   o2::aod::track::TPCSignal,
@@ -141,6 +170,29 @@ DECLARE_SOA_TABLE(SkimmedTPCTOFTree, "AOD", "TPCTOFSKIMTREE",
                   tpcskims::Ft0Occ,
                   tpcskims::HadronicRate);
 
+DECLARE_SOA_TABLE(SkimmedTPCTOFTreeWithdEdxTrkQA, "AOD", "TPCTOFSKIMWdE",
+                  o2::aod::track::TPCSignal,
+                  tpcskims::InvDeDxExpTPC,
+                  o2::aod::track::TPCInnerParam,
+                  o2::aod::track::Tgl,
+                  o2::aod::track::Signed1Pt,
+                  o2::aod::track::Eta,
+                  o2::aod::track::Phi,
+                  o2::aod::track::Y,
+                  tpcskims::Mass,
+                  tpcskims::BetaGamma,
+                  tpcskims::NormMultTPC,
+                  tpcskims::NormNClustersTPC,
+                  tpcskims::NormNClustersTPCPID,
+                  tpcskims::PidIndex,
+                  tpcskims::NSigTPC,
+                  tpcskims::NSigTOF,
+                  tpcskims::NSigITS,
+                  tpcskims::RunNumber,
+                  tpcskims::TrackOcc,
+                  tpcskims::Ft0Occ,
+                  tpcskims::HadronicRate,
+                  o2::aod::trackqa::TPCdEdxNorm);
 DECLARE_SOA_TABLE(SkimmedTPCTOFTreeWithTrkQA, "AOD", "TPCTOFSKIMWQA",
                   o2::aod::track::TPCSignal,
                   tpcskims::InvDeDxExpTPC,
@@ -174,6 +226,7 @@ DECLARE_SOA_TABLE(SkimmedTPCTOFTreeWithTrkQA, "AOD", "TPCTOFSKIMWQA",
                   o2::aod::trackqa::TPCdEdxTot0R,
                   o2::aod::trackqa::TPCdEdxTot1R,
                   o2::aod::trackqa::TPCdEdxTot2R,
-                  o2::aod::trackqa::TPCdEdxTot3R);
+                  o2::aod::trackqa::TPCdEdxTot3R,
+                  o2::aod::trackqa::TPCdEdxNorm);
 } // namespace o2::aod
 #endif // DPG_TASKS_TPC_TPCSKIMSTABLECREATOR_H_

DPG/Tasks/TPC/tpcSkimsTableCreator.h

@@ -125,7 +125,7 @@ struct nucleiFilter {
   struct : ConfigurableGroup {
     Configurable<double> bFieldInput{"trgH3L3Body.mBz", -999, "bz field, -999 is automatic"};
     Configurable<float> minCosPA3body{"trgH3L3Body.minCosPA3body", 0.9995, "minCosPA3body"};
-    Configurable<float> dcavtxdau{"trgH3L3Body.dcavtxdau", 0.02, "meen DCA among Daughters"};
+    Configurable<float> dcavtxdau{"trgH3L3Body.dcavtxdau", 0.15, "meen DCA among Daughters"};
     Configurable<float> dcapiontopv{"trgH3L3Body.dcapiontopv", 0.05, "DCA Pion To PV"};
     Configurable<float> tofPIDNSigmaMin{"trgH3L3Body.tofPIDNSigmaMin", -5, "tofPIDNSigmaMin"};
     Configurable<float> tofPIDNSigmaMax{"trgH3L3Body.tofPIDNSigmaMax", 5, "tofPIDNSigmaMax"};
@@ -138,7 +138,7 @@ struct nucleiFilter {
     Configurable<float> maxPionPt{"trgH3L3Body.maxPionPt", 1.2, "maxPionPt"};
     Configurable<float> minDeuteronPt{"trgH3L3Body.minDeuteronPt", 0.6, "minDeuteronPt"};
     Configurable<float> maxDeuteronPt{"trgH3L3Body.maxDeuteronPt", 10, "maxDeuteronPt"};
-    Configurable<float> minDeuteronPUseTOF{"trgH3L3Body.minDeuteronPUseTOF", 1, "minDeuteronPt Enable TOF PID"};
+    Configurable<float> minDeuteronPUseTOF{"trgH3L3Body.minDeuteronPUseTOF", 999, "minDeuteronPt Enable TOF PID"};
     Configurable<float> h3LMassLowerlimit{"trgH3L3Body.h3LMassLowerlimit", 2.96, "Hypertriton mass lower limit"};
     Configurable<float> h3LMassUpperlimit{"trgH3L3Body.h3LMassUpperlimit", 3.04, "Hypertriton mass upper limit"};
     Configurable<float> minP3Body{"trgH3L3Body.minP3Body", 1.5, "min P3Body"};
@@ -618,7 +618,7 @@ struct nucleiFilter {
         continue;
       }
 
-      float dcaDaughters = fitter3body.getChi2AtPCACandidate();
+      float dcaDaughters = std::sqrt(fitter3body.getChi2AtPCACandidate());
       if (dcaDaughters > trgH3L3Body.dcavtxdau) {
         continue;
       }