Skip to content

[PWGCF] Please consider the following formatting changes to #16917 #101

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

Open
alibuild wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[PWGCF] Please consider the following formatting changes to #16917 #101

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
46 changes: 23 additions & 23 deletions PWGCF/Flow/TableProducer/zdcQVectors.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
#include "Common/CCDB/RCTSelectionFlags.h"
#include "Common/DataModel/Centrality.h"
#include "Common/DataModel/EventSelection.h"
#include "Common/DataModel/TrackSelectionTables.h"
#include "Common/DataModel/Multiplicity.h"
#include "Common/DataModel/TrackSelectionTables.h"

#include <CCDB/BasicCCDBManager.h>
#include <CommonConstants/MathConstants.h>
Expand Down Expand Up @@ -170,10 +170,10 @@ struct ZdcQVectors {

// define my.....
// Filter collisionFilter = nabs(aod::collision::posZ) <;

using UsedCollisions = soa::Join<aod::Collisions, aod::EvSels, aod::Mults, aod::CentFT0Cs, aod::CentFT0CVariant1s, aod::CentFT0Ms, aod::CentFV0As, aod::CentNGlobals>;
using BCsRun3 = soa::Join<aod::BCs, aod::Timestamps, aod::BcSels, aod::Run3MatchedToBCSparse>;
Filter trackFilter = nabs(aod::track::eta) < cfgTrackSelsEta && aod::track::pt > cfgTrackSelsPtmin && aod::track::pt < cfgTrackSelsPtmax && ((requireGlobalTrackInFilter()) || (aod::track::isGlobalTrackSDD == (uint8_t)true)) && nabs(aod::track::dcaXY) < cfgTrackSelsDCAxy && nabs(aod::track::dcaZ) < cfgTrackSelsDCAz;
Filter trackFilter = nabs(aod::track::eta) < cfgTrackSelsEta && aod::track::pt > cfgTrackSelsPtmin&& aod::track::pt < cfgTrackSelsPtmax && ((requireGlobalTrackInFilter()) || (aod::track::isGlobalTrackSDD == (uint8_t)true)) && nabs(aod::track::dcaXY) < cfgTrackSelsDCAxy&& nabs(aod::track::dcaZ) < cfgTrackSelsDCAz;
using UnfilteredTracks = soa::Join<aod::Tracks, aod::TracksExtra, aod::TrackSelection, aod::TracksDCA>;
using UsedTracks = soa::Filtered<UnfilteredTracks>;

Expand Down Expand Up @@ -411,7 +411,7 @@ struct ZdcQVectors {
fMultPVCutHigh = std::make_unique<TF1>("fMultPVCutHigh", "[0]+[1]*x+[2]*x*x+[3]*x*x*x+[4]*x*x*x*x", 0, 100);
fMultCutLow = std::make_unique<TF1>("fMultCutLow", "[0]+[1]*x+[2]*x*x+[3]*x*x*x+[4]*x*x*x*x", 0, 100);
fMultCutHigh = std::make_unique<TF1>("fMultCutHigh", "[0]+[1]*x+[2]*x*x+[3]*x*x*x+[4]*x*x*x*x", 0, 100);

std::vector<double> paramsMultPVCut = cfgEvSelsMultPv;
std::vector<double> paramsMultCut = cfgEvSelsMult;

Expand All @@ -426,8 +426,8 @@ struct ZdcQVectors {
fMultPVCutHigh->SetParameters(paramsMultPVCut[5], paramsMultPVCut[6], paramsMultPVCut[7], paramsMultPVCut[8], paramsMultPVCut[9]);
fMultCutLow->SetParameters(paramsMultCut[0], paramsMultCut[1], paramsMultCut[2], paramsMultCut[3], paramsMultCut[4]);
fMultCutHigh->SetParameters(paramsMultCut[5], paramsMultCut[6], paramsMultCut[7], paramsMultCut[8], paramsMultCut[9]);
}
}
}

double rescaleTimestamp(uint64_t timestamp, int runnumber)
{
Expand Down Expand Up @@ -504,15 +504,15 @@ struct ZdcQVectors {
if (selected) {
selectionBits |= static_cast<uint16_t>(0x1u << evSel_Zvtx);
fillCutAnalysis(collision, bunchCrossing, evSel_Zvtx);
} else if(cfgSelVec.value[evSel_Zvtx]){
} else if (cfgSelVec.value[evSel_Zvtx]) {
isEventSelected = false;
}

selected = collision.sel8();
if (selected) {
selectionBits |= static_cast<uint16_t>(0x1u << evSel_sel8);
fillCutAnalysis(collision, bunchCrossing, evSel_sel8);
} else if(cfgSelVec.value[evSel_sel8]){
} else if (cfgSelVec.value[evSel_sel8]) {
isEventSelected = false;
}

Expand All @@ -521,71 +521,71 @@ struct ZdcQVectors {
if (selected) {
selectionBits |= static_cast<uint16_t>(0x1u << evSel_occupancy);
fillCutAnalysis(collision, bunchCrossing, evSel_occupancy);
} else if(cfgSelVec.value[evSel_occupancy]){
} else if (cfgSelVec.value[evSel_occupancy]) {
isEventSelected = false;
}

selected = collision.selection_bit(o2::aod::evsel::kNoSameBunchPileup);
if (selected) {
selectionBits |= static_cast<uint16_t>(0x1u << evSel_kNoSameBunchPileup);
fillCutAnalysis(collision, bunchCrossing, evSel_kNoSameBunchPileup);
} else if(cfgSelVec.value[evSel_kNoSameBunchPileup]){
} else if (cfgSelVec.value[evSel_kNoSameBunchPileup]) {
isEventSelected = false;
}

selected = collision.selection_bit(o2::aod::evsel::kIsGoodZvtxFT0vsPV);
if (selected) {
selectionBits |= static_cast<uint16_t>(0x1u << evSel_kIsGoodZvtxFT0vsPV);
fillCutAnalysis(collision, bunchCrossing, evSel_kIsGoodZvtxFT0vsPV);
} else if(cfgSelVec.value[evSel_kIsGoodZvtxFT0vsPV]){
} else if (cfgSelVec.value[evSel_kIsGoodZvtxFT0vsPV]) {
isEventSelected = false;
}

selected = collision.selection_bit(o2::aod::evsel::kNoCollInTimeRangeStandard);
if (selected) {
selectionBits |= static_cast<uint16_t>(0x1u << evSel_kNoCollInTimeRangeStandard);
fillCutAnalysis(collision, bunchCrossing, evSel_kNoCollInTimeRangeStandard);
} else if(cfgSelVec.value[evSel_kNoCollInTimeRangeStandard]){
} else if (cfgSelVec.value[evSel_kNoCollInTimeRangeStandard]) {
isEventSelected = false;
}

selected = collision.selection_bit(o2::aod::evsel::kNoCollInTimeRangeNarrow);
if (selected) {
selectionBits |= static_cast<uint16_t>(0x1u << evSel_kNoCollInTimeRangeNarrow);
fillCutAnalysis(collision, bunchCrossing, evSel_kNoCollInTimeRangeNarrow);
} else if(cfgSelVec.value[evSel_kNoCollInTimeRangeNarrow]){
} else if (cfgSelVec.value[evSel_kNoCollInTimeRangeNarrow]) {
isEventSelected = false;
}

selected = collision.selection_bit(o2::aod::evsel::kIsVertexITSTPC);
if (selected) {
selectionBits |= static_cast<uint16_t>(0x1u << evSel_kIsVertexITSTPC);
fillCutAnalysis(collision, bunchCrossing, evSel_kIsVertexITSTPC);
} else if(cfgSelVec.value[evSel_kIsVertexITSTPC]){
} else if (cfgSelVec.value[evSel_kIsVertexITSTPC]) {
isEventSelected = false;
}

selected = collision.selection_bit(o2::aod::evsel::kIsGoodITSLayersAll);
if (selected) {
selectionBits |= static_cast<uint16_t>(0x1u << evSel_kIsGoodITSLayersAll);
fillCutAnalysis(collision, bunchCrossing, evSel_kIsGoodITSLayersAll);
} else if(cfgSelVec.value[evSel_kIsGoodITSLayersAll]){
} else if (cfgSelVec.value[evSel_kIsGoodITSLayersAll]) {
isEventSelected = false;
}

selected = collision.selection_bit(o2::aod::evsel::kIsGoodITSLayer0123);
if (selected) {
selectionBits |= static_cast<uint16_t>(0x1u << evSel_kIsGoodITSLayer0123);
fillCutAnalysis(collision, bunchCrossing, evSel_kIsGoodITSLayer0123);
} else if(cfgSelVec.value[evSel_kIsGoodITSLayer0123]){
} else if (cfgSelVec.value[evSel_kIsGoodITSLayer0123]) {
isEventSelected = false;
}

selected = rctChecker(collision);
if (selected) {
selectionBits |= static_cast<uint16_t>(0x1u << evSel_RCTFlagsZDC);
fillCutAnalysis(collision, bunchCrossing, evSel_RCTFlagsZDC);
} else if(cfgSelVec.value[evSel_RCTFlagsZDC]){
} else if (cfgSelVec.value[evSel_RCTFlagsZDC]) {
isEventSelected = false;
}

Expand All @@ -600,8 +600,8 @@ struct ZdcQVectors {
}

auto multNTracksPV = collision.multNTracksPV();
selected = true;
selected = true;

if (vtxz > cfgVtxZ || vtxz < -cfgVtxZ)
selected = false;
if (multNTracksPV < fMultPVCutLow->Eval(collision.centFT0C()))
Expand All @@ -616,7 +616,7 @@ struct ZdcQVectors {
if (selected) {
selectionBits |= static_cast<uint16_t>(0x1u << evSel_MultCut);
fillCutAnalysis(collision, bunchCrossing, evSel_MultCut);
} else if(cfgSelVec.value[evSel_MultCut]){
} else if (cfgSelVec.value[evSel_MultCut]) {
isEventSelected = false;
}

Expand Down Expand Up @@ -909,7 +909,7 @@ struct ZdcQVectors {

// Use this bool to check for given set of event selections of Q-vectors would be selected
// Enable plotting only if event would be selected
bool isEventSelected = true;
bool isEventSelected = true;

uint16_t eventSelectionFlags = eventSelected(collision, foundBC.zdc(), isEventSelected, tracks.size());

Expand Down Expand Up @@ -996,7 +996,7 @@ struct ZdcQVectors {
calibtower++;
}

if (cfgFillHistRegistry && !cfgFillNothing && isEventSelected) {
if (cfgFillHistRegistry && !cfgFillNothing && isEventSelected) {
for (int i = 0; i < nTowersPerSide; i++) {
float bincenter = i + .5;
registry.fill(HIST("QA/ZNA_Energy"), bincenter, eZN[i]);
Expand Down Expand Up @@ -1055,7 +1055,7 @@ struct ZdcQVectors {
}
}

if (cfgFillHistRegistry && !cfgFillNothing && isEventSelected) {
if (cfgFillHistRegistry && !cfgFillNothing && isEventSelected) {
registry.get<TProfile>(HIST("QA/before/ZNA_Qx"))->Fill(Form("%d", runnumber), q[0]);
registry.get<TProfile>(HIST("QA/before/ZNA_Qy"))->Fill(Form("%d", runnumber), q[1]);
registry.get<TProfile>(HIST("QA/before/ZNC_Qx"))->Fill(Form("%d", runnumber), q[2]);
Expand Down Expand Up @@ -1087,7 +1087,7 @@ struct ZdcQVectors {
lastRunNumber = runnumber;
return;
} else {
if (cfgFillHistRegistry && isEventSelected)
if (cfgFillHistRegistry && isEventSelected)
fillCommonRegistry<kBefore>(q[0], q[1], q[2], q[3], v, centrality, rsTimestamp);

// vector of 4
Expand Down
Loading