Skip to content

Fixed bug for nested AnalysisCompositeCuts; removed duplicated histogram classes from TableReader #5039

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
iarsene merged 1 commit into from
Dec 11, 2020
Merged

Fixed bug for nested AnalysisCompositeCuts; removed duplicated histogram classes from TableReader #5039

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
14 changes: 11 additions & 3 deletions Analysis/Core/include/AnalysisCore/AnalysisCompositeCut.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,18 +29,26 @@ class AnalysisCompositeCut : public AnalysisCut
AnalysisCompositeCut& operator=(const AnalysisCompositeCut& c) = default;
~AnalysisCompositeCut() override;

void AddCut(AnalysisCut* cut) { fCutList.push_back(*cut); };
void AddCut(AnalysisCut* cut)
{
if (cut->IsA() == AnalysisCompositeCut::Class()) {
fCompositeCutList.push_back(*(AnalysisCompositeCut*)cut);
} else {
fCutList.push_back(*cut);
}
};

bool GetUseAND() const { return fOptionUseAND; }
int GetNCuts() const { return fCutList.size(); }
int GetNCuts() const { return fCutList.size() + fCompositeCutList.size(); }

bool IsSelected(float* values) override;

protected:
bool fOptionUseAND; // true (default): apply AND on all cuts; false: use OR
std::vector<AnalysisCut> fCutList; // list of cuts
std::vector<AnalysisCompositeCut> fCompositeCutList; // list of composite cuts

ClassDef(AnalysisCompositeCut, 1);
ClassDef(AnalysisCompositeCut, 2);
};

#endif
15 changes: 13 additions & 2 deletions Analysis/Core/src/AnalysisCompositeCut.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ ClassImp(AnalysisCompositeCut)
//____________________________________________________________________________
AnalysisCompositeCut::AnalysisCompositeCut(bool useAND) : AnalysisCut(),
fOptionUseAND(useAND),
fCutList()
fCutList(),
fCompositeCutList()
{
//
// default constructor
Expand All @@ -25,7 +26,8 @@ ClassImp(AnalysisCompositeCut)
//____________________________________________________________________________
AnalysisCompositeCut::AnalysisCompositeCut(const char* name, const char* title, bool useAND) : AnalysisCut(name, title),
fOptionUseAND(useAND),
fCutList()
fCutList(),
fCompositeCutList()
{
//
// named constructor
Expand All @@ -50,6 +52,15 @@ bool AnalysisCompositeCut::IsSelected(float* values)
}
}

for (std::vector<AnalysisCompositeCut>::iterator it = fCompositeCutList.begin(); it < fCompositeCutList.end(); ++it) {
if (fOptionUseAND && !(*it).IsSelected(values)) {
return false;
}
if (!fOptionUseAND && (*it).IsSelected(values)) {
return true;
}
}

if (fOptionUseAND) {
return true;
} else {
Expand Down
11 changes: 0 additions & 11 deletions Analysis/Tasks/PWGDQ/tableReader.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -593,17 +593,6 @@ void DefineHistograms(HistogramManager* histMan, TString histClasses)
histMan->AddHistogram(classStr.Data(), "Eta_Phi", "", false, 20, -1.0, 1.0, VarManager::kEta, 100, -8.0, 8.0, VarManager::kPhi);
}

if (classStr.Contains("DileptonsSelected")) {
histMan->AddHistClass(classStr.Data());
histMan->AddHistogram(classStr.Data(), "Mass_Pt", "", false, 100, 0.0, 5.0, VarManager::kMass, 100, 0.0, 20.0, VarManager::kPt);
}

if (classStr.Contains("HadronsSelected")) {
histMan->AddHistClass(classStr.Data());
histMan->AddHistogram(classStr.Data(), "Eta_Pt", "", false, 20, -1.0, 1.0, VarManager::kEta, 100, 0.0, 20.0, VarManager::kPt);
histMan->AddHistogram(classStr.Data(), "Eta_Phi", "", false, 20, -1.0, 1.0, VarManager::kEta, 100, -8.0, 8.0, VarManager::kPhi);
}

if (classStr.Contains("Pairs")) {
histMan->AddHistClass(classStr.Data());
histMan->AddHistogram(classStr.Data(), "Mass_Pt_Cent", "", false, 125, 0.0, 5.0, VarManager::kMass, 20, 0.0, 20.0, VarManager::kPt, 10, 0.0, 100.0, VarManager::kCentVZERO);
Expand Down