diff --git a/PWGCF/TableProducer/dptdptfilter.cxx b/PWGCF/TableProducer/dptdptfilter.cxx index 3991acc932e..6933c87d50b 100644 --- a/PWGCF/TableProducer/dptdptfilter.cxx +++ b/PWGCF/TableProducer/dptdptfilter.cxx @@ -132,7 +132,7 @@ struct DptDptFilter { Configurable cfgTrackType{"trktype", 1, "Type of selected tracks: 0 = no selection, 1 = global tracks FB96, 3 = Run3 tracks. Default 1"}; Configurable cfgCentMultEstimator{"centmultestimator", "V0M", "Centrality/multiplicity estimator detector: V0M, NOCM: none. Default V0M"}; Configurable cfgSystem{"syst", "PbPb", "System: pp, PbPb, Pbp, pPb, XeXe. Default PbPb"}; - Configurable cfgDataType{"datatype", "data", "Data type: data, MC, FastMC, OnTheFlyMC. Default data"}; + Configurable cfgDataType{"datatype", "data", "Data type: data, datanoevsel, MC, FastMC, OnTheFlyMC. Default data"}; Configurable cfgBinning{"binning", {28, -7.0, 7.0, 18, 0.2, 2.0, 16, -0.8, 0.8, 72, 0.5}, "triplets - nbins, min, max - for z_vtx, pT, eta and phi, binning plus bin fraction of phi origin shift"}; @@ -426,7 +426,7 @@ struct DptDptFilter { fOutputList->Add(new TParameter("TrackOneCharge", trackonecharge, 'f')); fOutputList->Add(new TParameter("TrackTwoCharge", tracktwocharge, 'f')); - if ((fDataType == kData) or (fDataType == kMC)) { + if ((fDataType == kData) or (fDataType == kDataNoEvtSel) or (fDataType == kMC)) { /* create the reconstructed data histograms */ if (fSystem > kPbp) { fhCentMultB = new TH1F("CentralityB", "Centrality before cut; centrality (%)", 100, 0, 100); @@ -506,7 +506,7 @@ struct DptDptFilter { } } - if (fDataType != kData) { + if ((fDataType != kData) and (fDataType != kDataNoEvtSel)) { /* create the true data histograms */ if (fSystem > kPbp) { fhTrueCentMultB = new TH1F("TrueCentralityB", "Centrality before (truth); centrality (%)", 100, 0, 100); diff --git a/PWGCF/TableProducer/dptdptfilter.h b/PWGCF/TableProducer/dptdptfilter.h index 782d608a0ab..162b21f6db6 100644 --- a/PWGCF/TableProducer/dptdptfilter.h +++ b/PWGCF/TableProducer/dptdptfilter.h @@ -51,11 +51,12 @@ enum SystemType { /// \enum DataType /// \brief Which kind of data is the task addressing enum DataType { - kData = 0, ///< actual data, not generated - kMC, ///< Generator level and detector level - kFastMC, ///< Gererator level but stored dataset - kOnTheFly, ///< On the fly generator level data - knGenData ///< number of different generator data types + kData = 0, ///< actual data, not generated + kMC, ///< Generator level and detector level + kFastMC, ///< Gererator level but stored dataset + kOnTheFly, ///< On the fly generator level data + kDataNoEvtSel, ///< actual data but not event selection available yet + knGenData ///< number of different generator data types }; /// \enum CentMultEstimatorType @@ -133,6 +134,8 @@ inline DataType getDataType(std::string const& datastr) /* we have to figure out how extract the type of data*/ if (datastr.empty() or (datastr == "data")) { return kData; + } else if (datastr == "datanoevsel") { + return kDataNoEvtSel; } else if (datastr == "MC") { return kMC; } else if (datastr == "FastMC") { diff --git a/PWGCF/Tasks/match-reco-gen.cxx b/PWGCF/Tasks/match-reco-gen.cxx index 4f2965697cd..62b514c9c4e 100644 --- a/PWGCF/Tasks/match-reco-gen.cxx +++ b/PWGCF/Tasks/match-reco-gen.cxx @@ -63,7 +63,7 @@ std::vector> mclabelneg[2]; struct CheckGeneratorLevelVsDetectorLevel { Configurable cfgTrackType{"trktype", 1, "Type of selected tracks: 0 = no selection, 1 = global tracks FB96"}; Configurable cfgCentMultEstimator{"centmultestimator", "V0M", "Centrality/multiplicity estimator detector: V0M, NOCM: none. Default V0M"}; - Configurable cfgDataType{"datatype", "data", "Data type: data, MC, FastMC, OnTheFlyMC. Default data"}; + Configurable cfgDataType{"datatype", "data", "Data type: data, datanoevsel, MC, FastMC, OnTheFlyMC. Default data"}; Configurable cfgBinning{"binning", {28, -7.0, 7.0, 18, 0.2, 2.0, 16, -0.8, 0.8, 72, 0.5}, "triplets - nbins, min, max - for z_vtx, pT, eta and phi, binning plus bin fraction of phi origin shift"};