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
3 changes: 2 additions & 1 deletion PWGCF/JCorran/Core/FlowJHistManager.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2019-2020 CERN and copyright holders of ALICE O2.

Check warning on line 1 in PWGCF/JCorran/Core/FlowJHistManager.h

View workflow job for this annotation

GitHub Actions / O2 linter

[doc/file]

Provide mandatory file documentation.
// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
// All rights not expressly granted are reserved.
//
Expand All @@ -8,7 +8,7 @@
// In applying this license CERN does not waive the privileges and immunities
// granted to it by virtue of its status as an Intergovernmental Organization
// or submit itself to any jurisdiction.

Check warning on line 11 in PWGCF/JCorran/Core/FlowJHistManager.h

View workflow job for this annotation

GitHub Actions / O2 linter

[doc/file]

Documentation for \file is missing, incorrect or misplaced.

Check warning on line 11 in PWGCF/JCorran/Core/FlowJHistManager.h

View workflow job for this annotation

GitHub Actions / O2 linter

[doc/file]

Documentation for \brief is missing, incorrect or misplaced.

Check warning on line 11 in PWGCF/JCorran/Core/FlowJHistManager.h

View workflow job for this annotation

GitHub Actions / O2 linter

[doc/file]

Documentation for \author is missing, incorrect or misplaced.
// \brief Histogram manager for the AC-related analyses.
// \author Cindy Mordasini (cindy.mordasini@cern.ch)

Expand All @@ -16,7 +16,7 @@
#define PWGCF_JCORRAN_CORE_FLOWJHISTMANAGER_H_

/* Header files. */
#include <iostream>

Check warning on line 19 in PWGCF/JCorran/Core/FlowJHistManager.h

View workflow job for this annotation

GitHub Actions / O2 linter

[include-iostream]

Including iostream is discouraged. Use O2 logging instead.
#include <vector>
#include <array>
#include <string>
Expand All @@ -33,8 +33,8 @@
// O2 Physics headers.

/* Namespaces. */
using namespace o2;

Check warning on line 36 in PWGCF/JCorran/Core/FlowJHistManager.h

View workflow job for this annotation

GitHub Actions / O2 linter

[using-directive]

Using directives are not allowed in headers.
using namespace o2::framework;

Check warning on line 37 in PWGCF/JCorran/Core/FlowJHistManager.h

View workflow job for this annotation

GitHub Actions / O2 linter

[using-directive]

Using directives are not allowed in headers.

// ----------------------------------------------------------------------------
// Histogram manager to fill the general QA common to all flow tasks.
Expand All @@ -45,14 +45,14 @@
FlowJHistManager() = default;

// Setters and getters, in the same order as the data members.
void SetHistRegistryQA(HistogramRegistry* myRegistry)

Check warning on line 48 in PWGCF/JCorran/Core/FlowJHistManager.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/function-variable]

Use lowerCamelCase for names of functions and variables.
{
mHistRegistryQA = myRegistry;
LOGF(info, "QA histogram registry successfully set.");
}
HistogramRegistry* GetHistRegistryQA() const { return mHistRegistryQA; }

Check warning on line 53 in PWGCF/JCorran/Core/FlowJHistManager.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/function-variable]

Use lowerCamelCase for names of functions and variables.

void SetDebugLog(bool debug)

Check warning on line 55 in PWGCF/JCorran/Core/FlowJHistManager.h

View workflow job for this annotation

GitHub Actions / O2 linter

[name/function-variable]

Use lowerCamelCase for names of functions and variables.
{
mDebugLog = debug;
LOGF(info, "Debug level: %d", mDebugLog);
Expand Down Expand Up @@ -161,7 +161,8 @@
break;
}

if (mDebugLog) LOGF(info, "The EventQA has been filled.");
if (mDebugLog)
LOGF(info, "The EventQA has been filled.");
}

/// \brief Hardcode the cBin for FillThisTrackQA if not constant.
Expand Down
1 change: 0 additions & 1 deletion PWGCF/JCorran/Core/FlowJSPCAnalysis.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,6 @@ void FlowJSPCAnalysis::FillQAHistograms(const Int_t fCentBin, Double_t phi, Doub
}
}


void FlowJSPCAnalysis::Correlation(Int_t c_nPart, Int_t c_nHarmo, Int_t* harmo, Double_t* correlData)
{
// Calculate the correlators for the provided set of harmonics using Q-vectors.
Expand Down
10 changes: 3 additions & 7 deletions PWGCF/JCorran/Tasks/flowJSPCAnalysis.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
#include "Common/Core/TrackSelection.h"
#include "Common/DataModel/TrackSelectionTables.h"


#include "PWGCF/DataModel/CorrelationsDerived.h"
#include "PWGCF/JCorran/DataModel/JCatalyst.h"
#include "PWGCF/JCorran/Core/FlowJSPCAnalysis.h"
Expand Down Expand Up @@ -112,7 +111,7 @@ struct flowJSPCAnalysis {

template <class CollisionT, class TrackT>
void analyze(CollisionT const& collision, TrackT const& tracks)
// void process(soa::Filtered<MyCollisions>::iterator const& coll, soa::Filtered<soa::Join<aod::MyTracks, aod::JWeights>> const& tracks)
// void process(soa::Filtered<MyCollisions>::iterator const& coll, soa::Filtered<soa::Join<aod::MyTracks, aod::JWeights>> const& tracks)
{
if (tracks.size() < cfgEventCuts.cfgMultMin)
return;
Expand All @@ -125,12 +124,12 @@ struct flowJSPCAnalysis {
SPCHistograms.fill(HIST("FullCentrality"), cent);
int nTracks = tracks.size();
for (auto& track : tracks) {
if (cfgFillQA){
if (cfgFillQA) {
// histManager.FillTrackQA<0>(track, cBin, collision.posZ());

using JInputClassIter = typename TrackT::iterator;
if constexpr (std::experimental::is_detected<hasWeightNUA, const JInputClassIter>::value) {
spcAnalysis.FillQAHistograms(cBin, track.phi(), 1./track.weightNUA());
spcAnalysis.FillQAHistograms(cBin, track.phi(), 1. / track.weightNUA());
}
}
}
Expand All @@ -143,7 +142,6 @@ struct flowJSPCAnalysis {
spcAnalysis.CalculateCorrelators(cBin);
}


void processJDerived(aod::JCollision const& collision, soa::Filtered<aod::JTracks> const& tracks)
{
analyze(collision, tracks);
Expand All @@ -169,8 +167,6 @@ struct flowJSPCAnalysis {
PROCESS_SWITCH(flowJSPCAnalysis, processCFDerivedCorrected, "Process CF derived data with corrections", true);
};



WorkflowSpec defineDataProcessing(ConfigContext const& cfgc)
{
return WorkflowSpec{
Expand Down
8 changes: 4 additions & 4 deletions PWGCF/JCorran/Tasks/jflucWeightsLoader.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,14 @@ struct jflucWeightsLoader {
}
}

void initCCDB(int runNum, int ts) {
void initCCDB(int runNum, int ts)
{
if (cfgForRunNumber) {
ph = ccdb->getForRun<THnF>(cfgCCDBPath, runNum);
} else
ph = ccdb->getForTimeStamp<THnF>(cfgCCDBPath,ts);
ph = ccdb->getForTimeStamp<THnF>(cfgCCDBPath, ts);
}


void init(InitContext const&)
{
if (!doprocessLoadWeights && !doprocessLoadWeightsCF) {
Expand All @@ -94,7 +94,7 @@ struct jflucWeightsLoader {
pf = 0;
LOGF(fatal, "NUA correction weights file not found: %s", cfgPathPhiWeights.value.substr(8).c_str());
}
useCCDB=false;
useCCDB = false;
} else {
LOGF(info, "Didn't find \"local://\" or \"ccdb\"");
return;
Expand Down
Loading