Skip to content

Possibility of data without event selection #340

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
victor-gonzalez merged 1 commit into from
Nov 24, 2021
Merged

Possibility of data without event selection #340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions PWGCF/TableProducer/dptdptfilter.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ struct DptDptFilter {
Configurable<int> cfgTrackType{"trktype", 1, "Type of selected tracks: 0 = no selection, 1 = global tracks FB96, 3 = Run3 tracks. Default 1"};
Configurable<std::string> cfgCentMultEstimator{"centmultestimator", "V0M", "Centrality/multiplicity estimator detector: V0M, NOCM: none. Default V0M"};
Configurable<std::string> cfgSystem{"syst", "PbPb", "System: pp, PbPb, Pbp, pPb, XeXe. Default PbPb"};
Configurable<std::string> cfgDataType{"datatype", "data", "Data type: data, MC, FastMC, OnTheFlyMC. Default data"};
Configurable<std::string> cfgDataType{"datatype", "data", "Data type: data, datanoevsel, MC, FastMC, OnTheFlyMC. Default data"};
Configurable<o2::analysis::DptDptBinningCuts> 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"};
Expand Down Expand Up @@ -426,7 +426,7 @@ struct DptDptFilter {
fOutputList->Add(new TParameter<Int_t>("TrackOneCharge", trackonecharge, 'f'));
fOutputList->Add(new TParameter<Int_t>("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);
Expand Down Expand Up @@ -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);
Expand Down
13 changes: 8 additions & 5 deletions PWGCF/TableProducer/dptdptfilter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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") {
Expand Down
2 changes: 1 addition & 1 deletion PWGCF/Tasks/match-reco-gen.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ std::vector<std::vector<int64_t>> mclabelneg[2];
struct CheckGeneratorLevelVsDetectorLevel {
Configurable<int> cfgTrackType{"trktype", 1, "Type of selected tracks: 0 = no selection, 1 = global tracks FB96"};
Configurable<std::string> cfgCentMultEstimator{"centmultestimator", "V0M", "Centrality/multiplicity estimator detector: V0M, NOCM: none. Default V0M"};
Configurable<std::string> cfgDataType{"datatype", "data", "Data type: data, MC, FastMC, OnTheFlyMC. Default data"};
Configurable<std::string> cfgDataType{"datatype", "data", "Data type: data, datanoevsel, MC, FastMC, OnTheFlyMC. Default data"};
Configurable<o2::analysis::DptDptBinningCuts> 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"};
Expand Down