From 2979731da4d963415a6b601567bf60206e0b330e Mon Sep 17 00:00:00 2001
From: Florian Uhlig <f.uhlig@gsi.de>
Date: Wed, 1 Jun 2022 12:59:18 +0200
Subject: [PATCH] Prepare CbmRoot for FairSoft apr22
Fix ambiguous function call.
---
.../papaframework/PairAnalysisCutQa.cxx | 30 +++++++++++++++++++
1 file changed, 30 insertions(+)
diff --git a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisCutQa.cxx b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisCutQa.cxx
index 89d67a16b2..adc84308b0 100644
--- a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisCutQa.cxx
+++ b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisCutQa.cxx
@@ -379,6 +379,20 @@ void PairAnalysisCutQa::Fill(UInt_t mask, TObject* obj, UInt_t addIdx)
if (idx == static_cast<Int_t>(ETypes::kTrack) || idx == static_cast<Int_t>(ETypes::kTrack2)) {
TProfile2D* detQA = static_cast<TProfile2D*>(histos->FindObject(Form("%sMatchEff", fTypeKeys[idx])));
PairAnalysisTrack* t = static_cast<PairAnalysisTrack*>(obj);
+#if (ROOT_VERSION_CODE >= ROOT_VERSION(6, 26, 0))
+ detQA->Fill(cutstep, PairAnalysisHelper::GetDetName(ECbmModuleId::kMvd),
+ t->TestBit(BIT(14 + ToIntegralType(ECbmModuleId::kMvd))), 1.);
+ detQA->Fill(cutstep, PairAnalysisHelper::GetDetName(ECbmModuleId::kSts),
+ t->TestBit(BIT(14 + ToIntegralType(ECbmModuleId::kSts))), 1.);
+ detQA->Fill(cutstep, PairAnalysisHelper::GetDetName(ECbmModuleId::kRich),
+ t->TestBit(BIT(14 + ToIntegralType(ECbmModuleId::kRich))), 1.);
+ detQA->Fill(cutstep, PairAnalysisHelper::GetDetName(ECbmModuleId::kTrd),
+ t->TestBit(BIT(14 + ToIntegralType(ECbmModuleId::kTrd))), 1.);
+ detQA->Fill(cutstep, PairAnalysisHelper::GetDetName(ECbmModuleId::kTof),
+ t->TestBit(BIT(14 + ToIntegralType(ECbmModuleId::kTof))), 1.);
+ detQA->Fill(cutstep, PairAnalysisHelper::GetDetName(ECbmModuleId::kMuch),
+ t->TestBit(BIT(14 + ToIntegralType(ECbmModuleId::kMuch))), 1.);
+#else
detQA->Fill(cutstep, PairAnalysisHelper::GetDetName(ECbmModuleId::kMvd),
t->TestBit(BIT(14 + ToIntegralType(ECbmModuleId::kMvd))));
detQA->Fill(cutstep, PairAnalysisHelper::GetDetName(ECbmModuleId::kSts),
@@ -391,6 +405,7 @@ void PairAnalysisCutQa::Fill(UInt_t mask, TObject* obj, UInt_t addIdx)
t->TestBit(BIT(14 + ToIntegralType(ECbmModuleId::kTof))));
detQA->Fill(cutstep, PairAnalysisHelper::GetDetName(ECbmModuleId::kMuch),
t->TestBit(BIT(14 + ToIntegralType(ECbmModuleId::kMuch))));
+#endif
}
++cutstep;
@@ -440,6 +455,20 @@ void PairAnalysisCutQa::FillAll(TObject* obj, UInt_t addIdx)
if (idx == static_cast<Int_t>(ETypes::kTrack) || idx == static_cast<Int_t>(ETypes::kTrack2)) {
TProfile2D* detQA = static_cast<TProfile2D*>(histos->FindObject(Form("%sMatchEff", fTypeKeys[idx])));
PairAnalysisTrack* t = static_cast<PairAnalysisTrack*>(obj);
+#if (ROOT_VERSION_CODE >= ROOT_VERSION(6, 26, 0))
+ detQA->Fill(0., PairAnalysisHelper::GetDetName(ECbmModuleId::kMvd),
+ t->TestBit(BIT(14 + ToIntegralType(ECbmModuleId::kMvd))), 1.);
+ detQA->Fill(0., PairAnalysisHelper::GetDetName(ECbmModuleId::kSts),
+ t->TestBit(BIT(14 + ToIntegralType(ECbmModuleId::kSts))), 1.);
+ detQA->Fill(0., PairAnalysisHelper::GetDetName(ECbmModuleId::kRich),
+ t->TestBit(BIT(14 + ToIntegralType(ECbmModuleId::kRich))), 1.);
+ detQA->Fill(0., PairAnalysisHelper::GetDetName(ECbmModuleId::kTrd),
+ t->TestBit(BIT(14 + ToIntegralType(ECbmModuleId::kTrd))), 1.);
+ detQA->Fill(0., PairAnalysisHelper::GetDetName(ECbmModuleId::kTof),
+ t->TestBit(BIT(14 + ToIntegralType(ECbmModuleId::kTof))), 1.);
+ detQA->Fill(0., PairAnalysisHelper::GetDetName(ECbmModuleId::kMuch),
+ t->TestBit(BIT(14 + ToIntegralType(ECbmModuleId::kMuch))), 1.);
+#else
detQA->Fill(0., PairAnalysisHelper::GetDetName(ECbmModuleId::kMvd),
t->TestBit(BIT(14 + ToIntegralType(ECbmModuleId::kMvd))));
detQA->Fill(0., PairAnalysisHelper::GetDetName(ECbmModuleId::kSts),
@@ -452,6 +481,7 @@ void PairAnalysisCutQa::FillAll(TObject* obj, UInt_t addIdx)
t->TestBit(BIT(14 + ToIntegralType(ECbmModuleId::kTof))));
detQA->Fill(0., PairAnalysisHelper::GetDetName(ECbmModuleId::kMuch),
t->TestBit(BIT(14 + ToIntegralType(ECbmModuleId::kMuch))));
+#endif
}
}
--
GitLab