Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions PWGDQ/Core/CutsLibrary.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#include <TF1.h>
#include <vector>
#include <string>
#include <iostream>

Check warning on line 19 in PWGDQ/Core/CutsLibrary.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[include-iostream]

Do not include iostream. Use O2 logging instead.
#include "AnalysisCompositeCut.h"
#include "VarManager.h"

Expand Down Expand Up @@ -1109,7 +1109,7 @@
cut->AddCut(magnus_PID121);
return cut;
}

Check warning on line 1112 in PWGDQ/Core/CutsLibrary.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number]

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
AnalysisCompositeCut* magnus_PID112 = new AnalysisCompositeCut("magnus_PID112", "");
magnus_PID112->AddCut(GetAnalysisCut("pidJpsi_magnus_ele1"));
magnus_PID112->AddCut(GetAnalysisCut("pidJpsi_magnus_pion1"));
Expand Down Expand Up @@ -1409,7 +1409,7 @@
return cut;
}
// -------------------------------------------------------------------------------------------------
//

Check warning on line 1412 in PWGDQ/Core/CutsLibrary.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number]

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
// LMee cuts
// List of cuts used for low mass dielectron analyses
//
Expand Down Expand Up @@ -1911,7 +1911,7 @@
}

if (!nameStr.compare(Form("lmee%s_eNSigmaRun3%s_strongHadRej", vecTypetrackWithPID.at(jcase).Data(), vecPIDcase.at(icase).Data()))) {
cut->AddCut(GetAnalysisCut("lmeeStandardKine"));

Check warning on line 1914 in PWGDQ/Core/CutsLibrary.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number]

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
cut->AddCut(GetAnalysisCut(Form("lmeeQCTrackCuts%s", vecTypetrackWithPID.at(jcase).Data())));
cut->AddCut(GetAnalysisCut("PrimaryTrack_looseDCA"));

Expand Down Expand Up @@ -2681,7 +2681,7 @@
AnalysisCompositeCut* cut_tpc_nSigma = new AnalysisCompositeCut("pid_TPCnSigma", "pid_TPCnSigma", kTRUE);
cut_tpc_nSigma->AddCut(GetAnalysisCut(Form("electronPID_TPCnsigma%s", vecPIDcase.at(icase).Data())));

AnalysisCompositeCut* cut_tof_nSigma = new AnalysisCompositeCut("pid_TOFnSigma", "pid_TOFnSigma", kTRUE);

Check warning on line 2684 in PWGDQ/Core/CutsLibrary.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number]

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
cut_tof_nSigma->AddCut(GetAnalysisCut(Form("electronPID_TOFnsigma%s", vecPIDcase.at(icase).Data())));

AnalysisCompositeCut* cut_pid_OR = new AnalysisCompositeCut("e_NSigma", "e_NSigma", kFALSE);
Expand Down Expand Up @@ -2738,7 +2738,7 @@
cut_tpc_nSigma->AddCut(GetAnalysisCut(Form("lmee_pp_502TeV_TPCloosenopkrej%s", vecPIDcase.at(icase).Data())));

cut->AddCut(cut_tpc_nSigma);
return cut;

Check warning on line 2741 in PWGDQ/Core/CutsLibrary.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number]

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
}

if (!nameStr.compare(Form("lmee_skimmingtesta_TOF%s", vecPIDcase.at(icase).Data()))) {
Expand Down Expand Up @@ -3696,6 +3696,10 @@
return cut;
}

if (!nameStr.compare("eventSel8")) { // kIsSel8 = kIsTriggerTVX && kNoITSROFrameBorder && kNoTimeFrameBorder
cut->AddCut(VarManager::kIsSel8, 0.5, 1.5);
return cut;
}
if (!nameStr.compare("eventStandardSel8")) { // kIsSel8 = kIsTriggerTVX && kNoITSROFrameBorder && kNoTimeFrameBorder
cut->AddCut(VarManager::kVtxZ, -10.0, 10.0);
cut->AddCut(VarManager::kIsSel8, 0.5, 1.5);
Expand Down Expand Up @@ -4449,20 +4453,20 @@
cut->AddCut(VarManager::kTPCncls, 120.0, 170.);
return cut;
}

Check warning on line 4456 in PWGDQ/Core/CutsLibrary.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number]

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
if (!nameStr.compare("TightTPCTrackRun3")) {
cut->AddCut(VarManager::kTPCchi2, 0.0, 4.0);
cut->AddCut(VarManager::kTPCnclsCR, 80.0, 161.);
return cut;

Check warning on line 4460 in PWGDQ/Core/CutsLibrary.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number]

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
}

if (!nameStr.compare("TightTPCTrack")) {
cut->AddCut(VarManager::kTPCchi2, 0.0, 4.0);
cut->AddCut(VarManager::kTPCnclsCR, 80.0, 161.);

Check warning on line 4465 in PWGDQ/Core/CutsLibrary.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number]

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
cut->AddCut(VarManager::kIsTPCrefit, 0.5, 1.5);
return cut;
}

Check warning on line 4469 in PWGDQ/Core/CutsLibrary.cxx

View workflow job for this annotation

GitHub Actions / O2 linter

[magic-number]

Avoid magic numbers in expressions. Assign the value to a clearly named variable or constant.
if (!nameStr.compare("SPDfirst")) {
cut->AddCut(VarManager::kIsSPDfirst, 0.5, 1.5);
return cut;
Expand Down
3 changes: 3 additions & 0 deletions PWGDQ/TableProducer/tableMakerMC_withAssoc.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -1061,6 +1061,9 @@ struct TableMakerMC {
if (fGrpMag != nullptr) {
o2::base::Propagator::initFieldFromGRP(fGrpMag);
}
if (fConfigVariousOptions.fPropMuon) {
VarManager::SetupMuonMagField();
}
}
std::map<string, string> metadataRCT, header;
header = fCCDBApi.retrieveHeaders(Form("RCT/Info/RunInformation/%i", bcs.begin().runNumber()), metadataRCT, -1);
Expand Down
3 changes: 3 additions & 0 deletions PWGDQ/TableProducer/tableMaker_withAssoc.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -1286,6 +1286,9 @@ struct TableMaker {
if (fGrpMag != nullptr) {
o2::base::Propagator::initFieldFromGRP(fGrpMag);
}
if (fConfigVariousOptions.fPropMuon) {
VarManager::SetupMuonMagField();
}
}
std::map<string, string> metadataRCT, header;
header = fCCDBApi.retrieveHeaders(Form("RCT/Info/RunInformation/%i", bcs.begin().runNumber()), metadataRCT, -1);
Expand Down
Loading